diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 0f19b5d..a2a5e5d 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -534,8 +534,8 @@ - - + + @@ -567,9 +567,8 @@ - - {{item.goods_name}} + {{item.goods_name}} @@ -698,7 +697,6 @@ - diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index 095e1fe..4c5461b 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -139,7 +139,7 @@ border-bottom: 2rpx #eee solid; /* padding: 10rpx; */ background-color: white; - padding: 20rpx; + margin: 20rpx; /* background-color: pink; */ box-sizing: border-box; } @@ -149,7 +149,7 @@ min-height: 300rpx; display: flex; /* border-bottom: 2rpx #eee solid; */ - padding: 10rpx; + margin: 10rpx; background-color: white; } @@ -901,6 +901,10 @@ top: 10rpx; border-radius: 40rpx; } +.zs_goods_xiao_wai{ padding-top:1rpx } +.s1_gk_a1.list_border{ display: block; border-bottom: 1rpx solid #eee} + + diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index f2952b0..7c424ba 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -2932,14 +2932,38 @@ Page({ onShareTimeline() { getApp().globalData.no_clear=1 - var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; - if(!store_name) - store_name=getApp().globalData.setting.appName; - - return { - title:this.data.data.goods_name + '-' + store_name, - imageUrl:this.data.gallery[0].image_url, - } + + var th = this; + var price = th.data.data.shop_price; + if (th.data.prom_act) { + price = th.data.prom_act.price; + + } + var title= th.data.data.goods_name; + var img=th.data.data.original_img; + if(th.data.prom_type==6){ + title=th.data.prom_act.share_title; + img=th.data.iurl+th.data.prom_act.share_imgurl; + } + + var url="goods_id=" + th.data.gid; + if(getApp().globalData.user_id) { + url+="&first_leader="+getApp().globalData.user_id; + } + + //-- 如果房间分享，且不是会员分享的 -- + if(getApp().globalData.room_id && + th.data.data.goods_id==getApp().globalData.room_goods_id && + !getApp().globalData.room_user_share + ){ + url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1"; + } + + return { + title:price + "元 " +title, + imageUrl:img, + query: url + } }, diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js index 52ce5b1..8fed520 100644 --- a/packageA/pages/jfbuy/jfbuy.js +++ b/packageA/pages/jfbuy/jfbuy.js @@ -267,23 +267,21 @@ Page({ // } }, - - - onShareTimeline() { - getApp().globalData.no_clear=1; - var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; - - var pagePath = this.route; //当前页面url - - if(!store_name) store_name = getApp().globalData.setting.appName; - if(pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - return { - title: store_name + '-积分购', - path: pagePath, - } - }, + + + onShareTimeline() { + getApp().globalData.no_clear=1; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + if(!store_name) store_name = getApp().globalData.setting.appName; + + return { + title: store_name + '-积分购', + query: 'first_leader='+user_id + } + }, //-- 点击tab -- diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js index 0530f00..990d007 100644 --- a/packageA/pages/liveStream/liveStream.js +++ b/packageA/pages/liveStream/liveStream.js @@ -365,23 +365,18 @@ Page({ } }, - onShareTimeline: function (res) { - getApp().globalData.no_clear=1; - if (res.from === 'button') { - // 来自页面内转发按钮 - // console.log(res.target) - } - return { - title: '直播列表' - // path: '/page/user?id=123' - } - }, - - - - - + onShareTimeline: function (res) { + getApp().globalData.no_clear=1; + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title: '直播列表', + query: 'first_leader='+user_id + } + }, + /** * 请求数据 */ diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js index 472479d..3a55568 100644 --- a/packageA/pages/liveStreamDetails/liveStreamDetails.js +++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js @@ -630,17 +630,17 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un } }, - onShareTimeline: function (res) { - getApp().globalData.no_clear=1; - if (res.from === 'button') { - // 来自页面内转发按钮 - console.log(res.target) - } - return { - title: this.data.details.name - // path: '/page/user?id=123' - } - }, + onShareTimeline: function (res) { + getApp().globalData.no_clear=1; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title: this.data.details.name, + query: 'first_leader='+user_id+"&id="+this.data.id + } + }, imageResize(imgWidth, imgHeight) { diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 93f7bf0..81f522e 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -1126,10 +1126,10 @@ Page({ if(this.data.reg_info.introducer_state){ let tjrname = this.data.referee; if (tjrname == "" || tjrname == null) { - app.my_warnning("请输入推荐人", 0, this); - return false; + //app.my_warnning("请输入推荐人", 0, this); + //return false; }; - data.tjrname=tjrname; + if(tjrname) data.tjrname=tjrname; } //-- 需要姓名 -- @@ -1150,7 +1150,6 @@ Page({ }; data.sex=sex; } - //需要生日 if(this.data.reg_info.birthday_state){ let birthday = this.data.datet; diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index a6ef4e5..ea36031 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -234,7 +234,6 @@ Page({ } t.data.data.gg = gg; - //--看一下有没有开启等级卡--- if (ee.data.rank_switch) { //---回调卡的列表--- diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index bdff1a9..0ec52e5 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -468,18 +468,19 @@ Page({ onShareTimeline() { getApp().globalData.no_clear=1; var title = this.data.act.name; - var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id; - if (getApp().globalData.user_id) { - url += "&first_leader=" + getApp().globalData.user_id; - } + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + var ob = { title: title, - path: url, + query: 'first_leader='+user_id+"&id=" + this.data.act.id }; if (this.data.act.img_url) ob.imageUrl = this.data.iurl + this.data.act.img_url; return ob; }, + /** * 点击规则详情,弹出规则 */ diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index 280ecb7..9508141 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -470,18 +470,19 @@ Page({ onShareTimeline() { getApp().globalData.no_clear=1; var title = this.data.act.name; - var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id; - if (getApp().globalData.user_id) { - url += "&first_leader=" + getApp().globalData.user_id; - } + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + var ob = { title: title, - path: url, + query: 'first_leader='+user_id+"&id=" + this.data.act.id }; if (this.data.act.img_url) ob.imageUrl = this.data.iurl + this.data.act.img_url; return ob; }, + /** * 点击规则详情,弹出规则 */ diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index dcd404f..9d2e658 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -1619,7 +1619,11 @@ Page({ break; case 1: //order_m = o_condition - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; + var bs=1; + if(ord_prom.is_bz){ + bs=Math.floor(o_condition/ord_prom.money); + } + order_prom_amount = bs*ord_prom['expression']; break; } } @@ -1976,8 +1980,13 @@ Page({ order_prom_amount = (o_condition - order_m).toFixed(2); break; case 1: - order_m = o_condition - ord_prom['expression'];//满额优惠金额 - order_prom_amount = 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 = bs*ord_prom['expression']; break; } } 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 1a85c7d..84dada4 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -242,6 +242,20 @@ Page({ var gd = t.data.data; if (!gd) return false; + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ + getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ + if(res.data.code==0){ + var pk=res.data.data; + if(pk && pk.is_same_city){ + th.setData({show_same_city:1}) + }} + + }) + + } + + t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; // console.log(t.data.data); @@ -406,12 +420,14 @@ Page({ th.data.json_d = json_d; th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; + var is_same_city = json_d.is_same_city; th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, - is_default_logistics: is_default_logistics + is_default_logistics: is_default_logistics, + is_same_city: is_same_city }); var rank_switch = json_d.rank_switch; @@ -499,9 +515,7 @@ Page({ console.log('calculatePrice2'); var th = this, good = this.data.bn_goods; - - th.setData({is_show_sub:0}); - + //-----------计算商品总价-------------- var allpice = th.data.param.goods_price; allpice = parseFloat(allpice).toFixed(2); @@ -510,6 +524,8 @@ Page({ [txt]: allpice, }); + this.setData({sub:1}); + wx.showLoading({ title: "处理中.", mask:true @@ -544,8 +560,9 @@ 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) { + if (goods_weight < 0) goods_weight = 0; goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; } @@ -611,7 +628,7 @@ Page({ wx.showToast({ title: "计算物流错误", icon: 'none',duration: 2000 }) - th.setData({ show_submit:0 }); + th.setData({ show_submit:0,sub:0 }); wx.hideLoading(); } @@ -622,12 +639,62 @@ Page({ [wl_txt]: shipping_price, }) - } else { + } else if(th.data.bn_exp_type==1) { var wl_txt = "formData.shipping_price"; th.setData({ [wl_txt]: 0, }) } + + + //判断是否同城配送,而且没有调用过 + if(th.data.bn_exp_type==2 && th.data.user_addr) { + + var lon=0;var lat=0; + //-- 获取距离 -- + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + }).then(res=>{ + if(res.data.code==0){ + var data= JSON.parse(res.data.data); + if(data.status==0){ + lon=data.result.location.lng; + lat=data.result.location.lat; + } + } + }) + + + var gd_w = good['weight'] * good['buynum']; + //-- 获取距离 -- + var req_data = { + store_id: os.stoid, + order_amount:th.data.param.goods_price, + lon: lon, lat: lat, + pickup_id: th.data.bn_pick, + goods_weight: gd_w + } + + var is_next=1; + //获取同城配送参数 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { + is_json: 1, + data: req_data + }).then(res => { + if (res.data.code == 0) { + var wl_txt = "formData.shipping_price"; + th.setData({ [wl_txt]: res.data.data, }) + }else{ + is_next=0; + wx.showToast({ + title: res.data.msg, icon: 'none', duration: 2000 + }) + } + }) + if(!is_next) return false + } + + //-----------------总价----------------- // 幸运购 01 // var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price); @@ -648,7 +715,7 @@ Page({ th.setData({ [txt]: total_m, [txt2]: 0, - is_show_sub:1 + is_show_sub:1,sub:0 }) } else { order_m = parseFloat(order_m) - parseFloat(th.data.yuer); @@ -656,14 +723,14 @@ Page({ th.setData({ [txt]: th.data.yuer, [txt2]: order_m, - is_show_sub:1 + is_show_sub:1,sub:0 }) } } else { th.setData({ [txt]: 0, [txt2]: order_m, - is_show_sub:1 + is_show_sub:1,sub:0 }) } wx.hideLoading(); 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 256b028..37fc228 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -10,6 +10,11 @@ + + + + + @@ -160,7 +165,7 @@ 应付金额：￥{{formData.order_amount}} - + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index bfc7ab7..e8d1026 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -528,8 +528,9 @@ Page({ }); //更新点击量 - getApp().request.put("/api/weshop/goods/updateClick", { - data: { store_id: os.stoid, goods_id: gid } + //noinspection JSUnresolvedFunction + getApp().request.put("/api/weshop/goods/updateClick", { + data: { store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 } }); @@ -2450,14 +2451,15 @@ Page({ if (pagePath.indexOf('/') != 0) { pagePath = '/' + pagePath; } - // if(getApp().globalData.user_id){ - // if(pagePath.indexOf("?")>0){ - // pagePath+="&first_leader="+getApp().globalData.user_id; - // }else{ - // pagePath+="?first_leader="+getApp().globalData.user_id; - // } - // } + if(getApp().globalData.user_id){ + if(pagePath.indexOf("?")>0){ + pagePath+="&first_leader="+getApp().globalData.user_id; + }else{ + pagePath+="?first_leader="+getApp().globalData.user_id; + } + } + return { title: "邀您一起参加幸运购", path: pagePath, @@ -6197,12 +6199,19 @@ Page({ onShareTimeline() { getApp().globalData.no_clear=1; - var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; - if (!store_name) - store_name = getApp().globalData.setting.appName; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; + if (!store_name) + store_name = getApp().globalData.setting.appName; + + var pagePath = `goods_id=${this.data.sele_g.goods_id}&prom_type=9&group_id=${this.data.group_id}`; //当前页面url + if(getApp().globalData.user_id){ + pagePath+="&first_leader="+getApp().globalData.user_id; + } + return { title: this.data.data.goods_name + '-' + store_name, imageUrl: this.data.gallery[0].image_url, + query: pagePath } }, diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index ae07d34..8cd20d8 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -205,12 +205,14 @@ Page({ th.data.json_d = json_d; th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; + var is_same_city = json_d.is_same_city; th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics, + is_same_city: is_same_city, sys_switch: json_d, }); @@ -500,6 +502,21 @@ Page({ order.show_img = oo.imghost + goods.original_img; }); + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if(goods.is_same_city && th.data.is_same_city && goods.whsle_id<=0){ + + getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}).then(res=>{ + if(res.data.code==0){ + var pk=res.data.data; + if(pk && pk.is_same_city){ + th.setData({show_same_city:1}) + } + } + + }) + + } + var g_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + order_goods.goods_id + "&pre_id=" + pre_arr.id; if (act.is_end || th.data.act.end_time < ut.gettimestamp()) { @@ -590,6 +607,11 @@ Page({ break; //物流 } + if (th.data.exp_type) { + exp_type=th.data.exp_type + } + + //等待发货的时候 if (th.data.wait_fh) { var send_time = th.data.act.delivery_date; @@ -626,15 +648,19 @@ Page({ }, - async calculatePrice2() { + async calculatePrice2() { var th = this; if (!this.data.pre_arr) return false; - th.setData({ show_submit: 0,}) + th.setData({ show_submit: 0,disabled_btn:0}) //--计算物流-- if (this.data.exp_type == 0) { this.calculate_wuliu(); - } else { + }else if (this.data.exp_type == 2) { + this.calculate_same_city(); + } + + else { var allpice = this.data.pre_arr.presell_price * this.data.order_goods.goods_num; allpice = allpice.toFixed(2); //--看一下有没有订单优惠-- @@ -698,8 +724,14 @@ Page({ order_prom_amount = (all_1 - o_condition1).toFixed(2); break; case 1: - o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; + + var bs=1; + if(ord_prom.is_bz){ + bs=Math.floor(o_condition/ord_prom.money); + } + + o_condition1 = ord_price - bs*ord_prom['expression'];//满额优惠金额 + order_prom_amount = bs*ord_prom['expression']; break; } } @@ -1824,8 +1856,9 @@ 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) { + if (goods_weight < 0) goods_weight = 0; goods_weight += item['weight'] * item['buynum']; cut_good_weight += item['weight'] * item['buynum']; } @@ -1908,6 +1941,68 @@ Page({ } //}); }, + async calculate_same_city() { + var th = this, + good = th.data.goods, + quan_price = 0, + exp_price = 0; + + var quan_no = null; + var bn_pick = th.data.pickup.pickup_id; + var allpice = th.data.all_price; + + good.buynum=th.data.order.order_goods.goods_num; + + if (th.data.using_quan[bn_pick] != null && th.data.using_quan[bn_pick] != undefined) + quan_no = th.data.using_quan[bn_pick].coupon_no; + + if (quan_no) { + if (th.data.using_quan[bn_pick].isby != 1) { + //---获取优惠券优惠--- + await getApp().request.promiseGet("/api/weshop/couponList/getUseCouponPrice", { + data: { + storeId: oo.stoid, + CashRepNo: quan_no, + WaresSum: th.data.ckeck_quan_price, + WareIds: th.data.check_quan_ware_list + } + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + quan_price = res.data.data[0].WareCashSum; + } + }) + + if (quan_price > 0) { + if (quan_price < th.data.tail_pay) th.setData({ quan_price: quan_price }) + else { + th.setData({ quan_price: th.data.tail_pay }) + quan_price = th.data.tail_pay; + } + } else { + th.setData({ quan_price: 0 }) + } + } else { + th.setData({ quan_price: 0 }) + } + } else { + th.setData({ quan_price: 0 }) + } + + //-----------当地址不为空，且是物流时，计算物流费用---------- + if (th.data.user_addr != null) { + th.wuliu_next(allpice, quan_price, 0); + } else { + wx.showToast({ + title: '请先选择收货地址', icon: 'none', duration: 2000 + }) + return false; + } + //}); + }, + + + + //相同的东西统一在一起 wuliu_next(allpice, quan_price, exp_price) { var th = this; @@ -1915,7 +2010,7 @@ Page({ if (o_condition < 0) o_condition = 0; //如果同意参与订单优惠 if (o_condition > 0 && this.data.pre_arr.is_useorderyh) { - th.check_is_order_prom(o_condition, function (ord_price) { + th.check_is_order_prom(o_condition,async function (ord_price) { var bn_pick = th.data.pickup.pickup_id var order_prom_amount = 0; var order_prom_id = 0; @@ -1950,9 +2045,59 @@ Page({ th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) } + if(th.data.exp_type == 2) { + var good = th.data.goods; + //--------------开始计算物流------------------ + var shipping_price = 0; + var lon = 0; + var lat = 0; + //-- 获取距离 -- + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { + is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address} + }).then(res => { + if (res.data.code == 0) { + var data = JSON.parse(res.data.data); + if (data.status == 0) { + lon = data.result.location.lng; + lat = data.result.location.lat; + } + } + }) + var gd_w = good['weight'] * good['buynum']; + //-- 获取距离 -- + var req_data = { + store_id: os.stoid, + order_amount: parseFloat(ord_price), + lon: lon, lat: lat, + pickup_id: bn_pick, + goods_weight: gd_w + } + + var is_next = 1; + //获取同城配送参数 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { + is_json: 1, + data: req_data + }).then(res => { + if (res.data.code == 0) { + shipping_price = res.data.data; + } else { + is_next = 0; + wx.showToast({ + title: res.data.msg, icon: 'none', duration: 2000 + }) + } + }) + if (!is_next) { + th.setData({show_submit: 1, disabled_btn: 1}) + return false + } + exp_price = parseFloat(shipping_price).toFixed(2); + } ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit); if (ord_price < 0) ord_price = 0; + th.setData({ exp_price: exp_price, order_m: ord_price + parseFloat(exp_price), show_submit: 1, }) }) diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml index ad0f87a..8a4148e 100644 --- a/packageC/pages/presell/cart/cart.wxml +++ b/packageC/pages/presell/cart/cart.wxml @@ -2,7 +2,7 @@ -
+ @@ -120,6 +120,12 @@ class="tab {{exp_type== 0 ? 'active':''}}" data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄 + + + + 同城配送 + - + diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 285b3b3..27c85c1 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -580,6 +580,8 @@ Page({ } }) + this.getHistoryBuy(); //获取历史购买 + ee.setData({ gallery: gallery, is_collect: is_collect, @@ -3183,6 +3185,27 @@ Page({ this.setData(ob); }, + //历史购买 + getHistoryBuy() { + let _this = this; + let req_data = { + store_id: os.stoid, + goods_id: this.data.gid, + pay_status: 1, + rndid: 1 + }; + getApp().request.promiseGet('/api/weshop/ordergoods/list', { + data: req_data, + }) + .then(res => { + if (t.ajax_ok(res)) { + _this.setData({ + historyBuyInfo: res.data.data.pageData, + }) + } + }) +}, + //--调用更新阶梯团的接口-- update_jiti: function (id) { var th = this; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index f31fa6a..3ba4a2f 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -17,21 +17,22 @@ @@ -24,13 +29,18 @@ + + + + + - - + {{wu_arr[item.wind].name}} @@ -215,7 +239,7 @@ - + 优惠券{{item.can_num}}张可用 @@ -415,10 +439,12 @@ {{order.store_prom}} - + - + diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index bc626e4..2f079e9 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -148,14 +148,16 @@ Page({ th.get_buy_goods(); //获取提现金额 - getApp().request.get("/api/weshop/withdrawals/summoney", { + //noinspection JSUnresolvedFunction + getApp().request.get("/api/weshop/withdrawals/summoney", { data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 }, success: function (su) { if (su.data.code == 0) { var yuer = parseFloat(th.data.userinfo.user_money - (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2); if (yuer < 0) yuer = 0; - th.setData({ txmon: su.data.data.summoney, yuer: yuer }); + //noinspection JSUnresolvedVariable + th.setData({ txmon: su.data.data.summoney, yuer: yuer }); } } }); @@ -173,6 +175,22 @@ Page({ var gd = t.data.data; if (!gd) return false; + + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ + + getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ + if(res.data.code==0){ + var pk=res.data.data; + if(pk && pk.is_same_city){ + th.setData({show_same_city:1}) + } + } + + }) + + } + t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; console.log(t.data.data); @@ -315,8 +333,10 @@ Page({ th.data.json_d = json_d; th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 var is_default_logistics = json_d.is_default_logistics; + var is_same_city = json_d.is_same_city; - th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); + th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules,is_same_city:is_same_city, + rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); var rank_switch = json_d.rank_switch; var max_price = -1; @@ -398,7 +418,6 @@ Page({ calculatePrice2:async function () { this.setData({submit:1}); - wx.showLoading({ title: "处理中.", mask:true @@ -441,7 +460,7 @@ Page({ 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(item['exp_sum_type'] == 2) { if (goods_weight < 0) goods_weight = 0; cut_good_weight += item['weight'] * item['buynum']; goods_weight += item['weight'] * item['buynum']; @@ -520,10 +539,54 @@ Page({ var wl_txt = "formData.shipping_price"; th.setData({ [wl_txt]: shipping_price, }) - } else { + } else if(th.data.bn_exp_type == 1 ) { var wl_txt = "formData.shipping_price"; th.setData({ [wl_txt]: 0, }) } + + //判断是否同城配送,而且没有调用过 + if(th.data.bn_exp_type==2 && th.data.user_addr){ + var lon=0;var lat=0; + //-- 获取距离 -- + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + }).then(res=>{ + if(res.data.code==0){ + var data= JSON.parse(res.data.data); + if(data.status==0){ + lon=data.result.location.lng; + lat=data.result.location.lat; + } + } + }) + + var gd_w=good['weight'] * good['buynum']; + //-- 获取距离 -- + var req_data={ + store_id:os.stoid, + order_amount:allpice, + lon:lon,lat:lat, + pickup_id:th.data.bn_pick, + goods_weight:gd_w + } + + var is_next=1; + //获取同城配送参数 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {is_json:1,data:req_data}).then(res=>{ + if(res.data.code==0){ + var wl_txt = "formData.shipping_price"; + th.setData({ [wl_txt]: res.data.data, }) + }else{ + is_next=0; + wx.showToast({ + title: res.data.msg, icon: 'none', duration: 2000 + }) + } + }) + if(!is_next) return false + } + + //-----------------总价----------------- var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price); total_m = parseFloat(total_m).toFixed(2); diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index bc99ba8..7f700e4 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -10,6 +10,11 @@ + + + + 同城配送 + diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index d868e51..fb7e260 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -41,6 +41,7 @@ Page({ teamgroup: null, submit:1, //默认按钮是灰色 + show_submit:0, //不线上 }, /** @@ -62,7 +63,8 @@ Page({ var json_d = JSON.parse(e.switch_list); th.data.json_d = json_d; var is_default_logistics = json_d.is_default_logistics; - th.setData({ is_default_logistics: is_default_logistics }); + var is_same_city = json_d.is_same_city; + th.setData({ is_default_logistics: is_default_logistics,is_same_city:is_same_city }); th.get_wuliu(th.get_info(th.show_page)); }, 1) @@ -91,6 +93,11 @@ Page({ if (th.data.exp_type == 0 && th.data.goods) { th.calculate_wuliu(); } + + if (th.data.exp_type == 2 && th.data.goods) { + th.calculate_same_city(); + } + }) }, @@ -265,7 +272,23 @@ Page({ else distr_type = pickup.distr_type; - switch (distr_type) { + + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if(goods.is_same_city && th.data.is_same_city && goods.whsle_id<=0){ + getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}).then(res=>{ + if(res.data.code==0){ + var pk=res.data.data; + if(pk && pk.is_same_city){ + th.setData({show_same_city:1}) + } + } + }) + } + + + + + switch (distr_type) { case 0: exp_type = 1; //-- 系统后台有设置要默认的 -- @@ -297,7 +320,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,submit:0 }) + th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1 }) } }, @@ -326,22 +349,19 @@ Page({ this.setData({ exp_type: type }); - - - //--计算物流的值-- if (type == 0) { - - th.setData({submit:0}) th.calculate_wuliu(); - } else { + } else if(type==1){ var allpice = parseFloat(th.data.order.order_amount) + parseFloat(th.data.order.user_money) + parseFloat(th.data.order.tail_money); allpice = allpice.toFixed(2); this.setData({ - allpice: allpice, exp_price: 0, + allpice: allpice, exp_price: 0,show_submit:1,submit:0 }); + }else{ + th.calculate_same_city(); } }, @@ -400,6 +420,12 @@ Page({ dd.shipping_price = parseFloat(th.data.exp_price); dd.addressid = th.data.user_addr.address_id; } + + //如果是同城配送的时候 + if(th.data.exp_type==2){ + dd.shipping_price = parseFloat(th.data.exp_price); + } + if(getApp().globalData.scene){ dd.scene=getApp().globalData.scene; } @@ -589,7 +615,7 @@ Page({ } }) if(!is_ok){ - th.setData({ submit:0 }); + th.setData({ submit:0,show_submit:1 }); wx.hideLoading(); return false; } @@ -599,16 +625,89 @@ Page({ allpice = allpice.toFixed(2); exp_price = parseFloat(exp_price); - th.setData({ exp_price: exp_price, allpice: allpice,submit:0 }) + th.setData({ exp_price: exp_price, allpice: allpice,submit:0,show_submit:1 }) } 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,submit:0}) + th.setData({ exp_price: 0, allpice: allpice,submit:0,show_submit:1}) } //}); }, + //----计算物流的钱--- + async calculate_same_city() { + //让按钮变灰色 + this.setData({submit:1}); + var th = this; + var good = th.data.goods; + good.buynum=th.data.order.order_goods['goods_num']; + + //--全部金额-- + var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.pt_tail_money; + //-----------当地址不为空，且是物流时，计算物流费用---------- + if (th.data.user_addr != null) { + + + var lon=0;var lat=0; + //-- 获取距离 -- + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + }).then(res=>{ + if(res.data.code==0){ + var data= JSON.parse(res.data.data); + if(data.status==0){ + lon=data.result.location.lng; + lat=data.result.location.lat; + } + } + }) + + var gd_w = good['weight'] * good['buynum']; + //--------------开始计算物流------------------ + var shipping_price =0; + + //-- 获取距离 -- + var req_data={ + store_id:os.stoid, + order_amount:allpice, + lon:lon,lat:lat, + pickup_id:th.data.pickup.pickup_id, + goods_weight:gd_w + } + + var is_next=1; + //获取同城配送参数 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {is_json:1,data:req_data}).then(res=>{ + if(res.data.code==0){ + shipping_price=res.data.data; + }else{ + is_next=0; + wx.showToast({ + title: res.data.msg, icon: 'none', duration: 2000 + }) + } + }) + if(!is_next) 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,submit:0,show_submit:1 }) + + + + } 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,submit:0,show_submit:1}) + } + + + }, + //---------------检查是否有收货地址------------------- checkAddressList: function () { diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index 4e58a03..9d1c5c6 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -1,6 +1,7 @@ + + + + + + + @@ -171,3 +178,5 @@
+ + diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index defcdf2..ec4a7d0 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -335,21 +335,20 @@ Page({ } }, - // 分享朋友圈 - onShareTimeline() { - getApp().globalData.no_clear=1; - var curPage = this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - pagePath += "?first_leader=" + this.data.getUserID; - return { - title: '专享礼包', - imageUrl: this.data.ad_data.ad_code, - path: pagePath, - } - }, + // 分享朋友圈 + onShareTimeline() { + getApp().globalData.no_clear=1; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title: '专享礼包', + imageUrl: this.data.ad_data.ad_code, + query: 'first_leader='+user_id + } + }, + //--- 设置一下默认库存的数量 ---- diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 029f528..78e6092 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -544,28 +544,21 @@ Page({ } }, - /** - * 用户分享朋友圈 - */ - onShareTimeline() { - getApp().globalData.no_clear=1; - var curPage = this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - pagePath += "?isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID; - // if (this.data.isBuy == 0) { - // pagePath += "&orderSn=" + this.data.orderSn; - // } else { - // pagePath += "&lbId=" + this.data.getGiftID; - // } - console.log('pagePath', pagePath); - return { - title: "礼包详情", - path: pagePath, - } - }, + /** + * 用户分享朋友圈 + */ + onShareTimeline() { + getApp().globalData.no_clear=1; + + var pagePath ="&isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader=" + this.data.getUserID; + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title: "礼包详情", + query: 'first_leader='+user_id+pagePath + } + }, //免费领取 GetFree: function (e) { diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js index dfee9d8..dd13e47 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.js +++ b/pages/giftpack/mygiftpack/mygiftpack.js @@ -177,20 +177,14 @@ Page({ } }, - onShareTimeline() { - getApp().globalData.no_clear=1; - var curPage = this; - var pagePath = curPage.route; //当前页面url - if (pagePath.indexOf('/') != 0) { - pagePath = '/' + pagePath; - } - pagePath += "?first_leader=" + this.data.getUserID; - return { - title: '专享礼包', - imageUrl: this.data.ad_data.ad_code, - path: pagePath, - } - }, + onShareTimeline() { + getApp().globalData.no_clear=1; + return { + title: '专享礼包', + imageUrl: this.data.ad_data.ad_code, + query: "first_leader=" + this.data.getUserID + } + }, }); \ No newline at end of file diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 96cdd72..45246d2 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -1092,15 +1092,20 @@ Page({ if(url[0]!='/') url='/'+url; getApp().goto(url); }, - - onShareTimeline(){ - getApp().globalData.no_clear=1; - var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; - if(!store_name) - store_name=getApp().globalData.setting.appName; - return { - title:'商品分类-'+store_name, - } - } + + onShareTimeline(){ + getApp().globalData.no_clear=1; + var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; + if(!store_name) + store_name=getApp().globalData.setting.appName; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title:'商品分类-'+store_name, + query: "first_leader=" + user_id + } + } }); \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index ec78e10..078172f 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -548,8 +548,9 @@ Page({ }); //更新点击量 + //noinspection JSUnresolvedFunction getApp().request.put("/api/weshop/goods/updateClick", { - data: {store_id: os.stoid, goods_id: gid} + data: {store_id: os.stoid, goods_id: gid,user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 } }); @@ -6673,16 +6674,33 @@ Page({ onShareTimeline() { getApp().globalData.no_clear=1; + var th=this; var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; if (!store_name) store_name = getApp().globalData.setting.appName; + + var url = "&goods_id=" + + th.data.sele_g.goods_id + "&prom_type=" + th.data.sele_g.prom_type + "&prom_id=" + th.data.sele_g.prom_id; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; + } + + //-- 如果房间分享，且不是会员分享的 -- + if (getApp().globalData.room_id && + th.data.sele_g.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share + ) { + url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; + } + return { title: this.data.data.goods_name + '-' + store_name, imageUrl: this.data.gallery[0].image_url, + query: 'first_leader='+user_id+url } }, + clickCollapse() { this.setData({ flag: !this.data.flag, diff --git a/pages/template/index.js b/pages/template/index.js index 546906d..9efa74d 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -126,7 +126,7 @@ Page({ var ob = { title: this.data.share_title, path: url, - imageUrl:this.data.url+this.data.store_config.store_logo, + //imageUrl:this.data.url+this.data.store_config.store_logo, }; return ob; }, @@ -152,9 +152,8 @@ Page({ var ob = { title:share_title, - //path: url, query:url, - imageUrl:this.data.url+store_config.store_logo, + //imageUrl:this.data.url+store_config.store_logo, }; console.log(ob); return ob; diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js index 55acd63..2a38aa4 100644 --- a/pages/user/assistance/assistance.js +++ b/pages/user/assistance/assistance.js @@ -240,14 +240,19 @@ Page({ } }, - onShareTimeline() { - getApp().globalData.no_clear=1; - var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; - if (!store_name) - store_name = getApp().globalData.setting.appName; - return { - title: '好友助力-' + store_name, - } - }, + onShareTimeline() { + getApp().globalData.no_clear=1; + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; + if (!store_name) + store_name = getApp().globalData.setting.appName; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + + return { + title: '好友助力-' + store_name, + query: 'first_leader='+user_id + } + }, }) diff --git a/pages/user/index/index.js b/pages/user/index/index.js index a5a80e3..9bfb971 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -42,7 +42,8 @@ Page({ actId: "", //生日活动的id actImg: "", is_assistance: 0, //助力活动 - ad_img: "", + ad_img: "", + usertop_ad: [],//会员顶部配置 add_card_data: '', //等级卡的内容 getusercode_vailtime:10,//会员二维码时效 hiddenCS: true, @@ -70,8 +71,13 @@ Page({ }, success: function (res) { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { - var item = res.data.data.pageData[0]; - if (item && item.ad_code) th.setData({ ad_img: item.ad_code }) + var item = res.data.data.pageData[0]; + if (item) + { + th.setData({ usertop_ad:item }); + if (item.ad_code) th.setData({ ad_img: item.ad_code }) + } + } } }) diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index 1c6125d..cb78f98 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -19,12 +19,12 @@ {{" "}} - 成长值 + 成长值 {{cz_val}} / {{need_money}} {{" "}} - 成长值 {{cz_val}} + 成长值 {{cz_val}} @@ -40,7 +40,7 @@ - + 会员卡 - 5000/10000 + 0/0 {{yuer?yuer:0}}