Commit 251a46db141f2a0f6cf0e6a041144a82ffa0d593
1 parent
82be4446
优化bug
Showing
7 changed files
with
76 additions
and
50 deletions
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -432,7 +432,9 @@ Component({ | @@ -432,7 +432,9 @@ Component({ | ||
| 432 | set_good:async function(goods){ | 432 | set_good:async function(goods){ |
| 433 | var now=ut.gettimestamp(); | 433 | var now=ut.gettimestamp(); |
| 434 | var th=this; | 434 | var th=this; |
| 435 | - if(!goods || goods.length==0) return false; | 435 | + if(!goods || goods.length==0) return false; |
| 436 | + var user_id=getApp().globalData.userInfo.user_id; | ||
| 437 | + if(!user_id) user_id=0; | ||
| 436 | for(var i in goods){ | 438 | for(var i in goods){ |
| 437 | var val=goods[i]; | 439 | var val=goods[i]; |
| 438 | var item = {}; | 440 | var item = {}; |
| @@ -441,7 +443,7 @@ Component({ | @@ -441,7 +443,7 @@ Component({ | ||
| 441 | 443 | ||
| 442 | var url="/api/weshop/activitylist/getGoodActInfo"; | 444 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 443 | var req_data={ | 445 | var req_data={ |
| 444 | - store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1 | 446 | + store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1,user_id:user_id |
| 445 | }; | 447 | }; |
| 446 | 448 | ||
| 447 | //获取商品的实际活动 | 449 | //获取商品的实际活动 |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
| @@ -531,6 +531,7 @@ Page({ | @@ -531,6 +531,7 @@ Page({ | ||
| 531 | check_more_order:async function(item){ | 531 | check_more_order:async function(item){ |
| 532 | var pickup=null,th=this; | 532 | var pickup=null,th=this; |
| 533 | var user_id=getApp().globalData.userInfo.user_id; | 533 | var user_id=getApp().globalData.userInfo.user_id; |
| 534 | + if(!user_id) user_id=0; | ||
| 534 | wx.showLoading(); | 535 | wx.showLoading(); |
| 535 | //--------获取门店----------- | 536 | //--------获取门店----------- |
| 536 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { | 537 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { |
| @@ -617,7 +618,7 @@ Page({ | @@ -617,7 +618,7 @@ Page({ | ||
| 617 | 618 | ||
| 618 | var url="/api/weshop/activitylist/getGoodActInfo"; | 619 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 619 | var req_data={ | 620 | var req_data={ |
| 620 | - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 | 621 | + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id |
| 621 | }; | 622 | }; |
| 622 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 623 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 623 | if(res.data.code==0){ | 624 | if(res.data.code==0){ |
pages/cart/cart/cart.js
| @@ -607,6 +607,12 @@ Page({ | @@ -607,6 +607,12 @@ Page({ | ||
| 607 | 607 | ||
| 608 | //如果是阶梯购的时候 | 608 | //如果是阶梯购的时候 |
| 609 | if(item.prom_type==10){ | 609 | if(item.prom_type==10){ |
| 610 | + | ||
| 611 | + var url = '/api/weshop/cart/update'; | ||
| 612 | + getApp().request.put(url, { | ||
| 613 | + data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:act.id} | ||
| 614 | + }); | ||
| 615 | + | ||
| 610 | if(!th.data.ladder_map[item.prom_id]){ | 616 | if(!th.data.ladder_map[item.prom_id]){ |
| 611 | //如果有阶梯购，要判断身份 | 617 | //如果有阶梯购，要判断身份 |
| 612 | var isok = 1; | 618 | var isok = 1; |
| @@ -642,10 +648,6 @@ Page({ | @@ -642,10 +648,6 @@ Page({ | ||
| 642 | item.prom_type=0; | 648 | item.prom_type=0; |
| 643 | item.prom_id=0; | 649 | item.prom_id=0; |
| 644 | }else{ | 650 | }else{ |
| 645 | - var url = '/api/weshop/cart/update'; | ||
| 646 | - getApp().request.put(url, { | ||
| 647 | - data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:act.id} | ||
| 648 | - }); | ||
| 649 | 651 | ||
| 650 | th.data.ladder_map[item.prom_id]=act; | 652 | th.data.ladder_map[item.prom_id]=act; |
| 651 | //-- 获取阶梯规则 -- | 653 | //-- 获取阶梯规则 -- |
| @@ -2242,7 +2244,7 @@ Page({ | @@ -2242,7 +2244,7 @@ Page({ | ||
| 2242 | 2244 | ||
| 2243 | //如果会员是等级会员,商品有等级价,且不是活动商品 | 2245 | //如果会员是等级会员,商品有等级价,且不是活动商品 |
| 2244 | if (card_field && val[card_field] > 0 && | 2246 | if (card_field && val[card_field] > 0 && |
| 2245 | - ((val.prom_type == 0 && g_arr[i].prom_type==0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || normal_arr[val.goods_id])) { | 2247 | + ((val.prom_type == 0 && g_arr[i].prom_type==0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || val.prom_type == 10 || normal_arr[val.goods_id])) { |
| 2246 | if (g_arr[i].goods_price != val[card_field]) { | 2248 | if (g_arr[i].goods_price != val[card_field]) { |
| 2247 | isok = 0; | 2249 | isok = 0; |
| 2248 | gname = val.goods_name; | 2250 | gname = val.goods_name; |
| @@ -2681,17 +2683,30 @@ Page({ | @@ -2681,17 +2683,30 @@ Page({ | ||
| 2681 | 2683 | ||
| 2682 | //跳转到商品 | 2684 | //跳转到商品 |
| 2683 | go_gd:function (e) { | 2685 | go_gd:function (e) { |
| 2686 | + var user_id=getApp().globalData.user_id; | ||
| 2687 | + if(!user_id) user_id=0; | ||
| 2684 | var gd= e.currentTarget.dataset.gd; | 2688 | var gd= e.currentTarget.dataset.gd; |
| 2685 | var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; | 2689 | var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; |
| 2686 | var url="/api/weshop/activitylist/getGoodActInfo"; | 2690 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 2687 | var req_data={ | 2691 | var req_data={ |
| 2688 | - store_id:os.stoid,goodsidlist:gd,is_detail:1 | 2692 | + store_id:os.stoid,goodsidlist:gd,is_detail:1,user_id:user_id |
| 2689 | }; | 2693 | }; |
| 2690 | //获取秒杀的多规格 | 2694 | //获取秒杀的多规格 |
| 2691 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 2695 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 2692 | if(res.data.code==0 && res.data.data){ | 2696 | if(res.data.code==0 && res.data.data){ |
| 2693 | if(res.data.data.length==1){ | 2697 | if(res.data.data.length==1){ |
| 2694 | - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; | 2698 | + var item=res.data.data[0]; |
| 2699 | + switch (item.prom_type){ | ||
| 2700 | + case 9: | ||
| 2701 | + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; | ||
| 2702 | + break; | ||
| 2703 | + case 8: | ||
| 2704 | + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id | ||
| 2705 | + break; | ||
| 2706 | + default: | ||
| 2707 | + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; | ||
| 2708 | + break | ||
| 2709 | + } | ||
| 2695 | } | 2710 | } |
| 2696 | getApp().goto(good_url); | 2711 | getApp().goto(good_url); |
| 2697 | 2712 |
pages/goods/goodsList/goodsList.js
| @@ -238,6 +238,9 @@ Page({ | @@ -238,6 +238,9 @@ Page({ | ||
| 238 | var e = this,th=e; | 238 | var e = this,th=e; |
| 239 | this.data.requestUrl = t; | 239 | this.data.requestUrl = t; |
| 240 | 240 | ||
| 241 | + | ||
| 242 | + var user_id=getApp().globalData.user_id; | ||
| 243 | + if(!user_id) user_id=0; | ||
| 241 | //不是商品分组的，不是默认排序的 | 244 | //不是商品分组的，不是默认排序的 |
| 242 | if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ | 245 | if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ |
| 243 | t += "&orderField=" + e.data.tabname; | 246 | t += "&orderField=" + e.data.tabname; |
| @@ -254,10 +257,10 @@ Page({ | @@ -254,10 +257,10 @@ Page({ | ||
| 254 | for(let i in res.data.data.pageData){ | 257 | for(let i in res.data.data.pageData){ |
| 255 | let item=res.data.data.pageData[i]; | 258 | let item=res.data.data.pageData[i]; |
| 256 | item.original_img = th.data.url + item.original_img; | 259 | item.original_img = th.data.url + item.original_img; |
| 257 | - | 260 | + /*-- |
| 258 | var url="/api/weshop/activitylist/getGoodActInfo"; | 261 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 259 | var req_data={ | 262 | var req_data={ |
| 260 | - store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 | 263 | + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id |
| 261 | }; | 264 | }; |
| 262 | //获取商品的实际活动 | 265 | //获取商品的实际活动 |
| 263 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 266 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| @@ -265,7 +268,7 @@ Page({ | @@ -265,7 +268,7 @@ Page({ | ||
| 265 | item.prom_type=res.data.data[0].prom_type; | 268 | item.prom_type=res.data.data[0].prom_type; |
| 266 | item.prom_id=res.data.data[0].act_id; | 269 | item.prom_id=res.data.data[0].act_id; |
| 267 | } | 270 | } |
| 268 | - }) | 271 | + })--*/ |
| 269 | 272 | ||
| 270 | var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | 273 | var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 |
| 271 | var prom_id=item.prom_id; | 274 | var prom_id=item.prom_id; |
pages/goods/search/search.js
| @@ -145,6 +145,10 @@ Page({ | @@ -145,6 +145,10 @@ Page({ | ||
| 145 | t += "&user_id=" + getApp().globalData.userInfo.user_id; | 145 | t += "&user_id=" + getApp().globalData.userInfo.user_id; |
| 146 | } | 146 | } |
| 147 | this.data.requestUrl = t; | 147 | this.data.requestUrl = t; |
| 148 | + | ||
| 149 | + var user_id=getApp().globalData.user_id; | ||
| 150 | + if(!user_id) user_id=0; | ||
| 151 | + | ||
| 148 | getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{ | 152 | getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{ |
| 149 | th.data.loading=0; | 153 | th.data.loading=0; |
| 150 | if(ut.ajax_ok(res)){ | 154 | if(ut.ajax_ok(res)){ |
| @@ -152,9 +156,11 @@ Page({ | @@ -152,9 +156,11 @@ Page({ | ||
| 152 | for(let i in res.data.data.pageData){ | 156 | for(let i in res.data.data.pageData){ |
| 153 | let item=res.data.data.pageData[i]; | 157 | let item=res.data.data.pageData[i]; |
| 154 | item.original_img = th.data.url + item.original_img; | 158 | item.original_img = th.data.url + item.original_img; |
| 159 | + | ||
| 160 | + /*-- | ||
| 155 | var url="/api/weshop/activitylist/getGoodActInfo"; | 161 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 156 | var req_data={ | 162 | var req_data={ |
| 157 | - store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 | 163 | + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id |
| 158 | }; | 164 | }; |
| 159 | //获取商品的实际活动 | 165 | //获取商品的实际活动 |
| 160 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 166 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| @@ -162,7 +168,7 @@ Page({ | @@ -162,7 +168,7 @@ Page({ | ||
| 162 | item.prom_type=res.data.data[0].prom_type; | 168 | item.prom_type=res.data.data[0].prom_type; |
| 163 | item.prom_id=res.data.data[0].act_id; | 169 | item.prom_id=res.data.data[0].act_id; |
| 164 | } | 170 | } |
| 165 | - }) | 171 | + })--*/ |
| 166 | 172 | ||
| 167 | var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | 173 | var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 |
| 168 | var prom_id=item.prom_id; | 174 | var prom_id=item.prom_id; |
| @@ -170,8 +176,6 @@ Page({ | @@ -170,8 +176,6 @@ Page({ | ||
| 170 | var url = ""; | 176 | var url = ""; |
| 171 | switch (prom_type){ | 177 | switch (prom_type){ |
| 172 | case 1: | 178 | case 1: |
| 173 | - var user_id=getApp().globalData.user_id; | ||
| 174 | - if(!user_id) user_id=0; | ||
| 175 | url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; | 179 | url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; |
| 176 | break; | 180 | break; |
| 177 | case 2: | 181 | case 2: |
| @@ -211,34 +215,21 @@ Page({ | @@ -211,34 +215,21 @@ Page({ | ||
| 211 | var flag=null; | 215 | var flag=null; |
| 212 | if(res.data.code==0 && res.data.data){ | 216 | if(res.data.code==0 && res.data.data){ |
| 213 | prom=res.data.data; | 217 | prom=res.data.data; |
| 214 | - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{ | ||
| 215 | - data:{ | ||
| 216 | - store_id: oo.stoid, | ||
| 217 | - is_end: 0, | ||
| 218 | - is_show: 1, | ||
| 219 | - user_id: getApp().globalData.user_id, | ||
| 220 | - pageSize:1000 | ||
| 221 | - } | ||
| 222 | - }).then(pd=>{ | ||
| 223 | - let pd_list=pd.data.data.pageData; | ||
| 224 | - if(res.data.code==0 && pd_list.length>0){ | ||
| 225 | - flag =pd_list.some(pd=>{ | ||
| 226 | - return pd.goods_id==item.goods_id | ||
| 227 | - }) | ||
| 228 | - } | ||
| 229 | - if (prom != null && prom.is_end==0 && prom.end_time>now && flag && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { | ||
| 230 | - item.prom_price = res.data.data.price; | ||
| 231 | - if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 232 | - var vNum=prom.virtual_num?prom.virtual_num:0; | ||
| 233 | - var vNum1=prom.virtualNum?prom.virtualNum:0; | ||
| 234 | - var vNum2=prom.virtual?prom.virtual:0; | ||
| 235 | - item.sales_sum=prom.buy_num+(vNum+vNum1+vNum2); | ||
| 236 | - }else{ | ||
| 237 | - item.prom_type=0; | ||
| 238 | - item.prom_id=0; | ||
| 239 | - item.prom_price=null; | ||
| 240 | - } | ||
| 241 | - }) | 218 | + |
| 219 | + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { | ||
| 220 | + item.prom_price = res.data.data.price; | ||
| 221 | + if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 222 | + var vNum=prom.virtual_num?prom.virtual_num:0; | ||
| 223 | + var vNum1=prom.virtualNum?prom.virtualNum:0; | ||
| 224 | + var vNum2=prom.virtual?prom.virtual:0; | ||
| 225 | + item.sales_sum=prom.buy_num+(vNum+vNum1+vNum2); | ||
| 226 | + }else{ | ||
| 227 | + item.prom_type=0; | ||
| 228 | + item.prom_id=0; | ||
| 229 | + item.prom_price=null; | ||
| 230 | + } | ||
| 231 | + | ||
| 232 | + | ||
| 242 | } | 233 | } |
| 243 | }) | 234 | }) |
| 244 | } | 235 | } |
| @@ -296,7 +287,6 @@ Page({ | @@ -296,7 +287,6 @@ Page({ | ||
| 296 | if(!val){ | 287 | if(!val){ |
| 297 | a.showWarning("请输入搜索关键词"); | 288 | a.showWarning("请输入搜索关键词"); |
| 298 | } | 289 | } |
| 299 | - | ||
| 300 | this.search(val); | 290 | this.search(val); |
| 301 | 291 | ||
| 302 | }, | 292 | }, |
pages/user/order_detail/order_detail.js
| @@ -1099,7 +1099,7 @@ Page({ | @@ -1099,7 +1099,7 @@ Page({ | ||
| 1099 | 1099 | ||
| 1100 | var url="/api/weshop/activitylist/getGoodActInfo"; | 1100 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 1101 | var req_data={ | 1101 | var req_data={ |
| 1102 | - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 | 1102 | + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id |
| 1103 | }; | 1103 | }; |
| 1104 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 1104 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 1105 | if(res.data.code==0){ | 1105 | if(res.data.code==0){ |
| @@ -1604,17 +1604,32 @@ Page({ | @@ -1604,17 +1604,32 @@ Page({ | ||
| 1604 | 1604 | ||
| 1605 | //跳转到商品 | 1605 | //跳转到商品 |
| 1606 | go_gd:function (e) { | 1606 | go_gd:function (e) { |
| 1607 | + | ||
| 1608 | + var user_id=getApp().globalData.user_id; | ||
| 1609 | + if(!user_id) user_id=0; | ||
| 1610 | + | ||
| 1607 | var gd= e.currentTarget.dataset.gd; | 1611 | var gd= e.currentTarget.dataset.gd; |
| 1608 | var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; | 1612 | var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; |
| 1609 | var url="/api/weshop/activitylist/getGoodActInfo"; | 1613 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 1610 | var req_data={ | 1614 | var req_data={ |
| 1611 | - store_id:os.stoid,goodsidlist:gd,is_detail:1 | 1615 | + store_id:os.stoid,goodsidlist:gd,is_detail:1,user_id:user_id |
| 1612 | }; | 1616 | }; |
| 1613 | //获取秒杀的多规格 | 1617 | //获取秒杀的多规格 |
| 1614 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 1618 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 1615 | if(res.data.code==0 && res.data.data){ | 1619 | if(res.data.code==0 && res.data.data){ |
| 1616 | if(res.data.data.length==1){ | 1620 | if(res.data.data.length==1){ |
| 1617 | - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; | 1621 | + var item=res.data.data[0]; |
| 1622 | + switch (item.prom_type){ | ||
| 1623 | + case 9: | ||
| 1624 | + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; | ||
| 1625 | + break; | ||
| 1626 | + case 8: | ||
| 1627 | + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id | ||
| 1628 | + break; | ||
| 1629 | + default: | ||
| 1630 | + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; | ||
| 1631 | + break | ||
| 1632 | + } | ||
| 1618 | } | 1633 | } |
| 1619 | getApp().goto(good_url); | 1634 | getApp().goto(good_url); |
| 1620 | 1635 |
pages/user/order_list/order_list.js
| @@ -1291,7 +1291,7 @@ Page({ | @@ -1291,7 +1291,7 @@ Page({ | ||
| 1291 | 1291 | ||
| 1292 | var url="/api/weshop/activitylist/getGoodActInfo"; | 1292 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 1293 | var req_data={ | 1293 | var req_data={ |
| 1294 | - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 | 1294 | + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id |
| 1295 | }; | 1295 | }; |
| 1296 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 1296 | await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 1297 | if(res.data.code==0){ | 1297 | if(res.data.code==0){ |