Merge branch 'dev_7.1.0' into fixbug-ZYW

src/pages/confirmOrder/confirmOrder.js

@@ -26,7 +26,8 @@ wxService.page({
     orderInitPrice: 0,
     plusMemberPrice: 0, // plus 默认价
     plusMemberName:'',
-    defalutCoupon: ''
+    defalutCoupon: '',
+    addressId: '' // 收货地址id
   },
 
   /**
@@ -284,7 +285,7 @@ wxService.page({
           wx.hideLoading()
           this.setData({ 
             currentOrderList: data,
-            defalutCoupon: data && data.couponDiscountPreviews && data.couponDiscountPreviews[0].couponDiscount,
+            defalutCoupon: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponDiscount || '',
             orderInitPrice: data.amount
           },()=>{
             // 实付款
@@ -295,11 +296,13 @@ wxService.page({
     })
   },
   handelGobuy() {
-    const { trolleySku2Buy, couponId } = this.data
+    const { trolleySku2Buy, couponId, addressInfo } = this.data
     let params = {
       couponId,
-      trolleySku2Buy
+      trolleySku2Buy,
+      addressId: addressInfo.id
     }
+   
     this.getBill(params) // 下单
   },
   //  下单

src/pages/confirmOrder/confirmOrder.wxml

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

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 44,
 			"list": [
 				{
 					"id": -1,
@@ -334,6 +334,13 @@
 					"pathName": "pages/my_11/my",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/my_11/my",
+					"pathName": "pages/my_11/my",
+					"query": "",
+					"scene": null
 				}
 			]
 		}