diff --git a/packageB/pages/user/Change_phone/Change_phone.js b/packageB/pages/user/Change_phone/Change_phone.js
index da47cac..94fd0e4 100644
--- a/packageB/pages/user/Change_phone/Change_phone.js
+++ b/packageB/pages/user/Change_phone/Change_phone.js
@@ -21,6 +21,9 @@ Page({
code: "", //验证码
change_phone: "", //新手机号码
send: 1, //发送类型
+
+ changing:0
+
},
/**
* 生命周期函数--监听页面加载
@@ -85,6 +88,11 @@ Page({
} else {
return false
}
+
+ wx.showLoading({
+ mask:true
+ });
+
getApp().request.post("/api/weshop/smslog/sendsms", {
data: {
store_id: r.stoid,
@@ -93,6 +101,8 @@ Page({
wxopenid: wxopenid
},
success: function(res) {
+ wx.hideLoading();
+
if (res.data.code == 0) {
th.setData({
isver: 0,
@@ -127,6 +137,11 @@ Page({
}
},
change_phone: function() {
+
+ if(this.data.changing) return false;
+ this.data.changing=1;
+
+
var th = this;
var code = th.data.code;
var mobile = th.data.mobile;
@@ -134,14 +149,29 @@ Page({
if (change_phone.length > 1) {
mobile = change_phone
}
+
if(!change_phone){
+ this.data.changing=0;
return getApp().my_warnning("请输入手机号", 0, th);
}
+
+ var ob=util.check_mobile(change_phone);
+ if(ob.code==-1){
+ this.data.changing=0;
+ return getApp().my_warnning(ob.title, 0, th);
+ }
+
if(!code){
+ this.data.changing=0;
return getApp().my_warnning("请输入验证码", 0, th);
}
+
+ wx.showLoading();
getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, {
success: function(res) {
+ th.data.changing=0;
+ wx.hideLoading();
+
if (res.data.code == 0) {
var url = "/packageG/pages/user/userinfo/userinfo?change_phone" + change_phone
getApp().globalData.userInfo.mobile = mobile;
diff --git a/packageB/pages/user/Change_phone/Change_phone.wxml b/packageB/pages/user/Change_phone/Change_phone.wxml
index e5c8bde..c535de0 100644
--- a/packageB/pages/user/Change_phone/Change_phone.wxml
+++ b/packageB/pages/user/Change_phone/Change_phone.wxml
@@ -12,7 +12,7 @@
{{mobile}}
-
+
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index ec06322..49fa4f2 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1441,6 +1441,28 @@ Page({
}
}
+ //如果是立即购买的时候,item_j.promgoodsbuynum
+ if(carr[0].state==1 && item1.prom_type>0){
+ item1.promgoodsbuynum=0;
+ await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+ data: {
+ store_id: oo.stoid,
+ user_id: getApp().globalData.user_id,
+ goods_id: item1.goods_id,
+ prom_type: item1.prom_type,
+ prom_id: item1.prom_id,
+ isnew:1
+ },
+ }).then(res => {
+ debugger
+ if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){
+ item1.promgoodsbuynum = res.data.data.promgoodsbuynum;
+ }
+ })
+ }
+
+
+
//要把优惠活动加入,prom_goods_map中,赠品不要运算,代发商品不算优惠
if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
// th.check_is_youhui(item1.goods_id, item1.pick_id);
diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js
index 67160a6..8f63326 100644
--- a/packageE/pages/cart/cart2/zh_calculate.js
+++ b/packageE/pages/cart/cart2/zh_calculate.js
@@ -55,7 +55,7 @@ module.exports = {
act_goos[j].num = item_j.goods_num;
act_goos[j].goods_price = item_j.goods_price;
var cart_num = item.cart_num = item_j.goods_num;
- var zh_b_num = item_j.promgoodsbuynum;
+ var zh_b_num = item_j.promgoodsbuynum || 0;
if (item.buyqty > 0) {
var key = item.goods_id + "." + act.id;
diff --git a/utils/more_cx.js b/utils/more_cx.js
index e1f2e3c..89445fa 100644
--- a/utils/more_cx.js
+++ b/utils/more_cx.js
@@ -74,7 +74,7 @@ module.exports = {
need_ck0=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0;
}
var min_can_buy0=0;
- if(need_ck+item_act_map.buyed>=act.buy_limit){
+ if(need_ck0+item_act_map.buyed>=act.buy_limit){
if(!need_ok) {
item_act_map.is_no_ok = 1;
}else{