diff --git a/app.json b/app.json index 9250245..8b3772a 100644 --- a/app.json +++ b/app.json @@ -201,7 +201,9 @@ "pages/user/member/account/account", "pages/user/member/account_unable/account_unable", "pages/user/member/cash_record/cash_record", - "pages/gift/gift" + "pages/gift/gift", + + "pages/shop/order_detail/order_detail" ] } diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 1b90f26..93f7bf0 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -72,8 +72,9 @@ Page({ check_label: [], //我选择的兴趣标签 fir_guide_id:null, //存储会员详情接口出来的美导ID isLunar: 0, - lat: null, //维度 - lon: null, //经度 + lat: null, //维度 + lon: null, //经度 + loading:0, }, //通过路径跳转到其他页面 @@ -892,9 +893,18 @@ Page({ zu_ce:function (dd) { var th=this; + wx.showLoading({ + title: "处理中.", + mask:true + }) + app.request.get("/api/weshop/users/thirdLogin", { data: dd, success: function (e) { + + wx.hideLoading(); + th.setData({loading:0}) ; + if (e.data.code == 0) { app.globalData.user_id = e.data.data.user_id; } else { @@ -907,9 +917,13 @@ Page({ }, failStatus: function (t) { + wx.hideLoading(); + th.setData({loading:0}) ; return app.my_warnning("授权登入失败,请稍后再试!", 0, that); }, fail: function (t) { + wx.hideLoading(); + th.setData({loading:0}) ; return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; } }); @@ -1192,6 +1206,10 @@ Page({ delete post_data.encryptedData; delete post_data.iv; + + if(th.data.loading) return false; + th.setData({loading:1}) ; + this.zu_ce(post_data); diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index e60c1cd..60fdbf9 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -174,7 +174,7 @@ - 保存 + 保存 保存成功即可获得一张{{couponInfo}} 保存成功即可获得一个{{libao}} diff --git a/packageA/pages/profile/profile.wxss b/packageA/pages/profile/profile.wxss index dad2d8e..66821d4 100644 --- a/packageA/pages/profile/profile.wxss +++ b/packageA/pages/profile/profile.wxss @@ -130,6 +130,11 @@ input { margin: 0 auto; } +.confirmtext.gray{ + background-color:darkgrey; +} + + .cmleft { margin-left: 45rpx; } diff --git a/packageD/pages/shop/order_detail/order_detail.js b/packageD/pages/shop/order_detail/order_detail.js new file mode 100644 index 0000000..a2ea6a8 --- /dev/null +++ b/packageD/pages/shop/order_detail/order_detail.js @@ -0,0 +1,1634 @@ +var e = getApp(), r = e.request,rq=r,t = require("../../../../utils/util.js"), o = require("../../../../utils/common.js"),oo=e.globalData,os=oo.setting; +var regeneratorRuntime = require('../../../../utils/runtime.js'); +var ut= require('../../../../utils/util.js'); +var py = require("../../../../utils/pay.js"); + + +Page({ + data: { + url: os.url, + resourceUrl: os.imghost, + iurl: os.imghost, + order: null, + optionIsGoup: !1, + user_note: "", + conf:null, + }, + onLoad: function(e) { + var th=this; + var r = void 0 !== e.isGoup && e.isGoup; + + getApp().getConfig2(function (e) { + + th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo}); + //--- 看后台是不是有开通等级卡 --- + + },1) + + this.setData({ + optionIsGoup: r + }), this.requestOrderDetail(e.order_id), wx.removeStorageSync("order:order_detail:update"); + }, + onShow: function() { + wx.getStorageSync("order:order_detail:update") && (wx.removeStorageSync("order:order_detail:update"), + this.requestOrderDetail(this.data.order.order_id)); + }, + requestOrderDetail: function(e) { + var o = this,oid=e,th=this; + r.get(o.data.url + "/api/weshop/order/get/"+os.stoid+"/"+e, { + success: function(e) { + var r = e.data.data; + r.addTimeFormat = t.format(r.add_time); + if (r.order_status == 0 && r.pay_status==0 ){ + r.order_status_detail="待支付"; r.pay_btn=1; + } + if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0) + r.order_status_detail = "待发货"; + + if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){ + r.order_status_detail = "待收货";r.receive_btn=1; + if (r.exp_type == 0) r.shipping_btn=1; + } + if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 2){ + r.order_status_detail = "待收货"; r.receive_btn = 1; + if (r.exp_type == 0) r.shipping_btn = 1; + } + if (r.order_status == 2){ + r.order_status_detail = "待评价"; if (r.exp_type == 0) r.shipping_btn = 1; + } + if (r.order_status == 3) + r.order_status_detail = "已取消"; + if (r.order_status == 4){ + r.order_status_detail = "已完成"; if (r.exp_type == 0) r.shipping_btn = 1; + } + if (r.order_status == 5) + r.order_status_detail = "已作废"; + if (r.order_status == 6) + r.order_status_detail = "退款完成"; + if (r.pt_status == 1 && r.pt_prom_id>0) + r.order_status_detail = "组团中"; + + + r['is_all_return'] = 0; + + var discount_price=r['discount_amount']; + var dis_json=r['prom_pt_json']; + + if(dis_json && discount_price){ + var prom_pt_json=JSON.parse(dis_json); + var ladder_amount=0; + for (var ll_item of prom_pt_json) { + if(ll_item['ladder_prom_id']){ + ladder_amount += ll_item['dis']; + } + } + r['ladder_amount']=ladder_amount; + r['discount_amount']=Math.floor((discount_price-ladder_amount)*100)/100; + } + + + + + //------获取订单商品------- + rq.get("/api/weshop/ordergoods/list",{ + data: { store_id: os.stoid, order_id: oid}, + success:async function (eb) { + r.order_goods=eb.data.data.pageData; + var glist = r.order_goods; + for(var i in glist){ + if(glist[i].is_gift){ + r.is_prom=1; + } + } + + //------------对比一下有没有退款记录------------ + await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{ + data: { order_id: r.order_id, store_id: os.stoid, + user_id:oo.user_id, pageSize: 20 } + }).then(rs=>{ + var ttd=rs; + //--看一下订单的总数量-- + var gtype_num = r.order_goods.length; + if(ttd.data.data.pageData == undefined) return false; + var goodslist = r.order_goods; + + //----没有相关的退款记录---- + if (ttd.data.data.total==0){ + r['is_all_return'] = 0; + + goodslist.forEach(function (ee, ii) { + if (r['order_status'] == 1 && r['pay_status'] == 1 && gtype_num>1){ + //是不是可以单个商品退款 + if(th.check_for_return_btn(r) ) { + goodslist[ii]['return_btn']=1; + } + } + }); + }else{ + //--------整单退-------- + if (ttd.data.data.pageData[0]['goods_id_list'] != null + && ttd.data.data.pageData[0]['goods_id_list'] != ''){ + + + var eea = ttd.data.data.pageData[0]; + //1.退款正在进行中， + //2.退款被拒绝就要显示可以退款 + //3.退款已经完成 + r['is_all_return']=1; + r['is_all_return_status'] = ttd.data.data.pageData[0].status; + + if (r['order_status'] == 1 && r['pay_status'] == 1) { + switch (eea.status) { + case 0: + case 1: + r.order_status_detail="退款中"; + r['return_btn'] = 2; break; + case 2: + r.order_status_detail="退款完成"; + r['return_btn'] = 4; break; + case 3: + r['return_btn'] = 3; break; + default: + r['return_btn'] = 0; + } + } + }else{ + //1.退款正在进行中， + //2.退款被拒绝就要显示可以退款 + //3.退款已经完成 + r['is_all_return'] = 0; + var rt_ok_num=0; + + //if(r['order_status'] == 1 && r['pay_status'] == 1) { + goodslist.forEach(function (eeb, iii) { + if(r['order_status'] == 1 && r['pay_status'] == 1) + goodslist[iii]['return_btn'] = 1; //申请退款 + ttd.data.data.pageData.forEach(function (eea, ii) { + var st = eea.status; + if (eea.goods_id == eeb.goods_id){ + + switch (eea.status){ + case 0: + case 1://退款处理中 + r['has_rt'] = 1; //有部分退 + goodslist[iii]['return_btn'] = 2; break; + case 2://退款完成 + r['has_rt'] = 1; //有部分退 + goodslist[iii]['return_btn'] = 4;rt_ok_num++; break; + case 3://已拒绝，重新退款 + goodslist[iii]['return_btn'] = 3; break; + default: + if(r['order_status'] == 1 && r['pay_status'] == 1) + goodslist[iii]['return_btn'] = 1; //申请退款 + } + return; + } + }); + }); + //} + } + } + + //--如果是全部退款，也就可以删除-- + if(rt_ok_num==goodslist.length){ + r['is_all_return_status']=2; + } + r['order_goods'] = goodslist; + var g_num = 0; + goodslist.forEach(function (ee, ii) { + if(ee.return_btn!=4) + g_num += ee.goods_num; + }); + r['g_num'] = g_num; + }) + + + //--------获取门店----------- + rq.get("/api/weshop/pickup/get/" + os.stoid + "/" + r.pickup_id, { + success: function (ebb) { + r.pickname = ebb.data.data.pickup_name; + o.setData({ + order: r, + }); + } + }) + + + } + }) + } + }); + }, + /*-----联系客户------*/ + contactService: function() { + getApp().con_Service(); + }, + + //--------取消订单--------- + cancelOrder: function(e) { + var t = this,th=t, o = e.currentTarget.dataset.id,order=this.data.order; + var is_skill=0; + var order_goods=order.order_goods; + var is_zsorder=order.is_zsorder; + + //--判断是不是秒杀-- + order_goods.forEach(function (val,ind) { + if(val.prom_type==1){ + is_skill=1; return false; + } + }) + + wx.showModal({ + title: "是否取消订单？", + success: function(e) { + if(!e.confirm) return false; + //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单 + //if(is_skill==1 || is_zsorder>=2){ + getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{ + data:{}, + success: function(t) { + if(t.data.code==0) + th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0); + }, + }) + /*---- + }else{ + getApp().request.put("/api/weshop/order/updatebyId", { + data: {order_id: o, order_status: 3}, + success: function(e) { + th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0); + } + }); + }--*/ + } + }); + }, + + //--------确认收货--------- + confirmOrder: function(e) { + var th=this; + var t = this, o = this.data.order.order_id,order=this.data.order; + var is_zsorder=order.is_zsorder; + wx.showModal({ + title: "是否确认收货?", + success: function(t) { + t.confirm && rq.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{ + success:function (e) { + if(e.data.code==0){ + th.requestOrderDetail(o) + } + } + }) + } + }); + }, + + //--------立即支付---------- + async jumpToCart4(e) { + + if(this.data.paying) return false; + this.setData({paying:1}); + + var th=this; + if(this.data.optionIsGoup) + wx.navigateTo({ + url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true" + }) + var order=this.data.order; + var order_goods=order.order_goods; + var user_id=order.user_id; + + var wlist=""; + for(var i in order_goods){ + var good=order_goods[i]; + //线下取价功能已经关闭或者过期 + if(!th.data.is_open_offline && good.offline_cut>0){ + wx.showModal({ + title: '提示', + content: '线下取价功能已经关闭或者过期！' + }); + th.setData({paying:0}); + return false; + } + + //要每件每件的商品进行检查，看有么有超出库存，超出限购 + var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null; + //获取单品的现在的活动状态 + await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, { + }).then(res=>{ + gg=res.data.data; + }) + var limit = gg.viplimited; + var store_count = gg.store_count; + good.erpwareid=gg.erpwareid; + + //---要获得商品，该用户买了多少件,同步应用--- + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: { + store_id: os.stoid, + user_id: getApp().globalData.user_id, + goods_id: good.goods_id, + prom_type: good.prom_type, + prom_id: good.prom_id + }, + }).then(res => { + var buy_num_data = res.data.data; + if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; + goodsbuynum = buy_num_data.goodsbuynum; + }) + + var buyed_mum2=goodsbuynum+good.goods_num; + if (buyed_mum2 > limit && limit > 0) { + + var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; + th.toast(content); + th.setData({paying:0}); + return false; + } + //当是组合优惠的时候 + if(good.prom_type==7){ + //如果有组合购 + var isok = 1; + var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id; + await getApp().request.promiseGet(url, {}).then(res => { + if(res.data.code==0 && res.data.data){ + if(res.data.data.is_show!=1){ + isok=0; + } + //如果活动已经结束 + if(res.data.data.is_end==1){ + isok=0; + } + //已经结束 + if(ut.gettimestamp()>res.data.data.end_time){ + isok=0; + } + //还未开始 + if(ut.gettimestamp() { + if (ut.ajax_ok(res)) { + var gdlist = res.data.data.pageData[0]; + good.buyqty=gdlist.buyqty; + } + }) + + var num=good['buyqty']; + console.log(1111); + console.log(num); + //---- 要计算商品的限购 ----- + if(good['buyqty']>0){ + if(good.goods_num+promgoodsbuynum>good['buyqty']){ + + var content= good['goods_name']+"超出活动限购\n"; + th.toast(content); + th.setData({paying:0}); + return false; + } + } + } + + //如果优惠促销和搭配购的时候 + if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ + var p_ok = 1,is_g_prom=0; + //因为有全场优惠活动，商品参加的活动还未开始 + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id + }; + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { + if(res.data.code==0 && res.data.data && res.data.data.length){ + for(let i in res.data.data){ + let item=res.data.data[i]; + if(item.prom_type==3) { + is_g_prom=1; break; + } + } + } + }) + if(is_g_prom){ + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (!r_data.collocationPromList && good.prom_type == 5) { + + var content = good.goods_name + '未找到活动,请取消订单重新购买'; + th.toast(content) + p_ok = 0; + } + if (!r_data.promGoodsLists && good.prom_type == 3) { + + var content = good.goods_name + '未找到活动,请取消订单重新购买'; + th.toast(content); + p_ok = 0; + } + } else { + + var content = good.goods_name + '未找到活动,请取消订单重新购买' + th.toast(content); + th.setData({paying:0}); + p_ok = 0; + } + }) + }else{ + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (!r_data.collocationPromList && good.prom_type == 5) { + + var content = good.goods_name + '未找到活动,请取消订单重新购买'; + th.toast(content) + + p_ok = 0; + } + if (!r_data.promGoodsLists && good.prom_type == 3) { + + var content = good.goods_name + '未找到活动,请取消订单重新购买'; + th.toast(content); + p_ok = 0; + } + } else { + + var content = good.goods_name + '未找到活动,请取消订单重新购买' + th.toast(content); + p_ok = 0; + } + }) + + } + if (!p_ok){ + th.setData({paying:0});return false; + } + } + + //商品的普通购买 ，不要进行判断 + if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){ + if(gg.prom_type!=good.prom_type && gg.prom_type>0) { + var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; + th.toast(content); + th.setData({paying:0}); + return false; + } + }else{ + if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) + && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { + var prom=null; + //---如果是活动的时候--- + var prom=null,th=this; + if(gg.prom_type==1){ + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + prom.price=prom.user_price; + } + }) + } + + if (gg.prom_type == 2) { + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { + if (res.data.code == 0) { + prom = res.data.data; + prom.price=prom.price; + } + }) + } + + + if(gg.prom_type==6){ + await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + } + }) + } + + if(gg.prom_type==4){ + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ + data:{store_id:os.stoid,goods_id:gg.goods_id} + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ + prom=res.data.data.pageData[0]; + } + }) + } + + if(prom){ + var t_now=ut.gettimestamp(); + if(prom.is_end==0 && prom.start_timet_now){ + + var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; + th.toast(content); + th.setData({paying:0}); + return false; + } + } + }else{ + //不是赠品的时候 + if(!good.is_gift && good.prom_type!=3){ + var t_ok=1; + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0"+"/"+getApp().globalData.user_id, {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + //-- 参加了全局的优惠活动 -- + if(r_data.promGoodsLists){ + + var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; + th.toast(content); + t_ok=0; + } + } + }) + if(!t_ok) { + th.setData({paying:0});return false; + } + } + + //-- 如果有参加线下取价 -- + if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; + } + //赠品和搭配购不判断商品金额 + var isok=1; + var card_field=th.data.card_field; // 会员等级 + //如果会员是等级会员,商品有等级价,且不是活动商品 + if(!good.is_gift && !good.is_collocation) { + if (card_field && gg[card_field] > 0) { + if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0; + if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 + + } else { + if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0; + if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 + } + var is_h=0; + if (!isok) { + + var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22'; + th.toast(content); + th.setData({paying:0}); + return false; + } + } + + //--如果是线下库存的时候-- + if(th.data.conf.sales_rules==2){ + var ob={}; + await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ + ob=obj; + }) + if(ob.code==-1){ + var content=gg.goods_name+'门店库存不足,请取消订单'; + th.toast(content); + th.setData({paying:0}); + return false; + } + + }else{ + if(good.goods_num>store_count){ + + var content=gg.goods_name+'商品的库存不足,请取消订单'; + th.toast(content); + th.setData({paying:0}); + return false; + } + + } + } + + console.log("------------------------------------"); + //---如果是活动的时候--- + var prom=null,goodsinfo=good,th=this; + if(goodsinfo.prom_type==1){ + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + prom.price=prom.user_price; + } + }) + } + + if (goodsinfo.prom_type == 2) { + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { + if (res.data.code == 0) { + prom = res.data.data; + prom.price=prom.price; + } + }) + } + + + if(goodsinfo.prom_type==6 && !good.is_pd_normal){ + await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + } + }) + } + + if(goodsinfo.prom_type==4 && !good.is_integral_normal){ + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ + data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ + prom=res.data.data.pageData[0]; + } + }) + } + + //----------如果有活动，并且在进行中，就不计算线下库存--------------- + if(prom){ + var now=ut.gettimestamp(); + if(prom.is_end==1 && prom.end_time prom.buy_limit && prom.buy_limit > 0) { + var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买'; + th.toast(content); + th.setData({paying:0}); + return false; + } + //看一下会员的秒杀价格是不是发生了变化 + if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ + var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; + th.toast(content); + th.setData({paying:0}); + return false; + } + + //看一下会员的团购价格是不是发生了变化 + if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ + var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; + th.toast(content); + th.setData({paying:0}); + return false; + } + + if(goodsinfo.prom_type==4){ + if (good.goods_num > prom.limitqty-prom.buy_num) { + + var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'; + th.toast(content); + th.setData({paying:0}); + return false; + } + }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { + if(order.add_time+5*600){ + wlist=ut.sub_last(wlist); + var keyid=order.pickup_id; + var user_info=getApp().globalData.userInfo; + if(!keyid) { + th.setData({paying:0});return false; + } + var offarr=null; + await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { + data:{ + VIPId:encodeURIComponent(user_info.erpvipid), + store_id:os.stoid, + PickupId:keyid, + WareIds:wlist}, + }, + ).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.length>0){ + offarr=res.data.data; + } + }) + if(!offarr && offarr.length<=0 ){ + wx.showModal({ title: '获取线下取价失败',}); + } + var newarr=ut.convert_arr_key(offarr,'WareId'); + //-- 循环判断线下的价格 -- + for(var k in order_goods){ + var good=order_goods[k]; + //判断线下取价是不是一样 + if(newarr[good.erpwareid] && + parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){ + + var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; + th.toast(content); + th.setData({paying:0}); + return false; + } + } + + } + + /*--- + o.jumpToCart4({ + order_sn: this.data.order.order_sn, + order_amount: this.data.order.order_amount, + type: 1 //正常单 + }, 1);--*/ + + py.pay(this.data.order.order_sn, function() { + th.setData({paying:0}); + wx.showToast({title: '支付成功'}) + wx.navigateBack(); + },function () { + th.setData({paying:0}); + },os.stoid,1); + + + }, + checkTeam: function() { + wx.navigateTo({ + url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id + }); + }, + + //------图片失败，默认图片--------- + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + zfwk:function(){ + var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; + wx.redirectTo({ + url:url, + }) + }, + + //--------跳转到退款详情----------- + gotoreturn: function (t) { + var e = t.currentTarget.dataset.recid; + var oid = t.currentTarget.dataset.oid; + var wh = ""; + if (e != undefined && e != null && e != "") { + wh = "&goods_id=" + e; + } + wx.navigateTo({ + url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, + }); + }, + + //---判断是不是有退款----- + checkReturnGoodsStatus: function (t) { + var e = t.currentTarget.dataset.recid; + var oid = t.currentTarget.dataset.oid; + r.get("/api/weshop/order/returngoods/page", { + data: { + goods_id: e, + order_id: oid, + store_id: os.stoid + }, + success: function (t) { + if (t.data.code == 0) { + var r = t.data.data.total; + if (0 == r) return wx.navigateTo({ + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + }); + //--如果拒绝，就重新申请退款-- + if (t.data.data.pageData[0].status == 3) { + return wx.navigateTo({ + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, + }); + } + + wx.navigateTo({ + url: "/pages/user/return_goods_info/return_goods_info?id=" + r + }); + } + } + }); + }, + + //-----删除订单----- + deleteOrderData: function(t) { + var th=this; + var order_id=t.currentTarget.dataset.order_id; + var up_data={ + order_id: order_id,isdel:1 + }; + if(th.data.order.order_status!=6){ + up_data.order_status=5; + } + wx.showModal({ + title: "是否删除订单？", + success: function(tt) { + tt.confirm && rq.put("/api/weshop/order/updatebyId", { + data: up_data, + success: function (t) { + getApp().my_warnning("删除成功",1,th); + setTimeout(function () { + getApp().goto("/pages/user/order_list/order_list"); + },1000); + } + }) + } + }); + }, + + //--判断是不是可以单个商品退-- + check_for_return_btn:function (item) { + if(item.coupon_no) return false; //有用优惠券 + if(item.order_prom_id) return false; //有订单优惠 + if(item.order_status>=2) return false; //订单状态>2 + var istrue=true; + //----判断是不是有优惠活动和赠送商品---- + for (var g in item.order_goods) { + var g_item=item.order_goods[g]; + if ((g_item.prom_type == 3 && g_item.discount_amount> 0) + || (g_item.prom_type== 3 && g_item.goods_price <= 0) + ) { + istrue=false; break + } + if (g_item.prom_type== 5) { + istrue=false; break + } + } + if(!istrue) return false; + var conf=this.data.conf; + //判断是不是原路退回 + if(conf.refund_type==1) return true; + else{ + if(item.order_amount==0 || item.user_money==0) return true; + } + return false; + }, + + + + //---检验线下库存的数量的子函数--- + async check_down_line_next(gg,num,pick_id,func){ + + var lock=0,pick_no,plist; + //先读取门店的lock + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ + data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id} + }).then(res=>{ + if(res.data.code==0 && res.data.data.total>0){ + for(var i in res.data.data.pageData) + lock+=res.data.data.pageData[i].outQty; + } + }) + //先获取门店的编号 + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ + data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id} + }).then(res=>{ + if(res.data.code==0){ + pick_no=res.data.data.pickup_no; + } + }) + //读取线下的门店库存 + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ + data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid} + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + plist=res.data.data.pageData[0]; + } + }) + var ob={}; ob.code=1; + if(!plist){ + ob.code=-1; ob.CanOutQty=0; + func(ob);return false; + } + + if(num>plist.CanOutQty-lock){ + ob.code=-1; + ob.CanOutQty=plist.CanOutQty-lock + if(ob.CanOutQty<0) ob.CanOutQty=0; + } + func(ob) + }, + + + //再来一单的功能的实现 + moreOrder:function(e){ + var th=this; + var item=th.data.order; + + if(this.data.moring) return false; + this.data.moring=1; + + th.check_more_order(item); + }, + + check_more_order:async function(item){ + var pickup=null,th=this; + var user_id=getApp().globalData.userInfo.user_id; + wx.showLoading(); + //--------获取门店----------- + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { + + }).then(res=>{ + pickup = res.data.data; + }) + if(!pickup){ + wx.hideLoading(); + getApp().confirmBox("找不到门店"); + this.data.moring=0; + return false; + } + + if(pickup.isstop){ + wx.hideLoading(); + getApp().confirmBox("门店已停用"); + this.data.moring=0; + return false; + } + + if(!pickup.is_pos){ + wx.hideLoading(); + getApp().confirmBox("门店不允许销售"); + this.data.moring=0; + return false; + } + + //--------获取商品---------- + var goods_list=item.order_goods; + //--- 返回的内容 --- + var back_goods_arr=[]; + var err_text=""; + for(var i in goods_list){ + var g_item=goods_list[i]; + var b_item={}; + //--如果是赠品，不加入购物车-- + if(g_item['is_gift']) continue; + if(g_item['prom_type']==4 ){ + err_text+= g_item['goods_name']+"积分购商品不加入购物车\n"; + continue; + } + if(g_item['prom_type']==5){ + err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n"; + continue; + } + if(g_item['prom_type']==6 ){ + err_text+= g_item['goods_name']+"拼团商品不加入购物车\n"; + continue; + } + + //--获取商品-- + var good=null; + await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, { + + }).then(res=>{ + good=res.data.data; + }) + + //调用接口判断订单优惠， + const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0"+"/"+getApp().globalData.user_id, {}) + if (res.data.code == 0 && res.data.data) { + var r_data = res.data.data; + if (r_data.ladderLists) { + var act_id = r_data.ladderLists[0].form_id; + //-- 判断会员能不能参与阶梯促销 -- + const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) + if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { + b_item.prom_type = 10; + b_item.prom_id = data.data.data.id; + } + } + } + + if(!good){ + err_text+= g_item['goods_name']+"未找到商品\n"; + continue; + } + if (good.is_on_sale != 1) { + err_text+= g_item['goods_name']+"已经下架\n"; + continue; + } + + var timestamp = ut.gettimestamp(); + if (good.on_time > timestamp) { + err_text+= g_item['goods_name']+"还未上架\n"; + continue; + } + if (good.down_time > 0) { + if (good.down_time < timestamp) { + err_text+=g_item['goods_name']+"已经下架\n"; + continue; + } + } + + //如果商品的配送方式和门店不匹配 + if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){ + err_text+= good['goods_name']+"配送方式不一致\n"; + continue; + } + + var prom=null; + + b_item.goods_id=g_item.goods_id; + b_item.goods_name=g_item.goods_name; + b_item.goods_num=g_item.goods_num; + b_item.guide_id=g_item.guide_id; + b_item.guide_type=g_item.guide_type; + b_item.pickup_id=item.pickup_id; + b_item.price=good.shop_price; + b_item.goods_sn=good.goods_sn; + b_item.sku=good.sku; + b_item.is_integral_normal=g_item.is_integral_normal; + + //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 -- + var card_field=th.data.card_field; + if(card_field && good[card_field]>0){ + b_item.price=good[card_field]; + } + + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id + }; + await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + if(res.data.code==0){ + var list = res.data.data; + for(let i in list){ + let item=list[i]; + if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; } + } + } + }) + + if(!prom) { + //--判断商品当前的活动情况-- + switch (good.prom_type) { + case 1: + var flash = null; + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + good.prom_id, {}).then(res => { + if (res.data.code == 0) { + flash = res.data.data; + } + }) + //----已经结束----- + if (flash && flash.is_end == 0) { + + if( flash.end_time > timestamp && flash.start_time < timestamp){ + prom = flash; + prom.price = prom.user_price; + b_item.price = prom.price; + good.prom_type = 1; + good.prom_id = prom.id; + }else{ + if(g_item.prom_type==0 && !flash.is_shop_buy ){ + err_text+=g_item['goods_name']+"秒杀活动不允许普通价\n"; + continue; + } + } + + } + break; + case 2: + var group = null; + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => { + if (res.data.code == 0) { + group = res.data.data; + } + }) + //----已经结束----- + if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { + prom = group; + prom.price = prom.price; + b_item.price = prom.price; + } + break; + case 6: + b_item.is_pd_normal = 1; + break; + case 7: + //如果有组合购 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data) { + if (res.data.data.is_show == 1 && res.data.data.is_end == 0 + && ut.gettimestamp() < res.data.data.end_time + && ut.gettimestamp() > res.data.data.start_time + ) { + b_item.prom_type = 7; + b_item.prom_id = res.data.data.id; + good.prom_type = 7; + good.prom_id = res.data.data.id; + } + } + }) + break; + case 10: + let user_id = getApp().globalData.userInfo.user_id; + var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) { + b_item.prom_type = 10; + b_item.prom_id = res.data.data.id; + } + }) + break; + } + } + + //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 + if((g_item.prom_type==3 || good.prom_type==3) && good.whsle_id<=0){ + var is_g_prom=0; + //因为有全场优惠活动，商品参加的活动还未开始 + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id + }; + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { + if(res.data.code==0 && res.data.data && res.data.data.length){ + for(let i in res.data.data){ + let item=res.data.data[i]; + if(item.prom_type==3) { + is_g_prom=1; break; + } + } + } + }) + if(is_g_prom) { + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (r_data.promGoodsLists) { + b_item.prom_type = 3; + b_item.prom_id = r_data.promGoodsLists[0].prom_id; + } + } + }) + }else{ + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (r_data.promGoodsLists) { + b_item.prom_type = 3; + b_item.prom_id = r_data.promGoodsLists[0].prom_id; + } + } + }) + } + } + + + //判断是不是线下库存的购买， 是不是秒杀活动 + if(th.data.sales_rules==2 && !prom){ + + //-- 看一下购物车上有多少商品 -- + var cart_num=0; + await getApp().request.promiseGet("/api/weshop/cart/page", { + data: { + store_id: os.stoid, + user_id: getApp().globalData.user_id, + state:0, is_gift:0, + goods_id:good.goods_id, + pick_id: b_item.pickup_id + } + }).then(res=>{ + var num = 0; + if(res.data.code==0 && res.data.data && res.data.data.pageData) { + for (var i = 0; i < res.data.data.pageData.length; i++) { + num += res.data.data.pageData[i].goods_num; + } + } + cart_num=num; + }) + + var lock=0,plist=null; + + if(b_item.prom_type!=7) { + //先读取门店的lock, + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000} + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty + } + }) + + //---通过接口获取门店的线下库存信息-- + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: { + storageNos: pickup.pickup_no, + wareIds: encodeURIComponent(good.erpwareid), + storeId: os.stoid + } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; + } + }) + + if (!plist) { + err_text += good['goods_name'] + "库存不足\n"; + continue; + } + if (plist.CanOutQty - lock <= 0) { + err_text += good['goods_name'] + "库存不足\n"; + continue; + } + if (b_item.goods_num > (plist.CanOutQty - lock)) { + b_item.goods_num = plist.CanOutQty - lock; + } + } + var req_data={ + store_id: os.stoid, + user_id: getApp().globalData.user_id, + goods_id: good.goods_id, + }; + if(b_item.prom_type==7){ + req_data.prom_type=7; + req_data.prom_id=b_item.prom_id; + } + + var buynum=0; + var promnum=0; + //---要获得商品，该用户买了多少件,同步应用--- + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: req_data, + }).then(res => { + if(res.data.code==0){ + var buy_num_data = res.data.data; + buynum = buy_num_data.goodsbuynum; + if(buy_num_data.promgoodsbuynum){ + promnum=buy_num_data.promgoodsbuynum; + } + } + }) + + //---- 要计算商品的限购 ----- + if(good['viplimited']>0){ + if(cart_num+buynum>good['viplimited']){ + err_text+= good['goods_name']+"超出限购\n"; + continue; + } + good['viplimited']-=(cart_num+buynum); + if(b_item.goods_num>good['viplimited']){ + b_item.goods_num=good['viplimited']; + } + } + //不需要计算组合购的限购 + + back_goods_arr.push(b_item); //返回商品元素 + + }else{ + //-- 看一下购物车上有多少商品 -- + var cart_num=0; + await getApp().request.promiseGet("/api/weshop/cart/page", { + data: { + store_id: os.stoid, + user_id: getApp().globalData.user_id, + state:0, is_gift:0, + goods_id:good.goods_id + } + }).then(res=>{ + var num = 0; + if(res.data.code==0 && res.data.data && res.data.data.pageData) { + for (var i = 0; i < res.data.data.pageData.length; i++) { + num += res.data.data.pageData[i].goods_num; + } + } + cart_num=num; + }) + + if(good.store_count<=0){ + err_text+= good['goods_name']+"库存不足\n"; + continue; + } + if(b_item.goods_num>good.store_count) + b_item.goods_num=good.store_count; + + var buynum=0; //商品已经购买多少件 + var promgoodsbuynum=0; //活动已经购买多少件 + var redis_num = 0; //redis库存 + + var req_data={ + store_id: os.stoid, + user_id: getApp().globalData.user_id, + goods_id: good.goods_id, + }; + + if(prom){ + req_data.prom_type= good.prom_type; + req_data.prom_id= good.prom_id; + b_item.prom_type=good.prom_type; + b_item.prom_id=good.prom_id; + + //------判断活动是否抢光----- + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + + os.stoid + "/" + good.prom_type + "/" + good.prom_id, { + 1: 1 + }).then(res => { + redis_num = res.data.data; + }); + if(redis_num<=0){ + //不允许商品普通价格修改 + if(!prom.is_shop_buy && prom.is_shop_buy!=undefined) { + err_text += good['goods_name'] + "活动不足\n"; + continue; + } + } + + } + + //---要获得商品，该用户买了多少件,同步应用--- + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: req_data, + }).then(res => { + if(res.data.code==0){ + var buy_num_data = res.data.data; + if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; + buynum = buy_num_data.goodsbuynum; + } + }) + + //---- 要计算商品的限购 ----- + if(good['viplimited']>0){ + if(cart_num+buynum>good['viplimited']){ + err_text+= good['goods_name']+"超出限购\n"; + continue; + } + good['viplimited']-=(cart_num+buynum); + if(b_item.goods_num>good['viplimited']){ + b_item.goods_num=good['viplimited']; + } + + } + + //-- 判断活动的库存 -- + if(prom){ + if(prom['goods_num']<=prom['buy_num']){ + err_text+= good['goods_name']+"超出活动库存\n";continue; + } + + if(b_item.goods_num>prom['goods_num']-prom['buy_num']){ + b_item['goods_num']= b_item['goods_num']-b_item['buy_num']; + } + + if(b_item.goods_num>redis_num){ + b_item.goods_num=redis_num; + } + + if(prom['buy_limit']>0){ + if(cart_num+promgoodsbuynum>=prom['buy_limit'] ){ + err_text+= good['goods_name']+"超出活动限购\n";continue; + } + prom['buy_limit'] -= (cart_num+buynum); + if(b_item.goods_num>prom['buy_limit']){ + b_item.goods_num=prom['buy_limit']; + } + } + + + } + back_goods_arr.push(b_item); //返回商品元素 + } + } + + //有重新购买的数据是时候，就要重新生成订单 + if(back_goods_arr.length>0){ + th.setData({back_goods_arr:back_goods_arr}); + if(!err_text){ + th.more_add_cart(); + }else{ + wx.hideLoading(); + // 如果没有获取用户信息 + wx.showModal({ + title:'确定', + content: err_text+',确定要买其他商品码？', + success(res) { + if (res.confirm) { + //跳转到登录页 + th.more_add_cart(); + }else{ + th.data.moring=0; + wx.hideLoading(); + } + },fail(){ + th.data.moring=0; + wx.hideLoading(); + } + }); + + } + }else{ + th.data.moring=0; + wx.hideLoading(); + getApp().confirmBox(err_text); + } + }, + + more_add_cart:async function(){ + var back_goods_arr=this.data.back_goods_arr; + var err_text=""; + var ok_num=0; + + for(var i in back_goods_arr){ + //商品ID + var g_item=back_goods_arr[i]; + var newd = { + goods_id: g_item.goods_id, + goods_num: g_item.goods_num, + pick_id: g_item.pickup_id, + user_id: oo.user_id, + store_id: os.stoid, + goods_price: g_item.price, + member_goods_price: g_item.price, + goods_name: g_item.goods_name, + goods_sn: g_item.goods_sn, + sku: g_item.sku, + }; + + if(g_item.guide_id){ + newd['guide_id']=g_item.guide_id; + newd['guide_type']=g_item.guide_type; + } + + if(g_item.is_integral_normal){ + newd['is_integral_normal']=g_item.is_integral_normal; + } + if(g_item.is_pd_normal){ + newd['is_pd_normal']=g_item.is_pd_normal; + } + if(g_item.prom_type){ + newd['prom_type']=g_item.prom_type; + newd['prom_id']=g_item.prom_id; + } + + + + var b_cart_goods=null; + await getApp().request.promiseGet("/api/weshop/cart/page", { + data: { + store_id: os.stoid, + user_id: oo.user_id, + goods_id: g_item.goods_id, + pick_id: g_item.pickup_id, + }, + }).then(res=>{ + //-------如果购物车中有相关的数据------- + if (res.data.data.total > 0) { + b_cart_goods= res.data.data.pageData[0]; + } + }) + + //-- 如果就加入过购物车 -- + if(b_cart_goods){ + var updata = { + id: b_cart_goods.id, + goods_num: newd.goods_num + b_cart_goods.goods_num, + goods_price: newd.goods_price, + member_goods_price:newd.goods_price, + store_id: os.stoid, + }; + if(newd.guide_id){ + updata.guide_id=newd.guide_id; + updata.guide_type=newd.guide_type; + } + await getApp().request.promisePut("/api/weshop/cart/update", { + data: updata + }).then(res=>{ + if(res.data.code==0) { + ok_num++; + }else{ + err_text+=newd.goods_name+"加入购物车失败\n"; + } + }) + + }else{ + await getApp().request.promisePost("/api/weshop/cart/save", { + data: newd + }).then(res=>{ + if(res.data.code==0) { + ok_num++; + }else{ + err_text+=newd.goods_name+"加入购物车失败\n"; + } + }) + } + } + + wx.hideLoading(); + this.data.moring=0; + if(ok_num==0){ + //-- 如果没有获取用户信息 -- + wx.showModal({ + title:'提示', + content: err_text, + success(res) {} + }); + }else{ + if(err_text==""){ + getApp().goto("/pages/cart/cart/cart"); + }else{ + // 如果没有获取用户信息 + wx.showModal({ + title:'提示', + content: err_text, + success(res) { + if (res.confirm) { + //跳转到登录页 + getApp().goto("/pages/cart/cart/cart"); + } + } + }); + + } + + } + }, + + toast(msg){ + wx.showToast({ + title: msg, + icon: 'none', + duration: 3000 + }) + }, + + con_weixin:function () { + getApp().con_wx(this); + }, + + //跳转到商品 + go_gd:function (e) { + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + var gd= e.currentTarget.dataset.gd; + var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:os.stoid,goodsidlist:gd,is_detail:1,user_id:user_id + }; + //获取秒杀的多规格 + getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + if(res.data.code==0 && res.data.data){ + if(res.data.data.length==1){ + var item=res.data.data[0]; + switch (item.prom_type){ + case 9: + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id; + break; + case 8: + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id + break; + default: + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1"; + break + } + } + getApp().goto(good_url); + + }else{ + getApp().goto(good_url); + } + }) + }, + + + + click_contact:function () { + getApp().globalData.no_clear=1; + } + + + + +}); \ No newline at end of file diff --git a/packageD/pages/shop/order_detail/order_detail.json b/packageD/pages/shop/order_detail/order_detail.json new file mode 100644 index 0000000..c9e22db --- /dev/null +++ b/packageD/pages/shop/order_detail/order_detail.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageD/pages/shop/order_detail/order_detail.wxml b/packageD/pages/shop/order_detail/order_detail.wxml new file mode 100644 index 0000000..2e34bef --- /dev/null +++ b/packageD/pages/shop/order_detail/order_detail.wxml @@ -0,0 +1,144 @@ + + + + + {{order.consignee}}{{'　　'}}{{order.mobile}} + + + {{order.more_address}} {{order.address}} + + + + + + + + + + 门店：{{order.pickname}} + {{order.order_status_detail}} + + + + + + + + + {{item.goods_name}} + + {{filters.show_gui_ge(item.goods_spec,item.goods_color)}} + + + + ￥{{item.member_goods_price}}({{item.ladder_discount}}折) + ×{{item.goods_num}} + + + + 申请退款 + 退款中 + 重新退款 + 退款完成 + + + + + + + + + 基本信息 + + 订单编号 + {{order.order_sn}} + + + 下单时间 + {{order.addTimeFormat}} + + + + 配送方式 + + -- + + {{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}} + + + 买家留言 + {{order.user_note!=''?order.user_note:'无'}} + + + + 价格信息 + + 商品总价 + ￥ {{filters.toFix(order.order_goods[0].member_goods_price*order.order_goods[0].goods_num,2)}}元 + + + 商品总价 + ￥ {{order.goods_price}}元 + + + + 定金金额 + ￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元 + + + 尾款金额 + ￥ {{filters.toFix(order.pt_tail_money-order.shipping_price,2)}}元 + + + + 配送费用 + ￥ {{order.shipping_price}}元 + + + 优惠券 + ￥ {{order.coupon_price}}元 + + + + 积分 + {{order.integral}}积分 + + + + 优惠活动 + ￥ {{filters.toFix(order.discount_amount,2)}}元 + + + + 阶梯优惠活动 + ￥ {{filters.toFix(order.ladder_amount,2)}}元 + + + + 订单优惠 + ￥ {{order.order_prom_amount}}元 + + + + 订单总价 + ￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元 + + + + + 使用余额 + ￥ {{filters.toFix(order.user_money+order.pt_tail_money,2)}}元 + ￥ {{filters.toFix(order.user_money,2)}}元 + + + + + + + + diff --git a/packageD/pages/shop/order_detail/order_detail.wxss b/packageD/pages/shop/order_detail/order_detail.wxss new file mode 100644 index 0000000..d0b0b02 --- /dev/null +++ b/packageD/pages/shop/order_detail/order_detail.wxss @@ -0,0 +1,178 @@ +.user-mes { + background-color: #fff; + font-size: 32rpx; + color: #333; +} + +.user-contact { + padding: 24rpx 80rpx; +} + +.location { + position: relative; + padding: 0 80rpx 24rpx; +} + +.pos-icon { + position: absolute; + left: 30rpx; + top: 0; + width: 32rpx; + height: 32.5rpx; +} + +.border-img { + width: 100%; + height: 16rpx; +} + +.order-meg { + margin-bottom: 20rpx; + font-size: 30rpx; +} + +.order-state { + height: 100rpx; + line-height: 100rpx; + padding-right: 40rpx; + padding-left: 40rpx; + background-color: #fff; + color: #f23030; + justify-content: space-between; + display: flex; +} +.shop_name{color: #333} +.order-detail { + padding: 30rpx 0; + border-bottom: 1px solid #ddd; + color: #666; + min-height: 115rpx; +} +.goods-img { + float: left; + width: 100rpx; + height: 100rpx; + margin: 0 30rpx; +} + +.order-cont { + float: left; + width: 410rpx; +} + +.goods-name { + height: 60rpx; + line-height: 30rpx; + overflow: hidden; + margin-bottom: 16rpx; +} + +.goods-color { + font-size: 24rpx; +} + +.order-num { + float: right; + font-size: 24rpx; + margin-top: 10rpx; + margin-right: 20rpx; + text-align: right; + line-height: 42rpx; +} + +.order-operate { + height: 100rpx; + padding-right: 20rpx; + background-color: #fff; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.check-btn { + width: 180rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + margin-right: 10rpx; + border: 1px solid #eee; +} + +.goods-btn { + width: 150rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + border: 1px solid #eee; +} + +.cancel-order { + margin-left: 20rpx; +} + +.information { + padding: 0 20rpx; + background-color: #fff; + margin-bottom: 20rpx; +} + +.information .title { + height: 70rpx; + line-height: 70rpx; + border-bottom: 1rpx solid #ddd; + font-size: 34rpx; + color: #333; +} + +.information .item { + display: flex; + justify-content: space-between; + height: 60rpx; + line-height: 60rpx; + font-size: 30rpx; + color: #333; +} + +.information .item.pnew{ + height: 50rpx; + line-height: 50rpx; + color: #999; +} +.item-line{ margin: 5rpx 0; height: 1rpx; border-bottom:1rpx solid #ddd } + +.delivery-address,.leave-word { + width: 500rpx; + text-align: right; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.pay-amount { + color: #f23030; +} + +.btn-wrap { + height: 100rpx; + background-color: #fff; + text-align: right; + position: fixed; width: 100%; bottom: 0; border-top: 1rpx solid #ddd +} + +.tips-btn { + display: inline-block; + width: 200rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 30rpx; + color: #fff; + background-color: #f23030; + /* margin-left: 2rpx; */ + margin-right: 8rpx +} + + +.contact-us.goods-btn::after { + content: none; +} \ No newline at end of file diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 47c3850..cb54ec2 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -702,7 +702,7 @@ Page({ user_money: 0, total_amount: 0, order_amount: 0, - user_note: 0 + user_note: "" }; //-- 把等级卡会优惠多少钱装进去 -- @@ -1026,7 +1026,7 @@ Page({ user_money: 0, total_amount: 0, order_amount: 0, - user_note: 0 + user_note: "" }; cart_arr.push(ie); th.data.old_cartlist = cart_arr; @@ -1331,10 +1331,11 @@ Page({ //如果有限制使用优惠券，就要减掉参与的活动商品的钱 if (!item_map.is_xz_yh) q_conditin = o_price; } - + //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表----------- for (var j = 0; j < ord_goods.length; j++) { if (ord_goods[j].is_gift) continue; + if (ord_goods[j].whsle_id) continue; if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) { ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh; ord_goods[j].is_past = item_map.is_past; @@ -1465,6 +1466,7 @@ Page({ //-------------------计算订单价格------------------- calculatePrice:async function (t, s) { var th = this; + th.setData({submit:1}); wx.showLoading({ title: "处理中.", @@ -1577,8 +1579,8 @@ Page({ //--------循环计算总价----------- for (var j = 0; j < item.length; j++) { - if(item.whsle_id>0){ - whsle_goods_price+=item.goods_price*item.goods_num; + if(item[j].whsle_id>0){ + whsle_goods_price+=item[j].goods_price*item[j].goods_num; } var is_no_zh = 0; @@ -1701,7 +1703,7 @@ Page({ var user_addr=th.data.user_addr; var req_d = { province: user_addr.province, city: user_addr.city, district: user_addr.district, - wuliu:parseFloat(o_price - quan_price).toFixed(2),store_id: os.stoid + wuliu:parseFloat(o_price - quan_price-whsle_goods_price).toFixed(2),store_id: os.stoid } await getApp().request.promisePost("/api/weshop/order/areaFreight", { is_json: 1, data: req_d @@ -1888,6 +1890,10 @@ Page({ break; case 1: //order_m = o_condition - ord_prom['expression'];//满额优惠金额 + var bs=1; + if(ord_prom.is_bz){ + bs=Math.floor(o_condition/ord_prom.money); + } order_prom_amount = ord_prom['expression']; break; } @@ -1988,7 +1994,7 @@ Page({ [atxt]: all_total_m, [atxt1]: all_order_m, [atxt2]: all_price, [atxt3]: all_user_m, [atxt4]: all_shipping_m, [atxt5]: all_coupon_price_m, [atxt6]: all_cutprice, - [atxt7]: all_order_prom, show_submit: 1, [atxt8]: all_zh_cutprice, [atxt9]: all_ladder_cutprice + [atxt7]: all_order_prom, show_submit: 1, [atxt8]: all_zh_cutprice, [atxt9]: all_ladder_cutprice,submit:0 }) th.data.order_prom_list_cart = c_arr; th.set_can_num(); @@ -2039,6 +2045,7 @@ Page({ return false; } + th.setData({submit:1}); wx.showLoading({ title: "处理中.", mask:true @@ -2326,7 +2333,13 @@ Page({ order_prom_amount = (o_condition - order_m).toFixed(2); break; case 1: - order_m = o_condition - ord_prom['expression'];//满额优惠金额 + //-- 如果有优惠促销倍减的时候 -- + var bs=1; + if(ord_prom.is_bz){ + bs=Math.floor(o_condition/ord_prom.money); + } + + order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额 order_prom_amount = ord_prom['expression']; break; } @@ -2358,14 +2371,14 @@ Page({ if (th.data.bn_use_money == 1) { if (amoney > order_m) { order_m = parseFloat(order_m).toFixed(2); - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,submit:0 }) } else { order_m = parseFloat(order_m) - parseFloat(amoney); order_m = order_m.toFixed(2); - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,submit:0 }) } } else { - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,submit:0 }) } //优惠活动送积分 if (good.s_intValue) { @@ -2425,14 +2438,14 @@ Page({ if (th.data.bn_use_money == 1) { if (amoney > order_m) { order_m = parseFloat(order_m).toFixed(2); - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 ,submit:0}) } else { order_m = parseFloat(order_m) - parseFloat(amoney); order_m = order_m.toFixed(2); - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,submit:0 }) } } else { - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 }) + th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,submit:0 }) } //优惠活动送积分 if (good.s_intValue) { @@ -2545,7 +2558,7 @@ Page({ 'user_money': parseFloat(th.data.formData.user_money).toFixed(2), //使用余额 'total_amount': parseFloat(th.data.formData.total_amount).toFixed(2), //订单总价 'order_amount': parseFloat(th.data.formData.order_amount).toFixed(2), //应付 - 'user_note': th.data.user_note['0'] ? th.data.user_note['0'] : 0, //用户备注 + 'user_note': th.data.user_note['0'] ? th.data.user_note['0'] : "", //用户备注 'store_id': oo.stoid, //商家 'pickup_id': th.data.bn_pick, //门店 'exp_type': th.data.bn_exp_type, //配送方式 @@ -2918,10 +2931,10 @@ Page({ var df_price = 0; var df_room_ids = ""; - //多个商品才运算 - if( t_item.goods.length>1) { //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { + + console.log("222"); var g_item = t_item.goods[k]; if (g_item.goods_num <= 0) continue; var goods = { @@ -3021,7 +3034,7 @@ Page({ } //-- 如果有代发商品，就要开始拆单 -- - if (g_item.whsle_id) { + if (g_item.whsle_id && t_item.goods.length>1) { df_price += parseFloat(g_item.goods_num * g_item.goods_price); goods.is_whsle_goods = 1; df_goods.push(goods); @@ -3035,15 +3048,15 @@ Page({ } } } - } + //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); - - + //处理代发商品的拆分 - if(df_goods.length>0){ + if(df_goods.length>0 && item.order_goods.length>0 ){ var df_item=JSON.parse(JSON.stringify(item)); + item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); @@ -3053,6 +3066,8 @@ Page({ df_item.total_amount=df_price; df_item.shipping_price=0; //没有运费 if(df_item.order_prom_list) df_item.order_prom_list={}; + if(df_item.coupon_price) delete(df_item.coupon_price); + if(df_item.coupon_no) delete(df_item.coupon_no); //看一下是用余额比较多，还是用钱比较多 if(item.order_amount>item.user_money){ @@ -3082,7 +3097,11 @@ Page({ df_item.order_goods=df_goods; pdata.push(df_item); } - + //如果只有代发商品的时候 + if(df_goods.length>0 && item.order_goods.length<=0){ + item.order_goods=df_goods; + item.is_whsle=1; + } pdata.push(item); } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index db2038f..0808679 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -396,10 +396,12 @@ Page({ //---------计算立即购买---------- calculatePrice2:async function () { - wx.showLoading({ + this.setData({submit:1}); + + wx.showLoading({ title: "处理中.", mask:true - }) + }) var th = this, good = this.data.bn_goods; //-----------计算商品总价-------------- @@ -533,14 +535,14 @@ Page({ //--------------如果使用余额--------------------- if (th.data.bn_use_money == 1 && th.data.yuer > 0) { if (parseFloat(th.data.yuer) > total_m) { - th.setData({ [txt]: total_m, [txt2]: 0 }) + th.setData({ [txt]: total_m, [txt2]: 0,submit:0 }) } else { order_m = parseFloat(order_m) - parseFloat(th.data.yuer); order_m = order_m.toFixed(2); - th.setData({ [txt]: th.data.yuer, [txt2]: order_m }) + th.setData({ [txt]: th.data.yuer, [txt2]: order_m,submit:0 }) } } else { - th.setData({ [txt]: 0, [txt2]: order_m }) + th.setData({ [txt]: 0, [txt2]: order_m,submit:0 }) } wx.hideLoading(); diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index bfb15a0..f2335b4 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -158,7 +158,7 @@ 应付金额：￥{{formData.order_amount}} - + diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 6dc8685..6534faa 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -40,6 +40,7 @@ Page({ show_pay_type: 0, teamgroup: null, + submit:1, //默认按钮是灰色 }, /** @@ -71,7 +72,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - getApp().check_can_share(); + getApp().check_can_share(); var th = this; if (th.data.isclose == 0) { wx.navigateTo({ @@ -96,7 +97,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { getApp().globalData.no_clear=1 }, + onShareAppMessage: function () { getApp().globalData.no_clear=1 }, //---------------获取物流--------------- get_wuliu(func) { var th = this, @@ -296,7 +297,7 @@ Page({ } else { var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money; allpice = allpice.toFixed(2); - th.setData({ exp_price: 0, allpice: allpice }) + th.setData({ exp_price: 0, allpice: allpice,submit:0 }) } }, @@ -330,6 +331,8 @@ Page({ //--计算物流的值-- if (type == 0) { + + th.setData({submit:0}) th.calculate_wuliu(); } else { var allpice = parseFloat(th.data.order.order_amount) @@ -348,11 +351,19 @@ Page({ }, //--弹起支付框-- to_pay() { + + + //如果有再计算价格的过程中，不能提交订单 + if(this.data.submit){ return false} + //--物流支付时要有地址-- if (this.data.exp_type == 0 && this.data.user_addr == null) { return getApp().my_warnning("请选择收货地址", 0, this); } + + + this.setData({ show_pay_type: 1 }); }, @@ -474,6 +485,8 @@ Page({ //----计算物流的钱---- async calculate_wuliu() { + //让按钮变灰色 + this.setData({submit:1}); var to = getApp(), th = this; //to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1, good = th.data.goods; @@ -568,13 +581,14 @@ Page({ await getApp().request.promisePost('/api/weshop/order/getOrderWuLiPrice', {data:w_data,is_json:1}).then(res=>{ if(res.data.code==0){ shipping_price=res.data.data; is_ok=1; + }else{ + wx.showToast({ + title: "计算物流错误:"+res.data.msg, icon: 'none',duration: 2000 + }) } }) if(!is_ok){ - wx.showToast({ - title: "计算物流错误", icon: 'none',duration: 2000 - }) - th.setData({ show_submit:0 }); + th.setData({ submit:0 }); wx.hideLoading(); return false; } @@ -584,11 +598,11 @@ Page({ allpice = allpice.toFixed(2); exp_price = parseFloat(exp_price); - th.setData({ exp_price: exp_price, allpice: allpice }) + th.setData({ exp_price: exp_price, allpice: allpice,submit:0 }) } else { var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money; allpice = allpice.toFixed(2); - th.setData({ exp_price: 0, allpice: allpice }) + th.setData({ exp_price: 0, allpice: allpice,submit:0}) } //}); diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index dca4ecd..4e58a03 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -110,7 +110,7 @@ ¥{{filters.toFix(order.tail_money+exp_price,2)}} --> 支付合计：¥{{filters.toFix(order.tail_money+exp_price,2)}} - 支付尾款 + 支付尾款 diff --git a/pages/cart/cart_wk/cart_wk.wxss b/pages/cart/cart_wk/cart_wk.wxss index 282ca14..bd6b927 100644 --- a/pages/cart/cart_wk/cart_wk.wxss +++ b/pages/cart/cart_wk/cart_wk.wxss @@ -288,7 +288,11 @@ page { color: #c4182e; } -/*----------nyf新增，地址---------*/ +.zf_btn.gray{ + background-color:darkgrey; +} + + /*----------nyf新增，地址---------*/ .add_new{ box-sizing: border-box; height: 92rpx; diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml index 57948bd..e0f40b8 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.wxml +++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml @@ -21,7 +21,8 @@ 我的礼包 - + + diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 2da23ec..029f528 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -228,7 +228,7 @@ Page({ giftTitle: res.data.data.giftTitle, default_color: res.data.data.bgcolor }) - + if(res.data.data.iswarelbtype==1) { th.setData({iswarelbtype:1}) } diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index b145b27..f820b5d 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -19,7 +19,7 @@ {{"兑换结束时间："+giftDate}} - + {{"活动结束时间："+giftDate}} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 9e23f2c..ec78e10 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1793,7 +1793,7 @@ Page({ //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); if ("add" == t.currentTarget.dataset.action) { - if (th.data.prom_goods) { + if (th.data.prom_goods && !th.data.sele_g.whsle_id) { newd.prom_type = 3; newd.prom_id = th.data.prom_goods[0].prom_id; } diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index 7fa1335..1a0d100 100644 --- a/pages/togoin/togoin.js +++ b/pages/togoin/togoin.js @@ -11,6 +11,7 @@ Page({ store_logo:'', first_leader:'', //-- 邀请人 -- config2:null, + sub:0 }, onLoad: function (options) { if (wx.getUserProfile) { @@ -232,8 +233,13 @@ Page({ } }) - }else{ + + this.setData({sub:1}); + wx.showLoading({ + title:'处理中.', + mask:true + }) this.zu_ce(dd); //调用注册的函数 } @@ -256,9 +262,11 @@ Page({ }, failStatus: function (t) { - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); + th.setData({sub:0}); + return app.my_warnning("授权登入失败,请稍后再试!", 0, th); }, fail: function (t) { + th.setData({sub:0}); return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; } }); diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml index 7ec704c..8f14586 100644 --- a/pages/togoin/togoin.wxml +++ b/pages/togoin/togoin.wxml @@ -68,7 +68,7 @@ 暂不授权 - + diff --git a/utils/util.js b/utils/util.js index 39c9180..867edf8 100644 --- a/utils/util.js +++ b/utils/util.js @@ -685,8 +685,8 @@ module.exports = { if (e.data.code == 0 && e.data.data ) { // 提示框 wx.showModal({ - title: '注册邀请', - content: e.data.data.vipname+'邀请你成为会员？', + title: '邀请登录', + content: e.data.data.vipname+'邀请你登录成为会员？', success: function (res) { if (res.confirm) { getApp().goto("/pages/togoin/togoin");