From 7e668cc6d5fb01e85c9eeb057a07b4db1d118587 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 25 May 2021 14:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/lili-dialog/goods-dialog.vue    |  24 +++-
 manager/src/views/lili-dialog/index.vue       |   9 +-
 .../promotion/pointsGoods/addPointsGoods.vue  | 129 ++++++++----------
 .../promotion/pointsGoods/pointsGoods.vue     |  11 +-
 .../views/promotion/seckill/seckillGoods.vue  |   2 +-
 5 files changed, 84 insertions(+), 91 deletions(-)

diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index 1f374a8d..ed8cf77a 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -45,8 +45,6 @@ export default {
       type: "multiple", //单选或者多选 single  multiple
 
       skuList: [], // 商品sku列表
-
-      selectedWay: [], //选中商品集合
       total: "",  // 商品总数
       goodsParams: { // 商品请求参数
         pageNumber: 1,
@@ -64,7 +62,12 @@ export default {
       loading: false, // 加载状态
     };
   },
-  props: ["clearFlag"],
+  props: {
+    selectedWay: {
+      type: Array,
+      default: new Array()
+    }
+  },
   watch: {
     category(val) {
       this.goodsParams.categoryPath = val[0];
@@ -74,6 +77,7 @@ export default {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
+      immediate: true
     },
 
     "goodsParams.categoryPath": {
@@ -110,6 +114,11 @@ export default {
         res.result.records.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
+          this.selectedWay.forEach(e => {
+            if (e.id === item.id) {
+              item.selected = true 
+            }
+          })
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
@@ -117,7 +126,6 @@ export default {
         this.total = res.result.total;
         this.goodsData.push(...res.result.records);
 
-        // console.log(this.goodsData);
       } else {
         this.empty = true;
       }
@@ -193,9 +201,13 @@ export default {
         this.selectedWay.push(val);
       } else {
         val.selected = false;
-        this.selectedWay.splice(index, 1);
+        for (let i = 0; i<this.selectedWay.length; i++ ) {
+          if (this.selectedWay[i].id===val.id) {
+            this.selectedWay.splice(i,1)
+            break;
+          }
+        }
       }
-      // console.log(this.selectedWay);
     },
   },
 };
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
index dc8341ec..3c283d43 100644
--- a/manager/src/views/lili-dialog/index.vue
+++ b/manager/src/views/lili-dialog/index.vue
@@ -1,10 +1,7 @@
 <template>
   <Modal :styles="{ top: '120px' }" width="1160" @on-cancel="clickClose" @on-ok="clickOK" v-model="flag" :mask-closable="false" scrollable>
-    <goodsDialog @selected="
-        (val) => {
-          goodsData = val;
-        }
-      " v-if="goodsFlag" ref="goodsDialog" />
+    <goodsDialog @selected="(val) => {goodsData = val;}" 
+      v-if="goodsFlag" ref="goodsDialog" :selectedWay='goodsData'/>
     <linkDialog @selectedLink="
         (val) => {
           linkData = val;
@@ -23,7 +20,7 @@ export default {
   data() {
     return {
       goodsFlag: false, // 是否商品选择器
-      goodsData: "", //选择的商品
+      goodsData: [], //选择的商品
       linkData: "", //选择的链接
       flag: false, // modal显隐
     };
diff --git a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
index 895f23c7..3e4244f0 100644
--- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
@@ -7,9 +7,7 @@
           <div class="form-item-view">
             <FormItem astyle="width: 100%">
               <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
-                  >选择商品</Button
-                >
+                <Button type="primary" @click="openSkuList">选择商品</Button>
                 <Button
                   type="error"
                   ghost
@@ -20,22 +18,19 @@
               </div>
               <Table
                 border
+                v-if="showTable"
                 :columns="columns"
-                :data="form.promotionGoodsList"
+                :data="promotionGoodsList"
                 @on-selection-change="changeSelect"
               >
                 <template slot-scope="{ row }" slot="skuId">
                   <div>{{ row.skuId }}</div>
                 </template>
 
-                <template slot-scope="{ row, index }" slot="settlementPrice">
+                <template slot-scope="{ index }" slot="settlementPrice">
                   <Input
                     type="number"
-                    v-model="row.settlementPrice"
-                    @input="
-                      pointsGoodsList[index].settlementPrice =
-                        row.settlementPrice
-                    "
+                    v-model="promotionGoodsList[index].settlementPrice"
                   />
                 </template>
 
@@ -44,7 +39,7 @@
                   slot="pointsGoodsCategory"
                 >
                   <Select
-                    v-model="pointsGoodsList[index].pointsGoodsCategoryId"
+                    v-model="promotionGoodsList[index].pointsGoodsCategoryId"
                     transfer="true"
                     label-in-value="true"
                     @on-change="
@@ -62,21 +57,17 @@
                   </Select>
                 </template>
 
-                <template slot-scope="{ row, index }" slot="activeStock">
+                <template slot-scope="{ index }" slot="activeStock">
                   <Input
                     type="number"
-                    v-model="row.activeStock"
-                    @input="
-                      pointsGoodsList[index].activeStock = row.activeStock
-                    "
+                    v-model="promotionGoodsList[index].activeStock"
                   />
                 </template>
 
-                <template slot-scope="{ row, index }" slot="points">
+                <template slot-scope="{ index }" slot="points">
                   <Input
                     type="number"
-                    v-model="row.points"
-                    @input="pointsGoodsList[index].points = row.points"
+                    v-model="promotionGoodsList[index].points"
                   />
                 </template>
               </Table>
@@ -151,22 +142,10 @@ export default {
     };
     return {
       form: {
-        /** 店铺承担比例 */
-        sellerCommission: 0,
-        /** 发行数量 */
-        publishNum: 1,
-        /** 运费承担者 */
-        scopeType: "ALL",
-        /** 限领数量 */
-        couponLimitNum: 1,
-        /** 活动类型 */
-        couponType: "PRICE",
-        /** 优惠券名称 */
-        couponName: "",
-        getType: "FREE",
-        promotionGoodsList: [],
+        promotionGoodsList: [], // 活动商品列表
       },
-      pointsGoodsList: [], // 积分商品列表
+      showTable: true,
+      promotionGoodsList: [], // 活动商品列表
       categoryList: [], // 分类列表
       submitLoading: false, // 添加或编辑提交状态
       selectedGoods: [], // 已选商品列表，便于删除
@@ -226,6 +205,12 @@ export default {
           title: "商品名称",
           key: "goodsName",
           minWidth: 120,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.goodsName
+            );
+          },
         },
         {
           title: "SKU编码",
@@ -236,6 +221,12 @@ export default {
           title: "店铺名称",
           key: "storeName",
           minWidth: 60,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.storeName
+            );
+          },
         },
         {
           title: "商品价格",
@@ -244,7 +235,7 @@ export default {
           render: (h, params) => {
             return h(
               "div",
-              this.$options.filters.unitPrice(params.row.price, "￥")
+              this.$options.filters.unitPrice(params.row.goodsSku.price, "￥")
             );
           },
         },
@@ -252,6 +243,12 @@ export default {
           title: "库存",
           key: "quantity",
           minWidth: 20,
+          render: (h, params) => {
+            return h(
+              "div",
+              params.row.goodsSku.quantity
+            );
+          },
         },
         {
           title: "结算价格",
@@ -313,11 +310,11 @@ export default {
       let res = await getPointsGoodsCategoryList();
       this.categoryList = res.result.records;
     },
-    /** 保存平台优惠券 */
+    /** 保存积分商品 */
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          let params = this.pointsGoodsList;
+          let params = this.promotionGoodsList;
           const start = this.$options.filters.unixToDate(
             this.form.startTime / 1000
           );
@@ -355,7 +352,8 @@ export default {
       this.$router.go(-1);
     },
     changeCategory(val, index) {
-      this.pointsGoodsList[index].pointsGoodsCategoryName = val.label;
+      this.promotionGoodsList[index].pointsGoodsCategoryName = val.label;
+      console.log(this.promotionGoodsList);
     },
     changeSelect(e) {
       // 已选商品批量选择
@@ -363,7 +361,7 @@ export default {
     },
     delSelectGoods() {
       // 多选删除商品
-      if (this.pointsGoodsList.length <= 0) {
+      if (this.selectedGoods.length <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;
       }
@@ -375,55 +373,42 @@ export default {
           this.selectedGoods.forEach(function (e) {
             ids.push(e.id);
           });
-          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+          this.promotionGoodsList = this.promotionGoodsList.filter(
             (item) => {
               return !ids.includes(item.id);
             }
           );
-          this.pointsGoodsList = this.pointsGoodsList.filter((item) => {
-            return !ids.includes(item.id);
-          });
         },
       });
     },
     delGoods(index) {
       // 删除商品
-      this.form.promotionGoodsList.splice(index, 1);
-      this.pointsGoodsList.splice(index, 1);
+      this.promotionGoodsList.splice(index, 1);
+    },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
     selectedGoodsData(item) {
       // 回显已选商品
-      let ids = [];
       let list = [];
-      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-            ...e,
-          });
-          this.pointsGoodsList.push({
-            settlementPrice: 0,
-            pointsGoodsCategoryId: 0,
-            pointsGoodsCategoryName: "",
-            activeStock: 0,
-            points: 0,
-            goodsSku: {
-              ...e,
-            },
-            skuId: e.id,
-          });
+        const obj = {
+          settlementPrice: e.settlementPrice || 0,
+          pointsGoodsCategoryId: e.pointsGoodsCategoryId || 0,
+          pointsGoodsCategoryName:e.pointsGoodsCategoryName || "",
+          activeStock:e.activeStock || 0,
+          points:e.points || 0,
+          skuId: e.id,
+          goodsSku: e.goodsSku || e
         }
+        list.push(obj);
       });
-      this.form.promotionGoodsList.push(...list);
+      this.promotionGoodsList = list;
     },
   },
 };
diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
index 3ea6a2a2..09dd78b7 100644
--- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue
@@ -127,7 +127,7 @@
       </Row>
       <Row type="flex" justify="end" class="page">
         <Page
-          :current="searchForm.pageNumber + 1"
+          :current="searchForm.pageNumber"
           :total="total"
           :page-size="searchForm.pageSize"
           @on-change="changePage"
@@ -157,7 +157,7 @@ export default {
       loading: true, // 表单加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 0, // 当前页数
+        pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
         order: "desc", // 默认排序方式
       },
@@ -248,18 +248,17 @@ export default {
       this.$router.push({ name: "add-points-goods" });
     },
     changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
       this.getDataList();
-      this.clearSelectAll();
     },
     changePageSize(v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
     handleSearch() {
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
-      if (this.searchForm.pointsS !== "") {
+      if (this.searchForm.pointsS) {
         this.searchForm.points =
           this.searchForm.pointsS +
           "_" +
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index e9a3dcab..e20cda2b 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -330,7 +330,7 @@ export default {
         this.$Message.success("删除成功！");
       // }
     },
-    delAll() {
+    delAll() { // 删除当前时段全部数据
       if (this.selectCount <= 0) {
         this.$Message.warning("您还未选择要删除的数据");
         return;