Commit 47a41983e65433aadad55ea5d20bf2bffbf6e54e
1 parent
8357d4cc
团购测试修改
Showing
3 changed files
with
203 additions
and
187 deletions
pages/cart/cart/cart.js
| @@ -1423,9 +1423,32 @@ Page({ | @@ -1423,9 +1423,32 @@ Page({ | ||
| 1423 | 1423 | ||
| 1424 | //----------------------更新购物数量，加减,调用接口--------------------- | 1424 | //----------------------更新购物数量，加减,调用接口--------------------- |
| 1425 | postCardList: function(t, item, pitem) { | 1425 | postCardList: function(t, item, pitem) { |
| 1426 | + var e = this,th=e,user_id = getApp().globalData.user_id; | ||
| 1427 | + function normal_check() { | ||
| 1428 | + //--- 看一下是不是线下库存 --- | ||
| 1429 | + if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ | ||
| 1430 | + th.check_down_line(t, pitem, item,wareIds); | ||
| 1431 | + }else{ | ||
| 1432 | + if (t.goods_num > store_count) { | ||
| 1433 | + wx.showModal({ | ||
| 1434 | + title: '提示', | ||
| 1435 | + content: '购买数量超出商品库存' | ||
| 1436 | + }); | ||
| 1437 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1438 | + e.setData({ | ||
| 1439 | + [txt]: store_count | ||
| 1440 | + }); | ||
| 1441 | + e.doCheckAll(); | ||
| 1442 | + t.goods_num=store_count; | ||
| 1443 | + } | ||
| 1444 | + e.update_cart(t, pitem, item); | ||
| 1445 | + } | ||
| 1446 | + } | ||
| 1447 | + | ||
| 1448 | + | ||
| 1449 | + | ||
| 1450 | + | ||
| 1426 | 1451 | ||
| 1427 | - var e = this,th=e; | ||
| 1428 | - var user_id = getApp().globalData.user_id; | ||
| 1429 | // console.log('update'); | 1452 | // console.log('update'); |
| 1430 | // console.log('9995959595959',t); | 1453 | // console.log('9995959595959',t); |
| 1431 | rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, { | 1454 | rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, { |
| @@ -1456,12 +1479,8 @@ Page({ | @@ -1456,12 +1479,8 @@ Page({ | ||
| 1456 | th.setData({[txt]:promgoodsbuynum}); | 1479 | th.setData({[txt]:promgoodsbuynum}); |
| 1457 | } | 1480 | } |
| 1458 | goodsbuynum = buy_num_data.goodsbuynum; | 1481 | goodsbuynum = buy_num_data.goodsbuynum; |
| 1459 | - | ||
| 1460 | - | ||
| 1461 | - // console.log('goodsbuynum===========', goodsbuynum); | ||
| 1462 | - }) | ||
| 1463 | 1482 | ||
| 1464 | - | 1483 | + }) |
| 1465 | 1484 | ||
| 1466 | var buyed_mum2 = t.goods_num + goodsbuynum; | 1485 | var buyed_mum2 = t.goods_num + goodsbuynum; |
| 1467 | if (buyed_mum2 > limit && limit > 0) { | 1486 | if (buyed_mum2 > limit && limit > 0) { |
| @@ -1482,129 +1501,174 @@ Page({ | @@ -1482,129 +1501,174 @@ Page({ | ||
| 1482 | } | 1501 | } |
| 1483 | 1502 | ||
| 1484 | 1503 | ||
| 1485 | - if (goodsinfo.prom_type == 1) { | ||
| 1486 | - //读取秒杀 | ||
| 1487 | - rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { | ||
| 1488 | - isShowLoading: 0, | ||
| 1489 | - success: function(res_d) { | ||
| 1490 | - | ||
| 1491 | - if(res_d.data.code==0 && res_d.data.data){ | ||
| 1492 | - if (t.goods_num > store_count) { | ||
| 1493 | - wx.showModal({ | ||
| 1494 | - title: '提示', | ||
| 1495 | - content: '购买数量超出商品库存' | ||
| 1496 | - }); | ||
| 1497 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1498 | - e.setData({ | ||
| 1499 | - [txt]: store_count | ||
| 1500 | - }); | ||
| 1501 | - e.doCheckAll(); | ||
| 1502 | - | ||
| 1503 | - t.goods_num=store_count; | ||
| 1504 | - e.update_cart(t, pitem, item); | 1504 | + switch (goodsinfo.prom_type){ |
| 1505 | + case 1: | ||
| 1506 | + //读取秒杀 | ||
| 1507 | + rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { | ||
| 1508 | + isShowLoading: 0, | ||
| 1509 | + success: function(res_d) { | ||
| 1510 | + if(res_d.data.code==0 && res_d.data.data){ | ||
| 1511 | + if (t.goods_num > store_count) { | ||
| 1512 | + wx.showModal({ | ||
| 1513 | + title: '提示', | ||
| 1514 | + content: '购买数量超出商品库存' | ||
| 1515 | + }); | ||
| 1516 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1517 | + e.setData({ | ||
| 1518 | + [txt]: store_count | ||
| 1519 | + }); | ||
| 1520 | + e.doCheckAll(); | ||
| 1505 | 1521 | ||
| 1506 | - return false; | ||
| 1507 | - } | 1522 | + t.goods_num=store_count; |
| 1523 | + e.update_cart(t, pitem, item); | ||
| 1508 | 1524 | ||
| 1509 | - var false_data = res_d.data.data; | ||
| 1510 | - //--判断库存-- | ||
| 1511 | - if (t.goods_num > false_data.goods_num - false_data.buy_num) { | ||
| 1512 | - wx.showModal({ | ||
| 1513 | - title: '提示', | ||
| 1514 | - content: '购买数量超出活动库存' | ||
| 1515 | - }); | ||
| 1516 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1517 | - e.setData({ | ||
| 1518 | - [txt]: false_data.goods_num - false_data.buy_num | ||
| 1519 | - }); | ||
| 1520 | - e.doCheckAll(); | ||
| 1521 | - | ||
| 1522 | - t.goods_num=false_data.goods_num - false_data.buy_num; | ||
| 1523 | - e.update_cart(t, pitem, item); | 1525 | + return false; |
| 1526 | + } | ||
| 1524 | 1527 | ||
| 1525 | - return false; | ||
| 1526 | - } | 1528 | + var false_data = res_d.data.data; |
| 1529 | + //--判断库存-- | ||
| 1530 | + if (t.goods_num > false_data.goods_num - false_data.buy_num) { | ||
| 1531 | + wx.showModal({ | ||
| 1532 | + title: '提示', | ||
| 1533 | + content: '购买数量超出活动库存' | ||
| 1534 | + }); | ||
| 1535 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1536 | + e.setData({ | ||
| 1537 | + [txt]: false_data.goods_num - false_data.buy_num | ||
| 1538 | + }); | ||
| 1539 | + e.doCheckAll(); | ||
| 1527 | 1540 | ||
| 1528 | - //--判断redis数量是否已经超出-- | ||
| 1529 | - if (t.goods_num > false_data.redisnum) { | ||
| 1530 | - wx.showModal({ | ||
| 1531 | - title: '提示', | ||
| 1532 | - content: '购买数量超出商品库存' | ||
| 1533 | - }); | ||
| 1534 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1535 | - e.setData({ | ||
| 1536 | - [txt]: false_data.redisnum | ||
| 1537 | - }); | ||
| 1538 | - e.doCheckAll(); | ||
| 1539 | - | ||
| 1540 | - t.goods_num=false_data.redisnum; | ||
| 1541 | - e.update_cart(t, pitem, item); | 1541 | + t.goods_num=false_data.goods_num - false_data.buy_num; |
| 1542 | + e.update_cart(t, pitem, item); | ||
| 1542 | 1543 | ||
| 1544 | + return false; | ||
| 1545 | + } | ||
| 1543 | 1546 | ||
| 1544 | - return false; | ||
| 1545 | - } | 1547 | + //--判断redis数量是否已经超出-- |
| 1548 | + if (t.goods_num > false_data.redisnum) { | ||
| 1549 | + wx.showModal({ | ||
| 1550 | + title: '提示', | ||
| 1551 | + content: '购买数量超出商品库存' | ||
| 1552 | + }); | ||
| 1553 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1554 | + e.setData({ | ||
| 1555 | + [txt]: false_data.redisnum | ||
| 1556 | + }); | ||
| 1557 | + e.doCheckAll(); | ||
| 1546 | 1558 | ||
| 1547 | - //--活动的限购是不是要判断-- | ||
| 1548 | - if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { | ||
| 1549 | - wx.showModal({ | ||
| 1550 | - title: '提示', | ||
| 1551 | - content: '购买数量超出秒杀限购' | ||
| 1552 | - }); | ||
| 1553 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1554 | - e.setData({ | ||
| 1555 | - [txt]: false_data.false_data.buy_limit | ||
| 1556 | - }); | ||
| 1557 | - e.doCheckAll(); | ||
| 1558 | - | ||
| 1559 | - t.goods_num=false_data.false_data.buy_limit; | ||
| 1560 | - e.update_cart(t, pitem, item); | ||
| 1561 | - return false; | ||
| 1562 | - } | ||
| 1563 | - e.update_cart(t, pitem, item); | 1559 | + t.goods_num=false_data.redisnum; |
| 1560 | + e.update_cart(t, pitem, item); | ||
| 1561 | + return false; | ||
| 1562 | + } | ||
| 1564 | 1563 | ||
| 1565 | - }else{ | ||
| 1566 | - //--- 看一下是不是线下库存 --- | ||
| 1567 | - if(th.data.sales_rules==2){ | ||
| 1568 | - th.check_down_line(t, pitem, item,wareIds); | ||
| 1569 | - }else{ | ||
| 1570 | - if (t.goods_num > store_count) { | 1564 | + //--活动的限购是不是要判断-- |
| 1565 | + if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { | ||
| 1571 | wx.showModal({ | 1566 | wx.showModal({ |
| 1572 | title: '提示', | 1567 | title: '提示', |
| 1573 | - content: '购买数量超出商品库存' | 1568 | + content: '购买数量超出秒杀限购' |
| 1574 | }); | 1569 | }); |
| 1575 | var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | 1570 | var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; |
| 1576 | e.setData({ | 1571 | e.setData({ |
| 1577 | - [txt]: store_count | 1572 | + [txt]: false_data.buy_limit |
| 1578 | }); | 1573 | }); |
| 1579 | e.doCheckAll(); | 1574 | e.doCheckAll(); |
| 1575 | + t.goods_num=(false_data.buy_limit-promgoodsbuynum)?false_data.buy_limit-promgoodsbuynum:0; | ||
| 1576 | + e.update_cart(t, pitem, item); | ||
| 1580 | return false; | 1577 | return false; |
| 1581 | } | 1578 | } |
| 1582 | e.update_cart(t, pitem, item); | 1579 | e.update_cart(t, pitem, item); |
| 1580 | + | ||
| 1581 | + }else{ | ||
| 1582 | + normal_check(); | ||
| 1583 | } | 1583 | } |
| 1584 | } | 1584 | } |
| 1585 | + }) | ||
| 1586 | + break; | ||
| 1587 | + case 2: | ||
| 1588 | + getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { | ||
| 1589 | + }).then(res => { | ||
| 1590 | + if(res.data.code==0 && res.data.data){ | ||
| 1591 | + if (t.goods_num > store_count) { | ||
| 1592 | + wx.showModal({ | ||
| 1593 | + title: '提示', | ||
| 1594 | + content: '购买数量超出商品库存' | ||
| 1595 | + }); | ||
| 1596 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1597 | + e.setData({ | ||
| 1598 | + [txt]: store_count | ||
| 1599 | + }); | ||
| 1600 | + e.doCheckAll(); | ||
| 1601 | + | ||
| 1602 | + t.goods_num=store_count; | ||
| 1603 | + e.update_cart(t, pitem, item); | ||
| 1604 | + | ||
| 1605 | + return false; | ||
| 1606 | + } | ||
| 1607 | + | ||
| 1608 | + var gr_data = res.data.data; | ||
| 1609 | + //--判断库存-- | ||
| 1610 | + if (t.goods_num > gr_data.goods_num - gr_data.buy_num) { | ||
| 1611 | + wx.showModal({ | ||
| 1612 | + title: '提示', | ||
| 1613 | + content: '购买数量超出活动库存' | ||
| 1614 | + }); | ||
| 1615 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1616 | + e.setData({ | ||
| 1617 | + [txt]: gr_data.goods_num - gr_data.buy_num | ||
| 1618 | + }); | ||
| 1619 | + e.doCheckAll(); | ||
| 1620 | + | ||
| 1621 | + t.goods_num=gr_data.goods_num - gr_data.buy_num; | ||
| 1622 | + e.update_cart(t, pitem, item); | ||
| 1623 | + | ||
| 1624 | + return false; | ||
| 1625 | + } | ||
| 1626 | + | ||
| 1627 | + //--判断redis数量是否已经超出-- | ||
| 1628 | + if (t.goods_num > gr_data.redisnum) { | ||
| 1629 | + wx.showModal({ | ||
| 1630 | + title: '提示', | ||
| 1631 | + content: '购买数量超出商品库存' | ||
| 1632 | + }); | ||
| 1633 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1634 | + e.setData({ | ||
| 1635 | + [txt]: gr_data.redisnum | ||
| 1636 | + }); | ||
| 1637 | + e.doCheckAll(); | ||
| 1638 | + | ||
| 1639 | + t.goods_num=gr_data.redisnum; | ||
| 1640 | + e.update_cart(t, pitem, item); | ||
| 1641 | + return false; | ||
| 1642 | + } | ||
| 1643 | + | ||
| 1644 | + //--活动的限购是不是要判断-- | ||
| 1645 | + if (t.goods_num + promgoodsbuynum > gr_data.buy_limit && gr_data.buy_limit > 0) { | ||
| 1646 | + wx.showModal({ | ||
| 1647 | + title: '提示', | ||
| 1648 | + content: '购买数量超出秒杀限购' | ||
| 1649 | + }); | ||
| 1650 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1651 | + e.setData({ | ||
| 1652 | + [txt]: gr_data.buy_limit | ||
| 1653 | + }); | ||
| 1654 | + e.doCheckAll(); | ||
| 1655 | + | ||
| 1656 | + t.goods_num=(gr_data.buy_limit-promgoodsbuynum)?gr_data.buy_limit-promgoodsbuynum:0; | ||
| 1657 | + e.update_cart(t, pitem, item); | ||
| 1658 | + return false; | ||
| 1659 | + } | ||
| 1660 | + e.update_cart(t, pitem, item); | ||
| 1661 | + | ||
| 1662 | + }else{ | ||
| 1663 | + normal_check(); | ||
| 1664 | + } | ||
| 1665 | + }) | ||
| 1585 | 1666 | ||
| 1586 | - } | ||
| 1587 | - }) | ||
| 1588 | - } else { | ||
| 1589 | - //--- 看一下是不是线下库存 --- | ||
| 1590 | - if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ | ||
| 1591 | - th.check_down_line(t, pitem, item,wareIds); | ||
| 1592 | - }else{ | ||
| 1593 | - if (t.goods_num > store_count) { | ||
| 1594 | - wx.showModal({ | ||
| 1595 | - title: '提示', | ||
| 1596 | - content: '购买数量超出商品库存' | ||
| 1597 | - }); | ||
| 1598 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1599 | - e.setData({ | ||
| 1600 | - [txt]: store_count | ||
| 1601 | - }); | ||
| 1602 | - e.doCheckAll(); | ||
| 1603 | - t.goods_num=store_count; | ||
| 1604 | - } | ||
| 1605 | - e.update_cart(t, pitem, item); | ||
| 1606 | - } | ||
| 1607 | - } | 1667 | + break; |
| 1668 | + default: | ||
| 1669 | + normal_check() | ||
| 1670 | + break | ||
| 1671 | + } | ||
| 1608 | } | 1672 | } |
| 1609 | }); | 1673 | }); |
| 1610 | }, | 1674 | }, |
pages/cart/cart2/cart2.js
| @@ -983,6 +983,7 @@ Page({ | @@ -983,6 +983,7 @@ Page({ | ||
| 983 | //t.data.data.shop_price = tt.data.data.prom_price; | 983 | //t.data.data.shop_price = tt.data.data.prom_price; |
| 984 | t.data.data.shop_price = tt.data.data.prom_user_price; | 984 | t.data.data.shop_price = tt.data.data.prom_user_price; |
| 985 | th.data.ckeck_quan_price=0; | 985 | th.data.ckeck_quan_price=0; |
| 986 | + gd.is_xz_yh=1; | ||
| 986 | } else { | 987 | } else { |
| 987 | t.data.data.prom_id = 0; | 988 | t.data.data.prom_id = 0; |
| 988 | t.data.data.prom_type = 0; | 989 | t.data.data.prom_type = 0; |
pages/goods/goodsInfo/goodsInfo.js
| @@ -3022,44 +3022,24 @@ Page({ | @@ -3022,44 +3022,24 @@ Page({ | ||
| 3022 | getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gid+"/"+ prom_id, { | 3022 | getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gid+"/"+ prom_id, { |
| 3023 | success: function (t) { | 3023 | success: function (t) { |
| 3024 | if (t.data.code != 0) { | 3024 | if (t.data.code != 0) { |
| 3025 | - ee.setData({ | ||
| 3026 | - prom_type: 0, | ||
| 3027 | - isshow: 1, | ||
| 3028 | - }); | ||
| 3029 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3030 | - ee.get_sto(); | 3025 | + ee.get_normal(gid); |
| 3031 | return false; | 3026 | return false; |
| 3032 | } | 3027 | } |
| 3033 | //----已经结束----- | 3028 | //----已经结束----- |
| 3034 | if (t.data.data.is_end == 1) { | 3029 | if (t.data.data.is_end == 1) { |
| 3035 | - ee.setData({ | ||
| 3036 | - prom_type: 0, | ||
| 3037 | - isshow: 1, | ||
| 3038 | - }); | ||
| 3039 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3040 | - ee.get_sto(); | 3030 | + ee.get_normal(gid); |
| 3041 | return false; | 3031 | return false; |
| 3042 | } | 3032 | } |
| 3043 | //----已经过期----- | 3033 | //----已经过期----- |
| 3044 | var now = ut.gettimestamp(); | 3034 | var now = ut.gettimestamp(); |
| 3045 | if (t.data.data.end_time < now || t.data.data.start_time>now) { | 3035 | if (t.data.data.end_time < now || t.data.data.start_time>now) { |
| 3046 | - ee.setData({ | ||
| 3047 | - prom_type: 0, | ||
| 3048 | - isshow: 1, | ||
| 3049 | - }); | ||
| 3050 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3051 | - ee.get_sto(); | 3036 | + ee.get_normal(gid); |
| 3052 | return false; | 3037 | return false; |
| 3053 | } | 3038 | } |
| 3054 | 3039 | ||
| 3055 | /*-- 还没有开始预热的也不显示 --*/ | 3040 | /*-- 还没有开始预热的也不显示 --*/ |
| 3056 | if (t.data.data.show_time > now) { | 3041 | if (t.data.data.show_time > now) { |
| 3057 | - ee.setData({ | ||
| 3058 | - prom_type: 0, | ||
| 3059 | - isshow: 1, | ||
| 3060 | - }); | ||
| 3061 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3062 | - ee.get_sto(); | 3042 | + ee.get_normal(gid); |
| 3063 | return false; | 3043 | return false; |
| 3064 | } | 3044 | } |
| 3065 | 3045 | ||
| @@ -3134,43 +3114,23 @@ Page({ | @@ -3134,43 +3114,23 @@ Page({ | ||
| 3134 | getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, { | 3114 | getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, { |
| 3135 | success: function (t) { | 3115 | success: function (t) { |
| 3136 | if (t.data.code != 0) { | 3116 | if (t.data.code != 0) { |
| 3137 | - ee.setData({ | ||
| 3138 | - prom_type: 0, | ||
| 3139 | - isshow: 1, | ||
| 3140 | - }); | ||
| 3141 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3142 | - ee.get_sto(); | 3117 | + ee.get_normal(gid); |
| 3143 | return false; | 3118 | return false; |
| 3144 | } | 3119 | } |
| 3145 | //----已经结束----- | 3120 | //----已经结束----- |
| 3146 | if (t.data.data.is_end == 1) { | 3121 | if (t.data.data.is_end == 1) { |
| 3147 | - ee.setData({ | ||
| 3148 | - prom_type: 0, | ||
| 3149 | - isshow: 1, | ||
| 3150 | - }); | ||
| 3151 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3152 | - ee.get_sto(); | 3122 | + ee.get_normal(gid); |
| 3153 | return false; | 3123 | return false; |
| 3154 | } | 3124 | } |
| 3155 | //----已经过期----- | 3125 | //----已经过期----- |
| 3156 | var now = ut.gettimestamp(); | 3126 | var now = ut.gettimestamp(); |
| 3157 | if (t.data.data.end_time < now) { | 3127 | if (t.data.data.end_time < now) { |
| 3158 | - ee.setData({ | ||
| 3159 | - prom_type: 0, | ||
| 3160 | - isshow: 1, | ||
| 3161 | - }); | ||
| 3162 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3163 | - ee.get_sto(); | 3128 | + ee.get_normal(gid); |
| 3164 | return false; | 3129 | return false; |
| 3165 | } | 3130 | } |
| 3166 | /*-- 还没有开始预热的也不显示 --*/ | 3131 | /*-- 还没有开始预热的也不显示 --*/ |
| 3167 | if (t.data.data.show_time > now) { | 3132 | if (t.data.data.show_time > now) { |
| 3168 | - ee.setData({ | ||
| 3169 | - prom_type: 0, | ||
| 3170 | - isshow: 1, | ||
| 3171 | - }); | ||
| 3172 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3173 | - ee.get_sto(); | 3133 | + ee.get_normal(gid); |
| 3174 | return false; | 3134 | return false; |
| 3175 | } | 3135 | } |
| 3176 | 3136 | ||
| @@ -3303,9 +3263,7 @@ Page({ | @@ -3303,9 +3263,7 @@ Page({ | ||
| 3303 | ee.get_sto(); | 3263 | ee.get_sto(); |
| 3304 | 3264 | ||
| 3305 | } else { | 3265 | } else { |
| 3306 | - ee.setData({ prom_type: 0, isshow: 1, }); | ||
| 3307 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3308 | - ee.get_sto(); | 3266 | + ee.get_normal(gid); |
| 3309 | return false; | 3267 | return false; |
| 3310 | } | 3268 | } |
| 3311 | }) | 3269 | }) |
| @@ -3330,44 +3288,25 @@ Page({ | @@ -3330,44 +3288,25 @@ Page({ | ||
| 3330 | success: function (t) { | 3288 | success: function (t) { |
| 3331 | console.log(t,3124); | 3289 | console.log(t,3124); |
| 3332 | if (t.data.code != 0) { | 3290 | if (t.data.code != 0) { |
| 3333 | - ee.setData({ | ||
| 3334 | - prom_type: 0, | ||
| 3335 | - isshow: 1, | ||
| 3336 | - }); | ||
| 3337 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3338 | - ee.get_sto(); | ||
| 3339 | - return false; | 3291 | + ee.get_normal(gid); |
| 3292 | + return false; | ||
| 3340 | } | 3293 | } |
| 3341 | //----已经结束----- | 3294 | //----已经结束----- |
| 3342 | if (t.data.data.is_end == 1) { | 3295 | if (t.data.data.is_end == 1) { |
| 3343 | - ee.setData({ | ||
| 3344 | - prom_type: 0, | ||
| 3345 | - isshow: 1, | ||
| 3346 | - }); | ||
| 3347 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3348 | - return false; | 3296 | + ee.get_normal(gid); |
| 3297 | + return false; | ||
| 3349 | } | 3298 | } |
| 3350 | //----已经过期----- | 3299 | //----已经过期----- |
| 3351 | var now = ut.gettimestamp(); | 3300 | var now = ut.gettimestamp(); |
| 3352 | if (t.data.data.end_time < now) { | 3301 | if (t.data.data.end_time < now) { |
| 3353 | - ee.setData({ | ||
| 3354 | - prom_type: 0, | ||
| 3355 | - isshow: 1, | ||
| 3356 | - }); | ||
| 3357 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3358 | - ee.get_sto(); | ||
| 3359 | - return false; | 3302 | + ee.get_normal(gid); |
| 3303 | + return false; | ||
| 3360 | } | 3304 | } |
| 3361 | 3305 | ||
| 3362 | /*-- 还没有开始预热的也不显示 --*/ | 3306 | /*-- 还没有开始预热的也不显示 --*/ |
| 3363 | if (t.data.data.show_time > now) { | 3307 | if (t.data.data.show_time > now) { |
| 3364 | - ee.setData({ | ||
| 3365 | - prom_type: 0, | ||
| 3366 | - isshow: 1, | ||
| 3367 | - }); | ||
| 3368 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3369 | - ee.get_sto(); | ||
| 3370 | - return false; | 3308 | + ee.get_normal(gid); |
| 3309 | + return false; | ||
| 3371 | } | 3310 | } |
| 3372 | 3311 | ||
| 3373 | /*-- 判断拼单是否启用 --*/ | 3312 | /*-- 判断拼单是否启用 --*/ |
| @@ -6054,9 +5993,21 @@ Page({ | @@ -6054,9 +5993,21 @@ Page({ | ||
| 6054 | corpId: id, | 5993 | corpId: id, |
| 6055 | success(res) {} | 5994 | success(res) {} |
| 6056 | }) | 5995 | }) |
| 5996 | + }, | ||
| 5997 | + | ||
| 5998 | + get_normal(gid){ | ||
| 5999 | + this.setData({ | ||
| 6000 | + prom_type: 0, | ||
| 6001 | + isshow: 1, | ||
| 6002 | + }); | ||
| 6003 | + this.get_sku(os.stoid, this.data.data, gid); | ||
| 6004 | + this.get_sto(); | ||
| 6005 | + this.check_is_youhui(gid,1); | ||
| 6006 | + this.data.is_normal=1; | ||
| 6057 | } | 6007 | } |
| 6058 | 6008 | ||
| 6059 | 6009 | ||
| 6060 | 6010 | ||
| 6061 | 6011 | ||
| 6012 | + | ||
| 6062 | }); | 6013 | }); |