Merge remote-tracking branch 'origin/master'

rk

2025-08-21 f79b4282f73759f2e4b696720cdf11581cca7ef2

Merge remote-tracking branch 'origin/master'

 small-program/pages/demand-hall/demand-hall.vue

@@ -36,7 +36,10 @@
            </view>
            <!-- 发单方 -->
            <view class="index-list" v-if="typeViewId === 0">
                <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
                <view class="index-list-wu" v-if="orderList.length === 0">
                    <text>已加载全部数据</text>
                </view>
                <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
                    <view class="index-list-item-head">
                        <view class="index-list-item-head-l">
                            <view class="xoam"></view>
@@ -450,6 +453,15 @@
            width: 100%;
            padding: 20rpx 30rpx;
            box-sizing: border-box;
            .index-list-wu {
                width: 100%;
                margin-top: 40rpx;
                text-align: center;
                text {
                    font-size: 30rpx;
                    color: #666666;
                }
            }
            .index-list-item {
                width: 100%;
                padding: 30rpx;

 small-program/pages/freight/freight.vue

@@ -92,8 +92,10 @@
                        <view class="list-item-row-label">运输重量/数量<b>*</b></view>
                        <view class="list-item-row-val">
                            <input type="text" v-model="form.transportNum" placeholder="请输入" />
                            <text @click="show4 = true">{{form.transportUnit}}</text>
                            <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
                            <view @click="show4 = true" style="width: 100%; flex-shrink: 0; display: flex; align-items: center; justify-content: flex-end;">
                                <text>{{form.transportUnit}}</text>
                                <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
                            </view>
                        </view>
                    </view>
                    <view class="list-item-row" v-if="viewStatus">
@@ -342,6 +344,9 @@
            },
            // 提交订单
            submit() {
                if (!this.form.carUnit) {
                    return uni.showToast({ title: '请选择货车型号', icon: 'none' })
                }
                if (!this.form.transportTypeName) {
                    return uni.showToast({ title: '请选择运输品种', icon: 'none' })
                }
@@ -419,24 +424,25 @@
                var that = this;
                uni.chooseImage({
                    success: (chooseImageRes) => {
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                        uni.uploadFile({
                            url: this.$baseUrl + '/web/public/upload',
                            filePath: tempFilePaths[0],
                            name: 'file',
                            formData: {
                                'folder': 'orders'
                            },
                            success: (uploadFileRes) => {
                                const res = JSON.parse(uploadFileRes.data)
                                that.form.multifileList.push({
                                    fileurl: res.data.imgaddr,
                                    name: res.data.originname,
                                    url: res.data.url,
                                    type: 0
                                })
                            }
                        });
                        for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                            uni.uploadFile({
                                url: this.$baseUrl + '/web/public/upload',
                                filePath: chooseImageRes.tempFilePaths[i],
                                name: 'file',
                                formData: {
                                    'folder': 'orders'
                                },
                                success: (uploadFileRes) => {
                                    const res = JSON.parse(uploadFileRes.data)
                                    that.form.multifileList.push({
                                        fileurl: res.data.imgaddr,
                                        name: res.data.originname,
                                        url: res.data.url,
                                        type: 0
                                    })
                                }
                            });
                        }
                    }
                });
            },

 small-program/pages/index/index.vue

@@ -415,18 +415,39 @@
        async onLoad() { 
            await this.$onLaunched;
            
            if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
            if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
                this.getOrderList()
                this.getCategoryLists()
            }
			
            this.getCategoryLists()
            this.getDictInfo()
			
            if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
                this.form.linkPhone = this.userInfo.telephone
            }
            
            this.qqmapsdk = new QQMapWX({
                key: '4PXBZ-JLBC7-LCLXG-P2SZX-C4HYE-LDBLQ'
            });
            
            this.form.linkPhone = this.userInfo.telephone
			
            this.getDictInfo()
            uni.$on('clear', (data) => {
                this.form.startDate = ''
                this.form.endDate = ''
                this.form.latitude = ''
                this.form.longitude = ''
                this.form.location = ''
                this.form.locationEnd = ''
                this.form.wayInfoDTOList = []
                this.form.workType = 0
                this.form.days = ''
                this.form.locationRemark = ''
                this.form.supplement = ''
                this.form.multifileList = []
                this.form.linkName = ''
                this.form.estimatedAccount = ''
                this.form.price = ''
                this.form.address = ''
            })
        },
        onShow(options) {
            this.typeViewId = 0
@@ -461,7 +482,7 @@
                    this.form.location = ''
                    this.form.locationEnd = ''
                    this.form.wayInfoDTOList = []
                    this.form.workType = ''
                    this.form.workType = 0
                    this.form.days = ''
                    this.form.locationRemark = ''
                    this.form.supplement = ''
@@ -649,24 +670,25 @@
            uploadImg() {
                uni.chooseImage({
                    success: (chooseImageRes) => {
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                        uni.uploadFile({
                            url: this.$baseUrl + '/web/public/upload',
                            filePath: tempFilePaths[0],
                            name: 'file',
                            formData: {
                                'folder': 'orders'
                            },
                            success: (uploadFileRes) => {
                                const res = JSON.parse(uploadFileRes.data)
                                this.form.multifileList.push({
                                    fileurl: res.data.imgaddr,
                                    name: res.data.originname,
                                    url: res.data.url,
                                    type: 0
                                })
                            }
                        });
                        for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                            uni.uploadFile({
                                url: this.$baseUrl + '/web/public/upload',
                                filePath: chooseImageRes.tempFilePaths[i],
                                name: 'file',
                                formData: {
                                    'folder': 'orders'
                                },
                                success: (uploadFileRes) => {
                                    const res = JSON.parse(uploadFileRes.data)
                                    this.form.multifileList.push({
                                        fileurl: res.data.imgaddr,
                                        name: res.data.originname,
                                        url: res.data.url,
                                        type: 0
                                    })
                                }
                            });
                        }
                    }
                });
            },
