修改部分错误，增加新功能

qingyiay

2023-05-17 af436aa050f76584cd5cb88e413e45cd08c15d50

修改部分错误，增加新功能

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

@@ -13,14 +13,7 @@
                        <view class="huodai-list">
                            <u-swipe-action>
                                <u-cell-group :border="false">
                                    <u-swipe-action-item
                                        :options="options1"
                                        v-for="(item, index) in huoDaiData"
                                        :index="item.userId"
                                        :name="item.userId"
                                        :key="index"
                                        @click="deleteHuoDaiClick"
                                    >
                                    <u-swipe-action-item :options="options1" v-for="(item, index) in huoDaiData" :key="item.userId" :name="item.userId" @click="deleteHuoDaiClick">
                                        <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>
@@ -42,14 +35,7 @@
                        <view class="fleet-list">
                            <u-swipe-action>
                                <u-cell-group :border="false">
                                    <u-swipe-action-item
                                        :options="options1"
                                        v-for="(item, index) in fleetData"
                                        :index="item.id"
                                        :name="item.id"
                                        :key="index"
                                        @click="deleteFleetClick"
                                    >
                                    <u-swipe-action-item :options="options1" v-for="(item, index) in fleetData" :key="item.id" :name="item.id" @click="deleteFleetClick">
                                        <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>

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

@@ -150,6 +150,9 @@
    onShow() {
        this.init();
    },
    onHide() {
        clearInterval(this.interval);
    },
    beforeDestroy() {
        clearInterval(this.interval);
    },

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

@@ -75,7 +75,7 @@
            color: #896227;
        }
        &-coalTwo {
            width: 84%;
            width: 80%;
            margin-top: 20%;
            margin: 20% auto 0;
            font-size: vww(20);
@@ -110,8 +110,8 @@
            justify-content: center;
            align-items: center;
            position: absolute;
            width: 100%;
            bottom: 161rpx;
            left: 42.5%;
            image {
                width: vww(52);
                height: vww(52);

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

@@ -298,7 +298,7 @@
            }
        },
        sideline() {
            return this.weighList.orderType == '内购' || this.weighList.orderType == '转出';
            return this.weighList.orderType == '内购' || this.weighList.orderType == '转入';
        }
    },
    methods: {
@@ -324,6 +324,9 @@
                    }
                    if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
                        this.isInputOrigin = true;
                        if (this.isInputOrigin) {
                            this.$u.toast('信息已填写');
                        }
                    }
                }
            });
