From 191b29a2dcc24c2d4116886a528c8cd11a996445 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 2 Apr 2024 11:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addLine.vue                    | 11 +++--
 .../components/addPointer.vue                 | 48 ++++++++++++++++---
 .../components/addQuestions.vue               |  8 +++-
 src/views/PartyshistoryRecoder/line.vue       | 17 ++++++-
 src/views/PartyshistoryRecoder/pointer.vue    | 15 +++++-
 .../PartyshistoryRecoder/studyQuestion.vue    | 16 ++++++-
 src/views/activity/activityOrder.vue          | 24 +++++++---
 src/views/activity/activityUser.vue           |  5 +-
 .../activity/components/addActivityUser.vue   |  3 ++
 .../activity/components/addDrawPrize.vue      |  5 +-
 src/views/activity/drawPrize.vue              |  3 ++
 src/views/activity/drawPrizeLog.vue           |  3 ++
 .../party/components/addStudyResource.vue     |  5 +-
 13 files changed, 136 insertions(+), 27 deletions(-)

diff --git a/src/views/PartyshistoryRecoder/components/addLine.vue b/src/views/PartyshistoryRecoder/components/addLine.vue
index 901b7d0..447d4d2 100644
--- a/src/views/PartyshistoryRecoder/components/addLine.vue
+++ b/src/views/PartyshistoryRecoder/components/addLine.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增点位场馆' : '编辑点位场馆'"
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增线路' : '编辑线路'"
       :form="form" :rules="rules" @submit="submit">
       <template v-slot:activity_list_id>
         <div class="xy-table-item">
@@ -9,7 +9,7 @@
             项目 ：
           </div>
           <div class="xy-table-item-content">
-            <el-select  style="width: 300px" @change="changeActive" v-model="form.activity_list_id" placeholder="请选择">
+            <el-select :disabled="hasActiveId" style="width: 300px" @change="changeActive" v-model="form.activity_list_id" placeholder="请选择">
               <el-option
                 v-for="item in listActivity"
                 :key="item.id"
