Merge branch 'dev' into 'test'

Dev See merge request !403

Merge branch 'dev' into 'test'
Dev See merge request !403
后端研发-苏明海
2 parents f6ec2830 7b40fe0a
Showing 3 changed files with 10 additions and 6 deletions
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/Change_phone/Change_phone.js
pages/user/userinfo/userinfo.js
@@ -854,7 +854,7 @@
     <view class="pding"> 
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money">
@@ -39,7 +39,7 @@ Page({
       th.setData({
         mobile: getApp().globalData.userInfo.mobile,
         wxopenid: getApp().globalData.userInfo.weapp_openid,
-        time_len: sms_conf.time_out
+        time_len: sms_conf?sms_conf.time_out:60
       })
     })
  
@@ -61,6 +61,8 @@ Page({
         return false;
       }
     }else{
+      getApp().my_warnning("请输入11位的手机号码", 0, th);
+      return false;
       if (mobile.length < 11) {
         getApp().my_warnning("请输入11位的手机号码", 0, th);
       } else if (!myreg.test(mobile)) {
@@ -659,11 +659,13 @@ Page({
       if (a.pickup_id != null) {
         req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
           success: function(da) {
+            if(da.data.data){
+              //设置门店
+              e.setData({
+                stoname: da.data.data.pickup_name
+              });
+            }
  
-            //设置门店
-            e.setData({
-              stoname: da.data.data.pickup_name
-            });
           }
         })
       }