直接收款

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

@@ -50,9 +50,9 @@
         <toPayWay @cancelPay="cancelPay()" @payFinish="payFinish()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId" :price.sync="price"></toPayWay>
     </uni-popup>
 
-	<!-- 临时收款 -->
+	<!-- 直接收款 -->
 	<uni-popup ref="gatheringRef" background-color="#fff" type="center" :animation="false">
-		<selectPrice @confirmSelectPrice="confirmSelectPrice" @cancelSelectPrice="cancelSelectPrice"></selectPrice>
+		<selectPrice @zjGathering="zjGathering" @cancelSelectPrice="cancelSelectPrice"></selectPrice>
 	</uni-popup>
 
 	<!-- 开单选花材输入数量和金额 -->
@@ -247,10 +247,11 @@ export default {
 		cancelSelectPrice(){
 			this.$refs.gatheringRef.close()
 		},
-		confirmSelectPrice(params){
+		//直接收款
+		zjGathering(params){
 			uni.showLoading({mask:true})
 			//isCashier=1时收银台播放 总金额139元，请扫码付款
-			createOrder({orderName:params.name,lsGoodsPrice:params.price,modifyPrice:params.price,isCashier:1,cash:params.cash,customId:this.customId}).then(res=>{
+			createOrder({orderName:params.name,lsGoodsPrice:params.price,modifyPrice:params.price,isCashier:1,cash:params.cash,customId:this.customId,version:3,zjGathering:1}).then(res=>{
 				uni.hideLoading()
 				if(res.code == 1){
 					if(res.data.status == 1){

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

@@ -115,7 +115,7 @@ export default {
                 this.$msg('请填写金额')
                 return
             }
-            this.$emit('confirmSelectPrice', {price:Number(this.price),name:this.name,cash:Number(this.cash)})
+            this.$emit('zjGathering', {price:Number(this.price),name:this.name,cash:Number(this.cash)})
         }
     }
 }