合并代码

src/views/HomeMain.vue

@@ -149,7 +149,7 @@
     </div>
 </template>
 <script >
-import { defineComponent, createVNode, ref, computed } from "vue";
+import { defineComponent, createVNode, ref, computed, onMounted } from "vue";
 import { isEmail } from "@/tool/util";
 import { setCookie, getCookie, WriteCookie,clonAllCookie } from "@/tool/cookie";
 import payOrder from "@/component/Pay/payOrder.vue";
@@ -170,6 +170,7 @@ import { useI18n } from "vue-i18n";
 import { gsap, TweenMax,TweenLite } from "gsap";
 import { ScrollTrigger } from "gsap/ScrollTrigger";
 import MyWs from "@/tool/webSocket";
+import MyEvent from "@/tool/myEvents";
 export default defineComponent({
     components: {
         VerificationCodeInput,
@@ -182,18 +183,10 @@ export default defineComponent({
 		navRouter,
     },
 	setup(){
-		let url = '127.0.0.1:3000'
-		MyWs.linkWs("ws://"+url)
-		console.log();
-		setTimeout(() => {
-			MyWs.sendMessage('aaaa')
-		}, 3000);
         const store = useStore();
 		const {t} = useI18n()
 		const {locale} = useI18n()
-		MyWs.ws.onmessage = (data)=>{
-			console.log(JSON.parse(data.data),232);
-		}
+		
 		let isTest = ref()
 		let isMurmur = ref()
 		let credits = computed(()=>{
@@ -228,7 +221,28 @@ export default defineComponent({
 		let messageNum = computed(()=>{
 			return store.state.UserHabit.messageSystem.messageNum
 		})
-		store.commit('setMessageSystem',{messageNum:22})
+		let getUnreadCount = ()=>{
+			Https.axiosGet(Https.httpUrls.getUnreadCount).then((rv)=>{
+				if(rv){
+					store.commit('setMessageSystem',rv)
+				}
+			})
+		}
+		MyWs.linkWs("ws://"+MyWs.messageUrl,'message')
+		let getWsMessage = (data)=>{
+			console.log(data);
+			store.commit('setMessageSystem',...data)
+		}
+		MyEvent.add('getMessage',getWsMessage)
+		// setTimeout(() => {
+		// 	MyWs.sendMessage('aaaa')
+		// }, 3000);
+		// MyWs.ws.onmessage = (data)=>{
+		// 	console.log(JSON.parse(data.data),232);
+		// }
+		onMounted(()=>{
+			getUnreadCount()
+		})
 		return {
 			store,
 			t,