wxd / MShopWeApp

Commit 13198dc6766762defb923fcebd175ad7d67b4759

Authored by taiyuan
2 parents 80cda58a 3dac6833

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

Inline Side-by-side
Showing 3 changed files with 273 additions and 95 deletions
pages/cart/cart/cart.js
  View file @13198dc
... ... @@ -356,32 +356,79 @@ Page({
356 356  
357 357 //--判断优惠活动有没有过期--
358 358 else if (item.prom_type == 3) {
359   - var isok = 1;
360   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
361   - if (res.data.code == 0) {
362   - var r_data = res.data.data;
363   - if (!r_data.promGoodsLists) {
  359 + var isok = 1,is_g_prom=0;
  360 + //因为有全场优惠活动，商品参加的活动还未开始
  361 + var url="/api/weshop/activitylist/getGoodActInfo";
  362 + var req_data={
  363 + store_id:os.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id
  364 + };
  365 + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
  366 + if(res.data.code==0 && res.data.data && res.data.data.length){
  367 + for(let i in res.data.data){
  368 + let item=res.data.data[i];
  369 + if(item.prom_type==3) {
  370 + is_g_prom=1; break;
  371 + }
  372 + }
  373 + }
  374 + })
  375 +
  376 + if(is_g_prom){
  377 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
  378 + if (res.data.code == 0) {
  379 + var r_data = res.data.data;
  380 + if (!r_data.promGoodsLists) {
  381 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  382 + getApp().request.delete(url, {});
  383 + //商品已经无活动
  384 + isok = 0;
  385 + }else{
  386 + //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了
  387 + if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){
  388 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  389 + getApp().request.delete(url, {});
  390 + //商品已经下架
  391 + isok = 0;
  392 + }
  393 + }
  394 +
  395 + } else {
364 396 var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
365 397 getApp().request.delete(url, {});
366   - //商品已经无活动
  398 + //商品已经下架
367 399 isok = 0;
368   - }else{
369   - //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了
370   - if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){
371   - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
372   - getApp().request.delete(url, {});
373   - //商品已经下架
374   - isok = 0;
375   - }
376   - }
377   -
378   - } else {
379   - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
380   - getApp().request.delete(url, {});
381   - //商品已经下架
382   - isok = 0;
383   - }
384   - })
  400 + }
  401 + })
  402 +
  403 + }else{
  404 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + item.goods_id, {}).then(res => {
  405 + if (res.data.code == 0) {
  406 + var r_data = res.data.data;
  407 + if (!r_data.promGoodsLists) {
  408 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  409 + getApp().request.delete(url, {});
  410 + //商品已经无活动
  411 + isok = 0;
  412 + }else{
  413 + //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了
  414 + if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){
  415 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  416 + getApp().request.delete(url, {});
  417 + //商品已经下架
  418 + isok = 0;
  419 + }
  420 + }
  421 +
  422 + } else {
  423 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  424 + getApp().request.delete(url, {});
  425 + //商品已经下架
  426 + isok = 0;
  427 + }
  428 + })
  429 +
  430 + }
  431 +
