Merge remote-tracking branch 'origin/master'

doum

2025-09-03 e352367d6d5b8441327f6a3ab1ae500ff1425265

Merge remote-tracking branch 'origin/master'

 admin/src/api/business/identityInfo.js

@@ -12,6 +12,13 @@
  })
}

// 导出Excel
export function exportExcel (data) {
  return request.post('/business/identityInfo/exportExcel', data, {
    download: true
  })
}

// 创建
export function create (data) {
  return request.post('/business/identityInfo/create', data)

 admin/src/views/business/identityInfo.vue

@@ -30,6 +30,7 @@
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
        <el-button type="primary" :loading="isWorking.export" @click="exportExcel">导出</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->

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

@@ -186,7 +186,7 @@
                <view class="order-footer-btn-a" @click="show = true" v-if="isPushlishor && (info.status ===0 ||  info.status ===1|| info.status ===2)">取消订单</view>
                <view class="order-footer-btn-b" @click="show2=true" v-if="isPushlishor && (info.status ===4 && info.commentStatus!=1)">去评价</view>
                <view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '继续支付' : '完成并支付'}}</view>
                <view class="order-footer-btn-a" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">确认费用</view>
                <view class="order-footer-btn-b" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">确认费用</view>
                <view class="order-footer-btn-b" v-if="isPushlishor && ((info.status ===3 && info.type===2))" @click="payment1">完成作业</view>
                <view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& isPushlishor && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">修改订单</view>
                <view class="order-footer-btn-b" @click="show5 =true" v-if="isAcceptor&& (info.isUpdate==1 && info.status ===2)">修改确认</view>
@@ -286,14 +286,14 @@
                </view>
                <view class="querenfee-c">
                    <view class="querenfee-c-info1">费用标准：</view>
                    <viem class=" money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
                    <viem class="money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
                </view>
                <view class="querenfee-c" >                     
                    <view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam1.name}}：</view>
                    <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="请输入" />
                    </view>
                    <text class="querenfee-c-info1" >{{feeFrom.priceParam1.unit}}</text>
                    <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>
@@ -307,10 +307,11 @@
                    <view class="querenfee-c-input">
                        <input type="number" v-model="feeForm.confirmOtherFee"  placeholder="请输入" />
                    </view>
                    <text class="querenfee-c-danw">元</text>
                </view>
                <view class="querenfee-c">
                <view class="querenfee-c" style="flex-direction: column;">
                    <view class="querenfee-c-info1">备注信息：</view>
                    <view class="querenfee-c-input">
                    <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>
                    </view>
                </view>
@@ -812,6 +813,7 @@
                width: 100%;
                margin-top: 46rpx;
                display: flex;
                justify-content: space-between;
                .querenfee-c-info {                    
                    align-items: center;
                    font-weight: 500;
@@ -823,11 +825,22 @@
                        margin-left: 10rpx;
                    }
                }
                .querenfee-c-info1 {
                    width: 50%;
                .querenfee-c-danw {
                    display: flex;
                    align-items: center;
                    flex-shrink: 0;
                    font-weight: 400;
                    font-size: 30rpx;
                    color: #666666;
                    color: #333333;
                    margin-left: 10rpx;
                }
                .querenfee-c-info1 {
                    width: 50%;
                    display: flex;
                    align-items: center;
                    font-weight: 600;
                    font-size: 32rpx;
                    color: #222222;
                    margin-bottom: 20rpx;
                }
                .querenfee-tips{
@@ -840,13 +853,22 @@
                .money{
                    width: 50%;
                    text-align: right;
                    color: red !important; 
                    font-weight: 600;
                    font-size: 34rpx;
                    color: #FF0000 !important;
                }
                .querenfee-c-input {
                    width: 100%;
                    padding: 0 30rpx;
                    // 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;
                    box-sizing: border-box;
                    height: 60rpx;
                    background: #F7F7F7;
                    border-radius: 10rpx;
                    border: 1rpx solid #EEEEEE;
@@ -862,7 +884,9 @@
                        flex: 1;
                        height: 100%;
                        font-weight: 500;
                        font-size: 56rpx;
                        color: #222222;
                        text-align: right;
                    }
                }
            }
@@ -876,7 +900,7 @@
                color: #FFFFFF;
                background: #00BC12;
                border-radius: 44rpx;
                margin-top: 264rpx;
                margin-top: 40rpx;
            }
        }
        .zhifu {