From 18c764fa5b5b4912fd5ef8c1024cddca5435dec7 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 22 Jul 2021 10:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E7=89=88=E4=B8=80?=
 =?UTF-8?q?=E7=B3=BB=E5=88=97=E9=97=AE=E9=A2=98=201=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E6=98=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E7=99=BB=E9=99=86=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=90=8E=E9=80=80=E9=94=AE=E5=B0=86=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=A6=96=E9=A1=B5=202=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2this.$rou?=
 =?UTF-8?q?te=20=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=EF=BC=8C=E8=80=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=A0=E6=AD=A4=E9=97=AE=E9=A2=98=203?=
 =?UTF-8?q?=E7=94=B5=E8=84=91=E6=B5=8F=E8=A7=88=E5=99=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=9E=E6=8E=A5=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=B5=8B=E8=AF=95=E9=94=99=E8=AF=AF=204?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=88=90app=EF=BC=8C=E9=A6=96=E9=A1=B5@tap?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=20#7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 101 +++++++++++---------------------------------
 1 file changed, 24 insertions(+), 77 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index b2eacc0..d4f4c3a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -9,21 +9,7 @@
 					<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover" v-if="item.type=='video'"></video>
 				</swiper-item>
 			</swiper>
-			<!-- 中部应用宫格 -->
-			<!--<view class="bg-white"  :style="[{animation: 'show 0.3s 1'}]">
-				<view class="cu-list grid margin-bottom col-2  ">
-				  <view 
-				  v-for="(item,index) in middleApps" 
-				  :key="index" 
-				  class="cu-item text-center" 
-				  :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]" hover-class="none">
-						<view class="flex align-center margin-left" @tap="goCheckPage(item.page)">
-							<image :src="item.icon"  mode="aspectFill" class="line2-icon"></image>
-							<view class="text-df">{{item.title}} <br/> <span class="text-light">{{item.text}}</span></view>
-						</view>
-					</view>	
-				</view>
-			</view>-->
+			
 			<!-- 常用服务 -->
 			<view class="cu-bar bg-white solid-bottom" :style="[{animation: 'show 0.5s 1'}]">
 				<view class="action">
@@ -65,6 +51,7 @@
 
 <script>
 	import { us,os } from '@/common/util/work.js'
+	import socket from '@/common/js-sdk/socket/socket.js'
 	export default {
 		name: 'home',
 		props:{
@@ -73,8 +60,8 @@
 		watch: {
 			cur: {
 				immediate: true,
-				handler() {
-					console.log('watch',this.cur)
+				handler:function(val,oldVal){
+					console.log('cur',val,oldVal)
 				    this.initMenu()
 				},
 			},
@@ -93,9 +80,6 @@
 				],
 				usList:us.data,
 				osList:os.data,
-				websock:'',
-				heartCheck:null,
-				lockReconnect:false,
 				msgCount:0,
 				dot:{
 				  mailHome:false
@@ -105,7 +89,8 @@
 		methods: {
 			initMenu(){
 				console.log("-----------home------------")
-			    this.initWebSocket();
+			    this.onSocketOpen()
+			    this.onSocketReceive()
 			    this.loadCount(0);
 			},
 			goPage(page){
@@ -116,65 +101,27 @@
 				  this.msgCount = 0
 				}
 				this.dot[page]=false
-				this.$router.push({name: page})
+				this.$Router.push({name: page})
 			},
-			initWebSocket: function () {
-				// WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
-				var userId = this.$store.getters.userid;
-				var url = this.$config.apiUrl.replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
-				console.log('websocket url>>'+url);
-				this.websock = new WebSocket(url);
-				this.websock.onopen = this.websocketOnopen;
-				this.websock.onerror = this.websocketOnerror;
-				this.websock.onmessage = this.websocketOnmessage;
-				this.websock.onclose = this.websocketOnclose;
+			// 启动webSocket
+			onSocketOpen() {
+				socket.init('websocket');
 			},
-			websocketOnopen: function () {
-				console.log("WebSocket连接成功");
-				//心跳检测重置
-				//this.heartCheck.reset().start();
-			},
-			websocketOnerror: function () {
-				console.log("WebSocket连接发生错误");
-				this.reconnect();
-			},
-			websocketOnmessage: function (e) {
-				console.log("-----接收消息-------",e.data);
-				var data = eval("(" + e.data + ")"); //解析对象
-				if(data.cmd == "topic"){
-				  //系统通知
-				  this.loadCount('1')
-				}else if(data.cmd == "user"){
-				  //用户消息
-				  this.loadCount('2')
-				} else if(data.cmd == 'email'){
-				  this.loadEmailCount()
+			onSocketReceive() {
+				var _this=this
+				socket.acceptMessage = function(res){
+					// console.log("页面收到的消息", res);
+					if(res.cmd == "topic"){
+					  //系统通知
+					  _this.loadCount('1')
+					}else if(res.cmd == "user"){
+					  //用户消息
+					  _this.loadCount('2')
+					} else if(res.cmd == 'email'){
+					 //邮件消息
+					  _this.loadEmailCount()
+					}
 				}
-		
-				//心跳检测重置
-				//this.heartCheck.reset().start();
-			},
-			websocketOnclose: function (e) {
-				console.log("connection closed (" + e.code + ")");
-				this.reconnect();
-			},
-			websocketSend(text) { // 数据发送
-				try {
-				  this.websock.send(text);
-				} catch (err) {
-				  console.log("send failed (" + err.code + ")");
-				}
-			},
-			reconnect() {
-				var that = this;
-				if(that.lockReconnect) return;
-				that.lockReconnect = true;
-				//没连接上会一直重连，设置延迟避免请求过多
-				setTimeout(function () {
-				  console.info("尝试重连...");
-				  that.initWebSocket();
-				  that.lockReconnect = false;
-				}, 5000);
 			},
 			loadCount(flag){
 				console.log("loadCount::flag",flag)