diff --git a/app.js b/app.js index 95fab52..344cf4c 100644 --- a/app.js +++ b/app.js @@ -13,7 +13,7 @@ App({ config2: null, code: null, heigth:0, - user_id: 5682068,// 4379287,// null,// 5682068, + user_id: null,// 4379287,// null,// 5682068, buy_now:null, picklist:null, //门店列表 wuliuprice: null, //物流价格表 diff --git a/images/add2.png b/images/add2.png new file mode 100644 index 0000000..a192bb5 --- /dev/null +++ b/images/add2.png diff --git a/images/quanyi2.png b/images/quanyi2.png new file mode 100644 index 0000000..f10f332 --- /dev/null +++ b/images/quanyi2.png diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 52c0d37..dba5888 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -67,7 +67,7 @@ Page({ if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); } - that.setData({ store_config: e }); + that.setData({ store_config: e,is_do:1 }); if (that.data.is_show_pl) that.setData({ currentTab: 0 }); else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation(); } @@ -113,7 +113,7 @@ Page({ continue; } } - t.setData({ catelist: arr}); + t.setData({ catelist: arr}); } }); }, diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 81c0f84..ad2ec9a 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -90,7 +90,7 @@ - + 商家暂未设置分类 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 938b09d..34d4ccf 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1349,6 +1349,15 @@ Page({ return false; } + /*-- 还没有开始预热的也不显示 --*/ + if (t.data.data.show_time >now) { + ee.setData({ + prom_type: 0,isshow:1, + }); + ee.get_sku(os.stoid, ee.data.data.sku, 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"); @@ -1435,6 +1444,15 @@ Page({ return false; } + /*-- 还没有开始预热的也不显示 --*/ + if (t.data.data.show_time > now) { + ee.setData({ + prom_type: 0,isshow:1, + }); + ee.get_sku(os.stoid, ee.data.data.sku, gid); + return false; + } + //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中------- getApp().request.get("/api/weshop/order/page", { data: { @@ -2345,33 +2363,35 @@ Page({ //把画板内容绘制成图片，并回调 画板图片路径 context.draw(false, function () { - console.log('draw callback') - wx.canvasToTempFilePath({ - x: 0, y: 0, - width: 750, - height: 1217, - destWidth: 1.2 * 750 * 750 / that.data.screenWidth, - destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, - canvasId: 'share', - success: function (res) { - that.setData({ - shareImgPath: res.tempFilePath, canvasHidden: true - }) - if (!res.tempFilePath) { - wx.showModal({ - title: '提示', - content: '图片绘制中，请稍后重试', - showCancel: false - }) - return false; - } - wx.previewImage({ - //将图片预览出来 - urls: [that.data.shareImgPath] - }); - wx.hideLoading(); - } - }) + setTimeout(function () { + wx.canvasToTempFilePath({ + x: 0, y: 0, + width: 750, + height: 1217, + destWidth: 1.2 * 750 * 750 / that.data.screenWidth, + destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, + canvasId: 'share', + success: function (res) { + that.setData({ + shareImgPath: res.tempFilePath, canvasHidden: true + }) + if (!res.tempFilePath) { + wx.showModal({ + title: '提示', + content: '图片绘制中，请稍后重试', + showCancel: false + }) + return false; + } + wx.previewImage({ + //将图片预览出来 + urls: [that.data.shareImgPath] + }); + wx.hideLoading(); + } + }) + },200) + }); }); } diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 1909359..2da3d7f 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -139,7 +139,7 @@ - + ￥{{item.price}} 满{{item.rynum}}人 @@ -172,11 +172,7 @@ - - - 还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠 - 您已经享最低优惠 - + 还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠您已经享最低优惠 还差{{prom_act.ct_num - item.open_num}}人成团 剩余 diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 03dc3b3..0bc968b 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -831,7 +831,7 @@ left:31rpx;} .group .group-list .ghaicha { width:300rpx; font-size: 27rpx; - margin-left:100px; + margin-left:180rpx; top:13rpx; left:-3rpx; font-weight:600; diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 4112d61..f33037d 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -67,6 +67,7 @@ Page({ t +="&page=" + e.data.currentPage, a.request(t, function(t) { + e.setData({is_go:1}); e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), wx.stopPullDownRefresh(); }, diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index c1343a5..238f338 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -42,7 +42,7 @@ - + 没有相关的数据 去逛逛 diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js index f7ea9dc..b4bb2b2 100644 --- a/pages/team/team_ping/team_ping.js +++ b/pages/team/team_ping/team_ping.js @@ -156,7 +156,7 @@ Page({ }) //--正在进行中的团，才有时间倒计时-- - if(teamgroup.state==2) { + if(teamgroup && teamgroup.state==2) { order[i].kt_end_time = teamgroup.kt_end_time; //---如果参团的人数没有3个人，则要体现沙发--- order[i].tg_state = teamgroup.state; diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml index 9316426..3924083 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/pages/team/team_ping/team_ping.wxml @@ -80,10 +80,9 @@ - 邀请好友 - - 查看详情 - 查看详情 + 邀请好友 + 查看详情 + 查看详情 diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 1771f9b..f154eaf 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -40,7 +40,7 @@ Page({ teamgroup: null, //活动从表 goods: null, //商品数据 pindGoods: null, //拼单数据 - imageurl: "https://mshopimg.yolipai.net/", //有礼派图片地址 + imageurl: os.imghost, //有礼派图片地址 team_id: 0, //支付是否成功 listno: "", //订单编号 @@ -156,6 +156,8 @@ Page({ clist: function(e) { var i = e.currentTarget.dataset.end; var pick_id = e.currentTarget.dataset.pick_id; + var pick_dis = e.currentTarget.dataset.pick_dis; + this.setData({ end_name: i, pick_id: pick_id, @@ -163,8 +165,10 @@ Page({ qh: true, se: false, list: false, + pick_dis: pick_dis }) }, + //点击第一层 setchild: function(e) { var ind = e.currentTarget.dataset.bindex; @@ -649,6 +653,8 @@ Page({ //------去支付，购买------- go_pay:function () { var th=this; + if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th); + //----判断起购数---- var qnum=parseFloat(th.data.teamlist.minbuynum); if(qnum>0 && qnum>th.data.num ){ @@ -703,6 +709,8 @@ Page({ } break; } + newd['pick_dis'] = th.data.pick_dis; + s.set_b_now(newd); wx.navigateTo({ diff --git a/pages/team/team_show/team_show.json b/pages/team/team_show/team_show.json index 0aa78bf..1f536c0 100644 --- a/pages/team/team_show/team_show.json +++ b/pages/team/team_show/team_show.json @@ -5,5 +5,8 @@ "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#ffffff", "backgroundColor": "#eeeeee" + }, + "usingComponents": { + "warn": "/components/long_warn/long_warn" } } \ No newline at end of file diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index 9fb4b23..cb36f3f 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -136,8 +136,6 @@ - - 收起拼团列表 @@ -222,7 +220,9 @@ - + {{item.pickup_name}} @@ -281,4 +281,6 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 09d67bd..33ddf44 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -102,7 +102,10 @@ Page({ }, async init( order_sn) { - var goods_id = 0,//商品ID, + + wx.showLoading(); + + var goods_id = 0,//商品ID, pageteam=null,// original_img=null ,//商品图片 order=null,//订单编号 @@ -212,8 +215,10 @@ Page({ data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id } }).then(res => { teamgroup = res.data.data.pageData[0]; - var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); - teamgroup.buy_start_date=buy_start_date; + 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; + } }) @@ -222,7 +227,7 @@ Page({ if (teamlist.kttype == 3){ var js_data = JSON.parse(teamlist.ct_rylist); js_data.forEach(function (val,ind) { - if (num_0 还差 {{teamlist.ct_num-ordertx.length}}人成团,组团成功为您节省 - {{goods.market_price-teamlist.price}}元 + {{filters.toFix(goods.market_price-teamlist.price,2)}}元 拼团成功,为您节省 - {{goods.market_price-teamlist.price}}元 + {{filters.toFix(goods.market_price-teamlist.price,2)}}元 @@ -152,7 +152,7 @@ - +