增加皮重异常提示 修改隐私协议

qingyiay

2023-09-11 46acd5c32a3eb1bc64df27c85c5e656d737f81b0

增加皮重异常提示 修改隐私协议

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

@@ -103,7 +103,10 @@
            style="width: 100%;height: 40rpx;"></view>
        <view class="history-utils">
            <view class="history-utils_item">
                平均皮重:{{avgSkin}}
                <text>平均皮重:{{avgSkin}}</text>
                <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
                    class="error-tip"
                    v-if="errorTipShow">* 异常</text>
            </view>
            <view class="history-utils_item btn">
                <u-button plain
@@ -202,6 +205,9 @@
                <view class="main-information">
                    <view class="prefix">订单余量:</view>
                    <view class="suffix">{{ weighList.orderSurplus ||""  }}</view>
                    <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
                        class="error-tip"
                        v-show="isweigh">* 订单余量不足</text>
                </view>
            </view>
        </view>
@@ -287,6 +293,7 @@
            this.init();
            this.changeWeigh('')
            this.realTimeWeigh = 0
            console.log(this.abnormalModalShow);
        },
        components: {
            combinedTitle
@@ -352,7 +359,8 @@
                historyBtn: false,
                historyShow: false,
                // 是否在称皮重，点击确定称重判断是否异常
                isSkinWeigh: false
                isSkinWeigh: false,
                errorTipShow: false
            };
        },
        watch: {
@@ -370,6 +378,11 @@
                        if (this.weighList.skin == 0) {
                            this.isSkinWeigh = true
                            this.temporaryWeighObj.skin = newV;
                            let xx = new BigNumber(this.avgSkin)
                            let yy = new BigNumber(newV)
                            if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
                                this.errorTipShow = true
                            }
                        } else {
                            this.isSkinWeigh = false;
                            this.temporaryWeighObj.hair = newV;
@@ -387,6 +400,11 @@
                        } else {
                            this.isSkinWeigh = true;
                            this.temporaryWeighObj.skin = newV;
                            let xx = new BigNumber(this.avgSkin)
                            let yy = new BigNumber(newV)
                            if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
                                this.errorTipShow = true
                            }
                            this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
                                2);
                            this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -592,7 +610,7 @@
                        this.avgSkin = res.data.avgSkin
                        this.tmTaskCoalList = res.data.tmTaskCoalList
                        /**
                         * @description true的话是不异常 false就是异常 没有历史，平均皮重为0是第一次也是正常 */
                         * @description true的话是第一次称, false就不是,没有历史，平均皮重为0是第一次也是正常 */
                        this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
                            .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
                    } else {
@@ -845,6 +863,7 @@
                    @include flex;
                    justify-content: flex-start;
                    overflow: hidden;
                    position: relative;

                    .prefix {
                        min-width: vww(60);
@@ -854,6 +873,11 @@
                        flex: 1;
                        margin-left: vww(12);
                        text-align: left;
                    }

                    .error-tip {
                        position: absolute;
                        right: 200rpx;
                    }
                }
            }
@@ -894,6 +918,11 @@

            &_item {
                width: 50%;

                .error-tip {
                    display: inline-block;
                    margin-left: 34rpx;
                }
            }

            .btn {

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

@@ -341,8 +341,19 @@
                    weight: {
                        type: 'number',
                        required: true,
                        message: '请填写体重',
                        trigger: ['blur', 'change']
                        trigger: ['blur', 'change'],
                        transform(value) {
                            return Number(value);
                        },
                        validator: (rule, value, callback) => {
                            if (!value) {
                                callback(new Error('请填写体重'))
                            } else if (value > 200) {
                                callback(new Error('请填写合理体重'))
                            } else {
                                callback()
                            }
                        }
                    },
                    carNo: [{
                            type: 'string',

 pages/login/PrivacyAgreementText/PrivacyAgreementText.vue

@@ -68,6 +68,10 @@
                6.1&nbsp;&nbsp;如果您对本隐私政策有任何疑问或意见，请通过应用程序内的联系方式与我们联系。我们将尽快回复您并解决您的问题。
            </p>
        </view>
        <view class="use-button">
            <button open-type="agreePrivacyAuthorization"
                @click='agreeFile'>我已知晓并同意此协议</button>
        </view>
    </view>
</template>

@@ -79,7 +83,11 @@
            }
        },
        methods: {

            agreeFile() {
                uni.navigateTo({
                    url: '/pages/register/register'
                });
            },
        }
    }
</script>
@@ -113,5 +121,27 @@
        .section-detail {
            color: rgb(83, 83, 83);
        }

        .use-button {
            width: 98%;
            height: vww(70);
            display: flex;
            justify-content: space-between;
            align-items: center;

            /deep/ button {
                width: 80%;
                height: 40px;
                line-height: 40px;
                padding: 0 12px;
                font-size: 28rpx;
                font-weight: 300;
                color: #ffffff;
                background: #497bfb;
                letter-spacing: 4rpx;
                border-radius: 37rpx 37rpx 37rpx 37rpx;
                box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
            }
        }
    }
</style>

 pages/login/login.vue

@@ -18,7 +18,7 @@
                text="一键绑定测试"></u-button>
        </view> -->
        <view class="register"
            @click="registerClick"><text>注册</text></view>
            @click="PrivacyAgreementHandle"><text>注册</text></view>
        <view class="login-bottom-box">
            <view class="copyright">冀中能源无人值守微信小程序</view>
            <view class="copyright">小程序仅供已拥有系统账号特定内部人员使用</view>
@@ -57,21 +57,6 @@
                @confirm="bindWxConfirm"
                @cancel="bindWxCancel"></u-modal>
        </view>
        <!-- 注册同意获取隐私信息 -->
        <view class="privacy">
            <u-modal :show="privacyShow"
                :title="privacyTitle"
                showCancelButton
                @confirm="privacyConfirm"
                @cancel="privacyCancel"
                confirmText="同意"
                cancelText="不同意">
                <view class="slot-content"
                    @click="PrivacyAgreementHandle">
                    <rich-text :nodes="PrivacyAgreement"></rich-text>
                </view>
            </u-modal>
        </view>
    </view>
</template>

@@ -91,9 +76,6 @@
                bindWxContent: '如果已拥有系统账号，可以直接跳转绑定微信页面',
                appid: "",
                secret: "",
                privacyShow: false,
                privacyTitle: "注意",
                PrivacyAgreement: `<p>注册即代表您同意我们用户隐私协议</p><p  class='PrivacyAgreement'>点击查看用户隐私协议</p>`
            };
        },
        components: {
@@ -190,29 +172,11 @@
            openPopup() {
                console.log('打开了');
            },
            privacyConfirm() {
                this.loginPopupShow = false
                uni.navigateTo({
                    url: '/pages/register/register'
                });
            },
            privacyCancel() {
                this.privacyShow = false
            },
            registerClick() {
                this.privacyShow = true
            },
            PrivacyAgreementHandle() {
                uni.navigateTo({
                    url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
                })
            },
            // 此方法只进行绑定测试，后期已通过扫码解决
            jumpBindBack() {
                uni.navigateTo({
                    url: '/pages/bindBackground/bindBackground'
                })
            }
        }
    };
</script>