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

taiyuan
2 parents 6f2bad0d 6040e203
Showing 10 changed files with 58 additions and 28 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_store_select/diy_store_select.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/prom_list/prom_list.js
packageB/pages/zuhegou/index/index.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_show/team_show.js
@@ -504,7 +504,7 @@ Component({
                         if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
                             var arr = res.data.data[0];
                             item.prom_price = arr.luck_goods_price;
-                            item.sales_sum=arr.buy_goodnum
+                            item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
                         }
                     })
                     break;
@@ -517,9 +517,12 @@ Component({
 			    var prom =null;
 			    if(res && res.data) prom=res.data.data;
 			    if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
-			       item.prom_price = res.data.data.price;
-			       if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
-                    item.sales_sum=res.data.data.buy_num
+			        item.prom_price = res.data.data.price;
+			        if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
+			        var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
+			        var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
+			        var vNum2=res.data.data.virtual?res.data.data.virtual:0;
+                    item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
 			    }else{
 			    	item.prom_type=0;
 			    	item.prom_id=0;
@@ -68,7 +68,8 @@ Component({
 	    var th=this;
 	    var dd = {
 	      store_id: o.stoid,
-	      isstop: 0,
+				isstop: 0,
+				is_pos: 1,
 	      pageSize: 1,
 	 		  page:1,
 	    };
@@ -182,6 +183,7 @@ Component({
 		 var dd = {
 			 store_id: o.stoid,
 			 isstop: 0,
+			 is_pos: 1,
 			 pageSize: 2000
 		   }
@@ -334,7 +334,7 @@ Page({
             }else{
               //要用接口是获取距离，js的计算不准
               getApp().request.promiseGet("/api/weshop/pickup/list",{
-                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1},
               }).then(res=>{
                 if(res.data.code==0){
                   e=res.data.data.pageData[0];
@@ -870,6 +870,7 @@ Page({
       var dd= {
           store_id: o.stoid,
           isstop: 0,
+          is_pos: 1,
           pageSize: 2000
       }  
       //如果有距离的话
@@ -118,7 +118,7 @@ Page({
 				  }else{
 					  //要用接口是获取距离，js的计算不准
 					  getApp().request.promiseGet("/api/weshop/pickup/list",{
-						  data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+						  data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
 					  }).then(res=>{
 						  if(res.data.code==0 && res.data.data && res.data.data.pageData){
 							  e=res.data.data.pageData[0];
@@ -747,7 +747,8 @@ Page({
         dd = {
           store_id: o.stoid,
           distr_type: g_distr_type,
-          isstop: 0,
+					isstop: 0,
+					is_pos: 1,
           pageSize: 2000
         }
       } else {
@@ -274,6 +274,7 @@ Page({
                                     data: {
                                         store_id: os.stoid,
                                         pickup_id: e.pickup_id,
+                                        is_pos: 1,
                                         lat: th.data.lat,
                                         lon: th.data.lon
                                     },
@@ -1212,12 +1213,14 @@ Page({
                     store_id: os.stoid,
                     distr_type: g_distr_type,
                     isstop: 0,
+                    is_pos: 1,
                     pageSize: 2000
                 }
             } else {
                 dd = {
                     store_id: os.stoid,
                     isstop: 0,
+                    is_pos: 1,
                     pageSize: 2000
                 }
             }
@@ -505,7 +505,7 @@ Page({
             } else {
               //要用接口是获取距离，js的计算不准
               getApp().request.promiseGet("/api/weshop/pickup/list", {
-                data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon },
+                data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
               }).then(res => {
                 if (res.data.code == 0) {
                   e = res.data.data.pageData[0];
@@ -2634,12 +2634,14 @@ Page({
           store_id: o.stoid,
           distr_type: g_distr_type,
           isstop: 0,
+          is_pos: 1,
           pageSize: 2000
         }
       } else {
         dd = {
           store_id: o.stoid,
           isstop: 0,
+          is_pos: 1,
           pageSize: 2000
         }
       }
@@ -696,6 +696,7 @@ Page({
                       data: {
                         store_id: os.stoid,
                         pickup_id: e.pickup_id,
+                        is_pos: 1,
                         lat: th.data.lat,
                         lon: th.data.lon
                       },
@@ -1784,12 +1785,14 @@ Page({
           store_id: o.stoid,
           distr_type: g_distr_type,
           isstop: 0,
+          is_pos: 1,
           pageSize: 2000
         }
       } else {
         dd = {
           store_id: o.stoid,
           isstop: 0,
+          is_pos: 1,
           pageSize: 2000
         }
       }
@@ -1022,9 +1022,13 @@ Page({
                                         t.data.data.prom_type = 0;
                                     }
-                                    th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
-                                    th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
-                                    th.data.check_quan_ware_list = t.data.data.erpwareid + "";
+                                    if(tt.data.data.isQuan){
+                                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
+                                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
+                                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
+                                    }else{
+                                        gd.is_xz_yh=1;
+                                    }
                                     th.setData({
                                         bn_goods: gd,
@@ -1420,7 +1424,7 @@ Page({
                     }
                     //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额--
-                    if (cart_item.exp_type == 0 && th.data.user_addr != null) {
+                    if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) {
                         //看是不是有调用过包邮券
                         if (!th.data.isget_by_quan[pickid]) {
                             //--判断要不要显示包邮券,调用接口，因为有for循环---
@@ -1428,7 +1432,8 @@ Page({
                                 data: {
                                     store_id: os.stoid,
                                     isuse: 0,
-                                    condition: q_conditin,
+                                    //condition: q_conditin,
+                                    condition:cart_item.ckeck_quan_price,
                                     user_id: getApp().globalData.user_id,
                                     pageSize: 2000
                                 }
@@ -1453,10 +1458,10 @@ Page({
                                     }
                                     if (arr) {
                                         th.data.get_by_quan_list_cart[pickid] = arr;
-                                        //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
-                                        if (th.data.is_b_now) {
-                                            th.setData({get_by_quan_list: arr});
-                                        }
+                                        th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
+                                        //if (th.data.is_b_now) {
+                                        //    th.setData({get_by_quan_list: arr});
+                                        //}
                                     }
                                     th.data.isget_by_quan[pickid] = 1;
                                 }
@@ -3428,6 +3433,19 @@ Page({
                 if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) {
                     continue;
                 }
+
+                //--如果是团购，要判断有没有限制使用优惠券
+                if(gd.prom_type == 2){
+                    var prom1=null;
+                    await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, {
+                    }).then(res => {
+                        if (res.data.code == 0) prom1 = res.data.data;
+                    })
+                    if(!prom1.isQuan){
+                        continue;
+                    }
+                }
+
                 //如果有限制使用优惠券，就要返回
                 if (gd.prom_type == 3) {
                     if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
@@ -3466,6 +3484,7 @@ Page({
             arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price;
             arr[ind].check_quan_ware_list = check_quan_ware_list;
             arr[ind].check_quan_price_list = check_quan_price_list;
+            arr[ind].is_xz_yh = is_xz_yh;
             //是否关闭使用优惠券
             if (th.data.is_close_quan != 1 && !is_xz_yh) {
@@ -3475,7 +3494,7 @@ Page({
                     data: {
                         storeId: oo.stoid,
                         userId: app.globalData.user_id,
-                        BuySum: ckeck_quan_price,
+                        BuySum: arr[ind].ckeck_quan_price,
                         WareIds: check_quan_ware_list,
                         pageSize: 100
                     }
@@ -2252,16 +2252,10 @@ Page({
               if (res.data.code == 0) prom = res.data.data;
             })
             break
-			
 	       case 8:		
 		     continue;
-
-          case 8:
-             continue;
-
         }
-
       }
       //---如果有活动，不算在一起---
       if (prom) {
@@ -605,7 +605,7 @@ Page({
             }else{
               //要用接口是获取距离，js的计算不准
               getApp().request.promiseGet("/api/weshop/pickup/list",{
-                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1},
               }).then(res=>{
                 if(res.data.code==0){
                   e=res.data.data.pageData[0];
@@ -1095,13 +1095,15 @@ Page({
 	      dd = {
 	        store_id: o.stoid,
 	        distr_type: g_distr_type,
-	        isstop: 0,
+          isstop: 0,
+          is_pos: 1,
 	        pageSize: 2000
 	      }
 	    } else {
 	      dd = {
 	        store_id: o.stoid,
-	        isstop: 0,
+          isstop: 0,
+          is_pos: 1,
 	        pageSize: 2000
 	      }
 	    }