11

.env

@@ -33,15 +33,15 @@ VITE_OAUTH2_SOCIAL_CLIENT='social:social'
 # 是否开启websocket 消息接受,
 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://www.zianxin.com/api
+# 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 = http://127.0.0.1:9999
 
-# VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api
-VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc
+VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api
+# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc
 # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999
 # VITE_IMAGE_DEV_PATH = https://www.zianxin.com/api
 # VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc

pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+allowBuilds:
+  core-js: set this to true or false
+  core-js-pure: set this to true or false
+  esbuild: set this to true or false

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "资安信",
     "appid" : "__UNI__1BFE88F",
     "description" : "资安信后勤管理系统",
-    "versionName" : "1.5.28",
-    "versionCode" : 1528,
+    "versionName" : "1.5.29",
+    "versionCode" : 1529,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/user/relation/components/guardian-ward-action-drawer.vue

@@ -184,7 +184,8 @@ const identityName = computed(() => (isCurrentUser.value ? "本人" : "被监护
 /** 服务插画的无障碍说明根据当前办理身份展示。 */
 const drawerImageLabel = computed(() => `${identityName.value}人脸、饭卡与预约服务插画`)
 const avatarUrl = computed(() => filePath(props.ward?.wardAvatar) || "/static/icon/default-avatar.png")
-const statusClass = computed(() => (props.ward?.rechargeEnabled && topUpIdentityAllowed.value ? "bg-#ecfdf5 color-#047857" : "bg-#fff7ed color-#c2410c"))
+/** 实体饭卡状态标签独立于余额充值资格，未激活时仍保留提醒色。 */
+const statusClass = computed(() => (props.ward?.cardStatusName === "激活" ? "bg-#ecfdf5 color-#047857" : "bg-#fff7ed color-#c2410c"))
 const faceCapacityReached = computed(() => {
 	const available = props.ward?.availableFaceCount
 	const pending = props.ward?.pendingFaceCount
@@ -295,7 +296,7 @@ const actions = computed<WardAction[]>(() => {
 					iconColor: "#059669",
 					background: "#f5fdf9",
 					borderColor: "#ccefe0",
-					/** 身份不匹配时入口不会生成；已通过身份限制后，仍需保留饭卡状态禁用反馈。 */
+					/** 身份不匹配时入口不会生成；钱包冻结等真实禁用状态继续以后端资格为准。 */
 					disabled: !props.ward?.rechargeEnabled,
 				},
 			]

src/pages/user/relation/list.vue

@@ -200,10 +200,11 @@ type HeroFaceSummary = {
 }
 
 const avatarUrl = (ward: GuardianWardRechargeItem) => filePath(ward.wardAvatar) || "/static/icon/default-avatar.png"
-/** 目标饭卡最终可充值状态，后端卡状态和直属商户身份限制必须同时满足。 */
+/** 目标余额钱包最终可充值状态；未绑定或未激活实体饭卡不影响该资格。 */
 const rechargeAvailable = (ward: GuardianWardRechargeItem) => Boolean(ward.rechargeEnabled)
 	&& userStore.isTopUpIdentityAllowed(ward.identityTypes)
-const statusClass = (ward: GuardianWardRechargeItem) => (rechargeAvailable(ward) ? "bg-#ecfdf5 color-#047857" : "bg-#fff7ed color-#c2410c")
+/** 实体饭卡状态标签独立展示，避免把可充值的未激活钱包误标成已激活状态。 */
+const statusClass = (ward: GuardianWardRechargeItem) => (ward.cardStatusName === "激活" ? "bg-#ecfdf5 color-#047857" : "bg-#fff7ed color-#c2410c")
 
 /**
  * 返回列表项相对当前登录用户的身份文案，避免把所有关系人都误称为被监护人。