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 6cee44d..93f7bf0 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -23,6 +23,7 @@ var date = new Date(timestamp); // barcode, // qrcode // } = require('../../../utils/index.js'); +var regeneratorRuntime = require('../../../utils/runtime.js'); Page({ data: { @@ -71,8 +72,9 @@ Page({ check_label: [], //我选择的兴趣标签 fir_guide_id:null, //存储会员详情接口出来的美导ID isLunar: 0, - lat: null, //维度 - lon: null, //经度 + lat: null, //维度 + lon: null, //经度 + loading:0, }, //通过路径跳转到其他页面 @@ -576,114 +578,104 @@ Page({ self = this; let url1 = '/api/weshop/storeconfig/get/'; - let url3 = '/api/weshop/users/getERPUser/'; + let url3 = '/api/weshop/users/getErpvipidPickup'; url1 += r.stoid; - var user=app.globalData.userInfo; - if(!user) return false; - - //-- 赋予默认值 -- - if(user['idcard']) this.data.id=user['idcard']; - if(user['vipname']) this.data.name=user['vipname']; - if(user['address']) this.data.address=user['address']; - + + var uu=getApp().globalData.zc_dd; + if(uu){ + this.setData({head_pic:uu.head_pic,nickname:uu.nickname}) + } + app.request.get(url1, { - success: function(res) { - console.log('x-->', res.data.code, res.data.data.reg_type, res.data.data.reg_info); + success:async function(res) { if(res.data.code == 0) { let reg_type = res.data.data.reg_type; let reg_info = res.data.data.reg_info; if(reg_type) { //reg_type为1才显示积分信息 if(reg_info) { - reg_info = JSON.parse(reg_info); + reg_info = JSON.parse(reg_info); + var user_id=0; + + //-- 获取会员信息 - + await getApp().request.promiseGet("/api/weshop/users/page", {data:{ + store_id:r.stoid,mobile:uu.mobile + }}).then(res=>{ + if(ut.ajax_ok(res)){ + user_id=res.data.data.pageData[0].user_id; + } + }) + if(reg_info.reginfo_coupon){ //判断有没有领过券 - self.check_is_send_quan(reg_info.reginfo_coupon,user.user_id); - } + self.check_is_send_quan(reg_info.reginfo_coupon,user_id); + } + + if(reg_info.reginfo_lb_id){ + //判断有没有领过礼包 + self.check_is_send_libao(reg_info.reginfo_lb_id,user_id); + } + }; }; self.setData({ reg_type, reg_info, - user: app.globalData.userInfo, }); - }; - + } }, }); - - //获取默认信息 - url3 += r.stoid + "/" +user.user_id; - app.request.get(url3, { - success: function(res) { - if(res.data.code == 0) { - console.log('url3', res.data.data.birthday); - let data = res.data.data; - - if(data.birthday){ - data.birthday= ut.formar_no_full(data.birthday); - } - - if(user['sex'] && !data.sex){ - data.sex=user['sex']; - } - if(user['birthday'] && !data.birthday){ - data.birthday= ut.formar_no_full(user['birthday']); - } - - if(!data.pickup_name){ - data.pickup_name=""; - } - if(!data.pickup_id){ - data.pickup_id=0; - } - //-- 获取门店 -- - if(user['pickup_id'] && !data.pickup_id){ - getApp().promiseGet("/api/weshop/pickup/get/"+r.stoid+"/"+user['pickup_id']).then(res=>{ - if(res.data.code==0 && res.data.data){ - data.pickup_name=res.data.data.pickup_name; - data.pickup_id=res.data.data.pickup_id; - - self.setData({ - isGender: data.sex, - isLunar: data.islunar, - datet: data.birthday, - stoname: data.pickup_name, - sto_sele_id: data.pickup_id, - }); - } - else{ - self.setData({ - isGender: data.sex, - isLunar: data.islunar, - datet: data.birthday, - stoname: data.pickup_name, - sto_sele_id: data.pickup_id, - }); - } - if(!self.data.sto_sele_id){ - self.get_store_set(); - } - }) - }else{ - self.setData({ - isGender: data.sex, - isLunar: data.islunar, - datet: data.birthday, - stoname: data.pickup_name, - sto_sele_id: data.pickup_id, - }); - } - - if(!self.data.sto_sele_id){ - self.get_store_set(); - } - }; - } - }); - - if(user){ - self.setData({user:user}) - } + + + //-- 获取线下会员的情况 -- + var req_data={ + stoid:r.stoid, + mobile:getApp().globalData.zc_dd.mobile + }; + if(getApp().globalData.zc_dd.first_leade) + req_data.first_leader=getApp().globalData.zc_dd.first_leader + + wx.showLoading(); + getApp().request.promiseGet(url3, {data:req_data}).then(res=>{ + if(res.data.code==0){ + var back_data=res.data.data; back_data=JSON.parse(back_data); + var set_data={is_fx:0}; + //-- 如果有包含会员的线下的信息 -- + if(back_data && back_data.erpviplist){ + //-- data.data就是门店的数据 -- + if(back_data.data){ + back_data.erpviplist.pickup_id=back_data.data.pickup_id; + if(!back_data.erpviplist.pick) set_data.is_fx=1; + set_data.stoname=back_data.data.pickup_name; + set_data.sto_sele_id=back_data.data.pickup_id; + } + + //-- 推荐人姓名 -- + if(back_data.erpviplist.fromuser) { + set_data.tjrname=back_data.erpviplist.fromuser; + back_data.erpviplist.fromuser_id=back_data.erpviplist.fromuser; + } + //性别 + if(back_data.erpviplist.sex) set_data.isGender=back_data.erpviplist.sex; + //名称 + if(back_data.erpviplist.vipname) set_data.name=back_data.erpviplist.vipname; + //身份证 + if(back_data.erpviplist.idcard) set_data.id=back_data.erpviplist.idcard; + //地址 + if(back_data.erpviplist.address) set_data.address=back_data.erpviplist.address; + //生日 + if(back_data.erpviplist.birthday) { + set_data.datet=back_data.erpviplist.birthday; + set_data.isLunar=back_data.erpviplist.islunar; + } + set_data.user=back_data.erpviplist; + } + self.setData(set_data); + if(!self.data.sto_sele_id){ + self.get_store_set(); + } + } + wx.hideLoading(); + }) var is_back=t.is_back; if(is_back) this.data.is_back=1; @@ -694,9 +686,7 @@ Page({ getApp().check_can_share(); - var e = this; if (this.data.is_zy) return false; - this.wait_for_store_config(); //如果有传值进行跳转的话 var choice_guide=null; @@ -705,64 +695,108 @@ Page({ getApp().globalData.choice_guide=null; } - var req = t; - - a.getUserInfo(function(a) { - var txt = util.formatTime(a.birthday, 'yyyy-M-d'), - arr = txt.split(' '); - a.birthday = arr[0]; - var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'), - arr2 = txt.split(' '); - a.reg_time = arr2[0]; - 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 - }); - } - - } - }) - } - - }, !0); }, check_is_send_quan:function(cid,uid){ var self=this; let url2 = '/api/weshop/prom/coupon/get/'; - //看一下会员有没有领过注册的券 - getApp().promiseGet("/api/weshop/couponList/page",{ - data:{store_id:r.stoid,uid:uid,cid:cid} - }).then(res=>{ - var is_ling=0; - if(res.data.code==0 && res.data.data && res.data.data.total>0){ - is_ling=1; - } - - //没有领过券，就显示 - if(!is_ling){ - //获取优惠券 - url2 += cid; - app.request.get(url2, { - success: function(r) { - if(r.data.code == 0) { - console.log('000res==>', r.data.data.name); - self.setData({ - couponInfo: r.data.data.name, - }); - }; - }, - }); - } - - }) + //-- 如果没有会员信息的时候 -- + if(!uid){ + //获取优惠券 + url2 += cid; + app.request.get(url2, { + success: function(r) { + if(r.data.code == 0) { + self.setData({ + couponInfo: r.data.data.name, + }); + }; + }, + }); + + }else{ + //看一下会员有没有领过注册的券 + getApp().promiseGet("/api/weshop/couponList/page",{ + data:{store_id:r.stoid,uid:uid,cid:cid} + }).then(res=>{ + var is_ling=0; + if(res.data.code==0 && res.data.data && res.data.data.total>0){ + is_ling=1; + } + + //没有领过券，就显示 + if(!is_ling){ + //获取优惠券 + url2 += cid; + app.request.get(url2, { + success: function(r) { + if(r.data.code == 0) { + console.log('000res==>', r.data.data.name); + self.setData({ + couponInfo: r.data.data.name, + }); + }; + }, + }); + } + + }) + } + + + }, + //-- 有没有送过礼包 -- + check_is_send_libao:function(lbid,uid){ + var self=this; + let url2 = '/api/weshop/marketing/giftbag/get'; + if(!uid){ + //获取礼包 + app.request.get(url2, { + data:{storeId:r.stoid,giftBagId:lbid}, + success: function(r) { + if(r.data.code == 0) { + console.log('000res==>', r.data.data.name); + self.setData({ + libao: r.data.data.lbTitle, + }); + } + } + }); + + }else{ + //看一下会员有没有领过注册的券 + getApp().promiseGet("/api/weshop/marketing/gift/getgiveone",{ + data:{store_id:r.stoid,user_id:uid,lbid:lbid,act_type:7} + }).then(res=>{ + var is_ling=0; + if(res.data.code==0 && res.data.data && res.data.data.total>0){ + is_ling=1; + } + //没有领过礼包，就显示 + if(!is_ling){ + //获取礼包 + app.request.get(url2, { + data:{storeId:r.stoid,giftBagId:lbid}, + success: function(r) { + if(r.data.code == 0) { + self.setData({ + libao: r.data.data.lbTitle, + }); + } + } + }); + } + + }) + } + + }, + + + //------卡片的显示和关闭-------- show_tc: function() { @@ -782,8 +816,6 @@ Page({ tc_hide: true, }); }, - - //地址 address: function(e) { @@ -854,39 +886,54 @@ Page({ datas.staffId=th.data.user.staffId; } - getApp().request.put("/api/weshop/users/updateUserInfo", { - data: datas, - success: function(res) { - if (res.data.code == 0) { - getApp().my_warnning("修改成功", 1, th); - - setTimeout(function () { - if(th.data.is_back){ - wx.navigateBack({ delta: 1}) //返回上一页 - }else{ - getApp().goto("/pages/user/index/index"); - } - },1000) - - } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); - } - } - }) + var post_data={ ...getApp().globalData.zc_dd, ...datas } + this.zu_ce(post_data); }, + + + 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 { + return app.showWarning("授权登入失败！"+e.data.msg); + } + getApp().globalData.login_back=1; + wx.setStorageSync("userinfo",e.data.data); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(a.globalData.userInfo.head_pic); + wx.navigateBack({ delta: 1}) + + }, + 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; + } + }); + }, + //选择地址 goto_address: function() { // this.setData({ is_zy: 1 }); }, - //更换手机 - // go_phone: function(e) { - // var url = e.currentTarget.dataset.url; - // this.setData({ - // is_zy: 1 - // }); - // getApp().goto(url); - // }, - + //--点击分享事件--- onShareAppMessage: function(t) { getApp().globalData.no_clear=1 @@ -983,9 +1030,8 @@ Page({ this.setData({ datet: e.detail.value, }); - }; - - // console.log(this.data.datet, this.data.isCalendar); + } + }, // 生日判断 @@ -1074,7 +1120,6 @@ Page({ var data = { store_id: r.stoid, - user_id: app.globalData.user_id, }; //-- 需要推荐人 -- @@ -1083,11 +1128,7 @@ Page({ if (tjrname == "" || tjrname == null) { app.my_warnning("请输入推荐人", 0, this); return false; - }; - if(tjrname==user.mobile || tjrname==user.erpvipno ){ - app.my_warnning("推荐人不能是自己", 0, this); - return false; - } + }; data.tjrname=tjrname; } @@ -1119,7 +1160,7 @@ Page({ }; data.birthday=birthday; - data.islunar=self.data.isLunar; + data.islunar=self.data.isLunar?1:0; } //-- 需要身份证 -- @@ -1155,97 +1196,23 @@ Page({ app.my_warnning("请您先阅读和勾选指定的内容", 0, this); return false; }; - - - console.log('data==>', data); - - app.request.put("/api/weshop/users/updateInfo", { - data: data, - success: function(res) { - if (res.data.code == 0) { - getApp().my_warnning("保存成功", 1, self); - if(th.data.is_back){ - wx.navigateBack({ delta: 1}) //返回上一页 - }else{ - getApp().goto("/pages/user/index/index"); - } - } else { - getApp().my_warnning(res.data.msg, 0, self); - }; - } - }) + + + + + var post_data={ ...getApp().globalData.zc_dd, ...data }; + + delete post_data.sessionKey; + delete post_data.encryptedData; + delete post_data.iv; + + + if(th.data.loading) return false; + th.setData({loading:1}) ; + + this.zu_ce(post_data); - // } else { - // app.my_warnning("请您先阅读和勾选指定的内容", 0, self); - // }; - // var isstcsp = th.data.isstcsp; //是否启用消费密码 - // var phone = th.data.phone; //手机号码 - // if (phone == "" || phone == null) { - // getApp().my_warnning("手机不能为空", 0, th); - // return false; - // } - // var consumption = th.data.consumption; //消费密码 - // var isstcsp = th.data.isstcsp; - // if (isstcsp == 1) { - - // if (consumption == null || consumption == "" || consumption == undefined) { - // getApp().my_warnning("消费密码不能为空", 0, th); - // return false; - // } - // if (consumption.length < 6) { - // getApp().my_warnning("消费密码不能小于6位", 0, th); - // return false; - // } - // } - // var sex = th.data.isGender; //性别 - - // if (sex != "1" && sex != "2") { - // getApp().my_warnning("请选择性别", 0, th); - // return false; - // } - // var vipname = th.data.user.vipname; //用户姓名 - // if (user_name == "" || user_name == null) { - // getApp().my_warnning("请输入名字", 0, th); - // return false; - // } - // var identity_card = th.data.identity_card; //身份证 - - // if (identity_card!=null && identity_card!=undefined && identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) { - // getApp().my_warnning("身份证号码错误", 0, th); - // return false; - // } - // var address = th.data.address; //地址 - // var sto_sele_id = self.data.sto_sele_id; - // var data = { - // store_id: r.stoid, - // user_id: app.globalData.user_id, - // tjrname: self.data.referee, //推荐人 - // vipname: self.data.name, //名称 - // sex: self.data.isGender, //性别 - // birthday: self.data.datet, - // islunar: self.data.isLunar, - // idcard: self.data.id, - // address: self.data.address, - // pickup_id: sto_sele_id ,//自提门店 所属门店 - // }; - - // console.log('data==>', data); - //往上提交美导的ID - // if(th.data.fir_guide_id!=th.data.user.staffId){ - // datas.staffId=th.data.user.staffId; - // } - - // app.request.put("/api/weshop/users/updateInfo", { - // data: data, - // success: function(res) { - // if (res.data.code == 0) { - // getApp().my_warnning("保存成功", 1, self); - // getApp().goto("/pages/user/index/index"); - // } else { - // getApp().my_warnning("系统繁忙,请稍后再试", 0, self); - // }; - // } - // }) + }, diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 45b7d0a..cc2045e 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -7,13 +7,13 @@ - + - {{user.nickname}} + {{nickname}} @@ -28,11 +28,13 @@ 推荐人: - + + + - +{{reg_info.introducer}}积分 - +{{reg_info.introducer}}成长值 + +{{reg_info.introducer}}积分 + +{{reg_info.introducer}}成长值 @@ -41,8 +43,8 @@ 姓名: - +{{reg_info.name}}积分 - +{{reg_info.name}}成长值 + +{{reg_info.name}}积分 + +{{reg_info.name}}成长值 @@ -68,10 +70,10 @@ 女 - - - +{{reg_info.sex}}积分 - +{{reg_info.sex}}成长值 + + + +{{reg_info.sex}}积分 + +{{reg_info.sex}}成长值 @@ -93,8 +95,8 @@ - +{{reg_info.birthday}}积分 - +{{reg_info.birthday}}成长值 + +{{reg_info.birthday}}积分 + +{{reg_info.birthday}}成长值 @@ -103,8 +105,8 @@ 身份证: - +{{reg_info.idcard}}积分 - +{{reg_info.idcard}}成长值 + +{{reg_info.idcard}}积分 + +{{reg_info.idcard}}成长值 @@ -113,8 +115,8 @@ 地址: - +{{reg_info.address}}积分 - +{{reg_info.address}}成长值 + +{{reg_info.address}}积分 + +{{reg_info.address}}成长值 @@ -127,9 +129,9 @@ ∟ - - +{{reg_info.pick}}积分 - +{{reg_info.pick}}成长值 + + +{{reg_info.pick}}积分 + +{{reg_info.pick}}成长值 @@ -172,8 +174,9 @@ - 保存 + 保存 保存成功即可获得一张{{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/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 82fb3dc..dcd404f 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -2238,6 +2238,11 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 8febce7..61a160b 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -495,7 +495,7 @@ Page({ }); }, //---------计算立即购买---------- - calculatePrice2: function () { + calculatePrice2: async function () { console.log('calculatePrice2'); var th = this, good = this.data.bn_goods; @@ -506,12 +506,14 @@ Page({ th.setData({ [txt]: allpice, }); - console.log(th.data.formData); - - to.getwuliuprice(async function (rs) { + wx.showLoading({ + title: "处理中.", + mask:true + }) + //to.getwuliuprice(async function (rs) { - var o_shipping_price = 0, + var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; var out_of_weight = null; //超出多少重量 @@ -539,8 +541,7 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { - - + if (goods_weight < 0) goods_weight = 0; if (item['exp_sum_type'] == 2) { goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; @@ -581,9 +582,36 @@ Page({ else out_of_weight = -back_data.weight_free * 1000; var code = th.data.wu_arr[th.data.index].code; - var shipping_price = - ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data,rs); + var shipping_price =0; + // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data,rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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; + } + }) + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + } + shipping_price = parseFloat(shipping_price).toFixed(2); var wl_txt = "formData.shipping_price"; @@ -616,24 +644,27 @@ Page({ if (parseFloat(th.data.yuer) > total_m) { th.setData({ [txt]: total_m, - [txt2]: 0 + [txt2]: 0, + is_show_sub:1 }) } 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 + [txt2]: order_m, + is_show_sub:1 }) } } else { th.setData({ [txt]: 0, - [txt2]: order_m + [txt2]: order_m, + is_show_sub:1 }) } - - }); + wx.hideLoading(); + //}); }, @@ -783,6 +814,12 @@ Page({ if(getApp().globalData.skinface_id){ goods.skinface_id=getApp().globalData.skinface_id; } + + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml index d8ac4ac..de02a90 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -154,7 +154,7 @@ - + 应付金额：￥{{formData.order_amount}} diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index 8f220da..f7deb93 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -2119,6 +2119,11 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 7fc3c63..addd47c 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -1716,9 +1716,9 @@ Page({ //----计算物流的钱---- - calculate_wuliu() { + async calculate_wuliu() { var to = getApp(), th = this; - to.getwuliuprice(async function (rs) { + //to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1, @@ -1823,6 +1823,7 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { + if (goods_weight < 0) goods_weight = 0; if (item['exp_sum_type'] == 2) { goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; @@ -1867,8 +1868,36 @@ Page({ th.data.is_no_by[th.data.bn_pick] = 0; //--------------开始计算物流------------------ - var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + var shipping_price =0; + + //ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + //goods_piece, th.data.user_addr, back_data, rs); + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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; + } + }) + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + return false; + } exp_price = parseFloat(shipping_price).toFixed(2); } @@ -1876,7 +1905,7 @@ Page({ } else { th.wuliu_next(allpice, quan_price, exp_price); } - }); + //}); }, //相同的东西统一在一起 wuliu_next(allpice, quan_price, exp_price) { diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml index fcea355..5789681 100644 --- a/packageC/pages/presell/cart/cart.wxml +++ b/packageC/pages/presell/cart/cart.wxml @@ -346,6 +346,9 @@ + + + 尾款时间{{filters.format_time(act.pay_begindate,1)}} - @@ -363,7 +366,7 @@ - + @@ -371,14 +374,13 @@ 取消订单 - 立即付款 + + 删除订单 - - @@ -401,6 +403,8 @@ + + diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 82f4374..bdf859f 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -571,7 +571,7 @@ Page({ //---------计算立即购买---------- - calculatePrice2: function () { + calculatePrice2: async function () { var th = this, good = this.data.bn_goods; if (!good) return false; @@ -582,7 +582,7 @@ Page({ } wx.showLoading({ - title: "处理中." + title: "处理中.",mask:true }) //-----------计算商品总价-------------- var allpice = good.shop_price * good.buynum; @@ -609,8 +609,8 @@ Page({ } - to.getConfig2(function (ee) { - to.getwuliuprice(async function (rs) { + // to.getConfig2(function (ee) { + // to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; var out_of_weight = null; //超出多少重量 @@ -699,9 +699,11 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { + if (goods_weight < 0) goods_weight = 0; if (item['exp_sum_type'] == 2) { cut_good_weight += item['weight'] * item['buynum']; goods_weight += item['weight'] * item['buynum']; + } if (back_data.weight_free > 0) { out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; @@ -743,9 +745,35 @@ Page({ if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ - var shipping_price = - ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + var shipping_price =0; + // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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; + } + }) + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + return false; + } if (shipping_price <= 0) { @@ -914,8 +942,8 @@ Page({ wx.hideLoading(); - }); - }); + // }); + // }); }, //--------------------提交订单----------------------- @@ -1054,6 +1082,11 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 4a882e4..8772484 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -542,6 +542,11 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; 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/cart/cart.js b/pages/cart/cart/cart.js index d095dfc..f67c2a8 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -612,8 +612,8 @@ Page({ } } - - else if(item.prom_type == 0) { + //判断不是代发的商品 + else if(item.prom_type == 0 && !item.whsle_id) { //如果有优惠活动，要更新活动 await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1"+"/"+getApp().globalData.user_id, {}).then(res => { @@ -1731,7 +1731,7 @@ Page({ function normal_check(store_count, goodsinfo, wareIds) { //--- 看一下是不是线下库存 --- - if (th.data.sales_rules == 2 && goodsinfo.prom_type != 7) { + if (th.data.sales_rules == 2 && goodsinfo.prom_type != 7 && !goodsinfo.whsle_id) { th.check_down_line(t, pitem, item, wareIds); } else { if (t.goods_num > store_count) { @@ -2491,7 +2491,7 @@ Page({ ab = 1; //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存--- if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || - i_arr[j].need_downlow_num) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1) { + i_arr[j].need_downlow_num) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) { //--获取商品的线下商品ID-- var gd = null; await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => { diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index dd7dd02..894bb6d 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -451,8 +451,8 @@ Page({ //如果有购买活动 item1.promgoodsbuynum = promgoodsbuynum; - //要把优惠活动加入,prom_goods_map中,赠品不要运算 - if (item1.prom_type == 3 && item1.is_gift != 1) { + //要把优惠活动加入,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); await th.add_prom_goods_map(item1); } @@ -702,7 +702,7 @@ Page({ user_money: 0, total_amount: 0, order_amount: 0, - user_note: 0 + user_note: "" }; //-- 把等级卡会优惠多少钱装进去 -- @@ -882,6 +882,11 @@ Page({ gd.prom_type = gg.prom_type ? gg.prom_type : 0; gd.prom_id = gg.prom_id ? gg.prom_id : 0; + if(gd.whsle_id>0){ + gd.prom_type =gg.prom_type=0; + gd.prom_id =gg.prom_id=0; + } + switch (gd.prom_type) { case 0: case 3: @@ -1021,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; @@ -1187,6 +1192,8 @@ Page({ var o_price = 0, q_conditin = 0; //--------循环计算总价----------- for (var j = 0; j < ord_goods.length; j++) { + + if(ord_goods[j].whsle_id) continue; o_price += ord_goods[j].goods_price * ord_goods[j].goods_num; } @@ -1232,6 +1239,7 @@ Page({ item_map.gift_weight = get_data.goodsinfo.weight; item_map.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type; item_map.uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum; + item_map.whsle_id = get_data.goodsinfo.whsle_id; } item_map.s_libao = get_data.libao; @@ -1323,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; @@ -1455,10 +1464,16 @@ Page({ }, //-------------------计算订单价格------------------- - calculatePrice: function (t, s) { + calculatePrice:async function (t, s) { var th = this; - to.getwuliuprice(async function (rs) { - wx.showLoading({ title: "处理中." }) + th.setData({submit:1}); + + wx.showLoading({ + title: "处理中.", + mask:true + }) + //-- to.getwuliuprice(async function (rs) { -- + //是不是区域包邮 th.data.is_area_by = 0; //当不是区域不包邮的时候，没有不包邮商品的时候 @@ -1491,12 +1506,16 @@ Page({ //调用函数计算每件商品的单价 await th.calc_per(c_arr); + //调用函数计算每件组合购商品的单价, await zh_calc.calc_zh_split_price(c_arr, th); + //调用函数计算每件阶梯促销商品的单价, await ladder_calc.calc_split_price(c_arr, th); //调用函数计算，优惠券优惠什么商品价格，优惠券优惠什么商品 + await th.get_cart_quan(c_arr); + //---循环购物车--- for (var i in c_arr) { //因为搭配购买也是再这里计算，搭配购的is_b_now==1 @@ -1555,9 +1574,15 @@ Page({ }) } + + var whsle_goods_price=0; //--------循环计算总价----------- for (var j = 0; j < item.length; j++) { + if(item[j].whsle_id>0){ + whsle_goods_price+=item[j].goods_price*item[j].goods_num; + } + var is_no_zh = 0; if (item[j].prom_type != 7 && item[j].prom_type != 10) is_no_zh = 1; @@ -1678,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 @@ -1729,6 +1754,8 @@ Page({ //--------循环计算总价----------- for (var j = 0; j < item.length; j++) { + //如果是一件代发商品，不计算运费 + if(item[j].whsle_id) continue; //如果商品本身是包邮了 if(item[j].is_free_shipping == 1) continue; //如果是优惠活动是包邮，就不用计算包邮的费用了 @@ -1738,8 +1765,8 @@ Page({ continue; } - if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) { - + if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) { + if (goods_weight < 0) goods_weight = 0; if (item[j]['exp_sum_type'] == 2) { cut_good_weight += item[j]['weight'] * item[j]['goods_num']; goods_weight += item[j]['weight'] * item[j]['goods_num']; @@ -1784,8 +1811,38 @@ Page({ var code = ""; if (th.data.wu_arr && th.data.wu_arr[cart_item.wind]) code = th.data.wu_arr[cart_item.wind].code; - cart_item.shipping_price = - ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,goods_piece, th.data.user_addr, back_data, rs); + + // cart_item.shipping_price = + // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,goods_piece, th.data.user_addr, back_data, rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=1; + await getApp().request.promisePost('/api/weshop/order/getOrderWuLiPrice', {data:w_data,is_json:1}).then(res=>{ + if(res.data.code==0){ + cart_item.shipping_price=res.data.data; + }else{ + is_ok=0; + } + }) + + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + } if (!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby != 1) { if (cart_item.shipping_price == 0) th.data.is_by[pickid] = 1; //已经全场包邮，就不要选择券了 @@ -1812,6 +1869,10 @@ Page({ o_condition = o_price_no_zh - quan_price; } + if(whsle_goods_price>0){ + o_condition=o_condition-whsle_goods_price; + } + var order_m = 0; //---判断是不是有订单优惠--- await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { @@ -1829,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; } @@ -1929,13 +1994,13 @@ 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(); wx.hideLoading(); - }); + //}); }, set_can_num: function () { @@ -1969,7 +2034,7 @@ Page({ //---------计算立即购买---------- - calculatePrice2: function () { + calculatePrice2: async function () { var th = this, good = this.data.bn_goods; if (!good) return false; @@ -1980,8 +2045,10 @@ Page({ return false; } + th.setData({submit:1}); wx.showLoading({ - title: "处理中." + title: "处理中.", + mask:true }) //-----------计算商品总价-------------- var allpice = good.shop_price * good.buynum; @@ -2007,7 +2074,7 @@ Page({ allpice = good.offline_price * good.buynum; } - to.getwuliuprice(async function (rs) { + //to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; var out_of_weight = null; //超出多少重量 @@ -2019,7 +2086,8 @@ Page({ quan_no = th.data.using_quan[bn_pick].coupon_no; if (quan_no) { - if (th.data.using_quan[bn_pick].isby != 1) { + //如果是一件代发就不要找商品 + if (th.data.using_quan[bn_pick].isby != 1 && !good.whsle_id) { //---获取优惠券优惠--- await getApp().request.promiseGet("/api/weshop/couponList/getUseCouponPrice", { data: { @@ -2043,7 +2111,7 @@ Page({ } //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past != 1) { + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1) { //看是不是有调用过包邮券 if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) { var condition = allpice - cut_price - quan_price; @@ -2081,6 +2149,7 @@ Page({ var shipping_price =0; var quan_no_goods_arr=null; var is_by_quan=0; + var pickid=th.data.bn_pick; //如果是包邮券的时候，要看看券的情况,判断一下包邮有没有不包邮模板 if (quan_no && th.data.using_quan[pickid].isby == 1) { @@ -2129,8 +2198,14 @@ Page({ var cut_good_weight = 0; for (let i in gd_arr_list) { let item = gd_arr_list[i]; - + + if(good.is_free_shipping==1) continue; + //-- 代发商品不算运费 -- + if(good.whsle_id) continue; + if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { + + if (goods_weight < 0) goods_weight = 0; if (item['exp_sum_type'] == 2) { goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; @@ -2177,8 +2252,37 @@ Page({ th.data.is_by[th.data.bn_pick] = 0; //--------------开始计算物流------------------ - shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + // shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=1; + 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; + }else{ + is_ok=0; + } + }) + + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + } if (shipping_price <= 0) { th.data.is_by[th.data.bn_pick] = 1; //已经是包邮了，就不要选择包邮券 @@ -2211,6 +2315,10 @@ Page({ } //--看一下有没有订单优惠-- var o_condition = parseFloat(order_m); + if(th.data.bn_goods.whsle_id>0){ + o_condition=0; + } + if (o_condition > 0) { th.check_is_order_prom(o_condition, function () { var order_prom_amount = 0; @@ -2226,7 +2334,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; } @@ -2258,14 +2372,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) { @@ -2325,14 +2439,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) { @@ -2372,7 +2486,7 @@ Page({ wx.hideLoading(); - }); + //}); }, @@ -2445,7 +2559,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, //配送方式 @@ -2522,6 +2636,7 @@ Page({ }) } + var goods = { 'goods_id': gg.goods_id, 'goods_name': gg.goods_name, @@ -2535,6 +2650,11 @@ Page({ 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + if (getApp().globalData.skinface_id) { goods.skinface_id = getApp().globalData.skinface_id; } @@ -2564,7 +2684,7 @@ Page({ if (gg.is_pd_normal) goods.is_pd_normal = 1; //如果不立即购买或者秒杀，如果是线下库存购买的时候 - if (goods.prom_type != 1 && goods.prom_type != 6 && th.data.sales_rules == 2) { + if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2 && th.data.sales_rules == 2 && !th.data.bn_goods.whsle_id) { var isok = 1; await th.check_store_num(goods.goods_id, th.data.bn_pick, gg.goods_num, function (res) { isok = res; @@ -2681,7 +2801,7 @@ Page({ } var order_prom_list_cart = th.data.order_prom_list_cart;; - console.log('xxxxxxxxxxxxxxxx', order_prom_list_cart) + //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { var t_item = order_prom_list_cart[i]; @@ -2806,120 +2926,192 @@ Page({ await th.split_set_goods_quanprice(you_item, t_item); } } - //-------------让商品添加到商品列表-------------------- - for (var k = 0; k < t_item.goods.length; k++) { - var g_item = t_item.goods[k]; - if (g_item.goods_num <= 0) continue; - var goods = { - 'goods_id': g_item.goods_id, - 'goods_name': g_item.goods_name, - 'goods_sn': g_item.goods_sn, - 'goods_num': g_item.goods_num, - 'market_price': g_item.market_price, - 'goods_price': g_item.goods_price, - 'member_goods_price': g_item.goods_price, - 'store_id': oo.stoid, - }; - if (getApp().globalData.skinface_id) { - goods.skinface_id = getApp().globalData.skinface_id; - } + //代发商品的集合 + var df_goods = []; + var df_price = 0; + var df_room_ids = ""; + + //-------------让商品添加到商品列表-------------------- + 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 = { + 'goods_id': g_item.goods_id, + 'goods_name': g_item.goods_name, + 'goods_sn': g_item.goods_sn, + 'goods_num': g_item.goods_num, + 'market_price': g_item.market_price, + 'goods_price': g_item.goods_price, + 'member_goods_price': g_item.goods_price, + 'store_id': oo.stoid, + }; - //-- 线下取价也要写入,组合购的商品不能去线下价格 -- - if (g_item.offline_price && t_item.is_offline == 1 && g_item.prom_type != 7) { - goods.goods_price = g_item.offline_price; - goods.member_goods_price = g_item.offline_price; - goods.offline_cut = (g_item.goods_price - g_item.offline_price).toFixed(2); - goods.pricing_type = g_item.pricing_type; - } - if (g_item.quan_num) { - goods.quan_num = g_item.quan_num; - goods.quan_no = g_item.quan_no; - } - //--判断活动的类型-- - switch (g_item.prom_type) { - case 1: - case 2: - case 10: - goods.prom_type = g_item.prom_type; - goods.prom_id = g_item.prom_id; - break; - case 3: - goods.prom_type = 3; - goods.prom_id = g_item.prom_id; - if (g_item.is_gift) { - goods.is_gift = g_item.is_gift; - goods.gift_id = g_item.gift_id; - } - break; - case 5: - goods.prom_type = 5; - goods.prom_id = g_item.prom_id; - if (g_item.is_collocation) { - goods.is_collocation = g_item.is_collocation; + if (getApp().globalData.skinface_id) { + goods.skinface_id = getApp().globalData.skinface_id; + } + + //-- 线下取价也要写入,组合购的商品不能去线下价格 -- + if (g_item.offline_price && t_item.is_offline == 1 && g_item.prom_type != 7) { + goods.goods_price = g_item.offline_price; + goods.member_goods_price = g_item.offline_price; + goods.offline_cut = (g_item.goods_price - g_item.offline_price).toFixed(2); + goods.pricing_type = g_item.pricing_type; + } + if (g_item.quan_num) { + goods.quan_num = g_item.quan_num; + goods.quan_no = g_item.quan_no; + } + //--判断活动的类型-- + switch (g_item.prom_type) { + case 1: + case 2: + case 10: + goods.prom_type = g_item.prom_type; + goods.prom_id = g_item.prom_id; + break; + case 3: + goods.prom_type = 3; + goods.prom_id = g_item.prom_id; + if (g_item.is_gift) { + goods.is_gift = g_item.is_gift; + goods.gift_id = g_item.gift_id; + } + break; + case 5: + goods.prom_type = 5; + goods.prom_id = g_item.prom_id; + if (g_item.is_collocation) { + goods.is_collocation = g_item.is_collocation; + } + break + case 7: + goods.prom_type = 7; + goods.prom_id = g_item.prom_id; + break + default: + goods.prom_type = 0; + goods.prom_id = 0; + } + + //如果不立即购买或者秒杀，如果是线下库存购买的时候 + if (goods.prom_type == 0 && th.data.sales_rules == 2) { + var isok = 1; + await th.check_store_num(goods.goods_id, t_item.pickup_id, goods.goods_num, function (res) { + isok = res; + }); + if (!isok) { + getApp().confirmBox(goods.goods_name + "的门店库存不足"); + th.data.is_summit_ing = 0; + return false; } - break - case 7: - goods.prom_type = 7; - goods.prom_id = g_item.prom_id; - break - default: - goods.prom_type = 0; - goods.prom_id = 0; - } + } - //如果不立即购买或者秒杀，如果是线下库存购买的时候 - if (goods.prom_type == 0 && th.data.sales_rules == 2) { - var isok = 1; - await th.check_store_num(goods.goods_id, t_item.pickup_id, goods.goods_num, function (res) { - isok = res; - }); - if (!isok) { - getApp().confirmBox(goods.goods_name + "的门店库存不足"); - th.data.is_summit_ing = 0; - return false; + //把优惠的平摊结果写进去 + if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account != undefined)) { + if (g_item.account >= 0) goods.account = g_item.account; + if (g_item.account_yu != 0) goods.account_yu = g_item.account_yu; + item.is_discount_amount = 1; } - } - //把优惠的平摊结果写进去 - if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account != undefined)) { - if (g_item.account >= 0) goods.account = g_item.account; - if (g_item.account_yu != 0) goods.account_yu = g_item.account_yu; - item.is_discount_amount = 1; - } + //导购ID + if (g_item.guide_id) { + goods.guide_id = g_item.guide_id; + goods.guide_type = g_item.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + g_item.guide_id, {}).then(res => { + if (res.data.code == 0) { + goods.guide_name = res.data.data.salesman; + goods.guide_sn = res.data.data.salesman_no; + } + }) + } - //导购ID - if (g_item.guide_id) { - goods.guide_id = g_item.guide_id; - goods.guide_type = g_item.guide_type; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + g_item.guide_id, {}).then(res => { - if (res.data.code == 0) { - goods.guide_name = res.data.data.salesman; - goods.guide_sn = res.data.data.salesman_no; + //如果有阶梯促销 + if (g_item.ladder_list_id) { + goods.ladder_list_id = g_item.ladder_list_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); + df_room_ids += g_item.room_id + ","; + } else { + + //-- 如果只有一件的时候，商品又是代发商品，订单的状态要改成代发订单 -- + if(g_item.whsle_id){ + goods.is_whsle_goods=1; + item.is_whsle=1; } - }) - } - //如果房间号不为空的时候 - if (g_item.room_id) { - goods.room_id = g_item.room_id; - room_ids += g_item.room_id + ","; - } - //如果有阶梯促销 - if (g_item.ladder_list_id) { - goods.ladder_list_id = g_item.ladder_list_id; + item.order_goods.push(goods); + //如果房间号不为空的时候 + if (g_item.room_id) { + goods.room_id = g_item.room_id; + room_ids += g_item.room_id + ","; + } + } } - item.order_goods.push(goods); - } //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); + + //处理代发商品的拆分 + 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); + + df_item.is_whsle=1; + df_item.is_discount_amount=0; + df_item.goods_price=df_price; + 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){ + if(item.order_amount>df_price){ + item.order_amount=parseFloat(item.order_amount-df_price).toFixed(2); + df_item.order_amount=df_price.toFixed(2); + }else { + var more_p=parseFloat(df_price-item.order_amount).toFixed(2); + item.order_amount=0; + item.user_money=parseFloat(item.user_money-more_p).toFixed(2); + df_item.user_money=more_p; + } + }else{ + if(item.user_money>df_price){ + item.user_money=parseFloat(item.user_money-df_price).toFixed(2); + df_item.user_money=df_price.toFixed(2); + }else { + var more_p=parseFloat(df_price-item.user_money).toFixed(2); + item.user_money=0; + item.order_amount=parseFloat(item.user_money-more_p).toFixed(2); + df_item.order_amount=more_p; + + } + } + + if (df_room_ids != "") df_item.room_ids = ut.sub_last(df_room_ids); + 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); } - } if (pdata.length == 0) return; @@ -2951,7 +3143,7 @@ Page({ } var order_amount = 0; pdata.forEach(function (em, ind) { - order_amount += em.order_amount; + order_amount += parseFloat(em.order_amount); }) //要进行判断，如果是用微信支付，就要跳转到支付界面 if (order_amount > 0) { @@ -3757,7 +3949,7 @@ Page({ for (var i in goodlist) { var gd = goodlist[i]; //--如果是秒杀就跳出,如果是赠品，如果是组合购限制使用优惠券-- - if (gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh) || gd.is_xz_yh == 1) { + if (gd.whsle_id==1 || gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh) || gd.is_xz_yh == 1) { continue; } @@ -3865,8 +4057,8 @@ Page({ arr[ind].ckeck_quan_price = ckeck_quan_price - (cut_price ? cut_price : 0); arr[ind].check_quan_ware_list = check_quan_ware_list; arr[ind].check_quan_price_list = check_quan_price_list; - //是否关闭使用优惠券 - if (th.data.is_close_quan != 1) { + //-- 是否关闭使用优惠券,循环有找到商品 -- + if (th.data.is_close_quan != 1 && check_quan_ware_list) { //--调用接口，获取优惠券的列表，3秒钟内控制接口请求-- var url = "/api/weshop/couponList/getUseCouponList"; await app.request.promiseGet(url, { @@ -3904,6 +4096,9 @@ Page({ get_buy_now_quan: function () { var quanlist = null, th = this, frozenQuan = null; var good = this.data.bn_goods; + + //一件代发商品不使用优惠券 + if(good.whsle_id) return false; if (good.prom_price) { th.data.ckeck_quan_price = good.prom_price; //如果有优惠价，就用优惠价 } else if (good.is_offline) { @@ -4025,6 +4220,7 @@ Page({ arr.gift_uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum; arr.gift_limit_num = get_data.limit_num; arr.gift_storecount = get_data.gift_storecount; + arr.whsle_id=get_data.goodsinfo.whsle_id; } arr.s_libao = get_data.libao; arr.s_lb_num = get_data.lb_num; @@ -4659,6 +4855,11 @@ Page({ goods_color: gf_item.goodsinfo.goods_color, }; + + //-- 如果是代发商品的时候 -- + if(gf_item.goodsinfo.whsle_id){ + newd.whsle_id=gf_item.goodsinfo.whsle_id; + } await getApp().request.promisePost("/api/weshop/cart/save", { data: newd }).then(res => { @@ -4714,6 +4915,11 @@ Page({ goods_spec: gf_item.goodsinfo.goods_spec, goods_color: gf_item.goodsinfo.goods_color, }; + //-- 如果是代发商品的时候 -- + if(gf_item.goodsinfo.whsle_id){ + newd.whsle_id=gf_item.goodsinfo.whsle_id; + } + new_pk_list_goods.push(newd); } var set_data = this.data.send_gf[th.data.bn_pick][this.data.send_gf_index]; diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index c62df2c..fe42052 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -407,9 +407,9 @@ Page({ //---------计算立即购买---------- - calculatePrice2: function () { + calculatePrice2:async function () { var th = this, good = this.data.bn_goods; - wx.showLoading({ title: "处理中.", }) + wx.showLoading({ title: "处理中.", mask:true }) //-----------计算商品总价-------------- var allpice = good.shop_price * good.buynum; var all_integral = good.integral * good.buynum; @@ -426,7 +426,7 @@ Page({ th.setData({ [c_txt]: cut_price, }); } - to.getwuliuprice(async function (rs) { + //to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; var out_of_weight = null; //超出多少重量 @@ -453,6 +453,7 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) { + if (goods_weight < 0) goods_weight = 0; if (item['exp_sum_type'] == 2) { goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; @@ -495,8 +496,38 @@ Page({ var code = ""; if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ - var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + var shipping_price=0; + // var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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; + } + }) + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + return false; + } + + if (shipping_price <= 0) { th.data.is_by[th.data.bn_pick] = 1; //已经是包邮了，就不要选择包邮券 } @@ -547,7 +578,7 @@ Page({ wx.hideLoading(); - }); + //}); }, @@ -666,6 +697,12 @@ Page({ goods.skinface_id=getApp().globalData.skinface_id; } + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + + //-- 把导购的信息填入-- if (gg.guide_id) { goods.guide_id = gg.guide_id; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 99b57cb..0808679 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -394,7 +394,15 @@ Page({ }); }, //---------计算立即购买---------- - calculatePrice2: function () { + calculatePrice2:async function () { + + this.setData({submit:1}); + + wx.showLoading({ + title: "处理中.", + mask:true + }) + var th = this, good = this.data.bn_goods; //-----------计算商品总价-------------- var allpice = good.shop_price * good.buynum; @@ -402,9 +410,10 @@ Page({ var txt = "formData.all_price"; th.setData({ [txt]: allpice, }); - to.getwuliuprice(async function (rs) { + //to.getwuliuprice(async function (rs) { console.log('calculatePrice2222'); - console.log(rs); + //console.log(rs); + var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; var out_of_weight = null; //超出多少重量 @@ -430,7 +439,8 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { - if (item['exp_sum_type'] == 2) { + if (goods_weight < 0) goods_weight = 0; + if (item['exp_sum_type'] == 2) { cut_good_weight += item['weight'] * item['buynum']; goods_weight += item['weight'] * item['buynum']; } @@ -473,8 +483,36 @@ Page({ var code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ - var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + var shipping_price=0; + // var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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; + } + }) + if(!is_ok){ + wx.showToast({ + title: "计算物流错误", icon: 'none',duration: 2000 + }) + th.setData({ show_submit:0 }); + wx.hideLoading(); + return false; + } shipping_price = parseFloat(shipping_price).toFixed(2); var wl_txt = "formData.shipping_price"; @@ -497,17 +535,19 @@ 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(); + + //}); }, //--------------------提交订单----------------------- @@ -618,6 +658,12 @@ Page({ if(getApp().globalData.skinface_id){ goods.skinface_id=getApp().globalData.skinface_id; } + + if(th.data.bn_goods.whsle_id){ + item.is_whsle=1; + goods.is_whsle_goods=1; + } + //--导购分享过来的id-- if (gg.guide_id) { goods.guide_id = gg.guide_id; 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 7e613c2..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 }); }, @@ -473,9 +484,11 @@ Page({ }, //----计算物流的钱---- - calculate_wuliu() { + async calculate_wuliu() { + //让按钮变灰色 + this.setData({submit:1}); var to = getApp(), th = this; - to.getwuliuprice(async function (rs) { + //to.getwuliuprice(async function (rs) { var o_shipping_price = 0, goods_weight = -1, goods_piece = -1, good = th.data.goods; var out_of_weight = null; //超出多少重量 @@ -505,7 +518,8 @@ Page({ let item = gd_arr_list[i]; if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { - if (item['exp_sum_type'] == 2) { + if (goods_weight < 0) goods_weight = 0; + if (item['exp_sum_type'] == 2) { goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; } @@ -547,21 +561,50 @@ Page({ var code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ - var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, back_data, rs); + var shipping_price =0; + // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, + // goods_piece, th.data.user_addr, back_data, rs); + + var w_data={ + store_id:os.stoid, code:code, + o_shipping_price:o_shipping_price, + goods_weight:goods_weight, + out_of_weight:out_of_weight,goods_piece:goods_piece, + user_addr_province:th.data.user_addr.province, + user_addr_city:th.data.user_addr.city, + user_addr_district:th.data.user_addr.district, + is_by_all:back_data && back_data.is_by_all?1:0, + no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, + } + + var is_ok=0; + 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){ + th.setData({ submit:0 }); + wx.hideLoading(); + return false; + } var exp_price = parseFloat(shipping_price).toFixed(2); allpice = parseFloat(exp_price) + parseFloat(allpice); 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 753ba52..ec78e10 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -352,6 +352,10 @@ Page({ getApp().globalData.guide_id = res.data.data.id; } }) + + if(!getApp().globalData.user_id){ + ut.new_user_go(os.stoid,first_leader); + } } //-- 如果有房间号 -- @@ -557,7 +561,7 @@ Page({ var that = this, th = this; getApp().getConfig2(function (e) { var sales_rules = e.sales_rules; - if (sales_rules == 2 && [1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 ) { + if (sales_rules == 2 && [1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 && !th.data.sele_g.whsle_id ) { getApp().waitfor2(that, "wait_for_user_store", "fir_goods", function () { var lock = 0, plist = null; var gd = that.data.fir_goods; @@ -886,7 +890,8 @@ Page({ } - if (ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { + //一件代发商品不去计算优惠 + if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) { ee.check_is_youhui(ee.data.gid); } @@ -1390,6 +1395,13 @@ Page({ prom_type: th.data.sele_g.prom_type, }; + + //-- 代发商品不参加优惠 -- + if(th.data.sele_g.whsle_id && newd.prom_type==3){ + newd.prom_type=0; + newd.prom_id=0; + } + //---是不是从收藏夹出来的--- if (th.data.c_guide_id) { newd['guide_id'] = th.data.c_guide_id; @@ -1664,7 +1676,7 @@ Page({ } //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2) { + if (th.data.sales_rules == 2 && !th.data.sele_g.whsle_id ) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- getApp().request.get("/api/weshop/goods/getWareStorages", { @@ -1781,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; } @@ -2336,7 +2348,7 @@ Page({ check_is_prom_goods: function (callback) { var th = this; var usr = getApp().globalData.userInfo; - if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3) { + if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3 && !this.data.sele_g.whsle_id) { callback(); } else { //-- 判断有没有优惠活动 -- @@ -2847,10 +2859,10 @@ Page({ }); - that.check_is_youhui(gid, that.data.is_normal); + if(!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal); //默认门店要拿下门店库存 - if (that.data.sales_rules == 2 && that.data.def_pick_store) { + if (that.data.sales_rules == 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id ) { var lock = 0, plist = null; //先读取门店的lock,采用链式写法，少用await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { @@ -3077,7 +3089,7 @@ Page({ th.setData({all_pick_list: e.data.data.pageData}); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购-- - if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { + if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { setTimeout(function () { th.deal_pickup_dline(e); }, 800) @@ -3619,7 +3631,7 @@ Page({ this.get_sku(o.stoid, this.data.data, gid); this.check_has_flash(); this.data.is_normal = 1; - this.check_is_youhui(gid, 1); + if(!this.data.data.whsle_id) this.check_is_youhui(gid, 1); return false; } @@ -4262,7 +4274,7 @@ Page({ }); }); } - th.check_is_youhui(th.data.gid, 1); + if(!th.data.sele_g.whsle_id) th.check_is_youhui(th.data.gid, 1); } else { if (th.data.is_normal) { @@ -5981,7 +5993,7 @@ Page({ var lock = 0; //---如果是活动的时候,同时不是普通购买--- - if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { + if (th.data.sele_g.whsle_id || (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { func(); return false; } @@ -6637,7 +6649,7 @@ Page({ }); }); } - this.check_is_youhui(th.data.gid, 1); + if(!th.data.sele_g.whsle_id) this.check_is_youhui(th.data.gid, 1); }, closeSpecModal_inte: function () { @@ -6845,7 +6857,8 @@ Page({ }); this.get_sku(os.stoid, this.data.data, gid); this.get_sto(); - this.check_is_youhui(gid, 1); + if(!this.data.data.whsle_id) + this.check_is_youhui(gid, 1); this.data.is_normal = 1; }, @@ -6944,7 +6957,7 @@ Page({ }); }); } - this.check_is_youhui(th.data.gid, 1); + if(!this.data.data.whsle_id) this.check_is_youhui(th.data.gid, 1); }, closeSpecModal_flash_normal: function () { diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 77164b7..49eff38 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -649,7 +649,7 @@ (配送不匹配) - + (库存不足) @@ -1254,7 +1254,7 @@ (库存不足) (配送不匹配) - + (库存不足) @@ -1326,7 +1326,7 @@ - + 库存不足 diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 4c10c0b..0135340 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -41,6 +41,9 @@ Page({ getApp().globalData.guide_id=res.data.data.id; } }) + if(!getApp().globalData.user_id){ + ut.new_user_go(oo.stoid,first_leader); + } } var th=this; diff --git a/pages/index/index/index.js b/pages/index/index/index.js index dac0d27..eb378ac 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -173,6 +173,11 @@ Page({ getApp().globalData.guide_id = res.data.data.id; } }) + + if(!getApp().globalData.user_id){ + ut.new_user_go(os.stoid,first_leader); + } + } // 判断是否有红包活动 diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index d57483c..9220eef 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -18,7 +18,6 @@ - @@ -45,17 +44,11 @@ - - - - - - - - - - + + + + @@ -595,3 +588,5 @@ + + diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index bc99d99..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) { @@ -187,15 +188,7 @@ Page({ }; //--如果有邀请人的时候-- if(th.data.first_leader){ - //判断一下分享人是不是分享商 - await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+th.data.first_leader,{}).then(res=>{ - if(res.data.code==0){ - var user= res.data.data; - if(user.is_distribut==1){ - dd.first_leader=th.data.first_leader; - } - } - }) + dd.first_leader=th.data.first_leader; } //-- 导购会员ID -- if(getApp().globalData.guide_id){ @@ -209,50 +202,77 @@ Page({ console.log("-----会员注册的信息-------"); console.log(dd); - app.request.get("/api/weshop/users/thirdLogin", { - data: dd, - success: function (e) { - - if (e.data.code == 0) { - app.globalData.user_id = e.data.data.user_id; - } else { - return app.showWarning("授权登入失败！"+e.data.msg); - } - - - var need_go=0; - var t_user=e.data.data; - - - getApp().globalData.login_back=1; - wx.setStorageSync("userinfo",e.data.data); - wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); - - //如果有需要完善的信息没有完善，就需要跳转 - if(!t_user['vipname'] && th.data.name_need_go){ need_go=1;} - if(!t_user['birthday'] && th.data.birth_need_go){ need_go=1;} - if(!t_user['idcard'] && th.data.idcard_need_go){ need_go=1;} - if(!t_user['address'] && th.data.address_need_go){ need_go=1;} - if(!t_user['pickup_id'] && th.data.pick_need_go){ need_go=1;} - if(!t_user['sex'] && th.data.sex_need_go){ need_go=1;} - if(!t_user['fromuser_id'] && th.data.introducer_need_go){ need_go=1;} - - if(need_go){ - getApp().goto("/packageA/pages/profile/profile"); - }else{ - wx.navigateBack({ delta: 1}) - } - }, - failStatus: function (t) { - return app.my_warnning("授权登入失败,请稍后再试!", 0, that); - }, - fail: function (t) { - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + + var need_go=0; + //如果有需要完善的信息没有完善，就需要跳转 + if(th.data.name_need_go){ need_go=1;} + if(th.data.birth_need_go){ need_go=1;} + if(th.data.idcard_need_go){ need_go=1;} + if(th.data.address_need_go){ need_go=1;} + if(th.data.pick_need_go){ need_go=1;} + if(th.data.sex_need_go){ need_go=1;} + if(th.data.introducer_need_go){ need_go=1;} + + if(need_go){ + + var req_data={ + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", {data:req_data}).then(res=>{ + if(res.data.code==0){ + dd.mobile=res.data.data; + getApp().globalData.zc_dd=dd; + wx.redirectTo({ + url:"/packageA/pages/profile/profile?is_back=1" + }) + } + }) + + }else{ + + this.setData({sub:1}); + wx.showLoading({ + title:'处理中.', + mask:true + }) + this.zu_ce(dd); //调用注册的函数 } - }); + }, + zu_ce:function (dd) { + var th=this; + app.request.get("/api/weshop/users/thirdLogin", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + app.globalData.user_id = e.data.data.user_id; + } else { + return app.showWarning("授权登入失败！"+e.data.msg); + } + getApp().globalData.login_back=1; + wx.setStorageSync("userinfo",e.data.data); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); + wx.navigateBack({ delta: 1}) + + }, + failStatus: function (t) { + th.setData({sub:0}); + return app.my_warnning("授权登入失败,请稍后再试!", 0, th); + }, + fail: function (t) { + th.setData({sub:0}); + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + } + }); + }, + + bind_bnerr:function(e){ var _errImg = e.target.dataset.errorimg; var _errObj = {}; 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/pages/user/index/index.js b/pages/user/index/index.js index 167e168..a5a80e3 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -75,7 +75,25 @@ Page({ } } }) - app.getUserFir(); + + var first_leader = options.first_leader; + if(first_leader){ + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + if(!getApp().globalData.user_id){ + ut.new_user_go(os.stoid,first_leader); + } + + }else{ + app.getUserFir(); + } this.init_user_tool() }, @@ -484,7 +502,26 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function () { getApp().globalData.no_clear = 1; }, + onShareAppMessage: function () { + getApp().globalData.no_clear = 1; + var url = "/pages/user/index/index"; + + if (userInfo) { + url += "?first_leader=" + getApp().globalData.user_id; + } + var title = "会员中心" + //分享 + if (getApp().globalData.config && getApp().globalData.config.store_name) { + title = getApp().globalData.config.store_name; + } else if (getApp().globalData.setting.appName) { + title = getApp().globalData.setting.appName; + } + + var ob = { + title: title,path: url, + }; + return ob; + }, //------卡片的显示和关闭-------- show_tc: function () { diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 1c1ac5f..1237861 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -629,7 +629,7 @@ Page({ } //--如果是线下库存的时候-- - if(th.data.conf.sales_rules==2){ + if(th.data.conf.sales_rules==2 && !gg.whsle_id){ var ob={}; await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ ob=obj; @@ -1197,7 +1197,7 @@ Page({ } //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 - if(g_item.prom_type==3 || good.prom_type==3){ + 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"; @@ -1239,7 +1239,7 @@ Page({ //判断是不是线下库存的购买， 是不是秒杀活动 - if(th.data.sales_rules==2 && !prom){ + if(th.data.sales_rules==2 && !prom && !good.whsle_id){ //-- 看一下购物车上有多少商品 -- var cart_num=0; diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 9a97f62..4fd3535 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -36,7 +36,7 @@ ×{{item.goods_num}} - + 申请退款 - + 申请退款 退款中 重新退款 diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 2606abf..1034f50 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -88,12 +88,17 @@ Page({ console.log('ee',ee); var sms_conf = ee.switch_list; sms_conf = JSON.parse(sms_conf); - th.setData({ - rank_switch:sms_conf.rank_switch, - is_lable_set: sms_conf.user_label_set, //是不是会员标签设置 - guide_title:sms_conf.guide_consultant, //系统参数 导购标题 - guide_change_time:sms_conf.guide_change_time, //每月能修改几次 - }) + let reg_type = ee.reg_type; + let reg_info = ee.reg_info; + var con_f={ + rank_switch:sms_conf.rank_switch, + is_lable_set: sms_conf.user_label_set, //是不是会员标签设置 + guide_title:sms_conf.guide_consultant, //系统参数 导购标题 + guide_change_time:sms_conf.guide_change_time, //每月能修改几次 + } + if(reg_type) con_f.reg_info= JSON.parse(reg_info); + th.setData(con_f) + if (sms_conf.usercode_vailtime!=null && parseInt(sms_conf.usercode_vailtime)>0) { th.setData({ getusercode_vailtime: sms_conf.usercode_vailtime }); @@ -101,7 +106,7 @@ Page({ if (sms_conf.user_label_set) { th.query_checklabels(); } - }) + },1) }, //查找会员选择的兴趣标签 query_checklabels: function() { @@ -816,15 +821,7 @@ Page({ } }) } - // var phone = ""; - // phone+=a.mobile.substr(0, 3)+"****"; - // phone += a.mobile.substr(7, 12); - - - // e.setData({ - // isGender:e.data.user.sex - // }) }, !0); }, diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 2e82d7b..cf1af24 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -113,6 +113,12 @@ 女 + + + +{{reg_info.sex}}积分 + +{{reg_info.sex}}成长值 + + @@ -140,7 +146,7 @@ 农历 - + @@ -150,7 +156,12 @@ {{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}} - + + + +{{reg_info.birthday}}积分 + +{{reg_info.birthday}}成长值 + + @@ -158,18 +169,25 @@ 姓名 - + + + + +{{reg_info.name}}积分 + +{{reg_info.name}}成长值 + + 身份证 + + + + +{{reg_info.idcard}}积分 + +{{reg_info.idcard}}成长值 + + - - - - 更换手机 @@ -185,8 +203,14 @@ {{user.address}} --> - - + + + + +{{reg_info.address}}积分 + +{{reg_info.address}}成长值 + + + @@ -194,7 +218,14 @@ 所属门店 {{stoname}} - ∟ + + ∟ + + +{{reg_info.pick}}积分 + +{{reg_info.pick}}成长值 + + + @@ -239,7 +270,6 @@ 收货地址 - ∟ diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss index efaf211..8d60f47 100644 --- a/pages/user/userinfo/userinfo.wxss +++ b/pages/user/userinfo/userinfo.wxss @@ -662,3 +662,7 @@ input { height: 46rpx; line-height: 46rpx; } + +.lb_txt{ + color: red; font-size: 24rpx; +} diff --git a/utils/util.js b/utils/util.js index 6dc7f0a..867edf8 100644 --- a/utils/util.js +++ b/utils/util.js @@ -677,6 +677,28 @@ module.exports = { url: r + o }); }, + + //分享注册，跳转到授权 + new_user_go:function (stoid,first_leader) { + getApp().request.get("/api/weshop/users/get/" + stoid + "/" + first_leader,{ + success: function(e) { + if (e.data.code == 0 && e.data.data ) { + // 提示框 + wx.showModal({ + title: '邀请登录', + content: e.data.data.vipname+'邀请你登录成为会员？', + success: function (res) { + if (res.confirm) { + getApp().goto("/pages/togoin/togoin"); + } + } + }) + } + } + }) + }, + + unserialize: unserialize, _throttle:_throttle, unserialize_o: unserialize_o,