合并

MrShi

21 小时以前 56d7ebbc6297c306ec7197f29737a59703ca4bda

 mini-program/pages/confirm-order/confirm-order.vue

@@ -263,7 +263,7 @@
            useIntegralCopy: 0,
            useIntegral: 0,
            receiveType: 0,
            couponId: null,
            couponId: -1,
            shopId: null,
            payDetailRequestList: [],
            shopList: [],
@@ -469,6 +469,8 @@
            let arr = this.orderInfo.memberCouponList.filter(item => item.active)
            if (arr.length > 0) {
               this.couponId = arr[0].id
            } else {
               this.couponId = null
            }
            this.show = false
            this.getOrderInfo()
@@ -476,7 +478,11 @@
         // 选择优惠券
         selectCoupon(i) {
            this.orderInfo.memberCouponList.forEach((item, index) => {
               item.active = index === i
               if (index === i) {
                  item.active = !item.active
               } else {
                  item.active = false
               }
            })
         },
         // 获取订单详细信息
@@ -493,7 +499,11 @@
                     res.data.memberCouponList = []
                  } else {
                     res.data.memberCouponList.forEach(item => {
                        item.active = false
                        if (res.data.memberCoupon) {
                           item.active = item.id === res.data.memberCoupon.id
                        } else {
                           item.active = false
                        }
                     })
                  }
                  this.orderInfo = res.data
@@ -1075,6 +1085,11 @@
               flex-direction: column;
               justify-content: space-between;
               .item-info-title {
                  width: 100%;
                  display: -webkit-box;
                  -webkit-box-orient: vertical;
                  -webkit-line-clamp: 2;
                  overflow: hidden;
                  font-weight: 400;
                  font-size: 30rpx;
                  color: #222222;