From a6a9ca33f9520398108efce7355d76b4b5c48e2d Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 7 Feb 2023 16:08:03 +0800 Subject: [PATCH] 多活动优化 --- packageA/pages/distribution/goods/goods.js | 26 ++++++++++++-------------- packageA/pages/serviceCard_pd/cart/cart.js | 944 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/goods/goodsList/goodsList.js | 2 +- 3 files changed, 218 insertions(+), 754 deletions(-) diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js index fd6620f..bdaa9b9 100644 --- a/packageA/pages/distribution/goods/goods.js +++ b/packageA/pages/distribution/goods/goods.js @@ -99,7 +99,7 @@ Page({ onShow: function () { getApp().check_can_share(); - let url = '/api/weshop/goods/page'; + let url = '/api/weshop/goods/page?isnewwhere=1'; let currentQuery = this.data.currentQuery; if(app.globalData.userInfo) { if(!this.data.isLogin) { @@ -115,12 +115,10 @@ Page({ currentQuery.is_mainshow = 1; currentQuery.isonsale = 1; currentQuery.searchtype = 2; - // url = '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1'; - // this.getData(true, '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1', this.data.currentQuery); + } else {//下架商品 currentQuery.searchtype = 1; - // url = '/api/weshop/goods/page?dis_type=1'; - // this.getData(true, '/api/weshop/goods/page?dis_type=1', this.data.currentQuery); + }; currentQuery.orderType = 'desc'; currentQuery.dis_type = 1; @@ -235,9 +233,9 @@ Page({ let url = ''; if(options.index == 0) { - url = '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1'; + url = '/api/weshop/goods/page?isnewwhere=1&is_mainshow=1&isonsale=1&dis_type=1'; } else { - url = '/api/weshop/goods/page'; + url = '/api/weshop/goods/page?isnewwhere=1'; }; @@ -367,10 +365,10 @@ Page({ if(this.data.options.index == 0) {//上架商品 - url = '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1'; + url = '/api/weshop/goods/page?isnewwhere=1&is_mainshow=1&isonsale=1&dis_type=1'; } else {//下架商品 data.dis_type = 1; - url = '/api/weshop/goods/page?searchtype=1'; + url = '/api/weshop/goods/page?isnewwhere=1&searchtype=1'; }; this.getData(true, url, data) .then(function(callback) { @@ -494,9 +492,9 @@ Page({ }; if(options.index == 0) { - url = '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1'; + url = '/api/weshop/goods/page?isnewwhere=1&is_mainshow=1&isonsale=1&dis_type=1'; } else { - url = '/api/weshop/goods/page'; + url = '/api/weshop/goods/page?isnewwhere=1'; }; this.getData(true, url, data); }, @@ -697,7 +695,7 @@ Page({ duration: 1000, }); - self.getData(true, '/api/weshop/goods/page?is_mainshow=1&isonsale=1&dis_type=1', self.data.currentQuery, false); + self.getData(true, '/api/weshop/goods/page?isnewwhere=1&is_mainshow=1&isonsale=1&dis_type=1', self.data.currentQuery, false); } else { wx.showToast({ title: '上架失败', @@ -753,7 +751,7 @@ Page({ icon: 'success', duration: 1000, }); - self.getData(true, '/api/weshop/goods/page?dis_type=1&searchtype=1', self.data.currentQuery, false); + self.getData(true, '/api/weshop/goods/page?isnewwhere=1&dis_type=1&searchtype=1', self.data.currentQuery, false); } else { wx.showToast({ title: '下架失败', @@ -850,7 +848,7 @@ Page({ currentTabIndex: 0, }); if(data.orderField) delete data.orderField; - this.getData(true, '/api/weshop/goods/page', data); + this.getData(true, '/api/weshop/goods/page?isnewwhere=1', data); return; }; diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js index e07f896..35f9333 100644 --- a/packageA/pages/serviceCard_pd/cart/cart.js +++ b/packageA/pages/serviceCard_pd/cart/cart.js @@ -90,48 +90,6 @@ Page({ to.auth.get_u(func); }, - //-------------------获取物流--------------- - get_wuliu(func) { - var th = this; - console.log("getwuliu4545"); - to.getwuliu(function (e) { - if (th.data.is_default_logistics) { - //如果第一个不是开启默认，说明要让用户自己选 - if (!e[0].is_default) { - th.setData({ is_default_logistics: 0 }); - } - } - th.setData({ wu_arr: e }) - typeof func == "function" && func(); - }) - }, - - //------获取会员收货地址----- - getuser_addr: function (func) { - if (to.globalData.baddr != null) { - var user_addr = to.globalData.baddr; - to.globalData.baddr = null; - func(user_addr); - } else { - a.get("/api/weshop/useraddress/page", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 }, - success: function (su) { - - var user_addr = su.data.data.pageData; - var item = null; - var def_item = null; - for (var i = 0; i < user_addr.length; i++) { - if (user_addr[i]['is_default'] == 1) { def_item = user_addr[i]; } - if (user_addr[i]['is_pickup'] == 1) { item = user_addr[i]; } - } - if (item == null) item = def_item; - if (item == null) item = user_addr[0]; - if (item == undefined) item = null; - func(item); - } - }); - } - }, //----------------展示页面,是再获取用户信息之后-------------- show_page: function () { var th = this; @@ -141,23 +99,10 @@ Page({ data: { r: Math.random() }, success: function (e) { - getApp().globalData.userInfo = e.data.data; - th.setData({ userinfo: e.data.data }); - //获取立即购买的商品信息 - th.get_buy_goods(); - - //获取提现金额 - getApp().request.get("/api/weshop/withdrawals/summoney", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 }, - success: function (su) { - if (su.data.code == 0) { - var yuer = parseFloat(th.data.userinfo.user_money - - (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2); - if (yuer < 0) yuer = 0; - th.setData({ txmon: su.data.data.summoney, yuer: yuer }); - } - } - }); + getApp().globalData.userInfo = e.data.data; + th.setData({ userinfo: e.data.data }); + //获取立即购买的商品信息 + th.get_buy_goods(); } }); }, @@ -166,13 +111,14 @@ Page({ get_buy_goods: function () { var th = this, a = getApp().request; var gg = th.data.postdata; + var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id //调用商品 - a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, { + a.get(url, { success: function (t) { var gd = t.data.data; if (!gd) return false; - t.data.data.original_img = oo.imghost + t.data.data.original_img; + t.data.data.original_img = oo.imghost + t.data.data.imgUrl; t.data.data['buynum'] = gg.goods_num; console.log(t.data.data); var distr_t = 0, et = 0 @@ -204,39 +150,21 @@ Page({ var gd = t.data.data; //-- 用商品的手店价来显示 -- - gg.goods_price = gd.shop_price; - //---是不是购买等级卡成功的返回---等级卡显示的判断--- - var is_card_back = getApp().globalData.is_card_back; - if (is_card_back) { - gg.goods_price = gd[th.data.card_name]; - t.data.data.shop_price = gg.goods_price; - getApp().globalData.is_card_back = 0; - th.setData({ card_cut_price: 0 }); - } else { - //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 - if (th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo.card_field) { - var cut_p = gg.goods_price - gd[th.data.card_name]; - th.setData({ card_cut_price: cut_p }); - } - } + gg.goods_price = gd.money; if (th.data.bn_goods) { et = th.data.bn_exp_type; } - th.setData({ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal: 1, bn_exp_type: et }); - - - th.calculatePrice2(); } else { //--阶梯团很特殊，不能用总表来拿价格-- - getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gd.prom_id, { + getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gg.prom_id, { success: function (tt) { if (tt.data.code == 0) { @@ -264,16 +192,12 @@ Page({ t.data.data.is_normal = 1; } - if (th.data.bn_goods) { - et = th.data.bn_exp_type; - } + if (th.data.bn_goods) { et = th.data.bn_exp_type; } th.setData({ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et }); - - //计算价格 th.calculatePrice2(); } @@ -290,89 +214,11 @@ Page({ wx.navigateTo({ url: "/pages/index/index/index" }) - } else { - this.getuser_addr(function (ie) { - //更换地址回来要重新调用计算价钱的接口 - th.setData({ user_addr: ie }); - if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { - th.setData({ add_back: 1 }); - if (th.data.bn_goods) th.calculatePrice2(); - } - }) - //--更新默认地址--,看一下是不是跳到地址页面 - if (!getApp().globalData.is_cart_old) { - this.update_code(); - } else { - getApp().globalData.is_cart_old = 0; - } } - - - //先获取是否有关闭使用优惠券 - getApp().getConfig2(function (ee) { - var json_d = JSON.parse(ee.switch_list); - th.data.json_d = json_d; - th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 - var is_default_logistics = json_d.is_default_logistics; - - th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); - - var rank_switch = json_d.rank_switch; - var max_price = -1; - var show_card = null; - var name = ""; - //如果有开等级卡的时候, - //因为都是调接口，要返回在计算 - if (rank_switch == 2) { - //-- 获取所有的等级卡, -- - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, - {}).then(res => { - if (res.data.code == 0) { - var plusCard = res.data.data; - //-- 循环判断，拿到最贵的那张卡 -- - for (var ih in plusCard) { - if (plusCard[ih].IsStopBuy == true) { continue; } - if (max_price < 0) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } else { - if (max_price < plusCard[ih].CardFee) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } - } - } - - if (show_card) { - name = name.toLowerCase(); - th.setData({ card_name: name, show_card: show_card }) - } - } - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - }) - } else { - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - } - }, 1) - - }, - //---------------检查是否有收货地址------------------- - checkAddressList: function () { - var t = this; - return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ - title: "请先填写或选择收货地址~", - success: function (a) { - a.confirm ? t.enterAddressPage() : wx.navigateBack(); - }, - fail: function () { - wx.navigateBack(); - } - }), !1); + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_info(th.show_page); }, + showInvoice: function () { this.setData({ invoiceToggle: !this.data.invoiceToggle @@ -393,129 +239,37 @@ Page({ maxWord: t.detail.value.length }); }, - //---------计算立即购买---------- - calculatePrice2: function () { - var th = this, good = this.data.bn_goods; - //-----------计算商品总价-------------- - var allpice = good.shop_price * good.buynum; - allpice = parseFloat(allpice).toFixed(2); - var txt = "formData.all_price"; - th.setData({ [txt]: allpice, }); - console.log(th.data.formData); - - to.getConfig2(function (ee) { - to.getwuliuprice(async function (rs) { - console.log('calculatePrice2222'); - console.log(rs); - var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; - var out_of_weight = null; //超出多少重量 - var freight_free = ee.freight_free; //全场满多少包邮 - var weight_free = ee.weight_free; //多少kg内包邮 - var no_ex_id = ee.no_ex_id; - var no_ex_good = null; - var by_qc = {}; - if (no_ex_id && freight_free > 0) { - //-----------获取不包邮区域，不包邮商品------- - await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods", { - data: { store_id: os.stoid, id: no_ex_id } - }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { - by_qc = res.data.data[0]; - } - }) - }; - //-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格---------- - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - switch (good['exp_sum_type']) { - case 1: - //统一运费 - o_shipping_price += good['uniform_exp_sum']; break; - case 2: - if (goods_weight < 0) goods_weight = 0; - //累积商品重量 每种商品的重量 * 数量 - goods_weight += good['weight'] * good['buynum']; - if (weight_free > 0) { - out_of_weight = (weight_free * 1000) - goods_weight; - } - break; - case 3: - if (goods_piece < 0) goods_piece = 0; - //累积商品数量 - goods_piece += good['buynum']; break; - } - - console.log(th.data.wu_arr); - var code = th.data.wu_arr[th.data.index].code; - th.data.is_no_by[th.data.bn_pick] = 0; - var no_by_data = null; - //--全部金额-- - //有不包邮区域，且不免运费 - if (no_ex_id && freight_free > 0 && freight_free <= parseFloat(allpice)) { - //-----------获取不包邮区域，不包邮商品------- - await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods", { - data: { store_id: os.stoid, id: no_ex_id } - }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { - no_by_data = res.data.data[0]; - //如果有设置不包邮区域的时候 - if (res.data.data[0].region_list) { - if (th.check_by_area(res.data.data[0].region_list)) { - freight_free = 0; - // out_of_weight = 0; - th.data.is_no_by[th.data.bn_pick] = 1; - } - } - //如果有设置不包邮商品 - if (res.data.data[0].goods_list && freight_free) { - if (th.check_by_goods(res.data.data[0].goods_list)) { - freight_free = 0; - // out_of_weight = 0; - th.data.is_no_by[th.data.bn_pick] = 1; - } - } - } - }) - } - var shipping_price = - th.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, th.data.user_addr, freight_free, allpice, rs,th.data.bn_pick); + //---------计算立即购买---------- + calculatePrice2: function () { + var th = this, good = this.data.bn_goods; + //-----------计算商品总价-------------- + var allpice = good.shop_price * good.buynum; + allpice = parseFloat(allpice).toFixed(2); + var txt = "formData.all_price"; + th.setData({ [txt]: allpice, }); - shipping_price = parseFloat(shipping_price).toFixed(2); - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: shipping_price, }) - } else { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: 0, }) - } //-----------------总价----------------- - var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price); + var total_m = parseFloat(allpice); total_m = parseFloat(total_m).toFixed(2); - var atxt = "formData.total_amount"; th.setData({ [atxt]: total_m, }) var order_m = total_m; - - var txt = "formData.user_money"; var txt2 = "formData.order_amount"; - //--------------如果使用余额--------------------- - if (th.data.bn_use_money == 1 && th.data.yuer > 0) { - if (parseFloat(th.data.yuer) > total_m) { - th.setData({ [txt]: total_m, [txt2]: 0 }) - } else { - order_m = parseFloat(order_m) - parseFloat(th.data.yuer); - order_m = order_m.toFixed(2); - th.setData({ [txt]: th.data.yuer, [txt2]: order_m }) - } - } else { - th.setData({ [txt]: 0, [txt2]: order_m }) - } + th.setData({ [txt2]: order_m }) - }); - }); }, + + + //-- 要弹起来提示一下 -- + submitForm: function() { + var th = this; + this.sendsm(function() { + th.submit_func(); + }) + }, //--------------------提交订单----------------------- - submitForm: async function (t) { + submit_func: async function (t) { if (this.data.is_summit_ing == 1) return false; //--提交中退出-- this.data.is_summit_ing = 1; @@ -523,114 +277,64 @@ Page({ var ff = true; //------------立即购买------------- console.log("buy_new"); - - //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 - if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - ff = false; - getApp().my_warnning("请选择收货地址", 0, this); - this.data.is_summit_ing = 0; - } - if (!ff) return false; - var addr = th.data.user_addr; - if (th.data.bn_exp_type == 1) addr = null; - - console.log(th.data.formData); - console.log(th.data.wu_arr); - console.log(th.data.bn_exp_type); - - if (th.data.bn_exp_type == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - getApp().my_warnning("读取物流失败", 0, this); - this.data.is_summit_ing = 0; - return false; - } - } - - //阶梯团强制带1，自提~~~ - if (th.data.kt_type == 3) { - th.data.bn_exp_type = 1; - } + th.data.bn_exp_type =1; var item = { - 'user_id': to.globalData.user_id, - 'consignee': addr == null ? "" : addr.consignee, - 'province': addr == null ? 0 : addr.province, - 'city': addr == null ? 0 : addr.city, - 'district': addr == null ? 0 : addr.district, - 'twon': addr == null ? 0 : addr.twon, - 'address': addr == null ? "" : addr.address, - 'more_address': addr == null ? "" : addr.more_address, - 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile, - 'email': '', - 'invoice_title': '', - 'goods_price': th.data.formData.all_price, //商品总价 - 'shipping_price': th.data.formData.shipping_price, //物流金额 - 'user_money': th.data.formData.user_money, //使用余额 - 'total_amount': th.data.formData.total_amount, //订单总价 - 'order_amount': th.data.formData.order_amount, //应付 - 'user_note': t.detail.value.user_note, //用户备注 - 'store_id': oo.stoid, //商家 - 'pickup_id': th.data.bn_pick, //门店 - 'exp_type': th.data.bn_exp_type, //配送方式 - 'is_normal': th.data.bn_goods.is_normal, //是否是普通购买 - 'pt_prom_id': th.data.bn_goods.prom_id, //拼单ID - 'is_pt_tz': th.data.is_pt_tz, //开团类型 - 'order_goods': new Array(), + 'user_id': to.globalData.user_id, + 'account': th.data.formData.order_amount, + 'store_id': oo.stoid, //商家 + 'list': new Array(), }; - //如果不是阶梯团，或者是普通购买， - if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) { - item['shipping_code'] = th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code; - item['shipping_name'] = th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name; - } - if (!th.data.bn_goods.is_normal) { - item.is_zsorder = th.data.kt_type + 1; //开团类型 - } - //老会员成为分销下线需要的参数 - if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { - //判断一下分享人是不是分享商 - await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then(res => { - if (res.data.code == 0) { - var user = res.data.data; - if (user.is_distribut == 1) { - item.first_leader = parseInt(getApp().globalData.first_leader); - } - } - }) - } + var gg = to.get_b_now(); + if (!gg.pick_id) { + getApp().showWarning("未找到门店"); + return false; + } + var goods = { + 'card_id': gg.id, + 'itemid': th.data.bn_goods.erpItemID, + 'qty': gg.goods_num, + 'price': th.data.formData.order_amount, + 'pickup_id': gg.pick_id, + 'pickup_keyid': gg.keyid, + 'prom_type': this.data.postdata.prom_type, //促销活动类型 + 'prom_id': this.data.postdata.prom_id, //促销活动id + 'is_pd_normal': th.data.bn_goods.is_normal, //是否是普通购买 + 'is_pt_tz': th.data.is_pt_tz, //开团类型 + }; + + if (!th.data.bn_goods.is_normal) { + goods.is_zsorder = th.data.kt_type + 1; //开团类型 + } - if (th.data.qh != '') { - item.team_qh = th.data.qh; - item.pt_listno = th.data.qh; - } + if (th.data.qh != '') { + goods.team_qh = th.data.qh; + goods.pt_listno = th.data.qh; + } - var gg = to.get_b_now(); - var goods = { - 'goods_id': gg.goods_id, - 'goods_name': gg.goods_name, - 'goods_sn': gg.goods_sn, - 'goods_num': gg.goods_num, - 'market_price': th.data.bn_goods.market_price, - 'goods_price': th.data.bn_goods.shop_price, - 'member_goods_price': th.data.bn_goods.shop_price, - 'store_id': oo.stoid, - 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 - 'prom_id': th.data.bn_goods.prom_id, //促销活动id - }; + if(this.data.postdata.prom_type == 1) { + goods.price = this.data.postdata.prom_price; + }; - //--导购分享过来的id-- - if (gg.guide_id) { - goods.guide_id = gg.guide_id; - goods.guide_type = gg.guide_type; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => { - if (res.data.code == 0) { - goods.guide_name = res.data.data.salesman; - goods.guide_sn = res.data.data.salesman_no; - } - }) - } + if(getApp().globalData.skinface_id){ + goods.skinface_id=getApp().globalData.skinface_id; + } + + //--导购分享过来的id-- + if (gg.guide_id) { + goods.guide_id = gg.guide_id; + goods.guide_type = gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then( + res => { + if (res.data.code == 0) { + goods.guide_name = res.data.data.salesman; + goods.guide_sn = res.data.data.salesman_no; + } + }) + } //--商品的房间号-- @@ -638,308 +342,87 @@ Page({ item.room_ids = gg.room_id; goods.room_id = gg.room_id; } - - if (th.data.bn_goods.is_normal) { goods.is_pd_normal = 1; } - - item.order_goods.push(goods); - pdata.push(item); - - if (pdata.length == 0) return; + item.list.push(goods); + pdata=item; + if (pdata.length == 0) return false; var str = JSON.stringify(pdata); - console.log("支付数据"); - console.log(str); - //return false; - wx.showLoading({ title: "加载中" }); - wx.request({ - url: oo.url + '/api/weshop/order/createWxdOrder', - data: str, - method: 'POST', - header: { - 'content-type': 'application/json' - },// 设置请求的 header - success: function (res) { - - wx.hideLoading(); - if (res.statusCode == 200) { - var data = res.data; - if (data.code == 0) { - console.log(th.data.is_b_now); - //如果是购物车结算，还要删除购物车 - if (th.data.is_b_now == 0) { - console.log(th.data.cartlist_y); - var list = th.data.cartlist_y; - for (var i = 0; i < list.length; i++) { - //删除购物车 - getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); - } - } - var order_amount = 0; - pdata.forEach(function (em, ind) { - order_amount += em.order_amount; - }) - //要进行判断，如果是用微信支付，就要跳转到支付界面 - if (order_amount > 0) { - th.setData({ isclose: 0 }); - //void e.jumpToCart4({ - // order_sn: data.data, - // type:1, - // }, 1); - util_pay.pay(data.data, function () { - 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, - }) - }, 1000) - }, function () { - //支付失败 - setTimeout(function () { - //wx.navigateBack({ delta: 1 }) - wx.reLaunch({ - url: "/pages/user/order_list/order_list", - }) - }, 1000) - - }, oo.stoid, 1); - - } else { - var dd = { - parent_sn: data.data, - store_id: oo.stoid, - type: 1, - }; - //return false; - getApp().request.post("/api/weshop/order/pay/createOrder", { - data: dd, - success: function (t) { - console.log(t); - // app.my_warnning("支付成功", 1, th); - wx.showToast({ - title: '支付成功', - icon: 'success', - duration: 2000 - }); - setTimeout(function () { - th.setData({ isclose: 0 }); - - if (th.data.is_normal == 1) { - /*-- - wx.navigateTo({ - url: "/pages/user/order_list/order_list", - })--*/ - var url = "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data; - wx.reLaunch({ - url: url - }) - - } else { - wx.reLaunch({ - url: "/pages/team/team_success/team_success?ordersn=" + data.data, - }) - } - - - }, 1000) - } - }); - } - } - else { - th.data.is_summit_ing = 0; //是否提交中 - getApp().confirmBox(data.msg); - } - } else { - th.data.is_summit_ing = 0; //是否提交中 - console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); - } - }, - fail: function () { - th.data.is_summit_ing = 0; //是否提交中 - wx.hideLoading(); - console.log("index.js wx.request CheckCallUser fail"); - }, - complete: function () { } - }) - }, - useCoupon: function () { - if (this.data.order.couponNum <= 0) { - //return t.showWarning("无可用优惠券"); - getApp().my_warnning("无可用优惠券", 0, this); - return; - } - var a = { - lid: this.data.coupon ? this.data.coupon.id : "0" - }; - wx.navigateTo({ - url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) - }); - }, - //检查区域是不是包邮 - check_area: function (arr) { - var user_addr = this.data.user_addr; - if (!user_addr) return 0; - for (var i in arr) { - var item = arr[i]; - if (user_addr.twon == item || user_addr.district == item - || user_addr.city == item || user_addr.province == item) { - return 0; - } - } - return 1; - }, - - //检查立即购买的商品是不是不包邮 - check_good: function (arr, goods_id) { - if (!goods_id) goods_id = this.data.goods.goods_id; - for (var i in arr) { - var item = arr[i]; - if (goods_id == item) return 0; - } - return 1; - }, - check_by_area: function (region_list) { - var arr = region_list.split(","); - var check = this.check_area(arr); - return !check; - }, - check_by_goods: function (goods_list, goods_id) { - var arr = goods_list.split(","); - var check = this.check_good(arr, goods_id); - return !check; - }, - enterAddressPage: function () { - getApp().globalData.is_cart_old = 1; - this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" - }); - }, - - //--------立即购买时，选择自提和物流----------- - setexptype_w: function (t) { - var th = this; - var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt; - th.setData({ [txt]: ty }); - var iszt = 1; - if (ty == 0) { - th.setData({ is_all_zt: 0 }); - } else { - for (var i = 0; i < th.data.cartlist.length; i++) { - var item = th.data.cartlist[i]; - if (item.exp_type == 0) { iszt = 0; break; } - } - th.setData({ is_all_zt: iszt }); - } - //----计算此时购物车的价格---- - th.calculatePrice(); - }, - - //--------立即购买时，选择自提和物流---------- - setexptype: function (t) { - var th = this; - var ty = t.currentTarget.dataset.t; - th.setData({ bn_exp_type: ty }); - //当物流为空的时候。 - if (ty == 0 && th.data.wu_arr == null) { - return th.get_wuliu(th.calculatePrice2()); - } - th.calculatePrice2() - console.log('setexptype'); - }, - - //--------立即购买时，使用余额-------- - set_bn_useyuer: function () { - var th = this; - th.setData({ bn_use_money: !th.data.bn_use_money }); - th.calculatePrice2(); - }, - set_js_useyuer: function () { - var th = this; - th.setData({ js_use_money: !th.data.js_use_money }); - th.calculatePrice(); - }, + console.log(str,"----"); - //-------------------计算物流--------------- - calculatewuliu: function (code, o_shipping_price, goods_weight, out_of_weight, - goods_piece, user_addr, freight_free, o_price, rs, pickid) { - var price = 0, th = this; - price += parseFloat(o_shipping_price); - //如果是包邮 - if (freight_free > 0 && o_price >= freight_free && out_of_weight >= 0) { return 0; } - if (user_addr == null) { return 0; } - //计算物流的config item; - var item = null; - //先根据 镇 县 区找计算的config - item = th.get_wuliu_config(user_addr.district, code, rs); - if (item == null) item = th.get_wuliu_config(user_addr.city, code, rs); - if (item == null) item = th.get_wuliu_config(user_addr.province, code, rs); - if (item == null) item = th.get_wuliu_default(code, rs); - if (item == null) return o_shipping_price; - var fw_price = 0, fp_price = 0; - item = item.config; - if (item == null) return o_shipping_price; - //------按重量---------- - if (goods_weight >= 0 && item['money']) { - fw_price = parseFloat(item['money']); - if (goods_weight > item['first_weight']) { - var fw = goods_weight - item['first_weight']; - var n = Math.ceil(fw / item['second_weight']) - fw_price = fw_price + n * parseFloat(item['add_money']); - } - } - //------超出重量---------- - if (out_of_weight < 0 && o_price >= freight_free && !th.data.is_no_by[pickid]) { - fw_price = parseFloat(item['money']); - var out_of_weight = Math.abs(out_of_weight); - if (out_of_weight > item['first_weight']) { - var fw = out_of_weight - item['first_weight']; - var n = Math.ceil(fw / item['second_weight']) - fw_price = fw_price + n * parseFloat(item['add_money']); - } - } - //------按件数---------- - if (goods_piece > 0) { - fp_price = parseFloat(item['piecemoney']); - if (goods_piece > item['first_piece']) { - var fp = goods_piece - item['first_piece']; - var m = Math.ceil(fp / item['second_piece']) - fp_price = fp_price + m * parseFloat(item['add_piecemoney']); - } - } - var rspice = parseFloat(price + fw_price + fp_price); - return rspice; - }, - - //------------循环获取config----------- - get_wuliu_config: function (region_id, code, rs) { - var item = null, rslist = rs.pageData; - for (var i = 0; i < rslist.length; i++) { - if (rslist[i].code == code && rslist[i].region_id == region_id) { item = rslist[i]; } - } - return item; - }, - //-------循环获取config,code default------- - get_wuliu_default: function (code, rs) { - var item = null, rslist = rs.pageData; - for (var i = 0; i < rslist.length; i++) { - if (rslist[i].shipping_code == code && rslist[i].is_default == 1) { item = rslist[i]; } - } - return item; - }, - - //----------立即购买，选择物流------------- - bindPickerChange: function (e) { - var ind = e.detail.value - this.setData({ index: ind }); - this.calculatePrice2(); - }, + wx.showLoading({ + title: "加载中" + }); + wx.request({ + url: oo.url + '/api/weshop/recharge/saveRecharge', + data: str, + method: 'POST', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + + wx.hideLoading(); + if (res.statusCode == 200) { + var data = res.data; + if (data.code == 0) { + th.data.order_id = data.data.order_id; + th.data.order_sn = data.data.order_sn; + + var order_amount = pdata.account; + //要进行判断，如果是用微信支付，就要跳转到支付界面 + if (order_amount > 0) { + th.setData({ isclose: 0 }); + getApp().request.post("/api/weshop/order/pay/createRechargeOrder", { + data: { + parentSn: data.data.order_sn, + store_id: oo.stoid + }, + success: function(su) { + + var n = su.data.data; + let order_id = data.data.order_id; + th.weixinPay(n, + function() { + // getApp().showWarning("购买成功"); + wx.showToast({ + title: '购买成功', + icon: 'success', + duration: 2000 + }); + setTimeout(function() { + wx.redirectTo({ + url: "/packageA/pages/serviceCard_pd/team_success/team_success?order_sn=" + data.data.order_sn + }); + }, 1000) + }, + function() { + getApp().showWarning("支付失败"); + setTimeout(function() { + wx.reLaunch({ + url: "/pages/user/order_list/order_list?index=2&tabindex=1", + }) + }, 1000) + }) + } + }) + } + } else { + th.data.is_summit_ing = 0; //是否提交中 + getApp().confirmBox(data.msg); + } + } else { + th.data.is_summit_ing = 0; //是否提交中 + console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); + } + }, + fail: function() { + th.data.is_summit_ing = 0; //是否提交中 + wx.hideLoading(); + console.log("index.js wx.request CheckCallUser fail"); + }, + complete: function() {} + }) - //----------购物车结算，选择物流------------- - bindPickerChange_w: function (e) { - var ind = e.detail.value, txt = e.currentTarget.dataset.txt; - this.setData({ [txt]: ind }); - this.calculatePrice(); }, - cart_set_err: function (e) { var txt = e.currentTarget.dataset.err; var ob = {}; @@ -947,70 +430,53 @@ Page({ this.setData(ob); }, - //// 开启物流的弹窗 - show_wu_arr: function (e) { - this.setData({ open_express: 1 }); - }, - - //更新下默认，在onshow里面 - update_code() { - var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - - var uii = setInterval(function () { - if (th.data.wu_arr) { - clearInterval(uii); - for (var k = 0; k < th.data.wu_arr.length; k++) { - var item = th.data.wu_arr[k]; - if (def_exp_code == item.code) { - m_wind = k; - } - } - //--如果是立即购买-- - th.setData({ index: m_wind, is_express: m_wind }); - } - }, 500) - }, + //------调起支付框-------- + weixinPay: function(n, success, fail) { + var th=this; + if (!n) return false; + wx.requestPayment({ + timeStamp: String(n.timeStamp), + nonceStr: n.nonceStr, + package: n.packageValue, + signType: n.signType, + paySign: n.paySign, + success: function(n) { + // console.log(n), getApp().showSuccess("支付成功！"); + wx.showToast({ + title: '支付成功', + icon: 'success', + duration: 2000 + }); + "function" == typeof success && success(); + }, + fail: function(n) { + console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : + "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n + .errMsg.substr("requestPayment:fail ".length)), + "function" == typeof fail && fail(); + } + }); + }, - // 关闭物流的弹窗 - close_express: function () { - this.setData({ open_express: 0 }); - }, - // 选择物流 - click_express_name: function (e) { - var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode; - var index = e.currentTarget.dataset.idxe; - var ob = { is_express: index, is_shipping_code: shippingcode, index: index }; - this.setData(ob); - }, + //订阅消息提醒 + sendsm: function(func) { + var template_id = this.data.template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + func(); + }, + fail(res) { + func(); + } + }) - //点击确定物流 - determine_expres: function (e) { - this.setData({ open_express: 0 }); - this.calculatePrice2(); - }, - //设置默认物流 - select_default_logistics: function () { - var th = this; - var is_shipping_code = this.data.is_shipping_code - getApp().request.put("/api/weshop/users/update", { - data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code }, - success: function (rse) { - if (rse.data.code == 0) { - getApp().globalData.userInfo.def_exp_code = is_shipping_code; - th.setData({ open_express: 0 }); - //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- - //if(th.data.is_b_now==1) th.calculatePrice2(); - //else th.calculatePrice(); - th.calculatePrice2(); - } - } - }) - }, + }, + go_to:function (e) { + var url=e.currentTarget.dataset.url; + getApp().goto(url); + } - //跳转到购买卡 - buycard: function () { - getApp().goto("/pages/user/plus/plus"); - getApp().globalData.plus_buy_back = 1; - } }); diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index d0ce6b0..6507234 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -15,7 +15,7 @@ Page({ requestData: null, allData: null, openFilterModal: !1, - baseUrl: "/api/weshop/goods/page?isnewwhere=1", + baseUrl: "/api/weshop/goods/page?1=1&isnewwhere=1", requestUrl: "", old_req_url:'', -- libgit2 0.21.4