qingyiay
2023-07-02 38de059c83720527d3813448153390da3e6453dc
验质替换页面,称重判断修改
13个文件已修改
2个文件已添加
697 ■■■■ 已修改文件
api/globalApi.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/combined-title/combined-title.vue 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/tab-bar/tab-bar.vue 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/customer-index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue 131 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue 238 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/tabBar-icon/checking.png 补丁 | 查看 | 原始文档 | blame | 历史
static/tabBar-icon/checkingblue.png 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/globalApi.js
@@ -140,6 +140,18 @@
        url: '/wrzs/jcproduct/getJcProductList',
        method: 'GET'
    },
    /**
     * @description 验质产品 河钢     */
    qualityInspection: {
        url: '/wrzs/userOperation/qualityInspection',
        method: 'GET'
    },
    /**
     * @description 验质产品历史 河钢     */
    qualityInspectionHistory: {
        url: '/wrzs/userOperation/qualityInspectionHistory',
        method: 'GET'
    },
    //    用户
    // 获取用户信息
    getUserEntity: {
api/request.js
@@ -83,7 +83,7 @@
const BaseUrl = "http://192.168.31.14:9997";
const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
export const onlineurl = "https://mx.jzeg.cn:9095";
// const BaseUrl = "http://192.168.0.100:9997";
// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info"
components/combined-title/combined-title.vue
@@ -8,10 +8,15 @@
            </view>
            <!-- 结尾 -->
            <view class="title_end" v-if="$slots.rightText">
                <view class="title_end_text" @click="rightTextClick">
                    <image src="https://mx.jzeg.cn:9095/appimg/image/banner/add.png" mode=""></image>
                    <text><slot name="rightText"></slot></text>
            <view class="title_end"
                v-if="$slots.rightText">
                <view class="title_end_text"
                    @click="rightTextClick">
                    <image src="https://mx.jzeg.cn:9095/appimg/image/banner/add.png"
                        mode=""></image>
                    <text>
                        <slot name="rightText"></slot>
                    </text>
                </view>
            </view>
        </view>
@@ -19,63 +24,71 @@
</template>
<script>
export default {
    name: 'combined-title',
    data() {
        return {};
    },
    props: {
        title: {
            type: String,
            default: ''
    import { onlineurl } from '../../api/request.js'
    export default {
        name: 'combined-title',
        data() {
            return {};
        },
        props: {
            title: {
                type: String,
                default: ''
            }
        },
        methods: {
            rightTextClick() {
                this.$emit('rightText');
            }
        }
    },
    methods: {
        rightTextClick() {
            this.$emit('rightText');
        }
    }
};
    };
</script>
<style lang="scss" scope>
.title {
    width: 100%;
    margin: vww(16) auto;
    .title_wrapper {
        height: vww(14);
        display: flex;
        justify-content: space-between;
        align-items: center;
        box-sizing: border-box;
        .title_start {
            .icon {
                display: inline-block;
                width: vww(4);
                height: vww(12);
                background-color: #007aff;
                border-radius: vww(2);
            }
            .text {
                display: inline-block;
                margin-left: vww(8);
                font-size: vww(16);
            }
        }
        .title_end {
            .title_end_text {
                display: flex;
                align-items: center;
                image {
                    margin-right: vww(8);
                    width: vww(21);
                    height: vww(21);
<style lang="scss"
    scope>
    .title {
        width: 100%;
        margin: vww(16) auto;
        .title_wrapper {
            height: vww(14);
            display: flex;
            justify-content: space-between;
            align-items: center;
            box-sizing: border-box;
            .title_start {
                .icon {
                    display: inline-block;
                    width: vww(4);
                    height: vww(12);
                    background-color: #007aff;
                    border-radius: vww(2);
                }
                text {
                .text {
                    display: inline-block;
                    margin-left: vww(8);
                    font-size: vww(16);
                }
            }
            .title_end {
                .title_end_text {
                    display: flex;
                    align-items: center;
                    image {
                        margin-right: vww(8);
                        width: vww(21);
                        height: vww(21);
                    }
                    text {
                        font-size: vww(16);
                    }
                }
            }
        }
    }
}
</style>
</style>
components/tab-bar/tab-bar.vue
@@ -1,55 +1,68 @@
<template>
    <view class="tab-bar">
        <u-tabbar :value="current ? current : 0" @change="tabbarchange" :fixed="true" :placeholder="false" :safeAreaInsetBottom="true" :border="true">
            <u-tabbar-item v-for="(item, index) in tabBarList" :key="index" :text="item.text">
                <image class="u-page__item__slot-icon" slot="active-icon" :src="item.selectedIconPath"></image>
                <image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.iconPath"></image>
        <u-tabbar :value="current ? current : 0"
            @change="tabbarchange"
            :fixed="true"
            :placeholder="false"
            :safeAreaInsetBottom="true"
            :border="true">
            <u-tabbar-item v-for="(item, index) in tabBarList"
                :key="index"
                :text="item.text">
                <image class="u-page__item__slot-icon"
                    slot="active-icon"
                    :src="item.selectedIconPath"></image>
                <image class="u-page__item__slot-icon"
                    slot="inactive-icon"
                    :src="item.iconPath"></image>
            </u-tabbar-item>
        </u-tabbar>
    </view>
</template>
<script>
import store from '@/store';
export default {
    props: {
        current: Number
    },
    created() {
        uni.hideTabBar();
    },
    data() {
        return {
            // tabBarList: this.$store.state.userTabbar
        };
    },
    computed: {
        tabBarList() {
            return this.$store.state.userTabbar;
    import store from '@/store';
    export default {
        props: {
            current: Number
        },
        created() {
            uni.hideTabBar();
        },
        data() {
            return {
                // tabBarList: this.$store.state.userTabbar
            };
        },
        computed: {
            tabBarList() {
                return this.$store.state.userTabbar;
            }
        },
        methods: {
            tabbarchange(e) {
                uni.switchTab({
                    url: '/' + this.tabBarList[e].pagePath
                });
            }
        }
    },
    methods: {
        tabbarchange(e) {
            uni.switchTab({
                url: '/' + this.tabBarList[e].pagePath
            });
        }
    }
};
    };
</script>
<style lang="scss" scoped>
::v-deep.tab-bar {
    .u-tabbar {
        &__content {
            background: #ececec !important;
            &__item-wrapper {
                height: vww(50);
<style lang="scss"
    scoped>
    ::v-deep.tab-bar {
        .u-tabbar {
            &__content {
                background: #ececec !important;
                &__item-wrapper {
                    height: vww(50);
                }
            }
        }
    }
}
.u-page__item__slot-icon {
    width: vww(20) !important;
    height: vww(20) !important;
}
</style>
    .u-page__item__slot-icon {
        width: vww(20) !important;
        height: vww(20) !important;
    }
</style>
pages.json
@@ -210,26 +210,22 @@
                "enablePullDownRefresh": false
            }
        }, {
            "path": "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
            "style": {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
        }, {
            "path": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
            "style": {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
        }
        ,{
            "path" : "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
            "style" :
            {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
        }
        ,{
            "path" : "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
            "style" :
            {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
        }
    ],
    ],
    "subPackages": [{
            "root": "pages/register",
            "pages": [{
@@ -370,6 +366,8 @@
                "pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
            },
            {
                "pagePath": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan"
            }, {
                "pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
                // "iconPath": "static/tabBar-icon/Gmine10.png",
                // "selectedIconPath": "static/tabBar-icon/Bmine57.png",
pages/customer-page/customer-index/customer-index.vue
@@ -4,7 +4,7 @@
            <view class="customer-index-body">
                <!-- 待领取和转发提煤单 -->
                <view class="wait-collection"
                    style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
                    style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') ;background-size:contain;background-repeat: no-repeat;">
                </view>
                <view style="position: relative;top: -120px;">
                    <u-empty mode="data"
@@ -42,7 +42,7 @@
                                    style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carNO.png') no-repeat;background-size: cover">
                                </view>
                            </view>
                            <view class="car-num">{{ item.carNos||''}}</view>
                            <view class="car-num">{{ item.carNos||item.carNo||''}}</view>
                        </view>
                        <view class="third-line">
                            <view class="time-icon">
@@ -63,11 +63,11 @@
                                v-if="item.orderType!=='外购'">
                                <view class="button-image">转发</view>
                            </view>
                            <view class="forward"
                            <!-- <view class="forward"
                                @click.stop="validateClick(index)"
                                v-if='roleType===4'>
                                <view class="button-image">验质</view>
                            </view>
                            </view> -->
                        </view>
                    </view>
                </view>
@@ -162,6 +162,7 @@
</template>
<script>
    import { onlineurl } from '@/api/request.js'
    import card from '@/components/card/card.vue';
    import combinedTitle from '@/components/combined-title/combined-title.vue';
    import { customerId } from '@/utils/status';
@@ -215,12 +216,14 @@
                carNum: "",
                // 剩余的提煤单数量
                carNumSurplus: '',
                canClick: false
                canClick: false,
                onlineurl: ''
            };
        },
        onLoad() {},
        onShow() {
            this.init();
            this.onlineurl = onlineurl;
        },
        methods: {
            init() {
@@ -329,7 +332,7 @@
            // 提煤单详情
            cardBodyClick(v) {
                uni
                    .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
                    .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2?v.cars2:""}` });
            },
            // 点击历史提煤单获取详情
            faYundetail(v) {
@@ -591,6 +594,7 @@
                        }
                        .car-num {
                            color: #515151;
                            white-space: nowrap;
                            overflow: hidden;
                            text-overflow: ellipsis;
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -25,7 +25,7 @@
                        font-weight: 400;
                        color: #F81414;
                        text-shadow: 0rpx 4rpx 0rpx #1A66FE;">
                            /{{ cars2 ||carNum||'' }}
                            /{{ (cars2||'') ||(carNum||'')||'' }}
                        </text>
                    </view>
                </view>
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -57,25 +57,36 @@
                    </view>
                </view>
            </view>
            <view class="origin-info"
                v-if="yyDailyList.orderType == '外购' || yyDailyList.orderType == '内购' || yyDailyList.orderType == '转入'">
                <combined-title title="原发信息"></combined-title>
                <view class="body-container">
                    <view class="container-block">
                        <view class="">皮重</view>
                        <view class="">{{ yyDailyList.skinTwo || 0 }}</view>
                    </view>
                </view>
                <view class="body-container">
                    <view class="container-block">
                        <view class="">毛重</view>
                        <view class="">{{ yyDailyList.hairTwo || 0 }}</view>
                    </view>
                </view>
                <view class="body-container last">
                    <view class="container-block">
                        <view class="">净重</view>
                        <view class="">{{ yyDailyList.cleanTwo || 0 }}</view>
            <view class="weigh-history"
                v-if="showWeigh.length!==0">
                <view class="block-main">
                    <view class="weigh-item"
                        v-for='item in showWeigh'
                        :key="item.id">
                        <view class="weigh-time">
                            <u-tag :text="item.createTime.slice(-8,-3)"
                                plain></u-tag>
                        </view>
                        <view class="item-block">
                            <view class="item">
                                <view class="concrete"
                                    style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
                                    皮</view>
                                <view class="num">{{ item.skin }}</view>
                            </view>
                            <view class="item">
                                <view class="concrete"
                                    style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
                                    毛</view>
                                <view class="num">{{ item.hair }}</view>
                            </view>
                            <view class="item">
                                <view class="concrete"
                                    style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
                                    净</view>
                                <view class="num">{{ item.clean }}</view>
                            </view>
                        </view>
                    </view>
                </view>
            </view>
@@ -105,6 +116,12 @@
                index: ''
            };
        },
        computed: {
            // 展示皮毛净
            showWeigh() {
                return this.orderPlanDetail.tmTaskCoalItems ? this.orderPlanDetail.tmTaskCoalItems : []
            }
        },
        methods: {
            GetOrderPlanDetail() {
                uni.showLoading({
@@ -114,7 +131,6 @@
                    if (res.code == 0) {
                        this.orderPlanDetail = res.data;
                        this.yyDailyList = res.data;
                        console.log(this.yyDailyList);
                        uni.hideLoading();
                    } else {
                        this.$u.toast('加载失败');
@@ -169,33 +185,70 @@
            }
        }
        .origin-info {
        .weigh-history {
            width: 690rpx;
            min-height: 300rpx;
            height: 100%;
            min-height: 420rpx;
            margin: vww(40) auto;
            margin-top: 20rpx;
            margin-bottom: 20rpx;
            background: #ffffff;
            box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
            box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
            border-radius: 20rpx;
            @include flex;
            flex-direction: column;
            align-items: flex-start;
            position: relative;
            font-size: 30rpx;
            font-weight: 300;
            color: #303030;
            overflow: hidden;
            .body-container {
                width: 100%;
                height: vww(56);
                border-bottom: vww(1) solid #d6d6d6;
                @include flex;
                justify-content: center;
                .container-block {
                    width: 94%;
            .block-main {
                display: grid;
                grid-template-columns: auto;
                grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
                gap: auto 5rpx;
                width: 94%;
                height: 100%;
                min-height: 380rpx;
                margin: vww(18) vww(7) vww(11) vww(17);
                gap: 10rpx 20rpx;
                .weigh-item {
                    width: 100%;
                    height: vww(80);
                    @include flex;
                }
            }
                    flex-direction: column;
                    justify-content: space-around;
                    align-items: flex-start;
            .last {
                border-bottom: none;
                    .item-block {
                        width: 100%;
                        height: vww(36);
                        @include flex;
                        justify-content: space-around;
                        .item {
                            min-width: vww(50);
                            height: vww(45);
                            font-size: 21rpx;
                            font-weight: 400;
                            color: #ffffff;
                            text-align: center;
                            line-height: vww(30);
                            @include flex;
                            .concrete {
                                width: vww(36);
                                height: vww(36);
                            }
                            .num {
                                font-size: 40rpx;
                                font-weight: 300;
                                color: #303030;
                            }
                        }
                    }
                }
            }
        }
    }
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -272,7 +272,7 @@
                            @click="confirmCondition"></u-button></view>
                </view>
            </u-popup>
            <tab-bar :current="1"></tab-bar>
            <tab-bar :current="roleType===4?2:1"></tab-bar>
        </view>
        <view class="white-block"></view>
    </view>
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
@@ -1,11 +1,11 @@
<template>
    <view>
    <view class="main">
        <view style="position: relative;top: -120px;">
            <u-empty mode="data"
                icon="http://cdn.uviewui.com/uview/empty/data.png"
                textSize="30"
                iconSize="1000"
                v-if="orderPlanData.length == 0"></u-empty>
                v-if="!orderPlanData"></u-empty>
        </view>
        <view class="collection-form">
            <view class="collection-form-item"
@@ -54,6 +54,74 @@
                </view>
            </view>
        </view>
        <view class="history-numbers">
            <combined-title title="历史提煤单"></combined-title>
            <scroll-view :scroll-top="scrollTop"
                scroll-y="true"
                class="scroll-Y"
                @scrolltolower="historyScrolltolower">
                <u-empty mode="data"
                    icon="http://cdn.uviewui.com/uview/empty/data.png"
                    textSize="30"
                    iconSize="1000"
                    v-if="historyCoalData.length==0"></u-empty>
                <view class="history-information"
                    v-for="(item, index) in historyCoalData"
                    :key="index"
                    @click="faYundetail(item)">
                    <view class="first">
                        <view class="">{{ item.deptName || '' }}</view>
                        <view class=""><u-icon name="arrow-right"
                                color="#999999"
                                size="40"></u-icon></view>
                    </view>
                    <view class="second">
                        <view class="coal-name">{{ item.coalName || '' }}</view>
                        <view class="order-type">{{ item.orderType || '' }}</view>
                    </view>
                    <view class="third">
                        <view class="third-line">
                            <view class="third-line_text">领取数:</view>
                            <view class="third-line_num">{{ item.cars2 }}</view>
                        </view>
                        <view class="third-line">
                            <view class="third-line_text">剩余数:</view>
                            <view class="third-line_num"
                                v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
                            <view class="third-line_num"
                                v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
                        </view>
                        <view class="third-line">
                            <view class="third-line_text">提煤单个数:</view>
                            <view class="third-line_num">{{ item.tmCount }}</view>
                        </view>
                    </view>
                    <view class="fourth">
                        <view class="fourth-icon">
                            <view
                                style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
                            </view>
                        </view>
                        <view class="senddate">{{ item.sendDate }}</view>
                    </view>
                    <view class="fourth">
                        <view class="fourth-icon">
                            <view
                                style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
                            </view>
                        </view>
                        <view class="senddate">{{ item.orderCode }}</view>
                    </view>
                </view>
                <view class="more_text"
                    v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
                <view class="white-block"></view>
            </scroll-view>
        </view>
        <view style="height: 160rpx;width: 100%;">
        </view>
        <tab-bar :current="1"></tab-bar>
    </view>
</template>
@@ -62,7 +130,14 @@
        data() {
            return {
                orderPlanData: [],
                index: null
                historyCoalData: [],
                // 每页数据量
                pageSize: 10,
                // 当前页
                pageCurrent: 1,
                // 是否显示更多数据
                showMoreData: false,
                total: null
            };
        },
        computed: {
@@ -70,25 +145,57 @@
                return uni.getStorageSync('roleType')
            }
        },
        onLoad(params) {
            this.index = params.index ? params.index : ''
        },
        onShow() {
            this.GetOrderPlan()
            this.qualityInspectionHistory()
        },
        methods: {
            GetOrderPlan() {
                uni.showLoading({ title: '加载中...' });
                this.$reqGet('GetOrderPlan').then(res => {
                this.$reqGet('qualityInspection').then(res => {
                    if (res.data) {
                        this.orderPlanData = res.data[this.index].tmTaskCoals ? res.data[this.index].tmTaskCoals :
                            []
                        uni.hideLoading();
                        this.orderPlanData = res.data
                    } else {
                        uni.hideLoading();
                        this.$u.toast('加载失败')
                        uni.hideLoading()
                    }
                })
            },
            // 验质历史
            qualityInspectionHistory() {
                uni.showLoading({ title: '加载中...' });
                this.$reqGet('qualityInspectionHistory', { current: this.pageCurrent, size: this.pageSize }).then(res => {
                    if (res.data) {
                        uni.hideLoading();
                        this.total = res.data.total;
                        if (this.pageCurrent > 1) {
                            this.historyCoalData = this.historyCoalData.concat(res.data.records);
                            this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
                        } else {
                            this.historyCoalData = res.data.records;
                        }
                    } else {
                        uni.hideLoading();
                        this.$u.toast('加载失败')
                    }
                })
            },
            // 上拉加载
            historyScrolltolower() {
                if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
                this.pageCurrent++;
                this.qualityInspectionHistory();
            },
            //fix 点击提煤单返回会增加重复数据
            ArrSet(Arr, id) {
                var obj = {};
                const arrays = Arr.reduce((setArr, item) => {
                    obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
                    return setArr;
                }, []);
                return arrays;
            },
            validateClick(item) {
                uni.navigateTo({
@@ -101,6 +208,113 @@
<style lang="scss"
    scoped>
    @mixin flex {
        display: flex;
        justify-content: space-between;
        align-items: center;
    }
    .main {
        width: 100%;
        margin: 0 auto;
    }
    .history-numbers {
        width: 100%;
        position: relative;
        // top: vww(-110);
        .history-information {
            width: 690rpx;
            height: 398rpx;
            margin: vww(10) vww(15);
            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;
            @include flex flex-direction: column;
            align-items: flex-start;
            justify-content: space-evenly;
            overflow: hidden;
            .first {
                width: 96%;
                height: 34rpx;
                font-size: 32rpx;
                font-weight: 300;
                color: #303030;
                @include flex;
                margin: vww(10) vww(10) 0;
            }
            .second {
                width: 100%;
                height: 31rpx;
                font-size: 30rpx;
                font-weight: 300;
                color: #515151;
                margin: vww(10) vww(10) 0;
                @include flex;
                justify-content: flex-start;
                .coal-name {
                    min-width: vww(30);
                    height: vww(20);
                    margin-right: vww(21);
                }
                .order-type {
                    color: #035cfb;
                    border: 2px solid #035cfb;
                    border-radius: 4rpx;
                    padding: vww(2) vww(4);
                    text-align: center;
                }
            }
            .third {
                width: 96%;
                height: 31rpx;
                font-size: 30rpx;
                font-weight: 300;
                color: #515151;
                margin: vww(10) vww(10) 0;
                @include flex;
                .third-line {
                    @include flex;
                    &_text {
                        color: #919090;
                    }
                    &_num {
                        color: #035cfb;
                    }
                }
            }
            .fourth {
                width: 100%;
                height: 31rpx;
                font-size: 30rpx;
                font-weight: 300;
                color: #515151;
                margin: vww(10) vww(10) 0;
                @include flex;
                .fourth-icon {
                    width: vww(13);
                    height: vww(13);
                    margin-right: vww(14);
                }
                .senddate {
                    flex: 1;
                }
            }
        }
    }
    .collection-form {
        width: vww(345);
        margin: 0 vww(15);
@@ -113,7 +327,8 @@
            box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
            border-radius: 20rpx;
            overflow: hidden;
            @include flex flex-direction: column;
            @include flex;
            flex-direction: column;
            position: relative;
            align-items: flex-start;
            margin-top: vww(10);
@@ -205,6 +420,7 @@
                }
                .car-num {
                    color: #515151;
                    white-space: nowrap;
                    overflow: hidden;
                    text-overflow: ellipsis;
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -267,9 +267,9 @@
                        this.temporaryWeighObj.hair = newV;
                    } else {
                        this.temporaryWeighObj.skin = newV;
                        this.temporaryWeighObj.clean = (this.showWeigh.hair -this.temporaryWeighObj.skin).toFixed(2);
                        this.isweigh = this.temporaryWeighObj
                            .clean < 0 || this.showWeigh.skin < newV && this.showWeigh.skin > 0;
                        this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
                        this.isweigh = this.temporaryWeighObj.clean < 0 || this.showWeigh.skin < newV && this.showWeigh
                            .skin > 0;
                    }
                }
            },
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -6,7 +6,7 @@
            ref="freightForwarderMyPageRef"></freight-forwarder-my-page>
        <driver-my-page v-if="roleType == 3"
            ref="driverMyRef"></driver-my-page>
        <tab-bar :current="2"></tab-bar>
        <tab-bar :current="roleType===4?3:2"></tab-bar>
    </view>
</template>
static/tabBar-icon/checking.png
static/tabBar-icon/checkingblue.png
store/index.js
@@ -42,6 +42,31 @@
            selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
            text: '我的'
        }
    ],
    three: [{
            pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
            iconPath: '../../static/tabBar-icon/home.png',
            selectedIconPath: '../../static/tabBar-icon/homeblue.png',
            text: '首页'
        },
        {
            pagePath: 'pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan',
            iconPath: '../../static/tabBar-icon/checking.png',
            selectedIconPath: '../../static/tabBar-icon/checkingblue.png',
            text: '验质'
        },
        {
            pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
            iconPath: '../../static/tabBar-icon/statistics.png',
            selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
            text: '统计'
        },
        {
            pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
            iconPath: '../../static/tabBar-icon/Gmine10.png',
            selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
            text: '我的'
        }
    ]
}
const store = new Vuex.Store({
@@ -89,12 +114,15 @@
        // 设置底部栏
        setUserTabbar(state, roleType) {
            state.roleType = roleType
            if (roleType == 1 || roleType == 4) {
            if (roleType == 1) {
                state.userTabbar = userRoleTabbar.first
                uni.setStorageSync('userTabbar', state.userTabbar)
            } else if (roleType == 2 || roleType == 3) {
                state.userTabbar = userRoleTabbar.second
                uni.setStorageSync('userTabbar', state.userTabbar)
            } else if (roleType == 4) {
                state.userTabbar = userRoleTabbar.three
                uni.setStorageSync('userTabbar', state.userTabbar)
            }
        },
        // 改变重量