Merge branch 'dev' into 'test'

Dev See merge request !419

Merge branch 'dev' into 'test'
Dev See merge request !419
后端研发-苏明海
2 parents 0d6dda24 00c38f4a
Showing 26 changed files with 122 additions and 71 deletions
app.json
images/bar/car.png → packageA/images/bar/car.png
images/bar/car_on.png → packageA/images/bar/car_on.png
images/bar/fl.png → packageA/images/bar/fl.png
images/bar/fl_on.png → packageA/images/bar/fl_on.png
images/bar/fx.png → packageA/images/bar/fx.png
images/bar/fx_on.png → packageA/images/bar/fx_on.png
images/bar/index.png → packageA/images/bar/index.png
images/bar/index_on.png → packageA/images/bar/index_on.png
images/bar/user.png → packageA/images/bar/user.png
images/bar/user_on.png → packageA/images/bar/user_on.png
images/share/ct_num.png → packageA/images/share/ct_num.png
images/share/default_g_img.gif → packageA/images/share/default_g_img.gif
images/share/hui_hear_pic.png → packageA/images/share/hui_hear_pic.png
images/share/mackground.png → packageA/images/share/mackground.png
images/share/miao_share.png → packageA/images/share/miao_share.png
images/share/q_tj.png → packageA/images/share/q_tj.png
images/share/s_gou.png → packageA/images/share/s_gou.png
images/share/share_bg.png → packageA/images/share/share_bg.png
pages/cart/cart/cart.js
@@ -83,8 +83,7 @@
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance",
     "pages/video/index",
-    "pages/template/index",
-    "pages/store/index"
+    "pages/template/index"   
   ],
@@ -92,6 +91,7 @@
       "root": "packageA/",
       "name":"pack1",
       "pages": [
+        "pages/store/index",
          "pages/prom_list/prom_list",
          "pages/quan_list/quan_list",
          "pages/quan_pro/quan_pro"
@@ -120,26 +120,26 @@
       {
         "pagePath": "pages/index/index/index",
         "text": "首页",
-        "iconPath": "images/bar/index.png",
-        "selectedIconPath": "images/bar/index_on.png"
+        "iconPath": "packageA/images/bar/index.png",
+        "selectedIconPath": "packageA/images/bar/index_on.png"
       },
       {
         "pagePath": "pages/goods/categoryList/categoryList",
         "text": "分类",
-        "iconPath": "images/bar/fl.png",
-        "selectedIconPath": "images/bar/fl_on.png"
+        "iconPath": "packageA/images/bar/fl.png",
+        "selectedIconPath": "packageA/images/bar/fl_on.png"
       },
       {
         "pagePath": "pages/cart/cart/cart",
         "text": "购物车",
-        "iconPath": "images/bar/car.png",
-        "selectedIconPath": "images/bar/car_on.png"
+        "iconPath": "packageA/images/bar/car.png",
+        "selectedIconPath": "packageA/images/bar/car_on.png"
       },
       {
         "pagePath": "pages/user/index/index",
         "text": "我的",
-        "iconPath": "images/bar/user.png",
-        "selectedIconPath": "images/bar/user_on.png"
+        "iconPath": "packageA/images/bar/user.png",
+        "selectedIconPath": "packageA/images/bar/user_on.png"
       }
     ]
   },
@@ -1129,7 +1129,14 @@ Page({
                      map.set(item.prom_id+"",ob);
                  }
            }
+
+           if(item.is_gift==1){
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+              getApp().request.delete(url, {});
+              list.goods.splice(i,1);
+           }
         }
+
         var map2=new Map();
         //请那些是赠品，但是优惠活动并没有被选中的商品要删除，同时满足条件的要放到map2，
         for(var i in list.goods){
@@ -1229,17 +1236,9 @@ Page({
                 }
               }
             }
