Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/item/add.vue

@@ -54,8 +54,8 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存不足</view>
           <view>
-            <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">不要自动补充</button>
-            <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
+            <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">关闭自动补充</button>
+            <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">开启自动补充</button>
           </view>
         </tui-list-cell>
 

ghsApp/src/admin/item/detail.vue

@@ -85,8 +85,8 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存不足</view>
           <view>
-            <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">不要自动补充</button>
-            <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
+            <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">关闭自动补充</button>
+            <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">开启自动补充</button>
           </view>
         </tui-list-cell>
 

ghsPad/src/pages/home/components/console.vue

@@ -33,7 +33,7 @@
 
     <!-- 扫码付款 -->
     <uni-popup ref="toPayRef" background-color="#fff" type="center" :animation="false" :is-mask-click="false">
-        <toPayWay @cancelPay="cancelPay()" @payFinish="payFinish()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId" :price.sync="price"></toPayWay>
+        <toPayWay @cancelPay="cancelPay()" @payFinish="payFinish()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId" :price.sync="price" :reachDiscountPrice.sync="reachDiscountPrice" :orderReachDiscountPrice.sync="orderReachDiscountPrice"></toPayWay>
     </uni-popup>
 
 	<!-- 临时收款 -->
@@ -117,6 +117,8 @@ export default {
 			calc:'add',
 			settleOpenStatus:0,
 			price:0,
+			orderReachDiscountPrice:0,
+			reachDiscountPrice:0,
 			fastAction:1
         }
     },
