Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

src/component/selectCoupon/selectCoupon.js

@@ -37,14 +37,17 @@ Component({
       const { couponList } = this.data
       if (couponList.length) {
         couponList.map(coupon => {
+          console.log('22222', coupon)
           coupon.couponDTOS.forEach(item => {
             item.checked = false
+            item.couponDiscount = coupon.couponDiscount
             item.title = coupon.couponSettingDTO.title
             item.type = coupon.couponSettingDTO.type
             item.faceAmount = coupon.couponSettingDTO.faceAmount
             item.takeCouponBgimg = coupon.couponSettingDetailDTO.style.takeCouponBgimg
             // notice 格式
             item.newNotice = JSON.parse(item.notice)
+            console.log('11111', item)
             for (let i in item.newNotice) {
               if (item.newNotice[i].type == 1) {
                 item.newNotice[i].value = item.startTime.substring(0, 10) + ' 至 ' + item.endTime.substring(0, 10)
@@ -67,7 +70,7 @@ Component({
     },
     selectCoupon(e) {
       // 1 抵用券  2 折扣券 
-      const { id, index, type, amount } = e.currentTarget.dataset
+      const { id, index, type, amount, couponDiscount} = e.currentTarget.dataset
       const { newConponOrderList } = this.data
 
       newConponOrderList.forEach(item => {
@@ -77,7 +80,8 @@ Component({
       let params = {
         type,
         id,
-        faceAmount: amount
+        faceAmount: amount,
+        couponDiscount: couponDiscount
       }
 
       wxService.nextTick(() => {

src/component/selectCoupon/selectCoupon.wxml

@@ -19,6 +19,7 @@
 				 data-id="{{coupon.id}}"
 				 data-index="{{index}}"
 				 data-type="{{coupon.type}}"
+         data-coupon-discount="{{coupon.couponDiscount}}"
 				 data-amount="{{coupon.faceAmount}}"
 				 bindtap="selectCoupon"
 				>

src/pages/confirmOrder/confirmOrder.js

@@ -89,8 +89,12 @@ wxService.page({
   },
   updateCoupon(e) {
     // faceAmount 抵用多少钱（分） 1 抵用券  2 折扣券
-    const { faceAmount, type, id } = e.detail
+    console.log('detail', e.detail)
+    const { faceAmount, type, id, couponDiscount } = e.detail
     const { orderPrice } = this.data
+    console.log('detail2222222', e.detail)
+    console.log('orderPrice', this.data)
+
 
     if (type == 1) {
       this.setData({
@@ -99,15 +103,16 @@ wxService.page({
         currentCoupon: `${faceAmount / 100} 元`
       })
     } else if (type == 2) {
-      let discounPrice = (faceAmount / 100) * (orderPrice)
-      let spread = Math.round(orderPrice - discounPrice)
+      // let discounPrice = (faceAmount / 100) * (orderPrice)
+      // let spread = Math.round(orderPrice - discounPrice)
 
       this.setData({
         couponId: id,
         haveCoupon: true,
-        currentCoupon: `${spread} 元`
+        currentCoupon: `${couponDiscount} 元`
       })
     }
+   
     // 实付款
     this.setPayPrice()
   },
@@ -116,7 +121,7 @@ wxService.page({
     let newCurrentCoupon = currentCoupon ? currentCoupon : 0
     let orderCoupon = parseFloat(newCurrentCoupon) // 优惠券价格
     let plusPrice = isSelect ? plusMemberPrice : 0 // plus
-    let calCouponPrice = defalutCoupon ? defalutCoupon : orderCoupon
+    let calCouponPrice = orderCoupon ? orderCoupon : defalutCoupon
 
     // 实际价格 - 优惠价 + plus
     this.setData({
@@ -329,10 +334,9 @@ wxService.page({
             noSelectPrice: sum
           })
          }
-        
           this.setData({
             currentOrderList: data,
-            defalutCoupon: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponDiscount || '',
+            defalutCoupon: data.couponDiscountPreviews[0].couponSettingDTO.type == 1 ? data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDiscount,
             defalutCouponId: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDTOS[0] && data.couponDiscountPreviews[0].couponDTOS[0].id || '',
             orderInitPrice: data.amount
           }, () => {

src/pages/confirmOrder/confirmOrder.wxml

@@ -130,7 +130,7 @@
 					<view>
 						<text class="price-label">优惠券</text>
 						<view class="select-coupon" bindtap="selectCoupon">
-							<text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}"> {{defalutCoupon?'-': '无可用优惠券'}}{{currentCoupon ? currentCoupon : defalutCoupon}}</text>
+							<text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}"> {{defalutCoupon ? '-': '无可用优惠券'}}{{currentCoupon ? currentCoupon : defalutCoupon}}</text>
 							<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 						</view>
 					</view>