@@ -93,7 +93,8 @@
     props: {},
     data() {
       return {
-        isShow: false,
+        isShow: false,
+        hasActiveId:false,
         id: "",
         type: "",
         image_id: [],
@@ -181,7 +182,9 @@
       setActivityId(e){
         if(e){
           this.form.activity_list_id = e
-          console.log("123")
+          if(this.form.activity_list_id){
+            this.hasActiveId = true
+          }
           this.load()
         }
       },
diff --git a/src/views/PartyshistoryRecoder/components/addPointer.vue b/src/views/PartyshistoryRecoder/components/addPointer.vue
index a722e31..aecaf5c 100644
--- a/src/views/PartyshistoryRecoder/components/addPointer.vue
+++ b/src/views/PartyshistoryRecoder/components/addPointer.vue
@@ -9,7 +9,7 @@
             项目 ：
           </div>
           <div class="xy-table-item-content">
-            <el-select  style="width: 300px" v-model="form.activity_list_id" placeholder="请选择">
+            <el-select :disabled="hasActiveId" style="width: 300px" v-model="form.activity_list_id" placeholder="请选择">
               <el-option
                 v-for="item in listActivity"
                 :key="item.id"
@@ -84,6 +84,24 @@
             <el-input v-model="form.path" clearable placeholder="请输入小程序路径" style="width: 300px"></el-input>
           </div>
         </div>
+      </template>
+      <template v-slot:logo_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">logo(100*100) ：</div>
+          <div class="xy-table-item-content">
+            <el-upload style="width: 300px" class="upload-demo" :action="action" :on-success="
+                (response, file, fileList) =>
+                  successHandle(response, file, fileList, 'logo_id')
+              " :before-upload="uploadBefore" :file-list="logo_id" :on-remove="
+                (file, fileList) => removeHande(file, fileList, 'logo_id')
+              " :limit="1" list-type="picture-card">
+              <i slot="default" class="el-icon-plus"></i>
+              <div slot="tip" class="el-upload__tip">
+                只能上传jpg/png文件，且不超过500kb
+              </div>
+            </el-upload>
+          </div>
+        </div>
       </template>
       <template v-slot:image_id>
         <div class="xy-table-item">
@@ -259,10 +277,12 @@
     props: {},
     data() {
       return {
-        isShow: false,
+        isShow: false,
+        hasActiveId:false,
         id: "",
         type: "",
-        image_id: [],
+        image_id: [],
+        logo_id:[],
         video_image_id: [],
         action: process.env.VUE_APP_UPLOAD_API,
         video_id: [],
@@ -274,7 +294,8 @@
           name: "",
           iswx:'',
           appid:'',
-          path:'',
+          path:'',
+          logo_id:'',
           image_id: "",
           lat: "",
           lng: "",
@@ -372,6 +393,9 @@
         }
         if (!key) {
           this.init();
+        }
+        if(this.form.activity_list_id){
+          this.hasActiveId = true
         }
       },
 
@@ -409,7 +433,7 @@
         const res = await show({
           id: this.id,
           table_name: "map_points",
-          with_relations: ['video', 'image', "videoImage"]
+          with_relations: ['video', 'image', "videoImage","logo"]
         });
         this.$integrateData(this.form, res);
         this.form.config = res.config && res.config.length>0?res.config:[{
@@ -425,7 +449,13 @@
           url: res.image?.url,
           name: res.image?.original_name,
           response: res.image
-        }] : []
+        }] : [],
+        this.logo_id = res.logo ? [{
+          url: res.logo?.url,
+          name: res.logo?.original_name,
+          response: res.logo
+        }] : [],
+
         this.video_id = res.video ? [{
           url: res.video?.url,
           name: res.video?.original_name,
@@ -458,6 +488,9 @@
         this.form.image_id = this.image_id.length == 0 ? "" : (this.image_id[0]?.response?.id);
         this.form.video_id = this.video_id.length == 0 ? "" : (this.video_id[0]?.response?.id);
         this.form.video_image_id = this.video_image_id.length == 0 ? "" : (this.video_image_id[0]?.response?.id);
+
+        this.form.logo_id = this.logo_id.length == 0 ? "" : (this.logo_id[0]?.response?.id);
+
         save(Object.assign(this.form, {
           table_name: "map_points"
         })).then(
@@ -483,7 +516,8 @@
         } else {
           this.id = "";
           this.type = "";
-          this.image_id = [];
+          this.image_id = [];
+          this.logo_id = []
           this.video_id = [];
           this.video_image_id = [];
           this.init();
diff --git a/src/views/PartyshistoryRecoder/components/addQuestions.vue b/src/views/PartyshistoryRecoder/components/addQuestions.vue
index ae72256..ca608f8 100644
--- a/src/views/PartyshistoryRecoder/components/addQuestions.vue
+++ b/src/views/PartyshistoryRecoder/components/addQuestions.vue
@@ -20,7 +20,7 @@
             项目名称 ：
           </div>
           <div class="xy-table-item-content">
-            <el-select @change="handleActiveSelect" style="width: 300px" v-model="form.activity_list_id" placeholder="请选择">
+            <el-select :disabled="hasActiveId" @change="handleActiveSelect" style="width: 300px" v-model="form.activity_list_id" placeholder="请选择">
               <el-option
                 v-for="item in listActivity"
                 :key="item.id"
@@ -92,7 +92,8 @@
     props: {},
     data() {
       return {
-        isShow: false,
+        isShow: false,
+        hasActiveId:false,
         id: "",
         type: "",
         select: {
@@ -224,6 +225,9 @@
         }
         if (!key) {
           this.init();
+        }
+        if(this.form.activity_list_id){
+          this.hasActiveId = true
         }
       },
       setSelectId(value){
diff --git a/src/views/PartyshistoryRecoder/line.vue b/src/views/PartyshistoryRecoder/line.vue
index 2f47399..34eca22 100644
--- a/src/views/PartyshistoryRecoder/line.vue
+++ b/src/views/PartyshistoryRecoder/line.vue
@@ -14,16 +14,18 @@
               v-model="select.keyword"
               placeholder="请输入关键字"
               style="width: 180px"
+              clearable
             ></Input>
           </div>
-          <div>
+          <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
             <Select v-model="select.activity_list_id" style="width:200px">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </div>
 
-          <Button
+         <Button
+          v-show="!sysInfo"
             style="margin-left: 10px"
             type="primary"
             @click="select = { page: 1, keyword: '',activity_list_id:'' }"
@@ -101,6 +103,7 @@ export default {
         activity_list_id: '',
         filter: [],
       },
+      sysInfo:false,
       listActivity: [],
       total: 0,
       list: [],
@@ -204,6 +207,16 @@ export default {
     },
   },
   mounted() {
+    let that = this;
+    let sysInfo = sessionStorage.getItem('sys_info')
+    if (sysInfo && sysInfo != "") {
+      let _sys = JSON.parse(sysInfo);
+      if(_sys.tag==='h5'){
+        return
+      }
+      this.select.activity_list_id = _sys.id;
+      that.sysInfo=_sys;
+    }
     this.load();
   },
   created() {
diff --git a/src/views/PartyshistoryRecoder/pointer.vue b/src/views/PartyshistoryRecoder/pointer.vue
index ab76f28..04cd26c 100644
--- a/src/views/PartyshistoryRecoder/pointer.vue
+++ b/src/views/PartyshistoryRecoder/pointer.vue
@@ -14,9 +14,10 @@
               v-model="select.keyword"
               placeholder="请输入关键字"
               style="width: 180px"
+              clearable
             ></Input>
           </div>
-          <div>
+          <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
             <Select v-model="select.activity_list_id" style="width:200px">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
@@ -24,6 +25,7 @@
           </div>
 
           <Button
+           v-show="!sysInfo"
             style="margin-left: 10px"
             type="primary"
             @click="select = { page: 1, keyword: '',activity_list_id:'' }"
@@ -122,6 +124,7 @@ export default {
         activity_list_id: '',
         filter: [],
       },
+      sysInfo:false,
       listActivity: [],
       total: 0,
       list: [],
@@ -233,6 +236,16 @@ export default {
     },
   },
   mounted() {
+    let that = this;
+    let sysInfo = sessionStorage.getItem('sys_info')
+    if (sysInfo && sysInfo != "") {
+      let _sys = JSON.parse(sysInfo);
+      if(_sys.tag==='h5'){
+        return
+      }
+      this.select.activity_list_id = _sys.id;
+      that.sysInfo=_sys;
+    }
     this.load();
   },
   created() {
diff --git a/src/views/PartyshistoryRecoder/studyQuestion.vue b/src/views/PartyshistoryRecoder/studyQuestion.vue
index 3f57969..bea3803 100644
--- a/src/views/PartyshistoryRecoder/studyQuestion.vue
+++ b/src/views/PartyshistoryRecoder/studyQuestion.vue
@@ -14,15 +14,17 @@
               v-model="select.keyword"
               placeholder="请输入关键字"
               style="width: 180px"
+              clearable
             ></Input>
           </div>
-          <div>
+          <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
             <Select v-model="select.activity_list_id" style="width:200px">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </div>
           <Button
+            v-if="!sysInfo"
             style="margin-left: 10px"
             type="primary"
             @click="select = { page: 1, keyword: '',activity_list_id:'' },load()"
@@ -86,6 +88,7 @@ export default {
         // activity_list_id: 7,
         activity_list_id: '',
       },
+      sysInfo:false,
       listActivity: [],
       total: 0,
       list: [],
@@ -168,6 +171,17 @@ export default {
     },
   },
   mounted() {
+      let that = this;
+      let sysInfo = sessionStorage.getItem('sys_info')
+      if (sysInfo && sysInfo != "") {
+        let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
+        this.select.activity_list_id = _sys.id;
+        that.sysInfo=_sys;
+      }
+
     this.loadActivity();
     this.load();
 
diff --git a/src/views/activity/activityOrder.vue b/src/views/activity/activityOrder.vue
index 82d832b..fe413bd 100644
--- a/src/views/activity/activityOrder.vue
+++ b/src/views/activity/activityOrder.vue
@@ -4,7 +4,7 @@
       <div slot="content"></div>
       <slot>
         <div class="selects">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex;align-items: center;" v-show="!sysInfo">
             <span style="padding: 0 6px;word-break: keep-all;">
               项目
             </span>
@@ -20,7 +20,7 @@
             <Input v-model="select.keyword" placeholder="请输入关键字" style="width: 180px"></Input>
           </div>
 
-          <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
+          <Button v-show="!sysInfo" style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
           </Button>
           <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
           <Button style="margin-left: 10px" type="primary" @click="add">新增</Button>
@@ -63,7 +63,8 @@
           page_size: 20,
           keyword: '',
           activity_list_id: ""
-        },
+        },
+        sysInfo:false,
         listActivity: [],
         total: 0,
         list: [],
@@ -83,16 +84,16 @@
             label: '用户名称',
             align: 'left',
             customFn: (row) => {
-              return ( < div style = {
+              return ( <div style = {
                   {
                     display: 'flex',
                     alignItems: 'center',
                     justifyContent: 'center'
                   }
-                } > < img src = {
+                }> <img src = {
                   row.upload.url
                 }
-                style = 'width:120px;height:120px' > < /img></div > )
+                style = 'width:120px;height:120px' > </img></div> )
             }
 
           }, {
@@ -154,7 +155,16 @@
         this.load()
       },
     },
-    mounted() {
+    mounted() {
+      let sysInfo = sessionStorage.getItem('sys_info')
+      if (sysInfo && sysInfo != "") {
+        let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
+        that.select.activity_list_id = _sys.id;
+        that.sysInfo=_sys;
+      }
       this.load();
       this.loadActivity()
     },
diff --git a/src/views/activity/activityUser.vue b/src/views/activity/activityUser.vue
index 1d92ad9..e0724b1 100644
--- a/src/views/activity/activityUser.vue
+++ b/src/views/activity/activityUser.vue
@@ -158,7 +158,10 @@
       this.type = this.select.is_auth = type;
       let sysInfo = sessionStorage.getItem('sys_info')
       if (sysInfo && sysInfo != "") {
-        let _sys = JSON.parse(sysInfo);
+        let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         that.select.activity_list_id = _sys.id;
         that.sysInfo=_sys;
       }
diff --git a/src/views/activity/components/addActivityUser.vue b/src/views/activity/components/addActivityUser.vue
index 1fc0067..8e9deca 100644
--- a/src/views/activity/components/addActivityUser.vue
+++ b/src/views/activity/components/addActivityUser.vue
@@ -158,6 +158,9 @@
       let sysInfo = sessionStorage.getItem('sys_info')
       if (sysInfo && sysInfo != "") {
         let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         this.detail.activity_list_id = _sys.id;
         that.sysInfo=_sys;
       }
diff --git a/src/views/activity/components/addDrawPrize.vue b/src/views/activity/components/addDrawPrize.vue
index aaa1388..0a17506 100644
--- a/src/views/activity/components/addDrawPrize.vue
+++ b/src/views/activity/components/addDrawPrize.vue
@@ -270,12 +270,15 @@
       console.log(sysInfo)
       if (sysInfo && sysInfo != "") {
         let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         that.detail.activity_list_id = _sys.id;
         that.sysInfo = _sys;
       }
     },
     mounted() {
-      
+
     }
   }
 </script>
diff --git a/src/views/activity/drawPrize.vue b/src/views/activity/drawPrize.vue
index b1aedd0..f71e688 100644
--- a/src/views/activity/drawPrize.vue
+++ b/src/views/activity/drawPrize.vue
@@ -213,6 +213,9 @@
       console.log(sysInfo)
       if (sysInfo && sysInfo != "") {
         let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         that.select.activity_list_id = _sys.id;
         that.sysInfo = _sys;
       }
diff --git a/src/views/activity/drawPrizeLog.vue b/src/views/activity/drawPrizeLog.vue
index f0d46f8..04d902e 100644
--- a/src/views/activity/drawPrizeLog.vue
+++ b/src/views/activity/drawPrizeLog.vue
@@ -225,6 +225,9 @@
       let sysInfo = sessionStorage.getItem('sys_info')
       if (sysInfo && sysInfo != "") {
         let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         that.select.activity_list_id = _sys.id;
         that.sysInfo=_sys;
       }
diff --git a/src/views/party/components/addStudyResource.vue b/src/views/party/components/addStudyResource.vue
index 58c755e..39544b1 100644
--- a/src/views/party/components/addStudyResource.vue
+++ b/src/views/party/components/addStudyResource.vue
@@ -346,7 +346,10 @@ import { index as menulist} from "@/api/index";
       let sysInfo = sessionStorage.getItem('sys_info')
       console.log(sysInfo)
       if (sysInfo && sysInfo != "") {
-        let _sys = JSON.parse(sysInfo);
+        let _sys = JSON.parse(sysInfo);
+        if(_sys.tag==='h5'){
+          return
+        }
         that.detail.activity_list_id = _sys.id;
       }
     }