-            else{
-              //---条件不到，删除相应的赠品---
-              for(var gi in list.goods){
-                var item=list.goods[gi];
-                if(item.is_gift==1 && item.prom_id==discount.prom_id){
-                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                     getApp().request.delete(url, {});
-                     list.goods.splice(gi,1);
-                }
-              }
-            }
+
+
+
             //-- 获取 --
             await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{
                data:{prom_id:prom.id}
@@ -311,12 +311,12 @@
             <!-- 优惠活动优惠金额 -->
             <view class="item" wx:if="{{formData.cut_price>0}}">
                <view>优惠活动</view>
-               <view class="co-red">- ￥ {{formData.cut_price}}元</view>
+               <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
             </view>
             <!-- 订单优惠优惠金额 -->
             <view class="item" wx:if="{{formData.order_prom_amount>0}}">
                  <view>订单优惠</view>
-                 <view class="co-red">- ￥ {{formData.order_prom_amount}}元</view>
+                 <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
              </view>
             <view class="item" wx:if="{{formData.user_money>0}}">
                 <view>使用余额</view>
@@ -346,7 +346,7 @@ margin:auto;
 }
 .xc-frame{
     width: 100%;
-    height:68.9%;
+    height:60%;
 }
 .xc-frame .list-frame{
@@ -480,11 +480,7 @@ padding-left: 40rpx;
   margin-top: 30rpx;
 }
