Commit 43f223b475a9eb10d4b028cce8c2490992aacb5c
1 parent
0e766823
解决冲突
Showing
3 changed files
with
1031 additions
and
1191 deletions
pages/cart/cart/cart.js
| @@ -360,31 +360,19 @@ Page({ | @@ -360,31 +360,19 @@ Page({ | ||
| 360 | //--判断优惠活动有没有过期,-- | 360 | //--判断优惠活动有没有过期,-- |
| 361 | else if (item.prom_type == 3) { | 361 | else if (item.prom_type == 3) { |
| 362 | var isok = 1,is_g_prom=0; | 362 | var isok = 1,is_g_prom=0; |
| 363 | -<<<<<<< HEAD | ||
| 364 | - //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 365 | - var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 366 | - var req_data={ | ||
| 367 | - store_id:os.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id | ||
| 368 | -======= | ||
| 369 | 363 | ||
| 370 | //因为有全场优惠活动，商品参加的活动还未开始 | 364 | //因为有全场优惠活动，商品参加的活动还未开始 |
| 371 | var url="/api/weshop/activitylist/getGoodActInfo"; | 365 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 372 | var req_data={ | 366 | var req_data={ |
| 373 | - store_id:os.stoid,goodsidlist:item.goods_id,is_detail:1 | ||
| 374 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | 367 | + store_id:os.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id |
| 375 | }; | 368 | }; |
| 376 | await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | 369 | await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { |
| 377 | if(res.data.code==0 && res.data.data && res.data.data.length){ | 370 | if(res.data.code==0 && res.data.data && res.data.data.length){ |
| 378 | for(let i in res.data.data){ | 371 | for(let i in res.data.data){ |
| 379 | -<<<<<<< HEAD | ||
| 380 | - let item=res.data.data[i]; | ||
| 381 | - if(item.prom_type==3) { | ||
| 382 | - is_g_prom=1; break; | ||
| 383 | -======= | ||
| 384 | let item=res.data.data[i]; | 372 | let item=res.data.data[i]; |
| 385 | if(item.prom_type==3) { | 373 | if(item.prom_type==3) { |
| 386 | is_g_prom=1; break; | 374 | is_g_prom=1; break; |
| 387 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | 375 | + |
| 388 | } | 376 | } |
| 389 | } | 377 | } |
| 390 | } | 378 | } |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1858,7 +1858,7 @@ Page({ | @@ -1858,7 +1858,7 @@ Page({ | ||
| 1858 | }); | 1858 | }); |
| 1859 | }, | 1859 | }, |
| 1860 | 1860 | ||
| 1861 | -<<<<<<< HEAD | 1861 | + |
| 1862 | openSpecModel: function (t) { | 1862 | openSpecModel: function (t) { |
| 1863 | var th = this; | 1863 | var th = this; |
| 1864 | var open_store = t.currentTarget.dataset.ind; | 1864 | var open_store = t.currentTarget.dataset.ind; |
| @@ -1930,8 +1930,8 @@ Page({ | @@ -1930,8 +1930,8 @@ Page({ | ||
| 1930 | th.setData({is_pop_more: 1}); | 1930 | th.setData({is_pop_more: 1}); |
| 1931 | 1931 | ||
| 1932 | } | 1932 | } |
| 1933 | - }, | ||
| 1934 | - | 1933 | + } |
| 1934 | + }, | ||
| 1935 | open_next(){ | 1935 | open_next(){ |
| 1936 | var th=this; | 1936 | var th=this; |
| 1937 | //回调。判断是不是优惠促销 | 1937 | //回调。判断是不是优惠促销 |
| @@ -3102,11 +3102,7 @@ Page({ | @@ -3102,11 +3102,7 @@ Page({ | ||
| 3102 | var user_id=getApp().globalData.user_id; | 3102 | var user_id=getApp().globalData.user_id; |
| 3103 | if(!user_id) user_id=0; | 3103 | if(!user_id) user_id=0; |
| 3104 | 3104 | ||
| 3105 | -<<<<<<< HEAD | ||
| 3106 | - if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 9) { | ||
| 3107 | -======= | ||
| 3108 | - if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 10) { | ||
| 3109 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | 3105 | + if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 9 || prom_type == 10) { |
| 3110 | this.setData({ | 3106 | this.setData({ |
| 3111 | prom_type: 0,isshow: 1, | 3107 | prom_type: 0,isshow: 1, |
| 3112 | }); | 3108 | }); |
| @@ -6167,8 +6163,6 @@ Page({ | @@ -6167,8 +6163,6 @@ Page({ | ||
| 6167 | success(res) {} | 6163 | success(res) {} |
| 6168 | }) | 6164 | }) |
| 6169 | }, | 6165 | }, |
| 6170 | -<<<<<<< HEAD | ||
| 6171 | - | ||
| 6172 | get_normal(gid){ | 6166 | get_normal(gid){ |
| 6173 | this.setData({ | 6167 | this.setData({ |
| 6174 | prom_type: 0, | 6168 | prom_type: 0, |
| @@ -6178,11 +6172,7 @@ Page({ | @@ -6178,11 +6172,7 @@ Page({ | ||
| 6178 | this.get_sto(); | 6172 | this.get_sto(); |
| 6179 | this.check_is_youhui(gid,1); | 6173 | this.check_is_youhui(gid,1); |
| 6180 | this.data.is_normal=1; | 6174 | this.data.is_normal=1; |
| 6181 | - } | ||
| 6182 | - | ||
| 6183 | -======= | ||
| 6184 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | ||
| 6185 | - | 6175 | + }, |
| 6186 | go_more_ladder:function (e) { | 6176 | go_more_ladder:function (e) { |
| 6187 | var prom_id=e.currentTarget.dataset.id; | 6177 | var prom_id=e.currentTarget.dataset.id; |
| 6188 | getApp().goto("/pages/goods/goodsList/goodsList?ladder_id="+prom_id); | 6178 | getApp().goto("/pages/goods/goodsList/goodsList?ladder_id="+prom_id); |
pages/user/order_list/order_list.js
| 1 | const app = getApp(); | 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 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 14 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 15 | -var ut = require('../../../utils/util.js'); | 15 | +var ut= require('../../../utils/util.js'); |
| 16 | var t = require("../../../utils/pay.js"); | 16 | var t = require("../../../utils/pay.js"); |
| 17 | 17 | ||
| 18 | Page({ | 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({ | ||
| 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 | - }, | 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 | + }, | ||
| 148 | 143 | ||
| 149 | 144 | ||
| 150 | /*---------获取订单列表--------*/ | 145 | /*---------获取订单列表--------*/ |
| 151 | requestOrderList: function (t) { | 146 | requestOrderList: function (t) { |
| 152 | var rd = Math.random() * 100; | 147 | var rd = Math.random() * 100; |
| 153 | - var e = this, | ||
| 154 | - th = e, | ||
| 155 | - r = e.data.url + "/api/weshop/order/page?rd=" + rd, | ||
| 156 | - a = ""; | 148 | + var e = this, th = e, r = e.data.url + "/api/weshop/order/page?rd=" + rd, a = ""; |
| 157 | switch (t) { | 149 | switch (t) { |
| 158 | case "1": | 150 | case "1": |
| 159 | r += "&wait_status=0"; | 151 | r += "&wait_status=0"; |
| @@ -172,24 +164,16 @@ Page({ | @@ -172,24 +164,16 @@ Page({ | ||
| 172 | if (this.data.searchContent) { | 164 | if (this.data.searchContent) { |
| 173 | r += "&keyWord=" + this.data.searchContent; | 165 | r += "&keyWord=" + this.data.searchContent; |
| 174 | } | 166 | } |
| 175 | - this.setData({ | ||
| 176 | - activeCategoryId: t | ||
| 177 | - }); | 167 | + this.setData({activeCategoryId: t}); |
| 178 | r = r + "&page=" + e.data.currentPage; | 168 | r = r + "&page=" + e.data.currentPage; |
| 179 | s.request(r, function (t) { | 169 | s.request(r, function (t) { |
| 180 | 170 | ||
| 181 | - th.setData({ | ||
| 182 | - is_get: 1 | ||
| 183 | - }); | 171 | + th.setData({is_get: 1}); |
| 184 | var data = e.data.orderList; | 172 | var data = e.data.orderList; |
| 185 | data.forEach(async function (item, ind) { | 173 | data.forEach(async function (item, ind) { |
| 186 | var tt = null; | 174 | var tt = null; |
| 187 | await getApp().request.promiseGet('/api/weshop/ordergoods/list', { | 175 | await getApp().request.promiseGet('/api/weshop/ordergoods/list', { |
| 188 | - data: { | ||
| 189 | - order_id: item.order_id, | ||
| 190 | - store_id: os.stoid, | ||
| 191 | - pageSize: 600 | ||
| 192 | - }, | 176 | + data: {order_id: item.order_id, store_id: os.stoid, pageSize: 600}, |
| 193 | }).then(res => { | 177 | }).then(res => { |
| 194 | tt = res; | 178 | tt = res; |
| 195 | }) | 179 | }) |
| @@ -200,13 +184,14 @@ Page({ | @@ -200,13 +184,14 @@ Page({ | ||
| 200 | } | 184 | } |
| 201 | } | 185 | } |
| 202 | 186 | ||
| 203 | - data[ind]['ord_url'] = '/pages/user/order_detail/order_detail'; | 187 | + data[ind]['ord_url']='/pages/user/order_detail/order_detail'; |
| 204 | //-- 如果是优惠活动 -- | 188 | //-- 如果是优惠活动 -- |
| 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) { | 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){ | ||
| 208 | data[ind]['presell'] = res.data.data; | 193 | data[ind]['presell'] = res.data.data; |
| 209 | - data[ind]['ord_url'] = '/packageC/pages/presell/cart/cart'; | 194 | + data[ind]['ord_url']='/packageC/pages/presell/cart/cart'; |
| 210 | } | 195 | } |
| 211 | }) | 196 | }) |
| 212 | } | 197 | } |
| @@ -235,10 +220,8 @@ Page({ | @@ -235,10 +220,8 @@ Page({ | ||
| 235 | //------------对比一下有没有退款记录------------ | 220 | //------------对比一下有没有退款记录------------ |
| 236 | await getApp().request.promiseGet("/api/weshop/order/returngoods/page", { | 221 | await getApp().request.promiseGet("/api/weshop/order/returngoods/page", { |
| 237 | data: { | 222 | data: { |
| 238 | - order_id: item.order_id, | ||
| 239 | - store_id: os.stoid, | ||
| 240 | - user_id: oo.user_id, | ||
| 241 | - pageSize: 20 | 223 | + order_id: item.order_id, store_id: os.stoid, |
| 224 | + user_id: oo.user_id, pageSize: 20 | ||
| 242 | } | 225 | } |
| 243 | }).then(rs => { | 226 | }).then(rs => { |
| 244 | var ttd = rs; | 227 | var ttd = rs; |
| @@ -261,8 +244,8 @@ Page({ | @@ -261,8 +244,8 @@ Page({ | ||
| 261 | }); | 244 | }); |
| 262 | } else { | 245 | } else { |
| 263 | //--------整单退-------- | 246 | //--------整单退-------- |
| 264 | - if (ttd.data.data.pageData[0]['goods_id_list'] != null && | ||
| 265 | - ttd.data.data.pageData[0]['goods_id_list'] != '') { | 247 | + if (ttd.data.data.pageData[0]['goods_id_list'] != null |
| 248 | + && ttd.data.data.pageData[0]['goods_id_list'] != '') { | ||
| 266 | var eea = ttd.data.data.pageData[0]; | 249 | var eea = ttd.data.data.pageData[0]; |
| 267 | //1.退款正在进行中， | 250 | //1.退款正在进行中， |
| 268 | //2.退款被拒绝就要显示可以退款 | 251 | //2.退款被拒绝就要显示可以退款 |
| @@ -301,16 +284,16 @@ Page({ | @@ -301,16 +284,16 @@ Page({ | ||
| 301 | if (eea.goods_id == eeb.goods_id) { | 284 | if (eea.goods_id == eeb.goods_id) { |
| 302 | switch (eea.status) { | 285 | switch (eea.status) { |
| 303 | case 0: | 286 | case 0: |
| 304 | - case 1: //退款处理中 | 287 | + case 1://退款处理中 |
| 305 | data[ind]['has_rt'] = 1; //有部分退 | 288 | data[ind]['has_rt'] = 1; //有部分退 |
| 306 | goodslist[iii]['return_btn'] = 2; | 289 | goodslist[iii]['return_btn'] = 2; |
| 307 | break; | 290 | break; |
| 308 | - case 2: //退款完成 | 291 | + case 2://退款完成 |
| 309 | data[ind]['has_rt'] = 1; //有部分退 | 292 | data[ind]['has_rt'] = 1; //有部分退 |
| 310 | goodslist[iii]['return_btn'] = 4; | 293 | goodslist[iii]['return_btn'] = 4; |
| 311 | rt_ok_num++; | 294 | rt_ok_num++; |
| 312 | break; | 295 | break; |
| 313 | - case 3: //已拒绝，重新退款 | 296 | + case 3://已拒绝，重新退款 |
| 314 | goodslist[iii]['return_btn'] = 3; | 297 | goodslist[iii]['return_btn'] = 3; |
| 315 | break; | 298 | break; |
| 316 | default: | 299 | default: |
| @@ -339,175 +322,166 @@ Page({ | @@ -339,175 +322,166 @@ Page({ | ||
| 339 | }); | 322 | }); |
| 340 | data[ind]['g_num'] = g_num; | 323 | data[ind]['g_num'] = g_num; |
| 341 | }) | 324 | }) |
| 342 | - th.setData({ | ||
| 343 | - orderList: data, | ||
| 344 | - }); | 325 | + th.setData({orderList: data,}); |
| 345 | 326 | ||
| 346 | }); | 327 | }); |
| 347 | - e.data.currentPage++, | 328 | + e.data.currentPage++ , |
| 348 | wx.stopPullDownRefresh(); | 329 | wx.stopPullDownRefresh(); |
| 349 | - }, null, { | ||
| 350 | - store_id: os.stoid, | ||
| 351 | - user_id: oo.user_id | ||
| 352 | - }); | ||
| 353 | - }, | ||
| 354 | - //滑倒底部 | ||
| 355 | - onReachBottom: function () { | ||
| 356 | - if (this.data.currentIndex == 0) { | ||
| 357 | - if (s.data.goodsLoadFinishFlag) { | ||
| 358 | - this.setData({ | ||
| 359 | - iscodeall: 1 | ||
| 360 | - }) | ||
| 361 | - } | ||
| 362 | - s.canloadMore() && this.requestOrderList(this.data.activeCategoryId); | ||
| 363 | - } else { | ||
| 364 | - this.request_list({ | ||
| 365 | - store_id: os.stoid, | ||
| 366 | - user_id: oo.user_id, | ||
| 367 | - page: this.data.currentPage2, | ||
| 368 | - }); | ||
| 369 | - } | ||
| 370 | - }, | ||
| 371 | - onPullDownRefresh: function (t) { | ||
| 372 | - // sty取消 | ||
| 373 | - // this.resetData(), this.requestOrderList(this.data.activeCategoryId); | ||
| 374 | - }, | ||
| 375 | - | ||
| 376 | - /*-----------取消订单-----------*/ | ||
| 377 | - cancelOrder: function (t) { | ||
| 378 | - var e = this, | ||
| 379 | - a = t.currentTarget.dataset.id, | ||
| 380 | - th = this; | ||
| 381 | - var is_zsorder = parseFloat(t.currentTarget.dataset.zsorder); | ||
| 382 | - var index = t.currentTarget.dataset.orderindex; | ||
| 383 | - var order = th.data.orderList[index]; | ||
| 384 | - var is_skill = 0; | ||
| 385 | - var order_goods = order.order_goods; | ||
| 386 | - //--判断是不是秒杀-- | ||
| 387 | - order_goods.forEach(function (val, ind) { | ||
| 388 | - if (val.prom_type == 1) { | ||
| 389 | - is_skill = 1; | ||
| 390 | - return false; | ||
| 391 | - } | ||
| 392 | - }) | ||
| 393 | - | ||
| 394 | - wx.showModal({ | ||
| 395 | - title: "是否取消订单？", | ||
| 396 | - success: function (t) { | ||
| 397 | - //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单 | ||
| 398 | - if (t.confirm) { | ||
| 399 | - //if(is_skill==1 || is_zsorder>=2){ | ||
| 400 | - getApp().request.post("/api/weshop/order/cancelOrder/" + os.stoid + "/" + a + "/" + getApp().globalData.user_id, { | ||
| 401 | - data: {}, | ||
| 402 | - success: function (t) { | ||
| 403 | - if (t.data.code == 0) { | ||
| 404 | - 0 == e.data.activeCategoryId ? | ||
| 405 | - (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a); | ||
| 406 | - } else { | ||
| 407 | - getApp().confirmBox(e.data.msg); | ||
| 408 | - } | ||
| 409 | - }, | ||
| 410 | - }) | ||
| 411 | - } | ||
| 412 | - } | ||
| 413 | - }); | 330 | + }, null, {store_id: os.stoid, user_id: oo.user_id}); |
| 414 | }, | 331 | }, |
| 415 | - | ||
| 416 | - /*-----------确认收货-----------*/ | ||
| 417 | - confirmOrder: function (t) { | ||
| 418 | - var e = this, | ||
| 419 | - a = t.currentTarget.dataset.id; | ||
| 420 | - var is_zsorder = t.currentTarget.dataset.zsorder; | ||
| 421 | - var th = this; | ||
| 422 | - | ||
| 423 | - wx.showModal({ | ||
| 424 | - title: "是否确认收货?", | ||
| 425 | - success: function (t) { | ||
| 426 | - t.confirm && rq.post("/api/weshop/order/confirmOrder/" + os.stoid + "/" + a + "/" + getApp().globalData.user_id, { | ||
| 427 | - success: function (e) { | ||
| 428 | - if (e.data.code == 0) { | ||
| 429 | - th.deleteOrderData2(a); | ||
| 430 | - getApp().confirmBox("确认收货成功！"); | ||
| 431 | - } | ||
| 432 | - } | ||
| 433 | - }) | ||
| 434 | - } | ||
| 435 | - }); | ||
| 436 | - }, | ||
| 437 | - | ||
| 438 | - //-----删除订单----- | ||
| 439 | - deleteOrderData: function (t) { | ||
| 440 | - var th = this; | ||
| 441 | - var order_id = t.currentTarget.dataset.order_id; | ||
| 442 | - var index = t.currentTarget.dataset.index; | ||
| 443 | - var up_data = { | ||
| 444 | - order_id: order_id, | ||
| 445 | - isdel: 1 | ||
| 446 | - }; | ||
| 447 | - var order = th.data.orderList[index]; | ||
| 448 | - if (order.order_status != 6) { | ||
| 449 | - up_data.order_status = 5; | 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 | + }) | ||
| 450 | } | 389 | } |
| 451 | - wx.showModal({ | ||
| 452 | - title: "是否删除订单？", | ||
| 453 | - success: function (tt) { | ||
| 454 | - tt.confirm && rq.put("/api/weshop/order/updatebyId", { | ||
| 455 | - data: up_data, | ||
| 456 | - success: function (t) { | ||
| 457 | - for (var e = 0; e < th.data.orderList.length; e++) | ||
| 458 | - if (th.data.orderList[e].order_id == order_id) { | ||
| 459 | - th.data.orderList.splice(e, 1), th.setData({ | ||
| 460 | - orderList: th.data.orderList | ||
| 461 | - }); | ||
| 462 | - break; | ||
| 463 | - } | ||
| 464 | - } | ||
| 465 | - }) | 390 | + } |
| 391 | + }); | ||
| 392 | + }, | ||
| 393 | + | ||
| 394 | + /*-----------确认收货-----------*/ | ||
| 395 | + confirmOrder: function(t) { | ||
| 396 | + var e = this,a = t.currentTarget.dataset.id; | ||
| 397 | + var is_zsorder = t.currentTarget.dataset.zsorder; | ||
| 398 | + var th = this; | ||
| 399 | + | ||
| 400 | + wx.showModal({ | ||
| 401 | + title: "是否确认收货?", | ||
| 402 | + success: function(t) { | ||
| 403 | + t.confirm && rq.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id,{ | ||
| 404 | + success:function (e) { | ||
| 405 | + if(e.data.code==0){ | ||
| 406 | + th.deleteOrderData2(a); | ||
| 407 | + getApp().confirmBox( "确认收货成功！"); | ||
| 408 | + } | ||
| 466 | } | 409 | } |
| 467 | - }); | ||
| 468 | - }, | ||
| 469 | - | ||
| 470 | - deleteOrderData2: function (order_id) { | ||
| 471 | - var th = this; | ||
| 472 | - for (var e = 0; e < th.data.orderList.length; e++) | ||
| 473 | - if (th.data.orderList[e].order_id == order_id) { | 410 | + }) |
| 411 | + } | ||
| 412 | + }); | ||
| 413 | + }, | ||
| 414 | + | ||
| 415 | + //-----删除订单----- | ||
| 416 | + deleteOrderData: function(t) { | ||
| 417 | + var th = this; | ||
| 418 | + var order_id = t.currentTarget.dataset.order_id; | ||
| 419 | + var index = t.currentTarget.dataset.index; | ||
| 420 | + var up_data={order_id: order_id,isdel:1}; | ||
| 421 | + var order=th.data.orderList[index]; | ||
| 422 | + if(order.order_status!=6){ | ||
| 423 | + up_data.order_status=5; | ||
| 424 | + } | ||
| 425 | + wx.showModal({ | ||
| 426 | + title: "是否删除订单？", | ||
| 427 | + success: function(tt) { | ||
| 428 | + tt.confirm && rq.put("/api/weshop/order/updatebyId", { | ||
| 429 | + data: up_data, | ||
| 430 | + success: function(t) { | ||
| 431 | + for (var e = 0; e < th.data.orderList.length; e++) | ||
| 432 | + if (th.data.orderList[e].order_id == order_id) { | ||
| 474 | th.data.orderList.splice(e, 1), th.setData({ | 433 | th.data.orderList.splice(e, 1), th.setData({ |
| 475 | - orderList: this.data.orderList | 434 | + orderList: th.data.orderList |
| 476 | }); | 435 | }); |
| 477 | break; | 436 | break; |
| 478 | - } | ||
| 479 | - }, | ||
| 480 | - | ||
| 481 | - //---判断是不是有退款----- | ||
| 482 | - checkReturnGoodsStatus: function (t) { | ||
| 483 | - var e = t.currentTarget.dataset.recid; | ||
| 484 | - var oid = t.currentTarget.dataset.oid; | ||
| 485 | - r.get("/api/weshop/order/returngoods/page", { | ||
| 486 | - data: { | ||
| 487 | - goods_id: e, | ||
| 488 | - order_id: oid, | ||
| 489 | - store_id: os.stoid | ||
| 490 | - }, | ||
| 491 | - success: function (t) { | ||
| 492 | - if (t.data.code == 0) { | ||
| 493 | - var r = t.data.data.total; | ||
| 494 | - if (0 == r) return wx.navigateTo({ | ||
| 495 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | ||
| 496 | - }); | ||
| 497 | - //--如果拒绝，就重新申请退款-- | ||
| 498 | - if (t.data.data.pageData[0].status == 3) { | ||
| 499 | - return wx.navigateTo({ | ||
| 500 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | ||
| 501 | - }); | ||
| 502 | - } | ||
| 503 | - | ||
| 504 | - wx.navigateTo({ | ||
| 505 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | ||
| 506 | - }); | ||
| 507 | - } | ||
| 508 | - } | 437 | + } |
| 438 | + } | ||
| 439 | + }) | ||
| 440 | + } | ||
| 441 | + }); | ||
| 442 | + }, | ||
| 443 | + | ||
| 444 | + deleteOrderData2: function(order_id) { | ||
| 445 | + var th = this; | ||
| 446 | + for (var e = 0; e < th.data.orderList.length; e++) | ||
| 447 | + if (th.data.orderList[e].order_id == order_id) { | ||
| 448 | + th.data.orderList.splice(e, 1), th.setData({ | ||
| 449 | + orderList: this.data.orderList | ||
| 509 | }); | 450 | }); |
| 510 | - }, | 451 | + break; |
| 452 | + } | ||
| 453 | + }, | ||
| 454 | + | ||
| 455 | + //---判断是不是有退款----- | ||
| 456 | + checkReturnGoodsStatus: function(t) { | ||
| 457 | + var e = t.currentTarget.dataset.recid; | ||
| 458 | + var oid = t.currentTarget.dataset.oid; | ||
| 459 | + r.get("/api/weshop/order/returngoods/page", { | ||
| 460 | + data: { | ||
| 461 | + goods_id: e, | ||
| 462 | + order_id: oid, | ||
| 463 | + store_id: os.stoid | ||
| 464 | + }, | ||
| 465 | + success: function(t) { | ||
| 466 | + if (t.data.code == 0) { | ||
| 467 | + var r = t.data.data.total; | ||
| 468 | + if (0 == r) return wx.navigateTo({ | ||
| 469 | + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | ||
| 470 | + }); | ||
| 471 | + //--如果拒绝，就重新申请退款-- | ||
| 472 | + if (t.data.data.pageData[0].status == 3) { | ||
| 473 | + return wx.navigateTo({ | ||
| 474 | + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | ||
| 475 | + }); | ||
| 476 | + } | ||
| 477 | + | ||
| 478 | + wx.navigateTo({ | ||
| 479 | + url: "/pages/user/return_goods_info/return_goods_info?id=" + r | ||
| 480 | + }); | ||
| 481 | + } | ||
| 482 | + } | ||
| 483 | + }); | ||
| 484 | + }, | ||
| 511 | /*----------跳转支付-----------*/ | 485 | /*----------跳转支付-----------*/ |
| 512 | async jumpToCart4(t) { | 486 | async jumpToCart4(t) { |
| 513 | 487 | ||
| @@ -516,7 +490,7 @@ Page({ | @@ -516,7 +490,7 @@ Page({ | ||
| 516 | var th = this; | 490 | var th = this; |
| 517 | var order = e; | 491 | var order = e; |
| 518 | var order_goods = e.order_goods; | 492 | var order_goods = e.order_goods; |
| 519 | - var user_id = getApp().globalData.userInfo.user_id; | 493 | + var user_id=getApp().globalData.userInfo.user_id; |
| 520 | 494 | ||
| 521 | // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} | 495 | // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} |
| 522 | if (parseInt(order_goods['0']['prom_type']) == 9) { | 496 | if (parseInt(order_goods['0']['prom_type']) == 9) { |
| @@ -548,13 +522,9 @@ Page({ | @@ -548,13 +522,9 @@ Page({ | ||
| 548 | }); | 522 | }); |
| 549 | return false; | 523 | return false; |
| 550 | } | 524 | } |
| 551 | - | 525 | + |
| 552 | //要每件每件的商品进行检查，看有么有超出库存，超出限购 | 526 | //要每件每件的商品进行检查，看有么有超出库存，超出限购 |
| 553 | - var good = order_goods[i], | ||
| 554 | - goodsbuynum = 0, | ||
| 555 | - promgoodsbuynum = 0, | ||
| 556 | - gg = null, | ||
| 557 | - presellList = null; | 527 | + var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null,presellList=null; |
| 558 | 528 | ||
| 559 | //获取单品的现在的活动状态 | 529 | //获取单品的现在的活动状态 |
| 560 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => { | 530 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => { |
| @@ -649,22 +619,16 @@ Page({ | @@ -649,22 +619,16 @@ Page({ | ||
| 649 | } | 619 | } |
| 650 | 620 | ||
| 651 | //如果是预售的时候， | 621 | //如果是预售的时候， |
| 652 | - | ||
| 653 | - if (good.prom_type == 8) { | ||
| 654 | - await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum", { | ||
| 655 | - data: { | ||
| 656 | - store_id: os.stoid, | ||
| 657 | - user_id: user_id, | ||
| 658 | - goods_id: good.goods_id, | ||
| 659 | - prom_id: good.prom_id | ||
| 660 | - }, | ||
| 661 | - }).then(e => { | 622 | + if(good.prom_type==8) { |
| 623 | + await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ | ||
| 624 | + data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, | ||
| 625 | + }).then(e=>{ | ||
| 662 | if (e.data.code == 0) { | 626 | if (e.data.code == 0) { |
| 663 | - promgoodsbuynum = e.data.data.sumgoodsnum; | 627 | + promgoodsbuynum=e.data.data.sumgoodsnum; |
| 664 | } | 628 | } |
| 665 | }) | 629 | }) |
| 666 | 630 | ||
| 667 | - var presell_id = good.prom_id; | 631 | + var presell_id =good.prom_id; |
| 668 | var url = "/api/weshop/marketing/marketingPresellList/list" | 632 | var url = "/api/weshop/marketing/marketingPresellList/list" |
| 669 | var rd = { | 633 | var rd = { |
| 670 | store_id: os.stoid, | 634 | store_id: os.stoid, |
| @@ -677,13 +641,13 @@ Page({ | @@ -677,13 +641,13 @@ Page({ | ||
| 677 | }).then(res => { | 641 | }).then(res => { |
| 678 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | 642 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { |
| 679 | var arr = res.data.data[0]; | 643 | var arr = res.data.data[0]; |
| 680 | - presellList = arr | 644 | + presellList=arr |
| 681 | } | 645 | } |
| 682 | }) | 646 | }) |
| 683 | 647 | ||
| 684 | - if (presellList) { | 648 | + if(presellList){ |
| 685 | 649 | ||
| 686 | - if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) { | 650 | + if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){ |
| 687 | var content = good.goods_name + '购买数量超出商品库存,请取消订单'; | 651 | var content = good.goods_name + '购买数量超出商品库存,请取消订单'; |
| 688 | th.toast(content); | 652 | th.toast(content); |
| 689 | return false; | 653 | return false; |
| @@ -769,39 +733,39 @@ Page({ | @@ -769,39 +733,39 @@ Page({ | ||
| 769 | } | 733 | } |
| 770 | 734 | ||
| 771 | //商品的普通购买 ，不要进行判断 | 735 | //商品的普通购买 ，不要进行判断 |
| 772 | - if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8) && | ||
| 773 | - !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { | ||
| 774 | - if (gg.prom_type != good.prom_type && gg.prom_type > 0) { | 736 | + if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8) |
| 737 | + && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) { | ||
| 738 | + if (gg.prom_type != good.prom_type && gg.prom_type>0) { | ||
| 775 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; | 739 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; |
| 776 | th.toast(content); | 740 | th.toast(content); |
| 777 | return false; | 741 | return false; |
| 778 | } | 742 | } |
| 779 | 743 | ||
| 780 | - } else { | ||
| 781 | - 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) && | ||
| 782 | - !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { | 744 | + } else { |
| 745 | + if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) | ||
| 746 | + && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { | ||
| 747 | + var prom = null; | ||
| 783 | //---如果是活动的时候--- | 748 | //---如果是活动的时候--- |
| 784 | - var prom = null, | ||
| 785 | - th = this; | 749 | + var prom = null, th = this; |
| 786 | if (gg.prom_type == 1) { | 750 | if (gg.prom_type == 1) { |
| 787 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => { | 751 | + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/"+ user_id + "/" + gg.prom_id, {}).then(res => { |
| 788 | if (res.data.code == 0) { | 752 | if (res.data.code == 0) { |
| 789 | prom = res.data.data; | 753 | prom = res.data.data; |
| 790 | - prom.price = prom.user_price; | 754 | + prom.price=prom.user_price; |
| 791 | } | 755 | } |
| 792 | }) | 756 | }) |
| 793 | } | 757 | } |
| 794 | - | ||
| 795 | - if (gg.prom_type == 2) { | ||
| 796 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => { | ||
| 797 | - if (res.data.code == 0) { | ||
| 798 | - prom = res.data.data; | ||
| 799 | - prom.price = prom.price; | ||
| 800 | - } | ||
| 801 | - }) | ||
| 802 | - } | ||
| 803 | - | ||
| 804 | - | 758 | + |
| 759 | + if (gg.prom_type == 2) { | ||
| 760 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { | ||
| 761 | + if (res.data.code == 0) { | ||
| 762 | + prom = res.data.data; | ||
| 763 | + prom.price=prom.price; | ||
| 764 | + } | ||
| 765 | + }) | ||
| 766 | + } | ||
| 767 | + | ||
| 768 | + | ||
| 805 | if (gg.prom_type == 6) { | 769 | if (gg.prom_type == 6) { |
| 806 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => { | 770 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => { |
| 807 | if (res.data.code == 0) { | 771 | if (res.data.code == 0) { |
| @@ -812,34 +776,25 @@ Page({ | @@ -812,34 +776,25 @@ Page({ | ||
| 812 | 776 | ||
| 813 | if (gg.prom_type == 4) { | 777 | if (gg.prom_type == 4) { |
| 814 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { | 778 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
| 815 | - data: { | ||
| 816 | - store_id: os.stoid, | ||
| 817 | - goods_id: gg.goods_id | ||
| 818 | - } | 779 | + data: {store_id: os.stoid, goods_id: gg.goods_id} |
| 819 | }).then(res => { | 780 | }).then(res => { |
| 820 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 781 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
| 821 | prom = res.data.data.pageData[0]; | 782 | prom = res.data.data.pageData[0]; |
| 822 | } | 783 | } |
| 823 | }) | 784 | }) |
| 824 | } | 785 | } |
| 825 | - if (gg.prom_type == 10) { | ||
| 826 | - var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${gg.prom_id}`; | ||
| 827 | - await getApp().request.promiseGet(url, {}).then(res => { | ||
| 828 | - if (res.data.code == 0 && res.data.data && !res.data.data.isuse || res.data.data.is_end == 1) { | ||
| 829 | - prom = res.data.data; | ||
| 830 | - } | ||
| 831 | - }) | ||
| 832 | - } | ||
| 833 | 786 | ||
| 834 | if (prom) { | 787 | if (prom) { |
| 835 | var t_now = ut.gettimestamp(); | 788 | var t_now = ut.gettimestamp(); |
| 836 | if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) { | 789 | if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) { |
| 790 | + | ||
| 837 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; | 791 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; |
| 838 | th.toast(content); | 792 | th.toast(content); |
| 839 | return false; | 793 | return false; |
| 840 | } | 794 | } |
| 841 | } | 795 | } |
| 842 | - } else { | 796 | + } |
| 797 | + else { | ||
| 843 | if (!good.is_gift && good.prom_type != 3) { | 798 | if (!good.is_gift && good.prom_type != 3) { |
| 844 | var t_ok = 1; | 799 | var t_ok = 1; |
| 845 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { | 800 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { |
| @@ -849,7 +804,6 @@ Page({ | @@ -849,7 +804,6 @@ Page({ | ||
| 849 | if (r_data.promGoodsLists) { | 804 | if (r_data.promGoodsLists) { |
| 850 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; | 805 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; |
| 851 | th.toast(content); | 806 | th.toast(content); |
| 852 | - console.log(3); | ||
| 853 | t_ok = 0; | 807 | t_ok = 0; |
| 854 | } | 808 | } |
| 855 | } | 809 | } |
| @@ -867,7 +821,7 @@ Page({ | @@ -867,7 +821,7 @@ Page({ | ||
| 867 | if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) { | 821 | if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) { |
| 868 | if (card_field && gg[card_field] > 0) { | 822 | if (card_field && gg[card_field] > 0) { |
| 869 | if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; | 823 | if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0; |
| 870 | - if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 | 824 | + if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 |
| 871 | 825 | ||
| 872 | } else { | 826 | } else { |
| 873 | if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0; | 827 | if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0; |
| @@ -878,7 +832,6 @@ Page({ | @@ -878,7 +832,6 @@ Page({ | ||
| 878 | 832 | ||
| 879 | var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1' | 833 | var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1' |
| 880 | th.toast(content); | 834 | th.toast(content); |
| 881 | - console.log(4); | ||
| 882 | return false; | 835 | return false; |
| 883 | } | 836 | } |
| 884 | } | 837 | } |
| @@ -908,28 +861,26 @@ Page({ | @@ -908,28 +861,26 @@ Page({ | ||
| 908 | } | 861 | } |
| 909 | 862 | ||
| 910 | //---如果是活动的时候--- | 863 | //---如果是活动的时候--- |
| 911 | - var prom = null, | ||
| 912 | - goodsinfo = good, | ||
| 913 | - th = this; | 864 | + var prom = null, goodsinfo = good, th = this; |
| 914 | if (goodsinfo.prom_type == 1) { | 865 | if (goodsinfo.prom_type == 1) { |
| 915 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | ||
| 916 | - if (res.data.code == 0) { | ||
| 917 | - prom = res.data.data; | ||
| 918 | - prom.price = prom.user_price; | ||
| 919 | - } | ||
| 920 | - }) | ||
| 921 | - } | ||
| 922 | - | ||
| 923 | - if (goodsinfo.prom_type == 2) { | ||
| 924 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { | 866 | + await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/"+ user_id + "/" + goodsinfo.prom_id, {}).then(res => { |
| 925 | if (res.data.code == 0) { | 867 | if (res.data.code == 0) { |
| 926 | prom = res.data.data; | 868 | prom = res.data.data; |
| 927 | - prom.price = prom.price; | 869 | + prom.price=prom.user_price; |
| 928 | } | 870 | } |
| 929 | }) | 871 | }) |
| 930 | } | 872 | } |
| 931 | - | ||
| 932 | - | 873 | + |
| 874 | + if (goodsinfo.prom_type == 2) { | ||
| 875 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { | ||
| 876 | + if (res.data.code == 0) { | ||
| 877 | + prom = res.data.data; | ||
| 878 | + prom.price=prom.price; | ||
| 879 | + } | ||
| 880 | + }) | ||
| 881 | + } | ||
| 882 | + | ||
| 883 | + | ||
| 933 | if (goodsinfo.prom_type == 6 && !good.is_pd_normal) { | 884 | if (goodsinfo.prom_type == 6 && !good.is_pd_normal) { |
| 934 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => { | 885 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => { |
| 935 | if (res.data.code == 0) { | 886 | if (res.data.code == 0) { |
| @@ -940,10 +891,7 @@ Page({ | @@ -940,10 +891,7 @@ Page({ | ||
| 940 | 891 | ||
| 941 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { | 892 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { |
| 942 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { | 893 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
| 943 | - data: { | ||
| 944 | - store_id: os.stoid, | ||
| 945 | - goods_id: goodsinfo.goods_id | ||
| 946 | - } | 894 | + data: {store_id: os.stoid, goods_id: goodsinfo.goods_id} |
| 947 | }).then(res => { | 895 | }).then(res => { |
| 948 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 896 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
| 949 | prom = res.data.data.pageData[0]; | 897 | prom = res.data.data.pageData[0]; |
| @@ -969,18 +917,18 @@ Page({ | @@ -969,18 +917,18 @@ Page({ | ||
| 969 | } | 917 | } |
| 970 | 918 | ||
| 971 | // --看一下会员的秒杀价格是不是发生了变化，因为会员的身份发生了变化 | 919 | // --看一下会员的秒杀价格是不是发生了变化，因为会员的身份发生了变化 |
| 972 | - if (goodsinfo.prom_type == 1 && goodsinfo.goods_price != prom.price) { | ||
| 973 | - var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化'; | ||
| 974 | - th.toast(content); | ||
| 975 | - return false; | ||
| 976 | - } | ||
| 977 | - | ||
| 978 | - // --看一下会员的团购价格是不是发生了变化 | ||
| 979 | - if (goodsinfo.prom_type == 2 && goodsinfo.goods_price != prom.price) { | ||
| 980 | - var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化'; | 920 | + if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ |
| 921 | + var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | ||
| 981 | th.toast(content); | 922 | th.toast(content); |
| 982 | return false; | 923 | return false; |
| 983 | } | 924 | } |
| 925 | + | ||
| 926 | + // --看一下会员的团购价格是不是发生了变化 | ||
| 927 | + if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ | ||
| 928 | + var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | ||
| 929 | + th.toast(content); | ||
| 930 | + return false; | ||
| 931 | + } | ||
| 984 | 932 | ||
| 985 | if (goodsinfo.prom_type == 4) { | 933 | if (goodsinfo.prom_type == 4) { |
| 986 | if (good.goods_num > prom.limitqty - prom.buy_num) { | 934 | if (good.goods_num > prom.limitqty - prom.buy_num) { |
| @@ -989,12 +937,12 @@ Page({ | @@ -989,12 +937,12 @@ Page({ | ||
| 989 | th.toast(content); | 937 | th.toast(content); |
| 990 | return false; | 938 | return false; |
| 991 | } | 939 | } |
| 992 | - } else if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6) { | ||
| 993 | - if (order.add_time + 5 * 60 < ut.gettimestamp()) { | 940 | + } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { |
| 941 | + if(order.add_time+5*60<ut.gettimestamp()) { | ||
| 994 | var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; | 942 | var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; |
| 995 | th.toast(content); | 943 | th.toast(content); |
| 996 | return false; | 944 | return false; |
| 997 | - } | 945 | + } |
| 998 | } | 946 | } |
| 999 | 947 | ||
| 1000 | } | 948 | } |
| @@ -1008,13 +956,14 @@ Page({ | @@ -1008,13 +956,14 @@ Page({ | ||
| 1008 | if (!keyid) return false; | 956 | if (!keyid) return false; |
| 1009 | var offarr = null; | 957 | var offarr = null; |
| 1010 | await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { | 958 | await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { |
| 1011 | - data: { | ||
| 1012 | - VIPId: encodeURIComponent(user_info.erpvipid), | ||
| 1013 | - store_id: os.stoid, | ||
| 1014 | - PickupId: keyid, | ||
| 1015 | - WareIds: wlist | 959 | + data: { |
| 960 | + VIPId: encodeURIComponent(user_info.erpvipid), | ||
| 961 | + store_id: os.stoid, | ||
| 962 | + PickupId: keyid, | ||
| 963 | + WareIds: wlist | ||
| 964 | + }, | ||
| 1016 | }, | 965 | }, |
| 1017 | - }, ).then(res => { | 966 | + ).then(res => { |
| 1018 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | 967 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { |
| 1019 | offarr = res.data.data; | 968 | offarr = res.data.data; |
| 1020 | } | 969 | } |
| @@ -1032,229 +981,201 @@ Page({ | @@ -1032,229 +981,201 @@ Page({ | ||
| 1032 | 981 | ||
| 1033 | var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; | 982 | var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; |
| 1034 | th.toast(content); | 983 | th.toast(content); |
| 1035 | - console.log(5); | ||
| 1036 | return false; | 984 | return false; |
| 1037 | } | 985 | } |
| 1038 | } | 986 | } |
| 1039 | } | 987 | } |
| 1040 | th.pay_next(e, o_index); | 988 | th.pay_next(e, o_index); |
| 1041 | }, | 989 | }, |
| 1042 | - | ||
| 1043 | - | ||
| 1044 | - pay_next(e, o_index) { | ||
| 1045 | - var th = this; | ||
| 1046 | - if (e.order_amount == 0) { | ||
| 1047 | - var dd = { | ||
| 1048 | - parent_sn: e.order_sn, | ||
| 1049 | - store_id: e.store_id, | ||
| 1050 | - type: 1, | ||
| 1051 | - }; | ||
| 1052 | - getApp().request.post("/api/weshop/order/pay/createOrder", { | ||
| 1053 | - data: dd, | ||
| 1054 | - success: function (t) { | ||
| 1055 | - if (t.data.code == 0) { | ||
| 1056 | - th.onload(); | ||
| 1057 | - } else { | ||
| 1058 | - getApp().confirmBox(t.data.msg + "请您取消该订单"); | ||
| 1059 | - } | ||
| 1060 | - } | ||
| 1061 | - }) | ||
| 1062 | - return false; | ||
| 1063 | - } | ||
| 1064 | - | ||
| 1065 | - /*--- | ||
| 1066 | - a.jumpToCart4({ | ||
| 1067 | - order_sn: e.order_sn, | ||
| 1068 | - order_amount: e.order_amount, | ||
| 1069 | - type: 1 //正常单 | ||
| 1070 | - });--*/ | ||
| 1071 | - | ||
| 1072 | - t.pay(e.order_sn, function () { | ||
| 1073 | - wx.showToast({ | ||
| 1074 | - title: '支付成功' | ||
| 1075 | - }) | ||
| 1076 | - th.data.orderList.splice(o_index, 1); | ||
| 1077 | - th.setData({ | ||
| 1078 | - orderList: th.data.orderList | ||
| 1079 | - }); | ||
| 1080 | - }, null, os.stoid, 1); | ||
| 1081 | - | ||
| 1082 | - | ||
| 1083 | - }, | ||
| 1084 | - | 990 | + |
| 991 | + | ||
| 992 | + pay_next(e,o_index){ | ||
| 993 | + var th=this; | ||
| 994 | + if (e.order_amount == 0) { | ||
| 995 | + var dd = { | ||
| 996 | + parent_sn: e.order_sn, | ||
| 997 | + store_id: e.store_id, | ||
| 998 | + type: 1, | ||
| 999 | + }; | ||
| 1000 | + getApp().request.post("/api/weshop/order/pay/createOrder", { | ||
| 1001 | + data: dd, | ||
| 1002 | + success: function(t) { | ||
| 1003 | + if (t.data.code == 0) { | ||
| 1004 | + th.onload(); | ||
| 1005 | + } else { | ||
| 1006 | + getApp().confirmBox(t.data.msg + "请您取消该订单"); | ||
| 1007 | + } | ||
| 1008 | + } | ||
| 1009 | + }) | ||
| 1010 | + return false; | ||
| 1011 | + } | ||
| 1012 | + | ||
| 1013 | + /*--- | ||
| 1014 | + a.jumpToCart4({ | ||
| 1015 | + order_sn: e.order_sn, | ||
| 1016 | + order_amount: e.order_amount, | ||
| 1017 | + type: 1 //正常单 | ||
| 1018 | + });--*/ | ||
| 1019 | + | ||
| 1020 | + t.pay(e.order_sn, function() { | ||
| 1021 | + wx.showToast({title: '支付成功'}) | ||
| 1022 | + th.data.orderList.splice(o_index,1); | ||
| 1023 | + th.setData({orderList:th.data.orderList}); | ||
| 1024 | + },null,os.stoid,1); | ||
| 1025 | + | ||
| 1026 | + | ||
| 1027 | + }, | ||
| 1028 | + | ||
| 1085 | //---检验线下库存的数量的子函数--- | 1029 | //---检验线下库存的数量的子函数--- |
| 1086 | - async check_down_line_next(gg, num, pick_id, func) { | ||
| 1087 | - | ||
| 1088 | - var lock = 0, | ||
| 1089 | - pick_no, plist; | ||
| 1090 | - //先读取门店的lock | ||
| 1091 | - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { | ||
| 1092 | - data: { | ||
| 1093 | - store_id: os.stoid, | ||
| 1094 | - wareId: gg.goods_id, | ||
| 1095 | - storageId: pick_id | ||
| 1096 | - } | ||
| 1097 | - }).then(res => { | ||
| 1098 | - if (res.data.code == 0 && res.data.data.total > 0) { | ||
| 1099 | - for (var i in res.data.data.pageData) | ||
| 1100 | - lock += res.data.data.pageData[i].outQty; | ||
| 1101 | - } | ||
| 1102 | - }) | ||
| 1103 | - //先获取门店的编号 | ||
| 1104 | - await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick_id, { | ||
| 1105 | - data: { | ||
| 1106 | - storeId: os.stoid, | ||
| 1107 | - goodsId: gg.goods_id, | ||
| 1108 | - pickupId: pick_id | ||
| 1109 | - } | ||
| 1110 | - }).then(res => { | ||
| 1111 | - if (res.data.code == 0) { | ||
| 1112 | - pick_no = res.data.data.pickup_no; | ||
| 1113 | - } | ||
| 1114 | - }) | ||
| 1115 | - //读取线下的门店库存 | ||
| 1116 | - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { | ||
| 1117 | - data: { | ||
| 1118 | - storageNos: pick_no, | ||
| 1119 | - wareIds: encodeURIComponent(gg.erpwareid), | ||
| 1120 | - storeId: os.stoid | ||
| 1121 | - } | ||
| 1122 | - }).then(res => { | ||
| 1123 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { | ||
| 1124 | - plist = res.data.data.pageData[0]; | ||
| 1125 | - } | ||
| 1126 | - }) | ||
| 1127 | - | ||
| 1128 | - var ob = {}; | ||
| 1129 | - ob.code = 1; | ||
| 1130 | - if (!plist) { | ||
| 1131 | - ob.code = -1; | ||
| 1132 | - ob.CanOutQty = 0; | ||
| 1133 | - func(ob); | ||
| 1134 | - return false; | ||
| 1135 | - } | ||
| 1136 | - | ||
| 1137 | - if (num > plist.CanOutQty - lock) { | ||
| 1138 | - ob.code = -1; | ||
| 1139 | - ob.CanOutQty = plist.CanOutQty - lock | ||
| 1140 | - if (ob.CanOutQty < 0) ob.CanOutQty = 0; | ||
| 1141 | - } | ||
| 1142 | - func(ob) | ||
| 1143 | - }, | ||
| 1144 | - | ||
| 1145 | - | ||
| 1146 | - | ||
| 1147 | - //------图片失败，默认图片--------- | ||
| 1148 | - bind_bnerr: function (e) { | ||
| 1149 | - var _errImg = e.currentTarget.dataset.errorimg; | ||
| 1150 | - var _errObj = {}; | ||
| 1151 | - _errObj[_errImg] = "public/images/default_goods_image_240.gif"; | ||
| 1152 | - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | ||
| 1153 | - }, | ||
| 1154 | - | ||
| 1155 | - //--------跳转到退款详情----------- | ||
| 1156 | - gotoreturn: function (t) { | ||
| 1157 | - var e = t.currentTarget.dataset.recid; | ||
| 1158 | - var oid = t.currentTarget.dataset.oid; | ||
| 1159 | - var wh = ""; | ||
| 1160 | - if (e != undefined && e != null && e != "") { | ||
| 1161 | - wh = "&goods_id=" + e; | ||
| 1162 | - } | ||
| 1163 | - wx.navigateTo({ | ||
| 1164 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | ||
| 1165 | - }); | 1030 | + async check_down_line_next(gg,num,pick_id,func){ |
| 1031 | + | ||
| 1032 | + var lock=0,pick_no,plist; | ||
| 1033 | + //先读取门店的lock | ||
| 1034 | + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ | ||
| 1035 | + data:{store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id} | ||
| 1036 | + }).then(res=>{ | ||
| 1037 | + if(res.data.code==0 && res.data.data.total>0){ | ||
| 1038 | + for(var i in res.data.data.pageData) | ||
| 1039 | + lock+=res.data.data.pageData[i].outQty; | ||
| 1040 | + } | ||
| 1041 | + }) | ||
| 1042 | + //先获取门店的编号 | ||
| 1043 | + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ | ||
| 1044 | + data:{storeId:os.stoid,goodsId:gg.goods_id,pickupId:pick_id} | ||
| 1045 | + }).then(res=>{ | ||
| 1046 | + if(res.data.code==0){ | ||
| 1047 | + pick_no=res.data.data.pickup_no; | ||
| 1048 | + } | ||
| 1049 | + }) | ||
| 1050 | + //读取线下的门店库存 | ||
| 1051 | + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ | ||
| 1052 | + data:{storageNos:pick_no,wareIds:encodeURIComponent(gg.erpwareid),storeId:os.stoid} | ||
| 1053 | + }).then(res=>{ | ||
| 1054 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | ||
| 1055 | + plist=res.data.data.pageData[0]; | ||
| 1056 | + } | ||
| 1057 | + }) | ||
| 1058 | + | ||
| 1059 | + var ob={}; ob.code=1; | ||
| 1060 | + if(!plist){ | ||
| 1061 | + ob.code=-1; ob.CanOutQty=0; | ||
| 1062 | + func(ob);return false; | ||
| 1063 | + } | ||
| 1064 | + | ||
| 1065 | + if(num>plist.CanOutQty-lock){ | ||
| 1066 | + ob.code=-1; | ||
| 1067 | + ob.CanOutQty=plist.CanOutQty-lock | ||
| 1068 | + if(ob.CanOutQty<0) ob.CanOutQty=0; | ||
| 1069 | + } | ||
| 1070 | + func(ob) | ||
| 1166 | }, | 1071 | }, |
| 1167 | - | ||
| 1168 | - //-----支付尾款------ | ||
| 1169 | - pay_wk: function (ee) { | ||
| 1170 | - console.log("pay_wk"); | ||
| 1171 | - var order_id = ee.currentTarget.dataset.order_id; | ||
| 1172 | - wx.navigateTo({ | ||
| 1173 | - url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id, | ||
| 1174 | - }); | ||
| 1175 | - | ||
| 1176 | - }, | ||
| 1177 | - | ||
| 1178 | - //--判断是不是可以单个商品退-- | ||
| 1179 | - check_for_return_btn: function (item) { | ||
| 1180 | - if (item.coupon_no) return false; //有用优惠券 | ||
| 1181 | - if (item.order_prom_id) return false; //有订单优惠 | ||
| 1182 | - if (item.order_status >= 2) return false; //订单状态>2 | ||
| 1183 | - var istrue = true; | ||
| 1184 | - //----判断是不是有优惠活动和赠送商品---- | ||
| 1185 | - for (var g in item.goodslist) { | ||
| 1186 | - var g_item = item.goodslist[g]; | ||
| 1187 | - if ((g_item.prom_type == 3 && g_item.discount_amount > 0) || | ||
| 1188 | - (g_item.prom_type == 3 && g_item.goods_price <= 0) | ||
| 1189 | - ) { | ||
| 1190 | - istrue = false; | ||
| 1191 | - break | ||
| 1192 | - } | ||
| 1193 | - if (g_item.prom_type == 5) { | ||
| 1194 | - istrue = false; | ||
| 1195 | - break | ||
| 1196 | - } | ||
| 1197 | - } | ||
| 1198 | - if (!istrue) return false; | ||
| 1199 | - var conf = this.data.conf; | ||
| 1200 | - //判断是不是原路退回 | ||
| 1201 | - if (conf.refund_type == 1) return true; | ||
| 1202 | - else { | ||
| 1203 | - if (item.order_amount == 0 || item.user_money == 0) return true; | ||
| 1204 | - } | ||
| 1205 | - return false; | ||
| 1206 | - }, | ||
| 1207 | - //跳到首页 | ||
| 1208 | - goto: function (e) { | ||
| 1209 | - wx.navigateTo({ | ||
| 1210 | - url: '/pages/index/index/index', | ||
| 1211 | - }) | ||
| 1212 | - }, | ||
| 1213 | - | ||
| 1214 | - //显示核销码 | ||
| 1215 | - code_show: function (e) { | ||
| 1216 | - var th = this; | ||
| 1217 | - //--获取成功的时候-- | ||
| 1218 | - var no = e.currentTarget.dataset.order_sn; | ||
| 1219 | - var qc_com = th.selectComponent("#qc_com"); //组件的id | ||
| 1220 | - var obj = { | ||
| 1221 | - val: no, | ||
| 1222 | - content: "请将二维码展示给核销员，收货更快捷" | ||
| 1223 | - }; | ||
| 1224 | - qc_com.open(obj) | ||
| 1225 | - }, | ||
| 1226 | - | ||
| 1227 | - //再来一单的功能的实现 | ||
| 1228 | - moreOrder: function (e) { | ||
| 1229 | - | ||
| 1230 | - if (this.data.moring) return false; | ||
| 1231 | - this.data.moring = 1; | ||
| 1232 | - | ||
| 1233 | - var th = this; | ||
| 1234 | - var index = e.currentTarget.dataset.index; | ||
| 1235 | - var item = th.data.orderList[index]; | ||
| 1236 | - th.check_more_order(item); | ||
| 1237 | - }, | ||
| 1238 | - | ||
| 1239 | - | ||
| 1240 | - check_more_order: async function (item) { | ||
| 1241 | - console.log(item, 100000); | ||
| 1242 | - var pickup = null, | ||
| 1243 | - th = this; | ||
| 1244 | - var user_id = getApp().globalData.user_id; | 1072 | + |
| 1073 | + | ||
| 1074 | + | ||
| 1075 | + //------图片失败，默认图片--------- | ||
| 1076 | + bind_bnerr: function(e) { | ||
| 1077 | + var _errImg = e.currentTarget.dataset.errorimg; | ||
| 1078 | + var _errObj = {}; | ||
| 1079 | + _errObj[_errImg] = "public/images/default_goods_image_240.gif"; | ||
| 1080 | + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | ||
| 1081 | + }, | ||
| 1082 | + | ||
| 1083 | + //--------跳转到退款详情----------- | ||
| 1084 | + gotoreturn: function(t) { | ||
| 1085 | + var e = t.currentTarget.dataset.recid; | ||
| 1086 | + var oid = t.currentTarget.dataset.oid; | ||
| 1087 | + var wh = ""; | ||
| 1088 | + if (e != undefined && e != null && e != "") { | ||
| 1089 | + wh = "&goods_id=" + e; | ||
| 1090 | + } | ||
| 1091 | + wx.navigateTo({ | ||
| 1092 | + url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | ||
| 1093 | + }); | ||
| 1094 | + }, | ||
| 1095 | + | ||
| 1096 | + //-----支付尾款------ | ||
| 1097 | + pay_wk: function(ee) { | ||
| 1098 | + console.log("pay_wk"); | ||
| 1099 | + var order_id = ee.currentTarget.dataset.order_id; | ||
| 1100 | + wx.navigateTo({ | ||
| 1101 | + url: "/pages/cart/cart_wk/cart_wk?order_id=" + order_id, | ||
| 1102 | + }); | ||
| 1103 | + | ||
| 1104 | + }, | ||
| 1105 | + | ||
| 1106 | + //--判断是不是可以单个商品退-- | ||
| 1107 | + check_for_return_btn: function(item) { | ||
| 1108 | + if (item.coupon_no) return false; //有用优惠券 | ||
| 1109 | + if (item.order_prom_id) return false; //有订单优惠 | ||
| 1110 | + if (item.order_status >= 2) return false; //订单状态>2 | ||
| 1111 | + var istrue = true; | ||
| 1112 | + //----判断是不是有优惠活动和赠送商品---- | ||
| 1113 | + for (var g in item.goodslist) { | ||
| 1114 | + var g_item = item.goodslist[g]; | ||
| 1115 | + if ((g_item.prom_type == 3 && g_item.discount_amount > 0) || | ||
| 1116 | + (g_item.prom_type == 3 && g_item.goods_price <= 0) | ||
| 1117 | + ) { | ||
| 1118 | + istrue = false; | ||
| 1119 | + break | ||
| 1120 | + } | ||
| 1121 | + if (g_item.prom_type == 5) { | ||
| 1122 | + istrue = false; | ||
| 1123 | + break | ||
| 1124 | + } | ||
| 1125 | + } | ||
| 1126 | + if (!istrue) return false; | ||
| 1127 | + var conf = this.data.conf; | ||
| 1128 | + //判断是不是原路退回 | ||
| 1129 | + if (conf.refund_type == 1) return true; | ||
| 1130 | + else { | ||
| 1131 | + if (item.order_amount == 0 || item.user_money == 0) return true; | ||
| 1132 | + } | ||
| 1133 | + return false; | ||
| 1134 | + }, | ||
| 1135 | + //跳到首页 | ||
| 1136 | + goto: function(e) { | ||
| 1137 | + wx.navigateTo({ | ||
| 1138 | + url: '/pages/index/index/index', | ||
| 1139 | + }) | ||
| 1140 | + }, | ||
| 1141 | + | ||
| 1142 | + //显示核销码 | ||
| 1143 | + code_show: function(e) { | ||
| 1144 | + var th = this; | ||
| 1145 | + //--获取成功的时候-- | ||
| 1146 | + var no = e.currentTarget.dataset.order_sn; | ||
| 1147 | + var qc_com = th.selectComponent("#qc_com"); //组件的id | ||
| 1148 | + var obj = { | ||
| 1149 | + val: no, | ||
| 1150 | + content: "请将二维码展示给核销员，收货更快捷" | ||
| 1151 | + }; | ||
| 1152 | + qc_com.open(obj) | ||
| 1153 | + }, | ||
| 1154 | + | ||
| 1155 | + //再来一单的功能的实现 | ||
| 1156 | + moreOrder:function(e){ | ||
| 1157 | + | ||
| 1158 | + if(this.data.moring) return false; | ||
| 1159 | + this.data.moring=1; | ||
| 1160 | + | ||
| 1161 | + var th=this; | ||
| 1162 | + var index=e.currentTarget.dataset.index; | ||
| 1163 | + var item=th.data.orderList[index]; | ||
| 1164 | + th.check_more_order(item); | ||
| 1165 | + }, | ||
| 1166 | + | ||
| 1167 | + | ||
| 1168 | + check_more_order:async function(item){ | ||
| 1169 | + var pickup=null,th=this; | ||
| 1170 | + var user_id=getApp().globalData.user_id; | ||
| 1245 | wx.showLoading(); | 1171 | wx.showLoading(); |
| 1246 | //--------获取门店----------- | 1172 | //--------获取门店----------- |
| 1247 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { | 1173 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { |
| 1248 | 1174 | ||
| 1249 | -<<<<<<< HEAD | ||
| 1250 | }).then(res=>{ | 1175 | }).then(res=>{ |
| 1251 | if(res.data.code==0){ | 1176 | if(res.data.code==0){ |
| 1252 | pickup = res.data.data; | 1177 | pickup = res.data.data; |
| 1253 | } | 1178 | } |
| 1254 | -======= | ||
| 1255 | - }).then(res => { | ||
| 1256 | - pickup = res.data.data; | ||
| 1257 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | ||
| 1258 | }) | 1179 | }) |
| 1259 | if(!pickup){ | 1180 | if(!pickup){ |
| 1260 | wx.hideLoading(); | 1181 | wx.hideLoading(); |
| @@ -1278,118 +1199,96 @@ Page({ | @@ -1278,118 +1199,96 @@ Page({ | ||
| 1278 | return false; | 1199 | return false; |
| 1279 | } | 1200 | } |
| 1280 | //--------获取商品---------- | 1201 | //--------获取商品---------- |
| 1281 | - var goods_list = item.order_goods; | 1202 | + var goods_list=item.order_goods; |
| 1282 | //--- 返回的内容 --- | 1203 | //--- 返回的内容 --- |
| 1283 | - var back_goods_arr = []; | ||
| 1284 | - var err_text = ""; | ||
| 1285 | - for (var i in goods_list) { | ||
| 1286 | - var g_item = goods_list[i]; | ||
| 1287 | - var b_item = {} | 1204 | + var back_goods_arr=[]; |
| 1205 | + var err_text=""; | ||
| 1206 | + for(var i in goods_list){ | ||
| 1207 | + var g_item=goods_list[i]; | ||
| 1288 | //--如果是赠品，不加入购物车-- | 1208 | //--如果是赠品，不加入购物车-- |
| 1289 | - if (g_item['is_gift']) continue; | ||
| 1290 | - if (g_item['prom_type'] == 4) { | ||
| 1291 | - err_text += g_item['goods_name'] + "积分购商品不加入购物车\n"; | 1209 | + if(g_item['is_gift']) continue; |
| 1210 | + if(g_item['prom_type']==4 ){ | ||
| 1211 | + err_text+= g_item['goods_name']+"积分购商品不加入购物车\n"; | ||
| 1292 | continue; | 1212 | continue; |
| 1293 | } | 1213 | } |
| 1294 | - if (g_item['prom_type'] == 5) { | ||
| 1295 | - err_text += g_item['goods_name'] + "搭配购商品不加入购物车\n"; | 1214 | + if(g_item['prom_type']==5){ |
| 1215 | + err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n"; | ||
| 1296 | continue; | 1216 | continue; |
| 1297 | } | 1217 | } |
| 1298 | - if (g_item['prom_type'] == 6) { | ||
| 1299 | - err_text += g_item['goods_name'] + "拼团商品不加入购物车\n"; | 1218 | + if(g_item['prom_type']==6 ){ |
| 1219 | + err_text+= g_item['goods_name']+"拼团商品不加入购物车\n"; | ||
| 1300 | continue; | 1220 | continue; |
| 1301 | } | 1221 | } |
| 1302 | 1222 | ||
| 1303 | //--获取商品-- | 1223 | //--获取商品-- |
| 1304 | - var good = null; | 1224 | + var good=null; |
| 1305 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, { | 1225 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, { |
| 1306 | 1226 | ||
| 1307 | - }).then(res => { | ||
| 1308 | - good = res.data.data; | ||
| 1309 | - | 1227 | + }).then(res=>{ |
| 1228 | + good=res.data.data; | ||
| 1310 | }) | 1229 | }) |
| 1311 | - //调用接口判断订单优惠， | ||
| 1312 | - const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) | ||
| 1313 | - if (res.data.code == 0 && res.data.data) { | ||
| 1314 | - var r_data = res.data.data; | ||
| 1315 | - if (r_data.ladderLists) { | ||
| 1316 | - var act_id = r_data.ladderLists[0].form_id; | ||
| 1317 | - //-- 判断会员能不能参与阶梯促销 -- | ||
| 1318 | - const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) | ||
| 1319 | - if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { | ||
| 1320 | - b_item.prom_type = 10; | ||
| 1321 | - b_item.prom_id = data.data.data.id; | ||
| 1322 | - } | ||
| 1323 | - } | ||
| 1324 | - } | ||
| 1325 | - if (!good) { | ||
| 1326 | - err_text += g_item['goods_name'] + "未找到商品\n"; | 1230 | + |
| 1231 | + if(!good){ | ||
| 1232 | + err_text+= g_item['goods_name']+"未找到商品\n"; | ||
| 1327 | continue; | 1233 | continue; |
| 1328 | } | 1234 | } |
| 1329 | if (good.is_on_sale != 1) { | 1235 | if (good.is_on_sale != 1) { |
| 1330 | - err_text += g_item['goods_name'] + "已经下架\n"; | 1236 | + err_text+= g_item['goods_name']+"已经下架\n"; |
| 1331 | continue; | 1237 | continue; |
| 1332 | } | 1238 | } |
| 1333 | 1239 | ||
| 1334 | var timestamp = ut.gettimestamp(); | 1240 | var timestamp = ut.gettimestamp(); |
| 1335 | if (good.on_time > timestamp) { | 1241 | if (good.on_time > timestamp) { |
| 1336 | - err_text += g_item['goods_name'] + "还未上架\n"; | 1242 | + err_text+= g_item['goods_name']+"还未上架\n"; |
| 1337 | continue; | 1243 | continue; |
| 1338 | } | 1244 | } |
| 1339 | if (good.down_time > 0) { | 1245 | if (good.down_time > 0) { |
| 1340 | if (good.down_time < timestamp) { | 1246 | if (good.down_time < timestamp) { |
| 1341 | - err_text += g_item['goods_name'] + "已经下架\n"; | 1247 | + err_text+=g_item['goods_name']+"已经下架\n"; |
| 1342 | continue; | 1248 | continue; |
| 1343 | } | 1249 | } |
| 1344 | } | 1250 | } |
| 1345 | 1251 | ||
| 1346 | //如果商品的配送方式和门店不匹配 | 1252 | //如果商品的配送方式和门店不匹配 |
| 1347 | - if (good['distr_type'] > 0 && pickup['distr_type'] > 0 && good['distr_type'] != pickup['distr_type']) { | ||
| 1348 | - err_text += good['goods_name'] + "配送方式不一致\n"; | 1253 | + if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){ |
| 1254 | + err_text+= good['goods_name']+"配送方式不一致\n"; | ||
| 1349 | continue; | 1255 | continue; |
| 1350 | } | 1256 | } |
| 1351 | 1257 | ||
| 1352 | - var prom = null; | ||
| 1353 | - b_item.goods_id = g_item.goods_id; | ||
| 1354 | - b_item.goods_name = g_item.goods_name; | ||
| 1355 | - b_item.goods_num = g_item.goods_num; | ||
| 1356 | - b_item.guide_id = g_item.guide_id; | ||
| 1357 | - b_item.guide_type = g_item.guide_type; | ||
| 1358 | - b_item.pickup_id = item.pickup_id; | ||
| 1359 | - b_item.price = good.shop_price; | ||
| 1360 | - b_item.goods_sn = good.goods_sn; | ||
| 1361 | - b_item.sku = good.sku; | ||
| 1362 | - b_item.is_integral_normal = g_item.is_integral_normal; | ||
| 1363 | - console.log(b_item, 'b_item'); | 1258 | + var prom=null; |
| 1259 | + var b_item={} | ||
| 1260 | + b_item.goods_id=g_item.goods_id; | ||
| 1261 | + b_item.goods_name=g_item.goods_name; | ||
| 1262 | + b_item.goods_num=g_item.goods_num; | ||
| 1263 | + b_item.guide_id=g_item.guide_id; | ||
| 1264 | + b_item.guide_type=g_item.guide_type; | ||
| 1265 | + b_item.pickup_id=item.pickup_id; | ||
| 1266 | + b_item.price=good.shop_price; | ||
| 1267 | + b_item.goods_sn=good.goods_sn; | ||
| 1268 | + b_item.sku=good.sku; | ||
| 1269 | + b_item.is_integral_normal=g_item.is_integral_normal; | ||
| 1270 | + | ||
| 1364 | //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 -- | 1271 | //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 -- |
| 1365 | - var card_field = th.data.card_field; | ||
| 1366 | - if (card_field && good[card_field] > 0) { | ||
| 1367 | - b_item.price = good[card_field]; | 1272 | + var card_field=th.data.card_field; |
| 1273 | + if(card_field && good[card_field]>0){ | ||
| 1274 | + b_item.price=good[card_field]; | ||
| 1368 | } | 1275 | } |
| 1369 | 1276 | ||
| 1370 | - var url = "/api/weshop/activitylist/getGoodActInfo"; | ||
| 1371 | - var req_data = { | ||
| 1372 | - store_id: g_item.store_id, | ||
| 1373 | - goodsidlist: g_item.goods_id, | ||
| 1374 | - is_detail: 1 | 1277 | + var url="/api/weshop/activitylist/getGoodActInfo"; |
| 1278 | + var req_data={ | ||
| 1279 | + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 | ||
| 1375 | }; | 1280 | }; |
| 1376 | - await getApp().request.promiseGet(url, { | ||
| 1377 | - data: req_data | ||
| 1378 | - }).then(res => { | ||
| 1379 | - if (res.data.code == 0) { | ||
| 1380 | - var list = res.data.data; | ||
| 1381 | - console.log('list', list); | ||
| 1382 | - for (let i in list) { | ||
| 1383 | - let item = list[i]; | ||
| 1384 | - if (item.prom_type == 1) { | ||
| 1385 | - good.prom_type = 1; | ||
| 1386 | - good.prom_id = item.act_id; | ||
| 1387 | - } | ||
| 1388 | - } | ||
| 1389 | - } | 1281 | + await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 1282 | + if(res.data.code==0){ | ||
| 1283 | + var list = res.data.data; | ||
| 1284 | + for(let i in list){ | ||
| 1285 | + let item=list[i]; | ||
| 1286 | + if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; } | ||
| 1287 | + } | ||
| 1288 | + } | ||
| 1390 | }) | 1289 | }) |
| 1391 | 1290 | ||
| 1392 | - if (!prom) { | 1291 | + if(!prom) { |
| 1393 | //--判断商品当前的活动情况-- | 1292 | //--判断商品当前的活动情况-- |
| 1394 | switch (good.prom_type) { | 1293 | switch (good.prom_type) { |
| 1395 | case 1: | 1294 | case 1: |
| @@ -1399,29 +1298,29 @@ Page({ | @@ -1399,29 +1298,29 @@ Page({ | ||
| 1399 | flash = res.data.data; | 1298 | flash = res.data.data; |
| 1400 | } | 1299 | } |
| 1401 | }) | 1300 | }) |
| 1402 | - //----进行中----- | 1301 | + //----已经结束----- |
| 1403 | if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time < timestamp) { | 1302 | if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time < timestamp) { |
| 1404 | prom = flash; | 1303 | prom = flash; |
| 1405 | prom.price = prom.user_price; | 1304 | prom.price = prom.user_price; |
| 1406 | b_item.price = prom.user_price; | 1305 | b_item.price = prom.user_price; |
| 1407 | } | 1306 | } |
| 1408 | break; | 1307 | break; |
| 1409 | - | ||
| 1410 | - case 2: | ||
| 1411 | - var group = null; | ||
| 1412 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => { | ||
| 1413 | - if (res.data.code == 0) { | ||
| 1414 | - group = res.data.data; | ||
| 1415 | - } | ||
| 1416 | - }) | ||
| 1417 | - //----进行中----- | ||
| 1418 | - if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { | ||
| 1419 | - prom = group; | ||
| 1420 | - prom.price = prom.price; | ||
| 1421 | - b_item.price = prom.price; | ||
| 1422 | - } | ||
| 1423 | - break; | ||
| 1424 | - | 1308 | + |
| 1309 | + case 2: | ||
| 1310 | + var group = null; | ||
| 1311 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + good.prom_id, {}).then(res => { | ||
| 1312 | + if (res.data.code == 0) { | ||
| 1313 | + group = res.data.data; | ||
| 1314 | + } | ||
| 1315 | + }) | ||
| 1316 | + //----已经结束----- | ||
| 1317 | + if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { | ||
| 1318 | + prom = group; | ||
| 1319 | + prom.price = prom.price; | ||
| 1320 | + b_item.price = prom.price; | ||
| 1321 | + } | ||
| 1322 | + break; | ||
| 1323 | + | ||
| 1425 | case 6: | 1324 | case 6: |
| 1426 | b_item.is_pd_normal = 1; | 1325 | b_item.is_pd_normal = 1; |
| 1427 | break; | 1326 | break; |
| @@ -1430,32 +1329,23 @@ Page({ | @@ -1430,32 +1329,23 @@ Page({ | ||
| 1430 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; | 1329 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; |
| 1431 | await getApp().request.promiseGet(url, {}).then(res => { | 1330 | await getApp().request.promiseGet(url, {}).then(res => { |
| 1432 | if (res.data.code == 0 && res.data.data) { | 1331 | if (res.data.code == 0 && res.data.data) { |
| 1433 | - if (res.data.data.is_show == 1 && res.data.data.is_end == 0 && | ||
| 1434 | - ut.gettimestamp() < res.data.data.end_time && | ||
| 1435 | - ut.gettimestamp() > res.data.data.start_time | 1332 | + if (res.data.data.is_show == 1 && res.data.data.is_end == 0 |
| 1333 | + && ut.gettimestamp() < res.data.data.end_time | ||
| 1334 | + && ut.gettimestamp() > res.data.data.start_time | ||
| 1436 | ) { | 1335 | ) { |
| 1437 | b_item.prom_type = 7; | 1336 | b_item.prom_type = 7; |
| 1438 | b_item.prom_id = res.data.data.id; | 1337 | b_item.prom_id = res.data.data.id; |
| 1439 | good.prom_type = 7; | 1338 | good.prom_type = 7; |
| 1440 | good.prom_id = b_item.prom_id; | 1339 | good.prom_id = b_item.prom_id; |
| 1340 | + | ||
| 1441 | } | 1341 | } |
| 1442 | } | 1342 | } |
| 1443 | }) | 1343 | }) |
| 1444 | break; | 1344 | break; |
| 1445 | - case 10: | ||
| 1446 | - let user_id = getApp().globalData.userInfo.user_id; | ||
| 1447 | - var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; | ||
| 1448 | - await getApp().request.promiseGet(url, {}).then(res => { | ||
| 1449 | - if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) { | ||
| 1450 | - b_item.prom_type = 10; | ||
| 1451 | - b_item.prom_id = res.data.data.id; | ||
| 1452 | - } | ||
| 1453 | - }) | ||
| 1454 | } | 1345 | } |
| 1455 | } | 1346 | } |
| 1456 | 1347 | ||
| 1457 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 | 1348 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 |
| 1458 | -<<<<<<< HEAD | ||
| 1459 | if(g_item.prom_type==3 || good.prom_type==3){ | 1349 | if(g_item.prom_type==3 || good.prom_type==3){ |
| 1460 | var is_g_prom=0; | 1350 | var is_g_prom=0; |
| 1461 | //因为有全场优惠活动，商品参加的活动还未开始 | 1351 | //因为有全场优惠活动，商品参加的活动还未开始 |
| @@ -1471,15 +1361,6 @@ Page({ | @@ -1471,15 +1361,6 @@ Page({ | ||
| 1471 | is_g_prom=1; break; | 1361 | is_g_prom=1; break; |
| 1472 | } | 1362 | } |
| 1473 | } | 1363 | } |
| 1474 | -======= | ||
| 1475 | - if (g_item.prom_type == 3 || good.prom_type == 3) { | ||
| 1476 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { | ||
| 1477 | - if (res.data.code == 0) { | ||
| 1478 | - var r_data = res.data.data; | ||
| 1479 | - if (r_data.promGoodsLists) { | ||
| 1480 | - b_item.prom_type = 3; | ||
| 1481 | - b_item.prom_id = r_data.promGoodsLists[0].prom_id; | ||
| 1482 | ->>>>>>> d4b9dbf03fa79fb3ff3c5889f79eea201fb49b74 | ||
| 1483 | } | 1364 | } |
| 1484 | }) | 1365 | }) |
| 1485 | if(is_g_prom) { | 1366 | if(is_g_prom) { |
| @@ -1508,41 +1389,34 @@ Page({ | @@ -1508,41 +1389,34 @@ Page({ | ||
| 1508 | 1389 | ||
| 1509 | 1390 | ||
| 1510 | //判断是不是线下库存的购买， 是不是秒杀活动 | 1391 | //判断是不是线下库存的购买， 是不是秒杀活动 |
| 1511 | - if (th.data.sales_rules == 2 && !prom) { | 1392 | + if(th.data.sales_rules==2 && !prom){ |
| 1512 | 1393 | ||
| 1513 | //-- 看一下购物车上有多少商品 -- | 1394 | //-- 看一下购物车上有多少商品 -- |
| 1514 | - var cart_num = 0; | 1395 | + var cart_num=0; |
| 1515 | await getApp().request.promiseGet("/api/weshop/cart/page", { | 1396 | await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 1516 | data: { | 1397 | data: { |
| 1517 | store_id: os.stoid, | 1398 | store_id: os.stoid, |
| 1518 | user_id: getApp().globalData.user_id, | 1399 | user_id: getApp().globalData.user_id, |
| 1519 | - state: 0, | ||
| 1520 | - is_gift: 0, | ||
| 1521 | - goods_id: good.goods_id, | 1400 | + state:0, is_gift:0, |
| 1401 | + goods_id:good.goods_id, | ||
| 1522 | pick_id: b_item.pickup_id | 1402 | pick_id: b_item.pickup_id |
| 1523 | } | 1403 | } |
| 1524 | - }).then(res => { | 1404 | + }).then(res=>{ |
| 1525 | var num = 0; | 1405 | var num = 0; |
| 1526 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 1406 | + if(res.data.code==0 && res.data.data && res.data.data.pageData) { |
| 1527 | for (var i = 0; i < res.data.data.pageData.length; i++) { | 1407 | for (var i = 0; i < res.data.data.pageData.length; i++) { |
| 1528 | num += res.data.data.pageData[i].goods_num; | 1408 | num += res.data.data.pageData[i].goods_num; |
| 1529 | } | 1409 | } |
| 1530 | } | 1410 | } |
| 1531 | - cart_num = num; | 1411 | + cart_num=num; |
| 1532 | }) | 1412 | }) |
| 1533 | 1413 | ||
| 1534 | - var lock = 0, | ||
| 1535 | - plist = null; | 1414 | + var lock=0,plist=null; |
| 1536 | 1415 | ||
| 1537 | - if (b_item.prom_type != 7) { | 1416 | + if(b_item.prom_type!=7) { |
| 1538 | //先读取门店的lock, | 1417 | //先读取门店的lock, |
| 1539 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { | 1418 | await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { |
| 1540 | - data: { | ||
| 1541 | - store_id: os.stoid, | ||
| 1542 | - wareId: good.goods_id, | ||
| 1543 | - storageId: b_item.pickup_id, | ||
| 1544 | - pageSize: 1000 | ||
| 1545 | - } | 1419 | + data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000} |
| 1546 | }).then(res => { | 1420 | }).then(res => { |
| 1547 | if (res.data.code == 0 && res.data.data.total > 0) { | 1421 | if (res.data.code == 0 && res.data.data.total > 0) { |
| 1548 | for (var i in res.data.data.pageData) | 1422 | for (var i in res.data.data.pageData) |
| @@ -1575,101 +1449,100 @@ Page({ | @@ -1575,101 +1449,100 @@ Page({ | ||
| 1575 | b_item.goods_num = plist.CanOutQty - lock; | 1449 | b_item.goods_num = plist.CanOutQty - lock; |
| 1576 | } | 1450 | } |
| 1577 | } | 1451 | } |
| 1578 | - var req_data = { | 1452 | + var req_data={ |
| 1579 | store_id: os.stoid, | 1453 | store_id: os.stoid, |
| 1580 | user_id: getApp().globalData.user_id, | 1454 | user_id: getApp().globalData.user_id, |
| 1581 | goods_id: good.goods_id, | 1455 | goods_id: good.goods_id, |
| 1582 | }; | 1456 | }; |
| 1583 | - if (b_item.prom_type == 7) { | ||
| 1584 | - req_data.prom_type = 7; | ||
| 1585 | - req_data.prom_id = b_item.prom_id; | 1457 | + if(b_item.prom_type==7){ |
| 1458 | + req_data.prom_type=7; | ||
| 1459 | + req_data.prom_id=b_item.prom_id; | ||
| 1586 | } | 1460 | } |
| 1587 | 1461 | ||
| 1588 | - var buynum = 0; | ||
| 1589 | - var promnum = 0; | 1462 | + var buynum=0; |
| 1463 | + var promnum=0; | ||
| 1590 | //---要获得商品，该用户买了多少件,同步应用--- | 1464 | //---要获得商品，该用户买了多少件,同步应用--- |
| 1591 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { | 1465 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
| 1592 | data: req_data, | 1466 | data: req_data, |
| 1593 | }).then(res => { | 1467 | }).then(res => { |
| 1594 | - if (res.data.code == 0) { | 1468 | + if(res.data.code==0){ |
| 1595 | var buy_num_data = res.data.data; | 1469 | var buy_num_data = res.data.data; |
| 1596 | buynum = buy_num_data.goodsbuynum; | 1470 | buynum = buy_num_data.goodsbuynum; |
| 1597 | - if (buy_num_data.promgoodsbuynum) { | ||
| 1598 | - promnum = buy_num_data.promgoodsbuynum; | 1471 | + if(buy_num_data.promgoodsbuynum){ |
| 1472 | + promnum=buy_num_data.promgoodsbuynum; | ||
| 1599 | } | 1473 | } |
| 1600 | } | 1474 | } |
| 1601 | }) | 1475 | }) |
| 1602 | 1476 | ||
| 1603 | //---- 要计算商品的限购 ----- | 1477 | //---- 要计算商品的限购 ----- |
| 1604 | - if (good['viplimited'] > 0) { | ||
| 1605 | - if (cart_num + buynum > good['viplimited']) { | ||
| 1606 | - err_text += good['goods_name'] + "超出限购\n"; | 1478 | + if(good['viplimited']>0){ |
| 1479 | + if(cart_num+buynum>good['viplimited']){ | ||
| 1480 | + err_text+= good['goods_name']+"超出限购\n"; | ||
| 1607 | continue; | 1481 | continue; |
| 1608 | } | 1482 | } |
| 1609 | - good['viplimited'] -= (cart_num + buynum); | ||
| 1610 | - if (b_item.goods_num > good['viplimited']) { | ||
| 1611 | - b_item.goods_num = good['viplimited']; | 1483 | + good['viplimited']-=(cart_num+buynum); |
| 1484 | + if(b_item.goods_num>good['viplimited']){ | ||
| 1485 | + b_item.goods_num=good['viplimited']; | ||
| 1612 | } | 1486 | } |
| 1613 | } | 1487 | } |
| 1614 | //不需要计算组合购的限购 | 1488 | //不需要计算组合购的限购 |
| 1615 | 1489 | ||
| 1616 | - back_goods_arr.push(b_item); //返回商品元素 | 1490 | + back_goods_arr.push(b_item); //返回商品元素 |
| 1617 | 1491 | ||
| 1618 | - } else { | 1492 | + }else{ |
| 1619 | 1493 | ||
| 1620 | //-- 看一下购物车上有多少商品 -- | 1494 | //-- 看一下购物车上有多少商品 -- |
| 1621 | - var cart_num = 0; | 1495 | + var cart_num=0; |
| 1622 | await getApp().request.promiseGet("/api/weshop/cart/page", { | 1496 | await getApp().request.promiseGet("/api/weshop/cart/page", { |
| 1623 | data: { | 1497 | data: { |
| 1624 | store_id: os.stoid, | 1498 | store_id: os.stoid, |
| 1625 | user_id: getApp().globalData.user_id, | 1499 | user_id: getApp().globalData.user_id, |
| 1626 | - state: 0, | ||
| 1627 | - is_gift: 0, | ||
| 1628 | - goods_id: good.goods_id | 1500 | + state:0, is_gift:0, |
| 1501 | + goods_id:good.goods_id | ||
| 1629 | } | 1502 | } |
| 1630 | - }).then(res => { | 1503 | + }).then(res=>{ |
| 1631 | var num = 0; | 1504 | var num = 0; |
| 1632 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 1505 | + if(res.data.code==0 && res.data.data && res.data.data.pageData) { |
| 1633 | for (var i = 0; i < res.data.data.pageData.length; i++) { | 1506 | for (var i = 0; i < res.data.data.pageData.length; i++) { |
| 1634 | num += res.data.data.pageData[i].goods_num; | 1507 | num += res.data.data.pageData[i].goods_num; |
| 1635 | } | 1508 | } |
| 1636 | } | 1509 | } |
| 1637 | - cart_num = num; | 1510 | + cart_num=num; |
| 1638 | }) | 1511 | }) |
| 1639 | 1512 | ||
| 1640 | 1513 | ||
| 1641 | - if (good.store_count <= 0) { | ||
| 1642 | - err_text += good['goods_name'] + "库存不足\n"; | 1514 | + if(good.store_count<=0){ |
| 1515 | + err_text+= good['goods_name']+"库存不足\n"; | ||
| 1643 | continue; | 1516 | continue; |
| 1644 | } | 1517 | } |
| 1645 | - if (b_item.goods_num > good.store_count) | ||
| 1646 | - b_item.goods_num = good.store_count; | 1518 | + if(b_item.goods_num>good.store_count) |
| 1519 | + b_item.goods_num=good.store_count; | ||
| 1647 | 1520 | ||
| 1648 | - var buynum = 0; //商品已经购买多少件 | ||
| 1649 | - var promgoodsbuynum = 0; //活动已经购买多少件 | ||
| 1650 | - var redis_num = 0; //redis库存 | 1521 | + var buynum=0; //商品已经购买多少件 |
| 1522 | + var promgoodsbuynum=0; //活动已经购买多少件 | ||
| 1523 | + var redis_num = 0; //redis库存 | ||
| 1651 | 1524 | ||
| 1652 | - var req_data = { | 1525 | + var req_data={ |
| 1653 | store_id: os.stoid, | 1526 | store_id: os.stoid, |
| 1654 | user_id: getApp().globalData.user_id, | 1527 | user_id: getApp().globalData.user_id, |
| 1655 | goods_id: good.goods_id, | 1528 | goods_id: good.goods_id, |
| 1656 | }; | 1529 | }; |
| 1657 | 1530 | ||
| 1658 | - if (prom) { | ||
| 1659 | - req_data.prom_type = good.prom_type; | ||
| 1660 | - req_data.prom_id = good.prom_id; | ||
| 1661 | - b_item.prom_type = good.prom_type; | ||
| 1662 | - b_item.prom_id = good.prom_id; | 1531 | + if(prom){ |
| 1532 | + req_data.prom_type= good.prom_type; | ||
| 1533 | + req_data.prom_id= good.prom_id; | ||
| 1534 | + b_item.prom_type=good.prom_type; | ||
| 1535 | + b_item.prom_id=good.prom_id; | ||
| 1663 | 1536 | ||
| 1664 | //------判断活动是否抢光----- | 1537 | //------判断活动是否抢光----- |
| 1665 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | 1538 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + |
| 1666 | os.stoid + "/" + good.prom_type + "/" + good.prom_id, { | 1539 | os.stoid + "/" + good.prom_type + "/" + good.prom_id, { |
| 1667 | - 1: 1 | ||
| 1668 | - }).then(res => { | 1540 | + 1: 1 |
| 1541 | + }).then(res => { | ||
| 1669 | redis_num = res.data.data; | 1542 | redis_num = res.data.data; |
| 1670 | }); | 1543 | }); |
| 1671 | - if (redis_num <= 0) { | ||
| 1672 | - err_text += good['goods_name'] + "活动不足\n"; | 1544 | + if(redis_num<=0){ |
| 1545 | + err_text+= good['goods_name']+"活动不足\n"; | ||
| 1673 | continue; | 1546 | continue; |
| 1674 | } | 1547 | } |
| 1675 | 1548 | ||
| @@ -1679,7 +1552,7 @@ Page({ | @@ -1679,7 +1552,7 @@ Page({ | ||
| 1679 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { | 1552 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
| 1680 | data: req_data, | 1553 | data: req_data, |
| 1681 | }).then(res => { | 1554 | }).then(res => { |
| 1682 | - if (res.data.code == 0) { | 1555 | + if(res.data.code==0){ |
| 1683 | var buy_num_data = res.data.data; | 1556 | var buy_num_data = res.data.data; |
| 1684 | if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; | 1557 | if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; |
| 1685 | buynum = buy_num_data.goodsbuynum; | 1558 | buynum = buy_num_data.goodsbuynum; |
| @@ -1687,20 +1560,20 @@ Page({ | @@ -1687,20 +1560,20 @@ Page({ | ||
| 1687 | }) | 1560 | }) |
| 1688 | 1561 | ||
| 1689 | //---- 要计算商品的限购 ----- | 1562 | //---- 要计算商品的限购 ----- |
| 1690 | - if (good['viplimited'] > 0) { | ||
| 1691 | - if (cart_num + buynum > good['viplimited']) { | ||
| 1692 | - err_text += good['goods_name'] + "超出限购\n"; | 1563 | + if(good['viplimited']>0){ |
| 1564 | + if(cart_num+buynum>good['viplimited']){ | ||
| 1565 | + err_text+= good['goods_name']+"超出限购\n"; | ||
| 1693 | continue; | 1566 | continue; |
| 1694 | } | 1567 | } |
| 1695 | - good['viplimited'] -= (cart_num + buynum); | ||
| 1696 | - if (b_item.goods_num > good['viplimited']) { | ||
| 1697 | - b_item.goods_num = good['viplimited']; | 1568 | + good['viplimited']-=(cart_num+buynum); |
| 1569 | + if(b_item.goods_num>good['viplimited']){ | ||
| 1570 | + b_item.goods_num=good['viplimited']; | ||
| 1698 | } | 1571 | } |
| 1699 | 1572 | ||
| 1700 | } | 1573 | } |
| 1701 | 1574 | ||
| 1702 | //-- 判断活动的库存 -- | 1575 | //-- 判断活动的库存 -- |
| 1703 | - if (prom) { | 1576 | + if(prom) { |
| 1704 | if (prom['goods_num'] <= prom['buy_num']) { | 1577 | if (prom['goods_num'] <= prom['buy_num']) { |
| 1705 | err_text += good['goods_name'] + "超出活动库存\n"; | 1578 | err_text += good['goods_name'] + "超出活动库存\n"; |
| 1706 | continue; | 1579 | continue; |
| @@ -1725,378 +1598,367 @@ Page({ | @@ -1725,378 +1598,367 @@ Page({ | ||
| 1725 | } | 1598 | } |
| 1726 | } | 1599 | } |
| 1727 | } | 1600 | } |
| 1728 | - back_goods_arr.push(b_item); //返回商品元素 | 1601 | + |
| 1602 | + | ||
| 1603 | + back_goods_arr.push(b_item); //返回商品元素 | ||
| 1729 | } | 1604 | } |
| 1730 | } | 1605 | } |
| 1731 | 1606 | ||
| 1732 | //有重新购买的数据是时候，就要重新生成订单 | 1607 | //有重新购买的数据是时候，就要重新生成订单 |
| 1733 | - if (back_goods_arr.length > 0) { | ||
| 1734 | - th.setData({ | ||
| 1735 | - back_goods_arr: back_goods_arr | ||
| 1736 | - }); | ||
| 1737 | - if (!err_text) { | 1608 | + if(back_goods_arr.length>0){ |
| 1609 | + th.setData({back_goods_arr:back_goods_arr}); | ||
| 1610 | + if(!err_text){ | ||
| 1738 | th.more_add_cart(); | 1611 | th.more_add_cart(); |
| 1739 | - } else { | 1612 | + }else{ |
| 1740 | wx.hideLoading(); | 1613 | wx.hideLoading(); |
| 1741 | // 如果没有获取用户信息 | 1614 | // 如果没有获取用户信息 |
| 1742 | wx.showModal({ | 1615 | wx.showModal({ |
| 1743 | - title: '确定', | ||
| 1744 | - content: err_text + ',确定要买其他商品吗？', | 1616 | + title:'确定', |
| 1617 | + content: err_text+',确定要买其他商品码？', | ||
| 1745 | success(res) { | 1618 | success(res) { |
| 1746 | if (res.confirm) { | 1619 | if (res.confirm) { |
| 1747 | //跳转到登录页 | 1620 | //跳转到登录页 |
| 1748 | th.more_add_cart(); | 1621 | th.more_add_cart(); |
| 1749 | - } else { | ||
| 1750 | - th.data.moring = 0; | 1622 | + }else{ |
| 1623 | + th.data.moring=0; | ||
| 1751 | wx.hideLoading(); | 1624 | wx.hideLoading(); |
| 1752 | } | 1625 | } |
| 1753 | - }, | ||
| 1754 | - fail() { | ||
| 1755 | - th.data.moring = 0; | 1626 | + },fail(){ |
| 1627 | + th.data.moring=0; | ||
| 1756 | wx.hideLoading(); | 1628 | wx.hideLoading(); |
| 1757 | } | 1629 | } |
| 1758 | }); | 1630 | }); |
| 1759 | 1631 | ||
| 1760 | } | 1632 | } |
| 1761 | - } else { | ||
| 1762 | - th.data.moring = 0; | 1633 | + }else{ |
| 1634 | + th.data.moring=0; | ||
| 1763 | wx.hideLoading(); | 1635 | wx.hideLoading(); |
| 1764 | getApp().confirmBox(err_text); | 1636 | getApp().confirmBox(err_text); |
| 1765 | } | 1637 | } |
| 1766 | }, | 1638 | }, |
| 1767 | - | ||
| 1768 | - more_add_cart: async function () { | ||
| 1769 | - var back_goods_arr = this.data.back_goods_arr; | ||
| 1770 | - var err_text = ""; | ||
| 1771 | - var ok_num = 0; | ||
| 1772 | - | ||
| 1773 | - for (var i in back_goods_arr) { | ||
| 1774 | - //商品ID | ||
| 1775 | - var g_item = back_goods_arr[i]; | ||
| 1776 | - console.log(g_item, 'g_item'); | ||
| 1777 | - var newd = { | ||
| 1778 | - goods_id: g_item.goods_id, | ||
| 1779 | - goods_num: g_item.goods_num, | ||
| 1780 | - pick_id: g_item.pickup_id, | ||
| 1781 | - user_id: oo.user_id, | ||
| 1782 | - store_id: os.stoid, | ||
| 1783 | - goods_price: g_item.price, | ||
| 1784 | - member_goods_price: g_item.price, | ||
| 1785 | - goods_name: g_item.goods_name, | ||
| 1786 | - goods_sn: g_item.goods_sn, | ||
| 1787 | - sku: g_item.sku, | ||
| 1788 | - }; | ||
| 1789 | - | ||
| 1790 | - if (g_item.guide_id) { | ||
| 1791 | - newd['guide_id'] = g_item.guide_id; | ||
| 1792 | - newd['guide_type'] = g_item.guide_type; | ||
| 1793 | - } | ||
| 1794 | - | ||
| 1795 | - if (g_item.is_integral_normal) { | ||
| 1796 | - newd['is_integral_normal'] = g_item.is_integral_normal; | ||
| 1797 | - } | ||
| 1798 | - if (g_item.is_pd_normal) { | ||
| 1799 | - newd['is_pd_normal'] = g_item.is_pd_normal; | ||
| 1800 | - } | ||
| 1801 | - if (g_item.prom_type) { | ||
| 1802 | - newd['prom_type'] = g_item.prom_type; | ||
| 1803 | - newd['prom_id'] = g_item.prom_id; | ||
| 1804 | - } | ||
| 1805 | - | ||
| 1806 | - | ||
| 1807 | - var b_cart_goods = null; | ||
| 1808 | - await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 1809 | - data: { | ||
| 1810 | - store_id: os.stoid, | ||
| 1811 | - user_id: oo.user_id, | ||
| 1812 | - goods_id: g_item.goods_id, | ||
| 1813 | - pick_id: g_item.pickup_id, | ||
| 1814 | - }, | ||
| 1815 | - }).then(res => { | ||
| 1816 | - //-------如果购物车中有相关的数据------- | ||
| 1817 | - if (res.data.data.total > 0) { | ||
| 1818 | - b_cart_goods = res.data.data.pageData[0]; | ||
| 1819 | - } | ||
| 1820 | - }) | ||
| 1821 | - | ||
| 1822 | - //-- 如果就加入过购物车 -- | ||
| 1823 | - if (b_cart_goods) { | ||
| 1824 | - var updata = { | ||
| 1825 | - id: b_cart_goods.id, | ||
| 1826 | - goods_num: newd.goods_num + b_cart_goods.goods_num, | ||
| 1827 | - goods_price: newd.goods_price, | ||
| 1828 | - member_goods_price: newd.goods_price, | ||
| 1829 | - store_id: os.stoid, | ||
| 1830 | - }; | ||
| 1831 | - if (newd.guide_id) { | ||
| 1832 | - updata.guide_id = newd.guide_id; | ||
| 1833 | - updata.guide_type = newd.guide_type; | ||
| 1834 | - } | ||
| 1835 | - if (newd.prom_type) { | ||
| 1836 | - updata.prom_type = newd.prom_type; | ||
| 1837 | - updata.prom_id = newd.prom_id; | ||
| 1838 | - } | ||
| 1839 | - | ||
| 1840 | - await getApp().request.promisePut("/api/weshop/cart/update", { | ||
| 1841 | - data: updata | ||
| 1842 | - }).then(res => { | ||
| 1843 | - if (res.data.code == 0) { | ||
| 1844 | - ok_num++; | ||
| 1845 | - } else { | ||
| 1846 | - err_text += newd.goods_name + "加入购物车失败\n"; | ||
| 1847 | - } | ||
| 1848 | - }) | ||
| 1849 | - | ||
| 1850 | - } else { | ||
| 1851 | - await getApp().request.promisePost("/api/weshop/cart/save", { | ||
| 1852 | - data: newd | ||
| 1853 | - }).then(res => { | ||
| 1854 | - if (res.data.code == 0) { | ||
| 1855 | - ok_num++; | ||
| 1856 | - } else { | ||
| 1857 | - err_text += newd.goods_name + "加入购物车失败\n"; | ||
| 1858 | - } | ||
| 1859 | - }) | ||
| 1860 | - } | ||
| 1861 | - } | ||
| 1862 | - wx.hideLoading(); | ||
| 1863 | - this.data.moring = 0; | ||
| 1864 | - if (ok_num == 0) { | ||
| 1865 | - //-- 如果没有获取用户信息 -- | ||
| 1866 | - wx.showModal({ | ||
| 1867 | - title: '提示', | ||
| 1868 | - content: err_text, | ||
| 1869 | - success(res) {} | ||
| 1870 | - }); | ||
| 1871 | - } else { | ||
| 1872 | - if (err_text == "") { | ||
| 1873 | - getApp().goto("/pages/cart/cart/cart"); | ||
| 1874 | - } else { | ||
| 1875 | - // 如果没有获取用户信息 | ||
| 1876 | - wx.showModal({ | ||
| 1877 | - title: '提示', | ||
| 1878 | - content: err_text, | ||
| 1879 | - success(res) { | ||
| 1880 | - if (res.confirm) { | ||
| 1881 | - //跳转到登录页 | ||
| 1882 | - getApp().goto("/pages/cart/cart/cart"); | ||
| 1883 | - } | ||
| 1884 | - } | ||
| 1885 | - }); | ||
| 1886 | - | ||
| 1887 | - } | ||
| 1888 | - } | ||
| 1889 | - }, | ||
| 1890 | - | ||
| 1891 | - request_list: function (data, callback) { | ||
| 1892 | - // console.log('进入request_list'); | ||
| 1893 | - | ||
| 1894 | - var th = this; | ||
| 1895 | - if (this.data.is_load2) return false; //-- 正在加载 | ||
| 1896 | - if (this.data.is_no_data2) return false; //-- 没有数据 | ||
| 1897 | - if (this.data.is_no_more2) return false; //-- 没有更多 | ||
| 1898 | - | ||
| 1899 | - // 开启加载状态 | ||
| 1900 | - this.data.is_load2 = 1; | ||
| 1901 | - | ||
| 1902 | - // var req_data = { | ||
| 1903 | - // page:th.data.currentPage2 | ||
| 1904 | - // } | ||
| 1905 | - | ||
| 1906 | - app.request.promiseGet("/api/weshop/order/pagePosOrder", { | ||
| 1907 | - data: data | ||
| 1908 | - }).then(res => { | ||
| 1909 | - // 关闭加载状态 | ||
| 1910 | - th.data.is_load2 = 0; | ||
| 1911 | - // 请求成功 | ||
| 1912 | - if (res.data.code == 0) { | ||
| 1913 | - if (res.data.data.pageData.length > 0) { | ||
| 1914 | - th.data.currentPage2++; | ||
| 1915 | - var data = res.data.data.pageData; | ||
| 1916 | - // 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有 | ||
| 1917 | - if (res.data.data.page * res.data.data.pageSize > res.data.data.total) { | ||
| 1918 | - th.setData({ | ||
| 1919 | - is_no_more2: 1 | ||
| 1920 | - }); | ||
| 1921 | - } | ||
| 1922 | - var list = th.data.list2; | ||
| 1923 | - list = list.concat(data); | ||
| 1924 | - th.setData({ | ||
| 1925 | - list2: list | ||
| 1926 | - }); | ||
| 1927 | - } else { | ||
| 1928 | - if (th.data.currentPage2 == 1) { | ||
| 1929 | - th.setData({ | ||
| 1930 | - is_no_data2: 1 | ||
| 1931 | - }); | ||
| 1932 | - } else { | ||
| 1933 | - th.setData({ | ||
| 1934 | - is_no_more2: 1 | ||
| 1935 | - }); | ||
| 1936 | - } | ||
| 1937 | - } | ||
| 1938 | - if (callback) callback(res); | ||
| 1939 | - } else { | ||
| 1940 | - wx.showToast({ | ||
| 1941 | - title: res.data.msg, | ||
| 1942 | - icon: 'none', | ||
| 1943 | - duration: 2000 | ||
| 1944 | - }) | ||
| 1945 | - } | ||
| 1946 | - }) | ||
| 1947 | - }, | ||
| 1948 | - | ||
| 1949 | - | ||
| 1950 | - onClickTab(e) { | ||
| 1951 | - let currentIndex = e.target.dataset.index; | ||
| 1952 | - this.setData({ | ||
| 1953 | - currentIndex: currentIndex | ||
| 1954 | - }); | ||
| 1955 | - console.log(this.data.currentIndex); | ||
| 1956 | - this.setData({ | ||
| 1957 | - is_no_data2: 0, | ||
| 1958 | - is_no_more2: 0, | ||
| 1959 | - currentPage2: 1, | ||
| 1960 | - }); | ||
| 1961 | - if (currentIndex == 0) { | ||
| 1962 | - console.log('线上订单'); | ||
| 1963 | - /*--- | ||
| 1964 | - this.setData({ | ||
| 1965 | - startDate: '选择开始时间', | ||
| 1966 | - endDate: '选择结束时间', | ||
| 1967 | - });--*/ | ||
| 1968 | - } else if (currentIndex == 1) { | ||
| 1969 | - console.log('线下订单'); | ||
| 1970 | - this.request_list({ | ||
| 1971 | - store_id: os.stoid, | ||
| 1972 | - user_id: oo.user_id, | ||
| 1973 | - page: 1, | ||
| 1974 | - BeginDate: this.data.startDate, | ||
| 1975 | - EndDate: this.data.endDate | ||
| 1976 | - }); | ||
| 1977 | - }; | ||
| 1978 | - }, | ||
| 1979 | - | ||
| 1980 | - bindDateChange1: function (e) { | ||
| 1981 | - console.log('picker发送选择改变，携带值为', e.detail.value) | ||
| 1982 | - this.setData({ | ||
| 1983 | - startDate: e.detail.value | ||
| 1984 | - }) | ||
| 1985 | - }, | ||
| 1986 | - | ||
| 1987 | - bindDateChange2: function (e) { | ||
| 1988 | - console.log('picker发送选择改变，携带值为', e.detail.value) | ||
| 1989 | - this.setData({ | ||
| 1990 | - endDate: e.detail.value | ||
| 1991 | - }) | ||
| 1992 | - }, | ||
| 1993 | - | ||
| 1994 | - bindInput(e) { | ||
| 1995 | - this.data.searchContent = e.detail.value; | ||
| 1996 | - }, | ||
| 1997 | - | ||
| 1998 | - searchOnline() { | ||
| 1999 | - console.log('online', this.data.searchContent); | ||
| 2000 | - if (this.data.searchContent) { | ||
| 2001 | - console.log(this.data.searchContent); | ||
| 2002 | - this.resetData(), this.requestOrderList(this.data.activeCategoryId); | ||
| 2003 | - } else { | ||
| 2004 | - wx.showToast({ | ||
| 2005 | - title: '您还没有输入搜索内容~', | ||
| 2006 | - icon: 'none', | ||
| 2007 | - }) | ||
| 2008 | - }; | ||
| 2009 | - }, | ||
| 2010 | - | ||
| 2011 | - searchOffline() { | ||
| 2012 | - console.log('执行查询'); | ||
| 2013 | - let th = this; | ||
| 2014 | - let startDate = this.data.startDate; | ||
| 2015 | - let endDate = this.data.endDate; | ||
| 2016 | - | ||
| 2017 | - // this.data.is_no_data2 = 0; | ||
| 2018 | - this.setData({ | ||
| 2019 | - currentPage2: 1, | ||
| 2020 | - list2: [], | ||
| 2021 | - is_no_data2: 0, | ||
| 2022 | - }); | ||
| 2023 | - | ||
| 2024 | - | ||
| 2025 | - if (startDate == '选择开始时间' || endDate == '选择结束时间') { | ||
| 2026 | - wx.showToast({ | ||
| 2027 | - title: '请选择完整的查询时间~', | ||
| 2028 | - icon: 'none', | ||
| 2029 | - }) | ||
| 2030 | - }; | ||
| 2031 | - | ||
| 2032 | - if (new Date(startDate) > new Date(endDate)) { | ||
| 2033 | - wx.showToast({ | ||
| 2034 | - title: '不对噢！开始时间不能晚于结束时间~', | ||
| 2035 | - icon: 'none', | ||
| 2036 | - }) | ||
| 2037 | - return; | ||
| 2038 | - }; | ||
| 2039 | - | ||
| 2040 | - | ||
| 2041 | - this.request_list({ | ||
| 2042 | - store_id: os.stoid, | ||
| 2043 | - user_id: oo.user_id, | ||
| 2044 | - page: 1, | ||
| 2045 | - BeginDate: this.data.startDate, | ||
| 2046 | - EndDate: this.data.endDate | ||
| 2047 | - }, function (res) { | ||
| 2048 | - if (res.data.data.total == 0) { | ||
| 2049 | - wx.showToast({ | ||
| 2050 | - title: '没有找到相关订单', | ||
| 2051 | - icon: 'none', | ||
| 2052 | - duration: 2000 | ||
| 2053 | - }) | ||
| 2054 | - } else { | ||
| 2055 | - th.setData({ | ||
| 2056 | - total: res.data.data.total | ||
| 2057 | - }); | ||
| 2058 | - } | ||
| 2059 | - }); | ||
| 2060 | - }, | ||
| 2061 | - | ||
| 2062 | - currentDate() { | ||
| 2063 | - var now = new Date(); | ||
| 2064 | - var year = now.getFullYear(); //年 | ||
| 2065 | - var month = now.getMonth() + 1; //月 | ||
| 2066 | - var day = now.getDate(); //日 | ||
| 2067 | - | ||
| 2068 | - var clock = year + "-"; | ||
| 2069 | - | ||
| 2070 | - if (month < 10) month += "0"; | ||
| 2071 | - clock += month + "-"; | ||
| 2072 | - | ||
| 2073 | - if (day < 10) day += "0"; | ||
| 2074 | - clock += day; | ||
| 2075 | - | ||
| 2076 | - // if(hh < 10) | ||
| 2077 | - // clock += "0"; | ||
| 2078 | - | ||
| 2079 | - // clock += hh + ":"; | ||
| 2080 | - // if (mm < 10) clock += '0'; | ||
| 2081 | - // clock += mm + ":"; | ||
| 2082 | - | ||
| 2083 | - // if (ss < 10) clock += '0'; | ||
| 2084 | - // clock += ss; | ||
| 2085 | - return clock; | ||
| 2086 | - }, | ||
| 2087 | - | ||
| 2088 | - toast(msg) { | ||
| 2089 | - wx.showToast({ | ||
| 2090 | - title: msg, | ||
| 2091 | - icon: 'none', | ||
| 2092 | - duration: 3000 | ||
| 2093 | - }) | ||
| 2094 | - }, | ||
| 2095 | - | ||
| 2096 | - go_url(e) { | ||
| 2097 | - var url = e.currentTarget.dataset.url; | ||
| 2098 | - getApp().goto(url); | 1639 | + |
| 1640 | + more_add_cart:async function(){ | ||
| 1641 | + var back_goods_arr=this.data.back_goods_arr; | ||
| 1642 | + var err_text=""; | ||
| 1643 | + var ok_num=0; | ||
| 1644 | + | ||
| 1645 | + for(var i in back_goods_arr){ | ||
| 1646 | + //商品ID | ||
| 1647 | + var g_item=back_goods_arr[i]; | ||
| 1648 | + var newd = { | ||
| 1649 | + goods_id: g_item.goods_id, | ||
| 1650 | + goods_num: g_item.goods_num, | ||
| 1651 | + pick_id: g_item.pickup_id, | ||
| 1652 | + user_id: oo.user_id, | ||
| 1653 | + store_id: os.stoid, | ||
| 1654 | + goods_price: g_item.price, | ||
| 1655 | + member_goods_price: g_item.price, | ||
| 1656 | + goods_name: g_item.goods_name, | ||
| 1657 | + goods_sn: g_item.goods_sn, | ||
| 1658 | + sku: g_item.sku, | ||
| 1659 | + }; | ||
| 1660 | + | ||
| 1661 | + if(g_item.guide_id){ | ||
| 1662 | + newd['guide_id']=g_item.guide_id; | ||
| 1663 | + newd['guide_type']=g_item.guide_type; | ||
| 1664 | + } | ||
| 1665 | + | ||
| 1666 | + if(g_item.is_integral_normal){ | ||
| 1667 | + newd['is_integral_normal']=g_item.is_integral_normal; | ||
| 1668 | + } | ||
| 1669 | + if(g_item.is_pd_normal){ | ||
| 1670 | + newd['is_pd_normal']=g_item.is_pd_normal; | ||
| 1671 | + } | ||
| 1672 | + | ||
| 1673 | + if(g_item.prom_type){ | ||
| 1674 | + newd['prom_type']=g_item.prom_type; | ||
| 1675 | + newd['prom_id']=g_item.prom_id; | ||
| 1676 | + } | ||
| 1677 | + | ||
| 1678 | + | ||
| 1679 | + var b_cart_goods=null; | ||
| 1680 | + await getApp().request.promiseGet("/api/weshop/cart/page", { | ||
| 1681 | + data: { | ||
| 1682 | + store_id: os.stoid, | ||
| 1683 | + user_id: oo.user_id, | ||
| 1684 | + goods_id: g_item.goods_id, | ||
| 1685 | + pick_id: g_item.pickup_id, | ||
| 1686 | + }, | ||
| 1687 | + }).then(res=>{ | ||
| 1688 | + //-------如果购物车中有相关的数据------- | ||
| 1689 | + if (res.data.data.total > 0) { | ||
| 1690 | + b_cart_goods= res.data.data.pageData[0]; | ||
| 1691 | + } | ||
| 1692 | + }) | ||
| 1693 | + | ||
| 1694 | + //-- 如果就加入过购物车 -- | ||
| 1695 | + if(b_cart_goods){ | ||
| 1696 | + var updata = { | ||
| 1697 | + id: b_cart_goods.id, | ||
| 1698 | + goods_num: newd.goods_num + b_cart_goods.goods_num, | ||
| 1699 | + goods_price: newd.goods_price, | ||
| 1700 | + member_goods_price:newd.goods_price, | ||
| 1701 | + store_id: os.stoid, | ||
| 1702 | + }; | ||
| 1703 | + if(newd.guide_id){ | ||
| 1704 | + updata.guide_id=newd.guide_id; | ||
| 1705 | + updata.guide_type=newd.guide_type; | ||
| 1706 | + } | ||
| 1707 | + if(newd.prom_type){ | ||
| 1708 | + updata.prom_type=newd.prom_type; | ||
| 1709 | + updata.prom_id=newd.prom_id; | ||
| 1710 | + } | ||
| 1711 | + | ||
| 1712 | + await getApp().request.promisePut("/api/weshop/cart/update", { | ||
| 1713 | + data: updata | ||
| 1714 | + }).then(res=>{ | ||
| 1715 | + if(res.data.code==0) { | ||
| 1716 | + ok_num++; | ||
| 1717 | + }else{ | ||
| 1718 | + err_text+=newd.goods_name+"加入购物车失败\n"; | ||
| 1719 | + } | ||
| 1720 | + }) | ||
| 1721 | + | ||
| 1722 | + }else{ | ||
| 1723 | + await getApp().request.promisePost("/api/weshop/cart/save", { | ||
| 1724 | + data: newd | ||
| 1725 | + }).then(res=>{ | ||
| 1726 | + if(res.data.code==0) { | ||
| 1727 | + ok_num++; | ||
| 1728 | + }else{ | ||
| 1729 | + err_text+=newd.goods_name+"加入购物车失败\n"; | ||
| 1730 | + } | ||
| 1731 | + }) | ||
| 1732 | + } | ||
| 1733 | + } | ||
| 1734 | + wx.hideLoading(); | ||
| 1735 | + this.data.moring=0; | ||
| 1736 | + if(ok_num==0){ | ||
| 1737 | + //-- 如果没有获取用户信息 -- | ||
| 1738 | + wx.showModal({ | ||
| 1739 | + title:'提示', | ||
| 1740 | + content: err_text, | ||
| 1741 | + success(res) {} | ||
| 1742 | + }); | ||
| 1743 | + }else{ | ||
| 1744 | + if(err_text==""){ | ||
| 1745 | + getApp().goto("/pages/cart/cart/cart"); | ||
| 1746 | + }else{ | ||
| 1747 | + // 如果没有获取用户信息 | ||
| 1748 | + wx.showModal({ | ||
| 1749 | + title:'提示', | ||
| 1750 | + content: err_text, | ||
| 1751 | + success(res) { | ||
| 1752 | + if (res.confirm) { | ||
| 1753 | + //跳转到登录页 | ||
| 1754 | + getApp().goto("/pages/cart/cart/cart"); | ||
| 1755 | + } | ||
| 1756 | + } | ||
| 1757 | + }); | ||
| 1758 | + | ||
| 1759 | + } | ||
| 1760 | + } | ||
| 1761 | + }, | ||
| 1762 | + | ||
| 1763 | + request_list: function(data, callback){ | ||
| 1764 | + // console.log('进入request_list'); | ||
| 1765 | + | ||
| 1766 | + var th = this; | ||
| 1767 | + if(this.data.is_load2) return false; //-- 正在加载 | ||
| 1768 | + if(this.data.is_no_data2) return false; //-- 没有数据 | ||
| 1769 | + if(this.data.is_no_more2) return false; //-- 没有更多 | ||
| 1770 | + | ||
| 1771 | + // 开启加载状态 | ||
| 1772 | + this.data.is_load2=1; | ||
| 1773 | + | ||
| 1774 | + // var req_data = { | ||
| 1775 | + // page:th.data.currentPage2 | ||
| 1776 | + // } | ||
| 1777 | + | ||
| 1778 | + app.request.promiseGet("/api/weshop/order/pagePosOrder", { | ||
| 1779 | + data: data | ||
| 1780 | + }).then(res=>{ | ||
| 1781 | + // 关闭加载状态 | ||
| 1782 | + th.data.is_load2=0; | ||
| 1783 | + // 请求成功 | ||
| 1784 | + if(res.data.code==0) { | ||
| 1785 | + if(res.data.data.pageData.length>0) { | ||
| 1786 | + th.data.currentPage2++; | ||
| 1787 | + var data = res.data.data.pageData; | ||
| 1788 | + // 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有 | ||
| 1789 | + if(res.data.data.page*res.data.data.pageSize > res.data.data.total){th.setData({is_no_more2:1});} | ||
| 1790 | + var list=th.data.list2; | ||
| 1791 | + list=list.concat(data); | ||
| 1792 | + th.setData({list2:list}); | ||
| 1793 | + } else { | ||
| 1794 | + if(th.data.currentPage2==1){ | ||
| 1795 | + th.setData({is_no_data2:1}); | ||
| 1796 | + } else { | ||
| 1797 | + th.setData({is_no_more2:1}); | ||
| 1798 | + } | ||
| 1799 | + } | ||
| 1800 | + if(callback) callback(res); | ||
| 1801 | + } else { | ||
| 1802 | + wx.showToast({ | ||
| 1803 | + title: res.data.msg, | ||
| 1804 | + icon: 'none', | ||
| 1805 | + duration: 2000 | ||
| 1806 | + }) | ||
| 1807 | + } | ||
| 1808 | + }) | ||
| 1809 | + }, | ||
| 1810 | + | ||
| 1811 | + | ||
| 1812 | + onClickTab(e) { | ||
| 1813 | + let currentIndex = e.target.dataset.index; | ||
| 1814 | + this.setData({ | ||
| 1815 | + currentIndex: currentIndex | ||
| 1816 | + }); | ||
| 1817 | + console.log(this.data.currentIndex); | ||
| 1818 | + this.setData({ | ||
| 1819 | + is_no_data2: 0, | ||
| 1820 | + is_no_more2: 0, | ||
| 1821 | + currentPage2: 1, | ||
| 1822 | + }); | ||
| 1823 | + if(currentIndex == 0) { | ||
| 1824 | + console.log('线上订单'); | ||
| 1825 | + /*--- | ||
| 1826 | + this.setData({ | ||
| 1827 | + startDate: '选择开始时间', | ||
| 1828 | + endDate: '选择结束时间', | ||
| 1829 | + });--*/ | ||
| 1830 | + } else if(currentIndex == 1) { | ||
| 1831 | + console.log('线下订单'); | ||
| 1832 | + this.request_list({ | ||
| 1833 | + store_id: os.stoid, | ||
| 1834 | + user_id: oo.user_id, | ||
| 1835 | + page: 1, | ||
| 1836 | + BeginDate: this.data.startDate, | ||
| 1837 | + EndDate: this.data.endDate | ||
| 1838 | + }); | ||
| 1839 | + }; | ||
| 1840 | + }, | ||
| 1841 | + | ||
| 1842 | + bindDateChange1: function(e) { | ||
| 1843 | + console.log('picker发送选择改变，携带值为', e.detail.value) | ||
| 1844 | + this.setData({ | ||
| 1845 | + startDate: e.detail.value | ||
| 1846 | + }) | ||
| 1847 | + }, | ||
| 1848 | + | ||
| 1849 | + bindDateChange2: function(e) { | ||
| 1850 | + console.log('picker发送选择改变，携带值为', e.detail.value) | ||
| 1851 | + this.setData({ | ||
| 1852 | + endDate: e.detail.value | ||
| 1853 | + }) | ||
| 1854 | + }, | ||
| 1855 | + | ||
| 1856 | + bindInput(e) { | ||
| 1857 | + this.data.searchContent = e.detail.value; | ||
| 1858 | + }, | ||
| 1859 | + | ||
| 1860 | + searchOnline() { | ||
| 1861 | + console.log('online',this.data.searchContent); | ||
| 1862 | + if(this.data.searchContent) { | ||
| 1863 | + console.log(this.data.searchContent); | ||
| 1864 | + this.resetData(), this.requestOrderList(this.data.activeCategoryId); | ||
| 1865 | + } else { | ||
| 1866 | + wx.showToast({ | ||
| 1867 | + title: '您还没有输入搜索内容~', | ||
| 1868 | + icon: 'none', | ||
| 1869 | + }) | ||
| 1870 | + }; | ||
| 1871 | + }, | ||
| 1872 | + | ||
| 1873 | + searchOffline() { | ||
| 1874 | + console.log('执行查询'); | ||
| 1875 | + let th = this; | ||
| 1876 | + let startDate = this.data.startDate; | ||
| 1877 | + let endDate = this.data.endDate; | ||
| 1878 | + | ||
| 1879 | + // this.data.is_no_data2 = 0; | ||
| 1880 | + this.setData({ | ||
| 1881 | + currentPage2: 1, | ||
| 1882 | + list2: [], | ||
| 1883 | + is_no_data2: 0, | ||
| 1884 | + }); | ||
| 1885 | + | ||
| 1886 | + | ||
| 1887 | + if(startDate == '选择开始时间' || endDate == '选择结束时间') { | ||
| 1888 | + wx.showToast({ | ||
| 1889 | + title: '请选择完整的查询时间~', | ||
| 1890 | + icon: 'none', | ||
| 1891 | + }) | ||
| 1892 | + }; | ||
| 1893 | + | ||
| 1894 | + if(new Date(startDate) > new Date(endDate)) { | ||
| 1895 | + wx.showToast({ | ||
| 1896 | + title: '不对噢！开始时间不能晚于结束时间~', | ||
| 1897 | + icon: 'none', | ||
| 1898 | + }) | ||
| 1899 | + return; | ||
| 1900 | + }; | ||
| 1901 | + | ||
| 1902 | + | ||
| 1903 | + this.request_list({ | ||
| 1904 | + store_id: os.stoid, | ||
| 1905 | + user_id: oo.user_id, | ||
| 1906 | + page: 1, | ||
| 1907 | + BeginDate: this.data.startDate, | ||
| 1908 | + EndDate: this.data.endDate | ||
| 1909 | + }, function(res) { | ||
| 1910 | + if(res.data.data.total == 0) { | ||
| 1911 | + wx.showToast({ | ||
| 1912 | + title: '没有找到相关订单', | ||
| 1913 | + icon: 'none', | ||
| 1914 | + duration: 2000 | ||
| 1915 | + }) | ||
| 1916 | + } else { | ||
| 1917 | + th.setData({ | ||
| 1918 | + total: res.data.data.total | ||
| 1919 | + }); | ||
| 1920 | + } | ||
| 1921 | + }); | ||
| 1922 | + }, | ||
| 1923 | + | ||
| 1924 | + currentDate() { | ||
| 1925 | + var now = new Date(); | ||
| 1926 | + var year = now.getFullYear(); //年 | ||
| 1927 | + var month = now.getMonth() + 1; //月 | ||
| 1928 | + var day = now.getDate(); //日 | ||
| 1929 | + | ||
| 1930 | + var clock = year + "-"; | ||
| 1931 | + | ||
| 1932 | + if(month < 10) month += "0"; | ||
| 1933 | + clock += month + "-"; | ||
| 1934 | + | ||
| 1935 | + if(day < 10) day += "0"; | ||
| 1936 | + clock += day; | ||
| 1937 | + | ||
| 1938 | + // if(hh < 10) | ||
| 1939 | + // clock += "0"; | ||
| 1940 | + | ||
| 1941 | + // clock += hh + ":"; | ||
| 1942 | + // if (mm < 10) clock += '0'; | ||
| 1943 | + // clock += mm + ":"; | ||
| 1944 | + | ||
| 1945 | + // if (ss < 10) clock += '0'; | ||
| 1946 | + // clock += ss; | ||
| 1947 | + return clock; | ||
| 1948 | + }, | ||
| 1949 | + | ||
| 1950 | + toast(msg){ | ||
| 1951 | + wx.showToast({ | ||
| 1952 | + title: msg, | ||
| 1953 | + icon: 'none', | ||
| 1954 | + duration: 3000 | ||
| 1955 | + }) | ||
| 1956 | + }, | ||
| 1957 | + | ||
| 1958 | + go_url(e){ | ||
| 1959 | + var url=e.currentTarget.dataset.url; | ||
| 1960 | + getApp().goto(url); | ||
| 2099 | } | 1961 | } |
| 2100 | - | ||
| 2101 | - | 1962 | + |
| 1963 | + | ||
| 2102 | }); | 1964 | }); |
| 2103 | \ No newline at end of file | 1965 | \ No newline at end of file |