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

WXD-SEASON\season
2 parents 12e17a5e f9cb4bf1
Showing 3 changed files with 10 additions and 3 deletions
components/diy_floatingBox/diy_floatingBox.wxss
packageC/pages/presell/cart/cart.js
pages/index/index/index.wxss
@@ -2,10 +2,10 @@
 .floatingBox {
   /* width: 100rpx; */
-  height: 750rpx;
+  /* height: 750rpx; */
   position: fixed;
   /* top:0; */
-  bottom: 300rpx;
+  bottom: 200rpx;
   /* margin: auto; */
   /* background-color: red; */
   display: flex;
@@ -1972,6 +1972,10 @@ Page({
         }).then(res => {
             if (res.data.code == 0) {
                 var data = res.data.data;
+
+                //如果订单促销的取价不是实收，清空订单促销
+                if(data &&  data.discount_field>0) data=null;
+
                 th.data.order_prom[pick] = data;
             } else {
                 th.data.order_prom[pick] = null;
@@ -2439,6 +2443,9 @@ Page({
                 }).then(res => {
                     if (res.data.code == 0) {
                         ord_prom = res.data.data;
+
+                        //如果订单促销的取价不是实收，清空订单促销
+                        if(ord_prom &&  ord_prom.discount_field>0) ord_prom=null;
                     }
                 })
             }
@@ -1070,7 +1070,7 @@ page {
 	width: 124rpx;
 	height: 170rpx;
 	position: fixed;
-	top: 50%;
+	top:300rpx;
 	right: 0;
 	/* transform: translateY(-50%); */
 	z-index: 10000;