preview_addressId

src/pages/confirmOrder/confirmOrder.js

@@ -25,7 +25,7 @@ wxService.page({
     orderPrice: null, // 订单金额
     orderInitPrice: 0,
     plusMemberPrice: 0, // plus 默认价
-    plusMemberName:'',
+    plusMemberName: '',
     defalutCoupon: '',
     addressId: '', // 收货地址id
     showPlus: null
@@ -41,10 +41,8 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log('dddd',app.globalData.isPlusVip)
-  
-    const { memberId } = wx.getStorageSync('_baseUserInfo')
- 
+    console.log('dddd', app.globalData.isPlusVip)
+
     let pages = getCurrentPages();
     let currPage = pages[pages.length - 1];
 
@@ -56,24 +54,24 @@ wxService.page({
 
     // 下单 && 计算优惠价
 
-    this.setData({ 
+    this.setData({
       trolleySku2Buy: tradeDto.trolleySku2Buy,
       showPlus: app.globalData.isPlusVip ? false : true
     }, () => {
-      console.log('showPlus', this.data.showPlus)
-      const { trolleySku2Buy, checkByPremium } = this.data
-      let params = {
-        checkByPremium,
-        trolleySku2Buy
-      }
-      this.calPreferentialPrice(params)  // 计算优惠价
+      this.initCitys()
+      // 地址列表
+      this.getAddressList()
+      // if (!this.data.wxAddress){
+      //   this.getAddressList()
+      // }
     })
 
-    this.initCitys()
-    // 地址列表
-    if (!this.data.wxAddress){
-      this.getAddressList()
-    }
+    // this.initCitys()
+    // // 地址列表
+    // this.getAddressList()
+    // // if (!this.data.wxAddress){
+    // //   this.getAddressList()
+    // // }
   },
   updateCoupon(e) {
     // faceAmount 抵用多少钱（分） 1 抵用券  2 折扣券
@@ -101,7 +99,7 @@ wxService.page({
   },
   setPayPrice() {
     const { currentCoupon, orderInitPrice, isSelect, plusMemberPrice } = this.data
-    let newCurrentCoupon = currentCoupon? currentCoupon : 0
+    let newCurrentCoupon = currentCoupon ? currentCoupon : 0
     let orderCoupon = parseFloat(newCurrentCoupon) // 优惠券价格
     let plusPrice = isSelect ? plusMemberPrice : 0 // plus
     // 实际价格 - 优惠价 + plus
@@ -244,17 +242,19 @@ wxService.page({
       this.setData({
         checkByPremium: isSelect
       }, () => {
-        const { trolleySku2Buy, checkByPremium } = this.data
+        const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
+
         let params = {
           checkByPremium,
-          trolleySku2Buy
+          trolleySku2Buy,
+          addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
         }
         this.calPreferentialPrice(params)  // 重新计算优惠价
         // 获取默认付费会员设置
         this.getPremiumDefault()
       })
     })
-    
+
   },
   // /premium/getDefault
   getPremiumDefault() {
@@ -266,10 +266,10 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
-          this.setData({ 
+          this.setData({
             plusMemberPrice: data.price,
             plusMemberName: data.name
-          },()=>{
+          }, () => {
             // 实付款
             this.setPayPrice()
           })
@@ -283,6 +283,7 @@ wxService.page({
   },
   // 计算优惠价
   calPreferentialPrice(params) {
+    console.log('params', params)
     wx.showLoading({
       title: '加载中'
     })
@@ -291,11 +292,11 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
-          this.setData({ 
+          this.setData({
             currentOrderList: data,
             defalutCoupon: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponDiscount || '',
             orderInitPrice: data.amount
-          },()=>{
+          }, () => {
             // 实付款
             this.setPayPrice()
           })
@@ -304,7 +305,7 @@ wxService.page({
     })
   },
   handelGobuy() {
-    const { trolleySku2Buy, couponId,addressId, addressInfo } = this.data
+    const { trolleySku2Buy, couponId, addressId, addressInfo } = this.data
     let params = {
       couponId,
       trolleySku2Buy,
@@ -370,8 +371,16 @@ wxService.page({
 
           this.setData({
             addressInfo: _defalutAddress
+          }, () => {
+            // preview
+            const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
+            let params = {
+              checkByPremium,
+              trolleySku2Buy,
+              addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
+            }
+            this.calPreferentialPrice(params)  // 计算优惠价
           })
-          console.log(this.data.addressInfo)
         }
       }
     }).finally(() => {
@@ -391,7 +400,7 @@ wxService.page({
           goodsAddress: false,
           wxAddress: true,
           addressInfo: res,
-          params:{
+          params: {
             userId: memberId,
             name: res.userName,
             phone: res.telNumber,
@@ -407,7 +416,7 @@ wxService.page({
           if (result == 0) {
             wx.hideLoading()
             this.setData({
-              addressId:data
+              addressId: data
             })
           }
         }).finally(() => {