Commit 36f754430186861da5456e4a475a46158d03dff6
1 parent
808b2a77
再来一单不计算购物车中的数量
Showing
2 changed files
with
105 additions
and
71 deletions
packageG/pages/user/order_detail/order_detail.js
| @@ -505,7 +505,7 @@ Page({ | @@ -505,7 +505,7 @@ Page({ | ||
| 505 | }) | 505 | }) |
| 506 | 506 | ||
| 507 | var buyed_mum2 = goodsbuynum + good.goods_num; | 507 | var buyed_mum2 = goodsbuynum + good.goods_num; |
| 508 | - if (buyed_mum2 > limit && limit > 0) { | 508 | + if (buyed_mum2 > limit && limit > 0 && !good.is_gift) { |
| 509 | var content = gg.goods_name + '购买数量超出商品限购,请取消订单'; | 509 | var content = gg.goods_name + '购买数量超出商品限购,请取消订单'; |
| 510 | th.toast(content); | 510 | th.toast(content); |
| 511 | th.setData({ paying: 0 }); | 511 | th.setData({ paying: 0 }); |
| @@ -1151,6 +1151,8 @@ Page({ | @@ -1151,6 +1151,8 @@ Page({ | ||
| 1151 | 1151 | ||
| 1152 | //---如果是活动的时候--- | 1152 | //---如果是活动的时候--- |
| 1153 | var prom = null, goodsinfo = good, th = this; | 1153 | var prom = null, goodsinfo = good, th = this; |
| 1154 | + | ||
| 1155 | + goodsinfo.prom_type=parseInt(goodsinfo.prom_type+''); | ||
| 1154 | if (goodsinfo.prom_type == 1) { | 1156 | if (goodsinfo.prom_type == 1) { |
| 1155 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | 1157 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { |
| 1156 | if (res.data.code == 0) { | 1158 | if (res.data.code == 0) { |
| @@ -1185,8 +1187,16 @@ Page({ | @@ -1185,8 +1187,16 @@ Page({ | ||
| 1185 | } | 1187 | } |
| 1186 | }) | 1188 | }) |
| 1187 | } | 1189 | } |
| 1190 | + | ||
| 1191 | + if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){ | ||
| 1192 | + wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 }); | ||
| 1193 | + th.setData({ paying: 0 }); | ||
| 1194 | + return false; | ||
| 1195 | + } | ||
| 1196 | + | ||
| 1188 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- | 1197 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- |
| 1189 | if (prom) { | 1198 | if (prom) { |
| 1199 | + | ||
| 1190 | let c_type=parseInt(goodsinfo.prom_type+''); | 1200 | let c_type=parseInt(goodsinfo.prom_type+''); |
| 1191 | var act_type=''; | 1201 | var act_type=''; |
| 1192 | switch (c_type){ | 1202 | switch (c_type){ |
| @@ -1207,13 +1217,20 @@ Page({ | @@ -1207,13 +1217,20 @@ Page({ | ||
| 1207 | } | 1217 | } |
| 1208 | 1218 | ||
| 1209 | var now = ut.gettimestamp(); | 1219 | var now = ut.gettimestamp(); |
| 1210 | - if (prom.is_end == 1 && prom.end_time < now) { | 1220 | + if (prom.is_end == 1 || prom.end_time < now) { |
| 1211 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' | 1221 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' |
| 1212 | th.toast(content); | 1222 | th.toast(content); |
| 1213 | th.setData({ paying: 0 }); | 1223 | th.setData({ paying: 0 }); |
| 1214 | return false; | 1224 | return false; |
| 1215 | } | 1225 | } |
| 1216 | 1226 | ||
| 1227 | + if(prom.is_show==0){ | ||
| 1228 | + wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 }); | ||
| 1229 | + th.setData({ paying: 0 }); | ||
| 1230 | + return false; | ||
| 1231 | + } | ||
| 1232 | + | ||
| 1233 | + | ||
| 1217 | buyed_mum2 = promgoodsbuynum + good.goods_num; | 1234 | buyed_mum2 = promgoodsbuynum + good.goods_num; |
| 1218 | if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) { | 1235 | if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) { |
| 1219 | 1236 | ||
| @@ -1904,23 +1921,23 @@ Page({ | @@ -1904,23 +1921,23 @@ Page({ | ||
| 1904 | 1921 | ||
| 1905 | //-- 看一下购物车上有多少商品 -- | 1922 | //-- 看一下购物车上有多少商品 -- |
| 1906 | var cart_num=0; | 1923 | var cart_num=0; |
| 1907 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 1908 | - data: { | ||
| 1909 | - store_id: os.stoid, | ||
| 1910 | - user_id: getApp().globalData.user_id, | ||
| 1911 | - state:0, is_gift:0, | ||
| 1912 | - goods_id:good.goods_id, | ||
| 1913 | - pick_id: b_item.pickup_id | ||
| 1914 | - } | ||
| 1915 | - }).then(res=>{ | ||
| 1916 | - var num = 0; | ||
| 1917 | - if(res.data.code==0 && res.data.data && res.data.data.pageData) { | ||
| 1918 | - for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 1919 | - num += res.data.data.pageData[i].goods_num; | ||
| 1920 | - } | ||
| 1921 | - } | ||
| 1922 | - cart_num=num; | ||
| 1923 | - }) | 1924 | + // await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 1925 | + // data: { | ||
| 1926 | + // store_id: os.stoid, | ||
| 1927 | + // user_id: getApp().globalData.user_id, | ||
| 1928 | + // state:0, is_gift:0, | ||
| 1929 | + // goods_id:good.goods_id, | ||
| 1930 | + // pick_id: b_item.pickup_id | ||
| 1931 | + // } | ||
| 1932 | + // }).then(res=>{ | ||
| 1933 | + // var num = 0; | ||
| 1934 | + // if(res.data.code==0 && res.data.data && res.data.data.pageData) { | ||
| 1935 | + // for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 1936 | + // num += res.data.data.pageData[i].goods_num; | ||
| 1937 | + // } | ||
| 1938 | + // } | ||
| 1939 | + // cart_num=num; | ||
| 1940 | + // }) | ||
| 1924 | 1941 | ||
| 1925 | var lock=0,plist=null; | 1942 | var lock=0,plist=null; |
| 1926 | 1943 | ||
| @@ -2016,22 +2033,22 @@ Page({ | @@ -2016,22 +2033,22 @@ Page({ | ||
| 2016 | }else{ | 2033 | }else{ |
| 2017 | //-- 看一下购物车上有多少商品 -- | 2034 | //-- 看一下购物车上有多少商品 -- |
| 2018 | var cart_num=0; | 2035 | var cart_num=0; |
| 2019 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 2020 | - data: { | ||
| 2021 | - store_id: os.stoid, | ||
| 2022 | - user_id: getApp().globalData.user_id, | ||
| 2023 | - state:0, is_gift:0, | ||
| 2024 | - goods_id:good.goods_id | ||
| 2025 | - } | ||
| 2026 | - }).then(res=>{ | ||
| 2027 | - var num = 0; | ||
| 2028 | - if(res.data.code==0 && res.data.data && res.data.data.pageData) { | ||
| 2029 | - for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2030 | - num += res.data.data.pageData[i].goods_num; | ||
| 2031 | - } | ||
| 2032 | - } | ||
| 2033 | - cart_num=num; | ||
| 2034 | - }) | 2036 | + // await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 2037 | + // data: { | ||
| 2038 | + // store_id: os.stoid, | ||
| 2039 | + // user_id: getApp().globalData.user_id, | ||
| 2040 | + // state:0, is_gift:0, | ||
| 2041 | + // goods_id:good.goods_id | ||
| 2042 | + // } | ||
| 2043 | + // }).then(res=>{ | ||
| 2044 | + // var num = 0; | ||
| 2045 | + // if(res.data.code==0 && res.data.data && res.data.data.pageData) { | ||
| 2046 | + // for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2047 | + // num += res.data.data.pageData[i].goods_num; | ||
| 2048 | + // } | ||
| 2049 | + // } | ||
| 2050 | + // cart_num=num; | ||
| 2051 | + // }) | ||
| 2035 | 2052 | ||
| 2036 | if(good.store_count<=0){ | 2053 | if(good.store_count<=0){ |
| 2037 | err_text+= good['goods_name']+"库存不足\n"; | 2054 | err_text+= good['goods_name']+"库存不足\n"; |
| @@ -2087,7 +2104,7 @@ Page({ | @@ -2087,7 +2104,7 @@ Page({ | ||
| 2087 | 2104 | ||
| 2088 | //---- 要计算商品的限购 ----- | 2105 | //---- 要计算商品的限购 ----- |
| 2089 | if(good['viplimited']>0){ | 2106 | if(good['viplimited']>0){ |
| 2090 | - if(cart_num+buynum>good['viplimited']){ | 2107 | + if(cart_num+buynum>=good['viplimited']){ |
| 2091 | err_text+= good['goods_name']+"超出限购\n"; | 2108 | err_text+= good['goods_name']+"超出限购\n"; |
| 2092 | continue; | 2109 | continue; |
| 2093 | } | 2110 | } |
pages/user/order_list/order_list.js
| @@ -820,7 +820,7 @@ Page({ | @@ -820,7 +820,7 @@ Page({ | ||
| 820 | }) | 820 | }) |
| 821 | 821 | ||
| 822 | var buyed_mum2 = goodsbuynum + good.goods_num; | 822 | var buyed_mum2 = goodsbuynum + good.goods_num; |
| 823 | - if (buyed_mum2 > limit && limit > 0) { | 823 | + if (buyed_mum2 > limit && limit > 0 && !good.is_gift) { |
| 824 | var content = gg.goods_name + '购买数量超出商品限购,请取消订单'; | 824 | var content = gg.goods_name + '购买数量超出商品限购,请取消订单'; |
| 825 | th.toast(content); | 825 | th.toast(content); |
| 826 | th.setData({ paying: 0 }); | 826 | th.setData({ paying: 0 }); |
| @@ -1480,6 +1480,8 @@ Page({ | @@ -1480,6 +1480,8 @@ Page({ | ||
| 1480 | 1480 | ||
| 1481 | //---如果是活动的时候--- | 1481 | //---如果是活动的时候--- |
| 1482 | var prom = null, goodsinfo = good, th = this; | 1482 | var prom = null, goodsinfo = good, th = this; |
| 1483 | + | ||
| 1484 | + goodsinfo.prom_type=parseInt(goodsinfo.prom_type+''); | ||
| 1483 | if (goodsinfo.prom_type == 1) { | 1485 | if (goodsinfo.prom_type == 1) { |
| 1484 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | 1486 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { |
| 1485 | if (res.data.code == 0) { | 1487 | if (res.data.code == 0) { |
| @@ -1514,8 +1516,16 @@ Page({ | @@ -1514,8 +1516,16 @@ Page({ | ||
| 1514 | } | 1516 | } |
| 1515 | }) | 1517 | }) |
| 1516 | } | 1518 | } |
| 1519 | + | ||
| 1520 | + if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){ | ||
| 1521 | + wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 }); | ||
| 1522 | + th.setData({ paying: 0 }); | ||
| 1523 | + return false; | ||
| 1524 | + } | ||
| 1525 | + | ||
| 1517 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- | 1526 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- |
| 1518 | if (prom) { | 1527 | if (prom) { |
| 1528 | + | ||
| 1519 | let c_type=parseInt(goodsinfo.prom_type+''); | 1529 | let c_type=parseInt(goodsinfo.prom_type+''); |
| 1520 | var act_type=''; | 1530 | var act_type=''; |
| 1521 | switch (c_type){ | 1531 | switch (c_type){ |
| @@ -1537,13 +1547,20 @@ Page({ | @@ -1537,13 +1547,20 @@ Page({ | ||
| 1537 | } | 1547 | } |
| 1538 | 1548 | ||
| 1539 | var now = ut.gettimestamp(); | 1549 | var now = ut.gettimestamp(); |
| 1540 | - if (prom.is_end == 1 && prom.end_time < now) { | 1550 | + if (prom.is_end == 1 || prom.end_time < now) { |
| 1541 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' | 1551 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' |
| 1542 | th.toast(content); | 1552 | th.toast(content); |
| 1543 | th.setData({ paying: 0 }); | 1553 | th.setData({ paying: 0 }); |
| 1544 | return false; | 1554 | return false; |
| 1545 | } | 1555 | } |
| 1546 | 1556 | ||
| 1557 | + if(prom.is_show==0){ | ||
| 1558 | + wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 }); | ||
| 1559 | + th.setData({ paying: 0 }); | ||
| 1560 | + return false | ||
| 1561 | + } | ||
| 1562 | + | ||
| 1563 | + | ||
| 1547 | buyed_mum2 = promgoodsbuynum + good.goods_num; | 1564 | buyed_mum2 = promgoodsbuynum + good.goods_num; |
| 1548 | if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) { | 1565 | if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) { |
| 1549 | 1566 | ||
| @@ -2231,23 +2248,23 @@ Page({ | @@ -2231,23 +2248,23 @@ Page({ | ||
| 2231 | 2248 | ||
| 2232 | //-- 看一下购物车上有多少商品 -- | 2249 | //-- 看一下购物车上有多少商品 -- |
| 2233 | var cart_num = 0; | 2250 | var cart_num = 0; |
| 2234 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 2235 | - data: { | ||
| 2236 | - store_id: os.stoid, | ||
| 2237 | - user_id: getApp().globalData.user_id, | ||
| 2238 | - state: 0, is_gift: 0, | ||
| 2239 | - goods_id: good.goods_id, | ||
| 2240 | - pick_id: b_item.pickup_id | ||
| 2241 | - } | ||
| 2242 | - }).then(res => { | ||
| 2243 | - var num = 0; | ||
| 2244 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | ||
| 2245 | - for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2246 | - num += res.data.data.pageData[i].goods_num; | ||
| 2247 | - } | ||
| 2248 | - } | ||
| 2249 | - cart_num = num; | ||
| 2250 | - }) | 2251 | + // await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 2252 | + // data: { | ||
| 2253 | + // store_id: os.stoid, | ||
| 2254 | + // user_id: getApp().globalData.user_id, | ||
| 2255 | + // state: 0, is_gift: 0, | ||
| 2256 | + // goods_id: good.goods_id, | ||
| 2257 | + // pick_id: b_item.pickup_id | ||
| 2258 | + // } | ||
| 2259 | + // }).then(res => { | ||
| 2260 | + // var num = 0; | ||
| 2261 | + // if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | ||
| 2262 | + // for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2263 | + // num += res.data.data.pageData[i].goods_num; | ||
| 2264 | + // } | ||
| 2265 | + // } | ||
| 2266 | + // cart_num = num; | ||
| 2267 | + // }) | ||
| 2251 | 2268 | ||
| 2252 | var lock = 0, plist = null; | 2269 | var lock = 0, plist = null; |
| 2253 | 2270 | ||
| @@ -2340,22 +2357,22 @@ Page({ | @@ -2340,22 +2357,22 @@ Page({ | ||
| 2340 | 2357 | ||
| 2341 | //-- 看一下购物车上有多少商品 -- | 2358 | //-- 看一下购物车上有多少商品 -- |
| 2342 | var cart_num = 0; | 2359 | var cart_num = 0; |
| 2343 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 2344 | - data: { | ||
| 2345 | - store_id: os.stoid, | ||
| 2346 | - user_id: getApp().globalData.user_id, | ||
| 2347 | - state: 0, is_gift: 0, | ||
| 2348 | - goods_id: good.goods_id | ||
| 2349 | - } | ||
| 2350 | - }).then(res => { | ||
| 2351 | - var num = 0; | ||
| 2352 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | ||
| 2353 | - for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2354 | - num += res.data.data.pageData[i].goods_num; | ||
| 2355 | - } | ||
| 2356 | - } | ||
| 2357 | - cart_num = num; | ||
| 2358 | - }) | 2360 | + // await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 2361 | + // data: { | ||
| 2362 | + // store_id: os.stoid, | ||
| 2363 | + // user_id: getApp().globalData.user_id, | ||
| 2364 | + // state: 0, is_gift: 0, | ||
| 2365 | + // goods_id: good.goods_id | ||
| 2366 | + // } | ||
| 2367 | + // }).then(res => { | ||
| 2368 | + // var num = 0; | ||
| 2369 | + // if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | ||
| 2370 | + // for (var i = 0; i < res.data.data.pageData.length; i++) { | ||
| 2371 | + // num += res.data.data.pageData[i].goods_num; | ||
| 2372 | + // } | ||
| 2373 | + // } | ||
| 2374 | + // cart_num = num; | ||
| 2375 | + // }) | ||
| 2359 | 2376 | ||
| 2360 | 2377 | ||
| 2361 | if (good.store_count <= 0) { | 2378 | if (good.store_count <= 0) { |