385 432 if (!isok) continue;
386 433 }
387 434 else if (item.prom_type == 7) {
... ... @@ -1424,7 +1471,7 @@ Page({
1424 1471 //----------------------更新购物数量，加减,调用接口---------------------
1425 1472 postCardList: function(t, item, pitem) {
1426 1473 var e = this,th=e,user_id = getApp().globalData.user_id;
1427   - function normal_check() {
  1474 + function normal_check(store_count,goodsinfo,wareIds) {
1428 1475 //--- 看一下是不是线下库存 ---
1429 1476 if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){
1430 1477 th.check_down_line(t, pitem, item,wareIds);
... ... @@ -1444,10 +1491,6 @@ Page({
1444 1491 e.update_cart(t, pitem, item);
1445 1492 }
1446 1493 }
1447   -
1448   -
1449   -
1450   -
1451 1494  
1452 1495 // console.log('update');
1453 1496 // console.log('9995959595959',t);
... ... @@ -1579,7 +1622,7 @@ Page({
1579 1622 e.update_cart(t, pitem, item);
1580 1623  
1581 1624 }else{
1582   - normal_check();
  1625 + normal_check(store_count,goodsinfo,wareIds);
1583 1626 }
1584 1627 }
1585 1628 })
... ... @@ -1645,7 +1688,7 @@ Page({
1645 1688 if (t.goods_num + promgoodsbuynum > gr_data.buy_limit && gr_data.buy_limit > 0) {
1646 1689 wx.showModal({
1647 1690 title: '提示',
1648   - content: '购买数量超出秒杀限购'
  1691 + content: '购买数量超出团购限购'
1649 1692 });
1650 1693 var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
1651 1694 e.setData({
... ... @@ -1660,13 +1703,13 @@ Page({
1660 1703 e.update_cart(t, pitem, item);
1661 1704  
1662 1705 }else{
1663   - normal_check();
  1706 + normal_check(store_count,goodsinfo,wareIds);
1664 1707 }
1665 1708 })
1666 1709  
1667 1710 break;
1668 1711 default:
1669   - normal_check()
  1712 + normal_check(store_count,goodsinfo,wareIds);
1670 1713 break
1671 1714 }
1672 1715 }
... ... @@ -1797,8 +1840,6 @@ Page({
1797 1840 },
1798 1841  
1799 1842  
1800   -
1801   -
1802 1843 //-------下拉刷新---------
1803 1844 onPullDownRefresh: function(t) {
1804 1845 this.getCardList();
... ... @@ -1813,7 +1854,6 @@ Page({
1813 1854 title:"计算中"
1814 1855 })
1815 1856 }
1816   -
1817 1857 var garr=this.data.requestData;
1818 1858 var check_is_goods_selected=0;
1819 1859 if(garr) {
... ... @@ -1843,9 +1883,10 @@ Page({
1843 1883 for (var j = 0; j < i_arr.length; j++) {
1844 1884 if (i_arr[j].selected && i_arr[j].is_gift != 1) {
1845 1885  
1846   - if (i_arr[j].is_pd_normal) {
  1886 + if (i_arr[j].is_pd_normal || i_arr[j].prom_type==0 || i_arr[j].prom_type==3) {
1847 1887 normal_arr[i_arr[j].goods_id] = 1;
1848 1888 }
  1889 +
1849 1890 //map 的key是不会重复，会覆盖，，
1850 1891 var ie = {
1851 1892 goods_id: i_arr[j].goods_id,
... ... @@ -1950,6 +1991,7 @@ Page({
1950 1991  
1951 1992 var promgoodsbuynum = 0;
1952 1993 var goodsbuynum = 0;
  1994 +
1953 1995 //--要获得商品，该用户买了多少件,同步应用--
1954 1996 await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
1955 1997 data: {
... ... @@ -1999,7 +2041,6 @@ Page({
1999 2041 return false;
2000 2042 }
2001 2043 }
2002   -
2003 2044 if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) {
2004 2045 isok = 0;
2005 2046 gname = val.goods_name;
... ...
pages/user/order_detail/order_detail.js
  View file @13198dc
... ... @@ -370,7 +370,6 @@ Page({
370 370 th.toast(content);
371 371 return false;
372 372 }
373   -
374 373 //当是组合优惠的时候
375 374 if(good.prom_type==7){
376 375 //如果有组合购
... ... @@ -439,30 +438,72 @@ Page({
439 438  
440 439 //如果优惠促销和搭配购的时候
441 440 if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
442   - var p_ok=1;
443   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
444   - if(res.data.code==0){
445   - var r_data=res.data.data;
446   - if(!r_data.collocationPromList && good.prom_type==5){
447   -
448   - var content=good.goods_name+'未找到活动,请取消订单重新购买';
449   - th.toast(content);
450   - p_ok=0;
451   - }
452   - if(!r_data.promGoodsLists && good.prom_type==3){
453   -
454   - var content=good.goods_name+'未找到活动,请取消订单重新购买';
455   - th.toast(content);
456   - p_ok=0;
457   - }
458   - }else{
459   -
460   - var content=good.goods_name+'未找到活动,请取消订单重新购买';
461   - th.toast(content);
462   - p_ok=0;
463   - }
464   - })
465   - if(!p_ok) return false;
  441 + var p_ok = 1,is_g_prom=0;
  442 + //因为有全场优惠活动，商品参加的活动还未开始
  443 + var url="/api/weshop/activitylist/getGoodActInfo";
  444 + var req_data={
  445 + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id
  446 + };
  447 + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
  448 + if(res.data.code==0 && res.data.data && res.data.data.length){
  449 + for(let i in res.data.data){
  450 + let item=res.data.data[i];
  451 + if(item.prom_type==3) {
  452 + is_g_prom=1; break;
  453 + }
  454 + }
  455 + }
  456 + })
  457 + if(is_g_prom){
  458 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
  459 + if (res.data.code == 0) {
  460 + var r_data = res.data.data;
  461 + if (!r_data.collocationPromList && good.prom_type == 5) {
  462 +
  463 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  464 + th.toast(content)
  465 + p_ok = 0;
  466 + }
  467 + if (!r_data.promGoodsLists && good.prom_type == 3) {
  468 +
  469 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  470 + th.toast(content);
  471 + p_ok = 0;
  472 + }
  473 + } else {
  474 +
  475 + var content = good.goods_name + '未找到活动,请取消订单重新购买'
  476 + th.toast(content);
  477 + p_ok = 0;
  478 + }
  479 + })
  480 + }else{
  481 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
  482 + if (res.data.code == 0) {
  483 + var r_data = res.data.data;
  484 + if (!r_data.collocationPromList && good.prom_type == 5) {
  485 +
  486 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  487 + th.toast(content)
  488 +
  489 + p_ok = 0;
  490 + }
  491 + if (!r_data.promGoodsLists && good.prom_type == 3) {
  492 +
  493 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  494 + th.toast(content);
  495 + p_ok = 0;
  496 + }
  497 + } else {
  498 +
  499 + var content = good.goods_name + '未找到活动,请取消订单重新购买'
  500 + th.toast(content);
  501 + p_ok = 0;
  502 + }
  503 + })
  504 +
  505 + }
  506 + if (!p_ok) return false;
466 507 }
467 508  
468 509 //商品的普通购买 ，不要进行判断
... ... @@ -1074,15 +1115,43 @@ Page({
1074 1115  
1075 1116 //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
1076 1117 if(g_item.prom_type==3 || good.prom_type==3){
1077   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
1078   - if (res.data.code == 0) {
1079   - var r_data = res.data.data;
1080   - if (r_data.promGoodsLists) {
1081   - b_item.prom_type=3;
1082   - b_item.prom_id=r_data.promGoodsLists[0].prom_id;
1083   - }
1084   - }
1085   - })
  1118 + var is_g_prom=0;
  1119 + //因为有全场优惠活动，商品参加的活动还未开始
  1120 + var url="/api/weshop/activitylist/getGoodActInfo";
  1121 + var req_data={
  1122 + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id
  1123 + };
  1124 + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
  1125 + if(res.data.code==0 && res.data.data && res.data.data.length){
  1126 + for(let i in res.data.data){
  1127 + let item=res.data.data[i];
  1128 + if(item.prom_type==3) {
  1129 + is_g_prom=1; break;
  1130 + }
  1131 + }
  1132 + }
  1133 + })
  1134 + if(is_g_prom) {
  1135 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
  1136 + if (res.data.code == 0) {
  1137 + var r_data = res.data.data;
  1138 + if (r_data.promGoodsLists) {
  1139 + b_item.prom_type = 3;
  1140 + b_item.prom_id = r_data.promGoodsLists[0].prom_id;
  1141 + }
  1142 + }
  1143 + })
  1144 + }else{
  1145 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
  1146 + if (res.data.code == 0) {
  1147 + var r_data = res.data.data;
  1148 + if (r_data.promGoodsLists) {
  1149 + b_item.prom_type = 3;
  1150 + b_item.prom_id = r_data.promGoodsLists[0].prom_id;
  1151 + }
  1152 + }
  1153 + })
  1154 + }
1086 1155 }
1087 1156  
1088 1157  
... ...
pages/user/order_list/order_list.js
  View file @13198dc
... ... @@ -620,34 +620,73 @@ Page({
620 620 }
621 621 }
622 622  
623   -
624   -
625 623 //如果优惠促销和搭配购的时候
626 624 if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) {
627   - var p_ok = 1;
628   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
629   - if (res.data.code == 0) {
630   - var r_data = res.data.data;
631   - if (!r_data.collocationPromList && good.prom_type == 5) {
  625 + var p_ok = 1,is_g_prom=0;
  626 + //因为有全场优惠活动，商品参加的活动还未开始
  627 + var url="/api/weshop/activitylist/getGoodActInfo";
  628 + var req_data={
  629 + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id
  630 + };
  631 + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
  632 + if(res.data.code==0 && res.data.data && res.data.data.length){
  633 + for(let i in res.data.data){
  634 + let item=res.data.data[i];
  635 + if(item.prom_type==3) {
  636 + is_g_prom=1; break;
  637 + }
  638 + }
  639 + }
  640 + })
  641 + if(is_g_prom){
  642 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => {
  643 + if (res.data.code == 0) {
  644 + var r_data = res.data.data;
  645 + if (!r_data.collocationPromList && good.prom_type == 5) {
  646 +
  647 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  648 + th.toast(content)
  649 + p_ok = 0;
  650 + }
  651 + if (!r_data.promGoodsLists && good.prom_type == 3) {
632 652  
633   - var content = good.goods_name + '未找到活动,请取消订单重新购买';
634   - th.toast(content)
  653 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  654 + th.toast(content);
  655 + p_ok = 0;
  656 + }
  657 + } else {
635 658  
  659 + var content = good.goods_name + '未找到活动,请取消订单重新购买'
  660 + th.toast(content);
636 661 p_ok = 0;
637 662 }
638   - if (!r_data.promGoodsLists && good.prom_type == 3) {
  663 + })
  664 + }else{
  665 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
  666 + if (res.data.code == 0) {
  667 + var r_data = res.data.data;
  668 + if (!r_data.collocationPromList && good.prom_type == 5) {
  669 +
  670 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  671 + th.toast(content)
  672 +
  673 + p_ok = 0;
  674 + }
  675 + if (!r_data.promGoodsLists && good.prom_type == 3) {
639 676  
640   - var content = good.goods_name + '未找到活动,请取消订单重新购买';
  677 + var content = good.goods_name + '未找到活动,请取消订单重新购买';
  678 + th.toast(content);
  679 + p_ok = 0;
  680 + }
  681 + } else {
  682 +
  683 + var content = good.goods_name + '未找到活动,请取消订单重新购买'
641 684 th.toast(content);
642 685 p_ok = 0;
643 686 }
644   - } else {
  687 + })
645 688  
646   - var content = good.goods_name + '未找到活动,请取消订单重新购买'
647   - th.toast(content);
648   - p_ok = 0;
649   - }
650   - })
  689 + }
651 690 if (!p_ok) return false;
652 691 }
653 692  
... ... @@ -1244,15 +1283,44 @@ Page({
1244 1283  
1245 1284 //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
1246 1285 if(g_item.prom_type==3 || good.prom_type==3){
1247   - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
1248   - if (res.data.code == 0) {
1249   - var r_data = res.data.data;
1250   - if (r_data.promGoodsLists) {
1251   - b_item.prom_type=3;
1252   - b_item.prom_id=r_data.promGoodsLists[0].prom_id;
  1286 + var is_g_prom=0;
  1287 + //因为有全场优惠活动，商品参加的活动还未开始
  1288 + var url="/api/weshop/activitylist/getGoodActInfo";
  1289 + var req_data={
  1290 + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id
  1291 + };
  1292 + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
  1293 + if(res.data.code==0 && res.data.data && res.data.data.length){
  1294 + for(let i in res.data.data){
  1295 + let item=res.data.data[i];
  1296 + if(item.prom_type==3) {
  1297 + is_g_prom=1; break;
  1298 + }
  1299 + }
1253 1300 }
  1301 + })
  1302 + if(is_g_prom) {
  1303 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
  1304 + if (res.data.code == 0) {
  1305 + var r_data = res.data.data;
  1306 + if (r_data.promGoodsLists) {
  1307 + b_item.prom_type = 3;
  1308 + b_item.prom_id = r_data.promGoodsLists[0].prom_id;
  1309 + }
  1310 + }
  1311 + })
  1312 + }else{
  1313 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
  1314 + if (res.data.code == 0) {
  1315 + var r_data = res.data.data;
  1316 + if (r_data.promGoodsLists) {
  1317 + b_item.prom_type = 3;
  1318 + b_item.prom_id = r_data.promGoodsLists[0].prom_id;
  1319 + }
  1320 + }
  1321 + })
1254 1322 }
1255   - })
  1323 +
1256 1324 }
1257 1325  
1258 1326  
... ...