Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

MrShi

2025-09-03 a377521310f5f9a39b71e7c7ce4623d5a13ea185

 small-program/pages/order-details/order-details.vue

@@ -299,38 +299,41 @@
            <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" 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="请输入" />
                  <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="请输入" />
                  <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">备注信息：</view>
               <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">
               <view class="querenfee-c-info1">实际总费用：</view>
               <view class="querenfee-c-input">
               <view class="querenfee-c-price">
                  ￥{{confirmPayFee}}
               </view>
               <!-- <view class="querenfee-c-input">
                  <image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
                  <text class="querenfee-c-input money">{{confirmPayFee}}</text>
               </view>
               </view> -->
            </view>
            <view class="querenfee-c">
            <view class="querenfee-c" style="margin-top: 12rpx;">
               <view class="querenfee-tips">最终费用由发单方支付，接单方收到的金额将扣除平台手续费用</view>
            </view>
            <view class="querenfee-botton" @click="confirmFee">确认费用</view>
@@ -465,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
@@ -731,9 +771,9 @@
                  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){
                  //按小时
@@ -842,6 +882,11 @@
               color: #333333;
               margin-left: 10rpx;
            }
            .querenfee-c-price {
               font-weight: 600;
               font-size: 44rpx;
               color: #FF0000;
            }
            .querenfee-c-info1 {
               width: 50%;
               display: flex;
@@ -849,7 +894,6 @@
               font-weight: 600;
               font-size: 32rpx;
               color: #222222;
               margin-bottom: 20rpx;
            }
            .querenfee-tips{
               width: 100%;
@@ -866,13 +910,6 @@
               color: #FF0000 !important;
            }
            .querenfee-c-input {
               // width: 100%;
               // padding: 0 30rpx;
               // box-sizing: border-box;
               // height: 60rpx;
               // background: #F7F7F7;
               // border-radius: 10rpx;
               // border: 1rpx solid #EEEEEE;
               width: 260rpx;
               height: 100rpx;
               padding: 10rpx 30rpx;
@@ -895,6 +932,9 @@
                  font-size: 56rpx;
                  color: #222222;
                  text-align: right;
                  .querenfee-c-input-placeholder {
                     font-size: 32rpx !important;
                  }
               }
            }
         }