Commit 1d6fbb086c7cf3f80dec7af09f4a2c7112c41ba9

Authored by 后端研发-苏明海
2 parents 9c839742 3070a58f

Merge branch 'qa' into 'master'

Qa

See merge request !405
pages/goods/goodsInfo/goodsInfo.wxml
@@ -854,7 +854,7 @@ @@ -854,7 +854,7 @@
854 <view class="pding"> 854 <view class="pding">
855 <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> 855 <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
856 <view class="spec-goods"> 856 <view class="spec-goods">
857 - <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> 857 + <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image>
858 <view class="spec-goods-info"> 858 <view class="spec-goods-info">
859 <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> 859 <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
860 <view class="flex ai_end xc-val-money"> 860 <view class="flex ai_end xc-val-money">
pages/user/Change_phone/Change_phone.js
@@ -39,7 +39,7 @@ Page({ @@ -39,7 +39,7 @@ Page({
39 th.setData({ 39 th.setData({
40 mobile: getApp().globalData.userInfo.mobile, 40 mobile: getApp().globalData.userInfo.mobile,
41 wxopenid: getApp().globalData.userInfo.weapp_openid, 41 wxopenid: getApp().globalData.userInfo.weapp_openid,
42 - time_len: sms_conf.time_out 42 + time_len: sms_conf?sms_conf.time_out:60
43 }) 43 })
44 }) 44 })
45 45
@@ -61,6 +61,8 @@ Page({ @@ -61,6 +61,8 @@ Page({
61 return false; 61 return false;
62 } 62 }
63 }else{ 63 }else{
  64 + getApp().my_warnning("请输入11位的手机号码", 0, th);
  65 + return false;
64 if (mobile.length < 11) { 66 if (mobile.length < 11) {
65 getApp().my_warnning("请输入11位的手机号码", 0, th); 67 getApp().my_warnning("请输入11位的手机号码", 0, th);
66 } else if (!myreg.test(mobile)) { 68 } else if (!myreg.test(mobile)) {
pages/user/userinfo/userinfo.js
@@ -659,11 +659,13 @@ Page({ @@ -659,11 +659,13 @@ Page({
659 if (a.pickup_id != null) { 659 if (a.pickup_id != null) {
660 req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, { 660 req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
661 success: function(da) { 661 success: function(da) {
  662 + if(da.data.data){
  663 + //设置门店
  664 + e.setData({
  665 + stoname: da.data.data.pickup_name
  666 + });
  667 + }
662 668
663 - //设置门店  
664 - e.setData({  
665 - stoname: da.data.data.pickup_name  
666 - });  
667 } 669 }
668 }) 670 })
669 } 671 }