qingyiay
2023-07-14 f5d9fc10d155aed63fdf91217380610faa60f9e0
转发页面修改
4个文件已修改
224 ■■■■ 已修改文件
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/drvier-my/drvier-my.vue 171 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/public-page/forward/forward.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/register/register.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -221,8 +221,14 @@
        },
        watch: {
            realTimeWeigh(newV, oldV) {
                if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList.orderType ==
                    '转出') {
            },
            // 监听重量变化
            globalweigh: {
                handler: function(newV) {
                    this.weighData.weigh = this.realTimeWeigh = newV;
                    if (this.weighList.orderType == '外销' || this.weighList.orderType == '内销' || this.weighList
                        .orderType == '转出') {
                    if (!this.showWeigh.skin) {
                        this.temporaryWeighObj.skin = newV;
                    } else {
@@ -236,16 +242,11 @@
                        this.temporaryWeighObj.hair = newV;
                    } else {
                        this.temporaryWeighObj.skin = newV;
                        this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
                            this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this
                                .showWeigh
                            .skin > 0;
                    }
                }
            },
            // 监听重量变化
            globalweigh: {
                handler: function(newV) {
                    this.weighData.weigh = this.realTimeWeigh = newV;
                    console.log(this.realTimeWeigh, '真实重量改变了');
                },
                deep: true
            }
@@ -294,7 +295,13 @@
            },
            currentClean() {
                if (!this.currentSkin) return ''
                if (this.weighList.orderType == '外购' || this.weighList.orderType == '内购' || this.weighList
                    .orderType == '转入') {
                return (this.currentHair - this.currentSkin).toFixed(2)
                } else {
                    return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
                }
            }
        },
        methods: {
pages/driver-page/drvier-my/drvier-my.vue
@@ -1,5 +1,7 @@
<template>
    <view class="driver-my">
        <view class=""
            style="height: 446rpx;width: 100%;">
        <view class="driver-banner">
            <view class="navgation">我的</view>
            <view class="avatar">
@@ -12,6 +14,9 @@
                        shape="circle"
                        plain>编辑个人资料</u-button></view>
            </view>
            </view>
        </view>
        <view class="information-block">
            <view class="personal-information">
                <view class="personal-information-block">
                    <view class="block-main">
@@ -60,6 +65,17 @@
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line">
                            <view class="line-label">
                                <image :src="`${onlineurl}/appimg/image/banner/axisnum.png`"
                                    mode="widthFix"></image>
                                <view class="label-text">车牌颜色</view>
                            </view>
                            <view class="information-value">
                                {{ userInfo.vehicleColour || '' }}
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line last">
                            <view class="line-label">
                                <image :src="`${onlineurl}/appimg/image/banner/weighnum.png`"
@@ -68,7 +84,6 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.weight || '' }}
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon> -->
                            </view>
                        </view>
                    </view>
@@ -90,6 +105,24 @@
                                width="80px"
                                height="80px"
                                @click="imageClick(1)">
                                <view slot="error"
                                    style="font-size: 24rpx;">加载失败</view>
                            </u--image>
                        </view>
                    </view>
                    <view class="car-img">
                        <view class="label-title">
                            <image :src="`${onlineurl}/appimg/image/banner/cardimg.png`"
                                mode="widthFix"></image>
                            <view class="label-text">车头车尾车身照片</view>
                        </view>
                        <view class="img-container"
                            v-for="item in userInfo.bodyofcarJpg?userInfo.bodyofcarJpg.split(','):[]">
                            <u--image :showLoading="true"
                                :src="item.url ? item.url : ''"
                                width="80px"
                                height="80px"
                                @click="imageClickCarBody(item.url)">
                                <view slot="error"
                                    style="font-size: 24rpx;">加载失败</view>
                            </u--image>
@@ -173,12 +206,37 @@
                                inputAlign="left"></u--input>
                        </u-form-item>
                        <u-form-item labelWidth="20%"
                            label="修改密码"
                            prop="password">
                            <u--input v-model="editUserInfo.password"
                                border="none"
                                inputAlign="left"></u--input>
                        </u-form-item>
                        <u-form-item labelWidth="20%"
                            label="车牌号"
                            prop="carNo"
                            required>
                            <u--input v-model="editUserInfo.carNo"
                                border="none"
                                inputAlign="left"></u--input>
                        </u-form-item>
                        <u-form-item labelWidth="20%"
                            label="车牌颜色"
                            required
                            prop="vehicleColour">
                            <u-radio-group v-model="editUserInfo.vehicleColour"
                                placement="row"
                                size="30"
                                shape="circle"
                                iconSize="20">
                                <u-radio labelSize="14px"
                                    size="20px"
                                    :customStyle="{ marginBottom: '8px' }"
                                    v-for="(item, index) in radiolist2"
                                    :key="index"
                                    :label="item.name"
                                    :name="item.value"></u-radio>
                            </u-radio-group>
                        </u-form-item>
                        <u-form-item labelWidth="20%"
                            label="体重"