-.cx-popup.radius{
-  
-height: 650rpx;
-}
 .xc-hook {
 width: 33rpx;
 height: 33rpx;
@@ -929,6 +929,11 @@ Page({
         sku: o.sku,
       };
+      //如果是积分够，is_integral_normal就要有积分购普通购买字段
+      if(o.prom_type==4){
+        newd.is_integral_normal=1;
+      }
+
       //-----如果是秒杀，团购，积分购,拼团-----
       if (th.data.prom_type == 1) {
         newd.goods_price = th.data.prom_price;
@@ -289,7 +289,7 @@ Page({
 		for(var i in order_goods){
 			var good=order_goods[i];
 			//如果不是小程序有的功能，直接提示要去3.0处理
-			if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+			if(good.prom_type==2  || good.prom_type==4){
 				wx.showModal({
 				  title: '提示',
 				  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -330,8 +330,8 @@ Page({
 			  });
 			  return false;
 			}
-			
-			  if(good.prom_type==1 || good.prom_type==6){
+
+            if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
 				   if(gg.prom_type!=good.prom_type)	{
 					   wx.showModal({
 					     title: '提示',
@@ -339,6 +339,32 @@ Page({
 					   });
 					   return false;		   
 				   }
+                if(good.prom_type==3  || good.prom_type==5){
+                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+                    }).then(res=>{
+                        if(res.data.code==0){
+                            var r_data=res.data.data;
+                            if(!r_data.collocationPromList && good.prom_type==5){
+                                wx.showModal({
+                                    title: '提示',
+                                    content: good.goods_name+'未找到活动'
+                                });
+                            }
+                            if(!r_data.promGoodsLists && good.prom_type==3){
+                                wx.showModal({
+                                    title: '提示',
+                                    content: good.goods_name+'未找到活动'
+                                });
+                            }
+                        }else{
+                            wx.showModal({
+                                title: '提示',
+                                content: good.goods_name+'未找到活动'
+                            });
+                            return false;
+                        }
+                    })
+                }
 			  }else{
@@ -374,24 +400,25 @@ Page({
 						  }
 					  } 				  
 				  }
-				  
-				  			  
-				  var isok=1;
-				  var card_field=th.data.card_field;
-				  //如果会员是等级会员,商品有等级价,且不是活动商品
-				  if(card_field && gg[card_field]>0){
-					 if (good.goods_price != gg[card_field])  isok = 0;
-				  }else{
-					 if (good.goods_price != gg.shop_price)  isok = 0;
-						
-				  }	
-				  if(!isok){
-					  wx.showModal({
-					    title: '提示',
-					    content: gg.goods_name+'商品的价格发生了变化'
-					  });
-					  return false;		
-				  }		
+
+                if(!good.is_gift && !good.is_collocation) {
+                    var isok = 1;
+                    var card_field = th.data.card_field;
+                    //如果会员是等级会员,商品有等级价,且不是活动商品
+                    if (card_field && gg[card_field] > 0) {
+                        if (good.goods_price != gg[card_field]) isok = 0;
+                    } else {
+                        if (good.goods_price != gg.shop_price) isok = 0;
+
+                    }
+                    if (!isok) {
+                        wx.showModal({
+                            title: '提示',
+                            content: gg.goods_name + '商品的价格发生了变化'
+                        });
+                        return false;
+                    }
+                }
 				  //--如果是线下库存的时候--		
 				  if(th.data.conf.sales_rules==2){
@@ -380,7 +380,7 @@ Page({
 	for(var i in order_goods){		
 		var good=order_goods[i];
 		//如果不是小程序有的功能，直接提示要去3.0处理
-		if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+		if(good.prom_type==2  || good.prom_type==4 ){
 			wx.showModal({
 			  title: '提示',
 			  content: '小程序还未有该活动，请到3.0公众号支付'
@@ -422,10 +422,7 @@ Page({
 		  return false;
 		}
-		
-		 console.log("-----------------111-------------------");
-		
-		  if(good.prom_type==1 || good.prom_type==6){
+		  if((good.prom_type==1 || good.prom_type==6  || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
 			   if(gg.prom_type!=good.prom_type)	{
 				   wx.showModal({
 				     title: '提示',
@@ -433,9 +430,34 @@ Page({
 				   });
 				   return false;		   
 			   }
-			
+			   if(good.prom_type==3  || good.prom_type==5){
+                   await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+                   }).then(res=>{
+                       if(res.data.code==0){
+                               var r_data=res.data.data;
+                               if(!r_data.collocationPromList && good.prom_type==5){
+                                   wx.showModal({
+                                       title: '提示',
+                                       content: good.goods_name+'未找到活动'
+                                   });
+                               }
+                               if(!r_data.promGoodsLists && good.prom_type==3){
+                                   wx.showModal({
+                                       title: '提示',
+                                       content: good.goods_name+'未找到活动'
+                                   });
+                               }
+                       }else{
+                           wx.showModal({
+                               title: '提示',
+                               content: good.goods_name+'未找到活动'
+                           });
+                           return false;
+                       }
+                   })
+               }
+
 		  }else{
-			  
 			  if(gg.prom_type==1 || gg.prom_type==6){
 				  var prom=null;
 				  //---如果是活动的时候---
@@ -468,24 +490,25 @@ Page({
 					  }
 				  } 				  
 			  }
-			  
-			  			  
+			  //赠品和搭配购不判断商品金额
 			  var isok=1;
 			  var card_field=th.data.card_field;
 			  //如果会员是等级会员,商品有等级价,且不是活动商品
-			  if(card_field && gg[card_field]>0){
-				 if (good.goods_price != gg[card_field])  isok = 0;
-			  }else{
-				 if (good.goods_price != gg.shop_price)  isok = 0;
-					
-			  }	
-			  if(!isok){
-				  wx.showModal({
-				    title: '提示',
-				    content: gg.goods_name+'商品的价格发生了变化'
-				  });
-				  return false;		
-			  }		
+              if(!good.is_gift && !good.is_collocation) {
+                  if (card_field && gg[card_field] > 0) {
+                      if (good.goods_price != gg[card_field]) isok = 0;
+                  } else {
+                      if (good.goods_price != gg.shop_price) isok = 0;
+
+                  }
+                  if (!isok) {
+                      wx.showModal({
+                          title: '提示',
+                          content: gg.goods_name + '商品的价格发生了变化'
+                      });
+                      return false;
+                  }
+              }
 			  //--如果是线下库存的时候--		
 			  if(th.data.conf.sales_rules==2){
 var filters = {
         toFix:function(val,count){
+            val=parseFloat(val);
             return val.toFixed(count)
         },
         replace_time:function(val){