From 882e222c5ad25e2c9aa4c74427ecd485c74b9c7a Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 24 May 2021 18:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/assets/images/geted.png             | Bin 1550 -> 4495 bytes
 buyer/src/pages/payment/Pay.vue               |  52 ++++++++++---
 seller/src/views/lili-dialog/goods-dialog.vue |  37 ++++++---
 seller/src/views/lili-dialog/index.vue        |  28 ++-----
 seller/src/views/promotion/coupon/coupon.vue  |   6 +-
 .../views/promotion/coupon/couponPublish.vue  |  22 +++---
 .../src/views/promotion/fullCut/fullCut.vue   |   4 +-
 .../views/promotion/fullCut/newFullCut.vue    |  38 ++++-----
 .../src/views/promotion/pintuan/pintuan.vue   |   4 +-
 .../views/promotion/pintuan/pintuanGoods.vue  |  33 ++++----
 .../src/views/promotion/seckill/seckill.vue   |   1 +
 .../views/promotion/seckill/seckillGoods.vue  |  73 +++++++++---------
 12 files changed, 164 insertions(+), 134 deletions(-)

diff --git a/buyer/src/assets/images/geted.png b/buyer/src/assets/images/geted.png
index 9bab88c61c80e3631ab34ce4f8ac879870db3582..0dc683c07e105e82df11d7f0ef60d8b7d97ef961 100644
GIT binary patch
literal 4495
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
WNzkd+bCcWr%f!OW23Kk7b^0I2-i-bL

delta 1544
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

diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index 79dcbc9a..0ae2f84d 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -116,11 +116,13 @@
                             <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
                             <span class="describe">满{{item.consumeThreshold}}元可用</span>
                         </div>
-                        <p>使用范围：{{useScope(item.scopeType)}}</p>
-                        <p>有效期：{{item.endTime}}</p>
+                          <p>使用范围：{{useScope(item.scopeType)}}</p>
+                          <p>有效期：{{item.endTime}}</p>
                         </div>
+                        <img class="used" v-if="usedCouponId.includes(item.id)" src="../../assets/images/geted.png" alt="">
                         <b></b>
-                        <a class="c-right" @click="useCoupon(item.id)">立即使用</a>
+                        <a class="c-right" @click="useCoupon(item.id, true)">立即使用</a>
+                        <a class="c-right" v-if="usedCouponId.includes(item.id)" @click="useCoupon(item.id, false)">放弃优惠</a>
                         <i class="circle-top"></i>
                         <i class="circle-bottom"></i>
                     </li>
@@ -207,7 +209,9 @@ export default {
       moreAddr: false, // 更多地址
       canUseCouponNum: 0, // 可用优惠券数量
       couponList: [], // 可用优惠券列表
-      logoImg: '' // 平台logo
+      logoImg: '', // 平台logo
+      usedCouponId: [], // 已使用优惠券id
+      selectedCoupon: {} // 已选优惠券对象
     };
   },
   mounted () {
@@ -250,7 +254,10 @@ export default {
           this.goodsList = res.result.cartList;
           this.priceDetailDTO = res.result.priceDetailDTO;
           this.skuList = res.result.skuList;
-          let notSupArea = res.result.notSupportFreight
+          let notSupArea = res.result.notSupportFreight;
+          this.selectedCoupon = {}
+          if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon
+          Object.assign(this.selectedCoupon, res.result.storeCoupons)
           if (notSupArea) {
             let content = [];
             let title = ''
@@ -295,8 +302,22 @@ export default {
             storeId: storeArr.toString(),
             totalPrice: this.priceDetailDTO.goodsPrice
           }
-          canUseCouponList(params).then(res => {
+          canUseCouponList(params).then(res => { // 可用优惠券列表
             if (res.success) this.couponList = res.result.records
+            const couponKeys = Object.keys(this.selectedCoupon)
+            this.usedCouponId = []
+            if (couponKeys.length) {
+              this.couponList.forEach(e => {
+                if (e.id === this.selectedCoupon[couponKeys].memberCoupon.id) {
+                  this.usedCouponId.push(e.id)
+                } 
+              })
+              this.$nextTick(() => {
+                this.$forceUpdate()
+              })
+            }
+            
+            
           })
         }
       })
@@ -361,16 +382,14 @@ export default {
 
       });
     },
