Merge refs/remotes/origin/dev into refs/heads/dev

泉州测试
2 parents c740cde2 773836e4
Showing 9 changed files with 250 additions and 36 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/cart/cart2/ladder_calculate.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.js
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
@@ -356,7 +356,6 @@ Page({
                                 })
                             }
                         }
-
                         //--判断优惠活动有没有过期,--
                         else if (item.prom_type == 3) {
                             var isok = 1,is_g_prom=0;
@@ -436,8 +435,6 @@ Page({
                             if (!isok) continue;
-
-
                         }
                         else if (item.prom_type == 7) {
                             if(!th.data.zuhe_map[item.prom_id]){
@@ -599,9 +596,79 @@ Page({
                                         });
                                         item.prom_type=3;
                                         item.prom_id=r_data.promGoodsLists[0].prom_id;
+                                    }else if(r_data.ladderLists){
+                                        var url = '/api/weshop/cart/update';
+                                        getApp().request.put(url, {
+                                            data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:r_data.ladderLists[0].form_id}
+                                        });
+                                        item.prom_type=10;
+                                        item.prom_id=r_data.ladderLists[0].form_id;
+
                                     }
                                 }
                             })
+
+                            //如果是阶梯购的时候
+                            if(item.prom_type==10){
+                                if(!th.data.ladder_map[item.prom_id]){
+                                    //如果有阶梯购，要判断身份
+                                    var isok = 1;
+                                    var is_flag=1;
+                                    var act=null;
+                                    var url="/api/weshop/prom/ladderForm/getNew/"+os.stoid+"/"+user_id+"/"+item.prom_id;
+                                    await getApp().request.promiseGet(url, {}).then(res => {
+                                        console.log(res,1000);
+                                        if(res.data.code==0 && res.data.data){
+                                            if(res.data.data.isuse!=1){
+                                                isok=0;
+                                            }
+                                            //如果活动已经结束
+                                            if(res.data.data.is_end==1){
+                                                isok=0;
+                                            }
+                                            //已经结束
+                                            if(ut.gettimestamp()>res.data.data.end_time){
+                                                isok=0;
+                                            }
+                                            //还未开始
+                                            if(ut.gettimestamp()<res.data.data.start_time){
+                                                isok=0;
+                                            }
+                                            act=res.data.data;
+
+                                        }else{
+                                            //未找到商品的活动
+                                            isok = 0;
+                                        }
+                                    })
+                                    if (!isok){
+                                        item.prom_type=0;
+                                        item.prom_id=0;
+                                        continue;
+
+                                    }
+                                    th.data.ladder_map[item.prom_id]=act;
+                                    //-- 获取阶梯规则 --
+                                    var url1 = "/api/weshop/prom/ladderList/list";
+                                    var req_data = {
+                                        store_id: os.stoid,
+                                        form_id: item.prom_id,
+                                    }
+                                    await getApp().request.promiseGet(url1, {
+                                        data: req_data
+                                    }).then(rs1 => {
+                                        if (rs1.data.code==0 && rs1.data.data) {
+                                            var gdlist = rs1.data.data;
+                                            th.data.ladder_map[item.prom_id].ladder_list=gdlist;
+                                        }
+                                    })
+                                }
+                                //直接把活动赋值给元素
+                                if(th.data.ladder_map[item.prom_id] && th.data.ladder_map[item.prom_id]!=-1 ){
+                                    item.act=th.data.ladder_map[item.prom_id];
+                                }
+                            }
+
                         }
                         all_num += item.goods_num;