@@ -569,7 +572,8 @@
        }
    }
    .bottom-block {
        width: 690rpx;
        width: calc(100% - 60rpx);
        box-sizing: border-box;
        height: 630rpx;
        margin: 0 vww(15) vww(45) vww(15);
        background: #ffffff;
@@ -577,6 +581,7 @@
        border-radius: 20rpx;
        @include flex;
        justify-content: center;
        overflow: hidden;
        .block-main {
            width: 94%;
            height: 565rpx;
@@ -585,6 +590,7 @@
            justify-content: space-around;
            align-items: flex-start;
            flex-direction: column;
            overflow: hidden;
            .main-information {
                width: 100%;
                height: 28rpx;
@@ -593,6 +599,7 @@
                color: #303030;
                @include flex;
                justify-content: flex-start;
                overflow: hidden;
                .prefix {
                    min-width: vww(60);
                }

 pages/driver-page/driver-index/driver-index.vue

@@ -31,12 +31,15 @@
                                </view>
                            </view>
                        </view>
                        <view class="second-line">
                        <!-- <view class="second-line">
                            <view class="coal-name">{{ item.coalName }}</view>
                        </view>
                        </view> -->
                        <view class="third-line">
                            <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
                            <view class="send-date">{{ item.sendDate }}</view>
                            <view class="type">
                                <view class="coal-name">{{ item.coalName }}</view>
                            </view>
                        </view>
                        <view class="fourth-line" @click="qiangDanBtn(item)" v-if="item.carNum - item.taskNum !== 0"><view class="button-img">立即抢单</view></view>
                    </view>
@@ -505,10 +508,33 @@
                        width: 148rpx;
                        height: 24rpx;
                        margin-left: vww(14);
                        margin-right: vww(56);
                        line-height: 24rpx;
                        font-size: 28rpx;
                        font-weight: 300;
                        color: #515151;
                    }
                    .type {
                        flex: 1;
                        margin-right: vww(10);
                        display: flex;
                        justify-content: center;
                        align-items: center;
                        .coal-name {
                            width: 120rpx;
                            height: 42rpx;
                            line-height: 42rpx;
                            border: 2px solid #035cfb;
                            border-radius: 4rpx;
                            font-size: 28rpx;
                            font-weight: 300;
                            color: #035cfb;
                            text-align: center;
                            padding: vww(3) vww(11);
                            white-space: nowrap;
                            overflow: hidden;
                            text-overflow: ellipsis;
                        }
                    }
                }
                .fourth-line {
@@ -518,8 +544,8 @@
                    display: flex;
                    justify-content: flex-end;
                    position: relative;
                    left: vww(190);
                    bottom: vww(10);
                    left: vww(203);
                    bottom: vww(3);
                    .button-img {
                        width: 100%;
                        height: 100%;
@@ -608,9 +634,9 @@
                    justify-content: flex-start;
                    margin-left: vww(18);
                    .clock {
                        width: 33%;
                        width: 40%;
                        height: vww(21);
                        margin-right: vww(70);
                        margin-right: vww(50);
                        line-height: vww(21);
                        @include flex;
                        justify-content: flex-start;

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

@@ -3,7 +3,7 @@
        <view class="driver-banner">
            <view class="navgation">我的</view>
            <view class="avatar">
                <view class="avatar-imgage" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/avatar.png')no-repeat;background-size: cover;"></view>
                <view class="avatar-imgage" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/driverava.png')no-repeat;background-size: cover;"></view>
                <view class="avatar-name">{{ userInfo.name || '' }}</view>
                <view class="edit-button"><u-button type="primary" @click="editBtnClick" shape="circle" plain>编辑个人资料</u-button></view>
            </view>

 pages/public-page/forward/forward.vue

@@ -17,9 +17,9 @@
        <view v-else-if="roleType == 2" class="notice-bar"><u-notice-bar :text="text1" :fontSize="30"></u-notice-bar></view>
        <view class="card-main">
            <view class="card-block">
                <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
                <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="val.vid">
                    <u-swipe-action>
                        <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)" :index="index" :name="val.xsUserId || val.fleetId">
                        <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)" :name="val.vid">
                            <view class="card-content">
                                <u--form labelPosition="left" :model="forwardForm" ref="form1">
                                    <u-form-item label="转发对象" labelWidth="21%" ref="item1" @click="forwardObjectClick(index)">
@@ -111,7 +111,8 @@
                        carNum: item.carNum,
                        xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
                        fleetId: item.fleetId === null ? 0 : item.fleetId,
                        checkboxValue1: ''
                        checkboxValue1: '',
                        vid: new Date().getTime()
                    };
                });
            } else if (res.data.length !== 0 && this.roleType == 2) {
@@ -123,7 +124,8 @@
                        carNum: item.carNum,
                        xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
                        fleetId: item.fleetId === null ? 0 : item.fleetId,
                        checkboxValue1: ''
                        checkboxValue1: '',
                        vid: new Date().getTime()
                    };
                });
            } else {
@@ -131,7 +133,8 @@
                    if (!v.orderPlanId) {
                        return {
                            ...v,
                            orderPlanId: params.orderPlanId
                            orderPlanId: params.orderPlanId,
                            vid: new Date().getTime()
                        };
                    }
                });
@@ -411,7 +414,8 @@
                    xsUserId: 0,
                    fleetId: 0,
                    checkboxValue1: '',
                    ischecked: false
                    ischecked: false,
                    vid: new Date().getTime()
                });
            } else {
                this.jhOrderPlanForwardList.push({
@@ -421,7 +425,8 @@
                    xsUserId: 0,
                    fleetId: 0,
                    checkboxValue1: '',
                    ischecked: true
                    ischecked: true,
                    vid: new Date().getTime()
                });
            }
            this.calculate(this.jhOrderPlanForwardList);

 pages/public-page/mapRoute/mapRoute.vue

@@ -2,7 +2,16 @@
    <view>
        <view class="page-body" style="margin-top: 4rpx;">
            <view class="page-section page-section-gap">
                <map style="width: 100%; height: 600px;" :latitude="latitude" :longitude="longitude" :markers="markers" :polyline="polyline"></map>
                <map
                    style="width: 100%; height: 600px;"
                    :latitude="latitude"
                    :longitude="longitude"
                    :markers="markers"
                    :polyline="polyline"
                    @markertap="awaken"
                    @callouttap="awaken"
                    @tap="awaken"
                ></map>
            </view>
        </view>
        <view class="tip">
@@ -238,14 +247,13 @@

<style lang="scss" scoped>
.tip {
    margin-top: 60rpx;
    width: 94%;
    height: 40rpx;
    font-size: 40rpx;
    margin: vww(22) auto;
    display: flex;
    justify-content: space-around;
    .first {
        color: #c78a64;
        color: #515151;
        text {
            font-size: 45rpx;
            color: #f81414;
@@ -259,6 +267,10 @@
    justify-content: center;
    /deep/.u-button {
        width: 300rpx;
        border: 1px solid #3b56eb;
        border-radius: 37rpx 37rpx 37rpx 37rpx;
        background-color: transparent;
        color: #3b56eb;
    }
}
</style>