pages/groupmeallist/addOrEditaddress/addOrEditaddress.js

@@ -19,6 +19,7 @@ Page({
         latitude: '',
         houseNumber: '',
         tagName: '家',
+        isreturn: '',
 
 
 
@@ -113,7 +114,7 @@ Page({
         }).then(res => {
             if (res.code == 200) {
                 wx.redirectTo({
-                    url: '../address/address',
+                    url: '../address/address?isreturn=' + this.data.isreturn,
                 })
             }
 
@@ -131,12 +132,16 @@ Page({
     onLoad: function (options) {
         let type = options.type;
         let addressId = options.addressId;
+        let isreturn = options.isreturn;
 
-        console.log(type +addressId)
+        console.log(type + addressId + isreturn)
+        this.setData({
+            isreturn: isreturn
+        })
         if (type == 'edit') {
             address.getddress({
                 mobile: cache.getMobile(),
-                addressId:addressId
+                addressId: addressId
             }).then(res => {
                 console.log(res.data)
 
@@ -148,17 +153,17 @@ Page({
                     }
                 })
                 this.setData({
-                    tagList:this.data.tagList,
-                    mobile:res.data.mobile,
-                    addressId:res.data.id,
-                    name:res.data.name,
-                    gender:res.data.gender,
-                    phone:res.data.phone,
-                    address:res.data.address,
-                    longitude:res.data.longitude,
-                    latitude:res.data.latitude,
-                    houseNumber:res.data.houseNumber,
-                    tagName:res.data.tagName,
+                    tagList: this.data.tagList,
+                    mobile: res.data.mobile,
+                    addressId: res.data.id,
+                    name: res.data.name,
+                    gender: res.data.gender,
+                    phone: res.data.phone,
+                    address: res.data.address,
+                    longitude: res.data.longitude,
+                    latitude: res.data.latitude,
+                    houseNumber: res.data.houseNumber,
+                    tagName: res.data.tagName,
                 })
             })
 

pages/groupmeallist/addOrEditaddress/addOrEditaddress.wxml

@@ -44,9 +44,7 @@
             <view class="tag_view {{item.show ==true?'back':''}}" style="margin-right: 19rpx; " data-value="{{item.value}}" data-id="{{index}}" catchtap="getagValue">{{item.value}}</view>
         </view>
     </view>
-    <view class="save" catchtap="saveAddress">
-    
-        保 存
+    <view class="save" catchtap="saveAddress">保 存
     </view>
 
 

pages/groupmeallist/address/address.js

@@ -47,10 +47,10 @@ Page({
     let addressId = e.currentTarget.dataset.idx
     console.log(addressId)
     if (this.data.isreturn) {
-      
+
       wx.redirectTo({
-     
-        url: '../submitOrder/submitOrder?addressvalue='+addressvalue + '&addressId=' + addressId,
+
+        url: '../submitOrder/submitOrder?addressvalue=' + addressvalue + '&addressId=' + addressId,
       })
     } else {
       return
@@ -79,7 +79,7 @@ Page({
 
     })
   },
-  handleTouchestart: function (e) {},
+  handleTouchestart: function (e) { },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -135,17 +135,23 @@ Page({
 
     let way = e.currentTarget.dataset.way;
     let addressId = e.currentTarget.dataset.id;
-    console.log(addressId)
+    let url = '';
     if (addressId >= 0) {
-      wx.navigateTo({
-        url: '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way + '&addressId=' + addressId,
-      })
-    } else {
-
-      wx.navigateTo({
-        url: '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way,
-      })
+      url = '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way + '&addressId=' + addressId
+    } else if (addressId >= 0 && this.data.isreturn) {
+      url = '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way + '&addressId=' + addressId + '&isreturn=' + this.data.isreturn
+    } else if (this.data.isreturn) {
+      url = '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way + '&isreturn=' + this.data.isreturn
+    }
+    else {
+      url = '/pages/groupmeallist/addOrEditaddress/addOrEditaddress?type=' + way
     }
+
+    wx.navigateTo({
+      url: url,
+    })
+
+
   },
 
   /**

pages/groupmeallist/address/address.wxss

@@ -70,4 +70,5 @@
     height: 223rpx;
     background: #FFFFFF;
 
-   }
+   }
+

pages/groupmeallist/orderDetail/orderDetail.wxml

@@ -154,10 +154,10 @@
         <view class="store_information_top">订单信息</view>
         <!-- <view style="width: 93%; border-bottom: 1px #e2e2e2 solid; margin: auto;margin-top: 24rpx;"></view> -->
         <view class="orderSn flex-row">
-            <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-top:23rpx;margin-left:22rpx">订单编号</view>
-            <view style="margin-top: 26rpx;">
+            <view style="font-size: 28rpx; font-weight: 400;text-align: left;color: #939393;margin-left:22rpx">订单编号</view>
+            <view >
                 <span style="margin-right: 7rpx;font-size: 28rpx;font-weight: 400;text-align: left;color: #232323;">{{orderSn}}</span>
-                <span class="copy_button" style="  margin-top: 26.5rpx;" catchtap="copywxtap">复制</span>
+                <span class="copy_button"  catchtap="copywxtap">复制</span>
             </view>
         </view>
         <view class="flex-row" style="justify-content: space-between;margin-top: 35rpx;">

pages/groupmeallist/orderDetail/orderDetail.wxss

@@ -236,6 +236,7 @@
     height: 37rpx;
     justify-content: space-between;
     line-height: 37rpx;
+    margin-top: 26.5rpx;
 }
 .copy_button{
     /* width: 178rpx; */

pages/groupmeallist/storeGoods/storeGoods.js

@@ -75,7 +75,7 @@ CustomPage({
           isShowCartPannel: false
         })
       }
-    }).catch(_ => {})
+    }).catch(_ => { })
   },
 
 
@@ -167,7 +167,7 @@ CustomPage({
       })
     }.bind(this), 100)
   },
-  onLoad(options) {},
+  onLoad(options) { },
 
   async onShow() {
     let _self = this;
@@ -208,12 +208,12 @@ CustomPage({
 
 
   async loadData() {
-     await storeGoods.getExhibit(cache.getStoreId()).then(res => {
+    await storeGoods.getExhibit(cache.getStoreId()).then(res => {
       if (res.code == 200) {
         this.dataMapView(res.data)
       }
     }).catch(_ => {
-      
+
     })
 
   },
@@ -240,7 +240,7 @@ CustomPage({
       if (res.code == 200) {
         this.refreshCartData()
       }
-    }).catch(_ => {})
+    }).catch(_ => { })
     await this.loadCartData()
 
 
@@ -324,7 +324,7 @@ CustomPage({
   async loadCartData() {
     await storeGoods.getCartData(cache.getStoreId(), user.getMobileCache(), null, null).then(res => {
       if (res.code == 200) {
-         this.cartDataMapToView(res.data)
+        this.cartDataMapToView(res.data)
       }
     }).catch(_ => {
       console.log(_)
@@ -333,6 +333,10 @@ CustomPage({
   cartPanelNum() {
     this.data.vtabs.forEach((item, i) => {
       item.goodsList.forEach((children, x) => {
+        if (this.data.cartSkuMapData == null) {
+          console.log("被return")
+          return
+        }
         this.data.cartSkuMapData.forEach((sku, s) => {
           if (sku.skuId == children.minPriceSku.skuId) {
             children.chooseNum = sku.num

pages/groupmeallist/submitOrder/submitOrder.wxml

@@ -23,9 +23,9 @@
         </view>
         <!-- 门店外送 -->
         <view wx:if="{{storeWay ==2}}" class="flex-row" style="margin-top: 67rpx;margin-left: 22rpx;justify-content: space-between;" catchtap="chooseAdress">
-            <view class="fontSize-28" style="font-weight: 700;color: #000000;">请选择收货地址
+            <view class="fontSize-28" style="width: 600rpx; font-weight: 700;color: #000000;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">请选择收货地址
 
-                <span style=" width: 200rpx; margin-left: 50rpx;color: #8B8B8B;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">{{addressvaule}}</span>
+                <span style=" width: 200rpx; margin-left: 50rpx;color: #8B8B8B;">{{addressvaule}}</span>
             </view>
             <view class="flex-row">
                 <span style="margin-right: 23rpx;color: #000000;" class="fontSize-28">