From 905afa72079ff4948534bd96b9b7866b20291825 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 12 七月 2023 19:08:26 +0800
Subject: [PATCH] 修改验质图片错误，增加图片回显
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 101 +++++++++++++++++---------------------------------
1 files changed, 34 insertions(+), 67 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 78d1d35..330e9d4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -13,7 +13,7 @@
</view>
</view>
</view>
- <customer-index v-if="roleType == 1"
+ <customer-index v-if="roleType == 1||roleType == 4"
ref="customerIndexRef"
:orderPlanDataStore="orderPlanDataStore"></customer-index>
<freight-forwarder-index v-if="roleType == 2"
@@ -29,7 +29,7 @@
:title="messageList.title"
@confirm="messageconfirm"
confirm-text="鍓嶅幓鏌ョ湅">
- <view class="slot-content"><rich-text :nodes="messageList.content"></rich-text></view>
+ <view class="slot-content"><u-parse :content="messageList.content"></u-parse></view>
</u-modal>
<!-- <view class="white-block"></view> -->
</view>
@@ -57,7 +57,7 @@
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
uni.showLoading({ title: '鍔犺浇涓�...' });
- // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ // 鑾峰彇鍘嗗彶閫氱煡鍗�
if (this.roleType == 1 || this.roleType == 2) {
this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
if (res.data.records) {
@@ -70,7 +70,7 @@
});
}
// 瀹㈡埛鑾峰彇鏃ヨ鍒�
- if (this.roleType == 1) {
+ if (this.roleType == 1 || this.roleType == 4) {
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.orderPlanDataStore = res.data;
@@ -132,7 +132,10 @@
indexHistoryCoalData: [],
indexdriverBillOfLoadingData: {},
messagePushShow: false,
- messageList: {},
+ messageList: {
+ title: '',
+ content: "",
+ },
isconnect: false,
dotShow: false,
appHide: false
@@ -147,35 +150,50 @@
if (nowWeighObj.eqInfraredStatus) {
this.changeinfraredStatus(true);
this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
} else {
this.changeinfraredStatus(false);
this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
}
}
} else if (v.startsWith('msg')) {
+ function removeTags(str) {
+ return str.replace(/<\/?[^>]+>/gi, '');
+ }
this.messageList = JSON.parse(v.slice(5));
+ this.messageList = {
+ ...this.messageList,
+ title: this.messageList.title.slice(0, 8) + '...',
+ content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
+ }
this.messagePushShow = true;
} else {}
}
},
onShow() {
this.init();
- if (!this.globalisconnect) {
+ if (this.globalisconnect) {
this.$store.dispatch('websocketInit')
+ this.changeisconnect(false)
+ this.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',
+ 'changeisLogin', 'changeWarning'
+ ]),
messagePage() {
uni.navigateTo({
url: '/pages/public-page/message/message'
@@ -200,6 +218,12 @@
console.log('driverIndexRef');
this.$nextTick(() => {
this.$refs.driverIndexRef.init();
+ });
+ break;
+ case 4:
+ console.log('customerIndexRef');
+ this.$nextTick(() => {
+ this.$refs.customerIndexRef.init();
});
break;
default:
@@ -241,63 +265,6 @@
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