From c234dffcd3adaf7b8d87a5a8301871493c0cadbd Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 21 九月 2023 14:20:35 +0800
Subject: [PATCH] 修改皮重异常弹窗不正确弹出
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index d97cb70..eba8902 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -25,6 +25,8 @@
:indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
<load-unload ref="LoadUnloadRef"
v-if="roleType == 5"></load-unload>
+ <!-- <selectTarget v-if="roleType == 5"
+ ref="LoadUnloadRef"></selectTarget> -->
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
<u-modal :show="messagePushShow"
@@ -42,6 +44,7 @@
import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
import LoadUnload from '@/pages/loadUnload-page/loadUnload-page.vue'
+ import selectTarget from '@/pages/loadUnload-page/selectTarget/selectTarget.vue'
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
@@ -51,7 +54,8 @@
customerIndex,
driverIndex,
freightForwarderIndex,
- LoadUnload
+ LoadUnload,
+ selectTarget
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
@@ -169,8 +173,16 @@
title: this.messageList.title.slice(0, 8) + '...',
content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
}
- this.messagePushShow = true;
- } else {}
+ if (uni.getStorageSync('userId') === this.messageList.appUserId) {
+ this.messagePushShow = true;
+ }
+ } else if (v.startsWith('wsg')) {
+ let wsgObj = JSON.parse(v.slice(5));
+ if (uni.getStorageInfoSync('carNo') === wsgObj.carNo) {
+ changewsgVisiable(true)
+ changewsgContent(wsgObj.content)
+ }
+ }
}
},
onShow() {
@@ -194,7 +206,9 @@
this.changeisconnect(true)
},
methods: {
- ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
+ ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
+ 'changewsgVisiable', 'changewsgContent'
+ ]),
messagePage() {
uni.navigateTo({
url: '/pages/public-page/message/message'
@@ -235,29 +249,26 @@
userAuthorization() {
wx.getSetting({
success(res) {
- // wx.startRecord();
- console.log('鎺堟潈鐩告満/楹﹀厠椋庢潈闄恠uccess');
+ console.log(res);
if (!res.authSetting['scope.record'] || !res.authSetting['scope.camera']) {
if (!res.authSetting['scope.camera']) {
wx.authorize({
scope: 'scope.camera',
success() {
- // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
- console.log('鎺堟潈鎴愬姛');
+ console.log('鐩告満鎴愬姛');
},
fail() {
- console.log('鎺堟潈澶辫触');
+ console.log('鐩告満澶辫触');
}
});
} else if (!res.authSetting['scope.record']) {
wx.authorize({
scope: 'scope.record',
success() {
- // 鐢ㄦ埛宸茬粡鍚屾剰灏忕▼搴忎娇鐢ㄥ綍闊冲姛鑳斤紝鍚庣画璋冪敤 wx.startRecord 鎺ュ彛涓嶄細寮圭獥璇㈤棶
- console.log('鎺堟潈鎴愬姛');
+ console.log('褰曢煶鎴愬姛');
},
fail: () => {
- console.log('鎺堟潈澶辫触');
+ console.log('褰曢煶澶辫触');
}
});
}
@@ -265,7 +276,7 @@
},
fail() {
console.log('鑾峰彇澶辫触');
- }
+ },
});
},
// 鍒濆鍖杦ebsocket
--
Gitblit v1.9.1