@@ -1442,8 +1509,7 @@ Page({
         if(car && car.length>0){
             th.data.in_zhact_gdmap={};
             for (var a = 0; a < car.length; a++) {
-                var item = car[a].goods,
-                    is_s_sele = 1;
+                var item = car[a].goods,is_s_sele = 1;
                 var offline_price=0;
                 var offline_num=0;
                 for (var c = 0; c < item.length; c++) {
@@ -631,6 +631,7 @@ Page({
                                 }
                                 arr[j].exp_type = e_t;
                                 if (e_t == 0) th.setData({is_all_zt: 0});
+                                else if(e_t==1) th.setData({is_all_zt: 1});
                                 //}
                                 //-- 把等级卡会优惠多少钱装进去 --
@@ -2543,6 +2544,15 @@ Page({
                 //房间号的ids
                 var room_ids = "";
+
+                 //-- 把券的钱，写入从表 ---
+                 if (t_item.quan_youhui_list && t_item.coupon_price) {
+                    for (var kk in t_item.quan_youhui_list) {
+                        var you_item = t_item.quan_youhui_list[kk];
+                        //-- 对券的价格进行平摊 --
+                        await th.split_set_goods_quanprice(you_item,t_item);
+                    }
+                }
                 //-------------让商品添加到商品列表--------------------
                 for (var k = 0; k < t_item.goods.length; k++) {
                     var g_item = t_item.goods[k];
@@ -2566,17 +2576,6 @@ Page({
                         goods.pricing_type = g_item.pricing_type;
                     }
-                    //--把券的钱，写入从表---
-                    if (t_item.quan_youhui_list && t_item.coupon_price) {
-                        for (var kk in t_item.quan_youhui_list) {
-                            var you_item = t_item.quan_youhui_list[kk];
-                            if (g_item.prom_type!=7 && g_item.erpwareid == you_item.WareId) {
-                                goods.quan_num = you_item.WareCashSum;
-                                goods.quan_no = you_item.CashRepNo;
-                            }
-                        }
-                    }
-
                     //--判断活动的类型--
                     switch (g_item.prom_type) {
                         case 1:
@@ -4039,6 +4038,73 @@ Page({
     go_url:function (e) {
         var url = e.currentTarget.dataset.url;
         getApp().goto(url);
+    },
+
+     //进行对商品的平摊g_item是单个商品，you_item是这个商品分多少优惠券的钱，goods是商品列表
+     split_set_goods_quanprice:async function (you_item,t_item) {
+        var coupon_price=t_item.coupon_price;
+        var goods=t_item.goods;
+        var arr=[];
+        //判断是不是有goods_id重复
+        for(var i=0;i<goods.length;i++){
+            if(goods[i].prom_type!=7 && goods[i].erpwareid==you_item.WareId){
+                var gg_ite={
+                  goods_id:goods[i].goods_id,
+                  goods_num:goods[i].goods_num,
+                  goods_price:goods[i].goods_price,
+                };
+                if(goods[i].account) gg_ite.goods_price=goods[i].account;
+                gg_ite.idx=i;arr.push(gg_ite);
+            }
+        }
+
+        if(arr.length<=0) return false;
+        if(arr.length==1){
+            var idx=arr[0].idx;
+            t_item.goods[idx].quan_num =Math.floor(coupon_price* 100) / 100;
+            t_item.goods[idx].quan_no=t_item.quan_no;
+            return false;
+        }
+
+        var pt_data = {
+            'dis': parseFloat(coupon_price),
+            'goods': arr,
+        }
+
+        var pt_res = null;
+        await  getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
+            is_json: 1,
+            data: pt_data
+        }).then(res => {
+            if (res.data.code == 0) {
+                pt_res = res.data.data;
+            }
+        })
+        if (pt_res) {
+            var q_s_num = 0;
+            for (var i in pt_res) {
+                var idx = pt_res[i].idx;
+                //有account的实收价，就要用account实收价
+                var price=(t_item.goods[idx].account?t_item.goods[idx].account:t_item.goods[idx].goods_price);
+                price=(price - pt_res[i].fisrt_account)* t_item.goods[idx].goods_num;
+                t_item.goods[idx].quan_num =price;
+
+                t_item.goods[idx].quan_num =Math.floor(t_item.goods[idx].quan_num * 100) / 100;
+                t_item.goods[idx].quan_no=t_item.quan_no;
+                q_s_num += t_item.goods[idx].quan_num;
+            }
+
+            if (q_s_num > parseFloat(coupon_price) || q_s_num < parseFloat(coupon_price)){
+                for (var ik in arr) {
+                    if (arr[ik].goods_num == 1) {
+                        var id = arr[ik].idx;
+                        var pri=Math.floor(coupon_price*100)/100-Math.floor(q_s_num*100)/100
+                        t_item.goods[id].quan_num+=pri;
+                        break;
+                    }
+                }
+            }
+        }
     }
@@ -67,7 +67,8 @@ module.exports = {
                 //-- 单个文件新增 --
                 let new_g = JSON.parse(JSON.stringify(end.item));
                 new_g.goods_num = 1;
-                new_g.account = account.toFixed(2);
+                //如果有平摊到单品的时候，account要显示
+                if(!th.data.ispt_goods) new_g.account = account.toFixed(2);
                 new_g.discount = item_j.discount;
                 new_g.goods_price =new_price;
                 new_g.ladder_list_id =item_j.id;
@@ -184,7 +185,7 @@ module.exports = {
         return dest;
     },
-    //-- 平摊组合购的价格 --
+    //-- 组装阶梯购的价格 --
     calc_split_price: async function (c_arr, th) {
         //-- 循环处理 --
         for (var k in c_arr) {
@@ -5734,6 +5734,32 @@ Page({
         success: function (res) {
           if (res.data.code == 0) {
             var r_data = res.data.data;
+              
+            if(r_data.ladderLists){
+                  var act_id=r_data.ladderLists[0].form_id;
+                  //-- 判断会员能不能参与阶梯促销 --
+                  getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid+"/"+user_id + "/"+act_id, {
+                  }).then(res=>{
+                      if(res.data.code==0 && res.data.data){
+                          var prom_content="";
+                          for(let jj in  r_data.ladderLists){
+                              if(r_data.ladderLists[jj].discount==10){
+                                  prom_content+="第"+(parseInt(jj)+1)+"件原价，";
+                              }else{
+                                  prom_content+="第"+(parseInt(jj)+1)+"件"+r_data.ladderLists[jj].discount+"折，";
+                              }
+                          }
+                          prom_content=ut.sub_last(prom_content);
+                          th.data.prom_type=10;
+                          th.data.prom_id=act_id;
+                          th.setData({
+                              jieti_prom:prom_content,
+                              ladder_act_id:act_id
+                          })
+                      }
+                  })
+              }
+
             th.setData({
               prom_goods: r_data.promGoodsLists,
             })
@@ -69,7 +69,13 @@ Page({
 	  if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; }
 	  if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; }
-	  if (0 != t.ladder_id && t.ladder_id != undefined) { url += "&ladder_id=" + t.ladder_id; }
+      if (0 != t.ladder_id && t.ladder_id != undefined) {
+           url += "&ladder_id=" + t.ladder_id; 
+           this.setData({
+            ladder_id:t.ladder_id,
+            baseUrl:url,
+           })
+        }
 	  var user_id=getApp().globalData.user_id;
       if(!user_id) user_id=0;
@@ -19,7 +19,7 @@
 	<view class="pd20 flex ai-center jc_sb">
 		<!-- 搜索框 -->
 		<view class="search-box f1">
-			<navigator hover-class="none" url="/pages/goods/search/search"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
+			<navigator hover-class="none" url="/pages/goods/search/search?ladder_id={{ladder_id}}"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
 		</view>
 		<!-- 单列/双列 显示切换 -->
 		<text class="iconfont {{isToggle ? 'icon-fenxiang':'icon-fenlie'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>
@@ -108,7 +108,13 @@ Page({
        if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
        if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
        if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
-	      
+       if (0 != t.ladder_id && t.ladder_id != undefined) {
+        url += "&ladder_id=" + t.ladder_id; 
+        this.setData({
+         baseUrl:url,
+
+        })
+     }
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
         // 获取历史搜索记录
@@ -200,23 +206,43 @@ Page({
                             break
                     }
                     if(url!=null && url!=''){
-                        await getApp().request.promiseGet(url, {}).then(res => {
+                        await getApp().request.promiseGet(url, {}).then(async res => {
                             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;
-                                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;
-                                item.prom_price=null;
+                            var flag=null;
+                            if(res.data.code==0 && res.data.data){
+                                prom=res.data.data;
+                                await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{
+                                    data:{
+                                      store_id: oo.stoid,
+                                      is_end: 0,
+                                      is_show: 1,
+                                      user_id: getApp().globalData.user_id,
+                                      pageSize:1000
+                                    }
+                                  }).then(pd=>{
+                                    let pd_list=pd.data.data.pageData;
+                                    if(res.data.code==0 && pd_list.length>0){
+                                      flag =pd_list.some(pd=>{
+                                          return pd.goods_id==item.goods_id
+                                      })
+                                    }
+                                    if (prom != null && prom.is_end==0 && prom.end_time>now && flag  && (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;
+                                        var vNum=prom.virtual_num?prom.virtual_num:0;
+                                        var vNum1=prom.virtualNum?prom.virtualNum:0;
+                                        var vNum2=prom.virtual?prom.virtual:0;
+                                        item.sales_sum=prom.buy_num+(vNum+vNum1+vNum2);
+                                    }else{
+                                        item.prom_type=0;
+                                        item.prom_id=0;
+                                        item.prom_price=null;
+                                    }
+                                  })
                             }
                         })
                     }
+                    if(!th.data.requestData) th.data.requestData=[];
                     th.data.requestData.push(item);
                     e.setData({requestData: e.data.requestData});
                 }
@@ -101,7 +101,25 @@ Page({
 				  r.order_status_detail = "组团中";  
-              r['is_all_return'] = 0;
+               r['is_all_return'] = 0;
+
+               var discount_price=r['discount_amount'];
+               var dis_json=r['prom_pt_json'];
+
+               if(dis_json && discount_price){
+                   var prom_pt_json=JSON.parse(dis_json);
+                   var ladder_amount=0;
+                   for (var ll_item of prom_pt_json) {
+                       if(ll_item['ladder_prom_id']){
+                           ladder_amount += ll_item['dis'];
+                       }
+                   }
+                   r['ladder_amount']=ladder_amount;
+                   r['discount_amount']=Math.floor((discount_price-ladder_amount)*100)/100;
+               }
+
+
+
                //------获取订单商品-------
                rq.get("/api/weshop/ordergoods/list",{
@@ -120,7 +120,12 @@
             <view class="item pnew" wx:if="{{order.discount_amount>0}}">
                 <view>优惠活动</view>
-                <view>￥ {{order.discount_amount}}元</view>
+                <view>￥ {{filters.toFix(order.discount_amount,2)}}元</view>
+            </view>
+
+            <view class="item pnew" wx:if="{{order.ladder_amount>0}}">
+                <view>阶梯优惠活动</view>
+                <view>￥ {{filters.toFix(order.ladder_amount,2)}}元</view>
             </view>
             <view class="item pnew" wx:if="{{order.order_prom_amount>0}}">