From d045025c40bb7430447b9d68156152fd980cc030 Mon Sep 17 00:00:00 2001 From: F5VT98DI7XY4X12\Administrator <765199919@qq.com> Date: Wed, 4 Sep 2019 14:15:59 +0800 Subject: [PATCH] 拼团列表，参团，购物车 --- pages/cart/cart2/cart2.js | 3 ++- pages/team/team_ping/team_ping.js | 65 ++++++++++++++++++++++++----------------------------------------- pages/team/team_ping/team_ping.wxml | 3 +-- pages/team/team_ping/team_ping.wxss | 7 ++----- pages/team/team_show/team_show.js | 2 ++ 5 files changed, 31 insertions(+), 49 deletions(-) diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index ead433a..6529af5 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -121,8 +121,8 @@ Page({ func(item); } }); - }, + //----------------展示页面,是再获取用户信息之后-------------- show_page:function(){ var th=this,ta = this.data.param; @@ -306,6 +306,7 @@ Page({ switch (gd.prom_type){ case 0: + case 6: //--此时开始计算商品的使用券相关,如果有等级价还要计算和等级价相关的, // 如果有优惠促销，还要把促销的部分计算在内，因为促销还有不能使用优惠券-- diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js index b4bb2b2..aa8975b 100644 --- a/pages/team/team_ping/team_ping.js +++ b/pages/team/team_ping/team_ping.js @@ -90,34 +90,34 @@ Page({ order_goods=null;//订单商品表 //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 + /*--- await getApp().request.promiseGet("/api/weshop/order/page?"+where, { data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} }).then(res => { order = res.data.data.pageData; this.data.currentPage++; + })--*/ + + await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, { + data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} + }).then(res => { + order = res.data.data.pageData; + this.data.currentPage++; }) + wx.showLoading({ title: "加载中"}); for (i = 0; i < order.length; i++) { //获取订单从表信息 - await getApp().request.promiseGet("/api/weshop/ordergoods/page", { + await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data: { store_id: os.stoid, order_id: order[i].order_id } }).then(res => { order_goods = res.data.data.pageData; order[i].order_goods = order_goods; + order[i].gimage = ee.data.imageurl + order_goods[0].original_img; }) - for (var j = 0; j < order_goods.length;j++){ - //获取商品表信息 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + order_goods[j].goods_id, { - data: {} - }).then(res => { - goods = res.data.data; - order[i].goods = goods; - order[i].original_img = this.data.imageurl + goods.original_img; - }) - } - + //获取订单表信息根据上面查询的订单号order[i].pt_listno await getApp().request.promiseGet("/api/weshop/order/pagePtList", { data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} @@ -128,43 +128,19 @@ Page({ order[i].tx=ordertx; }) - var teamlist=null; - //获取团的信息 - await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + order[i].pt_prom_id,{ - 1:1 - }).then(res=>{ - teamlist=res.data.data; - order[i].ct_num=teamlist.ct_num; - }) + - if (teamlist.kttype == 3) { + if (order[i].is_zsorder== 4) { var num = 0; - var jt_data = JSON.parse(teamlist.ct_rylist); + var jt_data = JSON.parse(order[i].ct_rylist); for (var m in jt_data) { if (jt_data[m].rynum > num) num = jt_data[m].rynum; } order[i].max_ct_num = num; } - - var teamgroup=null; - //获取活动从表信息team_id:305暂时 - await getApp().request.promiseGet("/api/weshop/teamgroup/page" , { - data: { store_id: os.stoid, listno: order[i].pt_listno, team_id: order[i].pt_prom_id } - }).then(res => { - teamgroup = res.data.data.pageData[0]; - }) - - //--正在进行中的团，才有时间倒计时-- - if(teamgroup && teamgroup.state==2) { - order[i].kt_end_time = teamgroup.kt_end_time; - //---如果参团的人数没有3个人，则要体现沙发--- - order[i].tg_state = teamgroup.state; - - } - - var sf_num=teamlist.ct_num; - if(teamlist.ct_num>=3){ sf_num=3;} + var sf_num = order[i].ct_num; + if (order[i].ct_num>=3){ sf_num=3;} sf_num=sf_num-ordertx.length; if(sf_num>0) { var arr = []; @@ -245,6 +221,13 @@ Page({ return param < 10 ? '0' + param : param; }, + images_err:function(e){ + var txt = e.currentTarget.dataset.err; + var ob={}; + ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + } + }) diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml index 3924083..decccf5 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/pages/team/team_ping/team_ping.wxml @@ -22,13 +22,12 @@ - + {{item.goods.goods_name}} - diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss index 306a2c3..2d9dc1c 100644 --- a/pages/team/team_ping/team_ping.wxss +++ b/pages/team/team_ping/team_ping.wxss @@ -338,11 +338,8 @@ margin-bottom:40rpx; color: #e4374d; border-radius: 7rpx; font-size: 25rpx; - - letter-spacing:4; -margin-right:8rpx; - - + margin-right:8rpx; + line-height: 46rpx } .xc-price-sn{ height:73rpx; diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index f154eaf..9675390 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -684,6 +684,8 @@ Page({ pick_id: th.data.pick_id, user_id: oo.user_id, store_id: th.data.stoid, + goods_name: th.data.goods.goods_name, + goods_sn: th.data.goods.goods_sn, }; //-----拼团----- newd.goods_price = th.data.teamlist.price; -- libgit2 0.21.4