开放商城

@@ -47,7 +47,7 @@ Component({
         },1300)
       }else{
         wx.navigateTo({
-          url: '/pages/shop_detail/shop_detail?id=' + id
+          url: '/packageA/pages/shop_detail/shop_detail?id=' + id
         })
       }
     },

@@ -69,11 +69,18 @@ App({
             wx.hideLoading();
             reject(res.data)
             wx.removeStorageSync('login');
-
-            // wx.removeStorageSync('token');
-            // wx.navigateTo({
-            //   url: '/pages/register/register?type=1',
-            // })
+            wx.showModal({
+              title: '提示',
+              content: res.data.msg,
+              showCancel: false
+            })
+            wx.removeStorageSync('token');
+            setTimeout(()=>{
+              wx.navigateTo({
+                url: '/pages/register/register?type=1',
+              })
+            },1200)
+           
           } else {
             wx.showModal({
               title: '提示',

- Subproject commit eed5ec7a45fa6ecb75d55addfbcaf7b9236a67dd
+ Subproject commit fa07629bea63caece0380a34b13e14ad18f14b80

@@ -33,7 +33,7 @@ Page({
       tel: e.detail.value.replace(/\s+/g, '')
     })
   },
-  beiTelFun(){
+  beiTelFun(e){
     this.setData({
       beiyongTel: e.detail.value.replace(/\s+/g, '')
     })
@@ -96,13 +96,13 @@ Page({
         icon: 'none',
         duration: 1300
       })
-    } else if (d.beiyongTel == '') {
+    } else if (d.b_tel == '') {
       wx.showToast({
         title: '请输入手机号',
         icon: 'none',
         duration: 1300
       })
-    } else if (!AuglyTest_phone.test(d.beiyongTel)) {
+    } else if (!AuglyTest_phone.test(d.b_tel)) {
       wx.showToast({
         title: '请输入正确的备用手机号',
         icon: 'none',

@@ -3,7 +3,7 @@
     <view class="user_info">
       <view class="name">{{item.name}}</view>
       <view class="tel">{{item.tel}}</view>
-      <view class="tel">{{item.b_tel}}</view>
+      <view class="tel">{{item.b_tel||''}}</view>
       <view class="type" wx:if="{{item.mo == 1}}">默认</view>
     </view>
     <view class="address">

@@ -17,7 +17,7 @@ page {
 
 .item .user_info {
     width: 100%;
-    height: 96rpx;
+    height: 60rpx;
     padding: 0 40rpx;
     box-sizing: border-box;
     display: flex;
@@ -25,19 +25,19 @@ page {
 }
 
 .user_info .name {
-    font-size: 32rpx;
+    font-size: 28rpx;
     font-family: PingFang SC;
     font-weight: bold;
     color: rgba(6, 14, 35, 1);
 }
 
 .user_info .tel {
-    font-size: 32rpx;
+    font-size: 28rpx;
     font-family: PingFang SC;
     font-weight: bold;
     color: rgba(19, 26, 46, 1);
-    margin-left: 40rpx;
-    margin-right: 20rpx;
+    margin-left: 10rpx;
+    margin-right: 10rpx;
 }
 
 .user_info .type {

@@ -67,6 +67,11 @@ Page({
             tel: e.detail.value.replace(/\s+/g, '')
         })
     },
+    inputtelFun(e){
+        this.setData({
+            b_tel: e.detail.value.replace(/\s+/g, '')
+        })
+    },
 
     // 获取详细地址
     getAddressFun(e) {
@@ -104,6 +109,7 @@ Page({
         let u = a.interface.editaddress;
         let d = {
             tel: t.data.tel,
+            b_tel: t.data.b_tel,
             name: t.data.name,
             area: t.data.area,
             address: t.data.address,
@@ -128,7 +134,19 @@ Page({
                 icon: 'none',
                 duration: 1300
             })
-        } else if (d.area == '') {
+        } else if (d.b_tel == '') {
+            wx.showToast({
+                title: '请输入手机号', 
+                icon: 'none',
+                duration: 1300
+            })
+        } else if (!AuglyTest_phone.test(d.b_tel)) {
+            wx.showToast({
+                title: '请输入正确的手机号',
+                icon: 'none',
+                duration: 1300
+            })
+        }else if (d.area == '') {
             wx.showToast({
                 title: '请选择省市区',
                 icon: 'none',

@@ -14,7 +14,7 @@
     <view class="list">
         <view class="list_left">备用手机号码</view>
         <view class="list_right">
-            <input placeholder="请输入手机号" type="number" maxlength="11" bindinput="telFun" p value="{{b_tel}}" placeholder-class="inut_plclass"></input>
+            <input placeholder="请输入手机号" type="number" maxlength="11" bindinput="inputtelFun" p value="{{b_tel}}" placeholder-class="inut_plclass"></input>
         </view>
     </view>
     <picker mode="region" style="width: 100%;" bindchange="bindRegionChange">

@@ -6,7 +6,7 @@ page {
 
 .box {
     width: 100%;
-    height: 200%;
+    height: 100%;
     background: rgba(255, 255, 255, 1);
     box-sizing: border-box;
     padding-left: 32rpx;
@@ -30,7 +30,7 @@ page {
 }
 
 .list_left {
-    width: 166rpx;
+    width: 200rpx;
     font-size: 30rpx
 }
 

@@ -33,7 +33,7 @@ Page({
       goods_id:id
       // goods_id:911
     }
-    app.postk(url, param).then((res) => {
+    app.post(url, param).then((res) => {
       console.log(res,'商品')
       if(res.data.length!=undefined){
         let data=res.data;
@@ -98,14 +98,14 @@ Page({
       goods_id:that.data.goods_id,
       spec_sku_id:that.data.spec_sku_id.join("_")
     }
-    app.postk(url, param).then((res) => {
-      console.log(res,'购物车数量')
+    app.post(url, param).then((res) => {
+      console.log(res,'购物车数量') 
       that.setData({
-        min_goods_price:res.data.goods_price,
+        min_goods_price:res.data.goods_price, 
         line_price:res.data.line_price,
         goodimg:res.data.spec_image,
-        stock_num:res.data.stock_num
-      })
+        stock_num:res.data.stock_num 
+      }) 
     })
   },
   num_change(e) {
@@ -144,7 +144,7 @@ Page({
   getcartnum(){
     let that=this;
     let url = '/car/bubble'
-    app.postk(url, {
+    app.post(url, {
      
     }).then((res) => {
       console.log(res,'购物车数量')
@@ -173,7 +173,7 @@ Page({
         type:1,
         spec_sku_id:that.data.spec_sku_id.join("_")
       }
-      app.postk(url, params).then((res) => {
+      app.post(url, params).then((res) => {
         that.setData({
           "info.shop": Number(that.data.info.shop) + that.data.num,
           num: 1

@@ -178,6 +178,12 @@
           "pathName": "packageA/pages/order/order",
           "query": "type=3&info={\"shop_id\":3232,\"num\":1}&id=3232",
           "scene": null
+        },
+        {
+          "name": "packageA/pages/logistics/logistics",
+          "pathName": "packageA/pages/logistics/logistics",
+          "query": "order=K7J527500103601",
+          "scene": null
         }
       ]
     }