YY 2 years ago
parent
commit
13c50a5654

+ 1 - 12
src/views/platActivi/act/parts/goods.vue

@@ -20,12 +20,9 @@
             <el-col :span="24" class="thr">
             <el-col :span="24" class="thr">
               <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
               <el-button type="primary" size="mini" @click="toAdd()">新增</el-button>
             </el-col>
             </el-col>
-            <el-col :span="24" class="four" v-if="type != '3' && type != '2'">
+            <el-col :span="24" class="four" v-if="type != '3'">
               <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @del="toDel" @set="toSet"> </data-table>
               <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @del="toDel" @set="toSet"> </data-table>
             </el-col>
             </el-col>
-            <el-col :span="24" class="four" v-if="type == '2'">
-              <data-table :fields="giftFields" :opera="opera" @query="search" :data="list" :total="total" @del="toDel" @set="toSet"> </data-table>
-            </el-col>
             <el-col :span="24" class="four" v-if="type == '3'">
             <el-col :span="24" class="four" v-if="type == '3'">
               <data-table :fields="spFields" :opera="opera" @query="search" :data="list" :total="total" @del="toDel" @set="toSet"> </data-table>
               <data-table :fields="spFields" :opera="opera" @query="search" :data="list" :total="total" @del="toDel" @set="toSet"> </data-table>
             </el-col>
             </el-col>
@@ -82,14 +79,6 @@ export default {
         { label: '店铺名称', model: 'shop_name' },
         { label: '店铺名称', model: 'shop_name' },
         { label: '商品原价', model: 'sell_money' },
         { label: '商品原价', model: 'sell_money' },
       ],
       ],
-      // 买赠
-      giftFields: [
-        { label: '商品名称', model: 'goods_name', showTip: false },
-        { label: '商品规格', model: 'spec_name', showTip: false },
-        { label: '店铺名称', model: 'shop_name' },
-        { label: '商品原价', model: 'sell_money' },
-        { label: '赠品数量', model: 'config.gift.length' },
-      ],
       // 特价
       // 特价
       spFields: [
       spFields: [
         { label: '商品名称', model: 'goods_name', showTip: false },
         { label: '商品名称', model: 'goods_name', showTip: false },

+ 1 - 3
src/views/platmanag/goodsTags/index.vue

@@ -141,9 +141,7 @@ export default {
       this.levelList.push(id);
       this.levelList.push(id);
       let data = this.data;
       let data = this.data;
       let res = await this.fetch(id);
       let res = await this.fetch(id);
-      if (this.$checkRes(res)) {
-        data.push(res.data);
-      }
+      if (this.$checkRes(res)) data.push(res.data);
       this.search();
       this.search();
     },
     },
     backLevel() {
     backLevel() {