From 47c3668aaab9d5f772c7d7e317d2bfa4b1cbeb28 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 25 九月 2023 17:49:45 +0800
Subject: [PATCH] 修改首页数据不刷新 超出预约时间提示
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 4 +++-
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 21 +++++++++++----------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 8a1686f..7549489 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -256,7 +256,6 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import BigNumber from "bignumber.js"
const dayjs = require('dayjs')
- import isBetween from 'dayjs/plugin/isBetween'
export default {
components: {
combinedTitle
@@ -270,7 +269,6 @@
this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
}
this.fileList1 = []
- dayjs.extend(isBetween)
if (this.globalIsFirstWeighing === 1) {
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
@@ -517,19 +515,11 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
- // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
- let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this.coalDetailsData
- .yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
- this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
- this.timeout = '1'
- }
// 鍏ラ棬璇� 鍜� 鍑洪棬璇� 鏄惁鏄剧ず
this.ablePrintInduction = this.coalDetailsData.hair || this.coalDetailsData.skin
this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
.coalDetailsData.status === 6
// 鍘熷彂淇℃伅鍥炴樉浠ュ強鎺у埗鏄惁鍙慨鏀�
-
this.haveInputOrigin = !this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
'澶栬喘'
this.deletable = this.isModifyoriginInfo = this.coalDetailsData.status > 3
@@ -566,6 +556,17 @@
}
}).then(() => {
this.getgetService(); //鑾峰彇瀹㈡湇
+ }).then(() => {
+ // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
+ setTimeout(() => {
+ let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
+ .coalDetailsData
+ .yuYueSection.slice(-5);
+ if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
+ this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ this.timeout = '1'
+ }
+ }, 1000)
})
},
// 鏃ュ織鏌ヨ
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 859715a..90c8b6a 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -124,8 +124,10 @@
clearInterval(this.globalIntervalId);
this.changeisconnect(false)
},
- onLoad() {
+ onShow() {
this.init();
+ },
+ onLoad() {
this.$store.dispatch('websocketInit')
this.$store.commit('changeisLogin', true)
console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
--
Gitblit v1.9.1