diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 3b30bd0..31f1f81 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -8,7 +8,7 @@ var t = require("../../../utils/util.js"), oo = s.globalData, o = s.globalData.setting, os = o; -//评价加载更多 +//评价加载更多 var more = function(e) { return e && e.__esModule ? e : { default: e @@ -285,21 +285,21 @@ Page({ ee.init(gid); //------几人评价------- //n.init(th, "", "comments"); - + th.requestCardNum(), wx.pageScrollTo && th.setData({ supportPageScroll: !0 }); - + //计算等级价相关 var swithc_list=e.switch_list; var sw_arr=JSON.parse(swithc_list); //---如果后台又开等级卡的开关--- if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ - th.setData({rank_switch:true}); - + th.setData({rank_switch:true}); + //---回调卡的列表--- th.getPlusCardType(function(ob){ - th.setData({card_list:ob.card_list}); + th.setData({card_list:ob.card_list}); var ti = setInterval(function () { var user = getApp().globalData.userInfo; if (!user) return false; @@ -309,22 +309,22 @@ Page({ var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); + var now = ut.gettimestamp(); //--- 判断是等级会员，且在有效期范围内 --- if(user.card_field && now5) card_name=card_name.substring(0,5); - + var is_near_date=0; if(end-now<60*60*30*24) is_near_date=1; //如果小于30天 - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date}); - } + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date}); + } } - }, 500) - }) - + }, 500) + }) + } - + }); //获取用户设备信息，屏幕宽度 @@ -508,7 +508,7 @@ Page({ var ui = setInterval(function () { goods_list = th.selectComponent("#goods_list"); if (goods_list) { - clearInterval(ui); + clearInterval(ui); goods_list.init(); return false } @@ -650,8 +650,8 @@ Page({ this.data.enterAddressPage && (this.data.enterAddressPage = !1); - - + + }, @@ -851,24 +851,24 @@ Page({ newd.prom_type = 0; newd.prom_id = 0; } - + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ if(o.prom_type!=1 && o.prom_type!=6){ var conf=th.data.bconfig; if(conf.switch_list){ var s_list=JSON.parse(conf.switch_list); //如果后台有开启等级价的功能 - if(parseInt(s_list.rank_switch)==2){ + if(parseInt(s_list.rank_switch)==2){ var card_price=o[getApp().globalData.userInfo['card_field']]; //如果会员有等级价 - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null + if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null && getApp().globalData.userInfo['card_field']!="" && card_price>0){ - newd.goods_price=card_price; + newd.goods_price=card_price; } } } } - + //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); if ("add" == t.currentTarget.dataset.action) { @@ -1201,7 +1201,7 @@ Page({ title=th.data.prom_act.share_title; img=th.data.iurl+th.data.prom_act.share_imgurl; } - + return { title: price + "元 " +title, path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid, @@ -1338,7 +1338,12 @@ Page({ //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 if(dd.lat && !th.data.def_pick_store){ - th.setData({def_pick_store:e.data.data.pageData[0]}); + th.setData({ + def_pick_store:e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }); } //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- @@ -1478,7 +1483,12 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店------ if (!th.data.def_pick_store) { - th.setData({def_pick_store:e.data.data.pageData[0]}) + th.setData({ + def_pick_store:e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) } } } @@ -1544,14 +1554,14 @@ Page({ await getApp().request.promiseGet(t, { data: req_where}).then(res=>{ var tot = res.data.data.total; e.data.c_curr_p++; - e.setData({ + e.setData({ com_num: tot, //已经有加载 }); if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ rs_data=res.data.data.pageData; }else{ th.setData({comments_no_more:1,auto:1}); - } + } }) if (rs_data){ @@ -1581,7 +1591,7 @@ Page({ if (res.data.data.pageData && res.data.data.pageData.length > 0) { cda[ind].replay_list = res.data.data.pageData; } - }) + }) } if (!com_data) com_data = cda; @@ -1683,7 +1693,7 @@ Page({ prom_start_time: prom_start_time, isshow: 1, }); - + var newTime = ut.gettimestamp(); var endTime2 = t.data.data.end_time; @@ -2248,26 +2258,26 @@ Page({ goods_sn: o.goods_sn, sku: o.sku, }; - - //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ - + + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ + if(th.data.is_normal == 1){ var conf=th.data.bconfig; if(conf.switch_list){ var s_list=JSON.parse(conf.switch_list); //如果后台有开启等级价的功能 - if(parseInt(s_list.rank_switch)==2){ + if(parseInt(s_list.rank_switch)==2){ var card_price=o[getApp().globalData.userInfo['card_field']]; //如果会员有等级价 - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null + if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null && getApp().globalData.userInfo['card_field']!="" && card_price>0){ - newd.goods_price=card_price; + newd.goods_price=card_price; } } } } - - + + //-----如果是秒杀，团购，积分购,拼团,且不是普通购买----- if (th.data.prom_type == 6 && th.data.is_normal!= 1) { newd.goods_price = th.data.prom_price; @@ -2542,8 +2552,8 @@ Page({ var cid = e.currentTarget.dataset.cid; var index = e.currentTarget.dataset.ind; var item = this.data.quan_list[index]; - - + + //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -2552,9 +2562,9 @@ Page({ }) return false; } - - - //如果券还在领取中，不能再点 + + + //如果券还在领取中，不能再点 if (item.linging == 1) { getApp().my_warnning('领取中..', 0, this); return false; @@ -2604,11 +2614,11 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/getphone/getphone', }) + //getApp().my_warnning("请先登录",0,this); + wx.navigateTo({ url: '/pages/getphone/getphone', }) return false; } - + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 var type = this.data.prom_type; if (type == 6) type = 2; @@ -3079,7 +3089,7 @@ Page({ is_gps: "3" }); } - + } }) }else{ @@ -3181,16 +3191,16 @@ Page({ openSpecModal: !0, openSpecModal_ind: openindstore, }); - } + } else if (openindstore == 4) { //4就是拼团 th.setData({ - openSpecModal_pt: 1, //打开拼团购买界面 + openSpecModal_pt: 1, //打开拼团购买界面 store: 0, //关闭门店 choice_sort_store: 0, //关闭门店2级 sort_store: 0, //关闭门店2级 }); } - + else { th.setData({ store: 0, @@ -3282,13 +3292,13 @@ Page({ } else if (openindstore == 4) { //4就是拼团 th.setData({ - openSpecModal_pt: 1, //打开拼团购买界面 - store: 0, //关闭门店 + openSpecModal_pt: 1, //打开拼团购买界面 + store: 0, //关闭门店 choice_sort_store: 0, //关闭门店2级 - sort_store: 0, //关闭门店2级 + sort_store: 0, //关闭门店2级 }); } - + else { th.setData({ store: 0, @@ -3367,7 +3377,7 @@ Page({ comments: that.data.comments }) }, - + //--- 获取卡类列表 --- getPlusCardType: function (func) { var storid = os.stoid; @@ -3377,16 +3387,16 @@ Page({ var arr = [1219, 2089, 3031]; var new_arr = new Array(); var card_name_map=new Map(); - for (var i = 0; i < plusCard.length; i++) { + for (var i = 0; i < plusCard.length; i++) { var name="card"+plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name,plusCard[i].CardName); + card_name_map.set(name,plusCard[i].CardName); } - + var ob={"card_list":plusCard,"name_map":card_name_map}; - func(ob); + func(ob); }) }, - + go_plus:function(){ getApp().goto("/pages/user/plus/plus"); }, @@ -3395,4 +3405,4 @@ Page({ } -}); \ No newline at end of file +}); diff --git a/pages/user/Change_phone/Change_phone.js b/pages/user/Change_phone/Change_phone.js index 33a7e7f..1abdc3a 100644 --- a/pages/user/Change_phone/Change_phone.js +++ b/pages/user/Change_phone/Change_phone.js @@ -11,7 +11,7 @@ Page({ */ data: { iurl: r.imghost, - inputxphone: 0, + inputxphone: 1, mobile: null, //旧手机号码 currentTime: "", //验证码发送倒计时 getvcode: "获取验证码", //显示文字 @@ -53,12 +53,22 @@ Page({ var isver = th.data.isver; var send = th.data.send; var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; - if (mobile.length < 11) { - getApp().my_warnning("请输入11位的手机号码", 0, th); - } else if (!myreg.test(mobile)) { - getApp().my_warnning("手机号有误", 0, th); - return false; + if(change_phone){ + if (change_phone.length < 11) { + getApp().my_warnning("请输入11位的手机号码", 0, th); + } else if (!myreg.test(change_phone)) { + getApp().my_warnning("手机号有误", 0, th); + return false; + } + }else{ + if (mobile.length < 11) { + getApp().my_warnning("请输入11位的手机号码", 0, th); + } else if (!myreg.test(mobile)) { + getApp().my_warnning("手机号有误", 0, th); + return false; + } } + if (change_phone == mobile) { getApp().my_warnning("新手机号码和旧手机号码不能一样", 0, th); return false; @@ -122,6 +132,12 @@ Page({ if (change_phone.length > 1) { mobile = change_phone } + if(!change_phone){ + return getApp().my_warnning("请输入手机号", 0, th); + } + if(!code){ + return getApp().my_warnning("请输入验证码", 0, th); + } getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, { success: function(res) { if (res.data.code == 0) { @@ -230,4 +246,4 @@ Page({ onShareAppMessage: function() { } -}) \ No newline at end of file +}) diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js index 8701da5..438925c 100644 --- a/pages/user/assistance/friend_assistance.js +++ b/pages/user/assistance/friend_assistance.js @@ -54,6 +54,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function() { + var th=this; if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking != 0) {