Merge branch 'dev' into 'test'

Dev See merge request !790

Merge branch 'dev' into 'test'
Dev See merge request !790
后端研发-苏明海
2 parents 15c455fe f8f77f42
Showing 6 changed files with 91 additions and 89 deletions
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStream/liveStream.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/index/index/index.wxml
@@ -245,7 +245,7 @@ Page({
 						pageSize: 100,
 					}).then((res) => {
 						self.setData({
-							living11: self.data.list,
+							living: self.data.list,
 						});
 						//直播中列表请求完后，请求即将开始列表
@@ -26,10 +26,10 @@
 	<!-- 直播中 -->
-	<block wx:if="{{living11.pageData.length > 0}}">
+	<block wx:if="{{living.pageData.length > 0}}">
 		<view class="title">直播中</view>
 		<view class="list">
-			<block wx:for="{{living11.pageData}}"  wx:key="item">
+			<block wx:for="{{liveing.pageData}}"  wx:key="item">
 				<view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing">
 					<view class="list-item-left">
 						<image src="{{item.share_img}}" class="item-pic" mode="aspectFit"></image>
@@ -492,23 +492,34 @@ Page({
             }
         }
-
-        var g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&pre_id="+pre_arr.id;
-        if(act.is_end || th.data.act.end_time<ut.gettimestamp()) {
-             g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
-             getApp().request.put("/api/weshop/goods/update",
-                 { data:{goods_id:order_goods.goods_id,store_id:os.stoid,prom_id:0,prom_type:0},
-                  success: function(e) {}
-             });
-        }
-
-
         //---获取商品---
         await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => {
             goods = res.data.data;
             order.market_price = goods.market_price;
             order.show_img = oo.imghost + goods.original_img;
         });
+		
+			
+		var g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&pre_id="+pre_arr.id;
+		if(act.is_end || th.data.act.end_time<ut.gettimestamp()) {
+					
+			 if(goods.prom_type==8 && goods.prom_id==act.id){
+				 g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
+				 getApp().request.put("/api/weshop/goods/update",
+				     { data:{goods_id:order_goods.goods_id,store_id:os.stoid,prom_id:0,prom_type:0},
+				      success: function(e) {}
+				 });
+			 }else{
+				 g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
+				 if(goods.prom_type==8){
+					 g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&prom_id="+goods.prom_id;
+				 } 
+			
+			 }
+			
+		}
+		
+	
         //判断使用优惠券的接口需要
         th.data.check_quan_ware_list = goods.erpwareid;
         //---获取门店---
@@ -646,9 +657,9 @@ Page({
             }
             if(quan_price>0){
-                    if (quan_price < o_condition) th.setData({quan_price: quan_price})
+                    if (quan_price < th.data.tail_pay) th.setData({quan_price: quan_price})
                     else {
-                        th.setData({quan_price: o_condition})
+                        th.setData({quan_price: th.data.tail_pay})
                     }
                     o_condition=o_condition-quan_price;
@@ -659,21 +670,22 @@ Page({
             //如果同意参与订单优惠
             if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
-                th.check_is_order_prom(o_condition, function () {
+                th.check_is_order_prom(o_condition, function (ord_price) {
                     var bn_pick=th.data.pickup.pickup_id
                     var order_prom_amount = 0;
                     var order_prom_id = 0;
+					var o_condition1=0;
                     if (th.data.order_prom[bn_pick]) {
                         var ord_prom = th.data.order_prom[bn_pick];
                         order_prom_id = ord_prom['id'];
                         switch (ord_prom['type']) {
                             case 0:
 							    var all_1=o_condition;
-                                o_condition = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                order_prom_amount = (all_1 - o_condition).toFixed(2);
+                                o_condition1 = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
+                                order_prom_amount = (all_1 - o_condition1).toFixed(2);
                                 break;
                             case 1:
-                                o_condition = o_condition - ord_prom['expression'];//满额优惠金额
+                                o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额
                                 order_prom_amount = ord_prom['expression'];
                                 break;
                         }
@@ -684,9 +696,12 @@ Page({
                         var order_prom_txt2 = "order_prom_amount";
                         th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
                     }
-                    th.setData({ exp_price: 0, order_m: o_condition })
+					
+					o_condition1=parseFloat(o_condition1)-parseFloat(th.data.presell.presell_deposit);	
+                    th.setData({ exp_price: 0, order_m: o_condition1 })
                 })
             }else{
+				o_condition=parseFloat(o_condition)-parseFloat(th.data.presell.presell_deposit);
                 th.setData({ exp_price: 0, order_m: o_condition })
             }
         }
@@ -1679,8 +1694,10 @@ Page({
             if (res.data.code == 0) {
                 var data = res.data.data;
                 th.data.order_prom[pick] = data;
-            }
-            func();
+            }else{
+				th.data.order_prom[pick] = null;
+			}
+            func(condition);
         })
     },
@@ -1872,9 +1889,10 @@ Page({
                         })
                         if(quan_price>0) {
-                            if (quan_price < allpice) th.setData({quan_price: quan_price})
+                            if (quan_price <th.data.tail_pay) th.setData({quan_price:quan_price})
                             else {
-                                th.setData({quan_price: allpice})
+                                th.setData({quan_price:  th.data.tail_pay})
+								quan_price=th.data.tail_pay;
                             }
                         }else{
                             th.setData({quan_price: 0})
@@ -1957,7 +1975,7 @@ Page({
         if(o_condition<0) o_condition=0;
         //如果同意参与订单优惠
         if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
-            th.check_is_order_prom(o_condition, function () {
+            th.check_is_order_prom(o_condition, function (ord_price) {
                 var bn_pick=th.data.pickup.pickup_id
                 var order_prom_amount = 0;
                 var order_prom_id = 0;
@@ -1967,15 +1985,15 @@ Page({
                     order_prom_id = ord_prom['id'];
                     switch (ord_prom['type']) {
                         case 0:
-                            order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                            order_prom_amount = (o_condition - order_m).toFixed(2);
+                            order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
+                            order_prom_amount = (ord_price - order_m).toFixed(2);
                             break;
                         case 1:
-                            order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                            order_m = ord_price - ord_prom['expression'];//满额优惠金额
                             order_prom_amount = ord_prom['expression'];
                             break;
                     }
-                    o_condition=order_m;
+                    ord_price=order_m;
                 }
                 //--订单优惠的显示--
@@ -1983,13 +2001,21 @@ Page({
                     var order_prom_txt1 = "order_prom_id";
                     var order_prom_txt2 = "order_prom_amount";
                     th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
-                }
-
-                th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition) +parseFloat(exp_price) })
+                }else{
+					var order_prom_txt1 = "order_prom_id";
+					var order_prom_txt2 = "order_prom_amount";
+					th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
+				}
+				
+				
+			    ord_price=parseFloat(ord_price)-parseFloat(th.data.presell.presell_deposit);
+                th.setData({ exp_price: exp_price, order_m: ord_price +parseFloat(exp_price) })
             })
         }else{
-            th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition)+parseFloat(exp_price) })
+			
+			var o_condition1=parseFloat(o_condition)-parseFloat(th.data.presell.presell_deposit);	
+            th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition1)+parseFloat(exp_price) })
         }
     },