-    useCoupon (id) { // 使用优惠券
+    useCoupon (id, used) { // 使用优惠券
       let params = {
         way: this.$route.query.way,
         memberCouponId: id,
-        used: true
+        used: used  // true 为使用， false为弃用
       }
       selectCoupon(params).then(res => {
-        if (res.success) {
-          this.init()
-        }
+        if (res.success) this.init()
       })
     },
     editInvoice () { // 编辑发票信息
@@ -774,5 +793,16 @@ export default {
     .circle-top,.circle-bottom{
         right: 22px;
     }
+    .used {
+      position: absolute;
+      top: 60px;
+      right: 40px;
+      width: 50px;
+      height: 50px;
+    }
+}
+.coupon-list {
+  max-height: 260px;
+  overflow: scroll;
 }
 </style>
diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue
index b3064aa1..9703e8c5 100644
--- a/seller/src/views/lili-dialog/goods-dialog.vue
+++ b/seller/src/views/lili-dialog/goods-dialog.vue
@@ -41,12 +41,17 @@
 <script>
 import * as API_Goods from "@/api/goods";
 export default {
-  data() {
+  props: {
+    selectedWay: {
+      type: Array,
+      default: new Array()
+    }
+  },
+  data () {
     return {
       type: "multiple", //单选或者多选 single  multiple
 
       cateList: [], // 商品分类列表
-      selectedWay: [], //选中商品集合
       total: "", // 商品总数
       goodsParams: { // 请求商品列表参数
         pageNumber: 1,
@@ -64,18 +69,17 @@ export default {
       loading: false, // 商品加载loading
     };
   },
-  props: ["clearFlag"],
   watch: {
     category(val) {
       this.goodsParams.categoryPath = val[2];
     },
     selectedWay: {
-      handler() {
+      handler(val) {
         this.$emit("selected", this.selectedWay);
       },
       deep: true,
+      immediate: true
     },
-
     "goodsParams.categoryPath": {
       handler: function () {
         this.goodsData = [];
@@ -88,7 +92,7 @@ export default {
     this.init();
   },
   methods: {
-    handleReachBottom() {
+    handleReachBottom() { // 页面触底触发加载
       setTimeout(() => {
         if (
           this.goodsParams.pageNumber * this.goodsParams.pageSize <=
@@ -99,17 +103,24 @@ export default {
         }
       }, 1500);
     },
-    getQueryGoodsList() {
+    getQueryGoodsList() { // 根据商品分类筛选商品
       API_Goods.getGoodsSkuData(this.goodsParams).then((res) => {
         this.initGoods(res);
       });
     },
 
-    initGoods(res) {
+    initGoods(res) { // 获取商品列表
       if (res.result.records.length !=0) {
-        res.result.records.forEach((item) => {
+        let data = res.result.records;
+        data.forEach((item) => {
           item.selected = false;
           item.___type = "goods"; //设置为goods让pc wap知道标识
+
+          this.selectedWay.forEach(e => {
+            if (e.id === item.id) {
+              item.selected = true 
+            }
+          })
         });
         /**
          * 解决数据请求中，滚动栏会一直上下跳动
@@ -141,7 +152,6 @@ export default {
     deepGroup(val) {
       val.forEach((item) => {
         let childWay = []; //第二级
-        let grandWay = []; //第三级
         // 第二层
         if (item.children) {
           item.children.forEach((child) => {
@@ -196,7 +206,12 @@ 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;
+          }
+        }
       }
     },
   },
diff --git a/seller/src/views/lili-dialog/index.vue b/seller/src/views/lili-dialog/index.vue
index ec565191..e9d748ff 100644
--- a/seller/src/views/lili-dialog/index.vue
+++ b/seller/src/views/lili-dialog/index.vue
@@ -10,20 +10,13 @@
     scrollable
   >
     <goodsDialog
-      @selected="
-        (val) => {
-          goodsData = val;
-        }
-      "
+      @selected="(val) => {goodsData = val;}"
+      :selectedWay='goodsData'
       ref="goodsDialog"
       v-if="goodsFlag"
     />
     <linkDialog
-      @selectedLink="
-        (val) => {
-          linkData = val;
-        }
-      "
+      @selectedLink="(val) => {linkData = val;}"
       v-else
       class="linkDialog"
     />
@@ -41,14 +34,11 @@ export default {
     return {
       title: "选择", // 模态框标题
       goodsFlag: false, // 是否商品选择器
-      goodsData: "", //选择的商品
+      goodsData: [], //选择的商品
       linkData: "", //选择的链接
       flag: false, // 控制模态框显隐
     };
   },
-  props: ["types"],
-  watch: {},
-  mounted() {},
   methods: {
     // 关闭弹窗
     clickClose() {
@@ -58,7 +48,6 @@ export default {
 
     // 单选商品
     singleGoods(){
-
       var timer = setInterval(() => {
         if (this.$refs.goodsDialog) {
 
@@ -66,19 +55,16 @@ export default {
          clearInterval(timer);
         }
       }, 100);
-
-
     },
-    clickOK() {
+    clickOK() { // 确定按钮回调，
       if (this.goodsFlag) {
         this.$emit("selectedGoodsData", this.goodsData);
       } else {
         this.$emit("selectedLink", this.linkData);
       }
       this.clickClose();
-      // this.clearFlag = false
     },
-    open(type){
+    open (type) { // 父组件通过ref调用，打开商品选择器
       this.flag = true;
       if(type == 'goods'){
         this.goodsFlag = true;
@@ -87,7 +73,7 @@ export default {
       }
 
     },
-    close(){
+    close(){ // 关闭组件
       this.flag = false;
     }
   },
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 17de56cc..f8b60bd6 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -223,7 +223,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
@@ -250,9 +250,9 @@ export default {
                   },
                 },
                 text
-              ),
+              )
             ]);
-          },
+          }
         },
         {
           title: "操作",
diff --git a/seller/src/views/promotion/coupon/couponPublish.vue b/seller/src/views/promotion/coupon/couponPublish.vue
index 9d3d5cb9..e9daf0da 100644
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -114,9 +114,8 @@
               v-if="form.scopeType == 'PORTION_GOODS'"
             >
               <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
@@ -466,6 +465,14 @@ export default {
         name: "coupon",
       });
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     changeSelect(e) {
       // 已选商品批量选择
       this.selectedGoods = e;
@@ -497,15 +504,9 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(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,
@@ -515,9 +516,8 @@ export default {
             sellerName: e.sellerName,
             skuId: e.id,
           });
-        }
       });
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getGoodsCategory(e) {
       // 获取级联选择器商品分类id
diff --git a/seller/src/views/promotion/fullCut/fullCut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
index 3a18d8f7..7b9def19 100644
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -140,12 +140,12 @@ export default {
         {
           title: "活动类型",
           slot: "promotionType",
-          minWidth: 60,
+          width: 100,
         },
         {
           title: "活动状态",
           key: "promotionStatus",
-          minWidth: 60,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index 6dee1a8f..9f44bb6d 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -183,7 +183,7 @@
                 style="display: flex; margin-bottom: 10px"
                 v-if="form.promotionStatus == 'NEW'"
               >
-                <Button type="primary" @click="$refs.skuSelect.open('goods')"
+                <Button type="primary" @click="openSkuList"
                   >选择商品</Button
                 >
                 <Button
@@ -376,6 +376,14 @@ export default {
       );
       this.$router.go(-1);
     },
+    openSkuList() { // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
+    },
     getDetail() {
       // 获取活动详情
       getFullDiscountById(this.id).then((res) => {
@@ -496,28 +504,20 @@ export default {
       this.form.promotionGoodsList.splice(index, 1);
     },
     selectedGoodsData(item) {
-      console.log(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,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            thumbnail: e.thumbnail,
-            skuId: e.id,
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          thumbnail: e.thumbnail,
+          skuId: e.id,
+        });
       });
-      console.log(list);
-      this.form.promotionGoodsList.push(...list);
+      this.form.promotionGoodsList = list;
     },
     getCouponList(query) {
       // 优惠券列表
diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue
index be4159a3..e17db15e 100644
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@@ -155,17 +155,15 @@ export default {
         {
           title: "活动开始时间",
           key: "startTime",
-          minWidth: 120
         },
         {
           title: "活动结束时间",
           key: "endTime",
-          minWidth: 120
         },
         {
           title: "状态",
           key: "promotionStatus",
-          minWidth: 100,
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue
index b523b5f8..dd4754ae 100644
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@@ -36,7 +36,7 @@
       </Row>
     </Card>
 
-    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+    <sku-select ref="skuSelect" :goodsData="goodsData" @selectedGoodsData="selectedGoodsData"></sku-select>
   </div>
 </template>
 <script>
@@ -65,7 +65,7 @@ export default {
       data: [], // 表单数据
       total: 0, // 表单数据总数
       status: this.$route.query.status, // 查看还是修改
-      columns: [
+      columns: [ // 活动详情表头
         {
           title: "活动名称",
           key: "promotionName",
@@ -111,7 +111,7 @@ export default {
           },
         },
       ],
-      goodsColumns: [
+      goodsColumns: [ // 活动商品表头
         { type: "selection", width: 60, align: "center" },
         {
           title: "商品名称",
@@ -202,7 +202,6 @@ export default {
 
     handleReset() {
       // 重置
-      // this.$refs.searchForm.resetFields();
       this.searchForm.pageNumber = 0;
       this.searchForm.promotionName = "";
       this.selectDate = null;
@@ -211,7 +210,7 @@ export default {
       this.getDataList();
     },
 
-    clearSelectAll() {
+    clearSelectAll() { // 清空所有已选项
       this.$refs.table.selectAll(false);
     },
     changeSelect(e) {
@@ -220,7 +219,7 @@ export default {
       this.selectCount = e.length;
     },
 
-    getDataList() {
+    getDataList() { // 获取商品列表
       this.loading = true;
       this.searchForm.pintuanId = this.$route.query.id;
 
@@ -233,14 +232,12 @@ export default {
       });
     },
 
-    getPintuanMsg() {
-      // 获取拼团详情
+    getPintuanMsg() { // 获取拼团详情
       getPintuanDetail(this.$route.query.id).then((res) => {
         if (res.success) this.data.push(res.result);
       });
     },
-    delGoods(index) {
-      // 删除商品
+    delGoods(index) { // 删除商品
       this.goodsData.splice(index, 1);
     },
     delAll() { // 批量删除商品
@@ -263,13 +260,9 @@ export default {
       });
     },
     selectedGoodsData(item) { // 选择商品
-      let ids = [];
+      console.log(item);
       let list = [];
-      this.goodsData.forEach((e) => {
-        ids.push(e.skuId);
-      });
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
           list.push({
             goodsName: e.goodsName,
             price: e.price,
@@ -281,15 +274,19 @@ export default {
             skuId: e.id,
             categoryPath: e.categoryPath,
           });
-        }
       });
-      this.goodsData.push(...list);
+      this.goodsData = list;
     },
     openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsData))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
   },
-  mounted() {
+  mounted () {
     this.init();
   },
 };
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
index 49d4ced7..b2448ac9 100644
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -134,6 +134,7 @@ export default {
         {
           title: "状态",
           key: "promotionStatus",
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "default";
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index 074bc207..e9a3dcab 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -318,17 +318,17 @@ export default {
     },
     delGoods(index, id) {
       // 删除商品
-      if (id) {
-        removeSeckillGoods(this.$route.query.id, id).then((res) => {
-          if (res.success) {
-            this.goodsList[this.tabIndex].list.splice(index, 1);
-            this.$Message.success("删除成功！");
-          }
-        });
-      } else {
+      // if (id) {
+      //   removeSeckillGoods(this.$route.query.id, id).then((res) => {
+      //     if (res.success) {
+      //       this.goodsList[this.tabIndex].list.splice(index, 1);
+      //       this.$Message.success("删除成功！");
+      //     }
+      //   });
+      // } else {
         this.goodsList[this.tabIndex].list.splice(index, 1);
         this.$Message.success("删除成功！");
-      }
+      // }
     },
     delAll() {
       if (this.selectCount <= 0) {
@@ -350,43 +350,46 @@ export default {
           ].list.filter((item) => {
             return !ids.includes(item.id);
           });
-          removeSeckillGoods(this.$route.query.id, ids).then((res) => {
-            if (res.success) {
-              this.$Message.success("删除成功！");
-            }
-          });
+          // removeSeckillGoods(this.$route.query.id, ids).then((res) => {
+          //   if (res.success) {
+          //     this.$Message.success("删除成功！");
+          //   }
+          // });
         },
       });
     },
     selectedGoodsData(item) {
       // 选择器添加商品
-      let ids = [];
       let list = [];
-
-      this.goodsList[this.tabIndex].list.forEach((e) => {
-        ids.push(e.skuId);
-      });
+      console.log(item);
       item.forEach((e) => {
-        if (!ids.includes(e.id)) {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            promotionApplyStatus: "",
-            quantity: e.quantity,
-            seckillId: this.$route.query.id,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-            timeLine: this.data[0].hours.split(",")[this.tabIndex],
-          });
-        }
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          promotionApplyStatus: e.promotionApplyStatus || '',
+          quantity: e.quantity,
+          seckillId: this.$route.query.id,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+          timeLine: this.data[0].hours.split(",")[this.tabIndex],
+
+        });
       });
 
-      this.goodsList[this.tabIndex].list.push(...list);
+      this.goodsList[this.tabIndex].list = list;
+      this.$nextTick(()=> {
+        this.$forceUpdate()
+      })
     },
-    openSkuList() {
+    openSkuList() { // 显示商品选择器
       this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.goodsList[this.tabIndex].list))
+      data.forEach(e => {
+        e.id = e.skuId
+      })
+      this.$refs.skuSelect.goodsData = data;
     },
     unixDate(time) {
       // 处理报名截止时间