Commit 6a123357745769489a61db031cadb3e0fdbd8479
1 parent
f91875e7
quanchang zai lai yi dan
Showing
1 changed file
with
1136 additions
and
1031 deletions
pages/user/order_list/order_list.js
1 | 1 | const app = getApp(); |
2 | -var t = function(t) { | |
3 | - return t && t.__esModule ? t : { | |
4 | - default: t | |
5 | - }; | |
6 | - }(require("../../../utils/LoadMore.js")), | |
7 | - e = getApp(), | |
8 | - os = e.globalData.setting, | |
9 | - oo = e.globalData, | |
10 | - r = e.request, | |
11 | - rq = r, | |
12 | - a = require("../../../utils/common.js"), | |
13 | - s = new t.default(); | |
2 | +var t = function (t) { | |
3 | + return t && t.__esModule ? t : { | |
4 | + default: t | |
5 | + }; | |
6 | + }(require("../../../utils/LoadMore.js")), | |
7 | + e = getApp(), | |
8 | + os = e.globalData.setting, | |
9 | + oo = e.globalData, | |
10 | + r = e.request, | |
11 | + rq = r, | |
12 | + a = require("../../../utils/common.js"), | |
13 | + s = new t.default(); | |
14 | 14 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
15 | -var ut= require('../../../utils/util.js'); | |
15 | +var ut = require('../../../utils/util.js'); | |
16 | 16 | var t = require("../../../utils/pay.js"); |
17 | 17 | |
18 | 18 | Page({ |
19 | - data: { | |
20 | - url: e.globalData.setting.url, | |
21 | - resourceUrl: e.globalData.setting.imghost, | |
22 | - iurl: e.globalData.setting.imghost, | |
23 | - categories: [{ | |
24 | - name: "全部", | |
25 | - id: 0 | |
26 | - }, { | |
27 | - name: "待付款", | |
28 | - id: 1 | |
29 | - }, { | |
30 | - name: "待发货", | |
31 | - id: 2 | |
32 | - }, { | |
33 | - name: "待收货", | |
34 | - id: 3 | |
35 | - }, { | |
36 | - name: "待评价", | |
37 | - id: 4 | |
38 | - }], | |
39 | - activeCategoryId: 0, | |
40 | - orderList: null, | |
41 | - currentPage: 1, | |
42 | - //已经读取过接口 | |
43 | - is_get: 0, | |
44 | - conf: null, | |
45 | - iscodeall: null, | |
46 | - sales_rules:1, //默认是显示线上库存 | |
47 | - | |
48 | - //会员的等级价位 | |
49 | - card_field:null, | |
50 | - | |
51 | - back_goods_arr:null, //返回商品的列表 | |
52 | - currentIndex: 0, | |
53 | - | |
54 | - startDate: '', | |
55 | - endDate: '', | |
56 | - list2: [], | |
57 | - currentPage2: 1, | |
58 | - currentDate: '', | |
59 | - total: 0, //读取时段内记录数量 | |
60 | - is_no_data2: 0, | |
61 | - is_no_more2: 0, | |
62 | - | |
63 | - | |
64 | - // 搜索内容 | |
65 | - searchContent: '', | |
66 | - }, | |
67 | - onLoad: function(t) { | |
68 | - // 设置日期选择器的结束时间为当前日期 | |
69 | - var now=new Date(); | |
70 | - var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate(); | |
71 | - var date = new Date(now.getTime() - 7 * 24 * 3600 * 1000); | |
72 | - var startDate=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); | |
73 | - | |
74 | - | |
75 | - if(t.index) { | |
76 | - this.setData({ | |
77 | - currentIndex: t.index | |
78 | - }); | |
79 | - }; | |
80 | - | |
81 | - this.setData({ | |
82 | - currentDate: this.currentDate(), | |
83 | - startDate:startDate, | |
84 | - endDate:nowDate, | |
85 | - }); | |
86 | - | |
87 | - | |
88 | - var th = this; | |
89 | - if (t.type != undefined) this.setData({ | |
90 | - activeCategoryId: t.type | |
91 | - }); | |
92 | - s.init(this, "", "orderList"); | |
93 | - }, | |
94 | - onShow: function() { | |
95 | - var th=this; | |
96 | - //---查看会员的等级价--- | |
97 | - getApp().getConfig2(function(e) { | |
98 | - th.setData({conf: e,sales_rules:e.sales_rules }); | |
99 | - //--- 看后台是不是有开通等级卡 --- | |
100 | - if(e.switch_list){ | |
101 | - var s_list=JSON.parse(e.switch_list); | |
102 | - var user=getApp().globalData.userInfo; | |
103 | - var is_open_offline=s_list.is_pricing_open; | |
104 | - //-- 如果后台有开启等级价的功能 -- | |
105 | - if(parseInt(s_list.rank_switch)==2 && user['card_expiredate']){ | |
106 | - var str = user['card_expiredate'].replace(/-/g, '/'); | |
107 | - var end = new Date(str); | |
108 | - end = Date.parse(end) / 1000; | |
109 | - var now = ut.gettimestamp(); | |
110 | - //--- 判断是等级会员,且在有效期范围内 --- | |
111 | - if(user.card_field && now<end){ | |
112 | - th.setData({card_field:user.card_field}) | |
113 | - } | |
114 | - } | |
115 | - //-- 判断有没有过期 -- | |
116 | - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=6",{}).then(res=>{ | |
117 | - //未购买 | |
118 | - if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){ | |
119 | - is_open_offline=0; | |
120 | - }else{ | |
121 | - //已经过期 | |
122 | - var item=res.data.data.pageData[0]; | |
123 | - if(item.end_time<ut.gettimestamp()){ | |
124 | - is_open_offline=0; | |
125 | - } | |
126 | - } | |
127 | - | |
128 | - th.data.is_open_offline=is_open_offline; | |
129 | - }) | |
130 | - } | |
131 | - },1) | |
132 | - | |
133 | - this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
134 | - | |
135 | - }, | |
136 | - changeTab: function(t) { | |
137 | - if (this.data.activeCategoryId == t.currentTarget.id) return false; | |
138 | - this.resetData(), this.requestOrderList(t.currentTarget.id); | |
139 | - }, | |
140 | - resetData: function() { | |
141 | - s.resetConfig(),this.data.orderList = null, this.data.currentPage = 1; | |
142 | - }, | |
19 | + data: { | |
20 | + url: e.globalData.setting.url, | |
21 | + resourceUrl: e.globalData.setting.imghost, | |
22 | + iurl: e.globalData.setting.imghost, | |
23 | + categories: [{ | |
24 | + name: "全部", | |
25 | + id: 0 | |
26 | + }, { | |
27 | + name: "待付款", | |
28 | + id: 1 | |
29 | + }, { | |
30 | + name: "待发货", | |
31 | + id: 2 | |
32 | + }, { | |
33 | + name: "待收货", | |
34 | + id: 3 | |
35 | + }, { | |
36 | + name: "待评价", | |
37 | + id: 4 | |
38 | + }], | |
39 | + activeCategoryId: 0, | |
40 | + orderList: null, | |
41 | + currentPage: 1, | |
42 | + //已经读取过接口 | |
43 | + is_get: 0, | |
44 | + conf: null, | |
45 | + iscodeall: null, | |
46 | + sales_rules: 1, //默认是显示线上库存 | |
47 | + | |
48 | + //会员的等级价位 | |
49 | + card_field: null, | |
50 | + | |
51 | + back_goods_arr: null, //返回商品的列表 | |
52 | + currentIndex: 0, | |
53 | + | |
54 | + startDate: '', | |
55 | + endDate: '', | |
56 | + list2: [], | |
57 | + currentPage2: 1, | |
58 | + currentDate: '', | |
59 | + total: 0, //读取时段内记录数量 | |
60 | + is_no_data2: 0, | |
61 | + is_no_more2: 0, | |
62 | + | |
63 | + | |
64 | + // 搜索内容 | |
65 | + searchContent: '', | |
66 | + }, | |
67 | + onLoad: function (t) { | |
68 | + // 设置日期选择器的结束时间为当前日期 | |
69 | + var now = new Date(); | |
70 | + var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate(); | |
71 | + var date = new Date(now.getTime() - 7 * 24 * 3600 * 1000); | |
72 | + var startDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); | |
73 | + | |
74 | + | |
75 | + if (t.index) { | |
76 | + this.setData({ | |
77 | + currentIndex: t.index | |
78 | + }); | |
79 | + }; | |
80 | + | |
81 | + this.setData({ | |
82 | + currentDate: this.currentDate(), | |
83 | + startDate: startDate, | |
84 | + endDate: nowDate, | |
85 | + }); | |
86 | + | |
87 | + | |
88 | + var th = this; | |
89 | + if (t.type != undefined) this.setData({ | |
90 | + activeCategoryId: t.type | |
91 | + }); | |
92 | + s.init(this, "", "orderList"); | |
93 | + }, | |
94 | + onShow: function () { | |
95 | + var th = this; | |
96 | + //---查看会员的等级价--- | |
97 | + getApp().getConfig2(function (e) { | |
98 | + th.setData({ | |
99 | + conf: e, | |
100 | + sales_rules: e.sales_rules | |
101 | + }); | |
102 | + //--- 看后台是不是有开通等级卡 --- | |
103 | + if (e.switch_list) { | |
104 | + var s_list = JSON.parse(e.switch_list); | |
105 | + var user = getApp().globalData.userInfo; | |
106 | + var is_open_offline = s_list.is_pricing_open; | |
107 | + //-- 如果后台有开启等级价的功能 -- | |
108 | + if (parseInt(s_list.rank_switch) == 2 && user['card_expiredate']) { | |
109 | + var str = user['card_expiredate'].replace(/-/g, '/'); | |
110 | + var end = new Date(str); | |
111 | + end = Date.parse(end) / 1000; | |
112 | + var now = ut.gettimestamp(); | |
113 | + //--- 判断是等级会员,且在有效期范围内 --- | |
114 | + if (user.card_field && now < end) { | |
115 | + th.setData({ | |
116 | + card_field: user.card_field | |
117 | + }) | |
118 | + } | |
119 | + } | |
120 | + //-- 判断有没有过期 -- | |
121 | + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=6", {}).then(res => { | |
122 | + //未购买 | |
123 | + if (res.data.code != 0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length) { | |
124 | + is_open_offline = 0; | |
125 | + } else { | |
126 | + //已经过期 | |
127 | + var item = res.data.data.pageData[0]; | |
128 | + if (item.end_time < ut.gettimestamp()) { | |
129 | + is_open_offline = 0; | |
130 | + } | |
131 | + } | |
132 | + | |
133 | + th.data.is_open_offline = is_open_offline; | |
134 | + }) | |
135 | + } | |
136 | + }, 1) | |
137 | + | |
138 | + this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
139 | + | |
140 | + }, | |
141 | + changeTab: function (t) { | |
142 | + if (this.data.activeCategoryId == t.currentTarget.id) return false; | |
143 | + this.resetData(), this.requestOrderList(t.currentTarget.id); | |
144 | + }, | |
145 | + resetData: function () { | |
146 | + s.resetConfig(), this.data.orderList = null, this.data.currentPage = 1; | |
147 | + }, | |
143 | 148 | |
144 | 149 | |
145 | 150 | /*---------获取订单列表--------*/ |
146 | 151 | requestOrderList: function (t) { |
147 | 152 | var rd = Math.random() * 100; |
148 | - var e = this, th = e, r = e.data.url + "/api/weshop/order/page?rd=" + rd, a = ""; | |
153 | + var e = this, | |
154 | + th = e, | |
155 | + r = e.data.url + "/api/weshop/order/page?rd=" + rd, | |
156 | + a = ""; | |
149 | 157 | switch (t) { |
150 | 158 | case "1": |
151 | 159 | r += "&wait_status=0"; |
... | ... | @@ -164,16 +172,24 @@ Page({ |
164 | 172 | if (this.data.searchContent) { |
165 | 173 | r += "&keyWord=" + this.data.searchContent; |
166 | 174 | } |
167 | - this.setData({activeCategoryId: t}); | |
175 | + this.setData({ | |
176 | + activeCategoryId: t | |
177 | + }); | |
168 | 178 | r = r + "&page=" + e.data.currentPage; |
169 | 179 | s.request(r, function (t) { |
170 | 180 | |
171 | - th.setData({is_get: 1}); | |
181 | + th.setData({ | |
182 | + is_get: 1 | |
183 | + }); | |
172 | 184 | var data = e.data.orderList; |
173 | 185 | data.forEach(async function (item, ind) { |
174 | 186 | var tt = null; |
175 | 187 | await getApp().request.promiseGet('/api/weshop/ordergoods/list', { |
176 | - data: {order_id: item.order_id, store_id: os.stoid, pageSize: 600}, | |
188 | + data: { | |
189 | + order_id: item.order_id, | |
190 | + store_id: os.stoid, | |
191 | + pageSize: 600 | |
192 | + }, | |
177 | 193 | }).then(res => { |
178 | 194 | tt = res; |
179 | 195 | }) |
... | ... | @@ -184,22 +200,23 @@ Page({ |
184 | 200 | } |
185 | 201 | } |
186 | 202 | |
187 | - data[ind]['ord_url']='/pages/user/order_detail/order_detail'; | |
203 | + data[ind]['ord_url'] = '/pages/user/order_detail/order_detail'; | |
188 | 204 | //-- 如果是优惠活动 -- |
189 | - if(glist[0].prom_type==8){ | |
190 | - await getApp().request.promiseGet('/api/weshop/order/orderPresell/get/'+os.stoid+'/'+item.order_id, { | |
191 | - }).then(res => { | |
192 | - if(res.data.code==0){ | |
205 | + if (glist[0].prom_type == 8) { | |
206 | + await getApp().request.promiseGet('/api/weshop/order/orderPresell/get/' + os.stoid + '/' + item.order_id, {}).then(res => { | |
207 | + if (res.data.code == 0) { | |
193 | 208 | data[ind]['presell'] = res.data.data; |
194 | - data[ind]['ord_url']='/packageC/pages/presell/cart/cart'; | |
209 | + data[ind]['ord_url'] = '/packageC/pages/presell/cart/cart'; | |
195 | 210 | } |
196 | 211 | }) |
197 | 212 | } |
198 | 213 | //------------对比一下有没有退款记录------------ |
199 | 214 | await getApp().request.promiseGet("/api/weshop/order/returngoods/page", { |
200 | 215 | data: { |
201 | - order_id: item.order_id, store_id: os.stoid, | |
202 | - user_id: oo.user_id, pageSize: 20 | |
216 | + order_id: item.order_id, | |
217 | + store_id: os.stoid, | |
218 | + user_id: oo.user_id, | |
219 | + pageSize: 20 | |
203 | 220 | } |
204 | 221 | }).then(rs => { |
205 | 222 | var ttd = rs; |
... | ... | @@ -222,8 +239,8 @@ Page({ |
222 | 239 | }); |
223 | 240 | } else { |
224 | 241 | //--------整单退-------- |
225 | - if (ttd.data.data.pageData[0]['goods_id_list'] != null | |
226 | - && ttd.data.data.pageData[0]['goods_id_list'] != '') { | |
242 | + if (ttd.data.data.pageData[0]['goods_id_list'] != null && | |
243 | + ttd.data.data.pageData[0]['goods_id_list'] != '') { | |
227 | 244 | var eea = ttd.data.data.pageData[0]; |
228 | 245 | //1.退款正在进行中, |
229 | 246 | //2.退款被拒绝就要显示可以退款 |
... | ... | @@ -262,16 +279,16 @@ Page({ |
262 | 279 | if (eea.goods_id == eeb.goods_id) { |
263 | 280 | switch (eea.status) { |
264 | 281 | case 0: |
265 | - case 1://退款处理中 | |
282 | + case 1: //退款处理中 | |
266 | 283 | data[ind]['has_rt'] = 1; //有部分退 |
267 | 284 | goodslist[iii]['return_btn'] = 2; |
268 | 285 | break; |
269 | - case 2://退款完成 | |
286 | + case 2: //退款完成 | |
270 | 287 | data[ind]['has_rt'] = 1; //有部分退 |
271 | 288 | goodslist[iii]['return_btn'] = 4; |
272 | 289 | rt_ok_num++; |
273 | 290 | break; |
274 | - case 3://已拒绝,重新退款 | |
291 | + case 3: //已拒绝,重新退款 | |
275 | 292 | goodslist[iii]['return_btn'] = 3; |
276 | 293 | break; |
277 | 294 | default: |
... | ... | @@ -300,166 +317,175 @@ Page({ |
300 | 317 | }); |
301 | 318 | data[ind]['g_num'] = g_num; |
302 | 319 | }) |
303 | - th.setData({orderList: data,}); | |
320 | + th.setData({ | |
321 | + orderList: data, | |
322 | + }); | |
304 | 323 | |
305 | 324 | }); |
306 | - e.data.currentPage++ , | |
325 | + e.data.currentPage++, | |
307 | 326 | wx.stopPullDownRefresh(); |
308 | - }, null, {store_id: os.stoid, user_id: oo.user_id}); | |
327 | + }, null, { | |
328 | + store_id: os.stoid, | |
329 | + user_id: oo.user_id | |
330 | + }); | |
309 | 331 | }, |
310 | - //滑倒底部 | |
311 | - onReachBottom: function() { | |
312 | - if(this.data.currentIndex == 0) { | |
313 | - if (s.data.goodsLoadFinishFlag) { | |
314 | - this.setData({ | |
315 | - iscodeall: 1 | |
316 | - }) | |
317 | - } | |
318 | - s.canloadMore() && this.requestOrderList(this.data.activeCategoryId); | |
319 | - } else { | |
320 | - this.request_list({ | |
321 | - store_id: os.stoid, | |
322 | - user_id: oo.user_id, | |
323 | - page: this.data.currentPage2, | |
324 | - }); | |
325 | - } | |
326 | - }, | |
327 | - onPullDownRefresh: function(t) { | |
328 | - // sty取消 | |
329 | - // this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
330 | - }, | |
331 | - | |
332 | - /*-----------取消订单-----------*/ | |
333 | - cancelOrder: function(t) { | |
334 | - var e = this, | |
335 | - a = t.currentTarget.dataset.id, | |
336 | - th = this; | |
337 | - var is_zsorder = parseFloat(t.currentTarget.dataset.zsorder); | |
338 | - var index = t.currentTarget.dataset.orderindex; | |
339 | - var order = th.data.orderList[index]; | |
340 | - var is_skill = 0; | |
341 | - var order_goods = order.order_goods; | |
342 | - //--判断是不是秒杀-- | |
343 | - order_goods.forEach(function(val, ind) { | |
344 | - if (val.prom_type == 1) { | |
345 | - is_skill = 1; | |
346 | - return false; | |
347 | - } | |
348 | - }) | |
349 | - | |
350 | - wx.showModal({ | |
351 | - title: "是否取消订单?", | |
352 | - success: function(t) { | |
353 | - //如果是秒杀和拼单的商品,取消订单要返回redis,并取消订单 | |
354 | - if (t.confirm) { | |
355 | - //if(is_skill==1 || is_zsorder>=2){ | |
356 | - getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id, { | |
357 | - data: {}, | |
358 | - success: function(t) { | |
359 | - if (t.data.code == 0) { | |
360 | - 0 == e.data.activeCategoryId ? | |
361 | - (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a); | |
362 | - } else { | |
363 | - getApp().confirmBox(e.data.msg); | |
364 | - } | |
365 | - }, | |
366 | - }) | |
332 | + //滑倒底部 | |
333 | + onReachBottom: function () { | |
334 | + if (this.data.currentIndex == 0) { | |
335 | + if (s.data.goodsLoadFinishFlag) { | |
336 | + this.setData({ | |
337 | + iscodeall: 1 | |
338 | + }) | |
339 | + } | |
340 | + s.canloadMore() && this.requestOrderList(this.data.activeCategoryId); | |
341 | + } else { | |
342 | + this.request_list({ | |
343 | + store_id: os.stoid, | |
344 | + user_id: oo.user_id, | |
345 | + page: this.data.currentPage2, | |
346 | + }); | |
347 | + } | |
348 | + }, | |
349 | + onPullDownRefresh: function (t) { | |
350 | + // sty取消 | |
351 | + // this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
352 | + }, | |
353 | + | |
354 | + /*-----------取消订单-----------*/ | |
355 | + cancelOrder: function (t) { | |
356 | + var e = this, | |
357 | + a = t.currentTarget.dataset.id, | |
358 | + th = this; | |
359 | + var is_zsorder = parseFloat(t.currentTarget.dataset.zsorder); | |
360 | + var index = t.currentTarget.dataset.orderindex; | |
361 | + var order = th.data.orderList[index]; | |
362 | + var is_skill = 0; | |
363 | + var order_goods = order.order_goods; | |
364 | + //--判断是不是秒杀-- | |
365 | + order_goods.forEach(function (val, ind) { | |
366 | + if (val.prom_type == 1) { | |
367 | + is_skill = 1; | |
368 | + return false; | |
369 | + } | |
370 | + }) | |
371 | + | |
372 | + wx.showModal({ | |
373 | + title: "是否取消订单?", | |
374 | + success: function (t) { | |
375 | + //如果是秒杀和拼单的商品,取消订单要返回redis,并取消订单 | |
376 | + if (t.confirm) { | |
377 | + //if(is_skill==1 || is_zsorder>=2){ | |
378 | + getApp().request.post("/api/weshop/order/cancelOrder/" + os.stoid + "/" + a + "/" + getApp().globalData.user_id, { | |
379 | + data: {}, | |
380 | + success: function (t) { | |
381 | + if (t.data.code == 0) { | |
382 | + 0 == e.data.activeCategoryId ? | |
383 | + (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a); | |
384 | + } else { | |
385 | + getApp().confirmBox(e.data.msg); | |
386 | + } | |
387 | + }, | |
388 | + }) | |
389 | + } | |
390 | + } | |
391 | + }); | |
392 | + }, | |
393 | + | |
394 | + /*-----------确认收货-----------*/ | |
395 | + confirmOrder: function (t) { | |
396 | + var e = this, | |
397 | + a = t.currentTarget.dataset.id; | |
398 | + var is_zsorder = t.currentTarget.dataset.zsorder; | |
399 | + var th = this; | |
400 | + | |
401 | + wx.showModal({ | |
402 | + title: "是否确认收货?", | |
403 | + success: function (t) { | |
404 | + t.confirm && rq.post("/api/weshop/order/confirmOrder/" + os.stoid + "/" + a + "/" + getApp().globalData.user_id, { | |
405 | + success: function (e) { | |
406 | + if (e.data.code == 0) { | |
407 | + th.deleteOrderData2(a); | |
408 | + getApp().confirmBox("确认收货成功!"); | |
409 | + } | |
410 | + } | |
411 | + }) | |
412 | + } | |
413 | + }); | |
414 | + }, | |
415 | + | |
416 | + //-----删除订单----- | |
417 | + deleteOrderData: function (t) { | |
418 | + var th = this; | |
419 | + var order_id = t.currentTarget.dataset.order_id; | |
420 | + var index = t.currentTarget.dataset.index; | |
421 | + var up_data = { | |
422 | + order_id: order_id, | |
423 | + isdel: 1 | |
424 | + }; | |
425 | + var order = th.data.orderList[index]; | |
426 | + if (order.order_status != 6) { | |
427 | + up_data.order_status = 5; | |
367 | 428 | } |
368 | - } | |
369 | - }); | |
370 | - }, | |
371 | - | |
372 | - /*-----------确认收货-----------*/ | |
373 | - confirmOrder: function(t) { | |
374 | - var e = this,a = t.currentTarget.dataset.id; | |
375 | - var is_zsorder = t.currentTarget.dataset.zsorder; | |
376 | - var th = this; | |
377 | - | |
378 | - wx.showModal({ | |
379 | - title: "是否确认收货?", | |
380 | - success: function(t) { | |
381 | - t.confirm && rq.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id,{ | |
382 | - success:function (e) { | |
383 | - if(e.data.code==0){ | |
384 | - th.deleteOrderData2(a); | |
385 | - getApp().confirmBox( "确认收货成功!"); | |
386 | - } | |
429 | + wx.showModal({ | |
430 | + title: "是否删除订单?", | |
431 | + success: function (tt) { | |
432 | + tt.confirm && rq.put("/api/weshop/order/updatebyId", { | |
433 | + data: up_data, | |
434 | + success: function (t) { | |
435 | + for (var e = 0; e < th.data.orderList.length; e++) | |
436 | + if (th.data.orderList[e].order_id == order_id) { | |
437 | + th.data.orderList.splice(e, 1), th.setData({ | |
438 | + orderList: th.data.orderList | |
439 | + }); | |
440 | + break; | |
441 | + } | |
442 | + } | |
443 | + }) | |
387 | 444 | } |
388 | - }) | |
389 | - } | |
390 | - }); | |
391 | - }, | |
392 | - | |
393 | - //-----删除订单----- | |
394 | - deleteOrderData: function(t) { | |
395 | - var th = this; | |
396 | - var order_id = t.currentTarget.dataset.order_id; | |
397 | - var index = t.currentTarget.dataset.index; | |
398 | - var up_data={order_id: order_id,isdel:1}; | |
399 | - var order=th.data.orderList[index]; | |
400 | - if(order.order_status!=6){ | |
401 | - up_data.order_status=5; | |
402 | - } | |
403 | - wx.showModal({ | |
404 | - title: "是否删除订单?", | |
405 | - success: function(tt) { | |
406 | - tt.confirm && rq.put("/api/weshop/order/updatebyId", { | |
407 | - data: up_data, | |
408 | - success: function(t) { | |
409 | - for (var e = 0; e < th.data.orderList.length; e++) | |
410 | - if (th.data.orderList[e].order_id == order_id) { | |
445 | + }); | |
446 | + }, | |
447 | + | |
448 | + deleteOrderData2: function (order_id) { | |
449 | + var th = this; | |
450 | + for (var e = 0; e < th.data.orderList.length; e++) | |
451 | + if (th.data.orderList[e].order_id == order_id) { | |
411 | 452 | th.data.orderList.splice(e, 1), th.setData({ |
412 | - orderList: th.data.orderList | |
453 | + orderList: this.data.orderList | |
413 | 454 | }); |
414 | 455 | break; |
415 | - } | |
416 | - } | |
417 | - }) | |
418 | - } | |
419 | - }); | |
420 | - }, | |
421 | - | |
422 | - deleteOrderData2: function(order_id) { | |
423 | - var th = this; | |
424 | - for (var e = 0; e < th.data.orderList.length; e++) | |
425 | - if (th.data.orderList[e].order_id == order_id) { | |
426 | - th.data.orderList.splice(e, 1), th.setData({ | |
427 | - orderList: this.data.orderList | |
428 | - }); | |
429 | - break; | |
430 | - } | |
431 | - }, | |
432 | - | |
433 | - //---判断是不是有退款----- | |
434 | - checkReturnGoodsStatus: function(t) { | |
435 | - var e = t.currentTarget.dataset.recid; | |
436 | - var oid = t.currentTarget.dataset.oid; | |
437 | - r.get("/api/weshop/order/returngoods/page", { | |
438 | - data: { | |
439 | - goods_id: e, | |
440 | - order_id: oid, | |
441 | - store_id: os.stoid | |
442 | - }, | |
443 | - success: function(t) { | |
444 | - if (t.data.code == 0) { | |
445 | - var r = t.data.data.total; | |
446 | - if (0 == r) return wx.navigateTo({ | |
447 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | |
448 | - }); | |
449 | - //--如果拒绝,就重新申请退款-- | |
450 | - if (t.data.data.pageData[0].status == 3) { | |
451 | - return wx.navigateTo({ | |
452 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | |
453 | - }); | |
454 | - } | |
456 | + } | |
457 | + }, | |
455 | 458 | |
456 | - wx.navigateTo({ | |
457 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | |
458 | - }); | |
459 | - } | |
460 | - } | |
461 | - }); | |
462 | - }, | |
459 | + //---判断是不是有退款----- | |
460 | + checkReturnGoodsStatus: function (t) { | |
461 | + var e = t.currentTarget.dataset.recid; | |
462 | + var oid = t.currentTarget.dataset.oid; | |
463 | + r.get("/api/weshop/order/returngoods/page", { | |
464 | + data: { | |
465 | + goods_id: e, | |
466 | + order_id: oid, | |
467 | + store_id: os.stoid | |
468 | + }, | |
469 | + success: function (t) { | |
470 | + if (t.data.code == 0) { | |
471 | + var r = t.data.data.total; | |
472 | + if (0 == r) return wx.navigateTo({ | |
473 | + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | |
474 | + }); | |
475 | + //--如果拒绝,就重新申请退款-- | |
476 | + if (t.data.data.pageData[0].status == 3) { | |
477 | + return wx.navigateTo({ | |
478 | + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | |
479 | + }); | |
480 | + } | |
481 | + | |
482 | + wx.navigateTo({ | |
483 | + url: "/pages/user/return_goods_info/return_goods_info?id=" + r | |
484 | + }); | |
485 | + } | |
486 | + } | |
487 | + }); | |
488 | + }, | |
463 | 489 | /*----------跳转支付-----------*/ |
464 | 490 | async jumpToCart4(t) { |
465 | 491 | var o_index = t.currentTarget.dataset.idx; |
... | ... | @@ -467,7 +493,7 @@ Page({ |
467 | 493 | var th = this; |
468 | 494 | var order = e; |
469 | 495 | var order_goods = e.order_goods; |
470 | - var user_id=getApp().globalData.userInfo.user_id; | |
496 | + var user_id = getApp().globalData.userInfo.user_id; | |
471 | 497 | |
472 | 498 | var wlist = ""; |
473 | 499 | for (var i in order_goods) { |
... | ... | @@ -480,9 +506,13 @@ Page({ |
480 | 506 | }); |
481 | 507 | return false; |
482 | 508 | } |
483 | - | |
509 | + | |
484 | 510 | //要每件每件的商品进行检查,看有么有超出库存,超出限购 |
485 | - var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null,presellList=null; | |
511 | + var good = order_goods[i], | |
512 | + goodsbuynum = 0, | |
513 | + promgoodsbuynum = 0, | |
514 | + gg = null, | |
515 | + presellList = null; | |
486 | 516 | |
487 | 517 | //获取单品的现在的活动状态 |
488 | 518 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => { |
... | ... | @@ -577,16 +607,21 @@ Page({ |
577 | 607 | } |
578 | 608 | |
579 | 609 | //如果是预售的时候, |
580 | - if(good.prom_type==8){ | |
581 | - await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ | |
582 | - data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, | |
583 | - }).then(e=>{ | |
610 | + if (good.prom_type == 8) { | |
611 | + await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum", { | |
612 | + data: { | |
613 | + store_id: os.stoid, | |
614 | + user_id: user_id, | |
615 | + goods_id: good.goods_id, | |
616 | + prom_id: good.prom_id | |
617 | + }, | |
618 | + }).then(e => { | |
584 | 619 | if (e.data.code == 0) { |
585 | - promgoodsbuynum=e.data.data.sumgoodsnum; | |
620 | + promgoodsbuynum = e.data.data.sumgoodsnum; | |
586 | 621 | } |
587 | 622 | }) |
588 | 623 | |
589 | - var presell_id =good.prom_id; | |
624 | + var presell_id = good.prom_id; | |
590 | 625 | var url = "/api/weshop/marketing/marketingPresellList/list" |
591 | 626 | var rd = { |
592 | 627 | store_id: os.stoid, |
... | ... | @@ -599,13 +634,13 @@ Page({ |
599 | 634 | }).then(res => { |
600 | 635 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { |
601 | 636 | var arr = res.data.data[0]; |
602 | - presellList=arr | |
637 | + presellList = arr | |
603 | 638 | } |
604 | 639 | }) |
605 | 640 | |
606 | - if(presellList){ | |
641 | + if (presellList) { | |
607 | 642 | |
608 | - if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){ | |
643 | + if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) { | |
609 | 644 | var content = good.goods_name + '购买数量超出商品库存,请取消订单'; |
610 | 645 | th.toast(content); |
611 | 646 | return false; |
... | ... | @@ -652,38 +687,39 @@ Page({ |
652 | 687 | } |
653 | 688 | |
654 | 689 | //商品的普通购买 ,不要进行判断 |
655 | - if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8) | |
656 | - && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { | |
657 | - if (gg.prom_type != good.prom_type && gg.prom_type>0) { | |
690 | + if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8) && | |
691 | + !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { | |
692 | + if (gg.prom_type != good.prom_type && gg.prom_type > 0) { | |
658 | 693 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; |
659 | 694 | th.toast(content); |
660 | 695 | return false; |
661 | 696 | } |
662 | 697 | |
663 | 698 | } else { |
664 | - if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 4 || gg.prom_type == 5 || gg.prom_type == 6|| gg.prom_type == 10) | |
665 | - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { | |
699 | + if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 4 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 10) && | |
700 | + !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { | |
666 | 701 | //---如果是活动的时候--- |
667 | - var prom = null, th = this; | |
702 | + var prom = null, | |
703 | + th = this; | |
668 | 704 | if (gg.prom_type == 1) { |
669 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/"+ user_id + "/" + gg.prom_id, {}).then(res => { | |
705 | + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => { | |
706 | + if (res.data.code == 0) { | |
707 | + prom = res.data.data; | |
708 | + prom.price = prom.user_price; | |
709 | + } | |
710 | + }) | |
711 | + } | |
712 | + | |
713 | + if (gg.prom_type == 2) { | |
714 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => { | |
670 | 715 | if (res.data.code == 0) { |
671 | 716 | prom = res.data.data; |
672 | - prom.price=prom.user_price; | |
717 | + prom.price = prom.price; | |
673 | 718 | } |
674 | 719 | }) |
675 | 720 | } |
676 | - | |
677 | - if (gg.prom_type == 2) { | |
678 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { | |
679 | - if (res.data.code == 0) { | |
680 | - prom = res.data.data; | |
681 | - prom.price=prom.price; | |
682 | - } | |
683 | - }) | |
684 | - } | |
685 | - | |
686 | - | |
721 | + | |
722 | + | |
687 | 723 | if (gg.prom_type == 6) { |
688 | 724 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => { |
689 | 725 | if (res.data.code == 0) { |
... | ... | @@ -694,7 +730,10 @@ Page({ |
694 | 730 | |
695 | 731 | if (gg.prom_type == 4) { |
696 | 732 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
697 | - data: {store_id: os.stoid, goods_id: gg.goods_id} | |
733 | + data: { | |
734 | + store_id: os.stoid, | |
735 | + goods_id: gg.goods_id | |
736 | + } | |
698 | 737 | }).then(res => { |
699 | 738 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
700 | 739 | prom = res.data.data.pageData[0]; |
... | ... | @@ -702,9 +741,9 @@ Page({ |
702 | 741 | }) |
703 | 742 | } |
704 | 743 | if (gg.prom_type == 10) { |
705 | - var url=`/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${gg.prom_id}`; | |
744 | + var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${gg.prom_id}`; | |
706 | 745 | await getApp().request.promiseGet(url, {}).then(res => { |
707 | - if (res.data.code == 0 && res.data.data && !res.data.data.isuse || res.data.data.is_end==1) { | |
746 | + if (res.data.code == 0 && res.data.data && !res.data.data.isuse || res.data.data.is_end == 1) { | |
708 | 747 | prom = res.data.data; |
709 | 748 | } |
710 | 749 | }) |
... | ... | @@ -718,8 +757,7 @@ Page({ |
718 | 757 | return false; |
719 | 758 | } |
720 | 759 | } |
721 | - } | |
722 | - else { | |
760 | + } else { | |
723 | 761 | if (!good.is_gift && good.prom_type != 3) { |
724 | 762 | var t_ok = 1; |
725 | 763 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { |
... | ... | @@ -747,7 +785,7 @@ Page({ |
747 | 785 | if (!good.is_gift && !good.is_collocation) { |
748 | 786 | if (card_field && gg[card_field] > 0) { |
749 | 787 | if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; |
750 | - if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵,则不通过 | |
788 | + if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵,则不通过 | |
751 | 789 | |
752 | 790 | } else { |
753 | 791 | if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0; |
... | ... | @@ -788,26 +826,28 @@ Page({ |
788 | 826 | } |
789 | 827 | |
790 | 828 | //---如果是活动的时候--- |
791 | - var prom = null, goodsinfo = good, th = this; | |
829 | + var prom = null, | |
830 | + goodsinfo = good, | |
831 | + th = this; | |
792 | 832 | if (goodsinfo.prom_type == 1) { |
793 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/"+ user_id + "/" + goodsinfo.prom_id, {}).then(res => { | |
833 | + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | |
794 | 834 | if (res.data.code == 0) { |
795 | 835 | prom = res.data.data; |
796 | - prom.price=prom.user_price; | |
836 | + prom.price = prom.user_price; | |
797 | 837 | } |
798 | 838 | }) |
799 | 839 | } |
800 | - | |
801 | - if (goodsinfo.prom_type == 2) { | |
802 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { | |
803 | - if (res.data.code == 0) { | |
804 | - prom = res.data.data; | |
805 | - prom.price=prom.price; | |
806 | - } | |
807 | - }) | |
808 | - } | |
809 | - | |
810 | - | |
840 | + | |
841 | + if (goodsinfo.prom_type == 2) { | |
842 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { | |
843 | + if (res.data.code == 0) { | |
844 | + prom = res.data.data; | |
845 | + prom.price = prom.price; | |
846 | + } | |
847 | + }) | |
848 | + } | |
849 | + | |
850 | + | |
811 | 851 | if (goodsinfo.prom_type == 6 && !good.is_pd_normal) { |
812 | 852 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => { |
813 | 853 | if (res.data.code == 0) { |
... | ... | @@ -818,7 +858,10 @@ Page({ |
818 | 858 | |
819 | 859 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { |
820 | 860 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
821 | - data: {store_id: os.stoid, goods_id: goodsinfo.goods_id} | |
861 | + data: { | |
862 | + store_id: os.stoid, | |
863 | + goods_id: goodsinfo.goods_id | |
864 | + } | |
822 | 865 | }).then(res => { |
823 | 866 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
824 | 867 | prom = res.data.data.pageData[0]; |
... | ... | @@ -844,18 +887,18 @@ Page({ |
844 | 887 | } |
845 | 888 | |
846 | 889 | // --看一下会员的秒杀价格是不是发生了变化,因为会员的身份发生了变化 |
847 | - if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ | |
848 | - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | |
890 | + if (goodsinfo.prom_type == 1 && goodsinfo.goods_price != prom.price) { | |
891 | + var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化'; | |
892 | + th.toast(content); | |
893 | + return false; | |
894 | + } | |
895 | + | |
896 | + // --看一下会员的团购价格是不是发生了变化 | |
897 | + if (goodsinfo.prom_type == 2 && goodsinfo.goods_price != prom.price) { | |
898 | + var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化'; | |
849 | 899 | th.toast(content); |
850 | 900 | return false; |
851 | 901 | } |
852 | - | |
853 | - // --看一下会员的团购价格是不是发生了变化 | |
854 | - if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ | |
855 | - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | |
856 | - th.toast(content); | |
857 | - return false; | |
858 | - } | |
859 | 902 | |
860 | 903 | if (goodsinfo.prom_type == 4) { |
861 | 904 | if (good.goods_num > prom.limitqty - prom.buy_num) { |
... | ... | @@ -864,12 +907,12 @@ Page({ |
864 | 907 | th.toast(content); |
865 | 908 | return false; |
866 | 909 | } |
867 | - } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { | |
868 | - if(order.add_time+5*60<ut.gettimestamp()) { | |
910 | + } else if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6) { | |
911 | + if (order.add_time + 5 * 60 < ut.gettimestamp()) { | |
869 | 912 | var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; |
870 | 913 | th.toast(content); |
871 | 914 | return false; |
872 | - } | |
915 | + } | |
873 | 916 | } |
874 | 917 | |
875 | 918 | } |
... | ... | @@ -883,14 +926,13 @@ Page({ |
883 | 926 | if (!keyid) return false; |
884 | 927 | var offarr = null; |
885 | 928 | await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { |
886 | - data: { | |
887 | - VIPId: encodeURIComponent(user_info.erpvipid), | |
888 | - store_id: os.stoid, | |
889 | - PickupId: keyid, | |
890 | - WareIds: wlist | |
891 | - }, | |
929 | + data: { | |
930 | + VIPId: encodeURIComponent(user_info.erpvipid), | |
931 | + store_id: os.stoid, | |
932 | + PickupId: keyid, | |
933 | + WareIds: wlist | |
892 | 934 | }, |
893 | - ).then(res => { | |
935 | + }, ).then(res => { | |
894 | 936 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { |
895 | 937 | offarr = res.data.data; |
896 | 938 | } |
... | ... | @@ -915,288 +957,332 @@ Page({ |
915 | 957 | } |
916 | 958 | th.pay_next(e, o_index); |
917 | 959 | }, |
918 | - | |
919 | - | |
920 | - pay_next(e,o_index){ | |
921 | - var th=this; | |
922 | - if (e.order_amount == 0) { | |
923 | - var dd = { | |
924 | - parent_sn: e.order_sn, | |
925 | - store_id: e.store_id, | |
926 | - type: 1, | |
927 | - }; | |
928 | - getApp().request.post("/api/weshop/order/pay/createOrder", { | |
929 | - data: dd, | |
930 | - success: function(t) { | |
931 | - if (t.data.code == 0) { | |
932 | - th.onload(); | |
933 | - } else { | |
934 | - getApp().confirmBox(t.data.msg + "请您取消该订单"); | |
935 | - } | |
936 | - } | |
937 | - }) | |
938 | - return false; | |
939 | - } | |
940 | - | |
941 | - /*--- | |
942 | - a.jumpToCart4({ | |
943 | - order_sn: e.order_sn, | |
944 | - order_amount: e.order_amount, | |
945 | - type: 1 //正常单 | |
946 | - });--*/ | |
947 | - | |
948 | - t.pay(e.order_sn, function() { | |
949 | - wx.showToast({title: '支付成功'}) | |
950 | - th.data.orderList.splice(o_index,1); | |
951 | - th.setData({orderList:th.data.orderList}); | |
952 | - },null,os.stoid,1); | |
953 | - | |
954 | - | |
955 | - }, | |
956 | - | |
960 | + | |
961 | + | |
962 | + pay_next(e, o_index) { | |
963 | + var th = this; | |
964 | + if (e.order_amount == 0) { | |
965 | + var dd = { | |
966 | + parent_sn: e.order_sn, | |
967 | + store_id: e.store_id, | |
968 | + type: 1, | |
969 | + }; | |
970 | + getApp().request.post("/api/weshop/order/pay/createOrder", { | |
971 | + data: dd, | |
972 | + success: function (t) { | |
973 | + if (t.data.code == 0) { | |
974 | + th.onload(); | |
975 | + } else { | |
976 | + getApp().confirmBox(t.data.msg + "请您取消该订单"); | |
977 | + } | |
978 | + } | |
979 | + }) | |
980 | + return false; | |
981 | + } | |
982 | + | |
983 | + /*--- | |
984 | + a.jumpToCart4({ | |
985 | + order_sn: e.order_sn, | |
986 | + order_amount: e.order_amount, | |
987 | + type: 1 //正常单 | |
988 | + });--*/ | |
989 | + | |
990 | + t.pay(e.order_sn, function () { | |
991 | + wx.showToast({ | |
992 | + title: '支付成功' | |
993 | + }) | |
994 | + th.data.orderList.splice(o_index, 1); | |
995 | + th.setData({ | |
996 | + orderList: th.data.orderList | |
997 | + }); | |
998 | + }, null, os.stoid, 1); | |
999 | + | |
1000 | + | |
1001 | + }, | |
1002 | + | |
957 | 1003 | //---检验线下库存的数量的子函数--- |
958 | - async check_down_line_next(gg,num,pick_id,func){ | |
959 | - | |
960 | - var lock=0,pick_no,plist; | |
961 | - //先读取门店的lock | |
962 | - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | |
963 | - data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id} | |
964 | - }).then(res=>{ | |
965 | - if(res.data.code==0 && res.data.data.total>0){ | |
966 | - for(var i in res.data.data.pageData) | |
967 | - lock+=res.data.data.pageData[i].outQty; | |
968 | - } | |
969 | - }) | |
970 | - //先获取门店的编号 | |
971 | - await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ | |
972 | - data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id} | |
973 | - }).then(res=>{ | |
974 | - if(res.data.code==0){ | |
975 | - pick_no=res.data.data.pickup_no; | |
976 | - } | |
977 | - }) | |
978 | - //读取线下的门店库存 | |
979 | - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | |
980 | - data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid} | |
981 | - }).then(res=>{ | |
982 | - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
983 | - plist=res.data.data.pageData[0]; | |
984 | - } | |
985 | - }) | |
986 | - | |
987 | - var ob={}; ob.code=1; | |
988 | - if(!plist){ | |
989 | - ob.code=-1; ob.CanOutQty=0; | |
990 | - func(ob);return false; | |
991 | - } | |
992 | - | |
993 | - if(num>plist.CanOutQty-lock){ | |
994 | - ob.code=-1; | |
995 | - ob.CanOutQty=plist.CanOutQty-lock | |
996 | - if(ob.CanOutQty<0) ob.CanOutQty=0; | |
997 | - } | |
998 | - func(ob) | |
1004 | + async check_down_line_next(gg, num, pick_id, func) { | |
1005 | + | |
1006 | + var lock = 0, | |
1007 | + pick_no, plist; | |
1008 | + //先读取门店的lock | |
1009 | + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { | |
1010 | + data: { | |
1011 | + store_id: os.stoid, | |
1012 | + wareId: gg.goods_id, | |
1013 | + storageId: pick_id | |
1014 | + } | |
1015 | + }).then(res => { | |
1016 | + if (res.data.code == 0 && res.data.data.total > 0) { | |
1017 | + for (var i in res.data.data.pageData) | |
1018 | + lock += res.data.data.pageData[i].outQty; | |
1019 | + } | |
1020 | + }) | |
1021 | + //先获取门店的编号 | |
1022 | + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick_id, { | |
1023 | + data: { | |
1024 | + storeId: os.stoid, | |
1025 | + goodsId: gg.goods_id, | |
1026 | + pickupId: pick_id | |
1027 | + } | |
1028 | + }).then(res => { | |
1029 | + if (res.data.code == 0) { | |
1030 | + pick_no = res.data.data.pickup_no; | |
1031 | + } | |
1032 | + }) | |
1033 | + //读取线下的门店库存 | |
1034 | + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { | |
1035 | + data: { | |
1036 | + storageNos: pick_no, | |
1037 | + wareIds: encodeURIComponent(gg.erpwareid), | |
1038 | + storeId: os.stoid | |
1039 | + } | |
1040 | + }).then(res => { | |
1041 | + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { | |
1042 | + plist = res.data.data.pageData[0]; | |
1043 | + } | |
1044 | + }) | |
1045 | + | |
1046 | + var ob = {}; | |
1047 | + ob.code = 1; | |
1048 | + if (!plist) { | |
1049 | + ob.code = -1; | |
1050 | + ob.CanOutQty = 0; | |
1051 | + func(ob); | |
1052 | + return false; | |
1053 | + } | |
1054 | + | |
1055 | + if (num > plist.CanOutQty - lock) { | |
1056 | + ob.code = -1; | |
1057 | + ob.CanOutQty = plist.CanOutQty - lock | |
1058 | + if (ob.CanOutQty < 0) ob.CanOutQty = 0; | |
1059 | + } | |
1060 | + func(ob) | |
999 | 1061 | }, |
1000 | - | |
1001 | - | |
1002 | - | |
1003 | - //------图片失败,默认图片--------- | |
1004 | - bind_bnerr: function(e) { | |
1005 | - var _errImg = e.currentTarget.dataset.errorimg; | |
1006 | - var _errObj = {}; | |
1007 | - _errObj[_errImg] = "public/images/default_goods_image_240.gif"; | |
1008 | - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | |
1009 | - }, | |
1010 | - | |
1011 | - //--------跳转到退款详情----------- | |
1012 | - gotoreturn: function(t) { | |
1013 | - var e = t.currentTarget.dataset.recid; | |
1014 | - var oid = t.currentTarget.dataset.oid; | |
1015 | - var wh = ""; | |
1016 | - if (e != undefined && e != null && e != "") { | |
1017 | - wh = "&goods_id=" + e; | |
1018 | - } | |
1019 | - wx.navigateTo({ | |
1020 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | |
1021 | - }); | |
1022 | - }, | |
1023 | - | |
1024 | - //-----支付尾款------ | |
1025 | - pay_wk: function(ee) { | |
1026 | - console.log("pay_wk"); | |
1027 | - var order_id = ee.currentTarget.dataset.order_id; | |
1028 | - wx.navigateTo({ | |
1029 | - url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id, | |
1030 | - }); | |
1031 | - | |
1032 | - }, | |
1033 | - | |
1034 | - //--判断是不是可以单个商品退-- | |
1035 | - check_for_return_btn: function(item) { | |
1036 | - if (item.coupon_no) return false; //有用优惠券 | |
1037 | - if (item.order_prom_id) return false; //有订单优惠 | |
1038 | - if (item.order_status >= 2) return false; //订单状态>2 | |
1039 | - var istrue = true; | |
1040 | - //----判断是不是有优惠活动和赠送商品---- | |
1041 | - for (var g in item.goodslist) { | |
1042 | - var g_item = item.goodslist[g]; | |
1043 | - if ((g_item.prom_type == 3 && g_item.discount_amount > 0) || | |
1044 | - (g_item.prom_type == 3 && g_item.goods_price <= 0) | |
1045 | - ) { | |
1046 | - istrue = false; | |
1047 | - break | |
1048 | - } | |
1049 | - if (g_item.prom_type == 5) { | |
1050 | - istrue = false; | |
1051 | - break | |
1052 | - } | |
1053 | - } | |
1054 | - if (!istrue) return false; | |
1055 | - var conf = this.data.conf; | |
1056 | - //判断是不是原路退回 | |
1057 | - if (conf.refund_type == 1) return true; | |
1058 | - else { | |
1059 | - if (item.order_amount == 0 || item.user_money == 0) return true; | |
1060 | - } | |
1061 | - return false; | |
1062 | - }, | |
1063 | - //跳到首页 | |
1064 | - goto: function(e) { | |
1065 | - wx.navigateTo({ | |
1066 | - url: '/pages/index/index/index', | |
1067 | - }) | |
1068 | - }, | |
1069 | - | |
1070 | - //显示核销码 | |
1071 | - code_show: function(e) { | |
1072 | - var th = this; | |
1073 | - //--获取成功的时候-- | |
1074 | - var no = e.currentTarget.dataset.order_sn; | |
1075 | - var qc_com = th.selectComponent("#qc_com"); //组件的id | |
1076 | - var obj = { | |
1077 | - val: no, | |
1078 | - content: "请将二维码展示给核销员,收货更快捷" | |
1079 | - }; | |
1080 | - qc_com.open(obj) | |
1081 | - }, | |
1082 | - | |
1083 | - //再来一单的功能的实现 | |
1084 | - moreOrder:function(e){ | |
1085 | - | |
1086 | - if(this.data.moring) return false; | |
1087 | - this.data.moring=1; | |
1088 | - | |
1089 | - var th=this; | |
1090 | - var index=e.currentTarget.dataset.index; | |
1091 | - var item=th.data.orderList[index]; | |
1092 | - th.check_more_order(item); | |
1093 | - }, | |
1094 | - | |
1095 | - | |
1096 | - check_more_order:async function(item){ | |
1097 | - console.log(item,100000); | |
1098 | - var pickup=null,th=this; | |
1099 | - var user_id=getApp().globalData.user_id; | |
1062 | + | |
1063 | + | |
1064 | + | |
1065 | + //------图片失败,默认图片--------- | |
1066 | + bind_bnerr: function (e) { | |
1067 | + var _errImg = e.currentTarget.dataset.errorimg; | |
1068 | + var _errObj = {}; | |
1069 | + _errObj[_errImg] = "public/images/default_goods_image_240.gif"; | |
1070 | + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | |
1071 | + }, | |
1072 | + | |
1073 | + //--------跳转到退款详情----------- | |
1074 | + gotoreturn: function (t) { | |
1075 | + var e = t.currentTarget.dataset.recid; | |
1076 | + var oid = t.currentTarget.dataset.oid; | |
1077 | + var wh = ""; | |
1078 | + if (e != undefined && e != null && e != "") { | |
1079 | + wh = "&goods_id=" + e; | |
1080 | + } | |
1081 | + wx.navigateTo({ | |
1082 | + url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | |
1083 | + }); | |
1084 | + }, | |
1085 | + | |
1086 | + //-----支付尾款------ | |
1087 | + pay_wk: function (ee) { | |
1088 | + console.log("pay_wk"); | |
1089 | + var order_id = ee.currentTarget.dataset.order_id; | |
1090 | + wx.navigateTo({ | |
1091 | + url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id, | |
1092 | + }); | |
1093 | + | |
1094 | + }, | |
1095 | + | |
1096 | + //--判断是不是可以单个商品退-- | |
1097 | + check_for_return_btn: function (item) { | |
1098 | + if (item.coupon_no) return false; //有用优惠券 | |
1099 | + if (item.order_prom_id) return false; //有订单优惠 | |
1100 | + if (item.order_status >= 2) return false; //订单状态>2 | |
1101 | + var istrue = true; | |
1102 | + //----判断是不是有优惠活动和赠送商品---- | |
1103 | + for (var g in item.goodslist) { | |
1104 | + var g_item = item.goodslist[g]; | |
1105 | + if ((g_item.prom_type == 3 && g_item.discount_amount > 0) || | |
1106 | + (g_item.prom_type == 3 && g_item.goods_price <= 0) | |
1107 | + ) { | |
1108 | + istrue = false; | |
1109 | + break | |
1110 | + } | |
1111 | + if (g_item.prom_type == 5) { | |
1112 | + istrue = false; | |
1113 | + break | |
1114 | + } | |
1115 | + } | |
1116 | + if (!istrue) return false; | |
1117 | + var conf = this.data.conf; | |
1118 | + //判断是不是原路退回 | |
1119 | + if (conf.refund_type == 1) return true; | |
1120 | + else { | |
1121 | + if (item.order_amount == 0 || item.user_money == 0) return true; | |
1122 | + } | |
1123 | + return false; | |
1124 | + }, | |
1125 | + //跳到首页 | |
1126 | + goto: function (e) { | |
1127 | + wx.navigateTo({ | |
1128 | + url: '/pages/index/index/index', | |
1129 | + }) | |
1130 | + }, | |
1131 | + | |
1132 | + //显示核销码 | |
1133 | + code_show: function (e) { | |
1134 | + var th = this; | |
1135 | + //--获取成功的时候-- | |
1136 | + var no = e.currentTarget.dataset.order_sn; | |
1137 | + var qc_com = th.selectComponent("#qc_com"); //组件的id | |
1138 | + var obj = { | |
1139 | + val: no, | |
1140 | + content: "请将二维码展示给核销员,收货更快捷" | |
1141 | + }; | |
1142 | + qc_com.open(obj) | |
1143 | + }, | |
1144 | + | |
1145 | + //再来一单的功能的实现 | |
1146 | + moreOrder: function (e) { | |
1147 | + | |
1148 | + if (this.data.moring) return false; | |
1149 | + this.data.moring = 1; | |
1150 | + | |
1151 | + var th = this; | |
1152 | + var index = e.currentTarget.dataset.index; | |
1153 | + var item = th.data.orderList[index]; | |
1154 | + th.check_more_order(item); | |
1155 | + }, | |
1156 | + | |
1157 | + | |
1158 | + check_more_order: async function (item) { | |
1159 | + console.log(item, 100000); | |
1160 | + var pickup = null, | |
1161 | + th = this; | |
1162 | + var user_id = getApp().globalData.user_id; | |
1100 | 1163 | wx.showLoading(); |
1101 | 1164 | //--------获取门店----------- |
1102 | 1165 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { |
1103 | 1166 | |
1104 | - }).then(res=>{ | |
1167 | + }).then(res => { | |
1105 | 1168 | pickup = res.data.data; |
1106 | 1169 | }) |
1107 | 1170 | |
1108 | 1171 | //--------获取商品---------- |
1109 | - var goods_list=item.order_goods; | |
1172 | + var goods_list = item.order_goods; | |
1110 | 1173 | //--- 返回的内容 --- |
1111 | - var back_goods_arr=[]; | |
1112 | - var err_text=""; | |
1113 | - for(var i in goods_list){ | |
1114 | - var g_item=goods_list[i]; | |
1174 | + var back_goods_arr = []; | |
1175 | + var err_text = ""; | |
1176 | + for (var i in goods_list) { | |
1177 | + var g_item = goods_list[i]; | |
1178 | + var b_item = {} | |
1115 | 1179 | //--如果是赠品,不加入购物车-- |
1116 | - if(g_item['is_gift']) continue; | |
1117 | - if(g_item['prom_type']==4 ){ | |
1118 | - err_text+= g_item['goods_name']+"积分购商品不加入购物车\n"; | |
1180 | + if (g_item['is_gift']) continue; | |
1181 | + if (g_item['prom_type'] == 4) { | |
1182 | + err_text += g_item['goods_name'] + "积分购商品不加入购物车\n"; | |
1119 | 1183 | continue; |
1120 | 1184 | } |
1121 | - if(g_item['prom_type']==5){ | |
1122 | - err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n"; | |
1185 | + if (g_item['prom_type'] == 5) { | |
1186 | + err_text += g_item['goods_name'] + "搭配购商品不加入购物车\n"; | |
1123 | 1187 | continue; |
1124 | 1188 | } |
1125 | - if(g_item['prom_type']==6 ){ | |
1126 | - err_text+= g_item['goods_name']+"拼团商品不加入购物车\n"; | |
1189 | + if (g_item['prom_type'] == 6) { | |
1190 | + err_text += g_item['goods_name'] + "拼团商品不加入购物车\n"; | |
1127 | 1191 | continue; |
1128 | 1192 | } |
1129 | 1193 | |
1130 | 1194 | //--获取商品-- |
1131 | - var good=null; | |
1195 | + var good = null; | |
1132 | 1196 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, { |
1133 | 1197 | |
1134 | - }).then(res=>{ | |
1135 | - good=res.data.data; | |
1136 | - }) | |
1198 | + }).then(res => { | |
1199 | + good = res.data.data; | |
1137 | 1200 | |
1138 | - if(!good){ | |
1139 | - err_text+= g_item['goods_name']+"未找到商品\n"; | |
1201 | + }) | |
1202 | + //调用接口判断订单优惠, | |
1203 | + const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) | |
1204 | + if (res.data.code == 0 && res.data.data) { | |
1205 | + var r_data = res.data.data; | |
1206 | + if (r_data.ladderLists) { | |
1207 | + var act_id = r_data.ladderLists[0].form_id; | |
1208 | + //-- 判断会员能不能参与阶梯促销 -- | |
1209 | + const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) | |
1210 | + if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { | |
1211 | + b_item.prom_type = 10; | |
1212 | + b_item.prom_id = data.data.data.id; | |
1213 | + } | |
1214 | + } | |
1215 | + } | |
1216 | + | |
1217 | + if (!good) { | |
1218 | + err_text += g_item['goods_name'] + "未找到商品\n"; | |
1140 | 1219 | continue; |
1141 | 1220 | } |
1142 | 1221 | if (good.is_on_sale != 1) { |
1143 | - err_text+= g_item['goods_name']+"已经下架\n"; | |
1222 | + err_text += g_item['goods_name'] + "已经下架\n"; | |
1144 | 1223 | continue; |
1145 | 1224 | } |
1146 | 1225 | |
1147 | 1226 | var timestamp = ut.gettimestamp(); |
1148 | 1227 | if (good.on_time > timestamp) { |
1149 | - err_text+= g_item['goods_name']+"还未上架\n"; | |
1228 | + err_text += g_item['goods_name'] + "还未上架\n"; | |
1150 | 1229 | continue; |
1151 | 1230 | } |
1152 | 1231 | if (good.down_time > 0) { |
1153 | 1232 | if (good.down_time < timestamp) { |
1154 | - err_text+=g_item['goods_name']+"已经下架\n"; | |
1233 | + err_text += g_item['goods_name'] + "已经下架\n"; | |
1155 | 1234 | continue; |
1156 | 1235 | } |
1157 | 1236 | } |
1158 | 1237 | |
1159 | 1238 | //如果商品的配送方式和门店不匹配 |
1160 | - if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){ | |
1161 | - err_text+= good['goods_name']+"配送方式不一致\n"; | |
1239 | + if (good['distr_type'] > 0 && pickup['distr_type'] > 0 && good['distr_type'] != pickup['distr_type']) { | |
1240 | + err_text += good['goods_name'] + "配送方式不一致\n"; | |
1162 | 1241 | continue; |
1163 | 1242 | } |
1164 | 1243 | |
1165 | - var prom=null; | |
1166 | - var b_item={} | |
1167 | - b_item.goods_id=g_item.goods_id; | |
1168 | - b_item.goods_name=g_item.goods_name; | |
1169 | - b_item.goods_num=g_item.goods_num; | |
1170 | - b_item.guide_id=g_item.guide_id; | |
1171 | - b_item.guide_type=g_item.guide_type; | |
1172 | - b_item.pickup_id=item.pickup_id; | |
1173 | - b_item.price=good.shop_price; | |
1174 | - b_item.goods_sn=good.goods_sn; | |
1175 | - b_item.sku=good.sku; | |
1176 | - b_item.is_integral_normal=g_item.is_integral_normal; | |
1177 | - | |
1244 | + var prom = null; | |
1245 | + | |
1246 | + b_item.goods_id = g_item.goods_id; | |
1247 | + b_item.goods_name = g_item.goods_name; | |
1248 | + b_item.goods_num = g_item.goods_num; | |
1249 | + b_item.guide_id = g_item.guide_id; | |
1250 | + b_item.guide_type = g_item.guide_type; | |
1251 | + b_item.pickup_id = item.pickup_id; | |
1252 | + b_item.price = good.shop_price; | |
1253 | + b_item.goods_sn = good.goods_sn; | |
1254 | + b_item.sku = good.sku; | |
1255 | + b_item.is_integral_normal = g_item.is_integral_normal; | |
1256 | + console.log(b_item, 'b_item'); | |
1178 | 1257 | //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 -- |
1179 | - var card_field=th.data.card_field; | |
1180 | - if(card_field && good[card_field]>0){ | |
1181 | - b_item.price=good[card_field]; | |
1258 | + var card_field = th.data.card_field; | |
1259 | + if (card_field && good[card_field] > 0) { | |
1260 | + b_item.price = good[card_field]; | |
1182 | 1261 | } |
1183 | 1262 | |
1184 | - var url="/api/weshop/activitylist/getGoodActInfo"; | |
1185 | - var req_data={ | |
1186 | - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 | |
1263 | + var url = "/api/weshop/activitylist/getGoodActInfo"; | |
1264 | + var req_data = { | |
1265 | + store_id: g_item.store_id, | |
1266 | + goodsidlist: g_item.goods_id, | |
1267 | + is_detail: 1 | |
1187 | 1268 | }; |
1188 | - await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | |
1189 | - if(res.data.code==0){ | |
1190 | - var list = res.data.data; | |
1191 | - console.log('list',list); | |
1192 | - for(let i in list){ | |
1193 | - let item=list[i]; | |
1194 | - if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; } | |
1195 | - } | |
1196 | - } | |
1269 | + await getApp().request.promiseGet(url, { | |
1270 | + data: req_data | |
1271 | + }).then(res => { | |
1272 | + if (res.data.code == 0) { | |
1273 | + var list = res.data.data; | |
1274 | + console.log('list', list); | |
1275 | + for (let i in list) { | |
1276 | + let item = list[i]; | |
1277 | + if (item.prom_type == 1) { | |
1278 | + good.prom_type = 1; | |
1279 | + good.prom_id = item.act_id; | |
1280 | + } | |
1281 | + } | |
1282 | + } | |
1197 | 1283 | }) |
1198 | 1284 | |
1199 | - if(!prom) { | |
1285 | + if (!prom) { | |
1200 | 1286 | //--判断商品当前的活动情况-- |
1201 | 1287 | switch (good.prom_type) { |
1202 | 1288 | case 1: |
... | ... | @@ -1213,22 +1299,22 @@ Page({ |
1213 | 1299 | b_item.price = prom.user_price; |
1214 | 1300 | } |
1215 | 1301 | break; |
1216 | - | |
1217 | - case 2: | |
1218 | - var group = null; | |
1219 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => { | |
1220 | - if (res.data.code == 0) { | |
1221 | - group = res.data.data; | |
1222 | - } | |
1223 | - }) | |
1224 | - //----进行中----- | |
1225 | - if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { | |
1226 | - prom = group; | |
1227 | - prom.price = prom.price; | |
1228 | - b_item.price = prom.price; | |
1229 | - } | |
1230 | - break; | |
1231 | - | |
1302 | + | |
1303 | + case 2: | |
1304 | + var group = null; | |
1305 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => { | |
1306 | + if (res.data.code == 0) { | |
1307 | + group = res.data.data; | |
1308 | + } | |
1309 | + }) | |
1310 | + //----进行中----- | |
1311 | + if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { | |
1312 | + prom = group; | |
1313 | + prom.price = prom.price; | |
1314 | + b_item.price = prom.price; | |
1315 | + } | |
1316 | + break; | |
1317 | + | |
1232 | 1318 | case 6: |
1233 | 1319 | b_item.is_pd_normal = 1; |
1234 | 1320 | break; |
... | ... | @@ -1237,9 +1323,9 @@ Page({ |
1237 | 1323 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; |
1238 | 1324 | await getApp().request.promiseGet(url, {}).then(res => { |
1239 | 1325 | if (res.data.code == 0 && res.data.data) { |
1240 | - if (res.data.data.is_show == 1 && res.data.data.is_end == 0 | |
1241 | - && ut.gettimestamp() < res.data.data.end_time | |
1242 | - && ut.gettimestamp() > res.data.data.start_time | |
1326 | + if (res.data.data.is_show == 1 && res.data.data.is_end == 0 && | |
1327 | + ut.gettimestamp() < res.data.data.end_time && | |
1328 | + ut.gettimestamp() > res.data.data.start_time | |
1243 | 1329 | ) { |
1244 | 1330 | b_item.prom_type = 7; |
1245 | 1331 | b_item.prom_id = res.data.data.id; |
... | ... | @@ -1250,10 +1336,10 @@ Page({ |
1250 | 1336 | }) |
1251 | 1337 | break; |
1252 | 1338 | case 10: |
1253 | - let user_id=getApp().globalData.userInfo.user_id; | |
1254 | - var url=`/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; | |
1255 | - await getApp().request.promiseGet(url,{}).then(res=>{ | |
1256 | - if(res.data.code==0 && res.data.data && res.data.data.isuse && res.data.data.is_end==0){ | |
1339 | + let user_id = getApp().globalData.userInfo.user_id; | |
1340 | + var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; | |
1341 | + await getApp().request.promiseGet(url, {}).then(res => { | |
1342 | + if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) { | |
1257 | 1343 | b_item.prom_type = 10; |
1258 | 1344 | b_item.prom_id = res.data.data.id; |
1259 | 1345 | } |
... | ... | @@ -1262,13 +1348,13 @@ Page({ |
1262 | 1348 | } |
1263 | 1349 | |
1264 | 1350 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 |
1265 | - if(g_item.prom_type==3 || good.prom_type==3){ | |
1351 | + if (g_item.prom_type == 3 || good.prom_type == 3) { | |
1266 | 1352 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { |
1267 | 1353 | if (res.data.code == 0) { |
1268 | 1354 | var r_data = res.data.data; |
1269 | 1355 | if (r_data.promGoodsLists) { |
1270 | - b_item.prom_type=3; | |
1271 | - b_item.prom_id=r_data.promGoodsLists[0].prom_id; | |
1356 | + b_item.prom_type = 3; | |
1357 | + b_item.prom_id = r_data.promGoodsLists[0].prom_id; | |
1272 | 1358 | } |
1273 | 1359 | } |
1274 | 1360 | }) |
... | ... | @@ -1276,34 +1362,41 @@ Page({ |
1276 | 1362 | |
1277 | 1363 | |
1278 | 1364 | //判断是不是线下库存的购买, 是不是秒杀活动 |
1279 | - if(th.data.sales_rules==2 && !prom){ | |
1365 | + if (th.data.sales_rules == 2 && !prom) { | |
1280 | 1366 | |
1281 | 1367 | //-- 看一下购物车上有多少商品 -- |
1282 | - var cart_num=0; | |
1368 | + var cart_num = 0; | |
1283 | 1369 | await getApp().request.promiseGet("/api/weshop/cart/page", { |
1284 | 1370 | data: { |
1285 | 1371 | store_id: os.stoid, |
1286 | 1372 | user_id: getApp().globalData.user_id, |
1287 | - state:0, is_gift:0, | |
1288 | - goods_id:good.goods_id, | |
1373 | + state: 0, | |
1374 | + is_gift: 0, | |
1375 | + goods_id: good.goods_id, | |
1289 | 1376 | pick_id: b_item.pickup_id |
1290 | 1377 | } |
1291 | - }).then(res=>{ | |
1378 | + }).then(res => { | |
1292 | 1379 | var num = 0; |
1293 | - if(res.data.code==0 && res.data.data && res.data.data.pageData) { | |
1380 | + if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | |
1294 | 1381 | for (var i = 0; i < res.data.data.pageData.length; i++) { |
1295 | 1382 | num += res.data.data.pageData[i].goods_num; |
1296 | 1383 | } |
1297 | 1384 | } |
1298 | - cart_num=num; | |
1385 | + cart_num = num; | |
1299 | 1386 | }) |
1300 | 1387 | |
1301 | - var lock=0,plist=null; | |
1388 | + var lock = 0, | |
1389 | + plist = null; | |
1302 | 1390 | |
1303 | - if(b_item.prom_type!=7) { | |
1391 | + if (b_item.prom_type != 7) { | |
1304 | 1392 | //先读取门店的lock, |
1305 | 1393 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { |
1306 | - data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000} | |
1394 | + data: { | |
1395 | + store_id: os.stoid, | |
1396 | + wareId: good.goods_id, | |
1397 | + storageId: b_item.pickup_id, | |
1398 | + pageSize: 1000 | |
1399 | + } | |
1307 | 1400 | }).then(res => { |
1308 | 1401 | if (res.data.code == 0 && res.data.data.total > 0) { |
1309 | 1402 | for (var i in res.data.data.pageData) |
... | ... | @@ -1336,100 +1429,101 @@ Page({ |
1336 | 1429 | b_item.goods_num = plist.CanOutQty - lock; |
1337 | 1430 | } |
1338 | 1431 | } |
1339 | - var req_data={ | |
1432 | + var req_data = { | |
1340 | 1433 | store_id: os.stoid, |
1341 | 1434 | user_id: getApp().globalData.user_id, |
1342 | 1435 | goods_id: good.goods_id, |
1343 | 1436 | }; |
1344 | - if(b_item.prom_type==7){ | |
1345 | - req_data.prom_type=7; | |
1346 | - req_data.prom_id=b_item.prom_id; | |
1437 | + if (b_item.prom_type == 7) { | |
1438 | + req_data.prom_type = 7; | |
1439 | + req_data.prom_id = b_item.prom_id; | |
1347 | 1440 | } |
1348 | 1441 | |
1349 | - var buynum=0; | |
1350 | - var promnum=0; | |
1442 | + var buynum = 0; | |
1443 | + var promnum = 0; | |
1351 | 1444 | //---要获得商品,该用户买了多少件,同步应用--- |
1352 | 1445 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
1353 | 1446 | data: req_data, |
1354 | 1447 | }).then(res => { |
1355 | - if(res.data.code==0){ | |
1448 | + if (res.data.code == 0) { | |
1356 | 1449 | var buy_num_data = res.data.data; |
1357 | 1450 | buynum = buy_num_data.goodsbuynum; |
1358 | - if(buy_num_data.promgoodsbuynum){ | |
1359 | - promnum=buy_num_data.promgoodsbuynum; | |
1451 | + if (buy_num_data.promgoodsbuynum) { | |
1452 | + promnum = buy_num_data.promgoodsbuynum; | |
1360 | 1453 | } |
1361 | 1454 | } |
1362 | 1455 | }) |
1363 | 1456 | |
1364 | 1457 | //---- 要计算商品的限购 ----- |
1365 | - if(good['viplimited']>0){ | |
1366 | - if(cart_num+buynum>good['viplimited']){ | |
1367 | - err_text+= good['goods_name']+"超出限购\n"; | |
1458 | + if (good['viplimited'] > 0) { | |
1459 | + if (cart_num + buynum > good['viplimited']) { | |
1460 | + err_text += good['goods_name'] + "超出限购\n"; | |
1368 | 1461 | continue; |
1369 | 1462 | } |
1370 | - good['viplimited']-=(cart_num+buynum); | |
1371 | - if(b_item.goods_num>good['viplimited']){ | |
1372 | - b_item.goods_num=good['viplimited']; | |
1463 | + good['viplimited'] -= (cart_num + buynum); | |
1464 | + if (b_item.goods_num > good['viplimited']) { | |
1465 | + b_item.goods_num = good['viplimited']; | |
1373 | 1466 | } |
1374 | 1467 | } |
1375 | 1468 | //不需要计算组合购的限购 |
1376 | 1469 | |
1377 | - back_goods_arr.push(b_item); //返回商品元素 | |
1470 | + back_goods_arr.push(b_item); //返回商品元素 | |
1378 | 1471 | |
1379 | - }else{ | |
1472 | + } else { | |
1380 | 1473 | |
1381 | 1474 | //-- 看一下购物车上有多少商品 -- |
1382 | - var cart_num=0; | |
1475 | + var cart_num = 0; | |
1383 | 1476 | await getApp().request.promiseGet("/api/weshop/cart/page", { |
1384 | 1477 | data: { |
1385 | 1478 | store_id: os.stoid, |
1386 | 1479 | user_id: getApp().globalData.user_id, |
1387 | - state:0, is_gift:0, | |
1388 | - goods_id:good.goods_id | |
1480 | + state: 0, | |
1481 | + is_gift: 0, | |
1482 | + goods_id: good.goods_id | |
1389 | 1483 | } |
1390 | - }).then(res=>{ | |
1484 | + }).then(res => { | |
1391 | 1485 | var num = 0; |
1392 | - if(res.data.code==0 && res.data.data && res.data.data.pageData) { | |
1486 | + if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | |
1393 | 1487 | for (var i = 0; i < res.data.data.pageData.length; i++) { |
1394 | 1488 | num += res.data.data.pageData[i].goods_num; |
1395 | 1489 | } |
1396 | 1490 | } |
1397 | - cart_num=num; | |
1491 | + cart_num = num; | |
1398 | 1492 | }) |
1399 | 1493 | |
1400 | 1494 | |
1401 | - if(good.store_count<=0){ | |
1402 | - err_text+= good['goods_name']+"库存不足\n"; | |
1495 | + if (good.store_count <= 0) { | |
1496 | + err_text += good['goods_name'] + "库存不足\n"; | |
1403 | 1497 | continue; |
1404 | 1498 | } |
1405 | - if(b_item.goods_num>good.store_count) | |
1406 | - b_item.goods_num=good.store_count; | |
1499 | + if (b_item.goods_num > good.store_count) | |
1500 | + b_item.goods_num = good.store_count; | |
1407 | 1501 | |
1408 | - var buynum=0; //商品已经购买多少件 | |
1409 | - var promgoodsbuynum=0; //活动已经购买多少件 | |
1410 | - var redis_num = 0; //redis库存 | |
1502 | + var buynum = 0; //商品已经购买多少件 | |
1503 | + var promgoodsbuynum = 0; //活动已经购买多少件 | |
1504 | + var redis_num = 0; //redis库存 | |
1411 | 1505 | |
1412 | - var req_data={ | |
1506 | + var req_data = { | |
1413 | 1507 | store_id: os.stoid, |
1414 | 1508 | user_id: getApp().globalData.user_id, |
1415 | 1509 | goods_id: good.goods_id, |
1416 | 1510 | }; |
1417 | 1511 | |
1418 | - if(prom){ | |
1419 | - req_data.prom_type= good.prom_type; | |
1420 | - req_data.prom_id= good.prom_id; | |
1421 | - b_item.prom_type=good.prom_type; | |
1422 | - b_item.prom_id=good.prom_id; | |
1512 | + if (prom) { | |
1513 | + req_data.prom_type = good.prom_type; | |
1514 | + req_data.prom_id = good.prom_id; | |
1515 | + b_item.prom_type = good.prom_type; | |
1516 | + b_item.prom_id = good.prom_id; | |
1423 | 1517 | |
1424 | 1518 | //------判断活动是否抢光----- |
1425 | 1519 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + |
1426 | 1520 | os.stoid + "/" + good.prom_type + "/" + good.prom_id, { |
1427 | - 1: 1 | |
1428 | - }).then(res => { | |
1521 | + 1: 1 | |
1522 | + }).then(res => { | |
1429 | 1523 | redis_num = res.data.data; |
1430 | 1524 | }); |
1431 | - if(redis_num<=0){ | |
1432 | - err_text+= good['goods_name']+"活动不足\n"; | |
1525 | + if (redis_num <= 0) { | |
1526 | + err_text += good['goods_name'] + "活动不足\n"; | |
1433 | 1527 | continue; |
1434 | 1528 | } |
1435 | 1529 | |
... | ... | @@ -1439,7 +1533,7 @@ Page({ |
1439 | 1533 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
1440 | 1534 | data: req_data, |
1441 | 1535 | }).then(res => { |
1442 | - if(res.data.code==0){ | |
1536 | + if (res.data.code == 0) { | |
1443 | 1537 | var buy_num_data = res.data.data; |
1444 | 1538 | if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; |
1445 | 1539 | buynum = buy_num_data.goodsbuynum; |
... | ... | @@ -1447,20 +1541,20 @@ Page({ |
1447 | 1541 | }) |
1448 | 1542 | |
1449 | 1543 | //---- 要计算商品的限购 ----- |
1450 | - if(good['viplimited']>0){ | |
1451 | - if(cart_num+buynum>good['viplimited']){ | |
1452 | - err_text+= good['goods_name']+"超出限购\n"; | |
1544 | + if (good['viplimited'] > 0) { | |
1545 | + if (cart_num + buynum > good['viplimited']) { | |
1546 | + err_text += good['goods_name'] + "超出限购\n"; | |
1453 | 1547 | continue; |
1454 | 1548 | } |
1455 | - good['viplimited']-=(cart_num+buynum); | |
1456 | - if(b_item.goods_num>good['viplimited']){ | |
1457 | - b_item.goods_num=good['viplimited']; | |
1549 | + good['viplimited'] -= (cart_num + buynum); | |
1550 | + if (b_item.goods_num > good['viplimited']) { | |
1551 | + b_item.goods_num = good['viplimited']; | |
1458 | 1552 | } |
1459 | 1553 | |
1460 | 1554 | } |
1461 | 1555 | |
1462 | 1556 | //-- 判断活动的库存 -- |
1463 | - if(prom) { | |
1557 | + if (prom) { | |
1464 | 1558 | if (prom['goods_num'] <= prom['buy_num']) { |
1465 | 1559 | err_text += good['goods_name'] + "超出活动库存\n"; |
1466 | 1560 | continue; |
... | ... | @@ -1485,367 +1579,378 @@ Page({ |
1485 | 1579 | } |
1486 | 1580 | } |
1487 | 1581 | } |
1488 | - | |
1489 | - | |
1490 | - back_goods_arr.push(b_item); //返回商品元素 | |
1582 | + back_goods_arr.push(b_item); //返回商品元素 | |
1491 | 1583 | } |
1492 | 1584 | } |
1493 | 1585 | |
1494 | 1586 | //有重新购买的数据是时候,就要重新生成订单 |
1495 | - if(back_goods_arr.length>0){ | |
1496 | - th.setData({back_goods_arr:back_goods_arr}); | |
1497 | - if(!err_text){ | |
1587 | + if (back_goods_arr.length > 0) { | |
1588 | + th.setData({ | |
1589 | + back_goods_arr: back_goods_arr | |
1590 | + }); | |
1591 | + if (!err_text) { | |
1498 | 1592 | th.more_add_cart(); |
1499 | - }else{ | |
1593 | + } else { | |
1500 | 1594 | wx.hideLoading(); |
1501 | 1595 | // 如果没有获取用户信息 |
1502 | 1596 | wx.showModal({ |
1503 | - title:'确定', | |
1504 | - content: err_text+',确定要买其他商品吗?', | |
1597 | + title: '确定', | |
1598 | + content: err_text + ',确定要买其他商品吗?', | |
1505 | 1599 | success(res) { |
1506 | 1600 | if (res.confirm) { |
1507 | 1601 | //跳转到登录页 |
1508 | 1602 | th.more_add_cart(); |
1509 | - }else{ | |
1510 | - th.data.moring=0; | |
1603 | + } else { | |
1604 | + th.data.moring = 0; | |
1511 | 1605 | wx.hideLoading(); |
1512 | 1606 | } |
1513 | - },fail(){ | |
1514 | - th.data.moring=0; | |
1607 | + }, | |
1608 | + fail() { | |
1609 | + th.data.moring = 0; | |
1515 | 1610 | wx.hideLoading(); |
1516 | 1611 | } |
1517 | 1612 | }); |
1518 | 1613 | |
1519 | 1614 | } |
1520 | - }else{ | |
1521 | - th.data.moring=0; | |
1615 | + } else { | |
1616 | + th.data.moring = 0; | |
1522 | 1617 | wx.hideLoading(); |
1523 | 1618 | getApp().confirmBox(err_text); |
1524 | 1619 | } |
1525 | 1620 | }, |
1526 | - | |
1527 | - more_add_cart:async function(){ | |
1528 | - var back_goods_arr=this.data.back_goods_arr; | |
1529 | - var err_text=""; | |
1530 | - var ok_num=0; | |
1531 | - | |
1532 | - for(var i in back_goods_arr){ | |
1533 | - //商品ID | |
1534 | - var g_item=back_goods_arr[i]; | |
1535 | - var newd = { | |
1536 | - goods_id: g_item.goods_id, | |
1537 | - goods_num: g_item.goods_num, | |
1538 | - pick_id: g_item.pickup_id, | |
1539 | - user_id: oo.user_id, | |
1540 | - store_id: os.stoid, | |
1541 | - goods_price: g_item.price, | |
1542 | - member_goods_price: g_item.price, | |
1543 | - goods_name: g_item.goods_name, | |
1544 | - goods_sn: g_item.goods_sn, | |
1545 | - sku: g_item.sku, | |
1546 | - }; | |
1547 | - | |
1548 | - if(g_item.guide_id){ | |
1549 | - newd['guide_id']=g_item.guide_id; | |
1550 | - newd['guide_type']=g_item.guide_type; | |
1551 | - } | |
1552 | - | |
1553 | - if(g_item.is_integral_normal){ | |
1554 | - newd['is_integral_normal']=g_item.is_integral_normal; | |
1555 | - } | |
1556 | - if(g_item.is_pd_normal){ | |
1557 | - newd['is_pd_normal']=g_item.is_pd_normal; | |
1558 | - } | |
1559 | - | |
1560 | - if(g_item.prom_type){ | |
1561 | - newd['prom_type']=g_item.prom_type; | |
1562 | - newd['prom_id']=g_item.prom_id; | |
1563 | - } | |
1564 | - | |
1565 | - | |
1566 | - var b_cart_goods=null; | |
1567 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | |
1568 | - data: { | |
1569 | - store_id: os.stoid, | |
1570 | - user_id: oo.user_id, | |
1571 | - goods_id: g_item.goods_id, | |
1572 | - pick_id: g_item.pickup_id, | |
1573 | - }, | |
1574 | - }).then(res=>{ | |
1575 | - //-------如果购物车中有相关的数据------- | |
1576 | - if (res.data.data.total > 0) { | |
1577 | - b_cart_goods= res.data.data.pageData[0]; | |
1578 | - } | |
1579 | - }) | |
1580 | - | |
1581 | - //-- 如果就加入过购物车 -- | |
1582 | - if(b_cart_goods){ | |
1583 | - var updata = { | |
1584 | - id: b_cart_goods.id, | |
1585 | - goods_num: newd.goods_num + b_cart_goods.goods_num, | |
1586 | - goods_price: newd.goods_price, | |
1587 | - member_goods_price:newd.goods_price, | |
1588 | - store_id: os.stoid, | |
1589 | - }; | |
1590 | - if(newd.guide_id){ | |
1591 | - updata.guide_id=newd.guide_id; | |
1592 | - updata.guide_type=newd.guide_type; | |
1593 | - } | |
1594 | - if(newd.prom_type){ | |
1595 | - updata.prom_type=newd.prom_type; | |
1596 | - updata.prom_id=newd.prom_id; | |
1597 | - } | |
1598 | - | |
1599 | - await getApp().request.promisePut("/api/weshop/cart/update", { | |
1600 | - data: updata | |
1601 | - }).then(res=>{ | |
1602 | - if(res.data.code==0) { | |
1603 | - ok_num++; | |
1604 | - }else{ | |
1605 | - err_text+=newd.goods_name+"加入购物车失败\n"; | |
1606 | - } | |
1607 | - }) | |
1608 | - | |
1609 | - }else{ | |
1610 | - await getApp().request.promisePost("/api/weshop/cart/save", { | |
1611 | - data: newd | |
1612 | - }).then(res=>{ | |
1613 | - if(res.data.code==0) { | |
1614 | - ok_num++; | |
1615 | - }else{ | |
1616 | - err_text+=newd.goods_name+"加入购物车失败\n"; | |
1617 | - } | |
1618 | - }) | |
1619 | - } | |
1620 | - } | |
1621 | - wx.hideLoading(); | |
1622 | - this.data.moring=0; | |
1623 | - if(ok_num==0){ | |
1624 | - //-- 如果没有获取用户信息 -- | |
1625 | - wx.showModal({ | |
1626 | - title:'提示', | |
1627 | - content: err_text, | |
1628 | - success(res) {} | |
1629 | - }); | |
1630 | - }else{ | |
1631 | - if(err_text==""){ | |
1632 | - getApp().goto("/pages/cart/cart/cart"); | |
1633 | - }else{ | |
1634 | - // 如果没有获取用户信息 | |
1635 | - wx.showModal({ | |
1636 | - title:'提示', | |
1637 | - content: err_text, | |
1638 | - success(res) { | |
1639 | - if (res.confirm) { | |
1640 | - //跳转到登录页 | |
1641 | - getApp().goto("/pages/cart/cart/cart"); | |
1642 | - } | |
1643 | - } | |
1644 | - }); | |
1645 | - | |
1646 | - } | |
1647 | - } | |
1648 | - }, | |
1649 | - | |
1650 | - request_list: function(data, callback){ | |
1651 | - // console.log('进入request_list'); | |
1652 | - | |
1653 | - var th = this; | |
1654 | - if(this.data.is_load2) return false; //-- 正在加载 | |
1655 | - if(this.data.is_no_data2) return false; //-- 没有数据 | |
1656 | - if(this.data.is_no_more2) return false; //-- 没有更多 | |
1657 | - | |
1658 | - // 开启加载状态 | |
1659 | - this.data.is_load2=1; | |
1660 | - | |
1661 | - // var req_data = { | |
1662 | - // page:th.data.currentPage2 | |
1663 | - // } | |
1664 | - | |
1665 | - app.request.promiseGet("/api/weshop/order/pagePosOrder", { | |
1666 | - data: data | |
1667 | - }).then(res=>{ | |
1668 | - // 关闭加载状态 | |
1669 | - th.data.is_load2=0; | |
1670 | - // 请求成功 | |
1671 | - if(res.data.code==0) { | |
1672 | - if(res.data.data.pageData.length>0) { | |
1673 | - th.data.currentPage2++; | |
1674 | - var data = res.data.data.pageData; | |
1675 | - // 判断有无更多数据可以加载,如果大于则没有更多数据,反之则有 | |
1676 | - if(res.data.data.page*res.data.data.pageSize > res.data.data.total){th.setData({is_no_more2:1});} | |
1677 | - var list=th.data.list2; | |
1678 | - list=list.concat(data); | |
1679 | - th.setData({list2:list}); | |
1680 | - } else { | |
1681 | - if(th.data.currentPage2==1){ | |
1682 | - th.setData({is_no_data2:1}); | |
1683 | - } else { | |
1684 | - th.setData({is_no_more2:1}); | |
1685 | - } | |
1686 | - } | |
1687 | - if(callback) callback(res); | |
1688 | - } else { | |
1689 | - wx.showToast({ | |
1690 | - title: res.data.msg, | |
1691 | - icon: 'none', | |
1692 | - duration: 2000 | |
1693 | - }) | |
1694 | - } | |
1695 | - }) | |
1696 | - }, | |
1697 | - | |
1698 | - | |
1699 | - onClickTab(e) { | |
1700 | - let currentIndex = e.target.dataset.index; | |
1701 | - this.setData({ | |
1702 | - currentIndex: currentIndex | |
1703 | - }); | |
1704 | - console.log(this.data.currentIndex); | |
1705 | - this.setData({ | |
1706 | - is_no_data2: 0, | |
1707 | - is_no_more2: 0, | |
1708 | - currentPage2: 1, | |
1709 | - }); | |
1710 | - if(currentIndex == 0) { | |
1711 | - console.log('线上订单'); | |
1712 | - /*--- | |
1713 | - this.setData({ | |
1714 | - startDate: '选择开始时间', | |
1715 | - endDate: '选择结束时间', | |
1716 | - });--*/ | |
1717 | - } else if(currentIndex == 1) { | |
1718 | - console.log('线下订单'); | |
1719 | - this.request_list({ | |
1720 | - store_id: os.stoid, | |
1721 | - user_id: oo.user_id, | |
1722 | - page: 1, | |
1723 | - BeginDate: this.data.startDate, | |
1724 | - EndDate: this.data.endDate | |
1725 | - }); | |
1726 | - }; | |
1727 | - }, | |
1728 | - | |
1729 | - bindDateChange1: function(e) { | |
1730 | - console.log('picker发送选择改变,携带值为', e.detail.value) | |
1731 | - this.setData({ | |
1732 | - startDate: e.detail.value | |
1733 | - }) | |
1734 | - }, | |
1735 | - | |
1736 | - bindDateChange2: function(e) { | |
1737 | - console.log('picker发送选择改变,携带值为', e.detail.value) | |
1738 | - this.setData({ | |
1739 | - endDate: e.detail.value | |
1740 | - }) | |
1741 | - }, | |
1742 | - | |
1743 | - bindInput(e) { | |
1744 | - this.data.searchContent = e.detail.value; | |
1745 | - }, | |
1746 | - | |
1747 | - searchOnline() { | |
1748 | - console.log('online',this.data.searchContent); | |
1749 | - if(this.data.searchContent) { | |
1750 | - console.log(this.data.searchContent); | |
1751 | - this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
1752 | - } else { | |
1753 | - wx.showToast({ | |
1754 | - title: '您还没有输入搜索内容~', | |
1755 | - icon: 'none', | |
1756 | - }) | |
1757 | - }; | |
1758 | - }, | |
1759 | - | |
1760 | - searchOffline() { | |
1761 | - console.log('执行查询'); | |
1762 | - let th = this; | |
1763 | - let startDate = this.data.startDate; | |
1764 | - let endDate = this.data.endDate; | |
1765 | - | |
1766 | - // this.data.is_no_data2 = 0; | |
1767 | - this.setData({ | |
1768 | - currentPage2: 1, | |
1769 | - list2: [], | |
1770 | - is_no_data2: 0, | |
1771 | - }); | |
1772 | - | |
1773 | - | |
1774 | - if(startDate == '选择开始时间' || endDate == '选择结束时间') { | |
1775 | - wx.showToast({ | |
1776 | - title: '请选择完整的查询时间~', | |
1777 | - icon: 'none', | |
1778 | - }) | |
1779 | - }; | |
1780 | - | |
1781 | - if(new Date(startDate) > new Date(endDate)) { | |
1782 | - wx.showToast({ | |
1783 | - title: '不对噢!开始时间不能晚于结束时间~', | |
1784 | - icon: 'none', | |
1785 | - }) | |
1786 | - return; | |
1787 | - }; | |
1788 | - | |
1789 | - | |
1790 | - this.request_list({ | |
1791 | - store_id: os.stoid, | |
1792 | - user_id: oo.user_id, | |
1793 | - page: 1, | |
1794 | - BeginDate: this.data.startDate, | |
1795 | - EndDate: this.data.endDate | |
1796 | - }, function(res) { | |
1797 | - if(res.data.data.total == 0) { | |
1798 | - wx.showToast({ | |
1799 | - title: '没有找到相关订单', | |
1800 | - icon: 'none', | |
1801 | - duration: 2000 | |
1802 | - }) | |
1803 | - } else { | |
1804 | - th.setData({ | |
1805 | - total: res.data.data.total | |
1806 | - }); | |
1807 | - } | |
1808 | - }); | |
1809 | - }, | |
1810 | - | |
1811 | - currentDate() { | |
1812 | - var now = new Date(); | |
1813 | - var year = now.getFullYear(); //年 | |
1814 | - var month = now.getMonth() + 1; //月 | |
1815 | - var day = now.getDate(); //日 | |
1816 | - | |
1817 | - var clock = year + "-"; | |
1818 | - | |
1819 | - if(month < 10) month += "0"; | |
1820 | - clock += month + "-"; | |
1821 | - | |
1822 | - if(day < 10) day += "0"; | |
1823 | - clock += day; | |
1824 | - | |
1825 | - // if(hh < 10) | |
1826 | - // clock += "0"; | |
1827 | - | |
1828 | - // clock += hh + ":"; | |
1829 | - // if (mm < 10) clock += '0'; | |
1830 | - // clock += mm + ":"; | |
1831 | - | |
1832 | - // if (ss < 10) clock += '0'; | |
1833 | - // clock += ss; | |
1834 | - return clock; | |
1835 | - }, | |
1836 | - | |
1837 | - toast(msg){ | |
1838 | - wx.showToast({ | |
1839 | - title: msg, | |
1840 | - icon: 'none', | |
1841 | - duration: 3000 | |
1842 | - }) | |
1843 | - }, | |
1844 | - | |
1845 | - go_url(e){ | |
1846 | - var url=e.currentTarget.dataset.url; | |
1847 | - getApp().goto(url); | |
1621 | + | |
1622 | + more_add_cart: async function () { | |
1623 | + var back_goods_arr = this.data.back_goods_arr; | |
1624 | + var err_text = ""; | |
1625 | + var ok_num = 0; | |
1626 | + | |
1627 | + for (var i in back_goods_arr) { | |
1628 | + //商品ID | |
1629 | + var g_item = back_goods_arr[i]; | |
1630 | + console.log(g_item, 'g_item'); | |
1631 | + var newd = { | |
1632 | + goods_id: g_item.goods_id, | |
1633 | + goods_num: g_item.goods_num, | |
1634 | + pick_id: g_item.pickup_id, | |
1635 | + user_id: oo.user_id, | |
1636 | + store_id: os.stoid, | |
1637 | + goods_price: g_item.price, | |
1638 | + member_goods_price: g_item.price, | |
1639 | + goods_name: g_item.goods_name, | |
1640 | + goods_sn: g_item.goods_sn, | |
1641 | + sku: g_item.sku, | |
1642 | + }; | |
1643 | + | |
1644 | + if (g_item.guide_id) { | |
1645 | + newd['guide_id'] = g_item.guide_id; | |
1646 | + newd['guide_type'] = g_item.guide_type; | |
1647 | + } | |
1648 | + | |
1649 | + if (g_item.is_integral_normal) { | |
1650 | + newd['is_integral_normal'] = g_item.is_integral_normal; | |
1651 | + } | |
1652 | + if (g_item.is_pd_normal) { | |
1653 | + newd['is_pd_normal'] = g_item.is_pd_normal; | |
1654 | + } | |
1655 | + if (g_item.prom_type) { | |
1656 | + newd['prom_type'] = g_item.prom_type; | |
1657 | + newd['prom_id'] = g_item.prom_id; | |
1658 | + } | |
1659 | + | |
1660 | + | |
1661 | + var b_cart_goods = null; | |
1662 | + await getApp().request.promiseGet("/api/weshop/cart/page", { | |
1663 | + data: { | |
1664 | + store_id: os.stoid, | |
1665 | + user_id: oo.user_id, | |
1666 | + goods_id: g_item.goods_id, | |
1667 | + pick_id: g_item.pickup_id, | |
1668 | + }, | |
1669 | + }).then(res => { | |
1670 | + //-------如果购物车中有相关的数据------- | |
1671 | + if (res.data.data.total > 0) { | |
1672 | + b_cart_goods = res.data.data.pageData[0]; | |
1673 | + } | |
1674 | + }) | |
1675 | + | |
1676 | + //-- 如果就加入过购物车 -- | |
1677 | + if (b_cart_goods) { | |
1678 | + var updata = { | |
1679 | + id: b_cart_goods.id, | |
1680 | + goods_num: newd.goods_num + b_cart_goods.goods_num, | |
1681 | + goods_price: newd.goods_price, | |
1682 | + member_goods_price: newd.goods_price, | |
1683 | + store_id: os.stoid, | |
1684 | + }; | |
1685 | + if (newd.guide_id) { | |
1686 | + updata.guide_id = newd.guide_id; | |
1687 | + updata.guide_type = newd.guide_type; | |
1688 | + } | |
1689 | + if (newd.prom_type) { | |
1690 | + updata.prom_type = newd.prom_type; | |
1691 | + updata.prom_id = newd.prom_id; | |
1692 | + } | |
1693 | + | |
1694 | + await getApp().request.promisePut("/api/weshop/cart/update", { | |
1695 | + data: updata | |
1696 | + }).then(res => { | |
1697 | + if (res.data.code == 0) { | |
1698 | + ok_num++; | |
1699 | + } else { | |
1700 | + err_text += newd.goods_name + "加入购物车失败\n"; | |
1701 | + } | |
1702 | + }) | |
1703 | + | |
1704 | + } else { | |
1705 | + await getApp().request.promisePost("/api/weshop/cart/save", { | |
1706 | + data: newd | |
1707 | + }).then(res => { | |
1708 | + if (res.data.code == 0) { | |
1709 | + ok_num++; | |
1710 | + } else { | |
1711 | + err_text += newd.goods_name + "加入购物车失败\n"; | |
1712 | + } | |
1713 | + }) | |
1714 | + } | |
1715 | + } | |
1716 | + wx.hideLoading(); | |
1717 | + this.data.moring = 0; | |
1718 | + if (ok_num == 0) { | |
1719 | + //-- 如果没有获取用户信息 -- | |
1720 | + wx.showModal({ | |
1721 | + title: '提示', | |
1722 | + content: err_text, | |
1723 | + success(res) {} | |
1724 | + }); | |
1725 | + } else { | |
1726 | + if (err_text == "") { | |
1727 | + getApp().goto("/pages/cart/cart/cart"); | |
1728 | + } else { | |
1729 | + // 如果没有获取用户信息 | |
1730 | + wx.showModal({ | |
1731 | + title: '提示', | |
1732 | + content: err_text, | |
1733 | + success(res) { | |
1734 | + if (res.confirm) { | |
1735 | + //跳转到登录页 | |
1736 | + getApp().goto("/pages/cart/cart/cart"); | |
1737 | + } | |
1738 | + } | |
1739 | + }); | |
1740 | + | |
1741 | + } | |
1742 | + } | |
1743 | + }, | |
1744 | + | |
1745 | + request_list: function (data, callback) { | |
1746 | + // console.log('进入request_list'); | |
1747 | + | |
1748 | + var th = this; | |
1749 | + if (this.data.is_load2) return false; //-- 正在加载 | |
1750 | + if (this.data.is_no_data2) return false; //-- 没有数据 | |
1751 | + if (this.data.is_no_more2) return false; //-- 没有更多 | |
1752 | + | |
1753 | + // 开启加载状态 | |
1754 | + this.data.is_load2 = 1; | |
1755 | + | |
1756 | + // var req_data = { | |
1757 | + // page:th.data.currentPage2 | |
1758 | + // } | |
1759 | + | |
1760 | + app.request.promiseGet("/api/weshop/order/pagePosOrder", { | |
1761 | + data: data | |
1762 | + }).then(res => { | |
1763 | + // 关闭加载状态 | |
1764 | + th.data.is_load2 = 0; | |
1765 | + // 请求成功 | |
1766 | + if (res.data.code == 0) { | |
1767 | + if (res.data.data.pageData.length > 0) { | |
1768 | + th.data.currentPage2++; | |
1769 | + var data = res.data.data.pageData; | |
1770 | + // 判断有无更多数据可以加载,如果大于则没有更多数据,反之则有 | |
1771 | + if (res.data.data.page * res.data.data.pageSize > res.data.data.total) { | |
1772 | + th.setData({ | |
1773 | + is_no_more2: 1 | |
1774 | + }); | |
1775 | + } | |
1776 | + var list = th.data.list2; | |
1777 | + list = list.concat(data); | |
1778 | + th.setData({ | |
1779 | + list2: list | |
1780 | + }); | |
1781 | + } else { | |
1782 | + if (th.data.currentPage2 == 1) { | |
1783 | + th.setData({ | |
1784 | + is_no_data2: 1 | |
1785 | + }); | |
1786 | + } else { | |
1787 | + th.setData({ | |
1788 | + is_no_more2: 1 | |
1789 | + }); | |
1790 | + } | |
1791 | + } | |
1792 | + if (callback) callback(res); | |
1793 | + } else { | |
1794 | + wx.showToast({ | |
1795 | + title: res.data.msg, | |
1796 | + icon: 'none', | |
1797 | + duration: 2000 | |
1798 | + }) | |
1799 | + } | |
1800 | + }) | |
1801 | + }, | |
1802 | + | |
1803 | + | |
1804 | + onClickTab(e) { | |
1805 | + let currentIndex = e.target.dataset.index; | |
1806 | + this.setData({ | |
1807 | + currentIndex: currentIndex | |
1808 | + }); | |
1809 | + console.log(this.data.currentIndex); | |
1810 | + this.setData({ | |
1811 | + is_no_data2: 0, | |
1812 | + is_no_more2: 0, | |
1813 | + currentPage2: 1, | |
1814 | + }); | |
1815 | + if (currentIndex == 0) { | |
1816 | + console.log('线上订单'); | |
1817 | + /*--- | |
1818 | + this.setData({ | |
1819 | + startDate: '选择开始时间', | |
1820 | + endDate: '选择结束时间', | |
1821 | + });--*/ | |
1822 | + } else if (currentIndex == 1) { | |
1823 | + console.log('线下订单'); | |
1824 | + this.request_list({ | |
1825 | + store_id: os.stoid, | |
1826 | + user_id: oo.user_id, | |
1827 | + page: 1, | |
1828 | + BeginDate: this.data.startDate, | |
1829 | + EndDate: this.data.endDate | |
1830 | + }); | |
1831 | + }; | |
1832 | + }, | |
1833 | + | |
1834 | + bindDateChange1: function (e) { | |
1835 | + console.log('picker发送选择改变,携带值为', e.detail.value) | |
1836 | + this.setData({ | |
1837 | + startDate: e.detail.value | |
1838 | + }) | |
1839 | + }, | |
1840 | + | |
1841 | + bindDateChange2: function (e) { | |
1842 | + console.log('picker发送选择改变,携带值为', e.detail.value) | |
1843 | + this.setData({ | |
1844 | + endDate: e.detail.value | |
1845 | + }) | |
1846 | + }, | |
1847 | + | |
1848 | + bindInput(e) { | |
1849 | + this.data.searchContent = e.detail.value; | |
1850 | + }, | |
1851 | + | |
1852 | + searchOnline() { | |
1853 | + console.log('online', this.data.searchContent); | |
1854 | + if (this.data.searchContent) { | |
1855 | + console.log(this.data.searchContent); | |
1856 | + this.resetData(), this.requestOrderList(this.data.activeCategoryId); | |
1857 | + } else { | |
1858 | + wx.showToast({ | |
1859 | + title: '您还没有输入搜索内容~', | |
1860 | + icon: 'none', | |
1861 | + }) | |
1862 | + }; | |
1863 | + }, | |
1864 | + | |
1865 | + searchOffline() { | |
1866 | + console.log('执行查询'); | |
1867 | + let th = this; | |
1868 | + let startDate = this.data.startDate; | |
1869 | + let endDate = this.data.endDate; | |
1870 | + | |
1871 | + // this.data.is_no_data2 = 0; | |
1872 | + this.setData({ | |
1873 | + currentPage2: 1, | |
1874 | + list2: [], | |
1875 | + is_no_data2: 0, | |
1876 | + }); | |
1877 | + | |
1878 | + | |
1879 | + if (startDate == '选择开始时间' || endDate == '选择结束时间') { | |
1880 | + wx.showToast({ | |
1881 | + title: '请选择完整的查询时间~', | |
1882 | + icon: 'none', | |
1883 | + }) | |
1884 | + }; | |
1885 | + | |
1886 | + if (new Date(startDate) > new Date(endDate)) { | |
1887 | + wx.showToast({ | |
1888 | + title: '不对噢!开始时间不能晚于结束时间~', | |
1889 | + icon: 'none', | |
1890 | + }) | |
1891 | + return; | |
1892 | + }; | |
1893 | + | |
1894 | + | |
1895 | + this.request_list({ | |
1896 | + store_id: os.stoid, | |
1897 | + user_id: oo.user_id, | |
1898 | + page: 1, | |
1899 | + BeginDate: this.data.startDate, | |
1900 | + EndDate: this.data.endDate | |
1901 | + }, function (res) { | |
1902 | + if (res.data.data.total == 0) { | |
1903 | + wx.showToast({ | |
1904 | + title: '没有找到相关订单', | |
1905 | + icon: 'none', | |
1906 | + duration: 2000 | |
1907 | + }) | |
1908 | + } else { | |
1909 | + th.setData({ | |
1910 | + total: res.data.data.total | |
1911 | + }); | |
1912 | + } | |
1913 | + }); | |
1914 | + }, | |
1915 | + | |
1916 | + currentDate() { | |
1917 | + var now = new Date(); | |
1918 | + var year = now.getFullYear(); //年 | |
1919 | + var month = now.getMonth() + 1; //月 | |
1920 | + var day = now.getDate(); //日 | |
1921 | + | |
1922 | + var clock = year + "-"; | |
1923 | + | |
1924 | + if (month < 10) month += "0"; | |
1925 | + clock += month + "-"; | |
1926 | + | |
1927 | + if (day < 10) day += "0"; | |
1928 | + clock += day; | |
1929 | + | |
1930 | + // if(hh < 10) | |
1931 | + // clock += "0"; | |
1932 | + | |
1933 | + // clock += hh + ":"; | |
1934 | + // if (mm < 10) clock += '0'; | |
1935 | + // clock += mm + ":"; | |
1936 | + | |
1937 | + // if (ss < 10) clock += '0'; | |
1938 | + // clock += ss; | |
1939 | + return clock; | |
1940 | + }, | |
1941 | + | |
1942 | + toast(msg) { | |
1943 | + wx.showToast({ | |
1944 | + title: msg, | |
1945 | + icon: 'none', | |
1946 | + duration: 3000 | |
1947 | + }) | |
1948 | + }, | |
1949 | + | |
1950 | + go_url(e) { | |
1951 | + var url = e.currentTarget.dataset.url; | |
1952 | + getApp().goto(url); | |
1848 | 1953 | } |
1849 | - | |
1850 | - | |
1954 | + | |
1955 | + | |
1851 | 1956 | }); |
1852 | 1957 | \ No newline at end of file | ... | ... |