修复错误，增加验证

qingyiay

2023-05-17 ae1aad66a165ee7253bed2127a3b53baa40c2361

修复错误，增加验证

 pages/customer-page/customer-index/customer-index.vue

@@ -209,7 +209,7 @@
            return arrays;
        },
        popupDetermineClick() {
            if (this.receiveNum) {
            if (this.receiveNum > 0) {
                this.getOrderNum.num = this.receiveNum;
                uni.showLoading({ title: '加载中...' });
                this.$reqPost('customerGet', this.getOrderNum, 'params').then(res => {
@@ -217,6 +217,7 @@
                    if (res.code == 0) {
                        this.getOrderNum.num = '';
                        this.GetOrderPlan();
                        this.show = false;
                        uni.showToast({
                            title: '领取成功！',
                            icon: 'none',
@@ -226,13 +227,19 @@
                        this.$u.toast(res.msg ? res.msg : '领取失败');
                    }
                });
            } else if (Number(this.receiveNum) <= 0) {
                uni.showToast({
                    title: '请输入合法的数字',
                    icon: 'none'
                });
                this.show = true;
            } else {
                uni.showToast({
                    title: '请输入领取数量',
                    icon: 'none'
                });
                this.show = true;
            }
            this.show = false;
        },
        /**
         * @客户领取

 pages/customer-page/customer-my/customer-my.vue

@@ -21,7 +21,9 @@
                                        :key="index"
                                        @click="deleteHuoDaiClick"
                                    >
                                        <u-cell :title="item.name" value="详情" @click="toFreightForwarderDetails(item.userId)"></u-cell>
                                        <u-cell :title="item.name" value="详情" @click="toFreightForwarderDetails(item.userId)">
                                            <u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
                                        </u-cell>
                                    </u-swipe-action-item>
                                </u-cell-group>
                            </u-swipe-action>
@@ -48,7 +50,9 @@
                                        :key="index"
                                        @click="deleteFleetClick"
                                    >
                                        <u-cell :title="item.name" :value="item.userSijisum + '辆'" @click="tofleetDetails(item.id)"></u-cell>
                                        <u-cell :title="item.name" :value="item.userSijisum + '辆'" @click="tofleetDetails(item.id)">
                                            <u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
                                        </u-cell>
                                    </u-swipe-action-item>
                                </u-cell-group>
                            </u-swipe-action>

 pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue

@@ -559,10 +559,10 @@
            return uni.getStorageSync('roleType');
        },
        dateRange() {
            return `${this.firstFilter}-${this.lastFilter}`;
            return `${this.firstFilter}至${this.lastFilter}`;
        },
        dateselect() {
            return `${this.first}-${this.last}`;
            return `${this.first}至${this.last}`;
        },
        coalTotal() {
            return this.coalList.length;
@@ -588,8 +588,8 @@
    },
    watch: {
        dateselect(newV, old) {
            let tempDate = `${this.first}-${this.last}`;
            if (newV != old && old != '-') {
            let tempDate = `${this.first}至${this.last}`;
            if (newV != old && old != '至') {
                this.first = newV.slice(0, 10);
                this.last = newV.slice(11);
                this.getTmTaskCoalData();

 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue

@@ -59,7 +59,7 @@
                    <u-button text="入场申请" type="primary" plain @click="rcsqClick" shape="circle"></u-button>
                </view>
                <view class="bottom-button">
                    <u-button text="放空" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="!isEvacuation"></u-button>
                    <u-button text="放空" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="isEvacuation || isapproach"></u-button>
                    <u-button text="呼叫客服" type="primary" plain @click="callCustomerService" shape="circle"></u-button>
                </view>
            </view>
@@ -143,11 +143,15 @@
            primaryClean: null,
            scrollTop: 0,
            // 磅单类型
            orderType: ''
            orderType: '',
            interval: ''
        };
    },
    onShow() {
        this.init();
    },
    beforeDestroy() {
        clearInterval(this.interval);
    },
    computed: {
        ...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -170,10 +174,27 @@
        //
        isEvacuation() {
            return this.coalDetailsData.hair == 0 || this.coalDetailsData.skin == 0;
        },
        isapproach() {
            return this.currentPageCoalStatus < 3;
        }
    },
    methods: {
        init() {
            this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
                if (res.code == 0) {
                    this.dayRZ = res.data;
                    this.dayRZ = this.dayRZ.map(v => {
                        let slicedate = v.taskStatusDes.slice(0, 10);
                        if (slicedate == this.currentDate) {
                            return {
                                ...v,
                                taskStatusDes: v.taskStatusDes.slice(10)
                            };
                        }
                    });
                }
            });
            this.coalDayPage(); //获取日志
            this.getTakeCoal(); //获取提煤单详情
            this.getgetService(); //获取客服
@@ -231,20 +252,22 @@
        },
        // 日志查询
        coalDayPage() {
            this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
                if (res.code == 0) {
                    this.dayRZ = res.data;
                    this.dayRZ = this.dayRZ.map(v => {
                        let slicedate = v.taskStatusDes.slice(0, 10);
                        if (slicedate == this.currentDate) {
                            return {
                                ...v,
                                taskStatusDes: v.taskStatusDes.slice(10)
                            };
                        }
                    });
                }
            });
            this.interval = setInterval(() => {
                this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
                    if (res.code == 0) {
                        this.dayRZ = res.data;
                        this.dayRZ = this.dayRZ.map(v => {
                            let slicedate = v.taskStatusDes.slice(0, 10);
                            if (slicedate == this.currentDate) {
                                return {
                                    ...v,
                                    taskStatusDes: v.taskStatusDes.slice(10)
                                };
                            }
                        });
                    }
                });
            }, 5000);
        },
        // 展示提煤单详情
        showCaolPickUpBill() {

 pages/driver-page/drvier-my/drvier-my.vue

@@ -17,7 +17,7 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.idCard || '' }}
                                <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon>
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line">
@@ -27,7 +27,7 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.phone || '' }}
                                <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon>
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line">
@@ -37,7 +37,7 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.carNo || '' }}
                                <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon>
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line">
@@ -47,7 +47,7 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.axleNum || '' }}
                                <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon>
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> -->
                            </view>
                        </view>
                        <view class="information-line last">
@@ -57,7 +57,7 @@
                            </view>
                            <view class="information-value">
                                {{ userInfo.weight || '' }}
                                <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon>
                                <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon> -->
                            </view>
                        </view>
                    </view>

 pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue

@@ -21,7 +21,9 @@
                                        :key="index"
                                        @click="deleteFleetClick"
                                    >
                                        <u-cell :title="item.name" :value="item.userSijisum + '辆'" @click="tofleetDetails(item.id)"></u-cell>
                                        <u-cell :title="item.name" :value="item.userSijisum + '辆'" @click="tofleetDetails(item.id)">
                                            <u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
                                        </u-cell>
                                    </u-swipe-action-item>
                                </u-cell-group>
                            </u-swipe-action>

 pages/public-page/forward/forward.vue

@@ -376,6 +376,16 @@
            let time;
            let that = this;
            that.$set(that.jhOrderPlanForwardList[index], 'carNum', Number(value));
            if (that.roleType == 1) {
                if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplus1) {
                    that.jhOrderPlanForwardList[index].checkboxValue1 = '';
                }
            }
            if (that.roleType == 2) {
                if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplusHuodai) {
                    that.jhOrderPlanForwardList[index].checkboxValue1 = '';
                }
            }
            return (function() {
                if (!time) {
                    time = setTimeout(() => {

 pages/public-page/mapRoute/mapRoute.vue

@@ -15,7 +15,7 @@
                <text>{{ duration || '' }}</text>
            </view>
        </view>
        <view class="open-button" @click="awaken"><button type="default">跳转</button></view>
        <view class="open-button" @click="awaken"><u-button type="primary">使用手机地图</u-button></view>
    </view>
</template>

@@ -253,7 +253,12 @@
    }
}
.open-button {
    width: 200rpx;
    margin: 10rpx 0;
    width: 100%;
    margin: 40rpx 0;
    display: flex;
    justify-content: center;
    /deep/.u-button {
        width: 300rpx;
    }
}
</style>

 pages/register/register.vue

@@ -147,12 +147,18 @@
                    message: '请填写姓名',
                    trigger: ['blur', 'change']
                },
                idCard: {
                    type: 'string',
                    required: true,
                    message: '请输入身份证号',
                    trigger: ['blur', 'change']
                },
                idCard: [
                    {
                        type: 'string',
                        required: true,
                        message: '请输入身份证号',
                        trigger: ['blur', 'change']
                    },
                    {
                        pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
                        message: '身份证号格式不正确'
                    }
                ],
                phone: [
                    {
                        required: true,
@@ -164,6 +170,13 @@
                        min: 11,
                        max: 11,
                        message: '请输入合法手机号'
                    },
                    {
                        validator: (rule, value, callback) => {
                            return uni.$u.test.mobile(value);
                        },
                        message: '手机号码不正确',
                        trigger: ['change', 'blur']
                    }
                ],
                password: [