wxd / MShopWeApp

Commit 0c4eea0ec59e003bde79e3421fd998eea71d29db

Authored by taiyuan
2 parents 6f2bad0d 6040e203

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 10 changed files with 58 additions and 28 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @0c4eea0
... ... @@ -504,7 +504,7 @@ Component({
504 504 if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
505 505 var arr = res.data.data[0];
506 506 item.prom_price = arr.luck_goods_price;
507   - item.sales_sum=arr.buy_goodnum
  507 + item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
508 508 }
509 509 })
510 510 break;
... ... @@ -517,9 +517,12 @@ Component({
517 517 var prom =null;
518 518 if(res && res.data) prom=res.data.data;
519 519 if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
520   - item.prom_price = res.data.data.price;
521   - if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
522   - item.sales_sum=res.data.data.buy_num
  520 + item.prom_price = res.data.data.price;
  521 + if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
  522 + var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
  523 + var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
  524 + var vNum2=res.data.data.virtual?res.data.data.virtual:0;
  525 + item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
523 526 }else{
524 527 item.prom_type=0;
525 528 item.prom_id=0;
... ...
components/diy_store_select/diy_store_select.js
  View file @0c4eea0
... ... @@ -68,7 +68,8 @@ Component({
68 68 var th=this;
69 69 var dd = {
70 70 store_id: o.stoid,
71   - isstop: 0,
  71 + isstop: 0,
  72 + is_pos: 1,
72 73 pageSize: 1,
73 74 page:1,
74 75 };
... ... @@ -182,6 +183,7 @@ Component({
182 183 var dd = {
183 184 store_id: o.stoid,
184 185 isstop: 0,
  186 + is_pos: 1,
185 187 pageSize: 2000
186 188 }
187 189  
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @0c4eea0
... ... @@ -334,7 +334,7 @@ Page({
334 334 }else{
335 335 //要用接口是获取距离，js的计算不准
336 336 getApp().request.promiseGet("/api/weshop/pickup/list",{
337   - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
  337 + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1},
338 338 }).then(res=>{
339 339 if(res.data.code==0){
340 340 e=res.data.data.pageData[0];
... ... @@ -870,6 +870,7 @@ Page({
870 870 var dd= {
871 871 store_id: o.stoid,
872 872 isstop: 0,
  873 + is_pos: 1,
873 874 pageSize: 2000
874 875 }
875 876 //如果有距离的话
... ...
packageA/pages/prom_list/prom_list.js
  View file @0c4eea0
... ... @@ -118,7 +118,7 @@ Page({
118 118 }else{
119 119 //要用接口是获取距离，js的计算不准
120 120 getApp().request.promiseGet("/api/weshop/pickup/list",{
121   - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
  121 + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
122 122 }).then(res=>{
123 123 if(res.data.code==0 && res.data.data && res.data.data.pageData){
124 124 e=res.data.data.pageData[0];
... ... @@ -747,7 +747,8 @@ Page({
747 747 dd = {
748 748 store_id: o.stoid,
749 749 distr_type: g_distr_type,
750   - isstop: 0,
  750 + isstop: 0,
  751 + is_pos: 1,
751 752 pageSize: 2000
752 753 }
753 754 } else {
... ...
packageB/pages/zuhegou/index/index.js
  View file @0c4eea0
... ... @@ -274,6 +274,7 @@ Page({
274 274 data: {
275 275 store_id: os.stoid,
276 276 pickup_id: e.pickup_id,
  277 + is_pos: 1,
277 278 lat: th.data.lat,
278 279 lon: th.data.lon
279 280 },
... ... @@ -1212,12 +1213,14 @@ Page({
1212 1213 store_id: os.stoid,
1213 1214 distr_type: g_distr_type,
1214 1215 isstop: 0,
  1216 + is_pos: 1,
1215 1217 pageSize: 2000
1216 1218 }
1217 1219 } else {
1218 1220 dd = {
1219 1221 store_id: os.stoid,
1220 1222 isstop: 0,
  1223 + is_pos: 1,
1221 1224 pageSize: 2000
1222 1225 }
1223 1226 }
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @0c4eea0
... ... @@ -505,7 +505,7 @@ Page({
505 505 } else {
506 506 //要用接口是获取距离，js的计算不准
507 507 getApp().request.promiseGet("/api/weshop/pickup/list", {
508   - data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon },
  508 + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
509 509 }).then(res => {
510 510 if (res.data.code == 0) {
511 511 e = res.data.data.pageData[0];
... ... @@ -2634,12 +2634,14 @@ Page({
2634 2634 store_id: o.stoid,
2635 2635 distr_type: g_distr_type,
2636 2636 isstop: 0,
  2637 + is_pos: 1,
2637 2638 pageSize: 2000
2638 2639 }
2639 2640 } else {
2640 2641 dd = {
2641 2642 store_id: o.stoid,
2642 2643 isstop: 0,
  2644 + is_pos: 1,
2643 2645 pageSize: 2000
2644 2646 }
2645 2647 }
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @0c4eea0
... ... @@ -696,6 +696,7 @@ Page({
696 696 data: {
697 697 store_id: os.stoid,
698 698 pickup_id: e.pickup_id,
  699 + is_pos: 1,
699 700 lat: th.data.lat,
700 701 lon: th.data.lon
701 702 },
... ... @@ -1784,12 +1785,14 @@ Page({
1784 1785 store_id: o.stoid,
1785 1786 distr_type: g_distr_type,
1786 1787 isstop: 0,
  1788 + is_pos: 1,
1787 1789 pageSize: 2000
1788 1790 }
1789 1791 } else {
1790 1792 dd = {
1791 1793 store_id: o.stoid,
1792 1794 isstop: 0,
  1795 + is_pos: 1,
1793 1796 pageSize: 2000
1794 1797 }
1795 1798 }
... ...
pages/cart/cart2/cart2.js
  View file @0c4eea0
... ... @@ -1022,9 +1022,13 @@ Page({
1022 1022 t.data.data.prom_type = 0;
1023 1023 }
1024 1024  
1025   - th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
1026   - th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
1027   - th.data.check_quan_ware_list = t.data.data.erpwareid + "";
  1025 + if(tt.data.data.isQuan){
  1026 + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
  1027 + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
  1028 + th.data.check_quan_ware_list = t.data.data.erpwareid + "";
  1029 + }else{
  1030 + gd.is_xz_yh=1;
  1031 + }
1028 1032  
1029 1033 th.setData({
1030 1034 bn_goods: gd,
... ... @@ -1420,7 +1424,7 @@ Page({
1420 1424 }
1421 1425  
1422 1426 //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额--
1423   - if (cart_item.exp_type == 0 && th.data.user_addr != null) {
  1427 + if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) {
1424 1428 //看是不是有调用过包邮券
1425 1429 if (!th.data.isget_by_quan[pickid]) {
1426 1430 //--判断要不要显示包邮券,调用接口，因为有for循环---
... ... @@ -1428,7 +1432,8 @@ Page({
1428 1432 data: {
1429 1433 store_id: os.stoid,
1430 1434 isuse: 0,
1431   - condition: q_conditin,
  1435 + //condition: q_conditin,
  1436 + condition:cart_item.ckeck_quan_price,
1432 1437 user_id: getApp().globalData.user_id,
1433 1438 pageSize: 2000
1434 1439 }
... ... @@ -1453,10 +1458,10 @@ Page({
1453 1458 }
1454 1459 if (arr) {
1455 1460 th.data.get_by_quan_list_cart[pickid] = arr;
1456   - //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
1457   - if (th.data.is_b_now) {
1458   - th.setData({get_by_quan_list: arr});
1459   - }
  1461 + th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
  1462 + //if (th.data.is_b_now) {
  1463 + // th.setData({get_by_quan_list: arr});
  1464 + //}
1460 1465 }
1461 1466 th.data.isget_by_quan[pickid] = 1;
1462 1467 }
... ... @@ -3428,6 +3433,19 @@ Page({
3428 3433 if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) {
3429 3434 continue;
3430 3435 }
  3436 +
  3437 + //--如果是团购，要判断有没有限制使用优惠券
  3438 + if(gd.prom_type == 2){
  3439 + var prom1=null;
  3440 + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, {
  3441 + }).then(res => {
  3442 + if (res.data.code == 0) prom1 = res.data.data;
  3443 + })
  3444 + if(!prom1.isQuan){
  3445 + continue;
  3446 + }
  3447 + }
  3448 +
3431 3449 //如果有限制使用优惠券，就要返回
3432 3450 if (gd.prom_type == 3) {
3433 3451 if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
... ... @@ -3466,6 +3484,7 @@ Page({
3466 3484 arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price;
3467 3485 arr[ind].check_quan_ware_list = check_quan_ware_list;
3468 3486 arr[ind].check_quan_price_list = check_quan_price_list;
  3487 + arr[ind].is_xz_yh = is_xz_yh;
3469 3488  
3470 3489 //是否关闭使用优惠券
3471 3490 if (th.data.is_close_quan != 1 && !is_xz_yh) {
... ... @@ -3475,7 +3494,7 @@ Page({
3475 3494 data: {
3476 3495 storeId: oo.stoid,
3477 3496 userId: app.globalData.user_id,
3478   - BuySum: ckeck_quan_price,
  3497 + BuySum: arr[ind].ckeck_quan_price,
3479 3498 WareIds: check_quan_ware_list,
3480 3499 pageSize: 100
3481 3500 }
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @0c4eea0
... ... @@ -2252,16 +2252,10 @@ Page({
2252 2252 if (res.data.code == 0) prom = res.data.data;
2253 2253 })
2254 2254 break
2255   -
2256 2255 case 8:
2257 2256 continue;
2258   -
2259   - case 8:
2260   - continue;
2261   -
2262 2257 }
2263 2258  
2264   -
2265 2259 }
2266 2260 //---如果有活动，不算在一起---
2267 2261 if (prom) {
... ...
pages/team/team_show/team_show.js
  View file @0c4eea0
... ... @@ -605,7 +605,7 @@ Page({
605 605 }else{
606 606 //要用接口是获取距离，js的计算不准
607 607 getApp().request.promiseGet("/api/weshop/pickup/list",{
608   - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
  608 + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
609 609 }).then(res=>{
610 610 if(res.data.code==0){
611 611 e=res.data.data.pageData[0];
... ... @@ -1095,13 +1095,15 @@ Page({
1095 1095 dd = {
1096 1096 store_id: o.stoid,
1097 1097 distr_type: g_distr_type,
1098   - isstop: 0,
  1098 + isstop: 0,
  1099 + is_pos: 1,
1099 1100 pageSize: 2000
1100 1101 }
1101 1102 } else {
1102 1103 dd = {
1103 1104 store_id: o.stoid,
1104   - isstop: 0,
  1105 + isstop: 0,
  1106 + is_pos: 1,
1105 1107 pageSize: 2000
1106 1108 }
1107 1109 }
... ...