Commit 97a6dfb8b8a45e7aee06088613bfaa41cc1b4f70
1 parent
18f45911
OA 单 购物车失效优化
Showing
2 changed files
with
102 additions
and
60 deletions
pages/cart/cart/cart.js
| @@ -619,7 +619,7 @@ Page({ | @@ -619,7 +619,7 @@ Page({ | ||
| 619 | else if(item.prom_type ==2){ | 619 | else if(item.prom_type ==2){ |
| 620 | var prom = null; | 620 | var prom = null; |
| 621 | var now = ut.gettimestamp(); | 621 | var now = ut.gettimestamp(); |
| 622 | - await getApp().request.promiseGet('/api/weshop/goods/groupBuy/getActInfo/' + item.goods_id + '/' + user_id + '/' + item.prom_id, {}).then(res => { | 622 | + await getApp().request.promiseGet('/api/weshop/goods/groupBuy/getActInfo/'+ oo.stoid + '/' + item.goods_id + '/' + item.prom_id, {}).then(res => { |
| 623 | if (res.data.code == 0) { | 623 | if (res.data.code == 0) { |
| 624 | prom = res.data.data; | 624 | prom = res.data.data; |
| 625 | prom.price = prom.user_price; | 625 | prom.price = prom.user_price; |
| @@ -666,26 +666,35 @@ Page({ | @@ -666,26 +666,35 @@ Page({ | ||
| 666 | if (!r_data.promGoodsLists) { | 666 | if (!r_data.promGoodsLists) { |
| 667 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 667 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 668 | // getApp().request.delete(url, {}); | 668 | // getApp().request.delete(url, {}); |
| 669 | - th.disInvalid(item); | ||
| 670 | //商品已经无活动 | 669 | //商品已经无活动 |
| 671 | - isok = 0; | 670 | + // th.disInvalid(item); |
| 671 | + // isok = 0; | ||
| 672 | + item.prom_type = 0 | ||
| 673 | + //购物车更新 | ||
| 674 | + th.cartUpFn(item) | ||
| 672 | } else { | 675 | } else { |
| 673 | //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 | 676 | //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 |
| 674 | if (item.prom_id != r_data.promGoodsLists[0].prom_id) { | 677 | if (item.prom_id != r_data.promGoodsLists[0].prom_id) { |
| 675 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 678 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 676 | // getApp().request.delete(url, {}); | 679 | // getApp().request.delete(url, {}); |
| 677 | - th.disInvalid(item); | ||
| 678 | //商品已经下架 | 680 | //商品已经下架 |
| 679 | - isok = 0; | 681 | + // th.disInvalid(item); |
| 682 | + // isok = 0; | ||
| 683 | + item.prom_type = 0 | ||
| 684 | + //购物车更新 | ||
| 685 | + th.cartUpFn(item) | ||
| 680 | } | 686 | } |
| 681 | } | 687 | } |
| 682 | 688 | ||
| 683 | } else { | 689 | } else { |
| 684 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 690 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 685 | // getApp().request.delete(url, {}); | 691 | // getApp().request.delete(url, {}); |
| 686 | - th.disInvalid(item); | ||
| 687 | - //商品已经下架 | ||
| 688 | - isok = 0; | 692 | + // th.disInvalid(item); |
| 693 | + // //商品已经下架 | ||
| 694 | + // isok = 0; | ||
| 695 | + item.prom_type = 0 | ||
| 696 | + //购物车更新 | ||
| 697 | + th.cartUpFn(item) | ||
| 689 | } | 698 | } |
| 690 | }) | 699 | }) |
| 691 | 700 | ||
| @@ -696,43 +705,51 @@ Page({ | @@ -696,43 +705,51 @@ Page({ | ||
| 696 | if (!r_data.promGoodsLists) { | 705 | if (!r_data.promGoodsLists) { |
| 697 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 706 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 698 | // getApp().request.delete(url, {}); | 707 | // getApp().request.delete(url, {}); |
| 699 | - th.disInvalid(item); | ||
| 700 | - //商品已经无活动 | ||
| 701 | - isok = 0; | 708 | + // th.disInvalid(item); |
| 709 | + // //商品已经无活动 | ||
| 710 | + // isok = 0; | ||
| 711 | + item.prom_type = 0 | ||
| 712 | + //购物车更新 | ||
| 713 | + th.cartUpFn(item) | ||
| 702 | } else { | 714 | } else { |
| 703 | //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 | 715 | //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 |
| 704 | if (item.prom_id != r_data.promGoodsLists[0].prom_id) { | 716 | if (item.prom_id != r_data.promGoodsLists[0].prom_id) { |
| 705 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 717 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 706 | // getApp().request.delete(url, {}); | 718 | // getApp().request.delete(url, {}); |
| 707 | - th.disInvalid(item); | ||
| 708 | - //商品已经下架 | ||
| 709 | - isok = 0; | 719 | + // th.disInvalid(item); |
| 720 | + // //商品已经下架 | ||
| 721 | + // isok = 0; | ||
| 722 | + item.prom_type = 0 | ||
| 723 | + //购物车更新 | ||
| 724 | + th.cartUpFn(item) | ||
| 710 | } | 725 | } |
| 711 | } | 726 | } |
| 712 | 727 | ||
| 713 | } else { | 728 | } else { |
| 714 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 729 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 715 | // getApp().request.delete(url, {}); | 730 | // getApp().request.delete(url, {}); |
| 716 | - th.disInvalid(item,1); | ||
| 717 | - //商品已经下架 | ||
| 718 | - isok = 0; | 731 | + // th.disInvalid(item,1); |
| 732 | + // //商品已经下架 | ||
| 733 | + // isok = 0; | ||
| 734 | + item.prom_type = 0 | ||
| 735 | + //购物车更新 | ||
| 736 | + th.cartUpFn(item) | ||
| 719 | } | 737 | } |
| 720 | }) | 738 | }) |
| 721 | - | ||
| 722 | } | 739 | } |
| 723 | - | ||
| 724 | - if (!isok) continue; | 740 | + // if (!isok) continue; |
| 725 | } | 741 | } |
| 726 | else if (item.prom_type == 7) { | 742 | else if (item.prom_type == 7) { |
| 743 | + console.log('组合购------------'); | ||
| 727 | if(!th.data.zuhe_map[item.prom_id]){ | 744 | if(!th.data.zuhe_map[item.prom_id]){ |
| 728 | - | 745 | + console.log('组1') |
| 729 | //如果有组合购 | 746 | //如果有组合购 |
| 730 | var isok = 1; | 747 | var isok = 1; |
| 731 | var is_flag = 1; | 748 | var is_flag = 1; |
| 732 | var act = null; | 749 | var act = null; |
| 733 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.user_id; | 750 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.user_id; |
| 734 | await getApp().request.promiseGet(url, {}).then(res => { | 751 | await getApp().request.promiseGet(url, {}).then(res => { |
| 735 | - console.log(res, 1000); | 752 | + console.log(res); |
| 736 | if (res.data.code == 0 && res.data.data) { | 753 | if (res.data.code == 0 && res.data.data) { |
| 737 | if (res.data.data.is_show != 1) { | 754 | if (res.data.data.is_show != 1) { |
| 738 | isok = 0; | 755 | isok = 0; |
| @@ -759,38 +776,44 @@ Page({ | @@ -759,38 +776,44 @@ Page({ | ||
| 759 | if (!isok) { | 776 | if (!isok) { |
| 760 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 777 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 761 | // getApp().request.delete(url, {}); | 778 | // getApp().request.delete(url, {}); |
| 762 | - th.disInvalid(item); | ||
| 763 | - th.data.zuhe_map[item.prom_id] = -1; | ||
| 764 | - continue; | ||
| 765 | - } | ||
| 766 | - th.data.zuhe_map[item.prom_id] = act; | ||
| 767 | - var url1 = "/api/weshop/prom/zhbuyGoods/page"; | ||
| 768 | - var req_data = { | ||
| 769 | - page: 1, | ||
| 770 | - pageSize: 2000, | ||
| 771 | - store_id: os.stoid, | ||
| 772 | - zh_id: item.prom_id, | 779 | + //组合购失效不处理 |
| 780 | + // th.disInvalid(item); | ||
| 781 | + // th.data.zuhe_map[item.prom_id] = -1; | ||
| 782 | + // continue; | ||
| 783 | + item.prom_type = 0 | ||
| 784 | + //购物车更新 | ||
| 785 | + th.cartUpFn(item) | ||
| 786 | + }else{ | ||
| 787 | + th.data.zuhe_map[item.prom_id] = act; | ||
| 788 | + var url1 = "/api/weshop/prom/zhbuyGoods/page"; | ||
| 789 | + var req_data = { | ||
| 790 | + page: 1, | ||
| 791 | + pageSize: 2000, | ||
| 792 | + store_id: os.stoid, | ||
| 793 | + zh_id: item.prom_id, | ||
| 794 | + } | ||
| 795 | + await getApp().request.promiseGet(url1, { | ||
| 796 | + data: req_data | ||
| 797 | + }).then(res => { | ||
| 798 | + console.log(res, 2000); | ||
| 799 | + if (ut.ajax_ok(res)) { | ||
| 800 | + var gdlist = res.data.data.pageData; | ||
| 801 | + gdlist.forEach(i => { | ||
| 802 | + if (item.goods_id == i.goods_id && !is_flag) { | ||
| 803 | + item.prom_type = 0; | ||
| 804 | + item.prom_type1 = 0; | ||
| 805 | + item.prom_id = 0; | ||
| 806 | + item.prom_id1 = 0 | ||
| 807 | + } | ||
| 808 | + }) | ||
| 809 | + th.data.zuhe_map_good[item.prom_id] = gdlist; | ||
| 810 | + } | ||
| 811 | + }) | ||
| 773 | } | 812 | } |
| 774 | - await getApp().request.promiseGet(url1, { | ||
| 775 | - data: req_data | ||
| 776 | - }).then(res => { | ||
| 777 | - console.log(res, 2000); | ||
| 778 | - if (ut.ajax_ok(res)) { | ||
| 779 | - var gdlist = res.data.data.pageData; | ||
| 780 | - gdlist.forEach(i => { | ||
| 781 | - if (item.goods_id == i.goods_id && !is_flag) { | ||
| 782 | - item.prom_type = 0; | ||
| 783 | - item.prom_type1 = 0; | ||
| 784 | - item.prom_id = 0; | ||
| 785 | - item.prom_id1 = 0 | ||
| 786 | - } | ||
| 787 | - }) | ||
| 788 | - th.data.zuhe_map_good[item.prom_id] = gdlist; | ||
| 789 | - } | ||
| 790 | - }) | ||
| 791 | } | 813 | } |
| 792 | - | 814 | + console.log('组2') |
| 793 | if (th.data.zuhe_map[item.prom_id] && th.data.zuhe_map[item.prom_id] != -1) { | 815 | if (th.data.zuhe_map[item.prom_id] && th.data.zuhe_map[item.prom_id] != -1) { |
| 816 | + console.log('组3') | ||
| 794 | var gdlist = th.data.zuhe_map_good[item.prom_id]; | 817 | var gdlist = th.data.zuhe_map_good[item.prom_id]; |
| 795 | var t_item = gdlist.find(function (ele) { | 818 | var t_item = gdlist.find(function (ele) { |
| 796 | return ele.goods_id == item.goods_id | 819 | return ele.goods_id == item.goods_id |
| @@ -798,13 +821,18 @@ Page({ | @@ -798,13 +821,18 @@ Page({ | ||
| 798 | if (!t_item) { | 821 | if (!t_item) { |
| 799 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 822 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 800 | // getApp().request.delete(url, {}); | 823 | // getApp().request.delete(url, {}); |
| 801 | - th.disInvalid(item,1); | ||
| 802 | - th.data.zuhe_map[item.prom_id] = -1; | ||
| 803 | - continue; | ||
| 804 | - } | ||
| 805 | - item.buyqty = t_item.buyqty; | ||
| 806 | - item.zh_b_num = promgoodsbuynum; | ||
| 807 | - item.act = th.data.zuhe_map[item.prom_id]; | 824 | + //组合购不处理 |
| 825 | + // th.disInvalid(item,1); | ||
| 826 | + // th.data.zuhe_map[item.prom_id] = -1; | ||
| 827 | + // continue; | ||
| 828 | + item.prom_type = 0 | ||
| 829 | + //购物车更新 | ||
| 830 | + th.cartUpFn(item) | ||
| 831 | + }else{ | ||
| 832 | + item.buyqty = t_item.buyqty; | ||
| 833 | + item.zh_b_num = promgoodsbuynum; | ||
| 834 | + item.act = th.data.zuhe_map[item.prom_id]; | ||
| 835 | + } | ||
| 808 | } //else{ | 836 | } //else{ |
| 809 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 837 | // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 810 | // getApp().request.delete(url, {}); | 838 | // getApp().request.delete(url, {}); |
| @@ -1082,7 +1110,19 @@ Page({ | @@ -1082,7 +1110,19 @@ Page({ | ||
| 1082 | } | 1110 | } |
| 1083 | }); | 1111 | }); |
| 1084 | }, | 1112 | }, |
| 1085 | - | 1113 | + //商品购物车修改 |
| 1114 | + cartUpFn(item){ | ||
| 1115 | + let updata1 = { | ||
| 1116 | + id: item.id, | ||
| 1117 | + prom_type: 0, | ||
| 1118 | + prom_id:item.prom_id, | ||
| 1119 | + store_id: os.stoid, | ||
| 1120 | + user_id: getApp().globalData.userInfo.user_id | ||
| 1121 | + }; | ||
| 1122 | + getApp().request.put("/api/weshop/cart/update", { | ||
| 1123 | + data: updata1, | ||
| 1124 | + }) | ||
| 1125 | + }, | ||
| 1086 | //-----真的获取购物车-------- | 1126 | //-----真的获取购物车-------- |
| 1087 | get_ser_cart: function () { | 1127 | get_ser_cart: function () { |
| 1088 | var th = this; | 1128 | var th = this; |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1863,6 +1863,7 @@ Page({ | @@ -1863,6 +1863,7 @@ Page({ | ||
| 1863 | goods_price: newd.goods_price, | 1863 | goods_price: newd.goods_price, |
| 1864 | member_goods_price: newd.goods_price, | 1864 | member_goods_price: newd.goods_price, |
| 1865 | store_id: th.data.stoid, | 1865 | store_id: th.data.stoid, |
| 1866 | + prom_id:newd.prom_id //把活动id带上去(用于购物车失效变成有效商品) | ||
| 1866 | }; | 1867 | }; |
| 1867 | 1868 | ||
| 1868 | //---是不是从收藏夹出来的--- | 1869 | //---是不是从收藏夹出来的--- |
| @@ -1875,6 +1876,7 @@ Page({ | @@ -1875,6 +1876,7 @@ Page({ | ||
| 1875 | updata['guide_type'] = 0; | 1876 | updata['guide_type'] = 0; |
| 1876 | } | 1877 | } |
| 1877 | } | 1878 | } |
| 1879 | + | ||
| 1878 | 1880 | ||
| 1879 | i.put("/api/weshop/cart/update", { | 1881 | i.put("/api/weshop/cart/update", { |
| 1880 | data: updata, | 1882 | data: updata, |
| @@ -2290,7 +2292,7 @@ Page({ | @@ -2290,7 +2292,7 @@ Page({ | ||
| 2290 | sort_store: 0, | 2292 | sort_store: 0, |
| 2291 | open_ind_store: open_store, | 2293 | open_ind_store: open_store, |
| 2292 | }) | 2294 | }) |
| 2293 | - //--先判断会员状态-- | 2295 | + //--先判断会员状态-- |
| 2294 | var user_info = getApp().globalData.userInfo; | 2296 | var user_info = getApp().globalData.userInfo; |
| 2295 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | 2297 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { |
| 2296 | wx.navigateTo({ | 2298 | wx.navigateTo({ |