Commit e15ae0762777d1a155beaa9d26c43241d853faed
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
22 changed files
with
350 additions
and
169 deletions
packageA/pages/checkin/checkin.js
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | var md5 = require("../../../utils/md5.js"); |
3 | 3 | var ut = require("../../../utils/util.js"); |
4 | 4 | const app = getApp(); |
5 | +const os=app.globalData.setting; | |
5 | 6 | let self; |
6 | 7 | Page({ |
7 | 8 | |
... | ... | @@ -77,6 +78,27 @@ Page({ |
77 | 78 | }); |
78 | 79 | self.loadQd(); |
79 | 80 | }); |
81 | + | |
82 | + // 广告 | |
83 | + getApp().request.promiseGet("/api/weshop/ad/page?pid=1205&store_id=" + os.stoid, { | |
84 | + data: { | |
85 | + enabled: 1 | |
86 | + } | |
87 | + }).then(res => { | |
88 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
89 | + var a = res.data.data.pageData; | |
90 | + var narr=[]; | |
91 | + for(var i in a){ | |
92 | + var tt = { | |
93 | + 'ad_code': os.imghost + a[i].ad_code, | |
94 | + 'media_link': '', | |
95 | + 'ad_weapplink':a[i].ad_weapplink | |
96 | + }; | |
97 | + narr.push(tt); | |
98 | + } | |
99 | + self.setData({ad_data:narr}); | |
100 | + } | |
101 | + }); | |
80 | 102 | |
81 | 103 | |
82 | 104 | }, |
... | ... | @@ -362,6 +384,11 @@ Page({ |
362 | 384 | var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate(); |
363 | 385 | //return y + "-" + m + "-" + d; |
364 | 386 | return [m + "-" + d,dd.getDate()]; |
387 | + }, | |
388 | + go_url(e){ | |
389 | + let url=e.currentTarget.dataset.url; | |
390 | + if(url){ | |
391 | + getApp().goto(url); | |
392 | + } | |
365 | 393 | } |
366 | - | |
367 | 394 | }) | ... | ... |
packageA/pages/checkin/checkin.wxml
1 | -<!--packageA//pages/checkin/checkin.wxml--> | |
1 | +<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | |
2 | +<wxs module="g_filter" src="g_filter.wxs"></wxs> | |
2 | 3 | <wxs src="checkin.wxs" module="myUtil"></wxs> |
3 | 4 | <view class="checkin-container"> |
4 | 5 | <view class="rule-container flex"> |
5 | 6 | <view class="rule" bindtap="showRules">规则</view> |
6 | - <view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view> | |
7 | - | |
7 | + <view class="points" bindtap="goto" data-url="/pages/user/integral/integral"> | |
8 | + <image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分 | |
9 | + </view> | |
8 | 10 | </view> |
9 | - | |
10 | 11 | <view class="list flex" wx:if="{{res}}"> |
11 | 12 | <view class="list-item active}}"> |
12 | 13 | <view class="circle">+{{res.cday1}}</view> |
... | ... | @@ -38,7 +39,7 @@ |
38 | 39 | </view> |
39 | 40 | </view> |
40 | 41 | <view wx:else style="height: 100rpx;"></view> |
41 | - | |
42 | + | |
42 | 43 | <view class="btn-container" wx:if="{{res}}"> |
43 | 44 | <view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}"> |
44 | 45 | <text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}} |
... | ... | @@ -48,14 +49,14 @@ |
48 | 49 | </view> |
49 | 50 | <view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view> |
50 | 51 | </view> |
51 | - | |
52 | - | |
52 | + | |
53 | + | |
53 | 54 | <!-- <view class="current"> |
54 | 55 | <view class="f-vc">当前连续签到:<text class="days fs34">{{res.getlxnum}}</text> 天</view> |
55 | 56 | <view class="f-vc">当前积分:<text class="fs34">{{integral}}</text></view> |
56 | - </view> --> | |
57 | + </view> --> | |
57 | 58 | <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> --> |
58 | - | |
59 | + | |
59 | 60 | <view class="calendar-container"> |
60 | 61 | <view class="calendar-wrapper"> |
61 | 62 | <view class="calendar-title"> |
... | ... | @@ -64,35 +65,35 @@ |
64 | 65 | <view wx:if="{{res.getkbqnum}}" class="fs24" style="color:#999;font-weight:bold">补签卡:{{res.getkbqnum}}</view> |
65 | 66 | </view> |
66 | 67 | <view class="calendar"> |
67 | - <!-- <view class="selectDate"> --> | |
68 | - <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> --> | |
69 | - <!-- <view class="date-wrap"> | |
68 | + <!-- <view class="selectDate"> --> | |
69 | + <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> --> | |
70 | + <!-- <view class="date-wrap"> | |
70 | 71 | {{year}}年{{month}}月 |
71 | 72 | </view> --> |
72 | - <!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> --> | |
73 | - <!-- </view> --> | |
74 | - <view class="week"> | |
75 | - <view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view> | |
76 | - </view> | |
77 | - | |
78 | - <view class="date"> | |
79 | - <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key"> | |
80 | - <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> --> | |
81 | - <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}"> | |
82 | - <view class="day">{{item.num}}</view> | |
83 | - </view> | |
84 | - </block> | |
85 | - </view> | |
86 | - | |
73 | + <!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> --> | |
74 | + <!-- </view> --> | |
75 | + <view class="week"> | |
76 | + <view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view> | |
77 | + </view> | |
78 | + | |
79 | + <view class="date"> | |
80 | + <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key"> | |
81 | + <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> --> | |
82 | + <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}"> | |
83 | + <view class="day">{{item.num}}</view> | |
84 | + </view> | |
85 | + </block> | |
86 | + </view> | |
87 | + | |
87 | 88 | </view> |
88 | 89 | </view> |
89 | - | |
90 | + | |
90 | 91 | </view> |
91 | - | |
92 | + | |
92 | 93 | <view class="jfbuy-container"> |
93 | 94 | <view class="jfbuy flex"> |
94 | - <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> | |
95 | - <view class="right"> | |
95 | + <!-- <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> --> | |
96 | + <!-- <view class="right"> | |
96 | 97 | <view> |
97 | 98 | <view class="t1">小积分大作为</view> |
98 | 99 | <view class="t2">积分抵用现金,积少成多</view> |
... | ... | @@ -100,10 +101,33 @@ |
100 | 101 | <view class="t-c"> |
101 | 102 | <view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view> |
102 | 103 | </view> |
103 | - </view> | |
104 | + </view> --> | |
105 | + <block wx:if="{{ad_data}}"> | |
106 | + <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" style="height:240rpx;width: 670rpx;"> | |
107 | + <block wx:for="{{ad_data}}"> | |
108 | + | |
109 | + <navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> | |
110 | + <swiper-item> | |
111 | + <image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" /> | |
112 | + </swiper-item> | |
113 | + </navigator> | |
114 | + | |
115 | + <view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url"> | |
116 | + <swiper-item> | |
117 | + <image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" class="slide-image" mode="widthFix" lazy-load="true" /> | |
118 | + </swiper-item> | |
119 | + </view> | |
120 | + | |
121 | + </block> | |
122 | + </swiper> | |
123 | + | |
124 | + </block> | |
125 | + <block wx:else> | |
126 | + <image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image> | |
127 | + </block> | |
104 | 128 | </view> |
105 | 129 | </view> |
106 | - | |
130 | + | |
107 | 131 | <view class="popup-container" wx:if="{{isShowRules}}"> |
108 | 132 | <view class="popup-wrapper"> |
109 | 133 | <view class="popup"> |
... | ... | @@ -115,5 +139,5 @@ |
115 | 139 | </view> |
116 | 140 | </view> |
117 | 141 | </view> |
118 | - | |
119 | -</view> | |
142 | + | |
143 | +</view> | |
120 | 144 | \ No newline at end of file | ... | ... |
packageA/pages/checkin/checkin.wxss
packageA/pages/checkin/g_filter.wxs
0 → 100644
1 | +var g_filters = { | |
2 | + has_char:function(url,key){ | |
3 | + if(!url) return -1; | |
4 | + return url.indexOf(key); | |
5 | + }, | |
6 | + beg_time:function(beg_date){ | |
7 | + var fmt1 = beg_date.substring(0, 19); | |
8 | + var reg = getRegExp("-", "g"); | |
9 | + var fmt2 = fmt1.replace(reg, '/'); | |
10 | + var t1 = getDate(fmt2); | |
11 | + var tnow=getDate(); | |
12 | + if(t1<=tnow) return 1; | |
13 | + return 0; | |
14 | + }, | |
15 | + end_time:function(end_date){ | |
16 | + var fmt1 = end_date.substring(0, 19); | |
17 | + var reg = getRegExp("-", "g"); | |
18 | + var fmt2 = fmt1.replace(reg, '/'); | |
19 | + var t1 = getDate(fmt2); | |
20 | + var tnow=getDate(); | |
21 | + if(t1>=tnow) return 1; | |
22 | + return 0; | |
23 | + }, | |
24 | + goToUrl: function(type, id, name) { | |
25 | + if (type == 1) { | |
26 | + return "/packageB/pages/zuhegou/index/index?id="+id+"&title="+name | |
27 | + } else { | |
28 | + return "/packageB/pages/zuhegou/preIndex/index?id="+id+"&title="+name | |
29 | + } | |
30 | + }, | |
31 | + | |
32 | +} | |
33 | +module.exports = { | |
34 | + has_char: g_filters.has_char, | |
35 | + beg_time: g_filters.beg_time, | |
36 | + end_time: g_filters.end_time, | |
37 | + goToUrl: g_filters.goToUrl, | |
38 | +} | |
0 | 39 | \ No newline at end of file | ... | ... |
packageA/pages/prom_list/prom_list.js
packageB/pages/evaluate/evaluate.js
... | ... | @@ -26,6 +26,7 @@ Page({ |
26 | 26 | is_act:0, //是否能购获取图片 |
27 | 27 | actId:0, //活动ID |
28 | 28 | giftBagId:0, //礼包ID |
29 | + ftype:0 | |
29 | 30 | |
30 | 31 | }, |
31 | 32 | //点击星级 |
... | ... | @@ -98,8 +99,19 @@ Page({ |
98 | 99 | |
99 | 100 | //查询美导信息 |
100 | 101 | query_bea: function() { |
101 | - var th = this; | |
102 | - var url = "/api/weshop/order/pagePosOrder"; | |
102 | + var th = this; | |
103 | + var url = "/api/weshop/order/pagePosOrder"; | |
104 | + | |
105 | + switch (this.data.ftype){ | |
106 | + case 3: | |
107 | + break; | |
108 | + case 4: | |
109 | + url = "/api/weshop/serviceCard/pagePos"; | |
110 | + break; | |
111 | + default: | |
112 | + break | |
113 | + } | |
114 | + | |
103 | 115 | var number = th.data.number; //订单编号 |
104 | 116 | getApp().request.promiseGet(url, { |
105 | 117 | data: { |
... | ... | @@ -175,10 +187,10 @@ Page({ |
175 | 187 | var url = th.data.url + "/api/weshop/evaluation/evaluate/insert"; |
176 | 188 | var posNo = th.data.number; //收银单号 |
177 | 189 | var proposal = th.data.proposal; //用户建议内容 |
178 | - var fromType = th.data.fromType; //评价来源 | |
190 | + var fromType = th.data.ftype?th.data.ftype:1; //评价来源 | |
179 | 191 | var json = { |
180 | 192 | "evaLabList": evaLabList, |
181 | - "fromType": 1, | |
193 | + "fromType": fromType, | |
182 | 194 | "number": posNo, |
183 | 195 | "remark": proposal, |
184 | 196 | "star": stars + 1, |
... | ... | @@ -197,9 +209,15 @@ Page({ |
197 | 209 | if (res.data.code == 0) { |
198 | 210 | getApp().my_warnning("评价成功", 1, th); |
199 | 211 | var namber=th.data.number; |
212 | + | |
213 | + var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"; | |
214 | + if(th.data.ftype==4){ | |
215 | + url="/pages/user/index/index"; | |
216 | + } | |
217 | + | |
200 | 218 | setTimeout(function() { |
201 | 219 | wx.redirectTo({ |
202 | - url: "/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1" | |
220 | + url: url | |
203 | 221 | }); |
204 | 222 | }, 2000); |
205 | 223 | } else { |
... | ... | @@ -218,11 +236,17 @@ Page({ |
218 | 236 | number: options.number, |
219 | 237 | //is_evaluate: options.evaluate |
220 | 238 | }) |
239 | + | |
240 | + if(options.fromtype){ | |
241 | + this.setData({ftype:parseInt(options.fromtype)}) ; | |
242 | + if(options.fromtype==4) th.judge_act(); | |
243 | + } | |
221 | 244 | //th.query_bea(); |
222 | - //th.judge_act(); | |
245 | + | |
223 | 246 | var userinfo=getApp().globalData.userInfo; |
224 | 247 | console.log("userinfo",userinfo) |
225 | - | |
248 | + | |
249 | + | |
226 | 250 | if(!userinfo){ |
227 | 251 | getApp().goto("/pages/togoin/togoin"); |
228 | 252 | } |
... | ... | @@ -260,9 +284,11 @@ Page({ |
260 | 284 | |
261 | 285 | var id=this.data.actId; |
262 | 286 | var gifbagid = this.data.gifbagid; |
263 | - console.log(id,"订单", this.data.number), | |
287 | + console.log(id,"订单", this.data.number); | |
288 | + | |
289 | + var ty=this.data.ftype?this.data.ftype:2; | |
264 | 290 | wx.redirectTo({ |
265 | - url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number | |
291 | + url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number | |
266 | 292 | }); |
267 | 293 | |
268 | 294 | }, |
... | ... | @@ -271,10 +297,13 @@ Page({ |
271 | 297 | judge_act: function () { |
272 | 298 | var th = this; |
273 | 299 | var url = "/api/weshop/marketing/comment/act/judge"; |
300 | + | |
301 | + var ty=this.data.ftype?this.data.ftype:2; | |
302 | + | |
274 | 303 | getApp().request.promiseGet(url, { |
275 | 304 | data: { |
276 | 305 | orderNumber: th.data.number, |
277 | - orderType: 2, | |
306 | + orderType: ty, | |
278 | 307 | storeId: a.stoid, |
279 | 308 | userId: d.user_id |
280 | 309 | } | ... | ... |
packageB/pages/evaluate/evaluate.wxml
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <!-- 项目 --> |
18 | 18 | <view class="flex-center item" bindtap="show_goods" data-index="{{index}}"> |
19 | 19 | <view class="itemlf fs32 flex-level-right">购买商品:</view> |
20 | - <view class="itemlr fs30 ellipsis-1 go_right">{{it.list[0].WareName}}</view> | |
20 | + <view class="itemlr fs30 ellipsis-1 go_right">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> | |
21 | 21 | </view> |
22 | 22 | |
23 | 23 | <!-- 时间 --> |
... | ... | @@ -94,13 +94,14 @@ |
94 | 94 | </navigator> |
95 | 95 | <view wx:else> |
96 | 96 | |
97 | - | |
97 | +<block wx:if="{{ftype!=4}}"> | |
98 | 98 | <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt"> |
99 | 99 | <view>评价其他</view> |
100 | 100 | </view> |
101 | 101 | <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt" data-status="1"> |
102 | 102 | <view>查看已评价的订单</view> |
103 | 103 | </view> |
104 | +</block> | |
104 | 105 | |
105 | 106 | <!-- 显示来个图标 --> |
106 | 107 | <view class="show_icon" style="margin-top: 60rpx;"> |
... | ... | @@ -133,7 +134,7 @@ |
133 | 134 | <view class="title">商品详情</view> |
134 | 135 | <view style="padding: 0 20rpx;"> |
135 | 136 | <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> |
136 | - <view>{{item.WareName}}</view> | |
137 | + <view>{{item.WareName?item.WareName:item.ItemName}}</view> | |
137 | 138 | <view>{{item.Qty}}</view> |
138 | 139 | </view> |
139 | 140 | </view> | ... | ... |
packageB/pages/zuhegou/list/list.js
packageB/pages/zuhegou/preindex/index.wxml
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 | <text class="iconfont icon-arrow_right"></text> |
7 | 7 | </view> |
8 | 8 | </view> |
9 | - <view wx:if="{{djs}}" class="countdown-container">距结束还剩 | |
9 | + <view wx:if="{{djs}}" class="countdown-container">距开始还剩 | |
10 | 10 | <text wx:if="{{djs.day}}">{{djs.day}}天</text> |
11 | 11 | <text class="num-box">{{djs.hou}}</text> |
12 | 12 | : | ... | ... |
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
... | ... | @@ -1605,16 +1605,19 @@ Page({ |
1605 | 1605 | }).then(res => { |
1606 | 1606 | if (res.data.code == 0) { |
1607 | 1607 | var ord_prom = res.data.data; |
1608 | - order_prom_id = ord_prom['id']; | |
1609 | - switch (ord_prom['type']) { | |
1610 | - case 0: | |
1611 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1612 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
1613 | - break; | |
1614 | - case 1: | |
1615 | - //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1616 | - order_prom_amount = ord_prom['expression']; | |
1617 | - break; | |
1608 | + //么有使用券,或者活动没有限制使用优惠券 | |
1609 | + if(quan_price<=0 || !ord_prom.is_xz_yh) { | |
1610 | + order_prom_id = ord_prom['id']; | |
1611 | + switch (ord_prom['type']) { | |
1612 | + case 0: | |
1613 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1614 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
1615 | + break; | |
1616 | + case 1: | |
1617 | + //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1618 | + order_prom_amount = ord_prom['expression']; | |
1619 | + break; | |
1620 | + } | |
1618 | 1621 | } |
1619 | 1622 | } |
1620 | 1623 | }) |
... | ... | @@ -1955,16 +1958,20 @@ Page({ |
1955 | 1958 | var order_prom_id = 0; |
1956 | 1959 | if (th.data.order_prom[th.data.bn_pick]) { |
1957 | 1960 | var ord_prom = th.data.order_prom[th.data.bn_pick]; |
1958 | - order_prom_id = ord_prom['id']; | |
1959 | - switch (ord_prom['type']) { | |
1960 | - case 0: | |
1961 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1962 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
1963 | - break; | |
1964 | - case 1: | |
1965 | - order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1966 | - order_prom_amount = ord_prom['expression']; | |
1967 | - break; | |
1961 | + | |
1962 | + //么有使用券,或者活动没有限制使用优惠券 | |
1963 | + if(coupon_price<=0 || !ord_prom.is_xz_yh) { | |
1964 | + order_prom_id = ord_prom['id']; | |
1965 | + switch (ord_prom['type']) { | |
1966 | + case 0: | |
1967 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1968 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
1969 | + break; | |
1970 | + case 1: | |
1971 | + order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1972 | + order_prom_amount = ord_prom['expression']; | |
1973 | + break; | |
1974 | + } | |
1968 | 1975 | } |
1969 | 1976 | } |
1970 | 1977 | //--订单优惠的显示-- | ... | ... |
packageC/pages/payForAnother/payForAnother.js
... | ... | @@ -1508,16 +1508,19 @@ Page({ |
1508 | 1508 | }).then(res => { |
1509 | 1509 | if (res.data.code == 0) { |
1510 | 1510 | var ord_prom = res.data.data; |
1511 | - order_prom_id = ord_prom['id']; | |
1512 | - switch (ord_prom['type']) { | |
1513 | - case 0: | |
1514 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1515 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
1516 | - break; | |
1517 | - case 1: | |
1518 | - //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1519 | - order_prom_amount = ord_prom['expression']; | |
1520 | - break; | |
1511 | + //么有使用券,或者活动没有限制使用优惠券 | |
1512 | + if(quan_price<=0 || !ord_prom.is_xz_yh) { | |
1513 | + order_prom_id = ord_prom['id']; | |
1514 | + switch (ord_prom['type']) { | |
1515 | + case 0: | |
1516 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1517 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
1518 | + break; | |
1519 | + case 1: | |
1520 | + //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1521 | + order_prom_amount = ord_prom['expression']; | |
1522 | + break; | |
1523 | + } | |
1521 | 1524 | } |
1522 | 1525 | } |
1523 | 1526 | }) |
... | ... | @@ -1855,16 +1858,19 @@ Page({ |
1855 | 1858 | var order_prom_id = 0; |
1856 | 1859 | if (th.data.order_prom[th.data.bn_pick]) { |
1857 | 1860 | var ord_prom = th.data.order_prom[th.data.bn_pick]; |
1858 | - order_prom_id = ord_prom['id']; | |
1859 | - switch (ord_prom['type']) { | |
1860 | - case 0: | |
1861 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1862 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
1863 | - break; | |
1864 | - case 1: | |
1865 | - order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1866 | - order_prom_amount = ord_prom['expression']; | |
1867 | - break; | |
1861 | + //么有使用券,或者活动没有限制使用优惠券 | |
1862 | + if(coupon_price<=0 || !ord_prom.is_xz_yh) { | |
1863 | + order_prom_id = ord_prom['id']; | |
1864 | + switch (ord_prom['type']) { | |
1865 | + case 0: | |
1866 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1867 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
1868 | + break; | |
1869 | + case 1: | |
1870 | + order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1871 | + order_prom_amount = ord_prom['expression']; | |
1872 | + break; | |
1873 | + } | |
1868 | 1874 | } |
1869 | 1875 | } |
1870 | 1876 | //--订单优惠的显示-- | ... | ... |
packageC/pages/presell/cart/cart.js
... | ... | @@ -700,10 +700,13 @@ Page({ |
700 | 700 | } |
701 | 701 | } |
702 | 702 | //--订单优惠的显示-- |
703 | + var order_prom_txt1 = "order_prom_id"; | |
704 | + var order_prom_txt2 = "order_prom_amount"; | |
703 | 705 | if (order_prom_id > 0) { |
704 | - var order_prom_txt1 = "order_prom_id"; | |
705 | - var order_prom_txt2 = "order_prom_amount"; | |
706 | 706 | th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount}) |
707 | + }else{ | |
708 | + o_condition1=ord_price; | |
709 | + th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0}) | |
707 | 710 | } |
708 | 711 | |
709 | 712 | o_condition1=parseFloat(o_condition1)-parseFloat(th.data.presell.presell_deposit); |
... | ... | @@ -1826,18 +1829,21 @@ Page({ |
1826 | 1829 | var order_m=0; |
1827 | 1830 | if (th.data.order_prom[bn_pick]) { |
1828 | 1831 | var ord_prom = th.data.order_prom[bn_pick]; |
1829 | - order_prom_id = ord_prom['id']; | |
1830 | - switch (ord_prom['type']) { | |
1831 | - case 0: | |
1832 | - order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折 | |
1833 | - order_prom_amount = (ord_price - order_m).toFixed(2); | |
1834 | - break; | |
1835 | - case 1: | |
1836 | - order_m = ord_price - ord_prom['expression'];//满额优惠金额 | |
1837 | - order_prom_amount = ord_prom['expression']; | |
1838 | - break; | |
1832 | + //么有使用券,或者活动没有限制使用优惠券 | |
1833 | + if(quan_price<=0 || !ord_prom.is_xz_yh) { | |
1834 | + order_prom_id = ord_prom['id']; | |
1835 | + switch (ord_prom['type']) { | |
1836 | + case 0: | |
1837 | + order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折 | |
1838 | + order_prom_amount = (ord_price - order_m).toFixed(2); | |
1839 | + break; | |
1840 | + case 1: | |
1841 | + order_m = ord_price - ord_prom['expression'];//满额优惠金额 | |
1842 | + order_prom_amount = ord_prom['expression']; | |
1843 | + break; | |
1844 | + } | |
1845 | + ord_price = order_m; | |
1839 | 1846 | } |
1840 | - ord_price=order_m; | |
1841 | 1847 | } |
1842 | 1848 | |
1843 | 1849 | //--订单优惠的显示-- | ... | ... |
packageC/pages/presell/list/list.js
pages/activity/pind_list/pind_list.js
pages/activity/seckill_list/seckill_list.js
pages/cart/cart2/cart2.js
... | ... | @@ -625,28 +625,28 @@ Page({ |
625 | 625 | if (arr.length > 0) { |
626 | 626 | for (var j = 0; j < arr.length; j++) { |
627 | 627 | if (arr[j].pickup_id == pcid) { |
628 | - //if(item.is_gift!=1){ | |
629 | - //确定配送方式 | |
630 | - if (arr[j].distr_t == 0) { | |
631 | - arr[j].distr_t = car_item.distr_type; | |
632 | - } | |
633 | - var e_t = 0 | |
634 | - switch (arr[j].distr_t) { | |
635 | - case 0: | |
636 | - e_t = 1; | |
637 | - if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0; | |
638 | - break; | |
639 | - case 1: | |
640 | - e_t = 1; | |
641 | - break; | |
642 | - case 2: | |
643 | - e_t = 0; | |
644 | - break; | |
628 | + if(item.is_gift!=1){ | |
629 | + //确定配送方式 | |
630 | + if (arr[j].distr_t == 0) { | |
631 | + arr[j].distr_t = car_item.distr_type; | |
632 | + } | |
633 | + var e_t = 0 | |
634 | + switch (arr[j].distr_t) { | |
635 | + case 0: | |
636 | + e_t = 1; | |
637 | + if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0; | |
638 | + break; | |
639 | + case 1: | |
640 | + e_t = 1; | |
641 | + break; | |
642 | + case 2: | |
643 | + e_t = 0; | |
644 | + break; | |
645 | + } | |
646 | + arr[j].exp_type = e_t; | |
647 | + if (e_t == 0) th.setData({is_all_zt: 0}); | |
648 | + else if(e_t==1) th.setData({is_all_zt: 1}); | |
645 | 649 | } |
646 | - arr[j].exp_type = e_t; | |
647 | - if (e_t == 0) th.setData({is_all_zt: 0}); | |
648 | - else if(e_t==1) th.setData({is_all_zt: 1}); | |
649 | - //} | |
650 | 650 | |
651 | 651 | //-- 把等级卡会优惠多少钱装进去 -- |
652 | 652 | if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1; |
... | ... | @@ -689,6 +689,7 @@ Page({ |
689 | 689 | } |
690 | 690 | //如果是物流的话,全部自提的控制要弄成0 |
691 | 691 | if (e_t == 0) th.setData({is_all_zt: 0}); |
692 | + else th.setData({is_all_zt: 1}); | |
692 | 693 | |
693 | 694 | var narr = new Array(); |
694 | 695 | narr.push(car_item); |
... | ... | @@ -920,7 +921,6 @@ Page({ |
920 | 921 | th.data.check_quan_price_list = t.data.data.offline_price * gg.goods_num + ""; |
921 | 922 | th.data.check_quan_ware_list = t.data.data.erpwareid + ""; |
922 | 923 | } |
923 | - | |
924 | 924 | t.data.data.prom_id = 0; |
925 | 925 | t.data.data.prom_type = 0; |
926 | 926 | |
... | ... | @@ -976,6 +976,12 @@ Page({ |
976 | 976 | if (gg.prom_type == 5) { |
977 | 977 | t.data.data.prom_id = gg.prom_id; |
978 | 978 | t.data.data.prom_type = 5; |
979 | + | |
980 | + // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon) | |
981 | + th.is_coupon = gg.is_coupon; | |
982 | + th.setData({ | |
983 | + is_coupon: gg.is_coupon | |
984 | + }); | |
979 | 985 | if (gg.room_id) { |
980 | 986 | t.data.data.room_id = gg.room_id; |
981 | 987 | } |
... | ... | @@ -1050,6 +1056,9 @@ Page({ |
1050 | 1056 | th.calculatePrice2(); |
1051 | 1057 | th.get_cart_quan(); |
1052 | 1058 | }); |
1059 | + | |
1060 | + | |
1061 | + | |
1053 | 1062 | } else { |
1054 | 1063 | //计算价格 |
1055 | 1064 | th.calculatePrice2(); |
... | ... | @@ -1724,16 +1733,19 @@ Page({ |
1724 | 1733 | }).then(res => { |
1725 | 1734 | if (res.data.code == 0) { |
1726 | 1735 | var ord_prom = res.data.data; |
1727 | - order_prom_id = ord_prom['id']; | |
1728 | - switch (ord_prom['type']) { | |
1729 | - case 0: | |
1730 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1731 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
1732 | - break; | |
1733 | - case 1: | |
1734 | - //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1735 | - order_prom_amount = ord_prom['expression']; | |
1736 | - break; | |
1736 | + //么有使用券,或者活动没有限制使用优惠券 | |
1737 | + if(quan_price<=0 || !ord_prom.is_xz_yh) { | |
1738 | + order_prom_id = ord_prom['id']; | |
1739 | + switch (ord_prom['type']) { | |
1740 | + case 0: | |
1741 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
1742 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
1743 | + break; | |
1744 | + case 1: | |
1745 | + //order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
1746 | + order_prom_amount = ord_prom['expression']; | |
1747 | + break; | |
1748 | + } | |
1737 | 1749 | } |
1738 | 1750 | } |
1739 | 1751 | }) |
... | ... | @@ -2079,16 +2091,19 @@ Page({ |
2079 | 2091 | var order_prom_id = 0; |
2080 | 2092 | if (th.data.order_prom[th.data.bn_pick]) { |
2081 | 2093 | var ord_prom = th.data.order_prom[th.data.bn_pick]; |
2082 | - order_prom_id = ord_prom['id']; | |
2083 | - switch (ord_prom['type']) { | |
2084 | - case 0: | |
2085 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
2086 | - order_prom_amount = (o_condition - order_m).toFixed(2); | |
2087 | - break; | |
2088 | - case 1: | |
2089 | - order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
2090 | - order_prom_amount = ord_prom['expression']; | |
2091 | - break; | |
2094 | + //么有使用券,或者活动没有限制使用优惠券 | |
2095 | + if(coupon_price<=0 || !ord_prom.is_xz_yh) { | |
2096 | + order_prom_id = ord_prom['id']; | |
2097 | + switch (ord_prom['type']) { | |
2098 | + case 0: | |
2099 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | |
2100 | + order_prom_amount = (o_condition - order_m).toFixed(2); | |
2101 | + break; | |
2102 | + case 1: | |
2103 | + order_m = o_condition - ord_prom['expression'];//满额优惠金额 | |
2104 | + order_prom_amount = ord_prom['expression']; | |
2105 | + break; | |
2106 | + } | |
2092 | 2107 | } |
2093 | 2108 | } |
2094 | 2109 | //--订单优惠的显示-- |
... | ... | @@ -3257,7 +3272,7 @@ Page({ |
3257 | 3272 | else { |
3258 | 3273 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; |
3259 | 3274 | } |
3260 | - this.setData({using_quan: using_quan, is_coupon: 2222}); | |
3275 | + this.setData({using_quan: using_quan, is_coupon: th.is_coupon}); | |
3261 | 3276 | return; |
3262 | 3277 | } |
3263 | 3278 | |
... | ... | @@ -3323,7 +3338,7 @@ Page({ |
3323 | 3338 | else { |
3324 | 3339 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; |
3325 | 3340 | } |
3326 | - this.setData({using_quan: using_quan, is_coupon: 2222}); | |
3341 | + this.setData({using_quan: using_quan, is_coupon: th.is_coupon}); | |
3327 | 3342 | return; |
3328 | 3343 | } |
3329 | 3344 | ... | ... |
pages/cart/cart2/cart2.wxml
pages/index/index/index.js
... | ... | @@ -83,19 +83,13 @@ Page({ |
83 | 83 | sec_show: 3, //倒计时的秒数 |
84 | 84 | full_ad: null, //全屏广告 |
85 | 85 | full_screen: 0, //全屏广告 |
86 | + is_ok_h5:0, //判断要不要显示关注二维码 | |
86 | 87 | |
87 | 88 | }, |
88 | 89 | |
89 | 90 | onLoad: async function (tt) { |
90 | - // onLoad生命周期内判断 | |
91 | - let obj = wx.getLaunchOptionsSync(); | |
92 | - console.log(obj.scene,'launch_scene'); | |
93 | - if (obj.scene === 1011 || obj.scene === 1012 || obj.scene === 1013 || obj.scene === 1017 || | |
94 | - obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) { | |
95 | - this.setData({is_ok_h5:1}) | |
96 | - } | |
97 | 91 | |
98 | - var th = this; | |
92 | + var th = this; | |
99 | 93 | var first_leader = tt.first_leader; |
100 | 94 | if (!first_leader && tt.scene) { |
101 | 95 | var first_leader_str = decodeURIComponent(tt.scene); |
... | ... | @@ -459,6 +453,15 @@ Page({ |
459 | 453 | } |
460 | 454 | }, 1500) |
461 | 455 | |
456 | + setTimeout(function () { | |
457 | + const query = wx.createSelectorQuery(); | |
458 | + query.select('#off_top').boundingClientRect(); | |
459 | + query.exec((res) => { | |
460 | + if(res && res[0] && res[0].height>0){ | |
461 | + th.setData({is_ok_h5:1}); | |
462 | + } | |
463 | + }) | |
464 | + },3600); | |
462 | 465 | |
463 | 466 | }, |
464 | 467 | //当隐藏的时候就关闭计时器 | ... | ... |
pages/index/index/index.wxml
... | ... | @@ -16,7 +16,7 @@ |
16 | 16 | |
17 | 17 | <view class="top-bar"> |
18 | 18 | <!-- 顶部关注公众号 --> |
19 | - <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view> | |
19 | + <view id="off_top" wx:if="{{is_gz_h5}}"><official-account></official-account></view> | |
20 | 20 | |
21 | 21 | <!-- 控制要不要显示顶部门店选择 --> |
22 | 22 | <block wx:if="{{is_topstore}}"> |
... | ... | @@ -414,7 +414,7 @@ |
414 | 414 | <!-- 置顶层 --> |
415 | 415 | <view class="dis_top"> |
416 | 416 | <!-- 关注公众号的显示 --> |
417 | - <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view> | |
417 | + <view id="off_top" wx:if="{{is_gz_h5}}"><official-account ></official-account></view> | |
418 | 418 | |
419 | 419 | <block wx:for="{{template_arr}}" > |
420 | 420 | <block wx:if="{{item.content.is_top==1}}"> | ... | ... |
pages/user/coupons/coupons.wxml
... | ... | @@ -81,7 +81,8 @@ |
81 | 81 | </view> |
82 | 82 | </view> |
83 | 83 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> |
84 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text> | |
84 | + <!--<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>--> | |
85 | + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}"><text style="margin-right: 15rpx">使用说明:</text>购买礼包得优惠券【消费满{{time.toFix(detail.condition,2)}}元可用】</text> | |
85 | 86 | </view> |
86 | 87 | </block> |
87 | 88 | |
... | ... | @@ -107,8 +108,8 @@ |
107 | 108 | </view> |
108 | 109 | </view> |
109 | 110 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> |
110 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text> | |
111 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text> | |
111 | + <view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1!=''}}"><text style="margin-right: 15rpx">使用说明:</text>{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark1}}</view> | |
112 | + <view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else><text style="margin-right: 15rpx">使用说明:</text> {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</view> | |
112 | 113 | </view> |
113 | 114 | </block> |
114 | 115 | </view> | ... | ... |
pages/user/coupons/filter.wxs
pages/user/index/index.js