From da0b2f29b3a769a1dc72e89c555e7b96aa8ff667 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 19 一月 2024 10:25:02 +0800
Subject: [PATCH] feat：司机端换肤首页 V1.0提交
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index a2087ce..ed1e46f 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||roleType == 4"
+ <customer-index v-if="roleType == 1"
ref="customerIndexRef"
:orderPlanDataStore="orderPlanDataStore"></customer-index>
<freight-forwarder-index v-if="roleType == 2"
@@ -23,6 +23,7 @@
<driver-index v-if="roleType == 3"
ref="driverIndexRef"
:indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
+ <inspectionIndex ref="inspectionIndex" v-if='roleType == 4'/>
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
<u-modal :show="messagePushShow"
@@ -37,17 +38,19 @@
<script>
import customerIndex from '@/pages/customer-page/customer-index/customer-index.vue';
- import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
+ // import driverIndex from '@/pages/driver-page/driver-index/driver-index.vue';
+ import driverIndex from '@/pages/driver-page/driver-index/test-index.vue'
+ import inspectionIndex from '@/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue'
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
-
let socket = null;
export default {
components: {
customerIndex,
driverIndex,
- freightForwarderIndex
+ freightForwarderIndex,
+ inspectionIndex
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
@@ -57,7 +60,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) {
@@ -138,7 +141,8 @@
},
isconnect: false,
dotShow: false,
- appHide: false
+ appHide: false,
+ phone: ''
};
},
watch: {
@@ -150,9 +154,13 @@
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')) {
@@ -188,7 +196,7 @@
},
methods: {
...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
- 'changeisLogin'
+ 'changeisLogin', 'changeWarning'
]),
messagePage() {
uni.navigateTo({
@@ -217,9 +225,9 @@
});
break;
case 4:
- console.log('customerIndexRef');
+ console.log('inspectionIndex');
this.$nextTick(() => {
- this.$refs.customerIndexRef.init();
+ this.$refs.inspectionIndex.init();
});
break;
default:
@@ -277,7 +285,7 @@
this.dotShow = filtermessage.length > 0;
}
});
- }
+ },
}
};
</script>
@@ -286,6 +294,8 @@
scoped>
.max-block {
font-family: siYuanLight !important;
+ width: 100%;
+ height: 100%;
}
.white-block {
--
Gitblit v1.9.1