价格

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

@@ -32,7 +32,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"></toPayWay>
+        <toPayWay @cancelPay="cancelPay()" @payFinish="payFinish()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId" :price.sync="price"></toPayWay>
     </uni-popup>
 
 	<!-- 临时收款 -->
@@ -83,7 +83,8 @@ export default {
             currentJobId:0,
 			calc:'add',
 			property:1,
-			settleOpenStatus:0
+			settleOpenStatus:0,
+			price:0
         }
     },
     watch:{
@@ -167,6 +168,7 @@ export default {
 					}
 					this.$refs.gatheringRef.close()
 					this.orderId = res.data.id
+					this.price = res.data.mainPay ? Number(res.data.mainPay) : 0
 				}
 			})
 		},
@@ -207,6 +209,7 @@ export default {
 				if(res.code == 1){
 					if(res.data.status == 1){
 						this.orderId = res.data.id
+						this.price = res.data.mainPay ? Number(res.data.mainPay) : 0
 						this.$refs.toPayRef.open('center')
 					}else{
 						//开单完成之后更新花材库存

hdPad/src/pages/home/components/leftGroup.vue

@@ -22,7 +22,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"></toPayWay>
+            <toPayWay @cancelPay="cancelPay()" @payFinish="payFinish()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId" :price.sync="price"></toPayWay>
         </uni-popup>
 
     </view>
@@ -53,7 +53,8 @@ export default {
             groupList:[],
             settleOpenStatus:0,
             groupInfo:{},
-            orderId:0
+            orderId:0,
+            price:0
         }
     },
     watch:{
@@ -73,7 +74,7 @@ export default {
 			this.$refs.toPayRef.close()
 			this.listenScanItem()
 		},
-		selectPayWayBack(price){
+		selectPayWayBack(){
 			this.$util.hitVoice()
 		},
         getDetail(item){
@@ -95,6 +96,7 @@ export default {
 				if(res.code == 1){
 					if(res.data.status == 1){
 						this.orderId = res.data.id
+                        this.price = res.data.mainPay ? Number(res.data.mainPay) : 0
 						this.$refs.toPayRef.open('center')
 					}
 					this.settleOpenStatus = 0

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

@@ -3,8 +3,8 @@
         <view v-if="showSuccess == false">
             <view class="collect-code_box">
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" />
+                <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
                 <view class="show-code">请出示付款码</view>
-                <!--<view class="btn-default result" @click="checkPay()">查询结果</view>-->
                 <view @click="cancelPayFn" class="btn-default result">取消</view>
             </view>
         </view>
@@ -38,7 +38,11 @@ export default {
 		orderId: {
 			type: Number,
 			default: 0
-		}
+		},
+        price:{
+			type: Number,
+			default: 0
+        }
     },
 	mounted(){
         let that = this
@@ -112,7 +116,7 @@ export default {
     padding: 10upx;
     overflow-y: auto;
     display: flex;
-    height: 90vh;
+    height: 95vh;
     flex-direction: column;
     box-sizing: border-box;
     width:50vw;
@@ -140,14 +144,15 @@ export default {
         align-items: center;
         justify-content: center;
         flex-direction: column;
-        padding-top:38upx;
+        padding-top:30upx;
         & > .img {
             width: 100upx;
             height: 100upx;
         }
         & .show-code{
             font-size: 14upx;
-            margin: 50upx 0 20upx 0;         
+            margin: 20upx 0 20upx 0;
+            font-weight:bold;
         }
         & .btn-default {
             height: 40upx;