wenjie 9 сар өмнө
parent
commit
8610353e25

+ 40 - 3
src/main.js

@@ -1,9 +1,9 @@
 /*
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-06-29 15:28:34
- * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
- * @LastEditTime: 2023-06-16 15:56:24
- * @FilePath: \agentManage\src\main.js
+ * @LastEditors: wenjie 1454560336@qq.com
+ * @LastEditTime: 2024-10-25 14:21:05
+ * @FilePath: \admin-manage\src\main.js
  * @Description: 
  * 
  * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
@@ -56,6 +56,43 @@ Vue.use(ElementUI)
 
 Vue.config.productionTip = false
 
+Vue.mixin({
+  data() {
+    return {
+      masterShopOptions:[
+        {
+          value: 1,
+          label: "慧研学惠生活",
+        },
+        {
+          value: 2,
+          label: "印象贵大",
+        },
+        {
+          value: 3,
+          label: "中数未来生活宝",
+        },
+      ]
+    }
+   },
+   methods: {
+    filterMasterName(val){
+      let value = val+''
+      let list = value.split(",")
+      let arr = []
+       list.map(item=>{
+        this.masterShopOptions.map(v=>{
+          if(v.value == item){
+            arr.push(v.label)
+          }
+        })
+       })
+       arr = arr.join()
+      return arr
+    },
+   },
+})
+
 new Vue({
   el: '#app',
   router,

+ 0 - 0
src/minxins/masterShop.js


+ 2 - 1
src/utils/request.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-08-02 14:50:38
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-04-17 16:16:14
+ * @LastEditTime: 2024-10-25 10:44:02
  * @FilePath: \admin-manage\src\utils\request.js
  * @Description: 
  * 
@@ -33,6 +33,7 @@ service.interceptors.request.use(
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
       config.headers['Accesstoken'] = getToken()
+      config.headers['code'] = 1
       config.headers['epid'] = localStorage.getItem('epid')
       // config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     // }

+ 30 - 22
src/views/merchantManage/index.vue

@@ -9,6 +9,22 @@
           placeholder="请输入门店名称"
           class="item-width-200 "
         ></el-input>
+         <el-select
+          v-model="platformType"
+          multiple
+          size="small"
+          clearable
+          class="item-width-200 ml10"
+          placeholder="请选择主商户"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
         <el-button
         class="ml10"
         type="primary"
@@ -45,7 +61,7 @@
         fit
       >
       <template slot-scope="scope">
-        {{scope.row.platformType | filterName}}
+        {{filterMasterName(scope.row.platformType )}}
       </template>
       </el-table-column>
 
@@ -202,7 +218,9 @@ export default {
       dialogTableVisible:false,
       bindDialog:false,
       accountId:'',//当前弹框的主体id
+      platformType:'',//平台类型
       query: {
+        platformType:null,
         shopName: "",
         currentPage: 1,
         pageSize: 10,
@@ -219,14 +237,15 @@ export default {
       }
     };
   },
-  // watch: {
-  //   query: {
-  //     handler: debounce(function(val) {
-  //       this.getList()
-  //     }),
-  //     deep:true
-  //   }
-  // },
+  watch: {
+    platformType(val) {
+        if(val.length){
+          this.query.platformType = val.join(',')
+        }else{
+          this.query.platformType = null
+        }
+      }
+  },
   filters: {
     filterType: function(val,that) {
       let msg 
@@ -237,19 +256,7 @@ export default {
       })
       return msg
     },
-    filterName(val){
-      let list = val.split(",")
-      let arr = []
-       list.map(item=>{
-        if(item == 1){
-          arr.push('慧研学惠生活')
-        }else if(item == 2){
-          arr.push('印象贵大')
-        }
-       })
-       arr = arr.join()
-      return arr
-    },
+    
     filterShopName(val){
       if(val){
         let list = val.split(",")
@@ -272,6 +279,7 @@ export default {
     
   },
   methods: {
+    
     choose(val){
       this.mer_no = val
     },

+ 4 - 0
src/views/operationManage/advertisingManage/addAdv.vue

@@ -156,6 +156,10 @@ export default {
           label: "慧研学",
           value: '2',
         },
+        {
+          label: "生活宝",
+          value: '3',
+        },
       ],
     };
   },

+ 9 - 5
src/views/operationManage/advertisingManage/editAdv.vue

@@ -83,13 +83,17 @@ export default {
         },
       options:[
         {
-          label:'惠生活',
-          value:1
+          label: "贵大",
+          value: '1',
         },
         {
-          label:'研学',
-          value:2
-        }
+          label: "慧研学",
+          value: '2',
+        },
+        {
+          label: "生活宝",
+          value: '3',
+        },
       ]
     };
   },

+ 4 - 0
src/views/operationManage/advertisingManage/index.vue

@@ -171,6 +171,10 @@ export default {
           label: "慧研学",
           value: '2',
         },
+        {
+          label: "生活宝",
+          value: '3',
+        },
       ],
       loading: false,
       query: {

+ 5 - 1
src/views/operationManage/appMenuManage/index.vue

@@ -142,7 +142,11 @@ export default {
         {
           label:'慧研学',
           value:'2'
-        }
+        },
+        {
+          label: "生活宝",
+          value: '3',
+        },
       ],
       title: "",
       total: 0,

+ 27 - 3
src/views/operationManage/bannerManage/addBanner.vue

@@ -6,18 +6,36 @@
       :rules="rules"
       label-width="130px"
     >
-      <el-form-item label="名称:" prop="bannerName">
+    
+        <el-form-item label="名称:" prop="bannerName">
         <el-input
           v-model="setQuery.bannerName"
           class="item-width-300"
         ></el-input>
       </el-form-item>
-      <el-form-item label="主题色:" prop="colour">
+      <el-form-item label="名称:" prop="bannerName">
         <el-input
-          v-model="setQuery.colour"
+          v-model="setQuery.bannerName"
           class="item-width-300"
         ></el-input>
       </el-form-item>
+      <el-form-item label="主商户" prop="platformType">
+         <el-select
+          v-model="setQuery.platformType"
+          size="small"
+          clearable
+          class="item-width-300"
+          placeholder="请选择主商户"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item label="banner图:" prop="bannerImg">
         <Upload
           type="bannerImg"
@@ -85,6 +103,7 @@ export default {
     return {
         loading:false,
         setQuery: {
+          platformType:'',
           "bannerImg": "",
           "bannerName": "",
           "id": 0,
@@ -102,6 +121,7 @@ export default {
     rules() {
       if(this.setQuery.jumpSet == 1){
         return {
+        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
         bannerImg: [{ required: true, message: "请上传banner图", trigger: "change" }],
         bannerName: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
         colour: [{ required: true, message: "请输入banner主题色", trigger: "blur" }],
@@ -110,6 +130,7 @@ export default {
       }
       }else{
          return {
+        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
         bannerImg: [{ required: true, message: "请上传banner图", trigger: "change" }],
         bannerName: [{ required: true, message: "请输入banner名称", trigger: "blur" }],
         colour: [{ required: true, message: "请输入banner主题色", trigger: "blur" }],
@@ -164,6 +185,9 @@ export default {
   },
   created () {
     this.getMenuName()
+    if(this.$route.query.title == '编辑banner'){
+     this.setQuery = JSON.parse(sessionStorage.getItem('bannerItem')) 
+    }
   },
 };
 </script>

+ 47 - 10
src/views/operationManage/bannerManage/index.vue

@@ -23,6 +23,22 @@
             :value="item.value"
           >
           </el-option>
+        </el-select>
+         <el-select
+          v-model="platformType"
+          multiple
+          size="small"
+          clearable
+          class="item-width-200 ml10"
+          placeholder="请选择主商户"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
         </el-select>
         <el-button
         class="ml10"
@@ -73,6 +89,16 @@
        <template slot-scope="scope">
           <span>{{scope.row.menuId |filterMenu(that)}}</span>
         </template>
+      </el-table-column>
+       <el-table-column
+        prop="accountChildType"
+        align="center"
+        label="所属平台"
+        fit
+      >
+      <template slot-scope="scope">
+        {{filterMasterName(scope.row.platformType )}}
+      </template>
       </el-table-column>
       <el-table-column
         prop="jumpUrl"
@@ -125,7 +151,9 @@ export default {
       tableData: [],
       options: [],
       loading: false,
+      platformType:"",
       query: {
+        platformType:null,
         menuId: "",
         bannerName: "",
         currentPage: 1,
@@ -135,14 +163,15 @@ export default {
       total: 0,
     };
   },
-  // watch: {
-  //   query: {
-  //     handler: debounce(function (val) {
-  //       this.bannerList()
-  //     }),
-  //     deep: true,
-  //   },
-  // },
+  watch: {
+    platformType(val) {
+        if(val.length){
+          this.query.platformType = val.join(',')
+        }else{
+          this.query.platformType = null
+        }
+      }
+  },
   filters: {
     filterMenu: function(value,that) {
       let msg
@@ -162,10 +191,18 @@ export default {
     },
     handleEdit(row){
       sessionStorage.setItem('bannerItem',JSON.stringify(row))
-      this.$router.push('/operationManage/bannerManage/editBanner')
+      // this.$router.push('/operationManage/bannerManage/editBanner')
+      this.$router.push({
+        path:'/operationManage/bannerManage/addBanner',
+        query:{
+          title:'编辑banner',
+        }
+      })
     },
     handleAdd(){
-      this.$router.push('/operationManage/bannerManage/addBanner')
+      this.$router.push({
+        path:'/operationManage/bannerManage/addBanner',
+      })
     },
     // 删除
      handleDel(id) {

+ 57 - 8
src/views/operationManage/goodsManage/labelList.vue

@@ -9,6 +9,22 @@
           placeholder="请输入名称"
           class="item-width-200 "
         ></el-input>
+          <el-select
+          v-model="platformType"
+          multiple
+          size="small"
+          clearable
+          class="item-width-200 ml10"
+          placeholder="请选择主商户"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
          <el-button
         class="ml10"
         type="primary"
@@ -54,6 +70,17 @@
         show-overflow-tooltip
       >
       </el-table-column>
+
+      <el-table-column
+        prop="accountChildType"
+        align="center"
+        label="所属平台"
+        fit
+      >
+      <template slot-scope="scope">
+        {{filterMasterName(scope.row.platformType )}}
+      </template>
+      </el-table-column>
       
       <el-table-column
         prop="createTime"
@@ -91,6 +118,23 @@
         :rules="rules"
         label-width="130px"
         >
+          
+        <el-form-item label="标签名称:" prop="labelName">
+            <el-select
+            v-model="setQuery.platformType"
+            clearable
+            class="item-width-300"
+            placeholder="请选择主商户"
+          >
+            <el-option
+              v-for="item in masterShopOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="标签名称:" prop="labelName">
             <el-input
             v-model="setQuery.labelName"
@@ -121,7 +165,9 @@ export default {
       options:[],
       loading: false,
       btnLoading: false,
+      platformType:"",
       query: {
+        platformType:null,
         // labelType: '',
         labelName: "",
         currentPage: 1,
@@ -130,23 +176,26 @@ export default {
       title: "",
       total: 0,
       setQuery:{
+        platformType:"",
         "id": 0,
         "labelName": "",
         "labelType": ''
       },
       rules: {
+        platformType: [{ required: true, message: "请选择主商户", trigger: "change" }],
         labelName: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
       },
     };
   },
-  // watch: {
-  //   query: {
-  //     handler: debounce(function (val) {
-  //       this.getList()
-  //     }),
-  //     deep: true,
-  //   },
-  // },
+   watch: {
+    platformType(val) {
+        if(val.length){
+          this.query.platformType = val.join(',')
+        }else{
+          this.query.platformType = null
+        }
+      }
+  },
   methods: {
     handleSearch(){
       this.query.currentPage = 1

+ 27 - 8
src/views/operationManage/shopManage/index.vue

@@ -9,6 +9,22 @@
           placeholder="请输入门店名称或账号"
           class="item-width-200"
         ></el-input>
+         <el-select
+          v-model="platformType"
+          multiple
+          size="small"
+          clearable
+          class="item-width-200 ml10"
+          placeholder="请选择主商户"
+        >
+          <el-option
+            v-for="item in masterShopOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
         <el-select
           v-model="query.shopMenuId"
           size="small"
@@ -229,7 +245,9 @@ export default {
         },
       ],
       loading: false,
+      platformType:'',
       query: {
+        platformType:null,
         state: null,
         province: "",
         city: "",
@@ -245,14 +263,15 @@ export default {
       total: 0,
     };
   },
-  // watch: {
-  //   query: {
-  //     handler: debounce(function (val) {
-  //       this.getList();
-  //     }),
-  //     deep: true,
-  //   },
-  // },
+  watch: {
+    platformType(val) {
+        if(val.length){
+          this.query.platformType = val.join(',')
+        }else{
+          this.query.platformType = null
+        }
+      }
+  },
   filters: {
     filterType: function(value,that) {
        let msg = ''