productDev/jinkuai.git

			@@ -89,6 +89,14 @@
			</view>
			</view>
			<view class="order-info-price">
			<view class="price-row" v-if="feeFrom.priceParam1.name">
			<view class="price-row-label">{{feeFrom.priceParam1.name}}</view>
			<view class="price-row-val" > {{(info.priceNum1\|\|0) }}{{feeFrom.priceParam1.unit}} </view>
			</view>
			<view class="price-row" v-if="feeFrom.priceParam2.name">
			<view class="price-row-label">{{feeFrom.priceParam2.name}}</view>
			<view class="price-row-val" > {{(info.priceNum2\|\|0) }}{{feeFrom.priceParam2.unit}} </view>
			</view>
			<view class="price-row">
			<view class="price-row-label">费用标准</view>
			<view class="price-row-val" v-if="info.type !==2">{{((info.price\|\|0)/100).toFixed(2) }}{{info.priceUnit \|\| '' }}</view>
			@@ -291,28 +299,28 @@
			<view class="querenfee-c" >
			<view class="querenfee-c-info1"><text style="color: red;">*</text>实际{{feeFrom.priceParam1.name}}</view>
			<view class="querenfee-c-input">
			<input type="number" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" v-model="feeForm.priceNum1" placeholder="请输入" />
			<input type="number" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="请输入" />
			</view>
			<text class="querenfee-c-danw">{{feeFrom.priceParam1.unit}}</text>
			</view>
			<view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null">
			<view class="querenfee-c-info1"><text style="color: red;">*</text>实际{{feeFrom.priceParam2.name}}：</view>
			<view class="querenfee-c-input">
			<input type="number" v-model="feeForm.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="请输入" />
			<input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" placeholder="请输入" />
			</view>
			<text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text>
			</view>
			<view class="querenfee-c">
			<view class="querenfee-c-info1">其他费用：</view>
			<view class="querenfee-c-input">
			<input type="number" v-model="feeForm.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="请输入" />
			<input type="number" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="请输入" />
			</view>
			<text class="querenfee-c-danw">元</text>
			</view>
			<view class="querenfee-c" style="flex-direction: column;">
			<view class="querenfee-c-info1" style="margin-bottom: 30rpx;">备注信息：</view>
			<view class="querenfee-c-input" style="width: 100%; height: 200rpx; padding: 30rpx; box-sizing: border-box;">
			<u--textarea placeholder="如需备注，请输入" border="none" v-model="feeForm.confirmFeeRemark" ></u--textarea>
			<u--textarea placeholder="如需备注，请输入" border="none" v-model="feeFrom.confirmFeeRemark" ></u--textarea>
			</view>
			</view>
			<view class="querenfee-c">
			@@ -460,8 +468,45 @@
			}
			})
			},
			getTotal() {
			this.$u.api.getTotal({
			price: this.info.price,
			priceUnit: this.feeFrom.priceParam1.unit,
			priceNum1: this.feeFrom.priceNum1 \|\| 0,
			priceNum2: this.feeFrom.priceNum2 \|\| 0,
			type: this.info.type
			}).then(res => {
			if (res.code === 200) {
			this.confirmPayFee = (res.data / 100) \|\| '0'
			}
			})
			},
			confirmFee(){
			console.log("confirmFee")
			if (!this.feeFrom.priceNum1) {
			return uni.showToast({
			title: '实际' + this.feeFrom.priceParam1.name + '不能为空',
			icon: 'none'
			})
			}
			if (this.feeFrom.priceParam2.name && !this.feeFrom.priceNum2) {
			return uni.showToast({
			title: '实际' + this.feeFrom.priceParam2.name + '不能为空',
			icon: 'none'
			})
			}
			this.$u.api.confirmFee({
			confirmFeeRemark: this.feeFrom.confirmFeeRemark,
			confirmOtherFee: this.feeFrom.confirmOtherFee,
			orderId: this.info.id,
			priceNum1: this.feeFrom.priceNum1,
			priceNum2: this.feeFrom.priceNum2
			}).then(res => {
			if (res.code === 200) {
			this.show7 = false
			uni.showToast({ title: '操作成功', icon: 'success', duration: 2000 });
			this.getOrderData()
			}
			})
			},
			payment() {
			var that = this
			@@ -720,30 +765,30 @@
			//包装工
			if(this.info.carType==0){
			//按天
			this.feeFrom.priceParam1.name ='用工天数：'
			this.feeFrom.priceParam1.name ='用工天数'
			this.feeFrom.priceParam1.unit ='天'
			this.feeFrom.priceParam2.name ='用工人数：'
			this.feeFrom.priceParam2.name ='用工人数'
			this.feeFrom.priceParam2.unit ='人'
			}else if(this.info.carType==1){
			//按小时
			this.feeFrom.priceParam1.name ='用工时间：'
			this.feeFrom.priceParam1.name ='工作时长'
			this.feeFrom.priceParam1.unit ='时'
			this.feeFrom.priceParam2.name ='实际用工人数：'
			this.feeFrom.priceParam2.name ='用工人数'
			this.feeFrom.priceParam2.unit ='人'
			}else if(this.info.carType==1){
			//按小时
			this.feeFrom.priceParam1.name ='包装重量：'
			this.feeFrom.priceParam1.name ='包装重量'
			this.feeFrom.priceParam1.unit ='斤'
			this.feeFrom.priceParam2.name =null
			this.feeFrom.priceParam2.unit =null
			}
			}else if(this.info.type==1 && this.info.carType==0){
			//运货单按天数
			this.feeFrom.priceParam1.name ='实际用车天数：'
			this.feeFrom.priceParam1.name ='用车天数'
			this.feeFrom.priceParam1.unit ='天'
			}else if(this.info.type==1 && this.info.carType==1){
			//运货单按次数
			this.feeFrom.priceParam1.name ='实际用车次数：'
			this.feeFrom.priceParam1.name ='用车次数'
			this.feeFrom.priceParam1.unit ='次'
			}
			}