@@ -239,7 +241,7 @@ export default {
 						this.$refs.toPayRef.open('center')
 						this.$refs.gatheringRef.close()
 						this.orderId = res.data.id
-						this.price = res.data.mainPay ? Number(res.data.mainPay) : 0
+						this.price = res.data.actPrice ? Number(res.data.actPrice) : 0
 					}else{
 						this.$refs.gatheringRef.close()
 						uni.showToast({title: '操作成功' })
@@ -299,6 +301,10 @@ export default {
 					if(res.data.status == 1){
 						this.orderId = res.data.id
 						this.price = res.data.actPrice ? Number(res.data.actPrice) : 0
+
+						this.orderReachDiscountPrice = res.data.orderReachDiscountPrice ? Number(res.data.orderReachDiscountPrice):0
+						this.reachDiscountPrice = res.data.reachDiscountPrice ? Number(res.data.reachDiscountPrice):0
+
 						this.$refs.toPayRef.open('center')
 					}else{
 						this.removeFromSaveDirect()

ghsPad/src/pages/home/components/rightItem.vue

@@ -34,7 +34,9 @@
                         <view>
                             <view>{{item.name}}</view>
                             <view style="display:flex;justify-content: space-between;padding-right:2upx;">
-                                <text>￥{{parseFloat(item.price)}}</text><text>剩{{parseFloat(item.stock)}}</text>
+                                <text>￥{{parseFloat(item.price)}}</text>
+                                <text v-if="Number(item.reachNumDiscount)>0 && Number(item.reachNum)>0" style="color:#FFEB3B;">{{ item.reachNum }}↓{{ item.reachNumDiscount?parseFloat(item.reachNumDiscount):0 }}</text>
+                                <text>剩{{parseFloat(item.stock)}}</text>
                             </view>
                         </view>
                     </view>

ghsPad/src/pages/home/components/toPay.vue

@@ -3,7 +3,18 @@
         <view v-if="showSuccess == false">
             <view class="collect-code_box">
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" @click="beginScan()" />
-                <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
+
+<view style="margin-top:8upx;font-weight:bold;font-size:22upx;text-decoration:line-through;color:#8a7f7f;" v-if="Number(reachDiscountPrice) > 0 || Number(orderReachDiscountPrice) > 0">
+    ￥{{ parseFloat((Number(reachDiscountPrice)+Number(price)+Number(orderReachDiscountPrice)).toFixed(2)) }}
+</view>
+<view style="margin-top:8upx;font-weight:bold;font-size:24upx;color:red;" v-if="Number(reachDiscountPrice)>0">
+    花材满减 -￥{{ parseFloat(reachDiscountPrice) }}
+</view>
+<view style="margin-top:10upx;font-weight:bold;font-size:26upx;color:red;" v-if="Number(orderReachDiscountPrice)>0">
+    整单满减 -￥{{ parseFloat(orderReachDiscountPrice) }}
+</view>
+<view style="margin-top:10upx;font-weight:bold;font-size:34upx;color:black;">¥{{price}}</view>
+
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
                 <view class="paying" v-if="goPay == 1">请求中</view>
                 <view style="font-size:18upx;margin:45upx auto 10upx auto;color:red;font-weight:bold;" v-if="goPay == 2">
@@ -12,8 +23,10 @@
                     查询结果
                     </text>
                 </view>
-                <image style="width:40upx;height:40upx;position:absolute;top:190upx;left:205upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
-                <view style="margin-top:30upx;">
+                <view v-if="goPay == 1">
+                    <image style="width:25upx;height:25upx;margin:0 auto;" :src="`${constant.imgUrl}/icon/loading.gif`" mode="scaleToFill" />
+                </view>
+                <view style="margin-top:10upx;">
                     <view @click="cancelPayFn" class="btn-default">取消</view>
                 </view>
             </view>
@@ -64,6 +77,14 @@ export default {
         price:{
 			type: Number,
 			default: 0
+        },
+        reachDiscountPrice:{
+			type: Number,
+			default: 0
+        },
+        orderReachDiscountPrice:{
+			type: Number,
+			default: 0
         }
     },
 	mounted(){
@@ -212,17 +233,17 @@ export default {
         flex-direction: column;
         padding-top:15upx;
         & > .img {
-            width: 100upx;
-            height: 100upx;
+            width: 80upx;
+            height: 80upx;
         }
         & .show-code{
             font-size: 19upx;
-            margin: 45upx 0 10upx 0;
+            margin: 10upx 0 10upx 0;
             font-weight:bold;
         }
         & .paying{
             font-size: 19upx;
-            margin: 45upx 0 10upx 0;
+            margin: 10upx 0 10upx 0;
             font-weight:bold;
         }
         & .btn-default {

hdApp/src/admin/home/order.vue

@@ -57,7 +57,7 @@
                   <text style="margin-left:10upx;">￥{{ item.actPrice ? parseFloat(item.actPrice):0 }}</text>
                 </text>
               </text>
-              <text class="app-size-30 app-bold" v-else>红冲订单 -¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</text>
+              <text class="app-size-30 app-bold" v-else style="color:red;">红冲 -¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</text>
             </view>
 
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;

hdApp/src/admin/order/detail.vue

@@ -5,7 +5,7 @@
       <!-- 售后付款单提示 -->
       <view class="after-sale-tip" v-if="orderInfo.forward == 1" @click="goPreOrder(orderInfo)">
         <view class="tip-content">
-          <text class="tip-text">红冲订单<block v-if="!$util.isEmpty(orderInfo.forwardMap)">，点击查看原单</block></text>
+          <text class="tip-text">红冲<block v-if="!$util.isEmpty(orderInfo.forwardMap)">，点击查看原单</block></text>
         </view>
       </view>
 
@@ -996,10 +996,10 @@ export default {
     width: 100%;
     
     .tip-text {
-      font-size: 28upx;
-      color: #856404;
+      font-weight:bold;
+      font-size:30upx;
+      color: red;
       line-height: 1.4;
-      font-weight: 500;
       text-align: center;
     }
   }

hdApp/src/pagesPurchase/aliPay.vue

@@ -15,10 +15,10 @@
           </div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材优惠 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
+          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材满减 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单优惠 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
+          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单满减 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
 
           <div class="price">
             <span class="app-size-36 app-bold">￥{{ realPrice || '0.00'}}</span>

hdApp/src/pagesPurchase/wechatPay.vue

@@ -15,10 +15,10 @@
           </div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材优惠 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
+          v-if="info.reachDiscountPrice && Number(info.reachDiscountPrice)>0">花材满减 -￥{{ parseFloat(info.reachDiscountPrice) }}</div>
 
           <div class="order-num app-color-3" style="color:red;font-size:30upx;margin-top:10upx;margin-bottom:10upx;font-weight:bold;" 
-          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单优惠 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
+          v-if="info.orderReachDiscountPrice && Number(info.orderReachDiscountPrice)>0">整单满减 -￥{{ parseFloat(info.orderReachDiscountPrice) }}</div>
 
           <div class="price">
             <span class="app-size-36 app-bold">￥{{ realPrice || '0.00'}}</span>