@@ -2110,7 +2136,7 @@ Page({
         if(th.data.user_note){
             dd.user_note=th.data.user_note;
         }
-        dd.order_amount= parseFloat(th.data.order_m-th.data.presell.presell_deposit).toFixed(2);
+        dd.order_amount= parseFloat(th.data.order_m).toFixed(2);
         console.log(JSON.stringify(dd));
         wx.request({
@@ -337,7 +337,7 @@
         <view class="btn-wrap">
             <view class="pay-amount">
                 <view class="payable">应付金额：
-                    <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m-presell.presell_deposit,2)}}</text>
+                    <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
                 </view>
             </view>
             <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">提交订单</button>
@@ -1538,7 +1538,7 @@ Page({
-    var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+    var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid+"&pre_id="+th.data.pre_arr.id;
     if (getApp().globalData.user_id) {
       url += "&first_leader=" + getApp().globalData.user_id;
     }
@@ -1558,6 +1558,9 @@ Page({
     };
     ob.title += '\n' + th.data.presellForm.share_remark;
+	
+	
+	console.log(ob,888);
     return ob;
@@ -2688,7 +2691,8 @@ Page({
     var app = getApp();
     var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
     var path2 = that.data.data.original_img;
-    var scene = th.data.gid + "";
+    
+	var scene = th.data.gid + "_"+th.data.pre_arr.id;
     var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
     if (user_id > 0) {
       scene += "_" + user_id;
@@ -2699,8 +2703,10 @@ Page({
       if (!user_id) scene += "_0";
       scene += "_" + getApp().globalData.room_id;
     }
+
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+      //os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/presell/goodsInfo/goodsInfo";
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
     console.log(path3);
@@ -2796,14 +2802,20 @@ Page({
             context.setFontSize(22 * unit)
             pri0 = "￥" + th.data.data.market_price.toFixed(2);
             var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
-            context.fillText('定金', wd2, 213 * unit);
-
-            // context.setStrokeStyle('gray');
-            // context.setLineWidth(1 * unit);
-            // context.moveTo(wd2 - 5, 206 * unit);
-            // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
-            // context.stroke();
-
+			
+			if(th.data.presellForm.presell_type==1){
+			   context.setStrokeStyle('gray');
+			   context.fillText(pri0, wd2, 213 * unit);
+			   context.setLineWidth(1 * unit);
+			   context.moveTo(wd2 - 5, 206 * unit);
+			   context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
+			   context.stroke();
+			}else{
+			   context.fillText('定金', wd2, 213 * unit);
+			}
+			
+           
+     
           } else {
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
@@ -2829,43 +2841,7 @@ Page({
           //---中间大图---
           context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
-          //预售
-          /* if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-            if (parseInt(th.data.poster.show_quality)) {
-              var g_path = "../../../../images/share/s_gou.png";
-              context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("正品保证", 84 * unit, 690 * unit);
-
-              context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("纯实体店", 246 * unit, 690 * unit);
-
-              context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("官方验证", 420 * unit, 690 * unit);
-            }
-          } else {
-            var g_path = "../../../../images/share/s_gou.png";
-            context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-            context.setFillStyle("red")
-            context.setFontSize(18 * unit)
-            context.fillText("正品保证", 84 * unit, 690 * unit);
-
-            context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-            context.setFillStyle("red")
-            context.setFontSize(18 * unit)
-            context.fillText("纯实体店", 246 * unit, 690 * unit);
-
-            context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-            context.setFillStyle("red")
-            context.setFontSize(18 * unit)
-            context.fillText("官方验证", 420 * unit, 690 * unit);
-          } */
-
+          
           //---画线---
           context.setLineWidth(1 * unit)
           context.moveTo(32 * unit, 665 * unit)
@@ -2876,14 +2852,14 @@ Page({
           context.setFillStyle("black")
           // context.setFontSize(22 * unit)
           context.setFontSize(24 * unit)
-          context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
+          context.fillText(th.data.sto_sele_name_1, 40 * unit, 730 * unit);
           context.setFillStyle("red")
           context.setFontSize(20 * unit)
           var presell_price = `预售价：${th.data.presellList.presell_price}`         
-          context.fillText(presell_price, 40 * unit, 801 * unit);
+          context.fillText(presell_price, 40 * unit, 780 * unit);
           context.setFillStyle("black")
           context.setFontSize(22 * unit)
-          context.fillText("特惠好物，限时预售", 40 * unit, 836 * unit);
+          context.fillText("特惠好物，限时预售", 40 * unit, 826 * unit);
           context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit);
           //---二维吗图---            
@@ -2894,7 +2870,7 @@ Page({
             context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
           } else {
             //---二维吗图---
-            context.drawImage(vpath, 390 * unit, 756 * unit, 130 * unit, 116 * unit);
+            context.drawImage(vpath, 390 * unit, 746 * unit, 130 * unit, 116 * unit);
           }
@@ -3966,7 +3942,7 @@ Page({
             }
         })
         if (!pre_arr) {
-            wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000});
+            wx.showToast({title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000});
             setTimeout(function () {
                 ut.wx_back();
             }, 2000)
@@ -203,7 +203,7 @@
 						<view class="imgview presell">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="preGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
 						</view>
-						<view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.goods_name}}</view>
+						<view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.act_name}}</view>
 						<view class="co-red mar-top10 flex jc_sb ali-c">
 							<view>
 								<text><text class="fs20">￥</text>{{aitem.presell_price}}</text>