商家端渠道优惠券管理、拼团、秒杀等营销活动模块前端布局页面调整

package.json

@@ -4,7 +4,7 @@
   "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
   "author": "Pan <panfree23@gmail.com>",
   "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
+    "dev": "vue-cli-service serve",
     "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
     "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",

src/views/marketing/channelCoupons/components/couponSelect.vue

@@ -104,7 +104,8 @@ export default {
       params: {
         page: 1,
         pageSize: 10,
-        search: ''
+        search: '',
+        shopId: undefined
       },
       tableData: [],
       total: 0
@@ -116,7 +117,7 @@ export default {
     }
   },
   mounted() {
-    this.params.shopId = parseInt(getShopId())
+    // this.params.shopId = parseInt(getShopId())
     this.getTableData()
   },
   methods: {

src/views/marketing/channelCoupons/components/productSelect.vue

@@ -65,6 +65,10 @@
         prop="number"
         label="销量"
       />
+      <el-table-column
+        prop="shopName"
+        label="所属店铺"
+      />
     </el-table>
     <el-pagination
       :current-page="params.currentPage"
@@ -108,7 +112,7 @@ export default {
         search: '',
         page: 1,
         pageSize: 10,
-        shopId: 0,
+        shopId: undefined,
         shelveState: 1
       },
       total: 0,
@@ -117,7 +121,7 @@ export default {
     }
   },
   mounted() {
-    this.params.shopId = parseInt(getShopId())
+    //this.params.shopId = parseInt(getShopId())
   },
   methods: {
     // 获取产品信息
@@ -127,7 +131,6 @@ export default {
         // this.params.cid = citem.shopCouponId
         this.params.shopCouponId = citem.shopCouponId
       }
-      console.log(this.params, 'this.params')
       const res = await getProducts(this.params)
       this.visible = true
       this.loading = false

src/views/marketing/channelCoupons/form.vue

@@ -39,7 +39,7 @@ export default {
         search: '',
         page: 1,
         pageSize: 10,
-        shopId: 0,
+        shopId: undefined,
         shelveState: 1
       }
       this.$refs.productSelect.tableData = []
@@ -48,16 +48,16 @@ export default {
         search: '',
         page: 1,
         pageSize: 10,
-        shopId: 0,
+        shopId: undefined,
         shelveState: 1
       }
       this.$refs.couponSelect.getTableData()
     },
     // 打开弹出窗
     show(row) {
-      this.form = {
+      /*this.form = {
         shopId: parseInt(getShopId())
-      }
+      }*/
       this.visible = true
     },
     // 取消

src/views/marketing/channelCoupons/index.vue

@@ -143,14 +143,14 @@ export default {
       tableData: [],
       currentPage: 1,
       getLinkLoading: '',
-      shopId: 0,
+      shopId: undefined,
       dialogVisible: false,
       linkData: ''
     }
   },
   mounted() {
-    this.shopId = parseInt(getShopId())
-    this.formInline.shopId = this.shopId
+    /*this.shopId = parseInt(getShopId())
+    this.formInline.shopId = this.shopId*/
     this.getAll()
   },
   // 方法集合

src/views/marketing/group/add.vue

@@ -61,7 +61,7 @@
     <el-dialog
       :title="visitDetail ? '查看商品' : '选择商品'"
       :visible.sync="isVisible"
-      width="55%"
+      width="80%"
       top="50px"
       class="group-dialog"
       :close-on-click-modal="false"
@@ -70,6 +70,10 @@
     >
       <!-- 表格 -->
       <div class="tableBox">
+        <div style="margin-bottom: 15px">
+          <el-input v-model="prodSearch" :placeholder="$t('product.productname_hint')" style="width: 360px"/>
+          <el-button type="primary" style="margin-left: 8px" @click="searchProd">{{$t('common.query')}}</el-button>
+        </div>
         <el-table
           ref="multipleTable"
           :data="tableData"
@@ -102,6 +106,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
+          <el-table-column prop="shopName" label="所属店铺"  show-overflow-tooltip />
           <!--          <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
           <!--            <template slot-scope="scope">-->
           <!--              <div class="btnList">-->
@@ -189,7 +194,8 @@ export default {
       multipleSelection: [],
       roleList: [],
       isVisible: false, // 选择商品弹窗
-      inputGroupTableData: []
+      inputGroupTableData: [],
+      prodSearch: undefined
     }
   },
   watch: {
@@ -388,6 +394,12 @@ export default {
         })
       })
       this.dateInfo = [this.addForm.startTime, this.addForm.endTime]
+    },
+    searchProd() {
+      this.proOption.page = 1
+      this.proOption.pageSize = 10
+      this.proOption.searchContent = this.prodSearch
+      this.getProList()
     }
   }
 }

src/views/marketing/spike/add.vue

@@ -67,8 +67,15 @@
       :modal-append-to-body="false"
       :modal="false"
     >
+
       <!-- 表格 -->
       <div class="tableBox">
+
+        <div style="margin-bottom: 15px">
+          <el-input v-model="prodSearch" :placeholder="$t('product.productname_hint')" style="width: 360px"/>
+          <el-button type="primary" style="margin-left: 8px" @click="searchProd">{{$t('common.query')}}</el-button>
+        </div>
+
         <el-table
           ref="multipleTable"
           :data="tableData"
@@ -192,6 +199,7 @@ export default {
       roleList: [],
       isVisible: false, // 选择商品弹窗
       inputSpikeTableData: [],
+      prodSearch: undefined
     }
   },
   watch: {
@@ -400,6 +408,13 @@ export default {
     },
     // 删除
     deleteSeckillFn() {
+    },
+
+    searchProd() {
+      this.proOption.page = 1
+      this.proOption.pageSize = 10
+      this.proOption.searchContent = this.prodSearch
+      this.getProList()
     }
   }
 }
@@ -409,7 +424,7 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .addGroupBuy {
   padding: 0px;
- 
+
   .formBox {
     margin-top: 20px;
     .flexBox {