From b2d1597a54acf6f113c7c0d39ee42f97ff3016c0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 23 Aug 2026 15:59:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E8=8F=9C=E5=93=81?=
=?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E4=BA=BA?=
=?UTF-8?q?=E5=91=98=E5=92=8C=E8=BA=AB=E4=BB=BD=E6=9F=A5=E8=AF=A2=20feat:?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 4 +-
src/App.vue | 23 +-
.../qiun-data-charts/qiun-data-charts.vue | 14 +-
src/manifest.json | 9 +-
src/pages/canteen-delivery/detail.vue | 4 +
src/pages/delivery/rider.vue | 20 +-
src/pages/human-face/guardian-ward-apply.vue | 2 +-
src/pages/merchant/online-dish-manage.vue | 5 +-
src/pages/merchant/rserve-cancel-list.vue | 20 +-
src/pages/pay/refund-apply.vue | 2 +-
src/pages/prosperity-shop/categary-manage.vue | 2 +-
src/pages/prosperity-shop/goods-form.vue | 2 +-
src/pages/tabbar/my.vue | 20 +-
src/pages/user/profile/index.vue | 20 +-
src/sheep/hooks/use-scan-code.ts | 22 ++
src/sheep/stores/user.ts | 16 +-
src/sheep/utils/jg-push/service.ts | 27 +-
src/sheep/utils/permission.ts | 365 +++++++++++++-----
.../tm-ui/components/tm-html/mp-node.vue | 21 +-
.../tm-upload-photo/tm-upload-photo.vue | 30 +-
.../tm-upload-video/tm-upload-video.vue | 32 +-
unpackage/release/__UNI__1BFE88F.wgt | Bin 1566637 -> 0 bytes
22 files changed, 518 insertions(+), 142 deletions(-)
delete mode 100644 unpackage/release/__UNI__1BFE88F.wgt
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 @@