wxd / MShopWeApp

Commit 5c8a96669d11c0bbe210fde7604e7d787ce993d1

Authored by F5VT98DI7XY4X12\Administrator
1 parent 7baf03f1

燕云测试的10点bug修复

Inline Side-by-side
Showing 14 changed files with 111 additions and 79 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @5c8a966
... ... @@ -1349,6 +1349,15 @@ Page({
1349 1349 return false;
1350 1350 }
1351 1351  
  1352 + /*-- 还没有开始预热的也不显示 --*/
  1353 + if (t.data.data.show_time >now) {
  1354 + ee.setData({
  1355 + prom_type: 0,isshow:1,
  1356 + });
  1357 + ee.get_sku(os.stoid, ee.data.data.sku, gid);
  1358 + return false;
  1359 + }
  1360 +
1352 1361 var t_gd = ee.data.data;
1353 1362 var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
1354 1363 var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
... ... @@ -1435,6 +1444,15 @@ Page({
1435 1444 return false;
1436 1445 }
1437 1446  
  1447 + /*-- 还没有开始预热的也不显示 --*/
  1448 + if (t.data.data.show_time > now) {
  1449 + ee.setData({
  1450 + prom_type: 0,isshow:1,
  1451 + });
  1452 + ee.get_sku(os.stoid, ee.data.data.sku, gid);
  1453 + return false;
  1454 + }
  1455 +
1438 1456 //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
1439 1457 getApp().request.get("/api/weshop/order/page", {
1440 1458 data: {
... ... @@ -2345,33 +2363,35 @@ Page({
2345 2363  
2346 2364 //把画板内容绘制成图片，并回调 画板图片路径
2347 2365 context.draw(false, function () {
2348   - console.log('draw callback')
2349   - wx.canvasToTempFilePath({
2350   - x: 0, y: 0,
2351   - width: 750,
2352   - height: 1217,
2353   - destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
2354   - destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
2355   - canvasId: 'share',
2356   - success: function (res) {
2357   - that.setData({
2358   - shareImgPath: res.tempFilePath, canvasHidden: true
2359   - })
2360   - if (!res.tempFilePath) {
2361   - wx.showModal({
2362   - title: '提示',
2363   - content: '图片绘制中，请稍后重试',
2364   - showCancel: false
2365   - })
2366   - return false;
2367   - }
2368   - wx.previewImage({
2369   - //将图片预览出来
2370   - urls: [that.data.shareImgPath]
2371   - });
2372   - wx.hideLoading();
2373   - }
2374   - })
  2366 + setTimeout(function () {
  2367 + wx.canvasToTempFilePath({
  2368 + x: 0, y: 0,
  2369 + width: 750,
  2370 + height: 1217,
  2371 + destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
  2372 + destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
  2373 + canvasId: 'share',
  2374 + success: function (res) {
  2375 + that.setData({
  2376 + shareImgPath: res.tempFilePath, canvasHidden: true
  2377 + })
  2378 + if (!res.tempFilePath) {
  2379 + wx.showModal({
  2380 + title: '提示',
  2381 + content: '图片绘制中，请稍后重试',
  2382 + showCancel: false
  2383 + })
  2384 + return false;
  2385 + }
  2386 + wx.previewImage({
  2387 + //将图片预览出来
  2388 + urls: [that.data.shareImgPath]
  2389 + });
  2390 + wx.hideLoading();
  2391 + }
  2392 + })
  2393 + },200)
  2394 +
2375 2395 });
2376 2396 });
2377 2397 }
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @5c8a966
... ... @@ -139,7 +139,7 @@
139 139 <!----显示价格,阶梯团---->
140 140 <block wx:if="{{prom_act.kttype==3}}">
141 141 <view class="jie_price flex">
142   - <view style='margin-right:75rpx' wx:for="{{prom_act.ct_rylist}}">
  142 + <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}">
143 143 <view class="fs35 word-color">
144 144 <text class="fs24">￥</text>{{item.price}}</view>
145 145 <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view>
... ... @@ -172,11 +172,7 @@
172 172 <!--//还差几人，剩余时间-->
173 173 <view class="rel">
174 174 <view class='ghaicha ellipsis-2 abs'>
175   - <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
176   - <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
177   - 还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text>
178   - <text wx:else>您已经享最低优惠</text>
179   - </text>
  175 + <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"><text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text><text wx:else>您已经享最低优惠</text></text>
180 176 <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text>
181 177 <view class="t_show">
182 178 剩余
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @5c8a966
... ... @@ -831,7 +831,7 @@ left:31rpx;}
831 831 .group .group-list .ghaicha {
832 832 width:300rpx;
833 833 font-size: 27rpx;
834   - margin-left:100px;
  834 + margin-left:180rpx;
835 835 top:13rpx;
836 836 left:-3rpx;
837 837 font-weight:600;
... ...
pages/team/team_ping/team_ping.js
  View file @5c8a966
... ... @@ -156,7 +156,7 @@ Page({
156 156 })
157 157  
158 158 //--正在进行中的团，才有时间倒计时--
159   - if(teamgroup.state==2) {
  159 + if(teamgroup && teamgroup.state==2) {
160 160 order[i].kt_end_time = teamgroup.kt_end_time;
161 161 //---如果参团的人数没有3个人，则要体现沙发---
162 162 order[i].tg_state = teamgroup.state;
... ...
pages/team/team_ping/team_ping.wxml
  View file @5c8a966
... ... @@ -80,10 +80,9 @@
80 80 </view>
81 81  
82 82 <view class='C'>
83   - <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view>
84   -
85   - <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
86   - <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view>
  83 + <view class='yao' wx:if="{{item.pt_status==1}}">邀请好友</view>
  84 + <view class='s_and_f' wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">查看详情</view>
  85 + <view class='s_and_f' wx:if="{{item.pt_status==3}}">查看详情</view>
87 86 </view>
88 87  
89 88 </view>
... ...
pages/team/team_show/team_show.js
  View file @5c8a966
... ... @@ -40,7 +40,7 @@ Page({
40 40 teamgroup: null, //活动从表
41 41 goods: null, //商品数据
42 42 pindGoods: null, //拼单数据
43   - imageurl: "https://mshopimg.yolipai.net/", //有礼派图片地址
  43 + imageurl: os.imghost, //有礼派图片地址
44 44 team_id: 0, //支付是否成功
45 45 listno: "", //订单编号
46 46  
... ... @@ -156,6 +156,8 @@ Page({
156 156 clist: function(e) {
157 157 var i = e.currentTarget.dataset.end;
158 158 var pick_id = e.currentTarget.dataset.pick_id;
  159 + var pick_dis = e.currentTarget.dataset.pick_dis;
  160 +
159 161 this.setData({
160 162 end_name: i,
161 163 pick_id: pick_id,
... ... @@ -163,8 +165,10 @@ Page({
163 165 qh: true,
164 166 se: false,
165 167 list: false,
  168 + pick_dis: pick_dis
166 169 })
167 170 },
  171 +
168 172 //点击第一层
169 173 setchild: function(e) {
170 174 var ind = e.currentTarget.dataset.bindex;
... ... @@ -649,6 +653,8 @@ Page({
649 653 //------去支付，购买-------
650 654 go_pay:function () {
651 655 var th=this;
  656 + if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
  657 +
652 658 //----判断起购数----
653 659 var qnum=parseFloat(th.data.teamlist.minbuynum);
654 660 if(qnum>0 && qnum>th.data.num ){
... ... @@ -703,6 +709,8 @@ Page({
703 709 }
704 710 break;
705 711 }
  712 + newd['pick_dis'] = th.data.pick_dis;
  713 +
706 714 s.set_b_now(newd);
707 715  
708 716 wx.navigateTo({
... ...
pages/team/team_show/team_show.json
  View file @5c8a966
... ... @@ -5,5 +5,8 @@
5 5 "navigationBarTextStyle": "white",
6 6 "navigationBarBackgroundColor": "#ffffff",
7 7 "backgroundColor": "#eeeeee"
  8 + },
  9 + "usingComponents": {
  10 + "warn": "/components/long_warn/long_warn"
8 11 }
9 12 }
10 13 \ No newline at end of file
... ...
pages/team/team_show/team_show.wxml
  View file @5c8a966
... ... @@ -136,8 +136,6 @@
136 136 <!----收起拼团列表---->
137 137 <view class='zhangxi' wx:if="{{hiddenName}}">
138 138  
139   -
140   -
141 139 <view class='zspan' bindtap='click'>收起拼团列表
142 140 <view class='down-arrow1'></view>
143 141 </view>
... ... @@ -222,7 +220,9 @@
222 220 <!--第二层list-->
223 221 <block wx:if="{{list}}">
224 222 <scroll-view scroll-y="true" style="max-height: 460rpx">
225   - <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist' data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
  223 + <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist'
  224 + data-pick_dis="{{item.distr_type}}"
  225 + data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
226 226 <text decode='true'>{{item.pickup_name}}</text>
227 227 </view>
228 228 </scroll-view>
... ... @@ -281,4 +281,6 @@
281 281 </view>
282 282 </view>
283 283 </view>
284   -</block>
285 284 \ No newline at end of file
  285 +</block>
  286 +
  287 +<warn id="warn"></warn>
286 288 \ No newline at end of file
... ...
pages/team/team_success/team_success.js
  View file @5c8a966
... ... @@ -215,8 +215,10 @@ Page({
215 215 data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id }
216 216 }).then(res => {
217 217 teamgroup = res.data.data.pageData[0];
218   - var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
219   - teamgroup.buy_start_date=buy_start_date;
  218 + if (teamgroup){
  219 + var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
  220 + teamgroup.buy_start_date=buy_start_date;
  221 + }
220 222 })
221 223  
222 224  
... ... @@ -225,7 +227,7 @@ Page({
225 227 if (teamlist.kttype == 3){
226 228 var js_data = JSON.parse(teamlist.ct_rylist);
227 229 js_data.forEach(function (val,ind) {
228   - if (num_0<val.rynum && ct_price==0){
  230 + if (num_0<=val.rynum && ct_price==0){
229 231 ct_price=val.price;
230 232 }
231 233 })
... ... @@ -510,33 +512,34 @@ Page({
510 512  
511 513 //把画板内容绘制成图片，并回调 画板图片路径
512 514 context.draw(false, function () {
513   - console.log('draw callback')
514   - wx.canvasToTempFilePath({
515   - x: 0, y: 0,
516   - width: 750,
517   - height: 1217,
518   - destWidth: 750 * 750 / that.data.screenWidth,
519   - destHeight: 1217 * 750 / that.data.screenWidth,
520   - canvasId: 'share',
521   - success: function (res) {
522   - that.setData({
523   - shareImgPath: res.tempFilePath, canvasHidden: false,
524   - })
525   - if (!res.tempFilePath) {
526   - wx.showModal({
527   - title: '提示',
528   - content: '图片绘制中，请稍后重试',
529   - showCancel: false
  515 + setTimeout(function () {
  516 + wx.canvasToTempFilePath({
  517 + x: 0, y: 0,
  518 + width: 750,
  519 + height: 1217,
  520 + destWidth: 750 * 750 / that.data.screenWidth,
  521 + destHeight: 1217 * 750 / that.data.screenWidth,
  522 + canvasId: 'share',
  523 + success: function (res) {
  524 + that.setData({
  525 + shareImgPath: res.tempFilePath, canvasHidden: false,
530 526 })
531   - return false;
  527 + if (!res.tempFilePath) {
  528 + wx.showModal({
  529 + title: '提示',
  530 + content: '图片绘制中，请稍后重试',
  531 + showCancel: false
  532 + })
  533 + return false;
  534 + }
  535 + wx.previewImage({
  536 + //将图片预览出来
  537 + urls: [that.data.shareImgPath]
  538 + });
  539 + wx.hideLoading();
532 540 }
533   - wx.previewImage({
534   - //将图片预览出来
535   - urls: [that.data.shareImgPath]
536   - });
537   - wx.hideLoading();
538   - }
539   - })
  541 + })
  542 + },200)
540 543 });
541 544 });
542 545 }
... ... @@ -624,6 +627,7 @@ Page({
624 627 });
625 628 }
626 629 },
  630 +
627 631 //--获取商品图片的本地缓存，回调写法--
628 632 get_goods_temp:function (tt) {
629 633 var ee=this;
... ...
pages/team/team_success/team_success.wxml
  View file @5c8a966
... ... @@ -70,12 +70,12 @@
70 70 <view class='bodytop' wx:if="{{(teamlist.kttype==2 || teamlist.kttype==1) && p_status==1}}">
71 71 还差
72 72 <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人成团,组团成功为您节省
73   - <text class="xc-wc">{{goods.market_price-teamlist.price}}</text>元
  73 + <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
74 74 </view>
75 75 <!-- 拼团成功 -->
76 76 <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
77 77 <view class="xc-wc">拼团成功</view>,为您节省
78   - <text class="xc-wc">{{goods.market_price-teamlist.price}}</text>元
  78 + <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
79 79 <view class="xc-img-frame oh">
80 80 <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
81 81 </view>
... ... @@ -152,7 +152,7 @@
152 152 <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
153 153 <!----/ // // // //按钮---->
154 154  
155   - <view wx:if="{{teamlist.kttype==3}}" class='bodybutton' bindtap='cmeng'>
  155 + <view wx:if="{{teamlist.kttype==3}}" style='background-color:#fab55a; color:#fff' class='bodybutton' bindtap='cmeng'>
156 156 <!-- 阶梯团 -->
157 157 <button wx:if="{{p_status==1}}">
158 158 邀请好友参团
... ...
pages/user/grow_value/grow_value.json
  View file @5c8a966
1 1 {
2   - "navigationBarTitleText": "我的成长值",
  2 + "navigationBarTitleText": "我的成长值",
3 3 "usingComponents": {
4 4 "timePicker": "/components/timePicker/timePicker",
5 5 "warn": "/components/long_warn/long_warn"
... ...
pages/user/member/account/account.wxml
  View file @5c8a966
... ... @@ -53,7 +53,7 @@
53 53  
54 54 <view class="money"
55 55 style="color:{{details.type==2||details.type==0?'#C4182E':'#6fd137'}}">
56   - {{details.type==2||details.type==0?'+':'-'}}{{filter.getNum(details.money)}}</view>
  56 + {{details.type==1||details.type==3?'-':'+'}}{{filter.getNum(details.money)}}</view>
57 57 </view>
58 58 </block>
59 59  
... ...
pages/user/order_detail/order_detail.wxml
  View file @5c8a966
... ... @@ -28,7 +28,7 @@
28 28 </navigator>
29 29 <view class="order-num">
30 30 <view class="goods-price">￥{{item.member_goods_price}}</view>
31   - <view class="goods-num">￥{{item.goods_num}}</view>
  31 + <view class="goods-num">×{{item.goods_num}}</view>
32 32 </view>
33 33 </view>
34 34 <view class="order-operate">
... ...
utils/filter.wxs
  View file @5c8a966
... ... @@ -18,7 +18,7 @@ var filters = {
18 18 if(isFull==1)
19 19 fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
20 20 return fm;
21   - }
  21 + },
22 22  
23 23 pInt:function(t) {
24 24 var d = parseInt(t); return d;
... ...