From e279e6f4dd7c4c5278dbd0a00bfaccbc48022936 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期五, 06 二月 2026 10:55:15 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
App.vue | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/App.vue b/App.vue
index c4c1fff..540bc51 100644
--- a/App.vue
+++ b/App.vue
@@ -1,19 +1,104 @@
<script>
+ import WebSocketServices from "./utils/WebSocketServices";
import {
getOpenId,
setUserInfo,
setToken,
- getToken
+ getToken,
+ getUserInfo
} from "./utils/auth";
+ import getuiUtils from "./utils/getuiUtils";
export default {
onLaunch: function() {
console.log('App Launch')
+ // #ifdef H5
+ // 娴嬭瘯鏃讹紝H5椤甸潰鍒锋柊浼氫涪澶盬ebSocket杩炴帴锛岄渶瑙﹀彂閲嶈繛 锛堥渶瑕佹祴璇曠殑鏃跺�欏啀瑙ｉ櫎娉ㄩ噴锛屽惁鍒欎細褰卞搷鐑洿鏂帮級
+ // if (uni.getStorageSync("userinfo")) {
+ // if (WebSocketServices.wsInstance) { // 鍋囪浣犵殑 WebSocket 瀹炰緥瀛樺湪 wsInstance 涓�
+ // WebSocketServices.closeConnect(); // 璋冪敤浣犲皝瑁呯殑鈥滃叧闂繛鎺モ�濇柟娉�
+ // }
+
+ // setTimeout(() => {
+ // WebSocketServices.createConnect(
+ // getUserInfo()["Czybm"],
+ // getUserInfo()["Czymc"],
+ // )
+ // }, 500)
+
+ // }
+
+ // // 鍏抽敭锛氱洃鍚儹鏇存柊妯″潡鏇挎崲锛岄攢姣佹棫杩炴帴
+ // if (module.hot) {
+ // module.hot.accept(); // 鍏佽褰撳墠妯″潡鐑洿鏂�
+ // module.hot.dispose(() => {
+ // // 鐑洿鏂版浛鎹㈡ā鍧楀墠锛岄攢姣� WebSocket 杩炴帴
+ // if (WebSocketServices.wsInstance) {
+ // WebSocketServices.closeConnect();
+ // WebSocketServices.wsInstance = null; // 閲嶇疆瀹炰緥
+ // }
+ // });
+ // }
+ // #endif
+
+ // #ifdef APP-PLUS || APP
+ // 鐩戝惉 App 鍚姩鏃剁殑鎺ㄩ�佸弬鏁帮紙鍐峰惎鍔細App 鍏抽棴鍚庣偣鍑婚�氱煡鍚姩锛�
+ const launchOpts = plus.runtime.launchArguments;
+ if (launchOpts && launchOpts.payload) {
+ this.handlePushJump(launchOpts.payload); // 澶勭悊璺宠浆
+ }
+
+ // 鐩戝惉閫氱煡鐐瑰嚮浜嬩欢锛堢儹鍚姩锛欰pp 鍚庡彴杩愯鏃剁偣鍑婚�氱煡锛�
+ plus.push.addEventListener("click", (msg) => {
+ let payload = {};
+ console.log('msg: ', msg);
+ // 鍏煎涓嶅悓鏍煎紡鐨� payload锛堟湰鍦版帹閫� vs 杩滅▼鎺ㄩ�侊級
+ if (typeof msg.payload === "string") {
+ payload = JSON.parse(msg.payload); // 杩滅▼鎺ㄩ�佸彲鑳芥槸瀛楃涓诧紝闇�瑙ｆ瀽
+ } else {
+ payload = msg.payload; // 鏈湴鎺ㄩ�佹槸瀵硅薄
+ }
+ this.handlePushJump(payload); // 澶勭悊璺宠浆
+ });
+
+ // 涓帹v1鐗堟湰鍙兘閫氳繃閫忎紶浼犲弬
+ plus.push.addEventListener('receive', (msg) => {
+ console.log('鏀跺埌 V1 鐗堟湰閫忎紶娑堟伅锛�', msg);
+ // 浠呴�忎紶妯℃澘闇�瑕侊紙閫氱煡妯℃澘鏃犻渶澶勭悊锛�
+ if (msg.payload) {
+ this.handlePushJump(msg.payload);
+ }
+ }, false);
+ // #endif
},
onShow: function() {
console.log('App Show')
+
},
onHide: function() {
console.log('App Hide')
+ },
+ methods: {
+ // 澶勭悊閫氱煡璺宠浆閫昏緫
+ handlePushJump(payload) {
+ console.log('payload-enter: ', payload);
+ if (!payload || !payload.pagePath) return;
+
+ // 纭繚 App 澶勪簬鍓嶅彴
+ // plus.runtime.foreground();
+
+ // 璺宠浆鍒版寚瀹氶〉闈�
+ setTimeout(() => {
+ uni.navigateTo({
+ url: `${payload.pagePath}?itemId=${payload.itemId}`, // 鎼哄甫鍙傛暟
+ fail: (err) => {
+ // 鑻ラ〉闈㈡爤婊★紙鏈�澶�10灞傦級锛屼娇鐢� redirectTo 鏇挎崲褰撳墠椤甸潰
+ uni.redirectTo({
+ url: `${payload.pagePath}?itemId=${payload.itemId}`,
+ });
+ }
+ });
+ }, 300)
+ }
}
}
</script>
@@ -29,7 +114,7 @@
/* 鐢ㄤ簬瑙ｅ喅picker鍐呴儴璁剧疆 disabled input 鏃朵笉鍝嶅簲鐨勯棶棰� */
.picker-overlay {
- box-sizing: border-box;
+ box-sizing: border-box;
position: absolute;
top: 0;
left: 0;
--
Gitblit v1.9.1