Merge branch 'dev' into 'test'

Dev See merge request !466

Merge branch 'dev' into 'test'
Dev See merge request !466
后端研发-苏明海
2 parents 3763c968 6347f106
Showing 5 changed files with 15 additions and 38 deletions
app.js
packageA/pages/liveStreamDetails/liveStreamDetails.js
packageA/pages/liveStreamDetails/liveStreamDetails.skeleton.wxml
packageA/pages/liveStreamDetails/liveStreamDetails.skeleton.wxss
pages/cart/cart2/cart2.js
@@ -129,7 +129,7 @@ App({
           cartGoodsNum:this.globalData.cartGoodsNum
       })
   },
-    
+
   globalData: {
      cartGoodsNum:0,       //购物车总数量
       isTabBar :false,
@@ -186,7 +186,6 @@ App({
                app.globalData.user_id= app.globalData.userInfo.user_id;
             }
         }
-
         wx.getSystemInfo({
           success: (res) => {
             // console.log(res)
@@ -594,6 +593,8 @@ App({
         this.globalData.wuliu=null;                        //关闭要把物流清空
         this.globalData.room_id=null;                      //关闭要把房间号关闭
         this.globalData.room_goods_id=null;                //关闭要把物流清空
+        this.globalData.config2=null;                      //清除config2的缓存
+        this.globalData.config=null;                       //清除config的缓存
     }
@@ -152,7 +152,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
     // console.log('----------------v', headImg);
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+      os.stoid + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails";
     // 以iPhone6为例，375/750 = 0.5
     // let scale = this.data.windowWidth / 375;
-<!--
-此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 
-使用方法：
-1. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxml"中使用`include`指令引入此模板，
-2. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxss"中使用`import`指令引入"packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxss"
-3. 书写对应的逻辑，来控制骨架屏的显示与隐藏
-
-更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
--->
-<view class="sk-container"></view>
 \ No newline at end of file
-/*
-此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 
-使用方法：参考 "packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxml"
-*/
-.sk-transparent {
-    color: transparent !important;
-  }
-.sk-container {
-    position: absolute;
-    overflow: hidden;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 1000000;
-    background-color: transparent;
-  }
@@ -675,7 +675,7 @@ Page({
                       item_map.is_bz = get_data.is_bz;         //是不是倍增
                       item_map.bs = get_data.bs;               //是不是倍数
                       item_map.is_past = get_data.is_past;     //是不是包邮
-                      item_map.prom_price = get_data.price?get_data.price:item_map.price;
+                      item_map.prom_price = get_data.price>=0?get_data.price:item_map.price;
                       item_map.s_intValue = get_data.intValue;
                       item_map.s_coupon_id = get_data.coupon_id;
                       item_map.s_coupon_num = get_data.coupon_num;
@@ -699,7 +699,7 @@ Page({
                //有活动，且优惠活动并没有限制使用优惠券，且有减价
                //--看有没有减价--
-               if(item_map.prom_price && item_map.price-item_map.prom_price){
+               if(item_map.prom_price>=0 && item_map.price-item_map.prom_price){
                    if(cart_item.prom_pt_json){
                        cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0})
                    }else{
@@ -743,7 +743,7 @@ Page({
                                var m_item = item_map.goods[i];
                                var m_all_amount = m_item.goods_price * m_item.goods_num - m_item.goods_price * m_item.goods_num * per;
                                var account = Math.floor(100 * m_all_amount /m_item.goods_num) / 100;
-                               if (account) {
+                               if (account>=0) {
                                    item_map.goods[i].account = account;
                                    account_all += account * m_item.goods_num; //累加总实收
                                }
@@ -1540,6 +1540,7 @@ Page({
           //比例太小不平摊
           if(per<0.001){
               goods.account_yu=th.data.formData.cut_price;
+              item.is_discount_amount=1;
           }else{
               per=Math.floor(per*1000)/1000;
               var all_amount=goods.goods_price*goods.goods_num-goods.goods_price*goods.goods_num*per;          //商品总实收
@@ -1547,6 +1548,7 @@ Page({
               var account_yu=account*goods.goods_num-(goods.goods_price*goods.goods_num-th.data.formData.cut_price);   //算出余数
               goods.account=account;
               goods.account_yu=parseFloat(account_yu.toFixed(2));
+              item.is_discount_amount=1;
           }
       }
       item.order_goods.push(goods);
@@ -1672,9 +1674,10 @@ Page({
           };
           //把优惠的平摊结果写进去
-          if(g_item.account){
-              goods.account=g_item.account;
-              goods.account_yu=g_item.account_yu;
+          if(g_item.account>=0 || g_item.account_yu>0){
+             if(g_item.account>=0) goods.account=g_item.account;
+             if(g_item.account_yu>=0) goods.account_yu=g_item.account_yu;
+             item.is_discount_amount=1;
           }
           //--把券的钱，写入从表---
@@ -1756,7 +1759,7 @@ Page({
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
-
+    
     wx.showLoading({title: "加载中"});
     wx.request({
       url: oo.url + '/api/weshop/order/createWxdOrder',
@@ -2696,7 +2699,7 @@ Page({
             arr.is_xz_yh=prom.is_xz_yh;       //是不是优惠
             arr.bs=get_data.bs;               //是不是倍数
             arr.is_past=get_data.is_past;     //是不是包邮
-            arr.prom_price=get_data.price?get_data.price:price;
+            arr.prom_price=get_data.price>=0?get_data.price:price;
             arr.s_intValue=get_data.intValue;
             arr.s_coupon_id=get_data.coupon_id;
             arr.s_coupon_num=get_data.coupon_num;