Merge branch 'pyq_goods' into 'dev'

Pyq goods

See merge request bp/op-web-service!14

src/pages/Goods/Retail/index.vue

@@ -26,7 +26,7 @@
               <el-input v-model="retailActivitie.marketing_name"></el-input>
             </el-form-item>
             <el-form-item label="商品id">
-              <el-input v-model="retailActivitie.goods_sku_id"></el-input>
+              <el-input v-model="retailActivitie.goods_spu_id"></el-input>
             </el-form-item>
             <el-form-item label="状态">
               <el-select
@@ -280,7 +280,7 @@
               <el-form-item label="关联商品:"> </el-form-item>
               <el-form-item label="商品id:">
                 <el-input
-                  v-model="ruleIdForm.goods_sku_id"
+                  v-model="ruleIdForm.goods_spu_id"
                   :disabled="shopStart !== 0"
                 ></el-input>
               </el-form-item>
@@ -315,7 +315,7 @@
                 </el-table-column>
                 <el-table-column
                   align="center"
-                  prop="goods_sku_id"
+                  prop="goods_spu_id"
                   label="商品id"
                 >
                 </el-table-column>
@@ -424,7 +424,7 @@ export default {
       retailActivitie: {
         marketing_id: "",
         marketing_name: "",
-        goods_sku_id: "",
+        goods_spu_id: "",
         online_status: [],
         page: 1,
         page_size: 20,
@@ -437,12 +437,12 @@ export default {
         second_commission_value: "",
         start_time: "",
         end_time: "",
-        goods_sku_id: [],
+        goods_spu_id: [],
       },
       timeSelect: [],
       ruleIdForm: {
         life_account_id: "",
-        goods_sku_id: "",
+        goods_spu_id: "",
         start_time: "",
         end_time: "",
       },
@@ -588,7 +588,7 @@ export default {
     // 查询商品列表
     async findProducts () {
       // 获取参数
-      const { goods_sku_id, life_account_id } = this.ruleIdForm;
+      const { goods_spu_id, life_account_id } = this.ruleIdForm;
       let [start_time, end_time] = this.timeSelect;
       if (start_time && end_time) {
         start_time = this.formatTime(start_time);
@@ -600,7 +600,7 @@ export default {
       // console.log(start_time, end_time);
       // 整理参数
       const ruleIdForm = {
-        goods_sku_id,
+        goods_spu_id,
         life_account_id,
         start_time,
         end_time,
@@ -687,13 +687,13 @@ export default {
         second_commission_value: "",
         start_time: "",
         end_time: "",
-        goods_sku_id: [],
+        goods_spu_id: [],
       }),
         (this.timeSelect = []),
         (this.goods_list = []),
         (this.ruleIdForm = {
           life_account_id: "",
-          goods_sku_id: "",
+          goods_spu_id: "",
           start_time: "",
           end_time: "",
         });