From 97d88adcdfa7e13b2203c8716c02866fae087704 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 26 九月 2023 09:38:47 +0800
Subject: [PATCH] 修改磅房忙碌问题及其他问题
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 140 ++++++++++++++--------------------------------
1 files changed, 44 insertions(+), 96 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index d97cb70..7e9dcc4 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',
@@ -111,7 +115,24 @@
});
}
},
+ onHide() {
+ console.log('椤甸潰闅愯棌')
+ },
+ onUnload() {
+ console.log('椤甸潰鍗歌浇');
+ this.$store.dispatch('websocketOnClose')
+ clearInterval(this.globalIntervalId);
+ this.changeisconnect(false)
+ },
+ onShow() {
+ this.init();
+ },
onLoad() {
+ this.$store.dispatch('websocketInit')
+ this.$store.commit('changeisLogin', true)
+ console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
+ this.userAuthorization();
+ this.messageReq();
// 寮�鍚弻浜洪�氳瘽
wx.setEnable1v1Chat({
enable: true,
@@ -151,13 +172,9 @@
if (v.startsWith('weigh')) {
let nowWeighObj = JSON.parse(v.slice(7));
if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.changeinfraredStatus(true);
- this.changeWeigh(nowWeighObj.weigh);
- } else {
- this.changeinfraredStatus(false);
- this.changeWeigh(nowWeighObj.weigh);
- }
+ this.changeWeigh(nowWeighObj.weigh);
+ this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
+ console.log(!!nowWeighObj.eqInfraredStatus, '绾㈠鐘舵��');
}
} else if (v.startsWith('msg')) {
function removeTags(str) {
@@ -169,32 +186,23 @@
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));
+ console.log(uni.getStorageSync('carNo'), wsgObj.carNo);
+ if (uni.getStorageSync('carNo') === wsgObj.carNo) {
+ this.changewsgVisiable(true)
+ this.changewsgContent(wsgObj.content)
+ }
+ }
}
- },
- onShow() {
- this.init();
- if (this.globalisconnect) {
- this.$store.dispatch('websocketInit')
- this.changeisconnect(false)
- this.$store.commit('changeisLogin', true)
- console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
- }
- this.userAuthorization();
- this.messageReq();
- },
- onHide() {
- console.log('椤甸潰闅愯棌')
- },
- onUnload() {
- console.log('椤甸潰鍗歌浇');
- this.$store.dispatch('websocketOnClose')
- clearInterval(this.globalIntervalId);
- 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 +243,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,64 +270,7 @@
},
fail() {
console.log('鑾峰彇澶辫触');
- }
- });
- },
- // 鍒濆鍖杦ebsocket
- initWebsocket() {
- let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- socket = uni.connectSocket({
- url: wsUrl,
- header: {
- CLIENT_TOC: 'Y'
},
- complete: res => {
- console.log(res, 'socket缁撴灉');
- if (res.errMsg == 'connectSocket:ok') {
- this.changeisconnect(true);
- this.isconnect = true;
- }
- }
- });
- socket.onOpen(() => {
- console.log('onOpen');
- this.intervalId = setInterval(() => {
- socket.send({
- data: JSON.stringify({ type: 'ping' }),
- success(e) {
- console.log(e, '鍙戦�佸績璺虫垚鍔�');
- }
- });
- }, 30000);
- });
-
- // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- socket.onMessage(res => {
- console.log('message', res);
- if (res.data.startsWith('weigh')) {
- let nowWeighObj = JSON.parse(res.data.slice(7));
- if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.changeinfraredStatus(true);
- this.changeWeigh(nowWeighObj.weigh);
- } else {
- this.changeinfraredStatus(false);
- this.changeWeigh(nowWeighObj.weigh);
- }
- }
- } else if (res.data.startsWith('msg')) {
- this.messageList = JSON.parse(res.data.slice(5));
- this.messagePushShow = true;
- } else {}
- });
- socket.onClose(e => {
- console.log('webSocketClose', e);
- this.isconnect = false;
- this.changeisconnect(false);
- });
- socket.onError(err => {
- console.log('socket鎶ラ敊', err);
- this.$u.toast('鍑虹幇閿欒锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
},
messageconfirm() {
--
Gitblit v1.9.1