diff --git a/app.json b/app.json index 36803e1..2420036 100644 --- a/app.json +++ b/app.json @@ -12,15 +12,13 @@ "pages/user/index/index", "pages/user/order_list/order_list", "pages/user/order_detail/order_detail", - "pages/user/address_list/address_list", "pages/user/userinfo/userinfo", "pages/user/coupon/coupon", - "pages/user/checkcoupon/checkcoupon", - "pages/user/add_address/add_address", - "pages/user/express/express", + "pages/user/checkcoupon/checkcoupon", + "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", - "pages/team/team_success/team_success", + "pages/team/team_show/team_show", "pages/user/userqy/userqy", @@ -47,8 +45,7 @@ "pages/user/assistance/task_assistance", "pages/user/assistance/friend_assistance", "pages/user/assistance/assistance_success", - "pages/user/assistance/assistance", - "pages/store/index", + "pages/user/assistance/assistance", "pages/giftpack/festival/festival", @@ -232,11 +229,21 @@ "pages/team/team_more/team_more", "pages/user/return_goods_info/return_goods_info", "pages/user/return_goods_list/return_goods_list", - "pages/user/return_goods/return_goods" + "pages/user/return_goods/return_goods", + "pages/user/address_list/address_list", + "pages/user/add_address/add_address" ] + }, + { + "root": "packageG/", + "name": "pack7", + "pages": [ + "pages/store/index", + "pages/user/express/express", + "pages/team/team_success/team_success" + ] } - ], diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js index d915145..ff11628 100644 --- a/components/diy_public/diy_public.js +++ b/components/diy_public/diy_public.js @@ -351,6 +351,13 @@ Component({ all_array[i].buy_num = all_array[i].goods_num*1 - all_array[i].actLen*1 // all_array[i].goods_name = all_array[i].title } + if (th.data.prom_type==2) { //团购 + // price = (all_array[i].group_price / 100) + '' + // all_array[i].buy_num = all_array[i].group_joined + all_array[i].buy_num =all_array[i].buy_num + all_array[i].virtual_num*1 + // all_array[i].goods_name = all_array[i].title + } + if (price && price.indexOf('.') > -1) { @@ -366,6 +373,9 @@ Component({ if (th.data.prom_type==9) { //幸运购 all_array[i].residue= all_array[i].actLen } + if (th.data.prom_type==2) { //团购 + all_array[i].residue += all_array[i].virtual_num*1 + } // console.error(all_array[i].residue); if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) { diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 4cb8a4c..8bdb315 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -816,7 +816,7 @@ Page({ enterAddress: function() { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 5778cf0..fa605f0 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -662,7 +662,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, @@ -3419,9 +3419,9 @@ Page({ /*--- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { th.get_sto(); diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index f86aa08..e0a22a3 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -655,7 +655,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流，不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code && !th.data.is_default_logistics ) { + if (def_exp_code && !th.data.is_default_logistics && th.data.wu_arr ) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -2608,18 +2608,21 @@ Page({ if (th.data.is_all_zt == 1) addr = null; var val_arr = t.detail.value; - if (th.data.is_all_zt != 1) - if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - th.data.is_summit_ing = 0; - getApp().confirmBox("读取物流失败"); - return false; - } - var order_prom_list_cart = th.data.order_prom_list_cart; //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { var t_item = order_prom_list_cart[i]; + + if(t_item.exp_type==0) { + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { + th.data.is_summit_ing = 0; + getApp().confirmBox("读取物流失败"); + return false; + } + } + + var item = { 'user_id': to.globalData.user_id, 'consignee': addr == null ? th.data.userinfo.mobile : addr.consignee, @@ -3018,7 +3021,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, 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 f90b71c..fdf3caa 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -949,6 +949,17 @@ Page({ if (out_of_weight >= 0) out_of_weight = -cut_good_weight; else out_of_weight = -back_data.weight_free * 1000; + + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } + var code = th.data.wu_arr[th.data.index].code; var shipping_price = 0; // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, @@ -977,6 +988,7 @@ Page({ wx.showToast({ title: "计算物流错误", icon: 'none', duration: 2000 }) + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } @@ -1003,7 +1015,7 @@ Page({ 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 } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -1523,7 +1535,7 @@ Page({ setTimeout(function () { // wx.reLaunch({ // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, // }) wx.redirectTo({ @@ -1599,7 +1611,7 @@ Page({ // }else{ // // wx.reLaunch({ - // // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // // url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, // // }) // } @@ -1667,7 +1679,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 13bacea..5f6dd91 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -4646,9 +4646,9 @@ Page({ // /*--- // wx.redirectTo({ - // url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + // url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, // });--*/ - // getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + // getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); // } else { // th.setData({ @@ -5013,7 +5013,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; /*-- wx.redirectTo({ url:url, @@ -5105,10 +5105,10 @@ Page({ wx.showLoading(); /*-- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { wx.navigateTo({ diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index bf35f8b..857ca09 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -187,7 +187,7 @@ + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流 diff --git a/packageD/pages/user/coupons/coupons.wxss b/packageD/pages/user/coupons/coupons.wxss index 8d98860..b812c11 100644 --- a/packageD/pages/user/coupons/coupons.wxss +++ b/packageD/pages/user/coupons/coupons.wxss @@ -323,7 +323,7 @@ color:#999999; } /* 点击条形 */ .bar-container { - padding: 40rpx 20rpx 20rpx 20rpx; + padding: 40rpx 0rpx 20rpx 20rpx; } .barcode { width: 100%; @@ -582,7 +582,7 @@ page { .popup-container { position: fixed; - width: 70%; + width: 90%; border-radius: 12rpx; top: 50%; left: 50%; diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 4f4f0bd..4ea8332 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1072,7 +1072,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流，不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code && !th.data.is_default_logistics) { + if (def_exp_code && !th.data.is_default_logistics && th.data.wu_arr) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -1150,7 +1150,7 @@ Page({ //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流，不管是不是自提都算一下----------------- var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (def_exp_code && !th.data.is_default_logistics) { + if (def_exp_code && !th.data.is_default_logistics && th.data.wu_arr) { for (var k = 0; k < th.data.wu_arr.length; k++) { var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { @@ -2759,6 +2759,17 @@ Page({ for (var i in c_arr) { var cart_item = c_arr[i]; cart_item.prom_pt_json=[]; + //要清空 + cart_item.g_zxlb_num=[]; //专享礼包 + cart_item.g_lb_num=[]; //旧礼包 + cart_item.g_monthlb_num=[]; //月包 + cart_item.g_coupon_num=[]; //送优惠券 + + cart_item.s_coupon_id=''; + cart_item.s_libao=''; + cart_item.zx_libao=''; + cart_item.monthlibao=''; + } //调用函数计算每件商品的单价 @@ -3169,6 +3180,17 @@ Page({ else out_of_weight = -back_data.weight_free * 1000; var code = ""; + + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } + if (th.data.wu_arr && th.data.wu_arr[cart_item.wind]) code = th.data.wu_arr[cart_item.wind].code; @@ -3205,6 +3227,7 @@ Page({ title: "计算物流错误", icon: 'none', duration: 2000 }) //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } @@ -3295,7 +3318,7 @@ Page({ if (!lon) { //-- 获取距离 -- 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 } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -3865,6 +3888,17 @@ Page({ else out_of_weight = -back_data.weight_free * 1000; var code = ""; + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } + + if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; th.data.is_no_by[th.data.bn_pick] = 0; th.data.is_by[th.data.bn_pick] = 0; @@ -3900,6 +3934,7 @@ Page({ title: "计算物流错误", icon: 'none', duration: 2000 }) //th.setData({ show_submit:0 }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } @@ -4097,7 +4132,7 @@ Page({ //-- 获取距离 -- 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 } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -4749,13 +4784,6 @@ Page({ if (th.data.is_all_zt == 1) addr = null; var val_arr = th.data.user_note; - if (th.data.is_all_zt != 1) - if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - th.data.is_summit_ing = 0; - getApp().confirmBox("读取物流失败"); - return false; - } - var order_prom_list_cart = th.data.order_prom_list_cart; //优惠商品限购的优化 @@ -4763,6 +4791,15 @@ Page({ //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { var t_item = order_prom_list_cart[i]; + + if (t_item.exp_type==0){ + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { + th.data.is_summit_ing = 0; + getApp().confirmBox("读取物流失败"); + return false; + } + } + var item = { "keyid": t_item.sto ? t_item.sto.keyid : '', 'user_id': to.globalData.user_id, @@ -4847,6 +4884,7 @@ Page({ if (t_item.s_intValue > 0) { order_prom_list.give_integral = t_item.s_intValue; } + if (t_item.s_coupon_id) { order_prom_list.give_coupon_id = t_item.s_coupon_id; order_prom_list.g_coupon_num = JSON.stringify(t_item.g_coupon_num); @@ -5285,8 +5323,6 @@ Page({ } // debugger var str = JSON.stringify(pdata); - console.log(str,'aaaaaaaaaaaaaaa'); - //return false; wx.showLoading({ title: "加载中" }); th.setData({ submit: 1, }) @@ -5562,7 +5598,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index 39296e5..a354d02 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -825,6 +825,17 @@ Page({ else out_of_weight = -back_data.weight_free * 1000; var code = ""; + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } + + if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ var shipping_price=0; @@ -855,6 +866,7 @@ Page({ wx.showToast({ title: "计算物流错误", icon: 'none',duration: 2000 }) + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } @@ -1032,7 +1044,7 @@ Page({ 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} + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} }).then(res=>{ if(res.data.code==0){ var data= JSON.parse(res.data.data); @@ -1514,7 +1526,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index a542b56..908f8d4 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -586,7 +586,7 @@ Page({ if(fy) return false; util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(th.data.ok_order_sn,"/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", @@ -598,7 +598,7 @@ Page({ //支付支付，返回首页 ut.m_toast('支付成功'); setTimeout(()=>{ - getApp().re_to("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); + getApp().re_to("/packageG/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn); },1000) }else{ @@ -843,7 +843,17 @@ Page({ else out_of_weight = -back_data.weight_free * 1000; - var code = th.data.wu_arr[th.data.index].code; + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } + + var code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ var shipping_price = 0; @@ -878,6 +888,7 @@ Page({ title: "计算物流错误", icon: 'none', duration: 2000 }) //th.setData({ show_submit:0 }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } @@ -897,7 +908,7 @@ Page({ 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 } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -1378,7 +1389,7 @@ Page({ setTimeout(function () { wx.reLaunch({ //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - url: "/pages/team/team_success/team_success?ordersn=" + data.data, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, }) }, 1000) }, function () { @@ -1424,7 +1435,7 @@ Page({ } else { wx.reLaunch({ - url: "/pages/team/team_success/team_success?ordersn=" + data.data, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + data.data, }) } @@ -1500,7 +1511,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index b81a94b..7a6926c 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -860,6 +860,15 @@ Page({ if (out_of_weight >= 0) out_of_weight = -cut_good_weight; else out_of_weight = -back_data.weight_free * 1000; + if(!th.data.wu_arr){ + wx.hideLoading(); + wx.showToast({ + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 + }) + //th.setData({ show_submit:0, }); + th.setData({show_submit:1, submit: 0,same_ok:0 }) + return false; + } var code = th.data.wu_arr[th.data.index].code; //--------------开始计算物流------------------ @@ -892,7 +901,7 @@ Page({ } }) if (!is_ok) { - th.setData({show_submit: 1}); + th.setData({show_submit:1, submit: 0,same_ok:0 }) wx.hideLoading(); return false; } @@ -1037,7 +1046,7 @@ Page({ 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} + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} }).then(res=>{ if(res.data.code==0){ var data= JSON.parse(res.data.data); @@ -1201,7 +1210,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = 1, wx.navigateTo({ - url: "/pages/user/address_list/address_list?is_back=1" + url: "/packageF/pages/user/address_list/address_list?is_back=1" }); }, diff --git a/packageF/pages/team/team_more/team_more.js b/packageF/pages/team/team_more/team_more.js index c24596f..ad8343c 100644 --- a/packageF/pages/team/team_more/team_more.js +++ b/packageF/pages/team/team_more/team_more.js @@ -197,7 +197,7 @@ Page({ }); }else if (odr.pt_status == 1 && odr.order_status == 1){ wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, }); } } diff --git a/packageF/pages/team/team_ping/team_ping.js b/packageF/pages/team/team_ping/team_ping.js index d1e2963..522b2d5 100644 --- a/packageF/pages/team/team_ping/team_ping.js +++ b/packageF/pages/team/team_ping/team_ping.js @@ -245,7 +245,7 @@ Page({ go_team_success:function(e) { var order_sn=e.currentTarget.dataset.ordsn; var goods_type=e.currentTarget.dataset.goods_type; - var url="/pages/team/team_success/team_success?ordersn=" + order_sn; + var url="/packageG/pages/team/team_success/team_success?ordersn=" + order_sn; if(goods_type==1){ url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn; } diff --git a/packageF/pages/user/add_address/add_address.js b/packageF/pages/user/add_address/add_address.js new file mode 100644 index 0000000..ba94069 --- /dev/null +++ b/packageF/pages/user/add_address/add_address.js @@ -0,0 +1,203 @@ +var s = function(s) { + return s && s.__esModule ? s : { + default: s + }; +}(require("../../../../utils/regions/Regions.js")), e = getApp(), a = e.globalData.setting,os=a,t = e.request; +var ut = require("../../../../utils/util.js"), oo = e.globalData; + +Page({ + data: { + url: a.url, + resourceUrl: a.resourceUrl, + iurl: a.imghost, + address: null, + isnew:0, + is_op_co:false,//switch开关 + disabled:0 + }, + onLoad: function(s) { + var a = this,th=a; + var is_e = ut.isEmptyObject(s); + this.setData({ + address: s, isnew:is_e, + }), e.getUserInfo(function(s) { + a.setData({ + user: s + }); + th.initRegions(); + }) + }, + + onReachBottom: function () { + if (this.data.total <= 6) return; + if (this.data.ismore) return; + this.requestAddressList(); + }, + + requestAddressList: function () { + var e = this; + t.get(e.data.url + "/api/weshop/useraddress/page", { + data: { store_id: os.stoid, user_id: oo.user_id, page: e.data.curpage, pageSize: 20 }, + success: function (t) { + e.data.curpage++; + var arr1 = e.data.addresses; + var arr2 = t.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + + var ismore = 0; + if (arr3.length == t.data.data.total) ismore = 1 + + e.setData({ + addresses: arr3, total: t.data.data.total, ismore: ismore + }), wx.stopPullDownRefresh(); + } + }); + }, + initRegions: function() { + var e = this; + new s.default(this, "regions", { + endAreaLevelCall: function(s, a, t) { + console.log("initRegions"); + console.log(t); + Object.assign(e.data.address, t), e.setData({ + "disabled": 0, + "address.province_name": e.data.address.province_name, + "address.city_name": e.data.address.city_name, + "address.district_name": e.data.address.district_name, + "address.twon_name": e.data.address.twon_name, + "address.more_address": + e.data.address.province_name + "-" + e.data.address.city_name + "-" + e.data.address.district_name + +"-"+e.data.address.twon_name, + }); + console.log(e.data.address); + } + }); + }, + //-----------添加或者编辑----------- + submitAddress: function (s) { + var a = this.data.address, b = a, th = this; + Object.assign(a, s.detail.value), a.is_default = Number(a.is_default); + a.store_id = os.stoid; + + //判断用户名是否为空 + var cs = th.check(a.consignee); + if (cs != 1) { + return getApp().my_warnning("收货姓名不能为空", 0, th); + } + + var ob = ut.check_mobile(a.mobile); + if (ob.code != 1) { + return getApp().my_warnning(ob.title, 0, th); + } + + if (a.more_address == null || a.more_address == undefined || a.more_address == "") { + getApp().my_warnning("请选择地区", 0, th); + return false; + } + //判断地址是否为空 + var add = th.check(a.address); + if (add != 1) { + return getApp().my_warnning("详细地址不能为空", 0, th); + } + + //判断是不是空对象 + //--------如果是修改地址---------- + if (!th.data.isnew) { + if (a.is_default == 1) { + t.put("/api/weshop/useraddress/update", { + data: { user_id: oo.user_id, is_default: 0 }, + success: function (s) { + t.put("/api/weshop/useraddress/updateById", { + data: a, + success: function (s) { + e.showSuccess(s.data.msg, function () { + wx.navigateBack(); + }); + } + }); + } + }); + + } else { + t.put("/api/weshop/useraddress/updateById", { + data: a, + success: function (s) { + e.showSuccess(s.data.msg, function () { + wx.navigateBack(); + }); + } + }); + } + + } else { + a['user_id'] = oo.user_id; + a['store_id'] = os.stoid; + + + if (a.is_default == 1) { + t.put("/api/weshop/useraddress/update", { + data: { user_id: oo.user_id, is_default: 0 }, + success: function (s) { + + //-----新增地址------- + t.post("/api/weshop/useraddress/save", { + data: a, + success: function (s) { + e.showSuccess(s.data.msg, function () { + wx.navigateBack(); + }); + } + }); + + } + }) + } else { + + //-----新增地址------- + t.post("/api/weshop/useraddress/save", { + data: a, + success: function (s) { + e.showSuccess(s.data.msg, function () { + wx.navigateBack(); + }); + } + }); + } + + + + } + }, + + //---------删除收货地址------------ + deleteAddress: function() { + var s = this.data.address.address_id; + s && wx.showModal({ + title: "确定删除？", + success: function(a) { + a.confirm && t.delete("/api/weshop/useraddress/del/" + oo.user_id+"/"+s, { + success: function(s) { + e.showSuccess("删除成功", function() { + wx.navigateBack(); + }, 500); + } + }); + } + }); + }, + //是否是默认地址 + bind_is_op_co:function(e){ + var i = e.detail; + this.setData({ + is_op_co:i + }) + console.log(i) + }, + check:function(as){ + var code = 1; + if(as===''){ + code = -1; + } + return code; +} +}); \ No newline at end of file diff --git a/packageF/pages/user/add_address/add_address.json b/packageF/pages/user/add_address/add_address.json new file mode 100644 index 0000000..5394760 --- /dev/null +++ b/packageF/pages/user/add_address/add_address.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "收货地址", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageF/pages/user/add_address/add_address.wxml b/packageF/pages/user/add_address/add_address.wxml new file mode 100644 index 0000000..633c2a2 --- /dev/null +++ b/packageF/pages/user/add_address/add_address.wxml @@ -0,0 +1,41 @@ + + + + + +
+ + + 收货人 + + + + 手机号码 + + + + 所在地区 + {{address.more_address==null?'省市区县，乡镇等':address.more_address}} + + + + + + 详细地址 + + + + 设为默认地址 + + + + + + +
+ + + + diff --git a/packageF/pages/user/add_address/add_address.wxss b/packageF/pages/user/add_address/add_address.wxss new file mode 100644 index 0000000..f40f148 --- /dev/null +++ b/packageF/pages/user/add_address/add_address.wxss @@ -0,0 +1,135 @@ +page { + background: rgb(255, 255, 255); +} + +.topbcolor { + width: 100%; + height: 7rpx; + background-color: rgb(245, 245, 245); +} + +.item { + display: flex; + align-items: center; + padding: 0 31rpx; + width: 100%; + box-sizing: border-box; + border-bottom: 1rpx #f5f5f5 solid; + height: 98rpx; + position: relative; + font-size: 26rpx; + padding-top: 16rpx; +} + +.item-name { + display: flex; + align-items: center; + height: 100%; + width: 104rpx; +} + +.item-img { + height: 100%; + align-items: center; +} + +.item_default { + display: flex; + justify-content: space-between; +} + +.item_default .item-name { + width: 200rpx; +} + +.item-input { + display: flex; + height: 100%; + margin-left: 40rpx; + /* word-break: keep-all; + white-space: nowrap; + overflow: hidden; */ + text-overflow: ellipsis; + color: rgb(0, 0, 0); + align-items: center; + width: 74%; +} + +.item-inputaddress { + color: rgb(199, 199, 199); + margin-left: 40rpx; +} + +.detailed { + height: 193rpx; + padding-bottom: 95rpx; + display: flex; + padding: 0 31rpx; + padding-top: 41rpx; + font-size: 26rpx; + border-bottom: 1rpx #f5f5f5 solid; +} + +.detailed .detailed_item-name { + width: 137rpx; +} + +.detailed_item-input { + margin-left: 40rpx; + height: auto; + width: 100%; + min-height: 40rpx; + padding-bottom: 28rpx; +} + +.item-switch { + zoom: 0.7; +} + +.item-switch::before { + width: 80rpx !important; + height: 35rpx !important; + zoom: 1; +} + +.arrow { + position: absolute; + right: 26rpx; + width: 26rpx; + height: 26rpx; + padding-top: 28rpx; +} + +.address-btns { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + bottom: 80rpx; + width: 100%; +} + +.delete-btn { + display: flex; + justify-content: center; + align-items: center; + width: 285rpx; + height: 60rpx; + border-radius: 40rpx; + font-size: 27rpx; + color: rgb(0, 0, 0); + border: 1rpx solid rgb(210, 210, 210); +} + +.submit-btn { + display: flex; + justify-content: center; + align-items: center; + width: 285rpx; + height: 59rpx; + background-color: #e30000; + font-size: 27rpx; + color: rgb(255, 255, 255); + border-radius: 40rpx; +} +@import "../../../../utils/regions/regions.wxss"; diff --git a/packageF/pages/user/address_list/address_list.js b/packageF/pages/user/address_list/address_list.js new file mode 100644 index 0000000..b71ad20 --- /dev/null +++ b/packageF/pages/user/address_list/address_list.js @@ -0,0 +1,198 @@ +var e = getApp(), t = require("../../../../utils/request.js"), os = e.globalData.setting, oo = e.globalData, t = e.request; + +Page({ + data: { + url: e.globalData.setting.url, + resourceUrl: e.globalData.setting.resourceUrl, + iurl: e.globalData.setting.imghost, + addresses: [], + operate: null, + curpage: 1, + total: 0, + ismore: 0, + is_back:0, //有没有跳转 + isloading:0, + is_address_read:0 + }, + onLoad: function (e) { + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + is_zy: 1 + }) + //清空is_pick_up + getApp().request.put("/api/weshop/useraddress/updatePickUp", { + data: {user_id: getApp().globalData.user_id, is_pickup: 0}, + success: function (s) { + } + }); + + this.data.operate = e.operate; + }, + onShow: function () { + var is_back=getApp().globalData.is_cart_old; + if (is_back) this.setData({ is_back: is_back}) + + this.data.curpage = 1; + this.data.addresses = []; + this.requestAddressList(); + console.log(this.data.addresses) + }, + + onReachBottom: function () { + if (this.data.total <= 6) return; + if (this.data.ismore) return; + this.requestAddressList(); + }, + + requestAddressList: function () { + var tt = Math.random() * 100 + var e = this; + t.get(e.data.url + "/api/weshop/useraddress/page", { + data: { store_id: os.stoid, user_id: oo.user_id, page: e.data.curpage, pageSize: 20, t: tt }, + success: function (t) { + e.data.curpage++; + var arr1 = e.data.addresses; + var arr2 = t.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + var ismore = 0; + if (arr3.length == t.data.data.total) ismore = 1 + e.setData({ + addresses: arr3, total: t.data.data.total, ismore: ismore, + is_address_read:1 + }), wx.stopPullDownRefresh(); + } + }); + }, + + /*----------编辑地址----------*/ + editAddress: function (e) { + var t = this.getAddressData(e.currentTarget.dataset.id), s = ""; + for (var a in t) s += (0 != s.length ? "&" : "?") + a + "=" + t[a]; + s && wx.navigateTo({ + url: "/packageF/pages/user/add_address/add_address" + s + }); + }, + + /*-----选择地址返回确认------*/ + selectAddress: function (e) { + if (null != this.data.operate) { + oo.baddr = e.currentTarget.dataset.item; + wx.navigateBack(); + } + }, + + getAddressData: function (e) { + var t = this.data.addresses; + for (var s in t) if (t[s].address_id == e) break; + return s ? t[s] : {}; + }, + + go_url: function (e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); + + }, + //判断是否选择 + add_is_pickup:function(e){ + + if(this.data.is_back==0) return false; + + var th = this; + var index = e.currentTarget.dataset.ind; + var a = this.data.addresses[index]; + + if (th.data.isloading) return; + th.data.isloading=1; + + t.put("/api/weshop/useraddress/updatePickUp", { + data: { user_id: oo.user_id, is_pickup: 0 }, + isShowLoading:0, + success: function (s) { + + a.is_pickup = 1; + t.put("/api/weshop/useraddress/updateById", { + data: a, + isShowLoading: 0, + success: function (s) { + + th.data.isloading=0 + if (th.data.is_back) { + wx.navigateBack({}); + } + + },fail: function (t) { + th.data.isloading = 0; + } + }); + }, + fail: function (t) { + th.data.isloading = 0; + } + }); + + + + } , + + //获取微信地址 + get_wx:function(){ + var th=this; + wx.getSetting({ + success(res) { + getApp().globalData.no_clear=1; + console.log("vres.authSetting['scope.address']：", res.authSetting['scope.address']); + if (res.authSetting['scope.address']) { + getApp().globalData.no_clear=1; + wx.chooseAddress({ + success(res) { + th.save_wx_addr(res); + } + }) + + } else { + if (res.authSetting['scope.address'] == false) { + getApp().globalData.no_clear=1; + wx.openSetting({ + success(res) {} + }) + } else { + + getApp().globalData.no_clear=1; + wx.chooseAddress({ + success(res) { + th.save_wx_addr(res); + } + }) + } + } + } + }) + }, + + save_wx_addr:function (res) { + var pd={},th=this; + pd.store_id=os.stoid; + pd.user_id=getApp().globalData.user_id; + pd.userName=res.userName; + pd.provinceName=res.provinceName; + pd.countryName=res.countyName; + pd.cityName=res.cityName; + pd.detailInfo=res.detailInfo; + pd.postalCode=res.postalCode; + pd.telNumber=res.telNumber; + getApp().request.promisePost("/api/weshop/useraddress/saveWx",{data:pd}).then(res=>{ + if(res.data.code==0){ + getApp().my_warnning("保存成功",1,th); + setTimeout(function () { + th.onShow(); + },1000) + } + }) + + }, + + + +}); \ No newline at end of file diff --git a/packageF/pages/user/address_list/address_list.json b/packageF/pages/user/address_list/address_list.json new file mode 100644 index 0000000..467c798 --- /dev/null +++ b/packageF/pages/user/address_list/address_list.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "收货地址", + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageF/pages/user/address_list/address_list.wxml b/packageF/pages/user/address_list/address_list.wxml new file mode 100644 index 0000000..794f1cf --- /dev/null +++ b/packageF/pages/user/address_list/address_list.wxml @@ -0,0 +1,78 @@ + + + + + + + + + 暂无收货地址 + + + + + + + + 获取微信地址 + + + + + + 新建收货地址 + + + + + + + + + + + + + + + + + + + + + {{item.consignee}} + + {{item.mobile}} + 默认地址 + + + + {{item.more_address}} {{item.address}} + + + + + + + + + + + + + + + + + 获取微信地址 + + + + + + 新建收货地址 + + + + \ No newline at end of file diff --git a/packageF/pages/user/address_list/address_list.wxss b/packageF/pages/user/address_list/address_list.wxss new file mode 100644 index 0000000..d20eeaa --- /dev/null +++ b/packageF/pages/user/address_list/address_list.wxss @@ -0,0 +1,247 @@ +/* 没有收货地址时的样式 */ + +.nothing { + width: 100%; + font-size: 31rpx; +} + +.nothing image { + width: 299rpx; + height: 283rpx; + margin-top: 161rpx; +} + +.nothing .nothingaddress { + color: rgb(251, 65, 66); + margin-top: 35rpx; +} + +.nothing .address { + margin-top: 61rpx; +} + +.nothing .address navigator { + color: rgb(255, 255, 255); + background-color: rgb(251, 65, 66); + width: 256rpx; + height: 55rpx; + border-radius: 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + +/* page { + margin-bottom: 200rpx; +} + +.address-box { + background-color: white; + padding: 25rpx 0 25rpx 25rpx; + font-size: 28rpx; + border-bottom: 3rpx #f8f8f8 solid; +} + +.address-user { + box-sizing: border-box; + float: left; + width: 150rpx; +} + +.N-name { + font-size: 30rpx; + padding-bottom: 20rpx; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.default { + color: white; + background-color: red; + padding: 4rpx; + width: fit-content; + border-radius: 6rpx; +} + +.address-info { + box-sizing: border-box; + float: left; + width: 480rpx; + padding-left: 10rpx; +} + +.mobile { + padding-bottom: 25rpx; +} + +.address { + height: 70rpx; + overflow: hidden; +} + +.address-edit { + box-sizing: border-box; + width: 95rpx; + float: left; + text-align: center; + padding-top: 32rpx; +} + +.address-edit>image { + width: 36rpx; + height: 42rpx; +} + +.address-create { + width: 50%; + text-align: center; + position: fixed; + bottom: 80rpx; + left: 25%; +} + +.create-btn { + font-size: 28rpx; + color: white; + background-color: #f23030; + border-radius: 10rpx; + text-align: center; + line-height: 80rpx; + display: block; +} */ + +page { + margin-bottom: 200rpx; +} + +.topbcolor { + width: 100%; + height: 7rpx; + background-color: rgb(245, 245, 245); +} + +.container { + margin-top: 7rpx; +} + +.container .address-box { + width: 100%; +} + +.container .address-box .address-user { + display: flex; + justify-content: center; + width: 100%; + border-bottom: 2rpx solid rgb(245, 245, 245); + height: 180rpx; + align-items: center; +} + +.container .address-box .address-user .icon { + padding-right: 20rpx; + display: flex; + align-items: center; + height: 100%; +} + +.container .address-box .address-user .no_xuanze { + width: 31rpx; + height: 31rpx; + border-radius: 50%; + border: 1rpx solid; +} + +.container .address-box .address-user .address { + width: 530rpx; +} + +.container .address-box .address-user .address .user { + display: flex; + align-items: center; + width: 500rpx; + font-weight: bold; + font-size: 31rpx; + color: rgb(40, 36, 33); +} + +.container .address-box .address-user .address .user .userName { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + max-width: 149rpx; +} + +.container .address-box .address-user .address .user .userPhone { + margin-left: 41rpx; +} + +.container .address-box .address-user .address .user .default { + display: flex; + width: 105rpx; + height: 31rpx; + background-color: rgb(239, 22, 51); + justify-content: center; + font-size: 20rpx; + color: rgb(255, 255, 253); + border-radius: 8rpx; + margin-left: 21rpx; + line-height: 31rpx; +} + +.container .address-box .address-user .address .ShippingAddress { + font-size: 24rpx; + color: rgb(41, 38, 33); + height: 66rpx; +} + +.container .address-box .address-user .edit { + display: flex; + justify-content: center; + margin-left: 60rpx; + height: 100%; + align-items: center; +} + +.container .address-box .address-user .edit image { + width: 41rpx; + height: 38rpx; + align-items: center; +} + +.container .new { + width: 86%; + display: flex; + position: fixed; + bottom: 0rpx; + height: 204rpx; + align-items: center; + background-color: rgb(255, 255, 255); + margin-left:7% +} + +.container .new .add { + margin-right: 10rpx; +} + +.container navigator { + display: flex; + width: 300rpx; + height: 62rpx; + background-color: rgb(239, 22, 51); + border-radius: 40rpx; + justify-content: center; + align-items: center; + color: rgb(255, 255, 255); + font-size: 27rpx; +} + +.container navigator.ye{ + background-color: #fc872d; +} +.nothing .address navigator.ye{ + background-color: #fc872d; +} diff --git a/packageG/pages/store/index.js b/packageG/pages/store/index.js new file mode 100644 index 0000000..de6d033 --- /dev/null +++ b/packageG/pages/store/index.js @@ -0,0 +1,183 @@ +var o=getApp().globalData.setting; +Page({ + data:{ + is_get_local_ok:0, + is_gps:0, + lat:null, + lon:null, + page:1, + cat_list:null, + pick_list:null, + url:o.imghost, + is_no_more:0, + key_word:'', //关键字搜索 + cat_id:0, //分类ID + islading:0, + }, + + //调用视频接口 + onLoad:function(e){ + var th=this; + wx.getLocation({ + type: 'gcj02', + success: function(res) { + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.data.is_get_local_ok = 1; + }, + fail: function(res) { + th.data.is_get_local_ok = 1; + if (res.errCode == 2) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + } + + } + }) + //--获取门店分类--- + getApp().request.get("/api/weshop/storagecategory/page", { + data: { + store_id: o.stoid, + is_show: 1, + pageSize: 300 + }, + success:function(res){ + if(res.data.code==0){ + th.setData({cat_list:res.data.data.pageData}) + } + }, + }) + this.get_sto(); + }, + + //---------拿出门店分类和门店------------ + get_sto() { + var th = this; + var timer_get = setInterval(function() { + if (th.data.is_get_local_ok == 0) return false; + clearInterval(timer_get); + th.get_list(); + }, 500) + + }, + + get_list:function(){ + if(this.data.is_no_more==1) return false; + if(this.data.islading==1) return false; + this.data.islading=1; + var th=this,req = getApp().request; + var dd = { + store_id: o.stoid, + isstop: 0, + pageSize: 10, + page:th.data.page + } + if(th.data.key_word!="" && th.data.key_word!=undefined) { + dd.keyword=th.data.key_word; + } + if(th.data.cat_id){ + dd.category_id=th.data.cat_id; + } + if(th.data.lat){ + dd.lat=th.data.lat; + dd.lon=th.data.lon; + } + + + wx.showLoading(); + //----------获取门店--------- + req.promiseGet("/api/weshop/pickup/list", { + data: dd, + }).then(res => { + this.data.islading=0; + wx.hideLoading(); + if(res.data.code==0){ + if(res.data.data.pageData.length<=0){ + th.data.is_no_more=1; return false; + } + + th.data.page=dd.page+1 + var pick_list=th.data.pick_list; + if(!pick_list) pick_list=[]; + pick_list=pick_list.concat(res.data.data.pageData); + th.setData({ + pick_list:pick_list + }) + } + }) + }, + + //---加载更多是靠这个函数---- + onReachBottom: function() { + this.get_list(); + }, + + lose_focus:function(e){ + var key_word = e.detail.value; + this.data.key_word=key_word; + }, + + + phone:function(e){ + var index=e.currentTarget.dataset.index; + var item=this.data.pick_list[index]; + wx.makePhoneCall({ + phoneNumber: item.pickup_phone, + }) + }, + + //分类的下拉 + bindPickerChange: function (e) { + var index = e.detail.value;//这里会获取他的索引值 + var self = this; + var list = self.data.cat_list; + var item = list[index]; + this.data.cat_id=item['cat_id']; + self.setData({ + periodsname: item['cat_name'], + cid: item['cat_id'] + }) + this.data.page=1; + this.data.is_no_more=0; + this.setData({ pick_list:null}) + this.get_list(); + + }, + + //搜索关键字 + sear:function(){ + this.data.page=1; + this.data.is_no_more=0; + this.setData({ pick_list:null}) + this.get_list(); + }, + + + map: function (e) { + var index = e.currentTarget.dataset.index;//这里会获取他的索引值 + var self = this; + var list = self.data.pick_list; + var item = list[index]; + + wx.openLocation({ + //当前经纬度 + latitude: parseFloat(item.lat), + longitude: parseFloat(item.lon), + //缩放级别默认28 + scale: 28, + //位置名 + name:item.pickup_name, + //详细地址 + address: item.pickup_address, + //成功打印信息 + success: function(res) {}, + //失败打印信息 + fail: function(err) {}, + //完成打印信息 + complete: function(info){}, + }) + }, + + + + +}) \ No newline at end of file diff --git a/packageG/pages/store/index.json b/packageG/pages/store/index.json new file mode 100644 index 0000000..8c3566f --- /dev/null +++ b/packageG/pages/store/index.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "门店列表", + "enablePullDownRefresh": false, + "usingComponents": { + "nav_box": "/components/nav_box/nav_box" + } +} \ No newline at end of file diff --git a/packageG/pages/store/index.wxml b/packageG/pages/store/index.wxml new file mode 100644 index 0000000..2a5c362 --- /dev/null +++ b/packageG/pages/store/index.wxml @@ -0,0 +1,36 @@ + + + + + + + + + + {{periodsname?periodsname:"选择分类"}} + + + + + + + {{item.pickup_name}} + + + + {{item.pickup_phone}} + + 一键拔号 + + + + + {{item.fulladdress}} + + 地图导航 + + + + + + \ No newline at end of file diff --git a/packageG/pages/store/index.wxss b/packageG/pages/store/index.wxss new file mode 100644 index 0000000..62d4aa0 --- /dev/null +++ b/packageG/pages/store/index.wxss @@ -0,0 +1,321 @@ +.box{ + padding: 10px; + border-bottom: 10px solid #f5f5f5; + color: #000000; +} +.box .pickname { + font-size: 32rpx; + line-height: 80rpx; + border-bottom: 1rpx solid #EEEEEE; +} + +.box .mt { + margin-top: 20rpx; +} +.addr{ width: 75%;color: #848484;} +.buttonclass { + width: 160rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + border: solid 1px #c3172d; + border-radius: 20rpx; + font-size: 28rpx; + color: #c3172d; +} +.fmob +{width: 28rpx; +height: 32rpx; +margin-right: 10rpx; +top: 4rpx; +position: relative; +} + +.faddr{ +width: 26rpx; +height: 32rpx; +margin-right: 6rpx; +top: 4rpx; +position: relative; +} + +.bcolor{background-color: #f5f5f5; height: 126rpx;} + +.sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;} +.sear_inp input{width: 400rpx;} +.select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center } +.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;} + +.border-bottom { + border-bottom: 2rpx solid #e0e0e0; +} + +.fs22 { + font-size: 22rpx; +} + +.flexShrink-0 { + flex-shrink: 0; +} + +.pt16 { + padding-top: 16rpx; +} + +.maxWidth-340 { + max-width: 340rpx; +} + +.maxWidth-400 { + max-width: 400rpx; +} + + +/* 图标字体 */ +/* @font-face { + font-family: 'iconfont'; + src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot'); + src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff2') format('woff2'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff') format('woff'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.ttf') format('truetype'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.svg#iconfont') format('svg'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 28rpx; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-weizhi:before { + content: "\e615"; + color: #FFBA10; +} + +.icon-arrow_down:before { + content: "\e600"; +} + +.icon-arrow_right:before { + content: "\e61f"; +} */ +/* 图标字体 */ + + + +.icon-weizhi { + color: #FFBA10; +} + +page { + height: 100%; + font-size: 28rpx; +} + +.container { + height: 100%; +} +#map { + /* width: 100%; + height: ; */ + display: block; + width: 100%; + height: 100%; +} +.tab-container.active { + height: calc(100% - 86rpx); +} +.map-container.active ~ .tab-container .list-container { + height: 204rpx; + overflow: hidden; +} +.map-container.active ~ .tab-container .list { + overflow: hidden; +} +.tab-container.active .list-container { + height: calc(100% - 108rpx - 84rpx); + background-color: #F7F7F7; +} + + +.search-container { + display: flex; + align-items: center; + padding: 0 32rpx; + border-bottom: 2rpx solid #F0F0F0; +} + +.city:after { + display: inline-block; + content: '◣'; + font-size: 14rpx; + padding-left: 8rpx; + padding-right: 20rpx; + transform: rotateZ(-45deg); + position: relative; + top: -16rpx; +} + +.input-container { + padding: 12rpx 0; + flex: 1; +} + +.input { + padding: 0 20rpx; + height: 60rpx; + line-height: 60rpx; + border-radius: 30rpx; + background-color: #F3F3F3; +} + +.placeholder { + color: #676767; + font-size: 24rpx; +} + + + + + +/* 切换卡 */ +.tab-title-container { + display: flex; + text-align: center; + border-bottom: 20rpx solid #F7F7F7; +} +.tab-title { + width: 50%; + line-height: 88rpx; + position: relative; +} +.tab-title.active { + font-weight: bold; +} +.tab-title.active::after { + position: absolute; + content: ''; + width: 110rpx; + height: 4rpx; + left: 50%; + bottom: 0; + transform: translateX(-50%); + background-color: #FFBA10; +} + +.map-container { + transition: 0.1s all linear; + background-color: pink; +} + +.map-container.active { + height: calc(100% - 86rpx - 80rpx - 200rpx); + transition: 0.1s all linear; +} + + + + +/* 查看地图 */ +.view-map { + line-height: 80rpx; + text-align: center; + font-size: 24rpx; + color: #000; + border-bottom: 2rpx solid #F0F0F0; +} + + +/* 列表 */ +.list { + height: 100%; +} +.list-item { + padding: 40rpx 28rpx; + border-bottom: 2rpx solid #F0F0F0; + justify-content: space-between; + background-color: #fff; +} +.list-item:last-child { + border-bottom: none; +} +radio .wx-radio-input { + width: 32rpx; + height: 32rpx; +} +radio .wx-radio-input.wx-radio-input-checked { + border-color: #333; + /* border-color: #FFBA10; */ + background-color: white; +} +radio .wx-radio-input.wx-radio-input-checked::before { + display: inline-block; + content: ''; + width: 24rpx; + height: 24rpx; + border-radius: 50%; + background-color: #333; + /* background-color: #FFBA10; */ +} +.name-container { + padding-left: 14rpx; + padding-right: 30rpx; + box-sizing: border-box; +} +.name { + display: flex; + align-items: center; + font-size: 30rpx; + position: relative; +} +.address { + color: #6E6E6E; + font-size: 26rpx; + line-height: 34rpx; + padding-top: 16rpx; + /* padding-right: 40rpx; */ + text-align: justify; +} +.tag { + color: #FF5B5A; + border-radius: 6rpx; + border: 2rpx solid #FF5B5A; + font-size: 22rpx; + padding: 0 4rpx; + flex-shrink: 0; + margin-left: 4rpx; +} + +.distance { + color: #6E6E6E; + font-size: 22rpx; + line-height: 34rpx; + padding-top: 16rpx; + /* word-break: break-all; */ +} + +.icon-arrow_right { + padding-left: 20rpx; +} + +.right { + min-width: 200rpx; + text-align: right; +} + +.icon-arrow_down.active { + display: inline-block; + transform: rotateZ(180deg); +} + + + + + + + + + diff --git a/packageG/pages/team/team_success/team_success.js b/packageG/pages/team/team_success/team_success.js new file mode 100644 index 0000000..ae21080 --- /dev/null +++ b/packageG/pages/team/team_success/team_success.js @@ -0,0 +1,1050 @@ +var t = require("../../../../utils/util.js"), + ut = t, + e = require("../../../../utils/common.js"), + a = require("../../../../utils/wxParse/wxParse.js"), + s = getApp(), + i = s.request, + rq = i, + oo = s.globalData, + o = s.globalData.setting, + os = o; + var regeneratorRuntime = require('../../../../utils/runtime.js'); + +Page({ + data: { + //activity_type:1,//活动类型 商家1 阶梯2 会员3 + p_status:1,//会员团的详细情况 1是正在行 2是成功 3失败 + sf_length: 1,//人数大于5 + + erweima:false, + meng:false, + zk:true, + stoid: o.stoid, + hiddenName: true, + teamlist:null, + teamgroup:null, + goods:null,//商品数据 + pindGoods: null,//拼单数据 + imageurl: o.imghost, + pay_f:0,//支付是否成功 + order_sn:"",//订单编号 + canvasHidden:false, //画画版 + screenWidth:0, + + pd_xx: 0, //弹框 + max_num:0,//最低成团人数 + min_price:0,//最低价格 + is_show:0,//加载完才显示 + + share_img_localpath:"", //分享图片的本地图片 + share_ewm_localpath: "", //分享的二维码本地图片 + share_head:"", //分享头像的本地图片 + + iurl:os.imghost, + ct_price:0,//阶梯团成团价格 + sf_arr:null, + + }, + onLoad: function (t) { + wx.setNavigationBarTitle({ title: "拼团订单",}) + var that=this; + var th=this; + //获取用户设备信息，屏幕宽度 + wx.getSystemInfo({ + success: res => { + that.setData({ screenWidth: res.screenWidth }) + } + }) + var pay_f = t.payf, order_sn = t.ordersn; + this.setData({ pay_f: pay_f, order_sn: order_sn}); + this.init(order_sn); + + //-- 自定义海报 -- + getApp().request.promiseGet("/api/weshop/goods/poster/page",{ + data:{store_id:os.stoid, type:1, is_use:1 } + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ + + var poster_data=res.data.data.pageData[0]; + var json_str=poster_data.jsonStr; + if(json_str){ + var json_data=JSON.parse(json_str); + if(json_data.bg_img){ + + //-- 把图片那到本地 -- + wx.getImageInfo({ + src:json_data.bg_img, + success: function(res) { + var path= res.path; + th.setData({share_b_img:path}) + }, + fail: function(res) {} + }); + } + th.setData({poster:json_data}) + } + } + }) + + getApp().getConfig(function (e) { + th.setData({sto_sele_name_1: e.store_name}) + }) + }, + onShow:function () { + getApp().check_can_share(this); + }, + + //关闭展开列表 + click:function(e){ + this.setData({ + hiddenName: !this.data.hiddenName, + zk: !this.data.zk, + }) + }, + //打开收起拼团列表 + czk:function(e){ + this.setData({ + zk:!this.data.zk, + hiddenName: !this.data.hiddenName, + }) + }, + //打开蒙板提示 + cmeng:function(e){ + this.setData({ + meng:!this.data.meng, + }) + }, + + //关闭蒙板提示 + cmc:function(e){ + this.setData({ + meng: !this.data.meng, + }) + }, +//打开二维码提示 + cerweima:function(e){ + this.setData({ + meng: !this.data.meng, + erweima: !this.data.erweima, + }) + }, + + cerc:function(e){ + this.setData({ + erweima: !this.data.erweima, + meng: !this.data.meng, + }) + }, + + async init( order_sn) { + + wx.showLoading(); + + var goods_id = 0,//商品ID, + pageteam=null,// + original_img=null ,//商品图片 + order=null,//订单编号 + id = 0,//团购id + pt_listno = "",//团编号 + pt_prom_id = 0, //活动id + ee = this, + team_id = 0,//活动id + ordertx=[],//头像图片 + share_img=null,//分享图片 + teamlist=null,//活动表 + goods=null,//商品 + teamgroup=null,//活動从表 + max_num=0,//最低价格时的成团人数 + p_status=1; + + //--如果商家团的时候--- + await getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", { + data: {orderSn:order_sn,storeId:os.stoid } + }) + + //获取order信息根据订单编号order_sn + await getApp().request.promiseGet("/api/weshop/order/page", { + data: { store_id: o.stoid, order_sn: order_sn,} + }).then(res => { + order = res.data.data.pageData[0]; + pt_prom_id = order.pt_prom_id; + pt_listno = order.pt_listno; + }) + + + + if (this.data.payf || order.pt_status == 3) p_status = 3; //失败 + if (order.pt_status == 2 || order.pt_status == 4 || order.pt_status == 5) + p_status = 2; //成功 + if (order.pt_status < 2 && !this.data.payf) + p_status = 1; //正在进行 + if ( order.pt_status == 6) p_status = 4; //支付尾款失败 + + var team_g=null; + if(pt_listno) { + //多少人参团头像 + await getApp().request.promiseGet("/api/weshop/order/pagePtList", { + data: {store_id: o.stoid, pt_listno: pt_listno,} + }).then(res => { + ordertx = res.data.data.pageData; + }) + + //获取teamgroup中的值 + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: { store_id: os.stoid, listno: pt_listno,pageSize:1,page:1} + }).then(res => { + team_g = res.data.data.pageData[0] + }) + } + + + var min_price=0; + //获取活动表的信息根据活动pt_prom_id + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, { + data: { } + }).then(res => { + if(res.data.code==0){ + teamlist=res.data.data; + this.setData({ + teamlist:teamlist + }); + var nt =ut.gettimestamp(); + teamlist.status=0; + + if (nt >= teamlist.start_time) teamlist.status = 1; + goods_id = res.data.data.goods_id; + id = res.data.data.id; + share_img = ee.data.imageurl + res.data.data.share_imgurl; + + //----------查看阶梯团------------ + if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined){ + var ct_rylist = JSON.parse(teamlist.ct_rylist); + var max=0; var pri=0; + ct_rylist.forEach(function (val,ind) { + if(parseInt(val.rynum)>parseInt(max)){ + max=val.rynum; + pri = val.price; + } + }) + max_num=max; + min_price=pri; + } + + } + //获取商品信息 + getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { + }).then(res => { + //商品地址 + original_img = ee.data.imageurl+ res.data.data.original_img, + goods = res.data.data + ee.setData({goods: goods,image: original_img,}) + }) + + }) + + if(ordertx && ordertx.length){ + //只装5个 + var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num; + if(max_num && !team_g.is_xuni_ct){ + ct_nun=parseInt(max_num); + if (ct_nun < ordertx.length) ct_nun = ordertx.length; + } + + if(ct_nun>5) ct_nun=5; + for(var i=0;i= ordertx.length) sf_num++ + else + ordertx2.push(ordertx[i]); + } + } + + + + + var head=[]; + if(team_g.is_xuni_ct) { + head=team_g.xuni_head_id.split(","); + order.is_xuni_ct=1; + + this.setData({head:head,}); + } + + + var sf_arr=[]; + for (var i=0;i { + teamgroup = res.data.data.pageData[0]; + if (teamgroup){ + var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); + teamgroup.buy_start_date=buy_start_date; + } + }) + + + var ct_price = 0; + var num_0 = ordertx?ordertx.length:0; + if (teamlist.kttype == 3){ + var js_data = JSON.parse(teamlist.ct_rylist); + js_data.forEach(function (val,ind) { + if (num_0<=val.rynum && ct_price==0){ + ct_price=val.price; + } + }) + if(ct_price==0) ct_price=min_price; + } + + //获取大家都在团信息 + getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { + data:{page:1,pageSize:2} + }).then(res => { + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + pageteam = res.data.data.pageData; + ee.setData({pageteam: pageteam,}) + } + + }) + + if(!teamlist.virtual) teamlist.virtual=0; + + //--当是成团的时候的操作-- + if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ + //设置值 + + ee.setData({ + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price, + order: order, share_img: share_img,max_num:max_num, + pindGoods: teamlist,is_show:1, zk:false, + hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr}); + + //--是否支付了尾款-- + if(order.pt_status==4 || order.pt_status==5){ + ee.setData({is_pay_wk:1}); + } + }else{ + //设置值 + ee.setData({ + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, + order: order, p_status: p_status, min_price:min_price, + share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1, + ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); + } + + wx.hideLoading(); + + wx.setNavigationBarTitle({ + title: "拼团详情", + }) + + ee.countDown2(); + + //获取分享图片的本地地址 + var path2 = os.imghost + teamlist.share_imgurl; + wx.getImageInfo({ + src: path2, + success: function (res) { + //res.path是网络图片的本地地址 + ee.data.share_img_localpath = res.path; + }, + fail: function (res) { + //失败回调 + } + }); + + + }, + //---小于10的格式化函数---- + timeFormat(param) { + return param < 10 ? '0' + param : param; + }, + countDown2() { + var th = this; + // 获取当前时间，同时得到活动结束时间数组 + var newTime = ut.gettimestamp(); + var o = this.data.teamgroup; + if(!o) return false; + + var endTime = o.kt_end_time; + if (o.status == 0) endTime = o.start_time; + + //看一下，是否要支付尾款 + if(o.team_type==3 && th.data.order.pt_status==2){ + endTime = o.wk_end_time; + } + + let obj = null; + // 如果活动未结束，对时间进行处理 + if (endTime - newTime > 0) { + let time = (endTime - newTime); + // 获取天、时、分、秒 + let day = parseInt(time / (60 * 60 * 24)); + let hou = parseInt(time % (60 * 60 * 24) / 3600); + let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); + let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); + obj = { + day: this.timeFormat(day), + hou: this.timeFormat(hou), + min: this.timeFormat(min), + sec: this.timeFormat(sec) + } + } else { + //活动已结束，全部设置为'00' + obj = { + day: '00', + hou: '00', + min: '00', + sec: '00' + } + } + var txt = "pindGoods.djs"; + th.setData({ + obj: obj + }); + setTimeout(th.countDown2, 1000); + }, + + //--定义的保存图片方法，分享团--- + saveImageToPhotosAlbum: function () { + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 + var type=1; + if(this.data.teamlist.kttype==3) type=2; + + wx.showLoading({ title: '生成中...', }) + var that = this, th = that; + //设置画板显示，才能开始绘图 + that.setData({ + canvasHidden: true, + }) + + if(this.data.share_hidden) { + this.setData({ + share_hidden: false, + }); + }; + + var app = getApp(); + var unit = that.data.screenWidth / 750 * 1.35; + var scene=th.data.teamgroup.id; + var goods_id=th.data.teamlist.goods_id; + var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; + if(user_id>0){ + scene+="_"+user_id; + } + if(goods_id !==""){ + scene+="_"+goods_id; + } + + //二微码 + var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+ + os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show"; + + console.log(path3,6000); + + //读取文件成功则OK-- + wx.getImageInfo({ + src: path3, + success:function (res) { + console.log(res,5000); + //回调写法 + th.get_head_temp(th.get_goods_temp,function () { + var vpath = res.path; + var context = wx.createCanvasContext('share'); + + + //先画背景 + var pg_path = "../../../images/share/share_bg.png"; + //-- 如果有自定义海报的时候，判断背景的图片 -- + if(th.data.share_b_img){ + pg_path=th.data.share_b_img; + } + + var share_title=th.data.teamlist.share_title; + if(!share_title) + share_title=th.data.teamlist.title; + + if (!th.data.share_b_img){ // 如果是普通商品，绘制新海报 + th.drawPoster(context, unit, th.data.share_img_localpath, vpath, type); + } else { + context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); + //-- 是自定义海报的情况下 -- + if(th.data.poster && parseInt(th.data.poster.style)==2){ + //在线上分享人的情况下 + if(parseInt(th.data.poster.show_headpic)){ + //获取坐标 + var x=parseFloat(th.data.poster.head_x)*2; + var y=parseFloat(th.data.poster.head_y)*2; + var x1=(x+90) *unit; + var y1=(y+50) *unit; + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, x1, y1); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; + //强烈推荐 改许程 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit) + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white") + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); + } + + }else{ + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; + //强烈推荐 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit); + context.setFontSize(18 * unit) + context.setFillStyle("white") + context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit); + } + + + //---产品名称--- + context.setFontSize(21.3 * unit); + context.setFillStyle("black"); + + + getApp().draw_Text(context,share_title, + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); + //------产品的价格------- + context.setFontSize(24 * unit) + context.setFillStyle("red") + + var pri0 = th.data.teamlist.price; + pri0=parseFloat(pri0).toFixed(2); + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25; + context.fillText("￥", wd1-15, 180 * unit); + context.setFontSize(31 * unit) + context.fillText(pri0, wd1, 180 * unit); + + //---市场价划掉--- + context.setFillStyle("gray") + context.setFontSize(22 * unit) + pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2); + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25; + context.fillText(pri0, wd2, 210 * unit); + + context.setStrokeStyle('gray') + context.setLineWidth(1 * unit) + context.moveTo(wd2-5, 204 * unit) + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit) + context.stroke(); + console.log(th.data.share_img_localpath); + + + //---中间大图--- + context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit); + + var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length; + var wz= ""; + if(g_ct>0) wz="还差"+g_ct+"人成团，"; + else{ + g_ct= th.data.max_num -th.data.ordertx.length; + if(g_ct>0){ + wz="还差"+g_ct+"人享最低优惠，"; + }else{ + wz="已享受最优惠，"; + } + } + + //-------大图后面就不一样了----------- + switch (type) { + case 1://会员团和商家团的展示 + //---画线--- + context.setLineWidth(1 * unit) + context.moveTo(32 * unit, 670 * unit) + context.lineTo(520 * unit, 670 * unit) + context.stroke(); + + //---文字--- + context.setFontSize(22 * unit) + context.setFillStyle("black") + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); + + //绘制成团图片 + var ct_img ="../../../images/share/ct_num.png"; + context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); + var ct_num = th.data.teamlist.ct_num; + context.setFontSize(14 * unit) + + context.setFillStyle("red") + if(ct_num<10){ + context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit); + }else{ + context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit); + } + context.setFontSize(22 * unit) + context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit); + context.setFillStyle("gray") + context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit); + context.setFillStyle("black") + + context.setFontSize(22 * unit) + context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); + //---二维吗图--- + //-- 自定义海报 -- + if(th.data.poster){ + var erm_x= parseFloat(th.data.poster.ewm_x)*2; + var erm_y= parseFloat(th.data.poster.ewm_y)*2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + } + break + case 2://阶梯团的展示 + //---画线--- + context.setLineWidth(1 * unit) + context.moveTo(32 * unit, 670 * unit) + context.lineTo(520 * unit, 670 * unit) + context.stroke(); + //---文字--- + context.setFontSize(22 * unit) + context.setFillStyle("black") + context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); + //---绘制中间阶梯的价格--- + var list= JSON.parse(th.data.teamlist.ct_rylist); + for(var i=0; i0) + url+="&first_leader="+getApp().globalData.user_id; + else + url+="?first_leader="+getApp().globalData.user_id; + } + // console.log('url+++++>>>>>', url, th.data.teamlist.title); + + var share_title=th.data.teamlist.title; + if(th.data.teamlist.share_title){ + share_title=th.data.teamlist.share_title; + } + return { + path:url, + title: share_title, + imageUrl: img, + } + }, + + clickShare() { + if(!getApp().globalData.user_id){ + getApp().goto("/packageE/pages/togoin/togoin"); + return false; + } + this.setData({ + share_hidden: true, + }); + }, + + send() { + this.setData({ + share_hidden:false, + }); + }, + + cancel() { + this.setData({ + share_hidden:false, + }); + }, + + + closePoster() { + this.setData({ + showPoster: false, + }); + }, + + + // 保存图片到手机 + savePic() { + console.log('保存图片'); + getApp().savePic(this); + + }, + + //-- 先版绘制 -- + drawPoster(context, unit, img, vpath, type) { + + var self=this; + self.data.prom_act=this.data.teamlist; + + // 1.灰色背景 + context.setFillStyle('#f2f1f6'); + context.rect(0, 0, 554 * unit, 899 * unit); + context.fill(); + + // 2.商城名称 + let shopName = this.data.sto_sele_name_1; + context.setTextAlign('center'); + context.setFontSize(26 * unit); + context.setFillStyle('black'); + context.fillText(shopName, 277 * unit, 60 * unit); + + // 3.推荐来源 + let fromText = `来自${getApp().globalData.userInfo.nickname}的推荐`; + context.setTextAlign('center'); + context.setFontSize(22 * unit); + context.setFillStyle('#96959a'); + context.fillText(fromText, 277 * unit, 105 * unit); + + // 4.海报背景 + context.setFillStyle('white'); + context.fillRect(37 * unit, 157 * unit, 480 * unit, 673 * unit); + + // 5.商品图片 + // 图片的x坐标 + let bg_x = 37 * unit + // 图片的y坐标 + let bg_y = 157 * unit + // 图片宽度 + let bg_w = 480 * unit + // 图片高度 + let bg_h = 474 * unit + // 图片圆角 + let bg_r = 4 + // 绘制海报背景图片圆角 + context.save() + context.beginPath() + context.arc(bg_x + bg_r, bg_y + bg_r, bg_r, Math.PI, Math.PI * 1.5) + context.arc(bg_x + bg_w - bg_r, bg_y + bg_r, bg_r, Math.PI * 1.5, Math.PI * 2) + context.arc(bg_x + bg_w, bg_y + bg_h, bg_r, 0, Math.PI * 0.5) + context.arc(bg_x, bg_y + bg_h, 0, Math.PI * 0.5, Math.PI) + context.clip() + context.drawImage(img, bg_x, bg_y, bg_w, bg_h); + context.restore(); + + // 6.强烈推荐 + let src = ''; + context.beginPath(); + + + if (type == 1) { // 商家和会员团 + src = '../../../images/share/ct_num.png'; + context.drawImage(src, 54 * unit, 648 * unit, 120 * unit, 30 * unit); + context.setTextAlign('left'); + + let ct_num = self.data.prom_act.ct_num; + context.setFontSize(16 * unit) + context.font = 'normal'; + context.setFillStyle("red") + if (ct_num < 10) { + context.fillText(ct_num + "人拼团", 100 * unit, 670 * unit); + } else { + context.fillText(ct_num + "人拼团", 96 * unit, 670 * unit); + } + context.setFontSize(22 * unit) + context.fillText("已拼" + self.data.prom_act.buy_num + "份", 186 * unit, 672 * unit); + } + + if (type == 2) { // 阶梯团 + let list = self.data.prom_act.ct_rylist; + if(ut.isString(list)){ + list=JSON.parse(list); + } + + for (let i = 0; i < list.length; i++) { + let item = list[i]; + let wi = i * 90 * unit; + context.font = 'normal'; + context.setTextAlign('left'); + context.setFontSize(16 * unit) + context.setFillStyle("red") + context.fillText("￥", 50 * unit + wi, 680 * unit); + context.setFontSize(22 * unit) + let pri = parseFloat(item.price).toFixed(2); + context.fillText(pri, 66 * unit + wi, 680 * unit); + + + context.setFillStyle("gray") + context.fillText("满" + item.rynum + "人", 50 * unit + wi, 716 * unit); + } + + + var wp= 52 * unit; + var hp=755 * unit + self.draw_pos_price(context,wp,hp,self.data.goods.market_price,unit); + } + + + // 8.商品标题 + context.setFontSize(20 * unit); + context.setFillStyle('#898989'); + getApp().draw_Text(context, this.data.goods.goods_name, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1); + // 9.小程序码 + context.drawImage(vpath, 375 * unit, 660 * unit, 120 * unit, 120 * unit); + context.setFontSize(16 * unit); + context.setFillStyle('#777'); + context.fillText('长按识别二维码', 378 * unit, 810 * unit); + + // 10.竖线 + context.beginPath(); + context.setFillStyle('#eee'); + context.rect(354 * unit, 670 * unit, 1 * unit, 130 * unit); + context.fill(); + }, + + + //---市场价划掉--- + draw_pos_price(context, w, h, market_price, unit) { + + if (!this.data.sys_switch) return false; + if (!this.data.sys_switch.is_retail_price) return false; + + context.setFillStyle("gray") + context.setFontSize(22 * unit) + var pri0 = "￥" + market_price.toFixed(2); + context.fillText(pri0, w, h); + + var c_h = h - 6; + context.setStrokeStyle('gray'); + context.setLineWidth(1 * unit); + context.moveTo(w - 5, c_h); + context.lineTo(w + ut.measureText(pri0, 22 * unit) + 5, c_h); + context.stroke(); + + }, + + + + + +}) + diff --git a/packageG/pages/team/team_success/team_success.json b/packageG/pages/team/team_success/team_success.json new file mode 100644 index 0000000..528e630 --- /dev/null +++ b/packageG/pages/team/team_success/team_success.json @@ -0,0 +1,12 @@ +{ + "windom": { + "navigationBarTitleText": "拼团订单", + "backgroundTextStyle": "light", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#ffffff", + "backgroundColor": "#eeeeee" + }, + "usingComponents": { + "share": "/components/share/share" + } +} \ No newline at end of file diff --git a/packageG/pages/team/team_success/team_success.wxml b/packageG/pages/team/team_success/team_success.wxml new file mode 100644 index 0000000..9f16d52 --- /dev/null +++ b/packageG/pages/team/team_success/team_success.wxml @@ -0,0 +1,355 @@ + + + + + + + + + + + + + {{goods.goods_name}} + + + + + + ￥{{teamlist.price}} + + ￥{{goods.shop_price}} + + + + + 已拼{{teamlist.buy_num+teamlist.virtual}}件 + + + + + + {{teamlist.ct_num}}人拼 + + + + + + + + + + + + + + + 当前价格 + ¥{{ct_price}}, + + 还差{{max_num-ordertx.length}}人享受最低价格￥{{min_price}} + + + 该团已经拼购到最低价了哦~ + + + + + 拼团成功,当前价格 + ￥{{ct_price}} + + + + + + + + + + + 拼团失败 + + + + + + + + 还差 + {{teamlist.ct_num-ordertx.length}}人成团,组团成功为您节省 + {{filters.toFix(goods.market_price-teamlist.price,2)}}元 + + + + 拼团成功,为您节省 + {{filters.toFix(goods.market_price-teamlist.price,2)}}元 + + + + + + + + + + + 团长 + + + + + + + + + + + + + + + + + + + + + 剩余 + + {{obj.hou}}: + {{obj.hou}}: + {{obj.min}}: + {{obj.sec}}结束 + + + + + 剩余支付时间: + + {{obj.hou}}时 + {{obj.min}}分 + {{obj.sec}}秒 + + + + 拼团已结束 + + + + + + 还差 + {{teamlist.ct_num-ordertx.length}}人参团, 拼团失败。 + + + + 已经有 + {{ordertx.length>teamlist.ct_num?ordertx.length:teamlist.ct_num}}人参团, 拼团成功。 + + + + + + + + + + + 拼团成功, 规定时间内支付尾款即发货 + + + 点击下方按钮分享给小伙伴,可快速成团！ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查看拼团列表 + + + + + + + + + + + + + + + + + + + + + + + + + 大家都在团 + + + + + + + + + + + + + + + 拼 + ¥{{item.price}} + + {{item.ct_num}} + 人参团 + + + + + {{item.goods_name}} + + + + + + + + + + + + + + + + + + + + + + 拼团玩法介绍 + + + 1.开团： + 选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功； + + 2.参团： + 进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格； + + 3.成团： + 在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货； + + 4.组团失败： + 在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户； + + 5. + 组团有效期间内，拼购商品订单不允许取消。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packageG/pages/team/team_success/team_success.wxss b/packageG/pages/team/team_success/team_success.wxss new file mode 100644 index 0000000..9d13c9f --- /dev/null +++ b/packageG/pages/team/team_success/team_success.wxss @@ -0,0 +1,965 @@ +page{ + background-color:#eee; +} +.top{ + background-color:rgb(216, 230, 220); + color: rgb(98, 155, 13); + text-align: center; + height:120rpx; + width: 100%; + padding-top:24rpx; +} + +.center{ + height: 240rpx; + width: 100%; + position: relative; + background:#fff; +} + +.cenleft{ + width: 240rpx; + height: 100%; + + float: left; + display:flex; + justify-content: center; + align-items: center; +} + +.cenleft image{ + background-color:white ; + width: 200rpx; + height: 200rpx; + +} + + +.cenrt{ + width: 460rpx; margin-top: 10rpx; +} + +.cenright{ + height: 100%; + width: 460rpx; + + float: left; +} + +.cenrtop{ + margin-top: 10rpx; + background-color: red; + color: white; + border-radius:10rpx; + padding-left: 16rpx; + width: 140rpx; + font-size: 32rpx; + float: left; + height: 40rpx; +} + +.cenrtoptitle{ + float: left; + width: 295rpx; + height: 40rpx; + margin-left: 12rpx; + font-size: 28rpx; + margin-top:12rpx; +} + +.cenrtoptitle>span{ + width: 100%; + display: inline-block; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap +} + +.cenrcen{ + height: 70rpx; + margin-top: 35rpx; + width:474rpx; +} +.jg{ font-size: 40rpx; + margin-right: 30rpx;} +.jgx{ + font-size: 28rpx; + color: #777; + text-decoration:line-through; + margin-left: 20rpx; +} + +.cenrfoot{ + align-content: center; + text-align: center; + border: 2rpx solid red; + border-radius:10rpx; + color: red; + float: left; + font-size: 24rpx; + padding: 4rpx 16rpx; +} + +.body{ + background-color: white; + /* min-height:418rpx; */ + width: 100%; + margin-top: 4rpx; + border-top:5rpx solid #eee; + height: auto; +} + +.bodytop{ + background-color: white; + text-align: center; + font-size: 28rpx; + height:100rpx; + line-height:117rpx; + +} + +.bodytop span{ + color: red; +} + + +.bodyimg{ + height:140rpx; + width:590rpx; + + + +} +.bodyimg image{ + +border-radius:50rpx; +height: 96rpx; +width: 96rpx; +background-color:burlywood; +margin-top: 30rpx; + position: absolute; + +} + +.d{ +width:101rpx; + height:101rpx; + display: inline-block; + margin-right:15rpx; + +} + +.bodyimg span{ + background-color:#e22b44; + color: white; + font-size: 24rpx; + border-radius:6rpx; + padding:2rpx 10rpx; + position: relative; + top: 0rpx; + left: 40rpx; +} + + + +.bodyspan{ + color: red; + text-align: center; + font-size: 26rpx; + +} + +.bodyselect{ + line-height: 47rpx; +} + +.bodytime{ + height: 88rpx; + width: 100%; + display: flex; + flex-wrap: nowrap; + margin-left:40rpx; + align-items:center; + +} + +.bodytimeleft{ + text-decoration:line-through; + flex-grow: 1.7; +} + + +.bodytimecen-success{ + text-align: center; + flex-grow: 1; + line-height:75rpx; + font-size: 30rpx; + color: #000; +} +.bodytimecen-success span{ + + color: #18ba5f; + border-radius:7rpx; + font-size: 30rpx; + margin: 0 auto; + +} +.bodytimecen{ + text-align: center; + flex-grow: 1; + + font-size: 30rpx; + color: #000; +} +.bodytimecen span{ + background-color: #333333; + color: white; + border-radius:7rpx; + padding-left: 10rpx; + font-size: 30rpx; + margin: 0 auto; + padding-right:10rpx; + margin-right:5px +} + + +.bodytimecen span:last-child{ + margin-right: 10rpx; +} + +.bodytimeright{ + flex-grow: 1.7; + margin-right:72rpx; + +} + +.bodybutton{ + width: 90%; + margin: 0 auto; + text-align: center; + line-height: 60rpx; + border-radius:15rpx; + height: auto; +} + +.bodybutton button{ + height:60rpx; + width: 100%; + background-color: #e4374d; + color: white; + font-size:26rpx; + border-radius:12rpx; + +} + +.bodyfoot{ + + width: 100%; + text-align: center; + + font-size: 28rpx; + color: #000; + background-color: white; +} + + + + + +.pintuan{ + width: 100%; + height: 84rpx; + background-color: white; + color: black; + text-align: center; + font-size:36rpx; + margin-top: 60rpx; +} + +.pintuanzhou{ +float: left; + +line-height: 84rpx; +width: 220rpx; +} + +.pintuanyou{ + float: right; + color: rgb(168, 167, 167); + line-height: 84rpx; + font-size: 28rpx; + margin-right: 20rpx; +} + +.onegoods{ + background-color: white; + width: 345rpx; + min-height: 490rpx; + height:auto; + + border:2rpx solid #eee; + + float: left; + margin-right:17rpx; + border-radius:20rpx; +} + +.goodsl{ + background-color: white; +} + +.onegoodsimg{ + width: 100%; + height: 360rpx; +} + +.onegoodsimg image{ + height: 100%; + width: 100%; + border-radius:20rpx 20rpx 0 0; + +} + .xc-buttmo-frame{ + min-height: 103rpx; + height: auto; + padding-bottom:15rpx; + + } +.xc-buttmo-frame .onegoodsdesc { + + height: 80rpx; +} + +.xc-buttmo-frame .onegoodsdesc .price{ + + padding-left:10rpx; + height:85rpx; + +} +.xc-ping{ + border-radius: 50%; + background: #fff; + line-height:34rpx; +width:34rpx; +height:34rpx; +font-size:24rpx; + +} +.jgleft{ +border-radius:36rpx; +height:45rpx; +line-height:50rpx; +color:#fff; +padding-left:7rpx; +padding-right:24rpx; +background:#e4374d; +} + +.jgright{ + font-size: 26rpx; + height:16rpx; +padding-right:10rpx; +color:rgb(168, 167, 167); +} + +.jgright span{ + color: rgb(168, 167, 167); +} + +.goodslisttop{ + width: 100%; +} + +.goodslisttop{ + width: 100%; + margin-top: 5rpx; + border-bottom: 4rpx solid #eee; + text-align: center; +} + +.goodslistspan{ + + margin: 0 auto; + padding-top: 20rpx; +} + +.xian{ + width: 100%; + border-bottom: 2rpx solid #eee; + float: left; +} + +.bodyselect{ + height: 90rpx; + background-color: white; + width: 100%; + line-height:90rpx; + +} + + +.changxin{ + overflow: hidden; + width: 100%; + padding-left:20rpx; + +} + +.zhangxi{ + width: 100%; + background-color:white; + color: black; +} + +.img{ + height: 100rpx; + margin-bottom: 0rpx; + float: left; + color: black; + line-height:100rpx; +display:flex; +align-items:center; + +} + +.zhangxi image{ + border-radius:50rpx; + height: 60rpx; + width: 60rpx; + float: left; + + background-color: red; + margin-left: 40rpx; + margin-right:10rpx; + +} + +.zhangxi .zssj{ + width: 413rpx; + margin-left: 28rpx; + float: right; + margin-top:32rpx; +} + +.zspan{ + float: left; + text-align: center; + display: flex; + align-items: center; + justify-content: center; + height: 48rpx; + font-size: 28rpx; + color:#000; + margin-bottom: 10rpx; + padding-bottom: 10rpx; + width: 100%; + background: #fff; + border-bottom:3rpx solid #eee; + margin-top:20rpx; + +} + + + +.mtop{ + text-align: center; + color: white; + background-color:rgba(0, 0, 0, .4); + width: 100%; + height: 100%; + position: fixed; + z-index: 5;top:0;left: 0; + +} + +.mt1{ + margin-top: 200rpx; + margin-bottom: 20rpx; +} + +.mts{ + color:#E1E10B; +} + +.mcou{ + font-size: 48rpx; + +} + +.mfoot{ + width: 100%; + margin-top: 700rpx; +} + + +.mbtn{ + margin-top: 60rrpx; + width: 400rpx; + background: #666666; + color: #fff; + border-radius: 20rpx; + font-size: 32rpx; +} + + + + + + + +.etop{ + padding-top: 200rpx; + width: 100%; + height: 100%; + position: fixed; + left: 0rpx; + top: 0rpx; + z-index: 12rpx; +background-color:rgba(0, 0, 0, .4); + +} + +.emyimage{ + display:flex; + justify-content: center; + align-items: center; +} + + +.emyimage image{ + background-color: red; + width: 300rpx; + height: 300rpx; + margin: 0 auto; + +} + +.espan{ + font-size: 32rpx; + margin-top: 10rpx; +} + +.erweima{ + margin-top: 10rpx; + display: flex; + width: 100%; + +} + +.erzhou{ + width: 200rpx; + + + margin-right: 20rpx; +} + +.erzhou image{ + background-color: blanchedalmond; + width: 200rpx; + height: 200rpx; +} + + +.eright{ + width: 500rpx; + font-size: 32rpx; + +} + + + +.ecc{ + float: right; + margin-right: 48rpx; +} + + +.eee{ + padding-top:40rpx; + +width:90%; +height:70%; + +padding-left:32rpx; +margin-left:20rpx; + +background-color:white; + +} + +.clear{ + clear: both; +} + +.down-arrow { + display: inline-block; + position: relative; + width: 40rpx; + height: 30rpx; + margin-right: 20rpx; +} + +.down-arrow::after { + display: inline-block; + content: " "; + height: 18rpx; + width: 18rpx; + border-width: 0 2rpx 2rpx 0; + border-color: #000; + border-style: solid; + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0); + transform-origin: center; + transition: transform 0.3s; + position: absolute; + top: 50%; + right: 10rpx; + margin-top: -10rpx; +} + +.down-arrow1 { + display: inline-block; + position: relative; + width: 40rpx; + height: 30rpx; + margin-right: 20rpx; + margin-top: 12rpx; +} + +.down-arrow1::after { + display: inline-block; + content: " "; + height: 18rpx; + width: 18rpx; + border-width: 0 2rpx 2rpx 0; + border-color: #000; + border-style: solid; + transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0); + transform-origin: center; + transition: transform 0.3s; + position: absolute; + top: 50%; + right: 10rpx; + margin-top: -10rpx; +} + +.down-arrow1::after { + transform-origin: center; + transform: rotate(-135deg); + transition: transform 0.3s; +} + +.bview { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); +} + +.juzhong { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.juzhong .xq { + padding: 0 20rpx; + background: #fff; + font-size: 30rpx; + padding-bottom: 20rpx; +} + +.juzhong .xq .title { + text-align: center; + margin: 20rpx 0; + position: relative; + height: 50rpx; +} + +.juzhong .xq .hs1 { + font-size: 28rpx; + color: #ab8f9e; +} + +.juzhong .xq .title .close { + position: absolute; + top: 0; + right: 0; + width: 45rpx; + height: 45rpx; +} + +.pt_qd { + margin-top: 40rpx; + height: auto; +} + +.spec-cart-btn.w100 { + width: 100%; + margin-left: 0; + height: 80rpx; + line-height: 80rpx; +} + +.pt_status_set{ + position: absolute; right: 10rpx; top:50rpx; width: 120rpx; height: 120rpx; +} + + + +.xc-goods-details{ +width:479rpx; +margin-top:20rpx; +height:77rpx; +} + +.xc-valframe{ + border-radius:7rpx; +border:1rpx solid; +margin-top:3rpx; +} +.xc-valframe .xc-frame-img{ + width:30rpx; +height:100%; +background:#e22b44; +} +.xc-valframe .xc-frame-img .picture{ + width:25rpx; +height:25rpx; +margin-top:4rpx; + +} +.xc-ellipsis-img{ +width:56rpx; +height:96rpx; + +} +.xc-ellipsis-img .pictures{ + width:56rpx;height:56rpx; +} +.flex_tou{ display: flex; justify-content: center; width: 100%;} +.xc-ptcomplete{ + width:74%; +height:105rpx; +line-height:105rpx; +float:right; + +} +.xc-ptcomplete .xc-img-frame .img{ + width: 105rpx; + height: 105rpx; + float: right; +} +.xc-ptcomplete-ladder .xc-img-frame{ + width:201rpx; + height: 105rpx; + margin-top:20rpx; +} +.xc-ptcomplete-ladder .xc-img-frame .img{ + width: 105rpx; + height: 105rpx; + float: right; + padding-right:6rpx; +} +.xc-ptcomplete .xc-img-frame{ + width:190rpx; + height: 105rpx; + margin-top:20rpx; +} +.xc-ptcomplete .xc-end{ + width:283rpx; +text-align:right; +} +.iw{ +padding-right:33rpx; +} +.xc-ptcomplete .xc-img-frames{ + width:360rpx; +height:105rpx; +margin-top:20rpx; + +} +.xc-ptcomplete .xc-img-frames .img{ + width: 105rpx; + height: 105rpx; + float: right; + padding-right:6rpx; +} +.xc-home-page-frame{ + padding-top:16rpx; + +} +.xc-home-page-frame .xc-home-page{ + background-color: #e22b44;border-radius:15rpx; +width:90%; +color:#fff; +height:60rpx; +font-size:26rpx; +line-height:60rpx; +} +/* */ +.xc-people-val{ + padding-left:8rpx; +padding-right:8rpx; +} +.xc-onclik{ + width:100%; +height:70rpx; + +} +.xc-green{ + color: #18ba5f; + text-align:center; +flex-grow:1; +height:90rpx; + + +} +.xc-ptcomplete-ladder{ + width:74%; +height:105rpx; +line-height:105rpx; +float:right; +} +.xc-fail-ladder{ + width:61%; +height:105rpx; +line-height:105rpx; +float:right; + +} +.xc-fail-ladder .xc-img-frame{ + width:61%; +height:105rpx; +margin-top:20rpx; +} +.xc-fail-ladder .xc-img-frame .img{ + width: 105rpx; + height: 105rpx; + float: right; + padding-right:6rpx; +} +.xc-list{ + background-color:#e22b44; +color:white; +font-size:17rpx; +border-radius:6rpx; +padding:0 5rpx; +position:absolute; +top:13rpx; +left:80rpx; +width:34rpx; +line-height:25rpx; + +} + +.xc-linellae-frame{ + width: 100%; + height: 60rpx; + background: #eee; +} +.xc-linellae-frame .xc-linellae{ + width: 425rpx; + height: 1rpx; + border-bottom: 1rpx solid #a5a5a5; +} +.xc-recommend-frame{ +background:#eee; +width:200rpx; +height:100%; + +} +.xc-recommend-frame .xc-recommend{ + width: 35rpx; + height: 27rpx; + margin-top:7rpx; +} +.xc-recommend-frame .xc-recommend-word{ +font-size:26rpx; +color: #a9a9a9; +margin-left:5rpx; +} +.xc-rmbs{ + +height:40rpx; +} +.xc-shuoming{ + padding-left:10rpx; +} + + +.poster-container { + box-sizing: border-box; + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: calc(100% - 210rpx); + z-index: 1000; +} +.mask { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 999; + background-color: rgba(0,0,0,.4); +} +.poster-wrapper { + width: 100%; +} + +.poster { + box-sizing: border-box; + width: 100%; + height: 905rpx; + border-radius: 20rpx; + /* box-shadow: 0 8px 12px #666; */ + position: relative; + z-index: 999; + overflow: hidden; +} +.poster-img { + display: block; + width: 100%; + height: 100%; +} +.btn-container { + display: flex; + justify-content: space-around; +} +.btn-share { + display: block; + background-color: #FE6867; + color: white; + border-radius: 8rpx; + line-height: 80rpx; + margin-top: 28rpx; + padding: 0 60rpx; +} + + +.btn-close { + /* background-color: rgba(0,0,0,.5); */ + color: #ccc; + width: 50rpx; + height: 50rpx; + line-height: 50rpx; + text-align: center; + border-radius: 50%; + position: absolute; + right: 20rpx; + top: 20rpx; +} + +.icon-close { + font-size: 48rpx; +} \ No newline at end of file diff --git a/pages/user/express/express.js b/packageG/pages/user/express/express.js index a3571af..a3571af 100644 --- a/pages/user/express/express.js +++ b/packageG/pages/user/express/express.js diff --git a/pages/user/express/express.json b/packageG/pages/user/express/express.json index 251518d..251518d 100644 --- a/pages/user/express/express.json +++ b/packageG/pages/user/express/express.json diff --git a/pages/user/express/express.wxml b/packageG/pages/user/express/express.wxml index de1d85e..de1d85e 100644 --- a/pages/user/express/express.wxml +++ b/packageG/pages/user/express/express.wxml diff --git a/pages/user/express/express.wxss b/packageG/pages/user/express/express.wxss index 112d0a9..112d0a9 100644 --- a/pages/user/express/express.wxss +++ b/packageG/pages/user/express/express.wxss diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js index befb038..44086ab 100644 --- a/pages/cart/cart4/cart4.js +++ b/pages/cart/cart4/cart4.js @@ -90,7 +90,7 @@ Page({ wx.setStorageSync("order:order_list:update", !0); if(this.data.is_pt==1){ wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + this.data.pt_order_sn, }); }else { diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index a6105eb..c9cfaf6 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -438,7 +438,8 @@ Page({ storeId: th.data.getStorageID, //商家ID userId: th.data.getUserID, //用户ID page: th.data.curpage, - pageSize: th.data.pageSize + pageSize: th.data.pageSize, + is_share:0 }, success: function (res) { if (res.data.code == 0) { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index ee03341..7c90395 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1266,7 +1266,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, onUnload: function () { @@ -5296,9 +5296,9 @@ Page({ /*--- wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { th.setData({ @@ -5637,7 +5637,7 @@ Page({ wx.showLoading(); var th = this; - var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + var url = "/packageG/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; /*-- wx.redirectTo({ url:url, @@ -5733,7 +5733,7 @@ Page({ this.data.is_go_to_team_show = 1; wx.showLoading(); - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + getApp().goto("/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { console.log(222, goods_id) diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 4362431..f8d83d9 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -485,12 +485,12 @@ - + - + diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 7068b32..c37d922 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -476,7 +476,7 @@ Page({ is_ok=0; }else if (odr.pt_status == 1 && odr.order_status == 1){ wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + url: "/packageG/pages/team/team_success/team_success?ordersn=" + odr.order_sn, }); is_ok=0; } diff --git a/pages/template/index.wxml b/pages/template/index.wxml index 019ba81..082b61e 100644 --- a/pages/template/index.wxml +++ b/pages/template/index.wxml @@ -44,12 +44,12 @@ - + - + diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js index a6c1960..51f1e5c 100644 --- a/pages/user/address_list/address_list.js +++ b/pages/user/address_list/address_list.js @@ -71,7 +71,7 @@ Page({ var t = this.getAddressData(e.currentTarget.dataset.id), s = ""; for (var a in t) s += (0 != s.length ? "&" : "?") + a + "=" + t[a]; s && wx.navigateTo({ - url: "/pages/user/add_address/add_address" + s + url: "/packageF/pages/user/add_address/add_address" + s }); }, diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml index 619915a..794f1cf 100644 --- a/pages/user/address_list/address_list.wxml +++ b/pages/user/address_list/address_list.wxml @@ -16,7 +16,7 @@ 获取微信地址 - + + 新建收货地址 @@ -69,7 +69,7 @@ 获取微信地址 - + + 新建收货地址 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 93945d3..35c4f5f 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -607,7 +607,7 @@ Page({ } }) - if(!presellList || !presellList.length){ + if(!presellList){ var content = good.goods_name + '未找到预售活动,请取消订单'; th.toast(content); th.setData({ paying: 0 }); @@ -2042,12 +2042,16 @@ Page({ 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; + //3，5，7，10加入购物车，统一prom_type为0 + if([3,5,7,10].indexOf(g_item.prom_type)>-1){ + g_item.prom_type=0; + g_item.prom_id=0; + } + 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: { diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index ce95d16..32763bb 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -179,7 +179,7 @@ + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 07df254..606bf3e 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -921,7 +921,7 @@ Page({ } }) - if(!presellList || !presellList.length){ + if(!presellList){ var content = good.goods_name + '未找到预售活动,请取消订单'; th.toast(content); th.setData({ paying: 0 }); diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index f9ecaef..bb0a89d 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -262,9 +262,9 @@ + hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流 + hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流 订单详情 订单详情 diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 4b21b03..54e81aa 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -275,7 +275,7 @@ - + 收货地址 ∟