fix

virgo.wzfrontend/workark/src/layout/components/indexNav.vue

@@ -34,7 +34,8 @@
 
 <script>
 	import {
-		removeToken
+		removeToken,
+		removeComment
 	} from '@/uitls/auth';
 	import {
 		mapGetters
@@ -60,16 +61,24 @@
 			logout() {
 				this.$confirm('是否要退出登录?', () => {
 					removeToken();
-					this.$chats.disConnect();
+					removeComment();
+					if (this.$store.getters.chatToken) this.$chat.disConnect();
 					if (this.$store.getters.chatTokens) this.$chats.disConnect();
 					this.$store.dispatch('app/resetState');
 					this.$message.success('退出成功');
-					this.init();
+					this.callbackFunc();
 				});
 			},
+			callbackFunc() {
+				if (this.$route.path === '/') {
+					this.init();
+				} else {
+					this.$router.go(0);
+				}
+			},
 			callback(type) {
 				this.dialogVisible = false;
-				if (type == 'init') this.init();
+				if (type == 'init') this.callbackFunc();
 			}
 		},
 		computed: {

virgo.wzfrontend/workark/src/layout/components/login.vue

@@ -24,7 +24,10 @@
 					<el-form-item prop="code" class="image-item" v-if="nowTab.id === 1">
 						<el-input type="text" prefix-icon="iconfont huifont-tuxingyanzhengma" v-model="loginForm.code"
 							placeholder="图片验证码" maxlength="4"></el-input>
-						<img v-if="codeImg" :src="codeImg" alt="图片验证码" class="code-image" @click="imgCodeFunc">
+						<div class="code-image" @click="imgCodeFunc">
+							<img v-if="codeImg" :src="codeImg" alt="图片验证码" />
+							<p class="color-blue">看不清？点击刷新</p>
+						</div>
 					</el-form-item>
 					<el-form-item prop="phoneCode" class="phone-code" v-if="nowTab.id === 1">
 						<el-input type="number" prefix-icon="iconfont huifont-duanxinyanzhengma"
@@ -182,8 +185,8 @@
 						getUserInfo().then(res => {
 							if (res.state) {
 								let user = res.data;
-								let organization = user.organizationList.find(node => node.contactTel ===
-									user.phone);
+								let organization = user.organizationList.find(node => node.contactTel ===
+									user.phone);
 								if (!organization) organization = user.organizationList[0];
 								this.$store.dispatch('app/changeOrganization', organization);
 								this.$store.dispatch('app/changeUser', user);
@@ -366,6 +369,12 @@
 				height: 50px;
 				cursor: pointer;
 			}
+
+			.color-blue {
+				color: $--color-primary;
+				font-size: 12px;
+				text-align: center;
+			}
 		}
 
 		.get-code-btn {

virgo.wzfrontend/workark/src/layout/components/topNav.vue

@@ -61,7 +61,8 @@
 		</el-drawer>
 		<el-dialog :close-on-click-modal="false" :title="logTitle" :visible.sync="visible" width="900px"
 			:append-to-body="true">
-			<select-organization v-if="visible && logTitle === '切换组织'" @callback="visible = false"></select-organization>
+			<select-organization v-if="visible && logTitle === '切换组织'"
+				@callback="visible = false"></select-organization>
 			<change-password v-if="visible && logTitle === '修改密码'"></change-password>
 			<share v-if="visible && logTitle === '分享邀请'"></share>
 		</el-dialog>
@@ -70,7 +71,8 @@
 
 <script>
 	import {
-		removeToken
+		removeToken,
+		removeComment
 	} from '@/uitls/auth';
 	import {
 		getMessageTest
@@ -144,8 +146,9 @@
 			},
 			logout() {
 				this.$confirm('是否要退出登录?', () => {
-					removeToken();
-					this.$chat.disConnect();
+					removeToken();
+					removeComment();
+					if (this.$store.getters.chatToken) this.$chat.disConnect();
 					if (this.$store.getters.chatTokens) this.$chats.disConnect();
 					this.$store.dispatch('app/resetState');
 					this.$router.replace('/loginRegister/login');

virgo.wzfrontend/workark/src/layout/indexLayout.vue

@@ -1,7 +1,9 @@
 <template>
 	<div class="website-layout">
 		<index-nav></index-nav>
-		<router-view :key="key" />
+		<keep-alive :include="['index']">
+			<router-view />
+		</keep-alive>
 		<index-foot></index-foot>
 	</div>
 </template>
@@ -13,11 +15,7 @@
 		data() {
 			return {}
 		},
-		computed: {
-			key() {
-				return this.$route.path;
-			}
-		},
+		computed: {},
 		components: {
 			indexNav,
 			indexFoot

virgo.wzfrontend/workark/src/router/index.js

@@ -17,7 +17,7 @@ export default new Router({
 		children: [{
 			path: '',
 			component: () => import('@/views/index'),
-			name: '首页',
+			name: 'index',
 			meta: {
 				title: '首页'
 			}

virgo.wzfrontend/workark/src/uitls/chat/customer.js

@@ -111,7 +111,11 @@ const $chat = {
 		});
 	},
 	disConnect() {
-		YeIMUniSDK.getInstance().disConnect();
+		try {
+			YeIMUniSDK.getInstance().disConnect();
+		} catch (error) {
+			//TODO handle the exception
+		}
 	},
 	listenerList() {
 		if (isListenerChatList) return;

virgo.wzfrontend/workark/src/uitls/chat/customerServe.js

@@ -113,7 +113,11 @@ const $chat = {
 		});
 	},
 	disConnect() {
-		YeIMUniSDK.getInstance().disConnect();
+		try {
+			YeIMUniSDK.getInstance().disConnect();
+		} catch (error) {
+			//TODO handle the exception
+		}
 	},
 	listenerList() {
 		if (isListenerChatList) return;

virgo.wzfrontend/workark/src/views/index.vue

@@ -24,14 +24,32 @@
 		getServeProductList
 	} from '@/api/system'
 	export default {
+		name: 'index',
 		data() {
 			return {
-				list: []
+				list: [],
+				scrollPosition: 0 // 保存滚动条位置
 			}
 		},
 		mounted() {
 			this.init();
 		},
+		activated() {
+			// 组件被激活时调用
+			if (document.getElementsByClassName('website-layout')) {
+				document.getElementsByClassName('website-layout')[0].scrollTo(0, this.scrollPosition);
+			}
+		},
+		beforeRouteLeave(to, from, next) {
+			if (document.getElementsByClassName('website-layout')) {
+				this.scrollPosition = document.getElementsByClassName('website-layout')[0].scrollTop;
+			}
+			next();
+		},
+		deactivated() {
+			// 组件被停用时调用
+
+		},
 		methods: {
 			init() {
 				getServeProductList(-1).then(res => {

virgo.wzfrontend/workark/src/views/login/login.vue

@@ -24,7 +24,10 @@
 				<el-form-item prop="code" class="image-item" v-if="nowTab.id === 1">
 					<el-input type="text" prefix-icon="iconfont huifont-tuxingyanzhengma" v-model="loginForm.code"
 						placeholder="图片验证码" maxlength="4"></el-input>
-					<img v-if="codeImg" :src="codeImg" alt="图片验证码" class="code-image" @click="imgCodeFunc">
+					<div class="code-image" @click="imgCodeFunc">
+						<img v-if="codeImg" :src="codeImg" alt="图片验证码" />
+						<p class="color-blue">看不清？点击刷新</p>
+					</div>
 				</el-form-item>
 				<el-form-item prop="phoneCode" class="phone-code" v-if="nowTab.id === 1">
 					<el-input type="number" prefix-icon="iconfont huifont-duanxinyanzhengma"
@@ -352,6 +355,12 @@
 				height: 50px;
 				cursor: pointer;
 			}
+
+			.color-blue {
+				color: $--color-primary;
+				font-size: 12px;
+				text-align: center;
+			}
 		}
 
 		.get-code-btn {