From 837c21ced9ed0aafe17a7c0c16975a1b6731eb9d Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 07 七月 2023 11:30:37 +0800
Subject: [PATCH] 验质功能修改，websocket优化
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 503 ++++++++++++++++++++++-------------------
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 1
pages/driver-page/drvier-my/drvier-my.vue | 4
pages/login/login.vue | 3
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 118 ++++++---
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue | 2
pages/tabbar-page/index-tabbar/index-tabbar.vue | 6
pages/customer-page/customer-my/customer-my.vue | 2
store/index.js | 26 +
9 files changed, 382 insertions(+), 283 deletions(-)
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 7d3cf26..5bbdee3 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -363,6 +363,8 @@
},
logoutCancel() {
this.logoutShow = false;
+ this.$store.commit('changeisLogin', false)
+ this.$store.dispatch('websocketOnClose')
},
// 璺宠浆鐢ㄦ埛绠＄悊椤甸潰
userManage() {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
index 8b0c5ad..86aba00 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
@@ -191,11 +191,13 @@
}, []);
return arrays;
},
+ // 楠岃川閫夋嫨
validateClick(item) {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}`
})
},
+ // 鍘嗗彶
faYundetail(item) {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}&flag=${true}`
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 09c87ff..dcb00fb 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -42,42 +42,52 @@
<u--input placeholder="璇疯緭鍏ユ墸娓�"
border="bottom"
clearable
- v-model="item.discount"
+ v-model="item.cinderWeight"
@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
</view>
<view v-else-if='flag'
- class="count">{{ item.discount }}%
+ class="count">{{ item.cinderWeight }}
</view>
</view>
<view class="weigh">
<view class="label-text">
鎵ｆ福鍚庡噣閲�
</view>
- <view class="count">{{ item.discountWeight }}</view>
+ <view class="count">{{ item.weight }}</view>
</view>
- </view>
- <view class="level">
- <view class=""
- style="width: 70rpx;">
- <u--text text="钃濇湰"
- size='32'></u--text>
- </view>
- <u-tag :text="MaterialList[i].breed+MaterialList[i].spec||'鏆傛棤'"
- plain
- @click="productNamePopoverShow(i)"
- v-if='MaterialList[i].breed&&MaterialList[i].spec||roleType===4'></u-tag>
</view>
<view class="level"
- v-if='modifyMaterialList[i].modifyProductName'>
- <view style="width: 70rpx;">
- <u--text text="淇"
+ v-if='!flag'>
+ <view class=""
+ style="width: 140rpx;">
+ <u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
- <view>
- <u-tag :text="modifyMaterialList[i].modifyProductName"
- plain></u-tag>
+ <u-tag :text="item.breed+item.spec||item.modifygoodsName||'鏆傛棤'"
+ plain
+ @click="goodsPopoverShow(i)"
+ v-if='item.breed&&item.spec||roleType===4'></u-tag>
+ </view>
+ <view class="level"
+ v-if='item.modifygoodsName||flag'>
+ <view style="width: 140rpx;">
+ <u--text text="浜у搧鍚嶇О"
+ size='32'></u--text>
+ </view>
+ <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
+ <u-tag :text="!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec"
+ plain
+ @click="productNamePopoverShow(i)"></u-tag>
</view>
</view>
+ <!-- 鐗╄祫鏄庣粏 -->
+ <u-action-sheet :actions="goodsList"
+ :show="goodsShow"
+ cancelText='鍙栨秷'
+ :closeOnClickOverlay='true'
+ @close='goodsNameClose'
+ @select="goodsselectClick"></u-action-sheet>
+ <!-- 浜у搧鍒楄〃 -->
<view class="">
<u-action-sheet :actions="actionsList"
:show="actionShow"
@@ -107,10 +117,15 @@
orderPlanId: "",
coalDetailsData: {},
showWeigh: [],
+ showWeighCopy: [],
discountrate: "",
loading: false,
show: false,
selectIndex: null,
+ // 鐗╄祫鏄庣粏
+ goodsList: [],
+ goodsShow: false,
+ goodsIndex: null,
// 浜у搧鍒楄〃
actionsList: [],
actionShow: false,
@@ -119,11 +134,7 @@
havedInput: false,
flag: false,
orderCode: null,
- // 鐗╄祫鏄庣粏list
- MaterialList: [],
- // 淇敼涔嬪悗鐨勭墿璧勬槑缁唋ist
- modifyMaterialList: [],
- // 淇敼涔嬪悗鐨勪骇鍝佸悕绉�
+
modifyProductName: null,
// 鏄惁淇敼
isModify: false
@@ -156,6 +167,15 @@
this.orderCode = res.data.orderCode
this.showWeigh = this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData
.tmTaskCoalItems : [];
+ this.showWeigh = this.showWeigh.map(v => {
+ return {
+ ...v,
+ modifyProductName: '',
+ modifygoodsName: ''
+
+ }
+ })
+ this.showWeighCopy = JSON.parse(JSON.stringify(this.showWeigh))
uni.hideLoading()
} else {
this.$u.toast('鍔犺浇澶辫触')
@@ -163,8 +183,12 @@
}
}).then(() => {
this.$reqGet('getMaterialDetailByOrderCode', { orderCode: this.orderCode }).then(r => {
- this.MaterialList = r.data
- this.modifyMaterialList = JSON.parse(JSON.stringify(this.MaterialList))
+ this.goodsList = r.data.map(v => {
+ return {
+ ...v,
+ name: v.breed + v.spec
+ }
+ })
uni.hideLoading()
})
})
@@ -202,14 +226,8 @@
this.showWeigh = this.showWeigh.map((v, i) => {
return {
...v,
- itemId: this.MaterialList[i].itemId,
- Num: this.MaterialList[i].Num,
- NumUnit: this.MaterialList[i].NumUnit,
- Remark: this.MaterialList[i].Remark,
- spec: this.modifyMaterialList[i].modifyProductName ? this.actionsList[i].spec : this
- .MaterialList[i].spec,
- breed: this.modifyMaterialList[i].modifyProductName ? this.actionsList[i]
- .secondCategoryName : this.MaterialList[i].breed
+ breed: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].breed : v.breed,
+ spec: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].spec : v.spec
}
})
this.$reqPost('updateTmTaskCoalItem', this.showWeigh, 'json').then(
@@ -228,20 +246,42 @@
}
})
},
+ // 鐗╄祫鏄庣粏
+ goodsPopoverShow(index) {
+ this.goodsShow = true
+ this.goodsIndex = index
+ },
+ goodsNameClose() {
+ this.goodsShow = false
+ },
+ goodsselectClick(val) {
+ this.showWeigh[this.goodsIndex].modifygoodsName = val.name
+ this.showWeigh[this.goodsIndex].itemId = val.itemId
+ this.showWeigh[this.goodsIndex].num = val.num
+ this.showWeigh[this.goodsIndex].numUnit = val.numUnit
+ this.showWeigh[this.goodsIndex].remark = val.remark
+ this.showWeigh[this.goodsIndex].breed = val.breed
+ this.showWeigh[this.goodsIndex].spec = val.spec
+ },
+ // 浜у搧鍒楄〃
productNamePopoverShow(index) {
- this.actionShow = true
- this.actionIndex = index
+ if (this.roleType === 4 && !this.flag) {
+ this.actionShow = true
+ this.actionIndex = index
+ }
},
productNameClose() {
this.actionShow = false
},
selectClick(val) {
- this.modifyMaterialList[this.actionIndex].modifyProductName = val.name
+ this.showWeighCopy[this.actionIndex].modifyProductName = val.name
+ this.showWeighCopy[this.actionIndex].breed = val.secondCategoryName
+ this.showWeighCopy[this.actionIndex].spec = val.spec
},
// 鎶樻墸鐜囪緭鍏�
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
- this.showWeigh[index].discountWeight = (clean - (Number(value)).toFixed(2));
+ this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
}
},
}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 4510c28..214e8f2 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -252,7 +252,6 @@
},
onShow() {
this.init();
- this.changeisLogin(true)
// this.realTimeWeigh = 0
},
computed: {
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 26d500e..2e47a02 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -376,7 +376,7 @@
this.$refs.editRef.setRules(this.rules);
},
methods: {
- ...mapMutations(['changeisUploadimg']),
+ ...mapMutations(['changeisUploadimg', 'changeisLogin']),
init() {
this.getUserEntity();
},
@@ -532,6 +532,8 @@
},
logoutConfirm() {
redirectLogin();
+ this.changeisLogin(false)
+ this.$store.dispatch('websocketOnClose')
},
logoutCancel() {
this.logoutShow = false;
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index c55e29c..b0fc123 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -1,11 +1,14 @@
<template>
<view class="freightForwarder-my">
- <view class="driver-banner"><view class="navgation">鎴戠殑</view></view>
+ <view class="driver-banner">
+ <view class="navgation">鎴戠殑</view>
+ </view>
<view class="personal-information">
<view class="personal-information-block">
<view class="block-main">
<view class="fleet-container">
- <combined-title title="鎴戠殑杞﹂槦" @rightText="addFleet">
+ <combined-title title="鎴戠殑杞﹂槦"
+ @rightText="addFleet">
<template v-slot:rightText>
<text>娣诲姞</text>
</template>
@@ -13,16 +16,19 @@
<view class="fleet-list">
<u-swipe-action>
<u-cell-group :border="false">
- <u-swipe-action-item
- :options="options1"
+ <u-swipe-action-item :options="options1"
v-for="(item, index) in fleetData"
:index="index"
:name="item.id"
:key="index"
- @click="deleteFleetClick"
- >
- <u-cell :title="item.name" :value="item.userSijisum + '杈�'" @click="tofleetDetails(item.id)">
- <u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
+ @click="deleteFleetClick">
+ <u-cell :title="item.name"
+ :value="item.userSijisum + '杈�'"
+ @click="tofleetDetails(item.id)">
+ <u-icon name="arrow-right"
+ color="#999999"
+ size="30"
+ slot="right-icon"></u-icon>
</u-cell>
</u-swipe-action-item>
</u-cell-group>
@@ -35,271 +41,307 @@
<!-- 鏂板缓杞﹂槦寮瑰嚭妗� -->
<view class="addNewGroup">
- <u-popup :show="updateGroupShow" @close="addNewFleetPopupClose" @open="addNewFleetPopupOpen" mode="center">
- <view class="title"><u--text text="鏂板缓杞﹂槦" size="30" lineHeight="80" align="center"></u--text></view>
+ <u-popup :show="updateGroupShow"
+ @close="addNewFleetPopupClose"
+ @open="addNewFleetPopupOpen"
+ mode="center">
+ <view class="title"><u--text text="鏂板缓杞﹂槦"
+ size="30"
+ lineHeight="80"
+ align="center"></u--text></view>
<view class="addCarForm">
- <u--form labelPosition="left" :model="addGroupForm" ref="form1" labelAlign="center">
- <u-form-item label="缁勫悕" borderBottom ref="groupName" labelWidth="100">
- <u--input v-model="addGroupForm.name" border="none" placeholder="璇疯緭鍏ヨ溅闃熷悕绉�"></u--input>
+ <u--form labelPosition="left"
+ :model="addGroupForm"
+ ref="form1"
+ labelAlign="center">
+ <u-form-item label="缁勫悕"
+ borderBottom
+ ref="groupName"
+ labelWidth="100">
+ <u--input v-model="addGroupForm.name"
+ border="none"
+ placeholder="璇疯緭鍏ヨ溅闃熷悕绉�"></u--input>
</u-form-item>
<!-- <u-form-item label="杞︾墝" borderBottom ref="cars" labelWidth="80">
<u--textarea maxlength="2000" v-model="addGroupForm.carNums" placeholder="璇疯緭鍏ヨ溅鐗�" height="150"></u--textarea>
</u-form-item> -->
</u--form>
</view>
- <view class="addCarButton"><u-button text="娣诲姞" type="primary" @click="addNewGroupClick"></u-button></view>
+ <view class="addCarButton"><u-button text="娣诲姞"
+ type="primary"
+ @click="addNewGroupClick"></u-button></view>
</u-popup>
</view>
<!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
<view class="utils-button">
- <view class="utils"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button></view>
+ <view class="utils"><u-button text="閫�鍑虹櫥褰�"
+ type="primary"
+ @click="logout"></u-button></view>
</view>
<!-- 鍒犻櫎杞﹂槦妯℃�佹 -->
<view class="deleteFleetModal">
- <u-modal
- :show="deleteFleetShow"
+ <u-modal :show="deleteFleetShow"
:title="deleteFleetTitle"
@close="deleteFleetClose"
@cancel="deleteFleetCancel"
@confirm="deleteFleetConfirm"
:closeOnClickOverlay="true"
- :showCancelButton="true"
- >
+ :showCancelButton="true">
<view class="slot-content"><rich-text :nodes="deleteFleetContent"></rich-text></view>
</u-modal>
</view>
<view class="logoutModel">
- <u-modal :show="logoutShow" :title="logoutTitle" showCancelButton :content="logoutContent" @confirm="logoutConfirm" @cancel="logoutCancel"></u-modal>
+ <u-modal :show="logoutShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="logoutConfirm"
+ @cancel="logoutCancel"></u-modal>
</view>
</view>
</template>
<script>
-import { redirectLogin } from '@/utils/status';
-export default {
- data() {
- return {
- fleetData: [],
- // 鏂板缓杞﹂槦
- addGroupForm: {
- name: ''
- // wxUserId: uni.getStorageSync('userInfo').id
- },
- updateGroupShow: false,
- options1: [
- {
+ import { redirectLogin } from '@/utils/status';
+ export default {
+ data() {
+ return {
+ fleetData: [],
+ // 鏂板缓杞﹂槦
+ addGroupForm: {
+ name: ''
+ // wxUserId: uni.getStorageSync('userInfo').id
+ },
+ updateGroupShow: false,
+ options1: [{
text: '鍒犻櫎'
- }
- ],
- // 鍒犻櫎杞﹂槦妯℃�佹
- deleteFleetId: null, // 鍒犻櫎杞﹂槦id
- deleteFleetShow: false,
- deleteFleetTitle: '',
- deleteFleetContent: '',
- // 閫�鍑烘ā鎬佹
- logoutShow: false,
- logoutTitle: '鎻愮ず',
- logoutContent: '鏄惁纭閫�鍑�'
- };
- },
- onShow() {
- this.init();
- },
- methods: {
- init() {
- this.getFleet();
+ }],
+ // 鍒犻櫎杞﹂槦妯℃�佹
+ deleteFleetId: null, // 鍒犻櫎杞﹂槦id
+ deleteFleetShow: false,
+ deleteFleetTitle: '',
+ deleteFleetContent: '',
+ // 閫�鍑烘ā鎬佹
+ logoutShow: false,
+ logoutTitle: '鎻愮ず',
+ logoutContent: '鏄惁纭閫�鍑�'
+ };
},
- // 鑾峰彇杞﹂槦
- getFleet() {
- // this.$reqGet('getFleet', { wxUserId: this.addGroupForm.wxUserId }).then(res => {
- this.$reqGet('getFleet').then(res => {
- console.log('璐т唬1杞﹂槦', res);
- this.fleetData = res.data;
- });
+ onShow() {
+ this.init();
},
- // 娣诲姞杞﹂槦
- addFleet() {
- console.log('娣诲姞杞﹂槦');
- this.updateGroupShow = true;
- },
- addNewFleetPopupClose() {
- this.updateGroupShow = false;
- this.addGroupForm.name = '';
- },
- addNewFleetPopupOpen() {
- console.log('娣诲姞杞﹂槦鎵撳紑');
- },
- // 纭鏂板缓杞﹂槦鎸夐挳
- addNewGroupClick() {
- this.updateGroupShow = false;
- this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
- if (res.code == 0) {
- this.$u.toast('娣诲姞鎴愬姛');
- this.getFleet();
- }
- });
- },
- // 鍒犻櫎杞﹂槦
- deleteFleetClick(args) {
- console.log(args.name, '杞﹂槦id');
- this.deleteFleetId = args.name;
- this.deleteFleetShow = true;
- this.fleetData.forEach(item => {
- if (item.id == this.deleteFleetId) {
- this.deleteFleetContent = '纭鍒犻櫎杞﹂槦' + item.name;
- }
- });
- },
- deleteFleetClose() {
- this.deleteFleetShow = false;
- },
- deleteFleetCancel() {
- this.deleteFleetShow = false;
- },
- deleteFleetConfirm() {
- this.deleteFleetShow = false;
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
- this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params').then(res => {
- console.log('鍒犻櫎杞﹂槦', res);
- if (res.code == 0) {
- this.$u.toast('鍒犻櫎鎴愬姛');
- } else {
- this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
- }
- uni.hideLoading();
+ methods: {
+ init() {
this.getFleet();
- });
- },
- // 杞﹂槦璇︽儏
- tofleetDetails(id) {
- uni.navigateTo({
- url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
- });
- },
- logout() {
- this.logoutShow = true;
- },
- logoutConfirm() {
- redirectLogin();
- },
- logoutCancel() {
- this.logoutShow = false;
- },
- // 璺宠浆鍙戣繍缁熻椤甸潰
- statistics() {
- uni.navigateTo({
- url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
- });
+ },
+ // 鑾峰彇杞﹂槦
+ getFleet() {
+ // this.$reqGet('getFleet', { wxUserId: this.addGroupForm.wxUserId }).then(res => {
+ this.$reqGet('getFleet').then(res => {
+ console.log('璐т唬1杞﹂槦', res);
+ this.fleetData = res.data;
+ });
+ },
+ // 娣诲姞杞﹂槦
+ addFleet() {
+ console.log('娣诲姞杞﹂槦');
+ this.updateGroupShow = true;
+ },
+ addNewFleetPopupClose() {
+ this.updateGroupShow = false;
+ this.addGroupForm.name = '';
+ },
+ addNewFleetPopupOpen() {
+ console.log('娣诲姞杞﹂槦鎵撳紑');
+ },
+ // 纭鏂板缓杞﹂槦鎸夐挳
+ addNewGroupClick() {
+ this.updateGroupShow = false;
+ this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('娣诲姞鎴愬姛');
+ this.getFleet();
+ }
+ });
+ },
+ // 鍒犻櫎杞﹂槦
+ deleteFleetClick(args) {
+ console.log(args.name, '杞﹂槦id');
+ this.deleteFleetId = args.name;
+ this.deleteFleetShow = true;
+ this.fleetData.forEach(item => {
+ if (item.id == this.deleteFleetId) {
+ this.deleteFleetContent = '纭鍒犻櫎杞﹂槦' + item.name;
+ }
+ });
+ },
+ deleteFleetClose() {
+ this.deleteFleetShow = false;
+ },
+ deleteFleetCancel() {
+ this.deleteFleetShow = false;
+ },
+ deleteFleetConfirm() {
+ this.deleteFleetShow = false;
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params').then(res => {
+ console.log('鍒犻櫎杞﹂槦', res);
+ if (res.code == 0) {
+ this.$u.toast('鍒犻櫎鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
+ }
+ uni.hideLoading();
+ this.getFleet();
+ });
+ },
+ // 杞﹂槦璇︽儏
+ tofleetDetails(id) {
+ uni.navigateTo({
+ url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
+ });
+ },
+ logout() {
+ this.logoutShow = true;
+ },
+ logoutConfirm() {
+ redirectLogin();
+ },
+ logoutCancel() {
+ this.logoutShow = false;
+ this.$store.commit('changeisLogin', false)
+ this.$store.dispatch('websocketOnClose')
+ },
+ // 璺宠浆鍙戣繍缁熻椤甸潰
+ statistics() {
+ uni.navigateTo({
+ url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
+ });
+ }
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-.statistics {
- margin-top: vww(10);
- margin-bottom: vww(10);
-}
-.utils-button {
- margin-top: vww(35);
- .utils {
+<style lang="scss"
+ scoped>
+ .statistics {
margin-top: vww(10);
margin-bottom: vww(10);
- /deep/ .u-button {
- width: 631rpx;
- height: 74rpx;
- border: 2px solid #3b56eb;
- background-color: #fff;
- color: #3b56eb;
- border-radius: 37rpx 37rpx 37rpx 37rpx;
- }
}
-}
-::v-deep.freightForwarder-my {
- width: 100%;
- margin: vww(90) auto;
- .driver-banner {
- width: 100%;
- height: 430rpx;
- background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
- background-size: contain;
- position: fixed;
- top: 0;
- .navgation {
- width: 80rpx;
- height: 37rpx;
- font-size: 40rpx;
- font-weight: normal;
- color: #ffffff;
- line-height: 69rpx;
- margin: vww(60) auto;
- }
- }
- .personal-information {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-around;
- flex-direction: column;
- position: relative;
- top: vww(20);
- &-block {
- width: 690rpx;
- min-height: 478rpx;
- background: #ffffff;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
- border-radius: 20rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- margin-top: vww(8);
- .block-main {
- width: 636rpx;
- margin: vww(10) vww(14);
- }
- }
- }
- // 鏂板缓杞﹂槦
- .addNewGroup {
- .u-popup {
- .u-popup__content {
- width: 94%;
- height: vww(160);
- border-radius: 1%;
- .title {
- width: 100%;
- text-align: center;
- font-size: 20;
- .u-text {
- .u-text__value {
- }
- }
- }
- .addCarForm {
- width: 80%;
- margin: 0 auto vww(30);
- }
- .addCarButton {
- width: 40%;
- margin: 0 auto;
- color: rgb(10, 108, 255);
- }
+
+ .utils-button {
+ margin-top: vww(35);
+
+ .utils {
+ margin-top: vww(10);
+ margin-bottom: vww(10);
+
+ /deep/ .u-button {
+ width: 631rpx;
+ height: 74rpx;
+ border: 2px solid #3b56eb;
+ background-color: #fff;
+ color: #3b56eb;
+ border-radius: 37rpx 37rpx 37rpx 37rpx;
}
}
}
- .fleet-container {
- .fleet-list {
- .u-swipe-action {
- .u-swipe-action-item {
- .u-swipe-action-item__right {
- .u-swipe-action-item__right__button {
- .u-swipe-action-item__right__button__wrapper {
- background-color: #f56c6c !important;
+ ::v-deep.freightForwarder-my {
+ width: 100%;
+ margin: vww(90) auto;
+
+ .driver-banner {
+ width: 100%;
+ height: 430rpx;
+ background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
+ background-size: contain;
+ position: fixed;
+ top: 0;
+
+ .navgation {
+ width: 80rpx;
+ height: 37rpx;
+ font-size: 40rpx;
+ font-weight: normal;
+ color: #ffffff;
+ line-height: 69rpx;
+ margin: vww(60) auto;
+ }
+ }
+
+ .personal-information {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ flex-direction: column;
+ position: relative;
+ top: vww(20);
+
+ &-block {
+ width: 690rpx;
+ min-height: 478rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin-top: vww(8);
+
+ .block-main {
+ width: 636rpx;
+ margin: vww(10) vww(14);
+ }
+ }
+ }
+
+ // 鏂板缓杞﹂槦
+ .addNewGroup {
+ .u-popup {
+ .u-popup__content {
+ width: 94%;
+ height: vww(160);
+ border-radius: 1%;
+
+ .title {
+ width: 100%;
+ text-align: center;
+ font-size: 20;
+
+ .u-text {
+ .u-text__value {}
+ }
+ }
+
+ .addCarForm {
+ width: 80%;
+ margin: 0 auto vww(30);
+ }
+
+ .addCarButton {
+ width: 40%;
+ margin: 0 auto;
+ color: rgb(10, 108, 255);
+ }
+ }
+ }
+ }
+
+ .fleet-container {
+ .fleet-list {
+ .u-swipe-action {
+ .u-swipe-action-item {
+ .u-swipe-action-item__right {
+ .u-swipe-action-item__right__button {
+ .u-swipe-action-item__right__button__wrapper {
+ background-color: #f56c6c !important;
+ }
}
}
}
@@ -307,5 +349,4 @@
}
}
}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index adac256..132f756 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -121,7 +121,6 @@
apiLoginWx({ code: code }).then(res => {
if (res.code != 1) {
this.$u.toast('鐧诲綍鎴愬姛');
- this.changeisLogin(true);
// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
setToken(res.access_token);
setRefreshToken(res.refresh_token);
@@ -136,7 +135,7 @@
this.$nextTick(() => {
redirectHome();
});
- });
+ })
} else {
this.$u.toast(res.msg);
this.bindWxModelShow = true;
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 81d8858..a2087ce 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -171,10 +171,10 @@
},
onShow() {
this.init();
- console.log(this.globalisconnect);
if (this.globalisconnect) {
this.$store.dispatch('websocketInit')
this.changeisconnect(false)
+ this.changeisLogin(true)
console.log(this.globalisconnect, 'index鐨剋s鏁版嵁鈥�');
}
this.userAuthorization();
@@ -187,7 +187,9 @@
this.changeisconnect(true)
},
methods: {
- ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
+ ...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
+ 'changeisLogin'
+ ]),
messagePage() {
uni.navigateTo({
url: '/pages/public-page/message/message'
diff --git a/store/index.js b/store/index.js
index ed0f27b..4c8a99f 100644
--- a/store/index.js
+++ b/store/index.js
@@ -225,12 +225,22 @@
clearInterval(state.reconnectTimeOut)
state.socketTast = null
commit('changereconnectState', false)
- if (state.connectNum < 6) {
- dispatch('reconnect')
- } else {
+ if (state.connectNum < 6 && state.globalisLogin) {
+ uni.showToast({
+ title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
+ icon: 'none'
+ })
commit('changereconnectNum', 1)
+ dispatch('reconnect')
+ } else if (state.connectNum > 6 && state.globalisLogin) {
+ commit('changereconnectNum', 1)
+ uni.showToast({
+ title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
+ icon: 'none'
+ })
+ } else {
+ return
}
-
},
websocketOnError({ state, commit, dispatch }, e) {
// 濡傛灉閲嶈繛鐘舵�佷负false鍒欎笉杩涜閲嶈繛锛屼负true鎵嶄細
@@ -239,19 +249,21 @@
clearInterval(state.reconnectTimeOut)
state.socketTast = null
commit('changereconnectState', false)
- if (state.connectNum < 6) {
+ if (state.connectNum < 6 && state.globalisLogin) {
uni.showToast({
title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
icon: 'none'
})
commit('changereconnectNum', 1)
dispatch('reconnect')
- } else {
+ } else if (state.connectNum > 6 && state.globalisLogin) {
commit('changereconnectNum', 1)
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
})
+ } else {
+ return
}
},
// 鎺ユ敹鏁版嵁
@@ -262,7 +274,7 @@
reconnect({ state, commit, dispatch }) {
console.log(state.is_open_socket, '閲嶆柊杩炴帴socket鐘舵��');
clearInterval(state.globalIntervalId)
- if (!state.is_open_socket) {
+ if (!state.is_open_socket && state.globalisLogin) {
state.reconnectTimeOut = setInterval(() => {
dispatch('websocketInit')
}, 5000)
--
Gitblit v1.9.1