@@ -211,6 +269,23 @@
                                width="250"
                                height="150"
                                :previewFullImage="true"></u-upload>
                        </u-form-item>
                        <u-form-item prop="bodyofcarJpg"
                            label="车头车尾车身照片"
                            labelWidth="20%"
                            required
                            @click="beforeRead">
                            <u-upload :fileList="fileList3"
                                deletable
                                @afterRead="afterRead"
                                @delete="deletePic"
                                name="3"
                                multiple
                                :maxCount="3"
                                width="250"
                                height="150"
                                :previewFullImage="true">
                            </u-upload>
                        </u-form-item>
                        <u-form-item labelWidth="25%"
                            label="行驶证照片"
@@ -268,7 +343,10 @@
                    drivingImg: '',
                    axleNum: '',
                    weight: '',
                    userId: ''
                    userId: '',
                    vehicleColour: '',
                    bodyofcarJpg: '',
                    password: ''
                },
                rules: {
                    name: {
@@ -313,6 +391,9 @@
                        message: '请填写体重',
                        trigger: ['blur', 'change']
                    },
                    password: {
                        required: false,
                    },
                    carNo: [{
                            type: 'string',
                            required: true,
@@ -330,6 +411,12 @@
                            trigger: ['change', 'blur']
                        }
                    ],
                    vehicleColour: {
                        type: 'string',
                        required: true,
                        message: '请选择车牌颜色',
                        trigger: ['blur', 'change']
                    },
                    axleNum: [{
                        transform(value) {
                            return Number(value);
@@ -346,6 +433,12 @@
                        message: '请上传车辆图片',
                        trigger: ['blur', 'change']
                    },
                    bodyofcarJpg: {
                        type: 'string',
                        required: true,
                        message: '请上传车辆图片',
                        trigger: ['blur', 'change']
                    },
                    drivingImg: {
                        type: 'string',
                        required: true,
@@ -356,6 +449,9 @@
                src: '',
                fileList1: [],
                fileList2: [],
                // 车头车身车尾照片
                fileList3: [],
                carBody: [],
                // 修改信息弹出框
                editDriverPopupShow: false,
                // previewImage
@@ -366,7 +462,20 @@
                logoutTitle: '提示',
                logoutContent: '是否确认退出',
                BaseUrl,
                onlineurl
                onlineurl,
                radiolist2: [{
                        name: '黄色',
                        value: '黄色'
                    },
                    {
                        name: '黄绿色',
                        value: '黄绿色'
                    },
                    {
                        name: '蓝色',
                        value: '蓝色'
                    }
                ],
            };
        },
        onShow() {
@@ -389,6 +498,7 @@
                    this.userInfo = res.data;
                    uni.setStorageSync('carImg', this.userInfo.carImg);
                    uni.setStorageSync('drivingImg', this.userInfo.drivingImg);
                    uni.setStorageSync('bodyofcarJpg', this.userInfo.bodyofcarJpg)
                    if (this.fileList1.length == 0) {
                        this.fileList1.push({
                            url: `${BaseUrl}${this.userInfo.carImg}`
@@ -399,9 +509,25 @@
                            url: `${BaseUrl}${this.userInfo.drivingImg}`
                        });
                    }
                    if (this.fileList3.length == 0) {
                        if (!this.userInfo.bodyofcarJpg) return
                        if (this.userInfo.bodyofcarJpg.indexOf(',') !== -1) {
                            let bodyofcarJpg = this.userInfo.bodyofcarJpg.split(',')
                            bodyofcarJpg.forEach(v => {
                                this.fileList3.push({
                                    url: `${BaseUrl}${v}`
                                });
                            })
                        } else {
                            this.fileList3.push({
                                url: `${BaseUrl}${this.userInfo.bodyofcarJpg}`
                            });
                        }
                    }
                    Object.keys(this.editUserInfo).map(item => {
                        if (res.data[item]) {
                            this.editUserInfo[item] = res.data[item];
                            this.editUserInfo.password = ''
                        }
                    });
                });
@@ -411,8 +537,6 @@
                this.editDriverPopupShow = true;
            },
            imageClick(index) {
                // 通过index切换图片
                console.log('切换图片', index);
                if (index == 1) {
                    this.previewImageSrc = this.userInfo.carImg;
                } else {
@@ -421,6 +545,9 @@
                this.$nextTick(() => {
                    this.previewImageShow = true;
                });
            },
            imageClickCarBody(url) {
                this.previewImageSrc = url;
            },
            beforeRead() {
                this.changeisUploadimg(true);
@@ -463,9 +590,6 @@
                        url: BaseUrl + '/admin/sys-file/uploadUnToken',
                        filePath: url,
                        name: 'file',
                        // formData: {
                        //     user: 'test'
                        // },
                        success: res => {
                            if (num == 1) {
                                this.editUserInfo.carImg = JSON.parse(res.data).data.url;
@@ -474,6 +598,12 @@
                            } else if (num == 2) {
                                this.editUserInfo.drivingImg = JSON.parse(res.data).data.url;
                                uni.setStorageSync('drivingImg', JSON.parse(res.data).data.url);
                                resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                            } else if (num == 3) {
                                let imageUrl = JSON.parse(res.data).data.url
                                this.carBody.push(imageUrl)
                                uni.setStorageSync('bodyofcarJpg', this.carBody.join(','));
                                this.editUserInfo.bodyofcarJpg = this.carBody.join(',')
                                resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                            }
                        }
@@ -503,7 +633,8 @@
                this.editUserInfo = {
                    ...this.editUserInfo,
                    carImg: uni.getStorageSync('carImg'),
                    drivingImg: uni.getStorageSync('drivingImg')
                    drivingImg: uni.getStorageSync('drivingImg'),
                    bodyofcarJpg: uni.getStorageSync('bodyofcarJpg')
                };
                this.$refs.editRef
                    .validate()
@@ -556,15 +687,10 @@
        align-items: center;
    }
    .statistics {
        margin-top: vww(10);
        margin-bottom: vww(10);
    }
    ::v-deep.driver-my {
        width: 100%;
        margin: 0 auto;
        padding-bottom: vww(60);
        padding-bottom: vww(100);
        .driver-banner {
            width: 100%;
@@ -617,17 +743,21 @@
                    top: vww(4);
                }
            }
        }
        .information-block {
            width: 100%;
            .personal-information {
                width: 100%;
                display: flex;
                justify-content: center;
                position: relative;
                top: vww(20);
                top: vww(-20);
                &-block {
                    width: 690rpx;
                    height: 478rpx;
                    height: 550rpx;
                    background: #ffffff;
                    box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
                    border-radius: 20rpx;
@@ -683,12 +813,11 @@
        .car-information {
            width: 100%;
            position: relative;
            top: vww(410);
            @include flex justify-content: center;
            .information-main {
                width: 690rpx;
                height: 552rpx;
                height: 828rpx;
                background: #ffffff;
                box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
                border-radius: 20rpx;
@@ -707,7 +836,7 @@
                        .label-title {
                            @include flex;
                            width: 220rpx;
                            width: 300rpx;
                            height: 100rpx;
                            .label-text {
@@ -731,7 +860,7 @@
            @include flex;
            justify-content: center;
            position: relative;
            bottom: vww(-430);
            top: vww(20);
            .loginout-main {
                width: 84%;
pages/public-page/forward/forward.vue
@@ -158,10 +158,10 @@
                        return {
                            id: item.id,
                            orderPlanId: item.orderPlanId,
                            name: item.xsUserName === null ? item.fleetName : item.xsUserName,
                            name: item.xsUserName ? item.xsUserName : item.fleetName,
                            carNum: item.carNum,
                            xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
                            fleetId: item.fleetId === null ? 0 : item.fleetId,
                            xsUserId: item.xsUserId ? item.xsUserId : 0,
                            fleetId: item.fleetId ? item.fleetId : 0,
                            checkboxValue1: '',
                            vid: `${new Date().getTime()}${index}${item.id}`
                        };
@@ -173,8 +173,8 @@
                            orderPlanId: item.orderPlanId,
                            name: item.fleetName,
                            carNum: item.carNum,
                            xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
                            fleetId: item.fleetId === null ? 0 : item.fleetId,
                            xsUserId: item.xsUserId ? 0 : item.xsUserId,
                            fleetId: item.fleetId ? 0 : item.fleetId,
                            checkboxValue1: '',
                            vid: `${new Date().getTime()}${index}${item.id}`
                        };
pages/register/register.vue
@@ -122,8 +122,8 @@
                        :previewFullImage="true">
                    </u-upload>
                </u-form-item>
                <u-form-item prop="bodyOfCarJpg"
                    label="车辆细节照片"
                <u-form-item prop="bodyofcarJpg"
                    label="车头车尾车身照片"
                    labelWidth="20%"
                    borderBottom
                    v-if="radiovalue1 == '司机'"
@@ -236,7 +236,7 @@
                    tuiJianMa: '',
                    confirmPassword: '',
                    vehicleColour: '',
                    bodyOfCarJpg: ''
                    bodyofcarJpg: ''
                },
                fileList1: [],
                fileList2: [],
@@ -330,7 +330,7 @@
                        message: '请上传车辆图片',
                        trigger: ['blur', 'change']
                    },
                    bodyOfCarJpg: {
                    bodyofcarJpg: {
                        type: 'string',
                        required: true,
                        message: '请上传车辆图片',
@@ -355,15 +355,15 @@
                radiovalue1: '货代',
                radiolist2: [{
                        name: '黄色',
                        value: 'huangse'
                        value: '黄色'
                    },
                    {
                        name: '绿色',
                        value: 'lvse'
                        name: '黄绿色',
                        value: '黄绿色'
                    },
                    {
                        name: '蓝色',
                        value: 'lanse'
                        value: '蓝色'
                    }
                ],
                beforeChangeValue: '',
@@ -508,7 +508,7 @@
                            } else if (num == 3) {
                                let imageUrl = JSON.parse(res.data).data.url
                                this.carBody.push(imageUrl)
                                this.registerFormModel.bodyOfCarJpg = this.carBody.join(',')
                                this.registerFormModel.bodyofcarJpg = this.carBody.join(',')
                                resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                            }
                        }