From 682f2146a63407cbd2e73eb5ea4235ff7f09b195 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Sat, 9 Apr 2022 10:09:52 +0800 Subject: [PATCH] 服务卡拼团的排版 --- packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml | 141 --------------------------------------------------------------------------------------------------------------------------------------------- packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml | 122 -------------------------------------------------------------------------------------------------------------------------- packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml | 143 ----------------------------------------------------------------------------------------------------------------------------------------------- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js | 634 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml | 148 ---------------------------------------------------------------------------------------------------------------------------------------------------- 5 files changed, 300 insertions(+), 888 deletions(-) delete mode 100644 packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml delete mode 100644 packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml delete mode 100644 packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml deleted file mode 100644 index 0d15a59..0000000 --- a/packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - {{sele_g.goods_name}} - - ￥ - - {{sele_g[card_field]}} - {{sele_g.shop_price}} - - - - 已售：{{sele_g.sales_sum}} - - 可售：{{def_pick_store.CanOutQty}} - 可售:0 - - 可售：{{sele_g.store_count}} - - - - - - - - - - {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - 更多门店 - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - 购买数量 - - - - - + - - - - - - - - 再买{{hui_condition.need}} - ，免{{hui_condition.money}}元 - ，打{{hui_condition.sale}}折 - ，包邮 - ，送{{hui_condition.intValue}}积分 - ，送优惠券 - ，送赠品 - ，送礼包 - ，送专享礼包 - - - - - - - - - 配送不匹配 - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - - 加入购物车 - 立即购买 - - - - - - - - - - - - - \ No newline at end of file diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml deleted file mode 100644 index 04b58fb..0000000 --- a/packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - {{data.goods_name}} - - - {{prom_integral}}积分 - + - {{prom_price}}元 - 0积分 - - - - - - 已售：{{prom_act.buy_num+prom_act.virtual}} - 可售：{{prom_act.limitqty-prom_act.buy_num}} - - - - - - - - - {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - 更多门店 - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - 购买数量 - - - - - + - - - - - - - - - 配送不匹配 - - - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - 立即兑换 - - - - - - - - - - - - - \ No newline at end of file diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml deleted file mode 100644 index 9449d8b..0000000 --- a/packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - {{sele_g.goods_name}} - - ￥ - - {{sele_g[card_field]}} - {{sele_g.shop_price}} - - - - 已售：{{sele_g.sales_sum}} - - 可售：{{def_pick_store.CanOutQty}} - 可售:0 - - 可售：{{sele_g.store_count}} - - - - - - - - - - {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - 更多门店 - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - 购买数量 - - - - - + - - - - - - - - 再买{{hui_condition.need}} - ，免{{hui_condition.money}}元 - ，打{{hui_condition.sale}}折 - ，包邮 - ，送{{hui_condition.intValue}}积分 - ，送优惠券 - ，送赠品 - ，送礼包 - ，送专享礼包 - - - - - - - - - - 配送不匹配 - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - - 加入购物车 - 立即购买 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 22619cd..116900e 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -1,16 +1,8 @@ -var t = require("../../../../utils/util.js"), - ut = t, - e = require("../../../../utils/common.js"), +var ut = require("../../../../utils/util.js"), a = require("../../../../utils/wxParse/wxParse.js"), - s = getApp(), - i = s.request, - rq = i, - oo = s.globalData, - o = s.globalData.setting, - os = o; - -let self = null; - + e = require("../../../../utils/common.js"), + oo = getApp().globalData, + os = oo.setting; //评价加载更多 var more = function(e) { return e && e.__esModule ? e : { @@ -18,7 +10,6 @@ var more = function(e) { }; }(require("../../../../utils/LoadMore.js")), n = new more.default(); -var utils = require('../../../../utils/util.js'); var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ @@ -27,14 +18,12 @@ Page({ color_type: 0, //线条控制 color_type_one: 0, color_type_two: 1, - gid: "", - stoid: o.stoid, - url: o.url, - resourceUrl: o.h5_url, //公众号那边的图片文件域名 - iurl: o.imghost, - defaultAvatar: o.resourceUrl + "/static/images/user68.jpg", - + stoid: os.stoid, + url: os.url, + resourceUrl: os.h5_url, //公众号那边的图片文件域名 + iurl: os.imghost, + data: null, content: "", //商品详情 @@ -114,7 +103,7 @@ Page({ is_sec_mend: 0, sto_sele_name: "", //选中的门店名称 sto_sele_id: "", //选中的门店id - sto_sele_keyid:'', //选中的门店线下 + sto_sele_keyid:'', //选中的门店线下 sto_sele_distr: "", //选择的门店的配送方式 is_show_sto_cat: 1, //是否显示门店分类 only_pk: null, @@ -130,7 +119,6 @@ Page({ mobile: '', //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 timer: [], - //商品的购买次数 prom_buy_num: -1, g_buy_num: null, @@ -199,7 +187,7 @@ Page({ is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 sales_rules:1, //默认是线上销售 - wait_for_user_store:null, + wait_for_user_store:null, poster:null, //自定义海报 share_b_img:'', //自定义分享的背景 showPoster: false, @@ -209,19 +197,14 @@ Page({ // 秒杀 prom_st: null, prom_r_null: 0, - hiddenCS: true, //控制客服操作菜单显示和控制 - openSpecModal_flash_normal: 0, }, //------初始化加载---------- onLoad: function(t) { self = this; - - this.setData({ - options: t, - }); + this.setData({ options: t,}); var ee = this, that = ee, @@ -265,11 +248,11 @@ Page({ if(gid_str.length>1){ first_leader=gid_str[1]; } - //-- 如果有room_id的获取 -- - if(gid_str.length>2 && gid_str[2]) { - room_id=gid_str[2]; - room_user_share=1; - }; + //-- 如果有room_id的获取 -- + if(gid_str.length>2 && gid_str[2]) { + room_id=gid_str[2]; + room_user_share=1; + }; }; ee.setData({ gid: gid}); @@ -315,7 +298,7 @@ Page({ is_show_gb: 1 }); } - // console.log(e); + var json_d = JSON.parse(e.switch_list); ee.setData({ store_config: e, @@ -331,38 +314,7 @@ Page({ th.requestCardNum(), wx.pageScrollTo && th.setData({ supportPageScroll: !0 }); - - //计算等级价相关 - // var swithc_list = e.switch_list; - // var sw_arr = JSON.parse(swithc_list); - // //---如果后台又开等级卡的开关--- - // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - // th.setData({ rank_switch: true }); - // //---回调卡的列表--- - // th.getPlusCardType(function (ob) { - // th.setData({ card_list: ob.card_list }); - // var ti = setInterval(function () { - // var user = getApp().globalData.userInfo; - // if (!user) return false; - // clearInterval(ti); - // if (user.card_field && user['card_expiredate']) { - // var str = user['card_expiredate'].replace(/-/g, '/'); - // var end = new Date(str); - // end = Date.parse(end) / 1000; - // var now = ut.gettimestamp(); - // //--- 判断是等级会员，且在有效期范围内 --- - // if (user.card_field && now < end) { - // var card_name = ob.name_map.get(user.card_field); - // //if(card_name.length>6) card_name=card_name.substring(0,6); - - // var is_near_date = 0; - // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 - // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); - // } - // } - // }, 500) - // }) - // } + }, 1); @@ -637,24 +589,8 @@ Page({ } }; - this.getTaohe(); - - // if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) { - // //----获取详情页的券的数量---- - // await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", { - // data: { - // store_id: os.stoid, - // type: 1, - // pageSize: 3, - // page: 1, - // is_share: 0, - // }, - // }).then(res1 => { - // fir_quan = res1.data.data.pageData; - // }) - // } - - + this.getTaohe(); + //this.getHistoryBuy(); //获取历史购买 ee.setData({ is_collect: is_collect, @@ -671,17 +607,16 @@ Page({ // gid 在onload阶段已经保存在this.data中 onShow: function() { - getApp().check_can_share(); - + getApp().check_can_share(); var that=this; var ee = this,gid = this.data.gid, i = getApp().request; this.data.is_timer = 1; - this.wait_for_store_config(); + this.wait_for_store_config(); - i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, { + i.get("/api/weshop/serviceCard/get/" + os.stoid + "/" + ee.data.gid, { failRollback: !0, success: function(t) { if (t.data.code == 0) { @@ -733,7 +668,7 @@ Page({ //获取重表 getApp().promiseGet("/api/weshop/serviceItem/list",{ - data:{store_id:o.stoid,service_id:t.data.data.id} + data:{store_id:os.stoid,service_id:t.data.data.id} }).then(res=>{ if(res.data.code==0){ var list=res.data.data; @@ -1256,33 +1191,6 @@ Page({ }; - - - - - - - - - - - - // var e = th.data.sele_g.goods_num; - // var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 - // if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { - // if (!th.data.def_pick_store) { - // wx.showModal({title: '请选择门店',}); - // return false; - // } else { - // e = th.data.def_pick_store.CanOutQty; - // } - // } - - - // th.setData({goodsInputNum: t}); - - // }); - }, @@ -1335,7 +1243,7 @@ Page({ t.data.is_collect_load=1; if (t.data.is_collect == 1) { //删除收藏 - i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, { + i.delete("/api/weshop/goodscollect/del/" + os.stoid + "/" + t.data.collect_id, { success: function(e) { t.data.is_collect_load=0; if (e.data.code == 0) { @@ -1352,7 +1260,7 @@ Page({ var d = { goods_id: t.data.data.goods_id, user_id: s.globalData.user_id, - store_id: o.stoid, + store_id: os.stoid, add_time: timestamp, type: 1, }; @@ -1432,27 +1340,21 @@ Page({ var t = this; getApp().request.get("/api/weshop/cart/page", { data: { - store_id: o.stoid, - user_id: s.globalData.user_id, + store_id: os.stoid, + user_id: getApp().globalData.user_id, state:0, is_gift:0 }, success: function(e) { - var num = 0; - for (var i = 0; i < e.data.data.pageData.length; i++) { - num += e.data.data.pageData[i].goods_num; - } - - /*-- - t.setData({ - cartGoodsNum: num - });--*/ - + var num = 0; + for (var i = 0; i < e.data.data.pageData.length; i++) { + num += e.data.data.pageData[i].goods_num; + } //-- 读取服务卡的数量 -- getApp().promiseGet("/api/weshop/cartService/page",{ data:{ - store_id: s.globalData.setting.stoid, - user_id: s.globalData.user_id, + store_id: os.stoid, + user_id: getApp().globalData.user_id, } }).then(res=>{ for (var i = 0; i < res.data.data.pageData.length; i++) { @@ -1547,7 +1449,7 @@ Page({ var i = getApp().request; if (!th.data.data) return false; var dd= { - store_id: o.stoid, + store_id: os.stoid, isstop: 0, is_pos: 1, pageSize: 2000 @@ -1637,7 +1539,7 @@ Page({ if (e.data.data.total > 10 && e.his_cate_num) { getApp().request.get("/api/weshop/storagecategory/page", { data: { - store_id: o.stoid, + store_id: os.stoid, pageSize: 1000, orderField:"sort", orderType:'asc', @@ -2693,7 +2595,7 @@ Page({ - var store_id = o.stoid; + var store_id = os.stoid; var user_id = getApp().globalData.user_id; var def_pickup_id = item.pickup_id; @@ -2958,7 +2860,7 @@ Page({ wx.showLoading(); var req_where = { - store_id: o.stoid, pageSize: 5, is_show: 1, + store_id: os.stoid, pageSize: 5, is_show: 1, parent_id: 0, goods_id: th.data.gid, commenttype: tp, service_id: this.data.gid, } @@ -3003,7 +2905,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", { data: { - store_id: o.stoid, + store_id: os.stoid, parent_id: ep.comment_id, service_id: this.data.gid, } @@ -3044,7 +2946,7 @@ Page({ app.request.post("/api/weshop/serviceCommentZan/save", { data: { - store_id: o.stoid, + store_id: os.stoid, user_id: app.globalData.user_id, goods_id: th.data.gid, service_id: th.data.gid, @@ -3187,15 +3089,11 @@ Page({ }; }); }, - - - - + //---小于10的格式化函数---- - // timeFormat(param) { - // return param < 10 ? '0' + param : param; - // }, - + timeFormat(param) { + return param < 10 ? '0' + param : param; + }, //----倒计时函数----- countDown(time, prom_st) { if (!this.data.is_timer) return false; @@ -3265,13 +3163,12 @@ Page({ prom_type: 0, isshow: 1, }); - // this.get_sku(os.stoid, this.data.data, gid); + this.get_sku(os.stoid, this.data.data, gid); this.get_sto(); - // this.check_is_youhui(gid, 1); + this.check_is_youhui(gid, 1); this.data.is_normal = 1; }, - - + //获取redis中的数量 async getactLen() { let prom_type = this.data.options.prom_type; @@ -3286,167 +3183,199 @@ Page({ }; }) }, - - - - - //--------检查是否活动，活动是否开始，或者是否结束------- - async check_prom(gid, prom_type, prom_id) { - var ee = this, th = ee; - var user_id = getApp().globalData.user_id; - if (!user_id) user_id = 0; - - if (prom_type == 1 && prom_id == 0) { - this.setData({ - prom_type: 0, isshow: 1, - }); - - //获取门店 - this.get_sto(); - // this.get_sku(o.stoid, this.data.data, gid); - this.check_has_flash(); - this.data.is_normal = 1; - // this.check_is_youhui(gid, 1); - return false; - } - - //---判断秒杀---- - if (prom_type == 1 && prom_id > 0) { - //-------判断活动是否抢光--------- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { - 1: 1 - }).then(res => { - var em = res; - if (em.data.code == 0) { - - if (em.data.data <= 0) { - th.setData({ - prom_r_null: 1, - goodsInputNum: res.data.data, - }); - - // th.setData({goodsInputNum: redis_num}) - }; - //拿取价格并且判断时间-- - getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, { - success: function (t) { - th.setData({ - sele_g: t.data.data, - }); - - if (t.data.code != 0) { - ee.get_normal(gid); - return false; - } - //----已经结束----- - if (t.data.data.is_end == 1) { - ee.get_normal(gid); - return false; - } - //----已经过期----- - var now = ut.gettimestamp(); - if (t.data.data.end_time < now) { - ee.get_normal(gid); - return false; - } - /*-- 还没有开始预热的也不显示 --*/ - if (t.data.data.show_time > now) { - ee.get_normal(gid); - return false; - } - - var t_gd = ee.data.data; - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); - - ee.setData({ - prom_price: t.data.data.user_price, - prom_type: 1, - prom_id: prom_id, - prom_buy_limit: t.data.data.buy_limit, - prom_act: t.data.data, - prom_end_time: prom_end_time, - prom_start_time: prom_start_time, - isshow: 1, - }); - - ee.get_sto(); - var newTime = ut.gettimestamp(); - var endTime2 = t.data.data.end_time; - var endTime1 = t.data.data.start_time; - if (endTime1 > newTime) { - ee.setData({ - prom_time_text: '距秒杀开始还有', - prom_st: 0, - }) - ee.countDown(endTime1, 0); - } else { - if (endTime2 > newTime) { - ee.setData({ - prom_time_text: '距秒杀结束还有', - prom_st: 1 - }) - ee.countDown(endTime2); - } - } - - //如果是进行中的话 - if (endTime1 < newTime) { - //-- 获取秒杀活动的多少规格 -- - ee.get_more_flash(function (list) { - if (list && list.length > 1) { - - var n_item = list[0]; - var ind = list.findIndex(function (ele) { - return ele.goods_id == ee.data.data.goods_id; - }) - if (ind < 0) return false; - if (ind > 0) { - n_item = JSON.parse(JSON.stringify(list[ind])); - list.splice(ind, 1); - list.unshift(n_item); - } - - ee.data.sele_g.viplimited = n_item.viplimited; - ee.data.data.viplimited = n_item.viplimited; - - var gb = 1; - //-- 显示多规格 -- - for (let i in list) { - let item = list[i]; - var gg = ""; - if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; - if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; - - if (item.goods_spec != "" && item.goods_color != "") { - gg = item.goods_spec + "/" + item.goods_color; - } else if (item.goods_spec != "" || item.goods_color != "") { - gg = item.goods_spec + item.goods_color; - } else { - gg = "规格" + gb; - gb++; - } - item.gg = gg; - item.prom_id = item.prom_id; - item.prom_type = 1; - } - - ee.setData({ - sku_g: list, - }); - - } - }) - } - - } - }); - } - }) - } - - }, - + + + + //--------检查是否活动，活动是否开始，或者是否结束------- + async check_prom(gid, prom_type, prom_id) { + var ee = this, th = ee; + var user_id = getApp().globalData.user_id; + if (!user_id) user_id = 0; + //-------判断活动是否抢光--------- + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + prom_id, { + 1: 1 + }).then(res => { + var em = res; + var flag = null; + if (em.data.code == 0) { + if (em.data.data <= 0) ee.setData({ + prom_r_null: 1 + }); + //拿取价格并且判断时间-- + getApp().request.get("/api/weshop/teamlist/get/" + + os.stoid + "/" + prom_id, { + success: async function (t) { + if (t.data.code != 0) { + ee.get_normal(gid); + return false; + } + //----已经结束----- + if (t.data.data.is_end == 1) { + ee.get_normal(gid); + return false; + } + //----已经过期----- + var now = ut.gettimestamp(); + if (t.data.data.end_time < now) { + ee.get_normal(gid); + return false; + } + + /*-- 还没有开始预热的也不显示 --*/ + if (t.data.data.show_time > now) { + ee.get_normal(gid); + return false; + } + + /*-- 判断拼单是否启用 --*/ + if (!t.data.data.is_show) { + console.log('没启用'); + wx.setNavigationBarTitle({ + title: '系统提示', + }); + wx.showToast({ + title: '此商品暂时没有拼单活动', + icon: 'none', + success(){ + setTimeout(() => { + wx.navigateBack() + }, 2000) + } + }); + return false + } + + //判断拼团的---会员身份-- + await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { + data: { + store_id: os.stoid, + is_end: 0, + is_show: 1, + user_id: getApp().globalData.user_id, + pageSize: 1000 + } + }).then(res => { + let pd_list = res.data.data.pageData; + if (res.data.code == 0 && pd_list.length > 0) { + flag = pd_list.some(pd => { + return pd.goods_id == gid + }) + } + }) + if (!flag) { + ee.get_normal(gid); + return false; + + } + //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中------- + await getApp().request.promiseGet("/api/weshop/order/page", { + data: { + pt_prom_id: prom_id, + user_id: oo.user_id, + store_id: os.stoid, + pageSize: 1, + page: 1 + } + }).then(e => { + if (e.data.code == 0 && e.data.data.pageData.length > 0) { + var odr = e.data.data.pageData[0]; + th.data.buy_order = odr; + if (odr.pt_status == 0 && odr.order_status == 1) { + th.setData({ + user_order_pt_state: 1 + }); + } + if (odr.pt_status == 1 && odr.order_status == 1) { + if (odr.is_zsorder == 4) { + getApp().request.promiseGet("/api/weshop/teamgroup/page/", { + data: { + store_id: os.stoid, + team_id: odr.pt_prom_id, + listno: odr.pt_listno + } + }).then(res => { + var now = ut.gettimestamp(); + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var tgr = res.data.data.pageData[0]; + //如果团的时间已经到了 + if (now >= tgr.kt_end_time) { + th.update_jiti(tgr.id); + } else { + th.setData({ + user_order_pt_state: 2 + }); + } + } + }) + + } else { + th.setData({ + user_order_pt_state: 2 + }); + } + } + + if (odr.pt_status == 2 && odr.is_zsorder == 4) { + th.setData({ + user_order_pt_state: 3, + }); + th.data.wk_order_id = odr.order_id; + } + } + }) + + //----------查看阶梯团------------ + if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) { + t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); + var max_num = 0; + t.data.data.ct_rylist.forEach(function (val, ind) { + if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum); + }) + t.data.data.max_ct_num = max_num; + } + + var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); + var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); + + ee.setData({ + prom_price: t.data.data.price, + prom_type: 6, + prom_id: prom_id, + prom_buy_limit: t.data.data.buy_limit, + prom_act: t.data.data, + prom_end_time: prom_end_time, + prom_start_time: prom_start_time, + isshow: 1, + }); + + ee.get_sto(); + + var newTime = now; + var endTime2 = t.data.data.end_time; + var endTime1 = t.data.data.start_time; + + if (endTime1 > newTime) { + ee.setData({ + prom_time_text: '距拼单开始还剩:' + }) + ee.countDown(endTime1, 0); + } else { + if (endTime2 > newTime) { + ee.setData({ + prom_time_text: '距拼单结束还剩:', + prom_st: 1 + }) + ee.countDown(endTime2); + } + } + //-------查看有多少人在开这个团------- + th.get_team_group(prom_id); + } + }); + } + }) + + }, viewFlash(e) { @@ -3657,7 +3586,7 @@ Page({ // this.setData({openSpecModal_flash_normal: 1}); // } else { // th.get_sto(1); - // th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + // th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () { // th.setData({ // openSpecModal_flash_normal: 1 // }); @@ -4057,8 +3986,7 @@ Page({ } } } - - //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); + if ("add" == t.currentTarget.dataset.action) { if (th.data.prom_goods) { @@ -4203,8 +4131,7 @@ Page({ th.buyNow(newd); } }, - - + click_contact:function () { getApp().globalData.no_clear=1; }, @@ -4236,9 +4163,7 @@ Page({ hiddenCS: true, }); }, - - - + //--点击弹起拼单-- openSpecModel_pt: function (e) { @@ -4274,7 +4199,7 @@ Page({ }); } else { th.get_sto(1); - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () { th.setData({ is_normal: ind, openSpecModal_pt: 1 @@ -4342,22 +4267,63 @@ Page({ }) } }, - - - - - - - - - + //--获取有多少人在开团-- + async get_team_group(prom_id) { + var teamgroup = [], + th = this, + grounp_tatal = 0; + //如果活动是开团不是商家团 + if (this.data.prom_act.kttype > 1) { - - - + var req_data = { + store_id: os.stoid, + pageSize: 3, + page: 1, + state: 2, + team_id: prom_id, + ordernum: 1 + }; + + if (this.data.prom_act.kttype == 3 && this.data.prom_act.max_ct_num) { + req_data.max_num = this.data.prom_act.max_ct_num; + } + + //获取活动从表信息team_id + await getApp().request.promiseGet("/api/weshop/teamgroup/page", { + data: req_data + }).then(res => { + teamgroup = res.data.data.pageData; + grounp_tatal = res.data.data.total; + }) + //获取订单的总数这个接口不能用 + for (i = 0; i < teamgroup.length; i++) { + await getApp().request.promiseGet("/api/weshop/order/page", { + data: { + store_id: os.stoid, + pt_status: 1, + pt_listno: teamgroup[i].listno + } + }).then(res => { + var order = res.data.data.pageData; + teamgroup[i].open_num = order.length; + }) + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => { + var user = res.data.data; + teamgroup[i].user = user; + }) + } + + if (teamgroup.length > 0) { + th.setData({ + teamgroup: teamgroup, + grounp_tatal: grounp_tatal + }); + th.countDown2(); + } + } + }, - }); diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml index 885811b..063418c 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml @@ -751,154 +751,6 @@ - - - - -- libgit2 0.21.4