Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !127

src/pages/cart/cart.js

@@ -161,7 +161,7 @@ wxService.page({
       cartList: cartList
     }, function () {
       this.setTotalFee()
-      this.editOk(cartList[e.index]) //调用完成
+      this.inputProNumber(cartList[e.index]) //调用完成
     })
 
   },
@@ -183,7 +183,7 @@ wxService.page({
         cartList: cartList
       }, function () {
         this.setTotalFee()
-        this.editOk(cartList[e.index]) //调用完成
+        this.inputProNumber(cartList[e.index]) //调用完成
       })
     }
   },
@@ -321,6 +321,26 @@ wxService.page({
       }
     })
   },
+
+  // 输入商品数量
+  inputProNumber(cartPro){
+    wx.showLoading({
+      title: '加载中'
+    })
+    wxService.post(`/sale/trolley/update?count=${cartPro.count}&skuId=${cartPro.skuId}`).then(res => {
+      if (res) {
+        const { result } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+        } else {
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none'
+          })
+        }
+      }
+    })
+  },
   checkProChange(e) {
     this.checkPro(e.detail)
   },

src/pages/confirmOrder/confirmOrder.js

@@ -31,6 +31,7 @@ wxService.page({
    */
   onLoad: function (options) {
     wx.hideShareMenu()
+    console.log('-----------',options)
   },
   /**
    * 生命周期函数--监听页面显示
@@ -42,6 +43,9 @@ wxService.page({
     //   couponId: couponId,
     //   trolleySku2Buy: JSON.parse(trolleySku2Buy)
     // }
+    let pages = getCurrentPages();
+    let currPage = pages[pages.length - 1];
+    console.log('-----------', pages)
 
     const { trolleySku2Buy } = this.options
 

src/pages/extendProduct/extendProduct.wxml

@@ -81,13 +81,13 @@
 			</view>
 		</view>
 		<view class="share-wrap">
-			<view class="share-button" bindtap="onTapShare">
+			<view class="share-button" bindtap="onTapPoster">
 				<image mode="widthFix" />
 				<text>快速分享</text>
 			</view>
 			<view class="share-button" bindtap="onTapPoster">
 				<image mode="widthFix" />
-				<text>生成卡片</text>
+				<text>生成海报</text>
 			</view>
 		</view>
 	</scroll-view>
@@ -96,12 +96,12 @@
 	<scroll-view scroll-y wx:if="{{currentTab==1}}">
 		<view class="release-num weui-flex df-j--bt">
 			<view class="num-invite df-1 border_box">
-				<view class="share-number">{{myShareCount.totalCount}}</view>
+				<view class="share-number">{{myShareCount.totalCount || 0}}</view>
 				<view class="share-title">当前分享订单</view>
 			</view>
 			<view class="extension-line" />
 			<view class="num-invite-yesterday df-1 border_box">
-				<view class="share-number">{{myShareCount.yesterdayCount}}</view>
+				<view class="share-number">{{myShareCount.yesterdayCount || 0}}</view>
 				<view class="share-title">昨日新增分享订单</view>
 			</view>
 		</view>
@@ -135,7 +135,7 @@
             <text class="pro-img-dot">{{extendItem.content}}</text>
           </view>
           <view class="pro-number">
-            <text class="total-pro">促成订单 <text class="help-order">5</text>笔
+            <text class="total-pro">促成订单 <text class="help-order">5</text> 笔
             </text>
           </view>
         </navigator>

src/pages/extendProduct/extendProduct.wxss

@@ -273,7 +273,7 @@ swiper {
 }
 
 .coupon-title{
-  width:300rpx;
+  width:270rpx;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-box-orient: vertical;

src/pages/myAddress/myAddress.js

@@ -29,6 +29,12 @@ wxService.page({
     const item = this.data.addressList[index]
 
     wx.setStorageSync('_defalutAddress', item)
+    let pages = getCurrentPages();
+    let beforePage = pages[pages.length - 2];
+    beforePage.setData({
+      wxAddress: false
+    })
+    console.log('beforePage+++++++', beforePage)
     setTimeout(() => {
       wxService.router().back()
     }, 300)
@@ -74,6 +80,13 @@ wxService.page({
     })
   },
 
+  // 编辑地址
+  editAddress(e){
+    if (e.currentTarget.dataset.id){
+      wxService.router(`/pages/addAddress/addAddress?id=${e.currentTarget.dataset.id}`)
+    }
+  },
+
   //设置默认地址
   settingDefalutAddress(e){
     console.log(e)

src/pages/myAddress/myAddress.wxml

@@ -39,10 +39,10 @@
 					</view>
 					<text class="setting-default">设为默认地址</text>
 				</view>
-				<navigator url="/pages/addAddress/addAddress?id={{item.id}}">
-					<image class="edit-img" mode="widthFix" src="/assets/imgs/7_1_0/edit.png" />
-				</navigator>
-				<view class="delete" bindtap="deleteAddress" data-id="{{item.id}}">删除</view>
+				<!-- <navigator url="/pages/addAddress/addAddress?id={{item.id}}"> -->
+				<image catchtap="editAddress" data-id="{{item.id}}" class="edit-img" mode="widthFix" src="/assets/imgs/7_1_0/edit.png" />
+				<!-- </navigator> -->
+				<view class="delete" catchtap="deleteAddress" data-id="{{item.id}}">删除</view>
 			</view>
 		</view>
 	</view>

src/utils/wxService.js

@@ -169,6 +169,7 @@ class WXService extends Http {
             let dataResp = response.data.data
             wx.setStorageSync('token', dataResp.token)
             wx.setStorageSync('_baseUserInfo', dataResp)
+            
             return Promise.resolve({
               response
             })