Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

src/views/modules/product/banner/index.vue

@@ -73,6 +73,22 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="应用">
+              <el-select
+                class="filter-item"
+                style="width: 200px"
+                v-model="formInline.app"
+                placeholder="请选择应用"
+              >
+                <el-option
+                  v-for="item in application"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="$refs.oTable.reload()"
                 >查询</el-button
@@ -146,6 +162,17 @@ export default {
           label: "云店分类",
         },
       ],
+      application: [
+        { label: "用户端", value: 1 },
+        {
+          label: "商家端",
+          value: 2,
+        },
+        {
+          label: "专员端",
+          value: 3,
+        },
+      ],
     };
   },
   created() {
@@ -153,6 +180,7 @@ export default {
       type: 0,
       ownerId: this.shopId,
       module: "shop",
+      app: 1,
     };
     this.$nextTick(() => {
       this.$refs.oTable.reload();
@@ -203,6 +231,8 @@ export default {
       this.formInline = {
         type: 0,
         ownerId: this.shopId,
+        module: "shop",
+        app: 1,
       };
       this.$refs.oTable.reload();
     },

src/views/modules/product/notice/index.vue

@@ -73,6 +73,22 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="应用">
+              <el-select
+                class="filter-item"
+                style="width: 200px"
+                v-model="formInline.app"
+                placeholder="请选择分类类型"
+              >
+                <el-option
+                  v-for="item in application"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="$refs.oTable.reload()"
                 >查询</el-button
@@ -146,6 +162,17 @@ export default {
           label: "云店分类",
         },
       ],
+      application: [
+        { label: "用户端", value: 1 },
+        {
+          label: "商家端",
+          value: 2,
+        },
+        {
+          label: "专员端",
+          value: 3,
+        },
+      ],
     };
   },
   created() {
@@ -153,6 +180,7 @@ export default {
       type: 0,
       targetId: this.shopId,
       position: "3",
+      app: 1,
     };
     this.$nextTick(() => {
       this.$refs.oTable.reload();
@@ -203,6 +231,8 @@ export default {
       this.formInline = {
         type: 0,
         targetId: this.shopId,
+        position: "3",
+        app: 1,
       };
       this.$refs.oTable.reload();
     },