@@ -1697,7 +1719,7 @@
                                        flex-shrink: 0;
                                    }
                                    text {
                                        flex: 1;
                                        width: 470rpx;
                                        overflow: hidden;
                                        text-overflow: ellipsis;
                                        white-space: nowrap;

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

@@ -7,12 +7,12 @@
            <view class="order-head-status">{{info.statusName || ''}}</view>
            <view class="order-head-info">{{getStatusInfo()}}</view> 
        </view>
        <view class="order-quxiao">
        <view class="order-quxiao" v-if="userInfo.useIdentity != 0">
            <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">取消订单</view>
            <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)">取消订单</view>
            <view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">修改订单</view>
        </view>
        <view class="order-user"  v-if="userInfo.id === info.releaseMemberId">
        <view class="order-user"  v-if="userInfo.id === info.releaseMemberId && userInfo.useIdentity != 0">
            <view class="order-user-info">
                <view class="user-info-l">
                    <view class="user-info-l-image">

 small-program/pages/success/success.vue

@@ -23,6 +23,7 @@
        },
        methods: {
            toIndex() {
                uni.$emit('clear')
                uni.switchTab({
                    url: '/pages/index/index'
                });

 small-program/pages/using-workers/using-workers.vue

@@ -23,8 +23,11 @@
                    </view>
                    <view class="list-item-row">
                        <view class="list-item-row-label">地点描述</view>
                        <view class="list-item-row-val">
                        <!-- <view class="list-item-row-val">
                            <input type="text" v-model="form.locationRemark" placeholder="请输入" />
                        </view> -->
                        <view class="list-item-row-val">
                            <textarea v-model="form.locationRemark" cols="30" rows="10" placeholder="请输入" maxlength="200"></textarea>
                        </view>
                    </view>
                </template>
@@ -314,24 +317,25 @@
            uploadImg() {
                uni.chooseImage({
                    success: (chooseImageRes) => {
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                        uni.uploadFile({
                            url: this.$baseUrl + '/web/public/upload',
                            filePath: tempFilePaths[0],
                            name: 'file',
                            formData: {
                                'folder': 'orders'
                            },
                            success: (uploadFileRes) => {
                                const res = JSON.parse(uploadFileRes.data)
                                this.form.multifileList.push({
                                    fileurl: res.data.imgaddr,
                                    name: res.data.originname,
                                    url: res.data.url,
                                    type: 0
                                })
                            }
                        });
                        for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                            uni.uploadFile({
                                url: this.$baseUrl + '/web/public/upload',
                                filePath: chooseImageRes.tempFilePaths[i],
                                name: 'file',
                                formData: {
                                    'folder': 'orders'
                                },
                                success: (uploadFileRes) => {
                                    const res = JSON.parse(uploadFileRes.data)
                                    this.form.multifileList.push({
                                        fileurl: res.data.imgaddr,
                                        name: res.data.originname,
                                        url: res.data.url,
                                        type: 0
                                    })
                                }
                            });
                        }
                    }
                });
            }

 small-program/pages/withdrawal/withdrawal.vue

@@ -11,13 +11,17 @@
                    <text>提现到账</text>
                    <text>微信零钱</text>
                </view>
                <view class="content-title">真实姓名</view>
                <view class="content-input" style="margin-bottom: 40rpx;"> 
                    <input style="font-weight: 500;" type="text" v-model="name"  @input="changeName" placeholder="微信实名认证姓名" /> 
                </view>
                <view class="content-title">提现金额</view>
                <view class="content-input">
                    <view class="content-input-icon">
                        <image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
                    </view>
                    <input type="number" v-model="amount" @input="changeAmount" placeholder="请输入提现金额" />
                    <view class="content-input-btn" @click="inputAll">全部提现</view>
                    <input type="digit" v-model="amount" @input="changeAmount" placeholder="请输入提现金额" />
                    <view class="content-input-btn" @click="inputAll">全部提现</view> 
                </view>
                <view class="content-tips">{{tips}}</view>
                <view class="content-button" @click="submit">2小时到账，确认提现</view>
@@ -38,10 +42,12 @@
                wxTips:'',
                canTransfer:false,
                changing1:false,
                amount: null
                amount: null,
                name:''
            };
        },
        onLoad(){
            this.name = this.userInfo.name
            var that =this
            that.canTransfer = false
            if (wx.canIUse('requestMerchantTransfer')) {
@@ -74,7 +80,7 @@
                uni.navigateTo({
                    url: '/pages/balance-details/balance-details'
                })
            },
            }, 
            inputAll(){
                this.amount = ((this.userInfo.amount|| 0)/100).toFixed(2)
            },
@@ -88,11 +94,13 @@
                    package: param.packageInfo,
                    success: (res) => {
                      // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
                      console.log(res)
                      uni.navigateTo({
                          url: '/pages/withdrawal-successful/withdrawal-successful'
                      })
                    },
                    fail: (res) => {
                      console.log("22222222222222",res)
                      uni.showToast({
                          title:'对不起，提现失败。'+res.err_msg
                      })
@@ -136,7 +144,7 @@
                  }
                  this.changing1 = true
                  var that = this
                  var param ={amount:this.amount }
                  var param ={amount:this.amount,name:this.name }
                  that.$u.api.applyWithdrawal(param)
                  .then(res =>{
                        if(res.code ===200){