diff --git a/.env b/.env
index be8c464..4c071b5 100644
--- a/.env
+++ b/.env
@@ -34,10 +34,10 @@ VITE_OAUTH2_SOCIAL_CLIENT='social:social'
VITE_WEBSOCKET_ENABLE = true
# --------------------------- start 开发环境 start ----------------------------------
# VITE_APP_DEV_SERVICE = https://www.zianxin.com/api
-VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc
+# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc
# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
# VITE_APP_DEV_SERVICE = https://www.zianxin.com/api
-# VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc
+VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc
#VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
# VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api
diff --git a/src/App.vue b/src/App.vue
index b9319aa..ebc1e05 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,7 @@ import { globalWebSocket } from "@/sheep/utils/global-websocket"
import { handleCanteenDeliveryWebSocketFrame } from "@/sheep/utils/canteen-delivery-ws-push"
import jgPush from "@/sheep/utils/jg-push"
import { consumePendingPushRoute } from "@/sheep/utils/push-route"
+import { showPermissionUsage } from "@/sheep/utils/permission"
export default {
data() {
@@ -27,9 +28,27 @@ export default {
debug: true,
autoInitService: true,
enableCrashHandler: true,
- requestAndroidPermission: true,
- requestIOSNotificationPermission: true,
+ requestAndroidPermission: false,
+ requestIOSNotificationPermission: false,
})
+ const pushStatus = jgPush.getStatus()
+ const pushPermissionGranted =
+ pushStatus.notificationPermission === "granted" ||
+ pushStatus.notificationPermission === "provisional" ||
+ pushStatus.notificationEnabled === true
+ if (!pushPermissionGranted) {
+ const shouldRequestPushPermission = await showPermissionUsage("通知", {
+ feature: "消息通知",
+ purpose: "用于接收订单、配送、核销和系统服务状态等重要消息提醒。",
+ })
+ if (shouldRequestPushPermission) {
+ if (this.system.platform === "android") {
+ await jgPush.requestAndroidPermission()
+ await jgPush.refreshStatus()
+ }
+ if (this.system.platform === "ios") await jgPush.requestNotificationAuthorization()
+ }
+ }
// 收到通知时刷新未读角标；只有点击通知时才消费服务层预先写入的路由队列。
jgPush.on("notification", (event) => {
const eventType = event?.payload?.notificationEventType
diff --git a/src/components/qiun-data-charts/qiun-data-charts.vue b/src/components/qiun-data-charts/qiun-data-charts.vue
index d8a0b0f..b665e55 100644
--- a/src/components/qiun-data-charts/qiun-data-charts.vue
+++ b/src/components/qiun-data-charts/qiun-data-charts.vue
@@ -90,6 +90,7 @@