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

src/pages/cart/cart.js

@@ -399,6 +399,16 @@ wxService.page({
             cartList: cartList
           })
          self.editDelOk(skuid) //调用完成 
+          var totalFee = 0
+          // 购物车总金额
+          for (let i = 0; i < cartList.length; i++) {
+            if (cartList[i].checked) {
+              totalFee += cartList[i].price * (cartList[i].count ? cartList[i].count : 1)
+            }
+          }
+          self.setData({
+            shopCartTotalFee: totalFee.toFixed(2)
+          })
         } else if (res.cancel) {
           console.log('用户点击取消')
         }

src/pages/confirmOrder/confirmOrder.js

@@ -20,6 +20,8 @@ wxService.page({
     cityView: '',
     multiIndex: [0, 0, 0],
     selectCityName: ['', ''],
+    currentCoupon: '无可用优惠券',
+    wxAddress: false,
     currentCoupon: '',
     orderPrice: null, // 订单金额
   },
@@ -62,7 +64,9 @@ wxService.page({
 
     this.initCitys()
     // 地址列表
-    this.getAddressList()
+    if (!this.data.wxAddress){
+      this.getAddressList()
+    }
   },
   updateCoupon(e) {
     // faceAmount 抵用多少钱（分） 1 抵用券  2 折扣券
@@ -328,6 +332,7 @@ wxService.page({
           this.setData({
             addressInfo: _defalutAddress
           })
+          console.log(this.data.addressInfo)
         }
       }
     }).finally(() => {
@@ -338,10 +343,16 @@ wxService.page({
     wx.chooseAddress({
       success: (res) => {
         console.log('微信地址', res)
+        res.name = res.userName
+        res.phone = res.telNumber
+        res.fullArea = res.provinceName + res.cityName + res.countyName
+        res.address = res.detailInfo
         this.setData({
           goodsAddress: false,
-          addressInfo: res,
+          wxAddress: true,
+          addressInfo: res
         })
+        console.log('WX---------------------', this.data.addressInfo)
       },
       fail: function (err) {
         console.log(err)