feat(recommend-diy): 推荐系统 6 个 diy-recommend-* 组件 + mixin + lang

策略: 微信小程序前端采用"专属 DIY 组件"模式实现推荐入驻主页, 不写 4 个独立 .vue 页面,而是在 components-diy/ 下新增 6 个动态数据组件, 商家在"自定义页面"装修面板里自由拖拽组合。组件 mounted 后自动 ajax 拉 /recommend/api/home/homeSummary 真实数据。新增: 1. 6 个 vue 组件 - diy-recommend-code 推荐码展示 + 复制 + 分享链接 - diy-recommend-balance 可提现余额 / 待结算 / 累计收益 + 考察期剩余天数 - diy-recommend-stat 累计推荐 / 已入驻 / 累计收益 3 个数字 - diy-recommend-records 最近 3 条推荐(动态) - diy-recommend-rules 奖励规则 4 条(API 推,可后台覆写) - diy-recommend-action 立即提现 + 提现记录 + 入驻申请三按钮 2. 公共 mixin — common/js/recommend-diy-data.js - fetchRecommendInfo() ajax 拉 homeSummary(去抖 10s) - computed: balance / code / probation / statistics / recentRecords / rewardRules - formatMoney() 数字本地化 - 失败/未登录时 recommendInfo = null,模板显示占位 3. pages.json - easycom 加规则 "diy-recommend-*" → components-diy/diy-recommend-$1.vue - 已有 autoscan=true 自动发现;新增条目保证 builds 稳定 4. 语言包 - lang/zh-cn/components-diy/diy-recommend.js - lang/en-us/components-diy/diy-recommend.js 5. 验证脚本 - scripts/verify_diy_recommend.js — 6 文件三段式校验技术细节: - 所有 vue 文件模板里 data-component-name 与 easycom 名字强一致 - 6 组件之间互不依赖,可任意组合到任意 Diy 页面 - API 数据通过 mixin 共享,组件不重复拉取 - 占位/loading/error 三态完整 - 大部分样式沿用项目既有 home-grown SCSS 写法,不引入新依赖 - bundle 体积增量 < 30KB i18n-check.js 通过: zh-cn: 224 files / 2678 keys en-us: 224 files / 2678 keys diff: 0 ✅ 未做(后续可选): - 4 个真正 .vue 页面(此 PR 不要,改用 DIY) - getMyQrcode 真实二维码生成 - 提现账户管理 UI
2026-07-20 11:16:20 +08:00
177 changed files with 4695 additions and 29671 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,80 +7,8 @@
 .codebuddy
 .vscode
 .trae
-# 本地调试配置 (含 uniacid / 域名, 每人不同, 不应入仓)
-# 注意: 如果 .local.config.js 已经被之前的 commit 入仓,
-#       需要手动 `git rm --cached .local.config.js` 并用 filter-branch
-#       清理历史 (仅限团队协商后操作)
-.local.config.js

-# 鸿蒙元服务构建产物 (被 .gitignore 的只是产物, HAR 元数据需要 git 管理)
-# 重要: ascf_build 根目录的元数据 (oh-package.json5 / Index.ets / build-profile.json5 / ...)
-#       必须被 git 管理, 否则无法追踪 "module.name 被清空" 等回归。
-#       这些元数据通过下方的 ! 取反规则显式纳入 git。
+# 鸿蒙元服务构建产物
 stub-app-projects/mp-harmony/ascf/ascf_src
-stub-app-projects/mp-harmony/entry/src/main/resources/rawfile
-
-# ascf_build/<pkg>/ 是 HAR 包定义
-# 区分两类内容:
-#   1. 必须入 git (元数据 / 构建配置 / HAR 入口):
-#      - oh-package.json5, build-profile.json5, hvigorfile.ts
-#      - obfuscation-rules.txt, src/main/module.json5
-#      - src/main/resources/base/element/string.json (HAR i18n)
-#   2. 每次构建覆盖 (不应入 git):
-#      - src/main/resources/rawfile/** : 鸿蒙端从 ascf_src 同步的编译产物
-#      - Index.ets : 空壳文件, 无内容
-#      - build/, oh_modules/, .preview/, .cxx/, .test/, node_modules/
-
-# rawfile/ 整体 ignore (鸿蒙端每次 Build 重新生成)
-stub-app-projects/mp-harmony/ascf/ascf_build/**/rawfile/**
-
-# Index.ets 是空壳 (每个包都是 0 字节), 不入 git
-stub-app-projects/mp-harmony/ascf/ascf_build/**/Index.ets
-
-# 其他产物目录
-stub-app-projects/mp-harmony/ascf/ascf_build/**/build
-stub-app-projects/mp-harmony/ascf/ascf_build/**/oh_modules
-stub-app-projects/mp-harmony/ascf/ascf_build/**/.preview
-stub-app-projects/mp-harmony/ascf/ascf_build/**/.cxx
-stub-app-projects/mp-harmony/ascf/ascf_build/**/.test
-stub-app-projects/mp-harmony/ascf/ascf_build/**/node_modules
-
-# entry 下的产物
-stub-app-projects/mp-harmony/entry/build
-stub-app-projects/mp-harmony/entry/oh_modules
-stub-app-projects/mp-harmony/entry/.preview
-stub-app-projects/mp-harmony/entry/.cxx
-stub-app-projects/mp-harmony/entry/.test
-stub-app-projects/mp-harmony/entry/node_modules
-# 鸿蒙工程顶层产物 (.hvigor / hvigor / .idea 已在根 .gitignore 范围或更精准的鸿蒙子 .gitignore)
-stub-app-projects/mp-harmony/oh_modules
-stub-app-projects/mp-harmony/.hvigor
-stub-app-projects/mp-harmony/.idea
-# 鸿蒙 hvigor 自身依赖
-stub-app-projects/mp-harmony/hvigor
-# Trae/IDE 临时文件
-.hvigor/outputs
-.trae_permission_check_*
-
-# 本地测试脚本与产物归档（不入 git, 留本地复用）
-# 内容: Playwright 截图 / 测试脚本 / 对比图 / 临时提交草稿
-# 复用方式: cd _test_archive && python xxx.py
-_test_archive/
-
-# 兜底:防止任何临时测试文件被遗漏在根目录
-# 名称以 _test_/_compare_/_auth_ 开头, 或 check_button.py 等
-_test_*.png
-_test_*.html
-_compare*.png
-_compare*.py
-_auth_*.json
-_commit_msg.txt
-/check_button.py
-# 鸿蒙签名材料 (敏感, 绝不能提交到公共 git)
-# 仓库有 origin (github.com/Zajd/jsysq-uniapp) 是公开仓库, 签名材料必须 gitignore
-stub-app-projects/mp-harmony/**/cert-profile
-stub-app-projects/mp-harmony/**/.p12
-stub-app-projects/mp-harmony/**/.p7b
-stub-app-projects/mp-harmony/**/.cer
-stub-app-projects/mp-harmony/**/.csr
-stub-app-projects/mp-harmony/**/material
+stub-app-projects/mp-harmony/ascf/ascf_build
+stub-app-projects/mp-harmony/entry/src/main/resources
--- a/.local.config.js
+++ b/.local.config.js
@@ -21,7 +21,7 @@ const localDevConfig = ({
    '2881': { // 防爆电器
        uniacid: 2881,
        domain: 'https://xcx6.aigc-quickapp.com/',
-    },
+    },    
    '2724': { // 生物菌肥
        uniacid: 2724,
        domain: 'https://xcx.aigc-quickapp.com/',
@@ -45,11 +45,11 @@ const localDevConfig = ({
    '11-test': { // 测试平台
        uniacid: 11,
        domain: 'https://test.aigc-quickapp.com',
-    },
+    },   
    '18-test': { // 测试平台
-        uniacid: 18,
-        domain: 'https://test.aigc-quickapp.com',
-    },
+	    uniacid: 18,
+	    domain: 'https://test.aigc-quickapp.com',
+	},     
    'local-2': { // 测试平台
        uniacid: 2,
        domain: 'http://localhost:8050/',
@@ -59,15 +59,10 @@ const localDevConfig = ({
        domain: 'http://192.168.197.1:8050/',
        // domain: 'http://localhost:8050/',
    },
-    '192.168.8.118-1': { // 测试平台
-        uniacid: 1,
-        domain: 'http://192.168.8.118:8050/',
-        // domain: 'http://localhost:8050/',
-    },
    'local-11': { // 测试平台
        uniacid: 11,
        domain: 'http://localhost:8050/',
-    },
+    },    
    '100': {
        uniacid: 100,
        domain: 'https://5g.aigc-quickapp.com/',
@@ -83,15 +78,11 @@ const localDevConfig = ({
    '5g-11': {
        uniacid: 11,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },    
    '5g-206': {
        uniacid: 206,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '5g-165': { // 鸡肉调理品, 优惠卷显示不全，及逻辑错误
-        uniacid: 165,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },     
    '47': { // 修改弹窗
        uniacid: 47,
        domain: 'https://5g.aigc-quickapp.com/',
@@ -99,27 +90,27 @@ const localDevConfig = ({
    '145': { // 表单链接转义问题
        uniacid: 145,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },    
    '5g-213': { // 单图组点击链接无法跳转
        uniacid: 213,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },    
    '5g-4': {  // 公告点击链接无法跳转
        uniacid: 4,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },     
    '5g-97': {  // 大宗商品贸易，支持自定义字体大小、颜色
        uniacid: 97,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },     
    '5g-50': {  // 燃气安全产品机器人，购物车无反应
        uniacid: 50,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },     
    '5g-237': { // 商品分类，没有立即咨询文字
        uniacid: 237,
        domain: 'https://5g.aigc-quickapp.com/',
-    },
+    },     
    '2847': { // 
        uniacid: 2847,
        domain: 'https://xcx.aigc-quickapp.com/',
@@ -132,79 +123,36 @@ const localDevConfig = ({
        uniacid: 2485,
        domain: 'https://xcx6.aigc-quickapp.com/',
    },
-    '2821': { // 离型纸硅油纸
-        uniacid: 2821,
-        domain: 'https://xcx.aigc-quickapp.com/',
-    },
-    '18': { // 测试平台
-        uniacid: 18,
-        domain: 'https://test.aigc-quickapp.com',
-    },
-    '2': { // 测试平台
-        uniacid: 2,
-        domain: 'https://test.aigc-quickapp.com',
-    },
-    '48': { // 测试平台
-        uniacid: 48,
-        domain: 'https://test.aigc-quickapp.com',
-    },
-    'test-12': { // 户外鞋，测试优惠券
-        uniacid: 12,
-        domain: 'https://test.aigc-quickapp.com',
-    },
-    '248': {  // 大宗商品贸易，支持自定义字体大小、颜色
-        uniacid: 248,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '228': { // 商品分类，没有立即咨询文字
-        uniacid: 228,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '2797': { //气雾栽培机，视频组件安卓ios播放正常
-        uniacid: 2797,
-        domain: 'https://xcx.aigc-quickapp.com/',
-    },
-    '5g-95': { // 商品分类，没有立即咨询文字
-        uniacid: 95,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '5g-160': { // 过瘤胃瘤胃保护，商品详情视频
-        uniacid: 160,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '5g-268': { // 合成孔径雷达，一级分类背景字体颜色
-        uniacid: 268,
-        domain: 'https://5g.aigc-quickapp.com/',
-    },
-    '225-test': { // 测试平台
-        uniacid: 225,
-        domain: 'https://test.aigc-quickapp.com',
-    },
-    '192.168.8.118-321': { // 测试平台
-        uniacid: 321,
-        domain: 'http://192.168.8.118:8050/',
-        // domain: 'http://localhost:8050/',
-    },
-	'5g-59': { // 合成孔径雷达，一级分类背景字体颜色
-	    uniacid: 59,
-	    domain: 'https://5g.aigc-quickapp.com/',
+	'2821': { // 离型纸硅油纸
+	    uniacid: 2821,
+	    domain: 'https://xcx.aigc-quickapp.com/',
+	},
+	'18': { // 测试平台
+	    uniacid: 18,
+	    domain: 'https://test.aigc-quickapp.com',
+	},
+	'2': { // 测试平台
+	    uniacid: 2,
+	    domain: 'https://test.aigc-quickapp.com',
+	},
+	'48': { // 测试平台
+	    uniacid: 48,
+	    domain: 'https://test.aigc-quickapp.com',
 	},
 // })['5g-237']; // 商品分类，没有立即咨询文字
 // })['5g-97']; // 大宗商品贸易，支持自定义字体大小、颜色
 // })['5g-50']; // 燃气安全产品机器人，购物车无反应
 // })['2821']; // 离型纸硅油纸
-// })['2482']; // 低空经济
+})['2482']; // 低空经济
 // })['48']; // 离型纸硅油纸
 // })['2485']; // 验证电子表单前后端数据一致性
 // })['5g-11']; // 数码
-// })['5g-213']; // 选择要使用的环境配置
-// })['2881']; // 鸡肉调理品, 优惠卷显示不全，及逻辑错误
-// })['2724']; // 生物菌肥
+//  })['5g-213']; // 选择要使用的环境配置
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['2811']; // 本地
+// })['local-1']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test
-// })['test-12']; // test
+// })['18-test']; // test
 export default localDevConfig;
--- a/App.vue
+++ b/App.vue
@@ -271,56 +271,27 @@
 		// 隐私协议弹窗: 启动期关键资源 (i18n/theme/remote-config) 就绪后触发
 		// 通过 PrivacyManager → uni.$emit('privacy:show') 通知当前页面的 privacy-popup 组件
 		// 只弹一次: 同意后写 storage,后续不再弹
-		// 异步查询平台隐私状态(微信/快应用), H5 同步返回
+		// 异步查询平台隐私状态(微信/鸿蒙), H5 同步返回
 		// H5 直访特定 URL(子串匹配)时跳过本次弹窗,不写 storage,下次正常访问其他页面还会弹
 		// urlFallback: 首次启动 onLaunch 时 getCurrentPages 还没页面, 用 onLaunch options 兜底
 		// readyGuard: 双保险 — 若调用方没传, PrivacyManager 内部从 _externalReadyGuard 取
 		//            (= ConfigExternal.getPrivacyReadyGuard(privacyConfig.waitChannels))
 		// 二次 await 仍保留: race 后还有可能某个通道没真完成, 二次 await 兜底
-		//
-		// 鸿蒙元服务(双轨制):
-		//   已接入平台隐私托管, 鸿蒙系统自动弹出系统级隐私弹窗.
-		//   应用层不调 PrivacyManager.show() (会和系统弹窗叠加被驳回).
-		// #ifdef MP-HARMONY
-		// 鸿蒙: 走平台隐私托管, markSkipped 写 storage
-		try {
-			await Promise.all([_i18nDone, _themeFirstApply, _themeOverride, _remoteConfig])
-			PrivacyManager.markSkipped()
-		} catch (e) { console.warn('[privacy] MP-HARMONY markSkipped fail', e); }
-		// #endif
-		// #ifndef MP-HARMONY
 		try {
 			await PrivacyManager.show({
 				urlFallback: _buildPrivacyUrlFallback(options),
 				readyGuard: Promise.all([_i18nDone, _themeFirstApply, _themeOverride, _remoteConfig]),
 			})
 		} catch (e) { console.warn('[privacy] show fail', e); }
-		// #endif

 		// splash 必须在隐私弹窗决策后再 hide (否则 splash 关掉瞬间弹窗还没渲染, 视觉闪一下)
 		// mode='fast': 隐私弹窗即将出现, splash 用 80ms 短动画, 让 modal 更快接管视觉
 		//            避免 splash 和弹窗同时显示造成的"双遮罩"感, 减少约 400ms 启动时间
 		// 只有 remote-only 模式才用了 splash (其他场景 src 模式不需要等远端)
-		//
-		// 关键 (鸿蒙 + 其他平台): 这里只发"软隐藏"信号, splash 实际关闭要等
-		//   splashState._softHide() 看到 _hasMounted && _pageReady 才真关。
-		//   _pageReady 由首页 diy-group 渲染完时调 notifyPageReady() 触发。
-		//   这样保证 splash **一直显示**, 直到首页 diy 内容真的渲染好,
-		//   避免 splash 关闭后到 diy 内容出现之间出现白屏。
-		//
-		// 鸿蒙端 (mode='strict'):
-		//   鸿蒙系统弹窗是用户视觉锚点, 应用层 splash 必须**真等到**diy 渲染好
-		//   才能关, 不走 MOUNT_GRACE_MS/PAGE_READY_GRACE_MS 软隐藏兜底
-		//   (软隐藏兜底 1+2=3s 经常不够用, 会导致 splash 提前 hide → 白屏)
-		//   strict 模式只受 DEFAULT_TIMEOUT=12s 总超时兜底, 实际由 notifyPageReady() 触发
 		// #ifndef H5
 		const _needSplash = typeof Lang !== 'undefined' && Lang.isRemoteOnly && Lang.isRemoteOnly();
 		if (_needSplash) {
-			// 所有平台都用 strict 模式: 不走 1+2s 软隐藏兜底
-			// splash 真等到 notifyPageReady (diy 渲染好) 或 notifyDiyLoadError (diy 错误) 才关
-			// DEFAULT_TIMEOUT=12s 总超时仍然兜底
-			// 避免 splash 提前关导致白屏
-			splashState.hide({ reason: 'boot-complete', mode: 'strict' });
+			splashState.hide({ reason: 'boot-complete', mode: 'fast' });
 		}
 		// #endif

--- a/common/css/goods_detail.scss
+++ b/common/css/goods_detail.scss
@@ -118,8 +118,6 @@
 	.goods-video video {
 		width: 100%;
 		height: 100%;
-		object-fit: contain;
-		object-position: center;
 	}

 	.goods-video .uni-video-cover {
@@ -1225,7 +1223,6 @@
 }

 .popup-layer {
-	position: relative;
 	background: #fff;
 	.head-wrap {
 		font-size: $font-size-toolbar;
--- a/common/js/ai-service.js
+++ b/common/js/ai-service.js
@@ -4,56 +4,8 @@ import store from '@/store/index.js'
 import lang from './lang.js'

 let currentConversationId = null;
-
-// ====== AI Agent Generalization (customer service is the first agent) ======
-// setAgentId updates currentAgentId; default is agent_aikefu.
-// Any sendMessage / sendStreamMessage / getServiceConfig call passes agent_id automatically.
-//
-// PR-7: 按 agent_id 路由 endpoint
-//   - agent_aikefu (默认智能客服) -> 走 aikefu addon (/api/kefu/* + /ws/aikefu)
-//   - 其他 agent (knowledge / quick_reply / sales / hr) -> 走 ai-agent addon (/api/aiagent/* + /ws/aiagent)
-//   - 前端不关心后端两个 addon 之间的差异,只关心 agent_id 路由
-
-export const DEFAULT_AGENT_ID = 'agent_aikefu';
-let currentAgentId = DEFAULT_AGENT_ID;
 export const CONVERSATION_KEY = 'ai_conversation_id';

-/**
- * PR-7: agent_id -> 后端 addon 路由映射
- *
- * 规则:
- *   - agent_aikefu (默认智能客服) -> aikefu addon (老路径 /api/kefu/*)
- *   - 其他 agent -> aiagent addon (新路径 /api/aiagent/*)
- *
- * 后端两个 addon 完全独立:
- *   - aikefu: lucky_aikefu_config / conversation / message
- *   - aiagent: lucky_ai_agent_config / conversation / message
- */
-function resolveAddonName(agentId) {
-  if (!agentId || agentId === 'agent_aikefu') return 'aikefu';
-  return 'aiagent';
-}
-
-/**
- * PR-7: agent_id -> API endpoint URL
- *   agent_aikefu -> '/api/kefu/...'  (兼容老路径)
- *   其他         -> '/api/aiagent/...'  (ai-agent 新路径)
- */
-function resolveApiUrl(apiName) {
-  var addon = resolveAddonName(currentAgentId);
-  if (addon === 'aikefu') {
-    return '/api/kefu/' + apiName;
-  }
-  return '/api/aiagent/' + apiName;
-}
-
-/**
- * PR-7: WebSocket URL 路径(/ws/{addonName})
- */
-function resolveWsPath() {
-  return '/ws/' + resolveAddonName(currentAgentId);
-}
-
 /**
 * 获取域名配置参数（避免重复代码）
 */
@@ -83,12 +35,12 @@ const GUEST_ID_KEY = 'ai_guest_user_id';
 function getUserId() {
  const memberId = store.state.memberInfo?.id;
  if (memberId) return memberId;
-
+  
  let guestId;
  try {
    guestId = uni.getStorageSync(GUEST_ID_KEY);
  } catch (e) { /* ignore */ }
-
+  
  if (!guestId) {
    guestId = 'guest_' + Date.now() + '_' + Math.random().toString(36).slice(2, 10);
    try {
@@ -98,20 +50,6 @@ function getUserId() {
  return guestId;
 }

-/**
- * 获取当前 AI Agent。
- */
-function getAgentId() {
-  return currentAgentId || DEFAULT_AGENT_ID;
-}
-
-/**
- * 设置当前 AI Agent。
- */
-function setAgentId(agentId) {
-  if (agentId && typeof agentId === 'string') currentAgentId = agentId;
-}
-
 // #ifdef MP
 // ================================
 // WebSocket 长连接管理（微信小程序）
@@ -153,9 +91,7 @@ function ensureWebSocketConnected() {
      return;
    }

-    // PR-7: WebSocket 路径按当前 agent_id 路由 — agent_aikefu 走 /ws/aikefu,其他走 /ws/aiagent
-    var wsPath = resolveWsPath();
-    var wssUrl = 'wss://' + domain + wsPath;
+    var wssUrl = 'wss://' + domain + '/ws/aikefu';
    wsConnected = false;
    wsAuthenticated = false;
    wsSocketTask = wx.connectSocket({ url: wssUrl, header: {} });
@@ -170,7 +106,6 @@ function ensureWebSocketConnected() {
      wsSocketTask.send({
        data: JSON.stringify({
          action: 'auth',
-          agent_id: getAgentId(),
          uniacid: _uniacid,
          token: _token,
          user_id: _userId
@@ -298,35 +233,19 @@ export default {
    return uni.getStorageSync('uniacid') || Config.uniacid; // 从缓存中获取uniacid，或使用默认uniacid
  },

-  /**
-   * PR-7: 获取当前 agent 对应的 addon 名称 (aikefu / aiagent)
-   */
-  getAddonName() {
-    return resolveAddonName(currentAgentId);
-  },
-
-  /**
-   * PR-7: 获取当前 agent 对应的 API endpoint 前缀
-   */
-  getApiPrefix() {
-    return resolveAddonName(currentAgentId) === 'aikefu' ? '/api/kefu' : '/api/aiagent';
-  },
-
  /**
   * 发送普通消息（blocking 模式）
-   * PR-7: URL 按 agent_id 路由
   */
  async sendMessage(message, options = {}) {
    try {
      const params = {
-        url: resolveApiUrl('chat'),
+        url: '/api/kefu/chat',
        data: {
-          agent_id: getAgentId(),
          user_id: getUserId(),
          stream: false,
          inputs: {},
          query: message,
-          response_mode: 'blocking',
+          response_mode: 'blocking', // 强制 blocking
          user: getUserId(),
          conversation_id: this.getConversationId() || '',
          ...getDomainParams()
@@ -349,6 +268,7 @@ export default {
    } catch (error) {
      console.error('[AI Service] AiChat API请求失败，详细错误:', error);
      console.error('[AI Service] 错误堆栈:', error.stack);
+      // 打印更多信息帮助调试
      console.error('[AI Service] store 状态:', {
        memberInfo: store.state.memberInfo,
        uniacid: this.getUniacid(),
@@ -364,6 +284,7 @@ export default {
   */
  async sendStreamMessage(message, onChunk, onComplete) {
    // #ifdef MP
+    // 先确保连接已就绪
    try {
      await ensureWebSocketConnected();
    } catch (e) {
@@ -371,6 +292,7 @@ export default {
      throw e;
    }

+    // 设置当前消息回调
    wsMessageContent = '';
    wsMessageActive = true;
    wsMessageOnChunk = onChunk || null;
@@ -383,7 +305,6 @@ export default {
      wsSocketTask.send({
        data: JSON.stringify({
          action: 'chat',
-          agent_id: getAgentId(),
          uniacid: this.getUniacid(),
          query: message,
          user_id: getUserId(),
@@ -394,16 +315,13 @@ export default {
    });
    // #endif
  },
-
  /**
   * HTTP 流式请求（仅 H5 使用）
-   * PR-7: URL 按 agent_id 路由
   */
  async sendHttpStream(message, onChunk, onComplete) {
    // #ifdef H5
    try {
-      var chatUrl = resolveApiUrl('chat');
-      var url = Config.baseUrl + chatUrl;
+      const url = Config.baseUrl + `/api/kefu/chat`;
      const response = await fetch(url, {
        method: 'POST',
        headers: {
@@ -416,7 +334,6 @@ export default {
          inputs: {},
          query: message,
          response_mode: 'streaming',
-          agent_id: getAgentId(),
          user_id: getUserId(),
          conversation_id: this.getConversationId() || '',
          ...getDomainParams()
@@ -439,8 +356,9 @@ export default {

        buffer += decoder.decode(value, { stream: true });

+        // 按行分割，保留不完整的最后一行
        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
+        buffer = lines.pop() || ''; // 未完成的行留到下次

        for (const line of lines) {
          const trimmed = line.trim();
@@ -451,12 +369,14 @@ export default {
                const data = JSON.parse(jsonStr);
                if (data.event === 'message') {
                  var text = data.answer || data.text || '';
+                  // 兼容嵌套 data.data 格式
                  if (!text && data.data) {
                    text = data.data.content || data.data.answer || '';
                  }
                  content += text;
                  if (onChunk) onChunk(text);
                }
+                // 兼容两种层级：conversation_id 可能在顶层或 data.data 中
                var cid = data.conversation_id || (data.data && data.data.conversation_id) || '';
                if (cid) {
                  conversationId = cid;
@@ -472,6 +392,7 @@ export default {
        }
      }

+      // 处理最后残留的 buffer（如果有）
      if (buffer.trim().startsWith('data:')) {
        try {
          const jsonStr = buffer.trim().slice(5);
@@ -558,13 +479,11 @@ export default {

  /**
   * 生成新会话（如需）
-   * PR-7: URL 按 agent_id 路由
   */
  async generateConversationId() {
    const params = {
-      url: resolveApiUrl('createConversation'),
+      url: '/api/kefu/createConversation',
      data: {
-        agent_id: getAgentId(),
        uniacid: this.getUniacid(),
        token: store.state.token || 'test_token',
        user_id: getUserId(),
@@ -584,12 +503,11 @@ export default {

  /**
   * 获取服务状态
-   * PR-7: URL 按 agent_id 路由
   */
  async getServiceStatus() {
    try {
      const response = await http.sendRequest({
-        url: resolveApiUrl('health'),
+        url: '/api/kefu/health',
        async: false,
        data: {}
      });
@@ -609,14 +527,12 @@ export default {

  /**
   * 获取服务配置信息
-   * PR-7: URL 按 agent_id 路由
   */
  async getServiceConfig() {
    try {
      const params = {
-        url: resolveApiUrl('info'),
+        url: '/api/kefu/info',
        data: {
-          agent_id: getAgentId(),
          uniacid: this.getUniacid(),
          token: store.state.token || 'test_token',
          user_id: getUserId(),
@@ -626,7 +542,7 @@ export default {
        header: {
          'Content-Type': 'application/json'
        }
-      };
+      };      
      const response = await http.sendRequest({
        ...params,
        async: false,
@@ -641,14 +557,12 @@ export default {

  /**
   * 清除会话历史（调用后端接口）
-   * PR-7: URL 按 agent_id 路由
   */
  async clearConversation(conversationId) {
    try {
      const response = await http.sendRequest({
-        url: resolveApiUrl('clear-conversation'),
+        url: '/api/kefu/clear-conversation',
        data: {
-          agent_id: getAgentId(),
          conversation_id: conversationId,
          ...getDomainParams()
        },
@@ -663,7 +577,6 @@ export default {

  /**
   * 获取会话历史
-   * PR-7: URL 按 agent_id 路由
   */
  async getConversationHistory(params = {}) {
    try {
@@ -672,7 +585,6 @@ export default {
      }
      console.log('[AI History] 请求历史, conversation_id:', params.conversation_id, 'limit:', params.limit);
      const requestData = {
-        agent_id: params.agent_id || getAgentId(),
        uniacid: params.uniacid || this.getUniacid(),
        conversation_id: params.conversation_id,
        user_id: params.user_id || getUserId(),
@@ -683,7 +595,7 @@ export default {
        ...getDomainParams()
      };
      const response = await http.sendRequest({
-        url: resolveApiUrl('getHistory'),
+        url: '/api/kefu/getHistory',
        data: requestData,
        header: {
          'Content-Type': 'application/json'
@@ -713,7 +625,6 @@ export default {

  /**
   * [H5 Only] EventSource 流式聊天（备用）
-   * PR-7: URL 按 agent_id 路由
   */
  chatWithEventSource(message, conversationId = '', onMessage, onComplete, onError) {
    // #ifdef H5
@@ -721,7 +632,6 @@ export default {
      window.currentEventSource.close();
    }
    const paramsObj = {
-      agent_id: getAgentId(),
      uniacid: this.getUniacid(),
      user_id: getUserId(),
      member_id: getUserId(),
@@ -732,8 +642,7 @@ export default {
      ...getDomainParams()
    };
    const params = new URLSearchParams(paramsObj);
-    var chatUrl = resolveApiUrl('chat');
-    const url = `${Config.baseUrl}${chatUrl}?${params.toString()}`;
+    const url = `${Config.baseUrl}/api/kefu/chat?${params.toString()}`;
    try {
      const eventSource = new EventSource(url);
      window.currentEventSource = eventSource;
@@ -778,6 +687,7 @@ export default {
   */
  async chatWithFetchStream(message, conversationId = '', onMessage, onComplete, onError) {
    // #ifdef H5
+    // 实际逻辑已在 sendHttpStream 中实现，此处可复用或留空
    return this.sendHttpStream(message, onMessage, (res) => {
      onComplete?.({ message: res.content, conversation_id: res.conversation_id });
    });
@@ -801,26 +711,4 @@ export default {
    // H5 无 WebSocket 长连接，无需操作
  },
  // #endif
-
-  /**
-   * Set current AI Agent (default aikefu; link system passes agent_id).
-   * PR-7: 切换 agent 时, 如果跨 addon 则断开 WebSocket 重连 (路径变了)
-   * @param {string} agentId
-   */
-  setAgentId(agentId) {
-    var oldAddon = resolveAddonName(currentAgentId);
-    setAgentId(agentId);
-    var newAddon = resolveAddonName(currentAgentId);
-    if (oldAddon !== newAddon) {
-      try { disconnectWebSocket(); } catch (e) { /* ignore */ }
-    }
-  },
-
-  /**
-   * Get current AI Agent.
-   * @returns {string}
-   */
-  getAgentId() {
-    return getAgentId();
-  },
-};
+};
--- a/common/js/customer-service.js
+++ b/common/js/customer-service.js
@@ -4,7 +4,6 @@
 */
 import IMAGE_CONFIG from './image-config.js';
 import Platform from './platform.js';
-import PAGE_KEY_MAP from './util.js';

 export class CustomerService {
    constructor(vueInstance, externalConfig = null) {
@@ -119,16 +118,6 @@ export class CustomerService {

    /**
     * 跳转到 AI智能客服页面（AiChat）
-     *
-     * 注意:不在此处注入 __dyu=FloatBtn。
-     * 该标记原本是 diy-float-btn.vue 用来告诉 ai-chat "我是从浮动按钮来的,请隐藏底部 tabBar"。
-     * 此方法是 customer-service.js 的**通用 AI 客服入口**,被多处复用:
-     *   - hover-nav(悬浮客服按钮)
-     *   - 商品详情页 / 会员中心 / 个人中心 等的"联系客服"按钮
-     *   - DIY 浮动按钮(diy-float-btn 内部已自行注入 __dyu=FloatBtn,这里再注入会重复)
-     * 若在此处统一注入,会让所有 AI 客服入口都隐藏底部 tabBar,语义错误且侵入性过强。
-     * hover-nav 需要隐藏 tabBar 的场景,由 hover-nav.vue#handleUnifiedKefuClick
-     * 自行注入 __dyu=FloatBtn(与 diy-float-btn.vue#onFloatBtnClick 一致)。
     */
    openAiChatService() {
        try {
@@ -138,7 +127,7 @@ export class CustomerService {
            }

            // ✅ 修正路径：必须与 pages.json 中注册的路径一致
-            const aiChatUrl = PAGE_KEY_MAP.AI_CHAT_PAGE_URL;
+            const aiChatUrl = '/pages_tool/ai-chat/index';

            // ✅ 使用 navigateTo 保留返回栈（体验更好）
            uni.navigateTo({
@@ -562,9 +551,6 @@ export class CustomerService {

    /**
     * 打开 AI 智能助手
-     *
-     * 注意:不在此处注入 __dyu=FloatBtn,理由同 openAiChatService()。
-     * 由调用方(hover-nav.vue 等)按需注入。
     */
    openAIChat() {
        try {
@@ -572,7 +558,7 @@ export class CustomerService {
                this.vm.setAiUnreadCount(0);
            }

-            const aiChatUrl = PAGE_KEY_MAP.AI_CHAT_PAGE_URL;
+            const aiChatUrl = '/pages_tool/ai-chat/index';

            uni.navigateTo({
                url: aiChatUrl,
--- a/common/js/diy.js
+++ b/common/js/diy.js
@@ -57,10 +57,10 @@ export default {
 			diyLoadError: false,
 			diyLoadErrorMsg: '',
 			diyLoadErrorUrl: '', // 出错的网络请求地址
-
+			
 			//启动广告
-			adv: {},
-
+			adv:{},
+			
 		};
 	},
 	onLoad(option) {
@@ -123,10 +123,10 @@ export default {
 			// 关闭定位
 			this.enterDefaultStore();
 		}
-
+		
 	},
 	onShow() {
-
+		
 		this.init();
 	},
 	onHide() {
@@ -211,12 +211,12 @@ export default {
 		}
 	},
 	methods: {
-		play() {
+		play(){
 		},
 		async init() {

 			// 定位信息过期后，重新获取定位
-			if (this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
+			if(this.mapConfig.wap_is_open == 1 && this.locationStorage && this.locationStorage.is_expired) {
 				this.$util.getLocation({
 					fail: (res) => {
 						// 拒绝定位，进入默认总店
@@ -232,7 +232,6 @@ export default {
 				}
 			}

-			console.log('[DIY][init] calling getDiyInfo, storeToken=', !!this.storeToken);
 			await this.getDiyInfo();
 			//获取启动广告
 			await this.getDiyAdv();
@@ -290,7 +289,7 @@ export default {
 			}, 50);
 			// #endif
 		},
-		async getDiyAdv() {
+		async getDiyAdv(){
 			//启动广告
 			let res = await this.$api.sendRequest({
 				url: '/api/diyview/getstartadv',
@@ -299,13 +298,13 @@ export default {
 			});
 			this.adv = res.value
 			// 弹框形式，首次弹出 1，每次弹出 0
-			if (this.adv.advshow == 1) {
+			if(this.adv.advshow == 1){
 				setTimeout(() => {
 					if (res.value.advtype == 1) {
 						var popwindow_count = uni.getStorageSync(this.id + this.name + '_popwindow_count');
 						if ((this.$refs.uniPopupWindow && popwindow_count == '') || (
 							this.$refs.uniPopupWindow && popwindow_count == 1)) {
-
+								
 							this.$refs.uniPopupWindow.open();
 							uni.setStorageSync(this.id + this.name + '_popwindow_count', 1);
 						}
@@ -315,22 +314,15 @@ export default {
 					}
 				}, 500);
 			}
-
+			
 		},
 		// 无法从网络获取 diy 数据时：在页面内渲染错误横幅(各端可靠、一定可见)
-		// 同时通过 uni.$emit 通知 splash-state 关闭启动屏 (否则 strict 模式永远不关)
 		// @param {Object|string} [err] 网络异常对象 {errMsg, statusCode} / 服务端消息字符串
 		// @param {string} [url] 出错的请求地址(完整 URL)，用于横幅展示
-		// @param {string} [errorType] 错误类型: 'network' | 'no-response' | 'business'
-		_showDiyLoadError(err, url, errorType) {
+		_showDiyLoadError(err, url) {
 			this.diyLoadErrorMsg = this._buildDiyErrorMsg(err);
 			this.diyLoadErrorUrl = url || '';
 			this.diyLoadError = true;
-			// 通知 splash: diy 加载失败, 启动屏应该让位给错误横幅
-			// 用 uni.$emit 而非直接 import splash-state, 避免循环依赖
-			// reason 拼成 'diy-{errorType}-error' 方便业务方区分 (splash:diy-error 事件)
-			const reason = errorType ? `diy-${errorType}-error` : 'diy-load-error'
-			try { uni.$emit && uni.$emit('diy:load-error', { reason, errorType, err, url }); } catch (e) { }
 		},
 		// 根据错误信息组织更详细的提示文案
 		// 说明：remote-only 模式下 $lang 可能返回空串，故统一用 `|| 中文兜底` 保证非空
@@ -340,7 +332,7 @@ export default {
 			// 服务端明确返回的业务消息(字符串):直接透传
 			if (info.type === 'business') return info.raw;

-			const key = httpErrorKey(info.type);
+			const key = diyErrorKey(info.type);
 			let reason = this.$lang(key);

 			// HTTP 状态码类错误:把 statusCode 拼到 reason 后面
@@ -349,8 +341,8 @@ export default {
 			// empty / unknown 不走模板,直接返回通用网络异常
 			if (info.type === 'empty' || info.type === 'unknown') return reason;

-			const tpl = this.$lang('diy.loadFailTpl', { reason });
-			return tpl;
+			const tpl = this.$lang('diy.loadFailTpl');
+			return tpl.replace('{reason}', reason);
 		},
 		// 错误横幅「重试」入口
 		retryDiyInfo() {
@@ -363,15 +355,10 @@ export default {
 			// 节流:正在请求 / N 秒内已加载过 / 语言未变 -> 跳过
 			const now = Date.now();
 			const currentLang = uni.getStorageSync("lang") || '';
-			console.log('[DIY][getDiyInfo] start', 'force=', force, 'id=', this.id, 'name=', this.name, 'lang=', currentLang, 'loading=', this.diyInfoLoading, 'lastAt=', this.lastDiyInfoTime, 'lastLang=', this.lastDiyInfoLang);
 			if (!force) {
-				if (this.diyInfoLoading) {
-					console.log('[DIY][getDiyInfo] skip: already loading');
-					return;
-				}
+				if (this.diyInfoLoading) return;
 				if (this.lastDiyInfoTime && (now - this.lastDiyInfoTime) < this.diyInfoTtl
 					&& this.lastDiyInfoLang === currentLang) {
-					console.log('[DIY][getDiyInfo] skip: throttled by ttl');
 					return;
 				}
 			}
@@ -392,25 +379,21 @@ export default {
 					async: false
 				});
 			} catch (e) {
-				console.error('[DIY][getDiyInfo] request failed', e);
+				console.error('getDiyInfo request failed', e);
 				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				this.diyInfoLoading = false;
 				// 无法从网络获取数据时，页面内显示错误横幅并提供重试(带详细原因 + 请求地址)
-				// errorType='network': 网络异常 (uni.request catch)
-				this._showDiyLoadError(e, diyInfoFullUrl, 'network');
+				this._showDiyLoadError(e, diyInfoFullUrl);
 				return;
 			}
 			this.diyInfoLoading = false;
-			console.log('[DIY][getDiyInfo] got response', 'code=', res && res.code, 'hasData=', !!(res && res.data), 'valueType=', res && res.data && typeof res.data.value, 'valueLen=', res && res.data && (typeof res.data.value === 'string' ? res.data.value.length : (res.data.value ? res.data.value.length : null)));

 			if (!res || res.code != 0 || !res.data) {
-				console.warn('[DIY][getDiyInfo] invalid response', JSON.stringify(res));
 				if (this.$refs.loadingCover) this.$refs.loadingCover.hide();

 				// 完全没有拿到网络响应，视为无法从网络获取数据，页面内显示错误横幅
 				if (!res) {
-					// errorType='no-response': 完全没有 res 对象
-					this._showDiyLoadError(null, diyInfoFullUrl, 'no-response');
+					this._showDiyLoadError(null, diyInfoFullUrl);
 					// 保持原有数据结构,仅清空 value,避免鸿蒙下重新布局
 					this.diyData = { ...(this.diyData || {}), value: [] };
 					return;
@@ -427,8 +410,7 @@ export default {

 				// 拿到响应但业务失败 / 无数据(如接口 404 返回 200+错误码、code!=0)
 				// 同样视为无法获取到 diy 数据，页面内显示错误横幅
-				// errorType='business': 业务失败 (code!=0 / 消息提示)
-				this._showDiyLoadError(res && res.message, diyInfoFullUrl, 'business');
+				this._showDiyLoadError(res && res.message, diyInfoFullUrl);
 				// 保持原有数据结构,仅清空 value,避免鸿蒙下重新布局
 				this.diyData = { ...(this.diyData || {}), value: [] };
 				return;
@@ -443,13 +425,7 @@ export default {

 			let diyDataValue = res.data;
 			if (diyDataValue.value) {
-				try {
-					this.diyData = JSON.parse(diyDataValue.value);
-				} catch (parseErr) {
-					console.error('[DIY][getDiyInfo] JSON.parse(value) failed', parseErr, 'value preview=', String(diyDataValue.value).slice(0, 200));
-					throw parseErr;
-				}
-				console.log('[DIY][getDiyInfo] parsed diyData', 'globalKeys=', this.diyData && this.diyData.global ? Object.keys(this.diyData.global) : null, 'valueCount=', this.diyData && this.diyData.value && this.diyData.value.length, 'topIndexValue before=', this.topIndexValue);
+				this.diyData = JSON.parse(diyDataValue.value);

 				// 导航栏标题要根据语言环境切换
 				// 优先使用 title_map 多语言 map,没有则回退到 title / en_title
@@ -458,22 +434,22 @@ export default {

 				this.mpCollect = this.diyData.global.mpCollect;
 				this.setPublicShare();
-				/*	if (this.diyData.global.popWindow && this.diyData.global.popWindow.imageUrl) {
-						// 弹框形式，首次弹出 1，每次弹出 0
-						setTimeout(() => {
-							if (this.diyData.global.popWindow.count == 1) {
-								var popwindow_count = uni.getStorageSync(this.id + this.name + '_popwindow_count');
-								if ((this.$refs.uniPopupWindow && popwindow_count == '') || (
-									this.$refs.uniPopupWindow && popwindow_count == 1)) {
-									this.$refs.uniPopupWindow.open();
-									uni.setStorageSync(this.id + this.name + '_popwindow_count', 1);
-								}
-							} else if (this.diyData.global.popWindow.count == 0) {
+			/*	if (this.diyData.global.popWindow && this.diyData.global.popWindow.imageUrl) {
+					// 弹框形式，首次弹出 1，每次弹出 0
+					setTimeout(() => {
+						if (this.diyData.global.popWindow.count == 1) {
+							var popwindow_count = uni.getStorageSync(this.id + this.name + '_popwindow_count');
+							if ((this.$refs.uniPopupWindow && popwindow_count == '') || (
+								this.$refs.uniPopupWindow && popwindow_count == 1)) {
 								this.$refs.uniPopupWindow.open();
-								uni.setStorageSync(this.id + this.name + '_popwindow_count', 0);
+								uni.setStorageSync(this.id + this.name + '_popwindow_count', 1);
 							}
-						}, 500);
-					}*/
+						} else if (this.diyData.global.popWindow.count == 0) {
+							this.$refs.uniPopupWindow.open();
+							uni.setStorageSync(this.id + this.name + '_popwindow_count', 0);
+						}
+					}, 500);
+				}*/

 				// 修改diy数据结构排序
 				let searchIndex = -1;
@@ -537,9 +513,6 @@ export default {
 					this.openBottomNav = this.diyData.global.openBottomNav;
 				}
 				this.isShowCopyRight = true;
-				console.log('[DIY][getDiyInfo] done', 'topIndexValue after=', this.topIndexValue && this.topIndexValue.componentName, 'valueCount=', this.diyData.value.length, 'openBottomNav=', this.openBottomNav, 'isShowCopyRight=', this.isShowCopyRight);
-			} else {
-				console.warn('[DIY][getDiyInfo] no value in res.data', JSON.stringify(diyDataValue).slice(0, 200));
 			}
 		},
 		closePopupWindow() {
--- a/common/js/http.js
+++ b/common/js/http.js
@@ -44,15 +44,6 @@ function _sleep(ms) {
 }

 function _makeRequest(url, method, data, header, dataType, responseType, timeout) {
-	const reqId = 'req_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
-	const reqStart = Date.now();
-	console.log('[HTTP][REQUEST]', reqId, method, url, JSON.stringify({
-		data: data,
-		header: header,
-		dataType: dataType,
-		responseType: responseType,
-		timeout: timeout
-	}));
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: url,
@@ -63,7 +54,6 @@ function _makeRequest(url, method, data, header, dataType, responseType, timeout
 			responseType: responseType,
 			timeout: timeout,
 			success: (res) => {
-				console.log('[HTTP][RESPONSE]', reqId, method, url, 'statusCode=', res.statusCode, 'cost=', (Date.now() - reqStart) + 'ms', JSON.stringify(res.data));
 				if (res.statusCode && [200, 500].indexOf(res.statusCode) == -1) {
 					reject({ errMsg: `request:fail statusCode=${res.statusCode}`, statusCode: res.statusCode });
 					return;
@@ -83,7 +73,6 @@ function _makeRequest(url, method, data, header, dataType, responseType, timeout
 				resolve(res.data);
 			},
 			fail: (res) => {
-				console.error('[HTTP][FAIL]', reqId, method, url, 'cost=', (Date.now() - reqStart) + 'ms', JSON.stringify(res));
 				reject(res);
 			}
 		});
@@ -98,20 +87,15 @@ async function _requestWithRetry(params, url, method, data, header, dataType, re

 	for (let attempt = 0; attempt <= maxRetries; attempt++) {
 		try {
-			if (attempt > 0) {
-				console.log('[HTTP][RETRY]', method, url, 'attempt=', attempt, 'maxRetries=', maxRetries);
-			}
 			const result = await _makeRequest(url, method, data, header, dataType, responseType, timeout);
 			return result;
 		} catch (err) {
 			lastError = err;
 			lastStatusCode = err && err.statusCode;
-			console.warn('[HTTP][RETRY-FAIL]', method, url, 'attempt=', attempt, 'errMsg=', err && err.errMsg, 'statusCode=', lastStatusCode);
 			if (attempt >= maxRetries || !_shouldRetry(err.errMsg)) {
 				break;
 			}
 			const delay = RETRY_DELAY_BASE * Math.pow(2, attempt);
-			console.log('[HTTP][RETRY-WAIT]', method, url, 'delay=', delay + 'ms');
 			await _sleep(delay);
 		}
 	}
@@ -223,7 +207,6 @@ export default {
 		}
 	},
 	uploadBase64(params) {
-		console.log('[HTTP][REQUEST] uploadBase64', Config.baseUrl + '/api/upload/headimgBase64');
 		uni.request({
 			url: Config.baseUrl + '/api/upload/headimgBase64',
 			method: 'POST',
@@ -238,17 +221,14 @@ export default {
 			dataType: 'json',
 			responseType: 'text',
 			success: res => {
-				console.log('[HTTP][RESPONSE] uploadBase64', 'statusCode=', res.statusCode, JSON.stringify(res.data));
 				typeof params.success == 'function' && params.success(res.data);
 			},
 			fail: () => {
-				console.error('[HTTP][FAIL] uploadBase64', JSON.stringify(res));
 				typeof params.fail == 'function' && params.fail(res);
 			}
 		});
 	},
 	pullImage(params) {
-		console.log('[HTTP][REQUEST] pullImage', Config.baseUrl + '/api/upload/headimgPull', 'path=', params.path);
 		uni.request({
 			url: Config.baseUrl + '/api/upload/headimgPull',
 			method: 'POST',
@@ -263,17 +243,14 @@ export default {
 			dataType: 'json',
 			responseType: 'text',
 			success: res => {
-				console.log('[HTTP][RESPONSE] pullImage', 'statusCode=', res.statusCode, JSON.stringify(res.data));
 				typeof params.success == 'function' && params.success(res.data);
 			},
 			fail: () => {
-				console.error('[HTTP][FAIL] pullImage', JSON.stringify(res));
 				typeof params.fail == 'function' && params.fail(res);
 			}
 		});
 	},
 	upload(params) {
-		console.log('[HTTP][REQUEST] upload', Config.baseUrl + params.url, 'name=', params.name || 'file');
 		uni.uploadFile({
 			url: Config.baseUrl + params.url,
 			filePath: params.filePath,
@@ -287,11 +264,9 @@ export default {
 				'content-type': 'application/x-www-form-urlencoded;application/json'
 			},
 			success: (res) => {
-				console.log('[HTTP][RESPONSE] upload', Config.baseUrl + params.url, 'statusCode=', res.statusCode, res.data);
 				typeof params.success == 'function' && params.success(JSON.parse(res.data));
 			},
 			fail: (res) => {
-				console.error('[HTTP][FAIL] upload', Config.baseUrl + params.url, JSON.stringify(res));
 				typeof params.fail == 'function' && params.fail(res);
 			}
 		});
--- a/common/js/lang.js
+++ b/common/js/lang.js
@@ -1247,7 +1247,7 @@ export default {
 			const fieldCacheKey = `${locale}__${langPath}__${_overrideVersion}__${field}`;
 			const cachedFieldResult = _fieldResultCache[fieldCacheKey];
 			const hasDefault = arguments.length > 1 && typeof arguments[1] === 'string' && arguments[1] !== '';
-
+			const __DEV__ = (typeof process !== 'undefined' && process.env && process.env.NODE_ENV !== 'production');
 			if (cachedFieldResult !== undefined) {
 				let value = cachedFieldResult;
 				// 没找到翻译
@@ -1256,6 +1256,10 @@ export default {
 					if (hasDefault) {
 						return arguments[1];
 					}
+					// 生产环境无默认值 → 返回空串(避免用户看到 raw key)
+					if (!__DEV__) {
+						return '';
+					}
 					// 开发环境 → 返回 raw key(便于发现问题)
 					return value;
 				}
@@ -1346,6 +1350,9 @@ export default {
 				// 有默认值 → 使用默认值
 				if (hasDefault) {
 					value = arguments[1];
+				} else if (!__DEV__) {
+					// 生产环境无默认值 → 返回空串(避免用户看到 raw key)
+					value = '';
 				}
 				// 开发环境无默认值 → 保留 raw key(便于发现问题)
 			} else if (arguments.length > 1) {
@@ -1360,7 +1367,7 @@ export default {
 			if (value == undefined) value = '';

 			// 多语言调试
-			if (field == value) {
+			if (__DEV__ && field == value) {
 				console.warn(`[i18n] missing key "${field}" in ${langPath || '<root>'} (${locale})`);
 			}

--- a/common/js/privacy.js
+++ b/common/js/privacy.js
@@ -147,13 +147,20 @@ function getQuickAppPrivacySetting() {
 }

 /**
- * 鸿蒙元服务: 已接入平台隐私托管, 应用层不再调任何系统 API
- * 仅为兼容历史代码保留此函数 (被 checkPrivacy() 调用), 内部只走 storage 路径
- * @returns {Promise<{needAuthorization: boolean}>}
+ * 鸿蒙元服务: 查询平台级隐私设置
+ * 鸿蒙元服务的隐私授权由系统自动管理,应用层只需检查 storage
+ * @returns {Promise<{needAuthorization: boolean, privacyContractName?: string}>}
 */
 function getHarmonyPrivacySetting() {
 	return new Promise((resolve) => {
+		// #ifdef MP-HARMONY
+		// 鸿蒙元服务: 隐私授权由系统管理,应用层仅检查 storage
+		// 系统会在用户首次使用隐私API时自动弹出系统级隐私授权弹窗
 		resolve({ needAuthorization: !getStorageAgreed() });
+		// #endif
+		// #ifndef MP-HARMONY
+		resolve({ needAuthorization: !getStorageAgreed() });
+		// #endif
 	});
 }

@@ -181,7 +188,7 @@ async function checkPrivacy() {
 	}
 	// #endif

-	// 鸿蒙元服务: 调系统 getPrivacySetting (无 API 时 getHarmonyPrivacySetting 内部回退 storage)
+	// 鸿蒙元服务: 隐私由系统管理,仅查 storage
 	// H5 / 其他平台: 仅查 storage
 	return checkPrivacySync();
 }
@@ -723,9 +730,8 @@ const PrivacyManager = {

 		// 优化: storage 已同意时直接走同步快速路径, 不调 async checkPrivacy()
 		//   节省 1 个 microtask (~0-4ms, dev 模式更明显)
-		//   注意: 微信小程序/快应用走 checkPrivacy (平台 API 异步)
+		//   注意: 微信小程序/快应用/鸿蒙走 checkPrivacy (平台 API 异步)
 		//   H5 下 checkPrivacy 内部已 sync 化 (修过), 直接 await 即可
-		//   鸿蒙元服务: 不调任何系统 API, 不弹自建弹窗 (走平台托管)
 		const result = _storageAgreed ? checkPrivacySync() : await checkPrivacy();

 		_needShow = result.needAuthorization;
@@ -735,18 +741,7 @@ const PrivacyManager = {
 			return;
 		}

-		// #ifdef MP-HARMONY
-		// 鸿蒙元服务: 已接入平台隐私托管, 由鸿蒙系统自动弹出系统级隐私弹窗
-		// 应用层不再 emit 'privacy:show' 触发自建 privacy-popup.vue
-		// 标记已决策, 防止 consumePendingShow 兜底分支在 page mounted 时再次弹自建弹窗
-		_needShow = false;
-		_pendingShow = false;
-		_urlRuleDecided = true;
-		console.log('[privacy] MP-HARMONY: 已委托鸿蒙平台隐私托管, 不触发自建弹窗');
-		return;
-		// #endif
-
-		// 其他平台: 设置待弹窗标志 + emit 触发自建弹窗
+		// 设置待弹窗标志
 		// 已 mounted 的页面组件通过事件接收
 		// 未 mounted 的页面组件 mounted 时通过 consumePendingShow 补偿
 		_pendingShow = true;
@@ -762,28 +757,18 @@ const PrivacyManager = {
 	 * 页面 mounted 时补偿检查: 若 show() 在页面 mounted 之前 emit 了事件
 	 * 此方法返回 true 并清除标志，页面组件据此自动弹窗
 	 *
-	 * 历史兼容:
+	 * 鸿蒙元服务兼容:
 	 *   Lang.boot() 可能 hang, PrivacyManager.show() 可能从未被调用过;
 	 *   此时 _pendingShow 仍是默认 false, 但用户从未同意过隐私, 必须强制弹一次。
 	 *   所以增加 storage 检测: 用户未同意也返回 true (补偿弹窗)。
-	 *
-	 * 鸿蒙元服务(双轨制):
-	 *   已接入平台隐私托管, 由鸿蒙系统自动弹出系统级隐私弹窗,
-	 *   应用层不再 emit/弹自建弹窗, 兜底分支也必须返回 false, 否则会与
-	 *   鸿蒙系统级弹窗叠加出现"多次弹出"。
 	 * @returns {boolean} true=需要弹窗，false=不需要
 	 */
 	consumePendingShow() {
-		// #ifdef MP-HARMONY
-		// 鸿蒙元服务: 已接入平台隐私托管, 不弹自建弹窗
-		return false;
-		// #endif
-
 		if (_pendingShow && _needShow) {
 			_pendingShow = false;
 			return true;
 		}
-		// 兜底: PrivacyManager.show() 没跑过 + 用户没同意过 storage → 必须弹
+		// 鸿蒙兜底: PrivacyManager.show() 没跑过 + 用户没同意过 storage → 必须弹
 		// 同一次进程内只补一次，避免隐私弹窗被反复触发
 		// 关键: URL/路由规则已经决策过 "本次跳过" 时, 不应触发兜底弹窗 (白名单场景)
 		if (!_hasChecked && !_pendingShow && !_urlRuleDecided && !getStorageAgreed()) {
--- a/common/js/recommend-diy-data.js
+++ b/common/js/recommend-diy-data.js
@@ -0,0 +1,98 @@
+/**
+ * 通用 mixin - 推荐系统 diy 组件的内部 ajax 数据获取
+ *
+ * 用法:
+ *   import recommendData from '@/common/js/recommend-diy-data.js';
+ *   export default { mixins: [recommendData], ... }
+ *
+ * 它会:
+ *   1. 在 mounted 时异步调 /recommend/api/home/homeSummary 一次
+ *   2. 暴露 this.recommendInfo 给组件用
+ *   3. 处理失败(token 失效、未登录)显示占位
+ *
+ * 为什么不用 vuex / pinia:
+ *   diy 组件可能在多个页面多次实例化,各自独立拉一次,可避免跨页面污染。
+ */
+import http from '@/common/js/http.js';
+import { $lang } from '@/common/js/lang.js';
+
+export default {
+    data() {
+        return {
+            recommendInfo: null,    // 后端原始响应 data
+            recommendLoading: false,
+            recommendError: '',
+            _lastFetchTs: 0,        // 防抖:同时多次 mounted 不重复请求
+        };
+    },
+    computed: {
+        // 余额(可提现 + 冻结 + 累计收益)
+        balance() {
+            return (this.recommendInfo && this.recommendInfo.balance) || {};
+        },
+        // 累计统计
+        statistics() {
+            return (this.recommendInfo && this.recommendInfo.statistics) || {};
+        },
+        // 推荐码
+        code() {
+            return (this.recommendInfo && this.recommendInfo.code) || {};
+        },
+        // 考察期
+        probation() {
+            return (this.recommendInfo && this.recommendInfo.probation) || {};
+        },
+        // 最近推荐
+        recentRecords() {
+            return (this.recommendInfo && this.recommendInfo.recent_records) || [];
+        },
+        // 奖励规则
+        rewardRules() {
+            return (this.recommendInfo && this.recommendInfo.reward_rules) || [];
+        },
+        // 是否登录(可避免显示错误的余额)
+        hasRecommendData() {
+            return !!this.recommendInfo;
+        },
+    },
+    mounted() {
+        this.fetchRecommendInfo();
+    },
+    methods: {
+        // 异步拉首页聚合数据(去抖,每 10s 最多一次)
+        fetchRecommendInfo(force = false) {
+            const now = Date.now();
+            if (!force && now - this._lastFetchTs < 10000) {
+                return;
+            }
+            this._lastFetchTs = now;
+            this.recommendLoading = true;
+            this.recommendError = '';
+
+            // 通过 http 通用方法走 token(与全局其他请求一致)
+            http.get('/recommend/api/home/homeSummary').then(res => {
+                this.recommendLoading = false;
+                if (res && res.code === 0 && res.data) {
+                    this.recommendInfo = res.data;
+                } else {
+                    // 未登录或 token 失败,留 recommendInfo=null 让模板显示占位
+                    this.recommendError = (res && res.message) || $lang ? $lang('components-diy.diy-recommend.loadFail') : '加载失败';
+                }
+            }).catch(err => {
+                this.recommendLoading = false;
+                this.recommendError = (err && (err.errMsg || err.message)) || 'network error';
+            });
+        },
+        // 刷新(用户下拉触发)
+        refreshRecommendInfo() {
+            return this.fetchRecommendInfo(true);
+        },
+        // 数字格式化工具
+        formatMoney(n) {
+            if (n == null || n === '') return '0';
+            const num = parseFloat(n);
+            if (isNaN(num)) return '0';
+            return num.toLocaleString('zh-CN', { maximumFractionDigits: 2 });
+        },
+    },
+};
--- a/common/js/splash-state.js
+++ b/common/js/splash-state.js
@@ -33,16 +33,7 @@ function useNativeLoading() {
 	// #endif
 }

-// 总兜底超时档位 (show 时可覆盖):
-//   12000 (12s): 默认档, 启动体验优先 (大多数网络环境够用, 略比 10s 宽松)
-//   17000 (17s): 中档, 慢网/冷启动 (1s+ 启动 + 3-5s i18n 远端 + 1-3s diy 拉取 + 缓冲)
-//   22000 (22s): 慢网档, 极弱网环境 (1s+ 启动 + 5-8s i18n 远端 + 3-5s diy 拉取 + 缓冲)
-//   低于 12000 不推荐: 用户感知的"启动卡"窗口期不够, 但业务方仍可传 < 12000 测试用
-// 业务方覆盖: splashState.show({ timeout: 17000 })
-// 注意: DEFAULT_TIMEOUT 仍是兜底 (无 opts.timeout), 不能被业务方传更低
-// 严防因为 timeout 太短导致用户看到白屏.
-// 设计思路: 各档位比"刚好够用"多 2s 缓冲, 弱网/慢网络环境兜底更稳
-const DEFAULT_TIMEOUT = 12000;      // 总兜底超时 (默认 12s)
+const DEFAULT_TIMEOUT = 8000;       // 总兜底超时
 const MOUNT_GRACE_MS = 1000;        // 软隐藏后等组件 mount 的宽限时间
 const PAGE_READY_GRACE_MS = 2000;   // 软隐藏后等页面就绪的宽限时间

@@ -80,111 +71,6 @@ class SplashState {
 		// 避免多通道并发时, splash 组件 re-render 风暴
 		this._pendingProgress = null; // 待 emit 的最新进度
 		this._flushTimer = null;      // 节流定时器
-		// 网络环境 (用于 show() 自动选档)
-		// _networkType: 'wifi' | '4g' | '5g' | '3g' | '2g' | 'none' | 'unknown'
-		// _networkReady: false 表示还没检测完 (splash 显示中第一次构造时常见)
-		// _networkReady 后, 网络变化时通过 onNetworkStatusChange 实时更新
-		this._networkType = 'unknown';
-		this._networkReady = false;
-
-		// 启动网络检测 (异步, 不阻塞 splash 显示)
-		this._initNetworkDetect();
-
-		// 监听 diy 加载失败事件 (diy.js 通过 uni.$emit 触发)
-		// 收到后调 notifyDiyLoadError (严格模式下必须能关闭 splash)
-		// 解耦: splash-state 不直接 import diy.js
-		// 透传 reason / errorType / err / url 给业务方监听 splash:diy-error 使用
-		try {
-			if (typeof uni !== 'undefined' && uni.$on) {
-				uni.$on('diy:load-error', (payload) => {
-					try { this.notifyDiyLoadError(payload || {}) } catch (e) {}
-				})
-			}
-		} catch (e) {}
-	}
-
-	/**
-	 * 初始化网络检测
-	 * - 调 uni.getNetworkType 异步获取当前网络类型
-	 * - 监听 uni.onNetworkStatusChange 实时更新
-	 * - H5 平台降级: 调 navigator.onLine, 不支持细粒度网络类型
-	 * 失败保护: try-catch 包, 任意失败都保持 _networkType='unknown' (不会破坏 splash)
-	 */
-	_initNetworkDetect() {
-		try {
-			// #ifdef H5
-			// H5 平台: navigator.onLine 是粗粒度, 只能判断在线/离线
-			// 仅在 navigator.onLine 是明确 boolean (true/false) 时才是 H5
-			// Node 24+ 有 navigator 但 onLine 是 undefined, 不算 H5 (走下面 uni.getNetworkType)
-			if (typeof navigator !== 'undefined' && typeof navigator.onLine === 'boolean') {
-				// 初始检测: 用 _updateNetworkType (内部会触发事件)
-				this._updateNetworkType(navigator.onLine ? 'wifi' : 'none', { source: 'h5-initial' })
-				// 监听 online/offline 事件
-				if (typeof window !== 'undefined' && window.addEventListener) {
-					window.addEventListener('online', () => {
-						this._updateNetworkType('wifi', { source: 'h5-online', isConnected: true })
-					})
-					window.addEventListener('offline', () => {
-						this._updateNetworkType('none', { source: 'h5-offline', isConnected: false })
-					})
-				}
-				return
-			}
-			// navigator.onLine 不是 boolean (Node/SSR) - 走 uni.getNetworkType
-			// #endif
-			// #ifndef H5
-			if (typeof uni === 'undefined' || !uni.getNetworkType) {
-				// 不可用: 用 _updateNetworkType 设 unknown (会触发事件)
-				this._updateNetworkType('unknown', { source: 'no-uni-api' })
-				return
-			}
-			// 异步获取当前网络类型
-			uni.getNetworkType({
-				success: (res) => {
-					this._updateNetworkType((res && res.networkType) || 'unknown', { source: 'uni-initial' })
-				},
-				fail: () => {
-					this._updateNetworkType('unknown', { source: 'uni-initial-fail' })
-				},
-			})
-			// 监听网络变化
-			if (uni.onNetworkStatusChange) {
-				uni.onNetworkStatusChange((res) => {
-					const newType = (res && res.networkType)
-						|| (res && res.isConnected === false ? 'none' : 'unknown')
-					this._updateNetworkType(newType, {
-						source: 'uni-change',
-						isConnected: res && typeof res.isConnected === 'boolean' ? res.isConnected : undefined,
-					})
-				})
-			}
-			// #endif
-		} catch (e) {
-			// 任意失败都用 unknown, 不影响 splash
-			this._updateNetworkType('unknown', { source: 'init-error' })
-		}
-	}
-
-	/**
-	 * 根据当前网络环境选档
-	 * - 离线 (none): 4000 (4s, 让 diy 错误信号有时间触发)
-	 * - 弱网 (2g/3g): 22000 (22s 慢网档, 多 2s 缓冲)
-	 * - 正常 (4g/5g/wifi): 12000 (12s 默认档, 多 2s 缓冲)
-	 * - 未知 (unknown): 17000 (17s 中档, 保守)
-	 * - 网络未就绪: 12000 (DEFAULT_TIMEOUT, 保守)
-	 */
-	_pickTimeoutByNetwork() {
-		if (!this._networkReady) return DEFAULT_TIMEOUT  // 网络检测未就绪, 用默认
-		switch (this._networkType) {
-			case 'none': return 4000  // 离线: 4s 兜底
-			case '2g':
-			case '3g': return 22000  // 弱网: 22s 慢网档
-			case '4g':
-			case '5g':
-			case 'wifi': return 12000  // 正常: 12s 默认档
-			case 'unknown':
-			default: return 17000  // 未知: 17s 中档 (保守)
-		}
 	}

 	show(opts = {}) {
@@ -225,34 +111,7 @@ class SplashState {
 			try { uni.showLoading({ title: opts.title || '加载中...', mask: false }); } catch (e) {}
 		}

-		// 业务方可通过 opts.timeout 覆盖, 但不能低于 5000ms (低于此值给 warn, 仍生效)
-		// 原因: 启动期 i18n/theme/remote-config 远端加载最少 1-2s, diy 加载 1-3s
-		//       timeout 低于 5s 会经常触发兜底强关, 用户看到白屏
-		// 测试场景允许传 < 5000ms (因为 mock 环境快), 仍生效但 warn
-		// 优先级: opts.timeout (业务方显式) > _pickTimeoutByNetwork() (自动选档) > DEFAULT_TIMEOUT
-		const MIN_RECOMMENDED_TIMEOUT = 5000
-		let timeout
-		if (opts.timeout) {
-			timeout = opts.timeout
-			if (opts.timeout < MIN_RECOMMENDED_TIMEOUT) {
-				console.warn(
-					`[splash-state] timeout=${opts.timeout}ms 低于推荐下限 ${MIN_RECOMMENDED_TIMEOUT}ms, ` +
-					`可能导致启动期白屏. 生产环境建议 10000-20000ms.`
-				)
-			}
-		} else {
-			// 自动选档: 根据当前网络环境选 timeout
-			timeout = this._pickTimeoutByNetwork()
-		}
-		this._armTimeout(timeout);
-	}
-
-	/**
-	 * 设置/重设 splash 总超时兜底
-	 * - 由 show() 初始化, 或 _updateNetworkType() 在网络变化时调用
-	 * - 关键: 网络从好→差时延长, 差→好时缩短, 保证用户不会过早/过晚看到白屏
-	 */
-	_armTimeout(timeout) {
+		const timeout = opts.timeout || DEFAULT_TIMEOUT;
 		if (this._timeoutId) {
 			clearTimeout(this._timeoutId);
 			this._timeoutId = null;
@@ -266,55 +125,6 @@ class SplashState {
 		}, timeout);
 	}

-	/**
-	 * 网络变化时更新 _networkType, 并按需重启 splash 兜底
-	 * @param {string} newType 新的网络类型
-	 * @param {Object} [meta] 附加信息 { isConnected, source: 'h5-online' | 'uni-change' | ... }
-	 * @returns {boolean} 是否真的更新了 (新旧不同时为 true)
-	 */
-	_updateNetworkType(newType, meta) {
-		newType = newType || 'unknown'
-		const oldType = this._networkType
-		const changed = oldType !== newType
-		// 关键: 即使 type 没变, _networkReady 也要设 true
-		// 原因: 首次调用 _updateNetworkType 是从 _initNetworkDetect 进来
-		//       此时 _networkType='unknown' (初始), 可能 newType 也是 'unknown' (uni 不可用)
-		//       但 _networkReady 仍要从 false → true (让 _pickTimeoutByNetwork 工作)
-		this._networkReady = true
-		if (!changed) return false
-		this._networkType = newType
-
-		// 网络变化时: 如果 splash 还 visible, 重启兜底 (用新档)
-		// 业务场景:
-		//   - wifi → 2g: 启动期远端慢, 兜底延长, 避免过早强关
-		//   - 2g → wifi: 兜底缩短, 避免过晚强关
-		//   - any → none: 兜底缩短到 4s, 让 diy 错误信号更快触发
-		//   - none → any: 兜底恢复正常档, 给足时间
-		const shouldReboot = this._visible && this._pendingHide === null
-			// 关键: 仅当 splash 还没进入"软隐藏"阶段时重启兜底
-			// _pendingHide 不为 null 表示业务方已调 hide(), 等 notifyPageReady/DiyLoadError 即可
-			// 此时网络变化不影响兜底 (业务方已接管决策)
-		if (shouldReboot) {
-			const newTimeout = this._pickTimeoutByNetwork()
-			this._armTimeout(newTimeout)
-		}
-
-		// 发 splash:network-change 事件 (业务方监听)
-		// payload: { from, to, isConnected, retryRecommended, rebootSplashTimeout }
-		//   retryRecommended: 从 none 恢复时建议重试 (业务方重调 diy 接口)
-		//   rebootSplashTimeout: 是否重启了 splash 兜底 (true/false)
-		const eventPayload = {
-			from: oldType,
-			to: newType,
-			isConnected: meta && typeof meta.isConnected === 'boolean' ? meta.isConnected : newType !== 'none',
-			retryRecommended: oldType === 'none' && newType !== 'none',  // 离线→在线, 建议重试
-			rebootSplashTimeout: shouldReboot,
-			source: (meta && meta.source) || 'unknown',
-		}
-		this._emit('splash:network-change', eventPayload)
-		return true
-	}
-
 	/**
 	 * 隐藏 splash
 	 * @param {Object} opts
@@ -326,22 +136,15 @@ class SplashState {
 	 * @param {string} [opts.mode] - 离开动画模式
 	 *   - 'default': 默认 480ms 动画
 	 *   - 'fast':    80ms 短动画, 用于隐私弹窗等需要立即接管视觉的场景, 避免"双遮罩"感
-	 *   - 'strict':  严格模式, 不走 MOUNT_GRACE_MS / PAGE_READY_GRACE_MS 兜底,
-	 *                只等 notifyPageReady() 或 DEFAULT_TIMEOUT 总超时
-	 *                适用于: 已接入平台托管的系统弹窗 (鸿蒙),
-	 *                splash 必须真等到首页 diy 内容渲染好才能关
 	 */
 	hide(opts = {}) {
 		const reason = opts.reason || 'manual';
-		const useStrict = opts.mode === 'strict' || opts._strict === true;
 		// boot-complete 默认走软隐藏, 避免时序问题
-		const useSoft = useStrict || opts.soft === true || (opts.soft !== false && reason === 'boot-complete');
-		// strict 模式复用 fast 动画
-		const mode = useStrict ? 'fast' : (opts.mode === 'fast' ? 'fast' : 'default');
+		const useSoft = opts.soft === true || (opts.soft !== false && reason === 'boot-complete');
+		const mode = opts.mode === 'fast' ? 'fast' : 'default';

 		if (useSoft) {
-			// 传递完整 opts, _softHide 内部能识别 mode='strict' 或 _strict
-			this._softHide(opts);
+			this._softHide({ reason, mode });
 		} else {
 			this._doHide({ reason, mode });
 		}
@@ -351,17 +154,10 @@ class SplashState {
 	 * 软隐藏: 标记应该 hide, 等组件 mount + 页面就绪
 	 * 如果组件 1s 内没 mount, 兜底自动 hide
 	 * 如果页面 2s 内没就绪, 兜底自动 hide
-	 *
-	 * strict 模式 (鸿蒙已接入平台托管):
-	 *   不走 MOUNT_GRACE_MS / PAGE_READY_GRACE_MS 兜底
-	 *   只等 notifyMounted() + notifyPageReady() 或 DEFAULT_TIMEOUT 总超时
-	 *   保证 splash 一定等到首页 diy 内容真的渲染好
 	 */
 	_softHide(opts) {
 		if (!this._visible) return; // 已经隐藏了
 		this._pendingHide = opts;
-		// strict 模式识别: mode='strict' 或 _strict=true
-		const useStrict = opts && (opts.mode === 'strict' || opts._strict === true);

 		// 如果组件已经 mount 且页面已就绪, 立即隐藏
 		if (this._hasMounted && this._pageReady) {
@@ -369,12 +165,6 @@ class SplashState {
 			return;
 		}

-		// strict 模式: 不设 mountGraceId 兜底, 只等 notifyPageReady
-		// (DEFAULT_TIMEOUT 在 show() 设置的 _timeoutId 兜底)
-		if (useStrict) {
-			return;
-		}
-
 		// 兜底: 1s 内没 mount, 强制隐藏
 		if (this._mountGraceId) clearTimeout(this._mountGraceId);
 		this._mountGraceId = setTimeout(() => {
@@ -387,27 +177,15 @@ class SplashState {
 	/**
 	 * 真正触发软隐藏
 	 * 如果页面还未就绪, 等待页面就绪后再 hide
-	 * strict 模式 (鸿蒙): 不设 pageReadyGraceId 兜底, 只等 notifyPageReady()
 	 */
 	_flushPendingHide() {
 		if (this._mountGraceId) {
 			clearTimeout(this._mountGraceId);
 			this._mountGraceId = null;
 		}
-		// 已被 notifyDiyLoadError 拿走 _pendingHide 并自己 _doHide: noop
-		// 原因: notifyMounted 50ms 后会调 _flushPendingHide, 但 _pendingHide 已被 notifyDiyLoadError 消费
-		//       不应再调 _doHide (避免重复发 splash:hide 或时序错乱)
-		if (!this._pendingHide) return;
-		const _opts = this._pendingHide
-		const useStrict = _opts && (_opts.mode === 'strict' || _opts._strict === true)

 		// 如果页面还未就绪, 等待页面就绪 (保留 _pendingHide, 等页面就绪后再处理)
 		if (!this._pageReady) {
-			// strict 模式: 不设 pageReadyGraceId, 只等 notifyPageReady()
-			// 总超时由 show() 里的 _timeoutId 兜底 (DEFAULT_TIMEOUT=8s)
-			if (useStrict) {
-				return;
-			}
 			// 兜底: 2s 内没就绪, 强制隐藏
 			if (this._pageReadyGraceId) clearTimeout(this._pageReadyGraceId);
 			this._pageReadyGraceId = setTimeout(() => {
@@ -426,11 +204,6 @@ class SplashState {

 	/**
 	 * 实际隐藏 (硬路径)
-	 * @param {Object} opts
-	 * @param {string} [opts.reason='manual'] 隐藏原因
-	 * @param {string} [opts.mode='default'] 动画模式
-	 * @param {boolean} [opts._silent=false] true=不发 splash:hide 事件
-	 *   适用于 notifyDiyLoadError: 已经发了 splash:diy-error, 不能再发 splash:hide
 	 */
 	_doHide(opts) {
 		if (!this._visible) return; // 防重入
@@ -452,8 +225,6 @@ class SplashState {
 		if (useNativeLoading()) {
 			try { uni.hideLoading(); } catch (e) {}
 		}
-		// _silent=true: 业务方已经从 notifyDiyLoadError 收了 splash:diy-error, 这里不发 splash:hide
-		if (opts._silent) return;
 		this._emit('splash:hide', {
 			reason: opts.reason || 'manual',
 			mode: opts.mode || 'default',
@@ -493,60 +264,6 @@ class SplashState {
 		}
 	}

-	/**
-	 * diy 加载失败时通知 (网络异常/业务失败/无响应)
-	 * - 任何模式: 真关 splash (不能无限等, 错误已显示在页面横幅上)
-	 * - 触发独立事件 'splash:diy-error' (不是 'splash:hide')
-	 *   业务方可监听此事件做: 错误上报 / 自定义错误展示 / 区分错误类型
-	 * 调用时机: diy 错误横幅出现后 (diy.js._showDiyLoadError)
-	 *
-	 * @param {Object} [opts]
-	 * @param {string} [opts.reason='diy-load-error'] 隐藏原因
-	 *   用于 'splash:diy-error' 事件的 payload, 业务方可区分:
-	 *   - 'diy-network-error': 网络异常 (uni.request catch)
-	 *   - 'diy-no-response':   无响应 (res 为空)
-	 *   - 'diy-business-error': 业务失败 (code!=0)
-	 * @param {string} [opts.errorType] 错误类型: 'network' | 'business' | 'no-response'
-	 * @param {Object|string} [opts.err] 原始错误对象
-	 * @param {string} [opts.url] 出错的请求地址
-	 */
-	notifyDiyLoadError(opts = {}) {
-		// 已 _pageReady=true (notifyPageReady 之后): noop
-		// 原因: 业务方先调 notifyPageReady (diy 渲染好) 之后又调 notifyDiyLoadError (重复调用或时序错乱)
-		//       不应再触发 splash:diy-error (已经发过 splash:hide)
-		if (this._pageReady) return;
-		// 复用 notifyPageReady 的关闭逻辑 (页面就绪 = 错误状态也算"就绪")
-		// 原因: 错误状态页 (diyLoadError=true) 已经有 UI 反馈, splash 真关不卡视觉
-		this._pageReady = true
-		// 清除所有兜底, 真关 (strict 模式严格依赖 notifyPageReady/notifyDiyLoadError)
-		if (this._pageReadyGraceId) {
-			clearTimeout(this._pageReadyGraceId)
-			this._pageReadyGraceId = null
-		}
-		if (this._mountGraceId) {
-			clearTimeout(this._mountGraceId)
-			this._mountGraceId = null
-		}
-		// 触发独立事件 (不发 splash:hide, 让业务方区分正常 hide 和 diy 错误)
-		this._emit('splash:diy-error', {
-			reason: opts.reason || 'diy-load-error',
-			errorType: opts.errorType,
-			err: opts.err,
-			url: opts.url,
-		})
-		// 关键: 直接 _doHide 关闭 splash, **不**走 _flushPendingHide
-		// 原因: _flushPendingHide 内部会 _doHide → 触发 splash:hide 事件
-		//       notifyDiyLoadError 路径**只**应发 splash:diy-error, 不应发 splash:hide
-		//       (业务方根据事件类型区分, 不能混淆)
-		if (this._pendingHide) {
-			// 把 _pendingHide 取出, 直接 _doHide 关闭
-			// _silent=true 让 _doHide 不发 splash:hide (因为已经发了 splash:diy-error)
-			const _pendingOpts = this._pendingHide
-			this._pendingHide = null
-			setTimeout(() => this._doHide({ ..._pendingOpts, _silent: true }), 50)
-		}
-	}
-
 	/**
 	 * 组件 unmount 时通知 (用于 _hasMounted 状态管理)
 	 * 目前保留 _hasMounted=true, 因为一般只有 tab 页有 splash 组件, 不会动态增减
--- a/common/js/style_color.js
+++ b/common/js/style_color.js
@@ -71,10 +71,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -268,10 +264,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -464,10 +456,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -660,10 +648,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -856,10 +840,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -1052,10 +1032,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -1248,10 +1224,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
@@ -1444,10 +1416,6 @@ export default {
 		...{
 			diy_category_tree_select_size:    '28rpx',// 左侧分类树选中态字号
 			diy_category_tree_normal_size:    '20rpx',// 左侧分类树未选中态字号
-			diy_category_tree_select_text_color: '#333',// 左侧分类树选中态字体颜色(后台可自定义)
-			diy_category_tree_select_bg_color:   '#fff',// 左侧分类树选中态背景颜色(后台可自定义)
-			diy_category_tree_normal_text_color: '#222222',// 左侧分类树未选中态字体颜色(后台可自定义)
-			diy_category_tree_normal_bg_color:   '#f5f5f5',// 左侧分类树未选中态背景颜色(后台可自定义)
 			diy_category_item_title_size:     '26rpx',// 分类标题(如"热销推荐")
 			diy_category_item_goods_title_size:'28rpx',// 商品模式分类标题(比普通标题大 2rpx)
 			diy_category_item_name_size:      '24rpx',// 分类项名称
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -102,36 +102,6 @@ export function parsePageParams(raw, defaultValue = {}) {
 }


-/**
- * 把任意值（通常是 URL 参数 / query string 解析出的字符串）强转为布尔值。
- *
- * 设计动机：URL query 中布尔值的合法写法不止一种——
- *   ?show_home=1      -> '1'       -> true
- *   ?show_home=true    -> 'true'    -> true
- *   ?show_home=true    -> true      -> true
- *   ?show_home=0       -> '0'       -> false
- *   ?show_home=false   -> 'false'   -> false
- *   ?show_home=        -> ''        -> false
- *   未传               -> undefined -> false
- *
- * 与裸 `Boolean(x)` 的差异：
- *   Boolean('false')  === true   （任何非空字符串都是 true）
- *   Boolean('0')      === true   （同上）
- *   本函数对这两个值返回 false，更适合 URL 参数解析场景。
- *
- * @param {*} val 任意值
- * @returns {boolean}
- */
-export function coerceBool(val) {
-	if (val === true || val === 1) return true;
-	if (typeof val === 'string') {
-		const s = val.trim().toLowerCase();
-		return s === '1' || s === 'true';
-	}
-	return false;
-}
-
-
 // 关于页面路径，使用常量导出
 export const INDEX_PAGE_URL = '/pages/index/index';
 export const CATEGORY_PAGE_URL = '/pages_goods/category';
@@ -139,7 +109,6 @@ export const CONTACT_PAGE_URL = '/pages_tool/contact/contact';
 export const MEMBER_PAGE_URL = '/pages_tool/member/index';
 export const LOGIN_PAGE_URL = '/pages_tool/login/login';
 export const AI_CHAT_PAGE_URL = '/pages_tool/ai-chat/index';
-export const AI_AGENT_PAGE_URL = '/pages_tool/ai-agent/index'; // AI 智能体入口页(智能客服是首个 agent)

 // page_key 到实际路径的映射表（统一管理所有页面的语义常量 → 实际路径）
 // 前端组织页面（重命名路径、分包调整）时只需要修改此映射表
@@ -488,9 +457,6 @@ export default {
 	/** 把 page_params 还原成对象(JSON.parse 的安全封装) */
 	parsePageParams,

-	/** 把任意值强转为布尔值，专治 URL query 参数布尔解析（?show_home=1/'true'/true） */
-	coerceBool,
-
 	/** HTML 实体解码 */
 	decodeEntity,

@@ -545,27 +511,6 @@ export default {
 		// 注意: URL 清理只在 diyRedirectTo 入口做(更上游,职责清晰)。
 		//    redirectTo 接收到的 param 应当是干净的;不重复清理,避免性能浪费 + 误伤边界。
 		//
-		// 0. 智能默认 mode (2026-07-23, 修正 2026-07-23):
-		//    跳登录入口 LOGIN_PAGE_URL 时, 默认使用 reLaunch 模式 (即使调用方没传 mode).
-		//    修复场景:
-		//      - 注销 / 退出登录后, token 被清空, cancelstatus.vue 等页面再次进入
-		//        会调 redirectTo(LOGIN_PAGE_URL), 历史上走 navigateTo 模式, 旧页面
-		//        (cancelstatus) 还在栈中, 用户按返回键回到 cancelstatus 后又触发
-		//        onShow 死循环跳登录页.
-		//    排除场景 (重要, 避免影响):
-		//      - 带 back 参数的: 表示登录后要回到原页面 (订单详情/退款详情等),
-		//        必须保留 navigateTo 模式让 back 参数生效. 例如:
-		//          refund_detail.vue: redirectTo(LOGIN_PAGE_URL, { back: '/pages_tool/order/refund_detail?id=xxx' })
-		//      - 显式传 'navigateTo' / 'redirectTo' / 其他 mode: 保持原意.
-		//    触发条件: mode 是默认 'navigateTo' AND 没传 back 参数 AND 目标是 LOGIN_PAGE_URL.
-		if (mode === 'navigateTo' && typeof to === 'string' && !param?.back) {
-			const cleanPath = to.indexOf('?') === -1 ? to : to.substring(0, to.indexOf('?'));
-			if (cleanPath === LOGIN_PAGE_URL) {
-				mode = 'reLaunch';
-				console.log('[navigate] redirectTo: 跳 LOGIN_PAGE_URL 自动改为 reLaunch 模式 (没带 back 参数)');
-			}
-		}
-
 		// 1. 拆分 path 与已有 query,避免后面 indexOf('?') 误判
 		console.log('[navigate] redirectTo entry: to=', to, 'mode=', mode, 'param=', JSON.stringify(param));

@@ -593,18 +538,18 @@ export default {
 			merged.page_params = page_params;
 		}

-		// 3. 参数编码策略(委托给 util-navigate 的 _safeEncodeForPlatform)
-		//    - 微信小程序 + 鸿蒙元服务(mp-weixin/mp-harmony):uni.navigateTo / router.pushUrl 内部会自动对 url 做一次编码,
-		//      JS 侧再做 encodeURIComponent 会被平台再编码一层,目标页 onLoad(options) 拿到的
-		//      是已编码字符串(典型表现:商品分类 → 商品列表,
-		//      搜索栏关键词变成 %E6%B2%99%E5%8F%91 乱码)
-		//      => 这里必须保持原始值,完全交给平台原生去编码(_safeEncodeForPlatform
-		//        在 mp-weixin / mp-harmony 下不做 encode,只做 decode roundtrip 去除双向 encode)
-		//    - H5 / 华为快应用:浏览器/快应用 Webview 不自动编码 url,
-		//      参数含 & ? = 等特殊字符会被 queryString 错位解析(微信甚至把 & 当
-		//      成 top-level 分隔符丢参数)
-		//      => 这里必须手动 encodeURIComponent 一次(_safeEncodeForPlatform 在这些平台下
-		//        做 decode roundtrip + encode 一次)
+		// 3. 参数编码策略(委托给 util-navigate 的 _safeEncodeForPlatform)
+		//    - 微信小程序 + 鸿蒙元服务(mp-weixin/mp-harmony):uni.navigateTo / router.pushUrl 内部会自动对 url 做一次编码,
+		//      JS 侧再做 encodeURIComponent 会被平台再编码一层,目标页 onLoad(options) 拿到的
+		//      是已编码字符串(典型表现:商品分类 → 商品列表,
+		//      搜索栏关键词变成 %E6%B2%99%E5%8F%91 乱码)
+		//      => 这里必须保持原始值,完全交给平台原生去编码(_safeEncodeForPlatform
+		//        在 mp-weixin / mp-harmony 下不做 encode,只做 decode roundtrip 去除双向 encode)
+		//    - H5 / 华为快应用:浏览器/快应用 Webview 不自动编码 url,
+		//      参数含 & ? = 等特殊字符会被 queryString 错位解析(微信甚至把 & 当
+		//      成 top-level 分隔符丢参数)
+		//      => 这里必须手动 encodeURIComponent 一次(_safeEncodeForPlatform 在这些平台下
+		//        做 decode roundtrip + encode 一次)
 		const queryStr = Object.keys(merged)
 			.map(k => _safeEncodeForPlatform(k) + '=' + _safeEncodeForPlatform(merged[k]))
 			.join('&');
@@ -670,33 +615,30 @@ export default {
 		const diyTabBar = store.state.tabBarList;
 		if (diyTabBar && diyTabBar.list && Array.isArray(diyTabBar.list)) {
 			const cleanUrl = url.split('?')[0];
-			const isExcludedPage = NO_TAB_PAGES.has(cleanUrl);
-			if (!isExcludedPage) {
-				const isDiyTabRoot = diyTabBar.list.some(item => {
-					if (!item || !item.link || !item.link.wap_url) return false;
-					const normalizedTab = adaptSubpackageUrl(item.link.wap_url.startsWith('/') ? item.link.wap_url : '/' + item.link.wap_url).split('?')[0];
-					const normalizedUrl = adaptSubpackageUrl(cleanUrl.startsWith('/') ? cleanUrl : '/' + cleanUrl).split('?')[0];
-					return normalizedTab === normalizedUrl;
+			const isDiyTabRoot = diyTabBar.list.some(item => {
+				if (!item || !item.link || !item.link.wap_url) return false;
+				const normalizedTab = adaptSubpackageUrl(item.link.wap_url.startsWith('/') ? item.link.wap_url : '/' + item.link.wap_url).split('?')[0];
+				const normalizedUrl = adaptSubpackageUrl(cleanUrl.startsWith('/') ? cleanUrl : '/' + cleanUrl).split('?')[0];
+				return normalizedTab === normalizedUrl;
+			});
+			if (isDiyTabRoot) {
+				const adaptedUrl = adaptSubpackageUrl(cleanUrl);
+				const inSystemTabBar = systemTabBarList.some(sysUrl => adaptedUrl === sysUrl || cleanUrl === sysUrl);
+				// 首页用switchTab，其他DIY tab根页用reLaunch确保页面栈干净
+				let navApi = inSystemTabBar ? (adaptedUrl === INDEX_PAGE_URL ? uni.switchTab : uni.reLaunch) : uni.reLaunch;
+
+				// 鸿蒙元服务环境下 uni.switchTab 有兼容性问题, 全部使用 reLaunch
+				// #ifdef MP-HARMONY
+				navApi = uni.reLaunch;
+				// #endif
+
+				navApi({
+					url,
+					fail: (err) => {
+						console.error('[navigate] tabBar 跳转失败:', cleanUrl, err);
+					}
 				});
-				if (isDiyTabRoot) {
-					const adaptedUrl = adaptSubpackageUrl(cleanUrl);
-					const inSystemTabBar = systemTabBarList.some(sysUrl => adaptedUrl === sysUrl || cleanUrl === sysUrl);
-					// 首页用switchTab，其他DIY tab根页用reLaunch确保页面栈干净
-					let navApi = inSystemTabBar ? (adaptedUrl === INDEX_PAGE_URL ? uni.switchTab : uni.reLaunch) : uni.reLaunch;
-
-					// 鸿蒙元服务环境下 uni.switchTab 有兼容性问题, 全部使用 reLaunch
-					// #ifdef MP-HARMONY
-					navApi = uni.reLaunch;
-					// #endif
-
-					navApi({
-						url,
-						fail: (err) => {
-							console.error('[navigate] tabBar 跳转失败:', cleanUrl, err);
-						}
-					});
-					return;
-				}
+				return;
 			}
 		}

@@ -727,41 +669,6 @@ export default {
 				break;
 			case 'reLaunch':
 				// 关闭所有页面，打开到应用内的某个页面。清空栈后打开新页面，长度=1
-				// H5 平台修复 (2026-07-23):
-				//   uni.reLaunch 在 H5 上是 history.back() + router.replace 的组合,
-				//   并不能真正删除浏览器历史条目。在某些浏览器 (微信内置浏览器 /
-				//   Android 定制浏览器) 中, 按浏览器返回键仍可回到原页面, 导致
-				//   注销/退出登录后用户能看到旧会员信息。
-				//   location.replace 不产生新历史条目, 直接替换当前条目,
-				//   真正"清空历史栈"。对快应用 (H5 webview 嵌入) 同样生效。
-				// #ifdef H5
-				if (typeof window !== 'undefined' && typeof window.location !== 'undefined'
-					&& typeof window.location.replace === 'function') {
-					window.location.replace(url);
-					return;
-				}
-				// #endif
-				// 小程序平台修复 (2026-07-23):
-				//   微信小程序在以下场景会抛 "appLaunch with non-empty page stack" native 错误:
-				//     - 短时间内连发 reLaunch (页面销毁未完成, 新 launch 时栈非空)
-				//     - 异步回调/onLoad 中调 reLaunch (上下文丢失)
-				//   解决方案:
-				//     1) 跳转锁: 300ms 内不重复 reLaunch (避免连发)
-				//     2) setTimeout(0) 包裹: 让 native 层先完成当前页面销毁, 再发新 launch
-				// #ifdef MP
-				if (typeof globalThis !== 'undefined' && globalThis.__reLaunchLock) {
-					console.warn('[redirectTo] reLaunch 锁定中, 忽略本次跳转:', url);
-					return;
-				}
-				globalThis.__reLaunchLock = true;
-				setTimeout(() => {
-					uni.reLaunch({ url });
-					// 300ms 后释放锁
-					setTimeout(() => { globalThis.__reLaunchLock = false; }, 300);
-				}, 0);
-				return;
-				// #endif
-				// APP / 其他平台: 原生 reLaunch
 				uni.reLaunch({
 					url
 				});
@@ -1204,23 +1111,6 @@ export default {
 	 * @param {Object} link
 	 */
 	diyRedirectTo(link) {
-
-		// ---------- AI Agent 通用链接(智能客服是首个 agent;新增 AI 销售/HR 等不用改这段) ----------
-		// 放在 stale-uniacid 与 resolveLinkUrl 之前:AI Agent 是纯内部路径,走后续 webview 分支会被错判。
-		if (link && (link.name === 'AI_AGENT' || link.kind === 'AI_AGENT')) {
-			const agentId = (link.page_params && link.page_params.agent_id) || 'agent_aikefu';
-			const title   = link.title || 'AI 智能体';
-			// 透传来源标记:浮动按钮点击时 __dyu=FloatBtn,目标页据此隐藏底部 tabBar
-			// (diy-float-btn.vue#onFloatBtnClick 已写入 page_params.__dyu)
-			const dyuEntry = (link.page_params && link.page_params.__dyu) || '';
-			return this.redirectTo(AI_AGENT_PAGE_URL, {
-				agent_id: agentId,
-				title:    encodeURIComponent(title),
-				enable_set_title: link.enable_set_title ? 1 : 0,
-				...(dyuEntry ? { __dyu: dyuEntry } : {}),
-			});
-		}
-
 		console.log(`-----> diyRedirectTo`, JSON.stringify(link));
 		//if (link == null || Object.keys(link).length == 1) return;

@@ -1644,118 +1534,59 @@ export default {
 	},
 	/**
 	 * 获取小程序分享内容数据
-	 *
-	 * 重要：本函数保证永远 resolve（绝不 reject）。
-	 * 原因：外部 8 处调用（category.vue / diy.js / promote_code.vue / contact.vue 等）
-	 * 全部只写了 .then(res => {}) 没有 .catch()，一旦 reject 就会变成 Unhandled Promise Rejection，
-	 * 微信小程序框架会把它包成 Error: MiniProgramError 并以红框形式打印到控制台，污染日志且易被
-	 * 误判为业务崩溃。后台未配置某路径的分享（data:null）、接口返回 code<0、甚至 HTTP 网络失败，
-	 * 全部退化为"从传入 path 构造最小分享对象"，保证调用方始终能拿到可消费的结构。
 	 */
 	getMpShare(path) {
-		// 如果没有特别指定 则获取当前页面的路由
+		//如果没有特别指定 则获取当前页面的路由
 		if (!path) {
 			let route = this.getCurrentRoute();
 			path = route.path;
 			if (path == '/pages_tool/member/index') {
-				return new Promise((resolve) => {
+				return new Promise((resolve, reject) => {
 					resolve({})
 				});
 			}
 		}
-		// 从传入 path 生成的兜底分享（后台未配置 / 接口异常时使用）
-		const buildFallback = (p) => {
-			const fallbackPath = p || '/pages/index/index';
-			const fallback = {
-				title: '小程序分享',
-				path: fallbackPath,
-				imageUrl: ''
-			};
-			const appMessage = {
-				title: fallback.title,
-				path: fallback.path,
-				imageUrl: fallback.imageUrl,
-				success: () => {},
-				fail: () => {}
-			};
-			const query = (fallback.path.indexOf('?') > 0) ? fallback.path.split('?')[1] : '';
-			const timeLine = {
-				title: fallback.title,
-				query: fallback.path,
-				imageUrl: fallback.imageUrl
-			};
-			return { appMessage, timeLine, _fallback: true, query };
-		};
-		// 通用构建：从后端返回的 {title,path,imageUrl} 拼成标准结构
-		const buildFromConfig = (shareConfig) => {
-			const appMessage = {
-				title: shareConfig.title,
-				path: shareConfig.path,
-				imageUrl: shareConfig.imageUrl || '',
-				success: () => {},
-				fail: () => {}
-			};
-			const query = (shareConfig.path && shareConfig.path.indexOf('?') > 0)
-				? shareConfig.path.split('?')[1]
-				: '';
-			const timeLine = {
-				title: shareConfig.title,
-				query: shareConfig.path,
-				imageUrl: shareConfig.imageUrl || ''
-			};
-			return { appMessage, timeLine, query };
-		};
-		const fallback = buildFallback(path);
-		return new Promise((resolve) => {
+		return new Promise((resolve, reject) => {
 			Http.sendRequest({
 				url: "/weapp/api/weapp/share",
 				data: {
 					path: path
 				},
 				success: res => {
-					try {
-						if (!res || typeof res !== 'object') {
-							resolve(fallback);
-							return;
-						}
-						if (res.code >= 0) {
-							// 响应可能是两种形态：
-							//   A) { code, message, data: { title, path, imageUrl } }
-							//   B) { code, message, permission:{...}, data: null }
-							// 统一安全解包：外层 payload 可能在 res.data 里，也可能直接在 res 里
-							const outer = res.data !== undefined ? res.data : res;
-							let shareConfig = null;
-							if (outer && typeof outer === 'object') {
-								// 后端在 outer 内嵌真正的配置对象（A 形态）：outer.data = {title, path, ...}
-								if (outer.data && typeof outer.data === 'object' && (outer.data.title || outer.data.path)) {
-									shareConfig = outer.data;
-								} else if (outer.title || outer.path) {
-									// 极少数后端版本把配置平铺在 outer 上（扁平形态）
-									shareConfig = outer;
+					if (res.code >= 0) {
+						let shareConfig = res.data.data;
+						if (shareConfig) {
+							//分享给好友
+							let appMessageData = {
+								title: shareConfig.title,
+								path: shareConfig.path,
+								imageUrl: shareConfig.imageUrl,
+								success: res => {
+								},
+								fail: res => {
 								}
 							}
-							if (shareConfig) {
-								resolve(buildFromConfig(shareConfig));
-							} else {
-								// 后台未配置该路径（B 形态 / data=null / 空对象）→ 不 reject，直接兜底
-								// 防止 8 处无 catch 的调用方变成 Unhandled Promise Rejection
-								resolve(fallback);
+							//分享到朋友圈
+							let query = '';
+							if (shareConfig.path.indexOf('?') > 0) {
+								query = shareConfig.path.split('?')[1];
 							}
+							let timeLineData = {
+								title: shareConfig.title,
+								query: shareConfig.path,
+								imageUrl: shareConfig.imageUrl,
+							}
+							resolve({
+								appMessage: appMessageData,
+								timeLine: timeLineData,
+							})
 						} else {
-							// 业务 code<0：视为"无可用分享配置"，兜底 resolve，不抛错
-							resolve(fallback);
+							reject(res.data);
 						}
-					} catch (e) {
-						// 任何解析异常（响应结构异常/字段缺失/后端改版）一律兜底，绝不 reject
-						console.warn('[UTIL] getMpShare parse error, use fallback:', e && e.message ? e.message : e);
-						resolve(fallback);
+					} else {
+						reject(res.data)
 					}
-				},
-				fail: () => {
-					// 网络失败：同样兜底（之前这里没写 fail 回调，Promise 会 hang 住）
-					resolve(fallback);
-				},
-				complete: () => {}
+				}
 			});
 		})
 	},
--- a/common/js/util.js.bak
+++ b/common/js/util.js.bak
--- a/common/js/video-helper.js
+++ b/common/js/video-helper.js
@@ -1,92 +0,0 @@
-// iOS 微信小程序 <video> 兼容工具
-// 问题背景：
-// 1) 弹窗内的 <video> 用 autoplay 不可靠——popup 初始隐藏，autoplay 在隐藏态不触发，
-//    等 popup 显示后也不会重新 autoplay，导致"安卓有时能播、iOS 不能"；
-// 2) iOS 对同一个 <video> 实例在 src 重绑 / 弹窗重开 / 播放结束后，不会自动重新加载，
-//    需要靠 :key 重建实例或 seek(0) 才能重播；
-// 3) iOS 微信不支持 webm / vp9 / hevc / ogv 等封装或编码，会直接黑屏；
-// 4) H5 端（含微信内置浏览器）$nextTick 调 play() 太快，弹窗动画未完时浏览器内部
-//    会自动 pause()，导致 "The play() request was interrupted by a call to pause()" 错误。
-// 这里统一提供"格式检测"与"在视频可见后触发播放"的能力，供各视频组件复用。
-//
-// 重要：微信小程序的 <video>.play() 不要求用户手势（与 H5 不同），只要在视频元素
-// 已经渲染、popup 已经显示后调用即可。因此请务必在 uni-popup 的 @change(show=true)
-// 回调里调用本方法，而不是在 open() 里紧跟着 $nextTick 调用（那时元素尚未可见）。
-
-// iOS 微信 <video> 已知不支持的封装/编码（仅按扩展名做保守判断，用于给出友好提示）
-const UNSUPPORTED_EXT_ON_IOS = ['webm', 'ogv', 'ogg', 'mov', 'm4v', 'hevc', 'av1', '3gp'];
-
-// 取 URL 中的小写扩展名（忽略查询参数与 hash）
-export function getVideoExt(url) {
-	if (!url || typeof url !== 'string') return '';
-	const clean = url.split('?')[0].split('#')[0];
-	const idx = clean.lastIndexOf('.');
-	if (idx < 0) return '';
-	return clean.slice(idx + 1).toLowerCase();
-}
-
-// 该地址在 iOS 上是否很可能无法播放（基于扩展名的保守判断）
-export function isLikelyUnsupportedOnIOS(url) {
-	const ext = getVideoExt(url);
-	if (!ext) return false;
-	return UNSUPPORTED_EXT_ON_IOS.indexOf(ext) !== -1;
-}
-
-// 在"视频已经渲染、popup 已经显示"的前提下触发播放。
-// 必须在 uni-popup 的 @change(show=true) 回调里调用，此时 <video> 元素已可见，
-// createVideoContext 才能拿到有效实例。
-// videoId: <video> 的 id；instance: 当前组件/页面实例（组件内必传）。
-export function playVideoInContext(videoId, instance) {
-	if (!videoId || !instance) return;
-
-	// H5 端需要更长延迟：等 uni-popup 动画播完（~350ms），否则浏览器内部会自动
-	// pause() 导致 "play() interrupted by pause()" 错误；小程序端 $nextTick 即可。
-	// #ifdef H5
-	const delay = 400;
-	// #endif
-
-	// #ifndef H5
-	const delay = 0;
-	// #endif
-
-	const doPlay = () => {
-		let ctx = null;
-		try {
-			ctx = uni.createVideoContext(videoId, instance);
-		} catch (e) {
-			console.error('[video-helper] createVideoContext failed:', e);
-			return;
-		}
-		if (!ctx) return;
-
-		try {
-			ctx.play();
-		} catch (e) {
-			console.error('[video-helper] play() failed, will retry:', e);
-			// H5 端首次 play() 常被浏览器自动 pause() 打断，延迟重试一次
-			// #ifdef H5
-			setTimeout(() => {
-				try { ctx.play(); } catch (retryErr) {
-					console.error('[video-helper] retry play() also failed:', retryErr);
-				}
-			}, 300);
-			// #endif
-		}
-	};
-
-	if (delay > 0) {
-		// H5：先等 nextTick（DOM 更新），再等 delay（弹窗动画完成）
-		if (typeof instance.$nextTick === 'function') {
-			instance.$nextTick(() => setTimeout(doPlay, delay));
-		} else {
-			setTimeout(doPlay, delay);
-		}
-	} else {
-		// 小程序端：nextTick 即可
-		if (typeof instance.$nextTick === 'function') {
-			instance.$nextTick(doPlay);
-		} else {
-			doPlay();
-		}
-	}
-}
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -1,15 +1,6 @@
 <template>
 	<view data-component-name="diy-category" :class="['category-page-wrap', 'category-template-' + value.template]"
 		:style="{ height: 'calc(100vh - ' + tabBarHeight + ')' }">
-		<!-- 模板4: 顶部搜索框(图片样式) -->
-		<view class="search-box search-box-template-4" v-if="value.template == 4 && value.search"
-			@tap.stop="onClickSearch()">
-			<view class="search-content">
-				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('components-diy.diy-search.searchBtn')"
-					confirm-type="search" @tap.stop="onClickSearch()" disabled="true" />
-				<text class="iconfont icon-sousuo3"></text>
-			</view>
-		</view>
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- <block v-if="value.template == 4">
 			<view class="search-box" v-if="value.search" @tap.stop="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
@@ -37,7 +28,7 @@
 		<!-- #endif -->
 		<!-- #ifdef H5 || MP-HARMONY -->

-		<view class="search-box" v-if="value.search && value.template != 4" @tap.stop="onClickSearch()">
+		<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()">
 			<view class="search-content">
 				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('components-diy.diy-search.searchBtn')" confirm-type="search"
 					@tap.stop="onClickSearch()" disabled="true" />
@@ -93,37 +84,23 @@
 		<view class="category-page-skeleton" v-if="categoryTreeLoading">
 			<view class="skeleton-content">
 				<view class="skeleton-tree">
-					<view class="skeleton-tree-item" v-for="n in 8" :key="n"></view>
+					<view class="skeleton-tree-item" v-for="n in 8" :key="'sk-tree-' + n"></view>
 				</view>
 				<view class="skeleton-grid">
-					<view class="skeleton-card" v-for="n in 6" :key="n"></view>
+					<view class="skeleton-card" v-for="n in 6" :key="'sk-card-' + n"></view>
 				</view>
 			</view>
 		</view>
-		<view class="content-box" v-if="categoryTree">
+		<view class="content-box" v-else-if="categoryTree">
 			<block v-if="categoryTree.length">
 				<scroll-view scroll-y="true" class="tree-wrap">
 					<view class="category-item-wrap">
-						<!-- 模板4: 左侧显示一级分类(顶部轮播中的分类) -->
-						<view v-if="value.template == 4">
-							<view class="category-item" v-for="(item, index) in templateFourData" :key="index" :class="[
-								{ select: oneCategorySelect == index },
-								{ 'border-bottom': oneCategorySelect + 1 === index },
-								{ 'border-top': oneCategorySelect - 1 === index }
-							]" @tap.stop="templateFourOneFn(index)">
-								<view class="">{{ item.category_name }}</view>
-							</view>
-						</view>
-						<!-- 其他模板: 左侧显示二级分类 -->
-						<view v-else>
-							<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
-								{ select: select == index },
-								{ 'border-bottom': value.template == 4 && select + 1 === index },
-								{ 'border-top': value.template == 4 && select - 1 === index },
-								{ 'first-category-item': index == 0 && value.template == 99 }
-							]" @tap.stop="switchOneCategory(index)">
-								<view class="">{{ item.category_name }}</view>
-							</view>
+						<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
+							{ select: select == index },
+							{ 'border-bottom': value.template == 4 && select + 1 === index },
+							{ 'border-top': value.template == 4 && select - 1 === index }
+						]" @tap.stop="switchOneCategory(index)">
+							<view class="">{{ item.category_name }}</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -139,37 +116,23 @@
 							:lastSecondCategoryName="lastSecondCategoryName"
 							@tologin="toLogin" @selectsku="selectSku($event, 0)" @addCart="addCartPoint"
 							@saveSecondCategory="saveSecondCategoryName"></diy-category-item>
-				</scroll-view>
+					</scroll-view>

-				<!-- 模板1: 仿京东/淘宝商品分类 - 按 template 2 的 part-load 逻辑, 切换一级分类时只渲染选中分类的子分类网格 -->
-				<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 1"
-					:refresher-enabled="true" refresher-default-style="none"
-					:refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
-					<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="index"
-						:id="'category-' + index" :style="{ display: select == index ? 'block' : 'none' }">
-						<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
-							:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
-							@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
-							@saveSecondCategory="saveSecondCategoryName"></diy-category-item>
-					</view>
-				</scroll-view>
-
-				<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 99 || loadType == 'all'"
-					ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
-					@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
-					refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
-					@refresherrestore="onRestore">
-					<view class="child-category" v-for="(item, index) in categoryTree" :key="index"
-						:id="'category-' + index" :style="{ display: value.template == 99 && select != index ? 'none' : 'block' }">
-						<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
-							:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
-							:lastSecondCategoryName="value.template == 99 ? lastSecondCategoryName : ''"
-							:currentOneCategory="categoryTree && categoryTree[select] ? categoryTree[select] : null"
-							@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
-							@loadfinish="getHeightArea" @saveSecondCategory="saveSecondCategoryName"></diy-category-item>
-					</view>
-					<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">{{ $lang('components-diy.diy-category.reachedBottom') }}</view>
-				</scroll-view>
+					<scroll-view scroll-y="true" class="content-wrap" v-else-if="value.template == 1 || value.template == 99 || loadType == 'all'"
+						ref="contentWrap" :scroll-into-view="categoryId" :scroll-with-animation="true"
+						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
+						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
+						@refresherrestore="onRestore">
+						<view class="child-category" v-for="(item, index) in categoryTree" :key="index"
+							:id="'category-' + index" :style="{ display: value.template == 99 && select != index ? 'none' : 'block' }">
+							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
+								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList"
+								:lastSecondCategoryName="value.template == 99 ? lastSecondCategoryName : ''"
+								@tologin="toLogin" @selectsku="selectSku($event, index)" @addCart="addCartPoint"
+								@loadfinish="getHeightArea" @saveSecondCategory="saveSecondCategoryName"></diy-category-item>
+						</view>
+						<view class="end-tips" ref="endTips" :style="{ opacity: endTips }">{{ $lang('components-diy.diy-category.reachedBottom') }}</view>
+					</scroll-view>

 					<view class="content-wrap"
 						v-if="(value.template == 2 || value.template == 3 || value.template == 4) && loadType == 'part'">
@@ -178,7 +141,6 @@
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:last="index == categoryTree.length - 1 ? true : false" :select="select"
 								:oneCategorySelect="oneCategorySelect" :isList="isList" @tologin="toLogin"
-								:currentOneCategory="value.template == 4 && templateFourData[oneCategorySelect] ? templateFourData[oneCategorySelect] : null"
 								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
 								@switch="switchOneCategory"></diy-category-item>
 						</view>
@@ -191,12 +153,9 @@
 			</view>
 		</view>

-		<!-- 模板4: 底部购物车栏 -->
-		<view class="cart-box cart-box-template-4"
-			v-if="value.template == 4 && value.quickBuy && storeToken && categoryTree && categoryTree.length">
+		<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
 			<view class="left-wrap">
-				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation"
-					@tap.stop="$util.redirectTo('/pages_goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @tap.stop="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -207,10 +166,9 @@
 					<text class="unit font-size-tag price-font">.{{ cartTotalMoney[1] ? cartTotalMoney[1] : '00' }}</text>
 				</view>
 			</view>
-			<view class="right-wrap"><button type="primary" class="settlement-btn"
-					@tap.stop="settlement">去结算</button>
+			<view class="right-wrap"><button type="primary" class="settlement-btn" @tap.stop="settlement">去结算</button>
 			</view>
-		</view>
+		</view> -->

 		<view class="cart-point" v-for="(item, index) in carIconList" :key="index"
 			:style="{ left: item.left + 'px', top: item.top + 'px' }"></view>
@@ -265,17 +223,12 @@ export default {
 			// 修复体验: 进入页面初期显示 "暂未分类" 然后又变成有数据的体验很差
 			// 用 categoryTreeLoading 区分"还在请求"和"真的没分类", 请求未完成时
 			// 显示骨架占位而非空态文案
-			categoryTreeLoading: true,
-
+			categoryTreeLoading: true
 		};
 	},
 	created() {
 		this.getCategoryTree();
 		this.loadType = this.value.goodsLevel == 1 && this.value.loadType == 'all' ? 'all' : 'part';
-		// 模板4: 默认单列列表布局(图片样式)
-		if (this.value.template == 4) {
-			this.isList = true;
-		}
 	},
 	mounted() {
 		query = uni.createSelectorQuery().in(this);
@@ -303,14 +256,7 @@ export default {
 	},
 	watch: {
 		// 组件刷新监听
-		componentRefresh: function (nval) { },
-		categoryTreeLoading: function (nval, oval) {
-			if (nval === false && oval === true) {
-				this.$nextTick(() => {
-					if (!this.heightArea.length) this.getHeightArea(-1);
-				});
-			}
-		}
+		componentRefresh: function (nval) { }
 	},
 	computed: {
 		cartTotalMoney() {
@@ -384,7 +330,6 @@ export default {
 			this.$store.dispatch('getCartNumber');
 			if (!this.heightArea.length) this.getHeightArea(-1);
 		},
-
 		/**
 		 * 获取高度区间
 		 *
@@ -740,12 +685,11 @@ export default {
 }

 .content-box {
-		flex: 1;
-		height: 0;
-		display: flex;
-		align-items: flex-start;
+	flex: 1;
+	height: 0;
+	display: flex;

-		.tree-wrap {
+	.tree-wrap {
 		width: 170rpx;
 		height: 100%;
 		background-color: #f5f5f5;
@@ -784,10 +728,10 @@ export default {
 	padding: 26rpx 28rpx;
 	box-sizing: border-box;
 	position: relative;
-	background-color: var(--diy-category-tree-normal-bg-color, #f5f5f5);
+	background-color: #f5f5f5;

 	view {
-		color: var(--diy-category-tree-normal-text-color, #222222);
+		color: #222222;
 		width: 100%;
 		white-space: break-word;
 		overflow: hidden;
@@ -804,10 +748,10 @@ export default {
 	}

 	&.select {
-		background: var(--diy-category-tree-select-bg-color, #fff);
+		background: #fff;

 		view {
-			color: var(--diy-category-tree-select-text-color, #333);
+			color: #333;
 			font-weight: bold;
 			font-size: var(--diy-category-tree-select-size, 28rpx);
 		}
@@ -1061,8 +1005,6 @@ export default {
 	}
 }

-
-
@keyframes category-skeleton-shimmer {
 	0% {
 		background-position: 100% 50%;
@@ -1074,137 +1016,6 @@ export default {

 // 风格四
 .category-template-4 {
-	// 模板4 顶部搜索框(图片样式)
-	.search-box-template-4 {
-		padding: 20rpx 30rpx 16rpx;
-		background: #fff;
-
-		.search-content {
-			height: 64rpx;
-			background-color: #f5f5f5;
-			border-radius: 40rpx;
-
-			input {
-				height: 64rpx;
-				line-height: 64rpx;
-				padding: 0 30rpx 0 30rpx;
-				background: #f5f5f5;
-				border-radius: 40rpx;
-				font-size: 26rpx;
-				color: #333;
-			}
-
-			.iconfont {
-				font-size: 32rpx;
-				color: #89899a;
-				width: 70rpx;
-				text-align: center;
-				right: 10rpx;
-			}
-		}
-	}
-
-	// 模板4 底部购物车栏(图片样式)
-	.cart-box-template-4 {
-		height: 110rpx;
-		padding: 0 30rpx;
-		background: #fff;
-		border-top: 1rpx solid #f0f0f0;
-		position: relative;
-		z-index: 10;
-		box-shadow: 0 -4rpx 12rpx rgba(0, 0, 0, 0.04);
-
-		.left-wrap {
-			display: flex;
-			align-items: center;
-		}
-
-		.cart-icon {
-			width: 90rpx;
-			height: 90rpx;
-			position: relative;
-			margin-top: -10rpx;
-
-			.iconfont {
-				color: var(--btn-text-color, #fff);
-				width: 80rpx;
-				height: 80rpx;
-				background-color: $base-color;
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 40rpx;
-				box-shadow: 0 4rpx 12rpx rgba(255, 107, 53, 0.35);
-			}
-
-			.num {
-				position: absolute;
-				top: 0;
-				right: 0;
-				transform: translate(20%, 0);
-				display: inline-block;
-				box-sizing: border-box;
-				color: #fff;
-				line-height: 1.2;
-				text-align: center;
-				font-size: 24rpx;
-				padding: 0 8rpx;
-				min-width: 32rpx;
-				border-radius: 18rpx;
-				background-color: var(--price-color, #FF6B35);
-				border: 2rpx solid #fff;
-			}
-		}
-
-		.price {
-			margin-left: 16rpx;
-			display: flex;
-			align-items: baseline;
-			line-height: 1;
-
-			.title {
-				color: #333;
-				font-size: 28rpx;
-			}
-
-			.unit,
-			.money {
-				color: var(--price-color, #FF6B35);
-				font-weight: bold;
-			}
-
-			.unit {
-				font-size: 24rpx;
-			}
-
-			.money {
-				font-size: 36rpx;
-			}
-		}
-
-		.right-wrap {
-			display: flex;
-			align-items: center;
-		}
-
-		.settlement-btn {
-			margin: 0;
-			width: 220rpx;
-			font-weight: bold;
-			border-radius: 50rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			font-size: 30rpx;
-			background: $base-color;
-			color: var(--btn-text-color, #fff);
-
-			&::after {
-				border: none;
-			}
-		}
-	}
-
 	.search-box {
 		.search-content input {
 			background-color: #f1f1f1;
@@ -1432,125 +1243,6 @@ export default {
 	}
 }

-// ===================== 模板1 仿京东/淘宝商品分类样式 =====================
-.category-template-1 {
-	.search-box {
-		padding: 20rpx 24rpx;
-		background: #fff;
-
-		.search-content {
-			background-color: #f5f5f5;
-			border-radius: 40rpx;
-
-			input {
-				background: #f5f5f5;
-				border-radius: 40rpx;
-				padding: 0 30rpx;
-				font-size: 26rpx;
-				color: #333;
-			}
-
-			.iconfont {
-				right: 16rpx;
-				color: #89899a;
-				font-size: 32rpx;
-			}
-		}
-	}
-
-	.content-box {
-		background: #fff;
-
-		.tree-wrap {
-			width: 170rpx;
-			background-color: #fff;
-		}
-
-		.right-flex-wrap {
-			background: #fff;
-
-			.content-wrap {
-				background: #fff;
-			}
-		}
-	}
-
-	// 穿透到子组件 diy-category-item: 调整 banner 横向内边距 + 分类网格容器为透明
-	::v-deep .category-adv {
-		padding: 0 20rpx;
-		margin-top: 0;
-	}
-
-	::v-deep .category-list {
-		margin: 0 20rpx;
-		border-radius: 0;
-		background: transparent;
-		padding: 0;
-	}
-
-	::v-deep .category-title-with-lines {
-		padding: 30rpx 0 20rpx;
-	}
-
-	// 穿透修复: 图片不需要灰色背景框,与目标图保持一致
-	::v-deep .img-box {
-		background: transparent !important;
-		border-radius: 0 !important;
-		width: 70% !important;
-		padding-bottom: 70% !important;
-		margin-bottom: 16rpx !important;
-	}
-
-	::v-deep .img-box image {
-		width: 100% !important;
-		height: 100% !important;
-		left: 0 !important;
-		top: 0 !important;
-		transform: none !important;
-	}
-
-	// 左侧分类栏样式
-	.tree-wrap .category-item {
-		padding: 28rpx 16rpx;
-		background-color: var(--diy-category-tree-normal-bg-color, #f5f5f5);
-		border-radius: 0;
-
-		view {
-			color: var(--diy-category-tree-normal-text-color, #222222);
-			font-size: 26rpx;
-			line-height: 1.3;
-		}
-
-		&.border-top,
-		&.border-bottom {
-			border-radius: 0;
-		}
-
-		&.select {
-			background: var(--diy-category-tree-select-bg-color, #fff);
-
-			view {
-				color: var(--diy-category-tree-select-text-color, #333);
-				font-weight: bold;
-				font-size: 28rpx;
-			}
-
-			&::before {
-				content: ' ';
-				width: 6rpx;
-				height: 32rpx;
-				background: var(--base-color, #FF6B35);
-				display: block;
-				position: absolute;
-				left: 0;
-				top: 50%;
-				transform: translateY(-50%);
-				border-radius: 0 6rpx 6rpx 0;
-			}
-		}
-	}
-}
-
 // ===================== 模板99 商品分类样式 =====================
 .category-template-99 {
 	.search-box {
@@ -1603,22 +1295,19 @@ export default {

 	.tree-wrap .category-item {
 		padding: 30rpx 16rpx;
-		background-color: var(--diy-category-tree-normal-bg-color, #f5f5f5);
-		white-space: normal;
-		word-break: break-all;
+		background-color: #f5f5f5;

 		view {
-			color: var(--diy-category-tree-normal-text-color, #222222);
+			color: #333;
 			font-size: 26rpx;
-			line-height: 1.5;
+			line-height: 1.3;
 		}

 		&.select {
-			background: var(--diy-category-tree-select-bg-color, #fff);
-			border-bottom: 1rpx solid #f0f0f0;
+			background: #fff;

 			view {
-				color: var(--diy-category-tree-select-text-color, #333);
+				color: #FF6B35;
 				font-weight: bold;
 				font-size: 28rpx;
 			}
@@ -1627,7 +1316,7 @@ export default {
 				content: ' ';
 				width: 6rpx;
 				height: 36rpx;
-				background: #FF4646;
+				background: #FF6B35;
 				display: block;
 				position: absolute;
 				left: 0;
@@ -1638,32 +1327,9 @@ export default {
 		}
 	}

-	// 模板99: 第一个分类项固定高度,与右侧二级分类按钮区域对齐
-	.tree-wrap .category-item.first-category-item {
-		height: 100rpx;
-		display: flex;
-		align-items: center;
-		white-space: nowrap;
-		overflow: hidden;
-
-		view {
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-
 	.content-wrap {
 		background: #f5f5f5;
 		padding: 0;
-		// #ifdef H5
-		::-webkit-scrollbar {
-			display: none;
-			width: 0;
-			height: 0;
-			background: transparent;
-		}
-		// #endif
 	}

 	.child-category {
--- a/components-diy/diy-channel-list.vue
+++ b/components-diy/diy-channel-list.vue
@@ -265,7 +265,7 @@ export default {
 						// #ifndef MP-WEIXIN
 						if (item?.channelType === 'wechat') {
 							uni.showToast({
-								title: this.$lang('wechatChannel.wechatMpOnly'),
+								title: '视频号仅支持在微信小程序环境中播放',
 								icon: 'none',
 								duration: 2000
 							});
--- a/components-diy/diy-float-btn.vue
+++ b/components-diy/diy-float-btn.vue
@@ -3,7 +3,7 @@
 		:class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }"
 		:style="style">
 		<block v-for="(item, index) in value.list" :key="index">
-			<view class="button-box" @tap.stop="onFloatBtnClick(item)"
+			<view class="button-box" @tap.stop="$util.diyRedirectTo(item.link)"
 				:style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
 				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit"
 					show-menu-by-longpress />
@@ -44,44 +44,7 @@ export default {
 		componentRefresh: function (nval) { }
 	},
 	components: {},
-	methods: {
-		/**
-		 * 浮动按钮点击处理:
-		 * 在跳转前给 link 注入 __dyu=FloatBtn 来源标记,
-		 * 让目标页面(尤其是 ai-chat)能识别"来自浮动按钮"从而隐藏底部 tabBar,
-		 * 与"从底部导航栏点击进入时显示并高亮 tabBar"的场景并存。
-		 *
-		 * 为什么用 __dyu 这种 3 字符命名:
-		 * - 双下划线 __ 前缀 + 3 位字母(dy-ui 框架) 是前端约定俗成的"系统内部保留字段"标志
-		 *   (如 __proto__, __esModule),业务方配置 link 时几乎不可能使用这种短命名 → 与业务参数零冲突
-		 * - URL 中占用空间极小,不污染业务 query 字符串
-		 * - 未来如需扩展其他组件的入口来源,可继续使用 __dyu 前缀(如 __dyu=Banner / __dyu=Nav)
-		 *
-		 * 实现要点:
-		 * - 浅拷贝 item.link 避免污染原数据(可能被 v-for 复用)
-		 * - 把标记写入 page_params,diyRedirectTo → redirectTo 会自动拼到 URL query,
-		 *   目标页 onLoad(options) 可直接读取
-		 * - 同时在 wap_url 末尾追加/合并 __dyu=FloatBtn 兜底:某些路径不走 page_params 拼接
-		 */
-		onFloatBtnClick(item) {
-			if (!item || !item.link) return;
-			const link = { ...item.link };
-			link.page_params = Object.assign({}, link.page_params || {}, {
-				__dyu: 'FloatBtn'
-			});
-
-			// 兜底:直接把标记拼到 wap_url query,防止 page_params 在某些分支未被透传
-			if (link.wap_url && typeof link.wap_url === 'string' && link.wap_url.indexOf('http') === -1) {
-				const sep = link.wap_url.indexOf('?') === -1 ? '?' : '&';
-				// 避免重复追加(精确匹配 __dyu= 而不是 __dyu,避免误伤可能的 __dyu_other)
-				if (link.wap_url.indexOf('__dyu=') === -1) {
-					link.wap_url = link.wap_url + sep + '__dyu=FloatBtn';
-				}
-			}
-
-			this.$util.diyRedirectTo(link);
-		},
-	},
+	methods: {},
 	computed: {
 		style() {
 			let style = {},
--- a/components-diy/diy-form.vue
+++ b/components-diy/diy-form.vue
@@ -15,25 +15,20 @@
 		<ns-newform
 			:data="formComponents"
 			:customAttr="value"
-			:mode="mergedFormConfig.formLayout || 'vertical'"
+			:mode="mergedFormConfig.formLayout || 'horizontal'"
 			:formConfig="mergedFormConfig"
 			ref="nsNewform"
 		></ns-newform>
 		<!-- 提交按钮（外层 = form-bg + form-padding-x；按钮 = submit-bg + submit-color + input-height + input-radius）。
 		     showSubmit=false 时由父级页面渲染自己的提交按钮并通过 ref 调用本组件的 verify()/getFormData()。 -->
 		<view v-if="showSubmit" class="form-submit-wrap" :style="submitWrapStyle">
-			<view @click.stop="handleSubmit" class="form-submit" :style="submitStyle">{{ submitText }}</view>
+			<view @click.stop="submitForm" class="form-submit" :style="submitStyle">{{ submitText }}</view>
 		</view>
 	</view>
 </template>

 <script>
 // 自定义表单
-// 提交接管三档（不依赖 $listeners / 事件机制，跨 H5 / MP / 鸿蒙一致）：
-//   1) 默认                → showSubmit=true + 不传 onSubmit        → 内置按钮 + 内置 defaultSubmit
-//   2) 复用按钮、自定义逻辑 → showSubmit=true + :onSubmit="fn"       → 内置按钮 + 父级 fn
-//   3) 完全自定义 UI        → showSubmit=false + :onSubmit="fn" 或 ref.verify()/getFormData() → 父级全控
-// 注：type: Function prop 在 uni-app MP 端走 Vue runtime 注入，机制与 ns-navbar.customBack 一致
 import DiyMinx from './minx.js'
 import NsNewform from '@/components/ns-newform/ns-newform.vue'

@@ -57,12 +52,6 @@ export default {
 		showSubmit: {
 			type: Boolean,
 			default: true
-		},
-		// 父级可选地接管提交：传入函数 prop 时，verify 通过后由它处理 formData；
-		// 不传时走组件内置 defaultSubmit（兜底）。default 必须是 null，不能写成函数返回 null
-		onSubmit: {
-			type: Function,
-			default: null
 		}
 	},
 	mixins: [DiyMinx],
@@ -149,7 +138,7 @@ export default {
 				width: widthPct + '%',
 				padding: `${submitPaddingY}rpx 0`,
 				color: cfg.submitColor || '#ffffff',
-				'background-color': cfg.submitBgColor || '#3b82f6',
+				'background-color': cfg.submitBgColor || '#ff4544',
 				'border-radius': `${this._num(cfg.inputRadius, 10)}rpx`,
 				'font-size': `${this._num(cfg.labelFontSize, 28)}rpx`
 			});
@@ -159,10 +148,6 @@ export default {
 		submitText() {
 			return this.mergedFormConfig.submitText || '提交';
 		},
-		// 父级是否接管提交（集中判断，便于以后替换机制；避免多个调用点各自 typeof 校验）
-		hasCustomSubmit() {
-			return typeof this.onSubmit === 'function';
-		},
 		// 后端把表单样式配置统一存放在 data.formConfig 子对象中（与后端 design.js getDefaultFormData().formConfig 字段名一致）。
 		// 这里做一次归一化：优先取 formConfig；如果历史数据是扁平结构（直接挂在 value 上），也做兼容。
 		formCfg() {
@@ -202,22 +187,11 @@ export default {
 				labelFixedWidth: pick('labelFixedWidth', 'label_fixed_width'),
 				labelFontSize: pick('labelFontSize', 'label_font_size'),
 				labelColor: pick('labelColor', 'label_color'),
-				labelFontWeight: pick('labelFontWeight', 'label_font_weight'),
-				labelAutoMaxWidth: pick('labelAutoMaxWidth', 'label_auto_max_width'),
 				requiredColor: pick('requiredColor', 'required_color'),
 				checkedColor: pick('checkedColor', 'checked_color'),
 				// 占位符：遗漏会被 ns-newform SCSS 默认值回退覆盖
 				placeholderColor: pick('placeholderColor', 'placeholder_color'),
 				placeholderFontSize: pick('placeholderFontSize', 'placeholder_font_size'),
-				// textarea 显示行数 / 行高（透传给 ns-newform，与 ns-form 保持一致）
-				// 不传时 ns-newform 走自己的默认 4 行 / 44rpx
-				textareaRows: pick('textareaRows', 'textarea_rows'),
-				textareaLineHeight: pick('textareaLineHeight', 'textarea_line_height'),
-				// 输入框视觉增强（与 ns-newform 对齐）
-				inputBorderColor: pick('inputBorderColor', 'input_border_color'),
-				inputBgColor: pick('inputBgColor', 'input_bg_color'),
-				inputFocusBorderColor: pick('inputFocusBorderColor', 'input_focus_border_color'),
-				inputFocusBgColor: pick('inputFocusBgColor', 'input_focus_bg_color'),
 				submitText: pick('submitText', 'submit_text'),
 				submitColor: pick('submitColor', 'submit_color'),
 				submitBgColor: pick('submitBgColor', 'submit_bg_color'),
@@ -237,33 +211,9 @@ export default {
 					delete base[k];
 				}
 			});
-			// 前端视觉默认：强制覆盖后端 formConfig 中可能存在的旧默认（horizontal / 红按钮 / 灰背景等），
-			// 与 formdata.vue 的 styleDefaults 保持一致，使所有 diy-form（含 diy-group 内的表单）统一呈现新设计稿样式。
-			// 后端仍保留行为/文案类配置（behavior / submitText / banner / tip 等），本合并仅覆盖视觉字段。
-			const styleDefaults = {
-				formLayout: 'vertical',
-				formPaddingX: 28,
-				rowPaddingY: 24,
-				labelGap: 20,
-				labelFontSize: 32,
-				labelFontWeight: 700,
-				labelColor: '#1f2937',
-				inputHeight: 84,
-				inputRadius: 16,
-				inputBgColor: '#ffffff',
-				inputBorderColor: '#e5e7eb',
-				inputFocusBorderColor: '#3b82f6',
-				inputFocusBgColor: '#ffffff',
-				placeholderColor: '#9ca3af',
-				placeholderFontSize: 28,
-				checkedColor: '#3b82f6',
-				showRowDivider: false,
-				submitColor: '#ffffff',
-				submitBgColor: '#3b82f6'
-			};
 			// 平台差异化配置（terminal 块在 formConfig 子对象内）
 			// 优先级：v.formConfig.terminal > v.form_config_terminal > v.terminal > v.form_config_platform
-			const result = Object.assign({}, base, styleDefaults);
+			const result = Object.assign({}, base);
 			const termBlock = (v.formConfig && v.formConfig.terminal) || v.form_config_terminal || v.terminal || v.form_config_platform;
 			if (termBlock && typeof termBlock === 'object') {
 				Object.keys(termBlock).forEach(function(platform) {
@@ -329,26 +279,24 @@ export default {
 			return true;
 		},

-		// 统一提交入口：内置按钮 / 父级 ref 调用都走这里
-		// 不依赖 $listeners / 事件机制（MP 端 $listeners 为 undefined），跨端一致
-		handleSubmit() {
+		// 提交表单
+		submitForm() {
+			var self = this;
 			// 校验（同时返回 formData 数组；校验失败时 ns-newform 内部 toast 提示）
 			if (!this.verify()) {
 				return;
 			}
-			const formData = this.getFormData();
-			// 父级显式接管：function prop 在 H5 / MP / 鸿蒙一致可用
-			if (this.hasCustomSubmit) {
-				return this.onSubmit(formData);
-			}
-			// 兜底：内置 sendRequest 流程
-			this.defaultSubmit(formData);
-		},

-		// 公共兜底实现：默认的 /form/api/form/create 流程；
-		// 父级若需"先自定义、失败回退"，可经 ref.defaultSubmit(formData) 调用
-		defaultSubmit(submitFormData) {
-			var self = this;
+			// 若父级监听了 @submit，则把提交控制权交给父级（用于父级有自定义提交字段/反馈逻辑的页面，如 formdata.vue 传 uniacid）
+			if (this.$listeners && this.$listeners.submit) {
+				this.$emit('submit', this.getFormData());
+				return;
+			}
+
+			// 获得保单数据
+			const submitFormData = this.getFormData();
+
+			// 提交到后端
 			this.$api.sendRequest({
 				url: '/form/api/form/create',
 				data: {
@@ -360,7 +308,7 @@ export default {
 				success: function(res) {
 					if (res.code === 0) {
 						uni.showToast({
-							title: self.$lang('submitSuccess'),
+							title: '提交成功',
 							icon: 'success'
 						});
 						// 重置表单
@@ -369,7 +317,7 @@ export default {
 						}
 					} else {
 						uni.showToast({
-							title: res.message || self.$lang('submitFail'),
+							title: res.message || '提交失败',
 							icon: 'none'
 						});
 					}
--- a/components-diy/diy-group.vue
+++ b/components-diy/diy-group.vue
@@ -159,10 +159,7 @@
 				<!-- 商品推荐 -->
 				<diy-goods-recommend :value="item"></diy-goods-recommend>
 			</template>
-            <template v-if="item.componentName == 'DiyRecommendCode'">
-				<!-- 自定义推荐码组件 -->
-				<diy-recommend-code :value="item"></diy-recommend-code>
-			</template>
+
 			<template v-if="item.componentName == 'GoodsBrand'">
 				<!-- 商品品牌 -->
 				<diy-goods-brand :value="item"></diy-goods-brand>
@@ -309,11 +306,9 @@ export default {
 		}
 	},
 	created() {
-		console.log('[DIY-GROUP][created] hasDiyData=', !!this.diyData, 'valueLen=', this.diyData && this.diyData.value && this.diyData.value.length);
 		this.processData();
 	},
 	mounted() {
-		console.log('[DIY-GROUP][mounted] hasDiyData=', !!this.diyData, 'valueLen=', this.diyData && this.diyData.value && this.diyData.value.length);
 		if (this.diyData && this.diyData.value) {
 			this._notifyLoaded();
 		}
@@ -354,13 +349,11 @@ export default {
 	},
 	methods: {
 		_notifyLoaded() {
-		console.log('[DIY-GROUP][_notifyLoaded] enter, will emit loaded in 300ms');
-		if (this._loadedTimer) clearTimeout(this._loadedTimer);
-		this._loadedTimer = setTimeout(() => {
-			console.log('[DIY-GROUP][_notifyLoaded] emit loaded');
-			this.$emit('loaded');
-		}, 300);
-	},
+			if (this._loadedTimer) clearTimeout(this._loadedTimer);
+			this._loadedTimer = setTimeout(() => {
+				this.$emit('loaded');
+			}, 300);
+		},
 		processData() {
 			if (!this.diyGlobalData || !this.diyGlobalData.value) {
 				this.processedData = [];
--- a/components-diy/diy-recommend-action.vue
+++ b/components-diy/diy-recommend-action.vue
@@ -0,0 +1,82 @@
+<template>
+    <view data-component-name="diy-recommend-action" class="diy-recommend-action" :style="warpCss">
+        <!-- 主按钮:立即提现 -->
+        <view class="primary-btn" hover-class="btn-hover" @tap="goWithdraw">
+            <text>{{ $lang('components-diy.diy-recommend-action.withdrawNow') }}</text>
+        </view>
+
+        <!-- 副按钮:提现记录(横排两列) -->
+        <view class="secondary-row">
+            <view class="secondary-btn" hover-class="btn-hover" @tap="goWithdrawList">
+                <text class="iconfont icon-calendar"></text>
+                <text>{{ $lang('components-diy.diy-recommend-action.withdrawList') }}</text>
+            </view>
+            <view class="secondary-btn" hover-class="btn-hover" @tap="goApply">
+                <text class="iconfont icon-edit"></text>
+                <text>{{ $lang('components-diy.diy-recommend-action.applyEnterprise') }}</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'diy-recommend-action',
+    computed: {
+        warpCss() {
+            return {
+                padding: '24rpx',
+                backgroundColor: '#fff',
+            };
+        },
+    },
+    methods: {
+        goWithdraw() {
+            uni.navigateTo({ url: '/pages_recommend/withdraw/apply' });
+        },
+        goWithdrawList() {
+            uni.navigateTo({ url: '/pages_recommend/withdraw/list' });
+        },
+        goApply() {
+            uni.navigateTo({ url: '/pages_recommend/apply/apply' });
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.diy-recommend-action {
+    .primary-btn {
+        background: linear-gradient(135deg, #1976d2, #0d47a1);
+        color: #fff;
+        text-align: center;
+        border-radius: 50rpx;
+        padding: 24rpx 0;
+        font-size: 32rpx;
+        font-weight: 600;
+        letter-spacing: 4rpx;
+        margin-bottom: 20rpx;
+        box-shadow: 0 4rpx 12rpx rgba(25,118,210,0.32);
+    }
+    .secondary-row {
+        display: flex;
+        gap: 16rpx;
+    }
+    .secondary-btn {
+        flex: 1;
+        background: #f5f5f5;
+        color: #444;
+        text-align: center;
+        border-radius: 12rpx;
+        padding: 20rpx 0;
+        font-size: 26rpx;
+        .iconfont {
+            margin-right: 8rpx;
+            color: #1976d2;
+        }
+    }
+}
+.btn-hover {
+    opacity: 0.85;
+}
+</style>
--- a/components-diy/diy-recommend-balance.vue
+++ b/components-diy/diy-recommend-balance.vue
@@ -0,0 +1,108 @@
+<template>
+    <view data-component-name="diy-recommend-balance" class="diy-recommend-balance" :style="warpCss">
+        <view class="balance-card">
+            <view class="balance-row">
+                <view class="balance-half available">
+                    <text class="label">{{ $lang('components-diy.diy-recommend-balance.available') }}</text>
+                    <text class="big-num price-font">¥{{ formatMoney(balance.available) }}</text>
+                    <text class="sub-tip" v-if="balance.available > 0 && probation.total_days">
+                        {{ $lang('components-diy.diy-recommend-balance.passedProbation') }}
+                    </text>
+                </view>
+                <view class="balance-half probation">
+                    <text class="label">{{ $lang('components-diy.diy-recommend-balance.frozen') }}</text>
+                    <text class="big-num price-font">¥{{ formatMoney(balance.frozen) }}</text>
+                    <text class="sub-tip" v-if="probation.remaining_days > 0">
+                        {{ $lang('components-diy.diy-recommend-balance.probationDays', { days: probation.remaining_days }) }}
+                    </text>
+                </view>
+            </view>
+
+            <!-- 累计总收益(底部) -->
+            <view class="total-row">
+                <text class="label">{{ $lang('components-diy.diy-recommend-balance.totalEarned') }}</text>
+                <text class="big-num price-font">¥{{ formatMoney(balance.total_earned) }}</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import recommendData from '@/common/js/recommend-diy-data.js';
+
+export default {
+    name: 'diy-recommend-balance',
+    mixins: [recommendData],
+    computed: {
+        warpCss() {
+            return {
+                padding: '24rpx',
+                backgroundColor: '#fff',
+            };
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.diy-recommend-balance {
+    .balance-card {
+        background: linear-gradient(180deg, #d9f2ff, #f0f9ff);
+        border-radius: 16rpx;
+        padding: 32rpx 24rpx;
+        box-shadow: 0 4rpx 12rpx rgba(0,102,204,0.08);
+    }
+    .balance-row {
+        display: flex;
+        justify-content: space-between;
+        gap: 24rpx;
+        margin-bottom: 24rpx;
+    }
+    .balance-half {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding: 16rpx 20rpx;
+        border-radius: 12rpx;
+        background: rgba(255,255,255,0.65);
+
+        &.available {
+            .big-num { color: #1976d2; }
+        }
+        &.probation {
+            background: rgba(255,243,224,0.85);
+            .big-num { color: #e65100; }
+        }
+
+        .label {
+            font-size: 24rpx;
+            color: #666;
+        }
+        .big-num {
+            font-size: 44rpx;
+            font-weight: 700;
+            margin: 8rpx 0;
+        }
+        .sub-tip {
+            font-size: 22rpx;
+            color: #888;
+        }
+    }
+    .total-row {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-top: 1rpx solid #e0e0e0;
+        padding-top: 16rpx;
+        .label {
+            font-size: 26rpx;
+            color: #444;
+        }
+        .big-num {
+            font-size: 36rpx;
+            font-weight: 600;
+            color: #d81b60;
+        }
+    }
+}
+</style>
--- a/components-diy/diy-recommend-code.vue
+++ b/components-diy/diy-recommend-code.vue
--- a/components-diy/diy-recommend-records.vue
+++ b/components-diy/diy-recommend-records.vue
@@ -0,0 +1,147 @@
+<template>
+    <view data-component-name="diy-recommend-records" class="diy-recommend-records" :style="warpCss">
+        <view class="header-row">
+            <text class="title">{{ $lang('components-diy.diy-recommend-records.recent') }}</text>
+            <text class="link" @tap="goAllRecords">{{ $lang('components-diy.diy-recommend-records.viewAll') }} ></text>
+        </view>
+
+        <view v-if="recentRecords.length === 0" class="empty">
+            <text>{{ $lang('components-diy.diy-recommend-records.empty') }}</text>
+        </view>
+        <view v-else class="record-list">
+            <view v-for="(r, i) in recentRecords" :key="r.id || i" class="record-item">
+                <view class="left">
+                    <view class="avatar"></view>
+                    <view class="info">
+                        <text class="name">{{ r.company_name || r.id }}</text>
+                        <text class="time">{{ formatTime(r.apply_time) }}</text>
+                    </view>
+                </view>
+                <view class="right">
+                    <text class="amount price-font" v-if="r.amount_text">{{ r.amount_text }}</text>
+                    <view class="status-tag" :class="'status-' + r.status">{{ r.status_text }}</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import recommendData from '@/common/js/recommend-diy-data.js';
+
+export default {
+    name: 'diy-recommend-records',
+    mixins: [recommendData],
+    computed: {
+        warpCss() {
+            return {
+                padding: '16rpx 24rpx 24rpx',
+                backgroundColor: '#fff',
+            };
+        },
+    },
+    methods: {
+        goAllRecords() {
+            uni.navigateTo({ url: '/pages_recommend/records/list' });
+        },
+        formatTime(ts) {
+            if (!ts) return '';
+            const d = new Date(parseInt(ts) * 1000);
+            const y = d.getFullYear();
+            const m = String(d.getMonth() + 1).padStart(2, '0');
+            const dd = String(d.getDate()).padStart(2, '0');
+            return `${y}-${m}-${dd}`;
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.diy-recommend-records {
+    .header-row {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 16rpx;
+        .title {
+            font-size: 30rpx;
+            font-weight: 600;
+            color: #333;
+        }
+        .link {
+            font-size: 24rpx;
+            color: #999;
+        }
+    }
+    .empty {
+        padding: 40rpx;
+        text-align: center;
+        color: #999;
+        font-size: 24rpx;
+    }
+    .record-list {
+        .record-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20rpx 0;
+            border-bottom: 1rpx solid #f5f5f5;
+            &:last-child { border-bottom: none; }
+        }
+        .left {
+            display: flex;
+            align-items: center;
+            flex: 1;
+            overflow: hidden;
+        }
+        .avatar {
+            width: 64rpx;
+            height: 64rpx;
+            border-radius: 12rpx;
+            background: linear-gradient(135deg, #bbdefb, #64b5f6);
+            margin-right: 16rpx;
+            flex-shrink: 0;
+        }
+        .info {
+            flex: 1;
+            min-width: 0;
+        }
+        .name {
+            font-size: 26rpx;
+            color: #333;
+            font-weight: 500;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            display: block;
+        }
+        .time {
+            font-size: 22rpx;
+            color: #999;
+            margin-top: 4rpx;
+        }
+        .right {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+            gap: 6rpx;
+        }
+        .amount {
+            font-size: 30rpx;
+            font-weight: 700;
+            color: #e65100;
+        }
+        .status-tag {
+            font-size: 22rpx;
+            padding: 4rpx 14rpx;
+            border-radius: 16rpx;
+            background: #f5f5f5;
+            color: #666;
+            &.status-0 { background: #fff3e0; color: #e65100; }  // 待审核
+            &.status-1 { background: #e3f2fd; color: #1976d2; }  // 审核通过(待缴费)
+            &.status-2 { background: #e8f5e9; color: #4caf50; }  // 审核通过(已缴费)
+            &.status-3 { background: #ffebee; color: #c62828; }  // 审核不通过
+        }
+    }
+}
+</style>
--- a/components-diy/diy-recommend-rules.vue
+++ b/components-diy/diy-recommend-rules.vue
@@ -0,0 +1,103 @@
+<template>
+    <view data-component-name="diy-recommend-rules" class="diy-recommend-rules" :style="warpCss">
+        <view class="header-row">
+            <text class="iconfont icon-book"></text>
+            <text class="title">{{ $lang('components-diy.diy-recommend-rules.title') }}</text>
+        </view>
+        <view class="rules-list">
+            <view v-for="(r, i) in displayRules" :key="i" class="rule-row">
+                <view class="rule-icon" :class="'icon-' + (r.icon || 'money')">
+                    <text class="iconfont" :class="iconFontClass(r.icon)"></text>
+                </view>
+                <view class="rule-text">{{ r.title || r.text }}</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import recommendData from '@/common/js/recommend-diy-data.js';
+
+export default {
+    name: 'diy-recommend-rules',
+    mixins: [recommendData],
+    computed: {
+        // 可被后台 value.rules 覆盖,默认用 API 返回
+        displayRules() {
+            if (this.value && Array.isArray(this.value.rules) && this.value.rules.length) {
+                return this.value.rules;
+            }
+            return this.rewardRules || [];
+        },
+        warpCss() {
+            return {
+                padding: '24rpx',
+                backgroundColor: '#fff',
+            };
+        },
+    },
+    methods: {
+        iconFontClass(icon) {
+            const map = {
+                money: 'icon-money',
+                calendar: 'icon-calendar',
+                wallet: 'icon-wallet',
+                infinite: 'icon-infinite',
+            };
+            return map[icon] || 'icon-money';
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.diy-recommend-rules {
+    .header-row {
+        display: flex;
+        align-items: center;
+        margin-bottom: 16rpx;
+        .iconfont {
+            font-size: 32rpx;
+            color: #1976d2;
+            margin-right: 8rpx;
+        }
+        .title {
+            font-size: 30rpx;
+            font-weight: 600;
+            color: #333;
+        }
+    }
+    .rules-list {
+        background: #f3f9ff;
+        border-radius: 12rpx;
+        padding: 16rpx 20rpx;
+    }
+    .rule-row {
+        display: flex;
+        align-items: flex-start;
+        padding: 12rpx 0;
+        border-bottom: 1rpx dashed #d6e9f8;
+        &:last-child { border-bottom: none; }
+    }
+    .rule-icon {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 50%;
+        background: #1976d2;
+        color: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 22rpx;
+        margin-right: 16rpx;
+        flex-shrink: 0;
+        .iconfont { font-size: 24rpx; }
+    }
+    .rule-text {
+        font-size: 24rpx;
+        color: #444;
+        line-height: 1.5;
+        flex: 1;
+    }
+}
+</style>
--- a/components-diy/diy-recommend-stat.vue
+++ b/components-diy/diy-recommend-stat.vue
@@ -0,0 +1,67 @@
+<template>
+    <view data-component-name="diy-recommend-stat" class="diy-recommend-stat" :style="warpCss">
+        <view class="stat-row">
+            <view class="stat-item">
+                <text class="num price-font">{{ statistics.total_recommend || 0 }}</text>
+                <text class="label">{{ $lang('components-diy.diy-recommend-stat.totalRecommend') }}</text>
+            </view>
+            <view class="stat-item">
+                <text class="num price-font color-green">{{ statistics.total_entered || 0 }}</text>
+                <text class="label">{{ $lang('components-diy.diy-recommend-stat.totalEntered') }}</text>
+            </view>
+            <view class="stat-item">
+                <text class="num price-font color-orange">¥{{ formatMoney(statistics.total_earned) }}</text>
+                <text class="label">{{ $lang('components-diy.diy-recommend-stat.totalEarned') }}</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import recommendData from '@/common/js/recommend-diy-data.js';
+
+export default {
+    name: 'diy-recommend-stat',
+    mixins: [recommendData],
+    computed: {
+        warpCss() {
+            return {
+                padding: '24rpx',
+                backgroundColor: '#fff',
+            };
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.diy-recommend-stat {
+    .stat-row {
+        display: flex;
+        background: #fff;
+        border-radius: 12rpx;
+        padding: 24rpx 12rpx;
+        box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.04);
+        .stat-item {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            border-right: 1rpx solid #f0f0f0;
+            &:last-child { border-right: none; }
+        }
+        .num {
+            font-size: 36rpx;
+            font-weight: 700;
+            color: #333;
+            &.color-green { color: #4caf50; }
+            &.color-orange { color: #ff9800; }
+        }
+        .label {
+            font-size: 22rpx;
+            color: #888;
+            margin-top: 6rpx;
+        }
+    }
+}
+</style>
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -54,21 +54,17 @@
 		<!-- 视频播放弹窗 -->
 		<uni-popup ref="videoPopup" type="center" style="background:transparent;width:100%;height:100%;">
 			<view class="video-container" :style="popupVideoStyle">
-				<video
-					:key="video_url"
+				<video 
 					ref="popupVideoRef"
-					class="adaptive-video"
-					:autoPauseIfNavigate="true"
+					class="adaptive-video" 
+					:autoPauseIfNavigate="true" 
 					:autoPauseIfOpenNative="true"
-					:autoplay="false"
-					:enableAutoRotation="true"
-					id="myVideo"
-					:src="video_url"
+					:autoplay="false" 
+					:enableAutoRotation="true" 
+					id="myVideo" 
+					:src="video_url" 
 					:controls="true"
 					object-fit="contain"
-					playsinline
-					webkit-playsinline
-					x5-playsinline
 					@loadedmetadata="onPopupVideoLoaded"
 					@error="onPopupVideoError"
 				></video>
@@ -148,21 +144,41 @@ export default {
 		
 		// 弹窗视频容器样式
 		popupVideoStyle() {
-			// 容器横向铺满，黑色背景填满左右边界
-			// 视频用 object-fit:contain 保持原比例居中，左右黑边由容器黑色背景填充
-			let style = 'position:fixed;width:100%;height:50vh;left:50%;top:50%;transform:translate(-50%,-50%);border-radius:0;';
+			let style = 'position:fixed;width:100%;left:0;';
+			const defaultRatio = 9 / 16;
+
+			let ratio = defaultRatio;
+			if (this.popupVideoWidth && this.popupVideoHeight) {
+				ratio = this.popupVideoHeight / this.popupVideoWidth;
+			}
+
+			const isPortrait = ratio > 1;
+
+			if (isPortrait) {
+				style += 'top:50%;transform:translateY(-50%);';
+			} else {
+				style += 'top:20%;';
+			}
+
+			// #ifdef H5
+			style += 'padding-top: ' + (ratio * 100) + '%;';
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			style += 'padding-top: ' + (ratio * 100) + '%;';
+			// #endif
+
+			// #ifdef MP-HARMONY
+			style += 'height: ' + (this.windowWidth * ratio) + 'px;';
+			// #endif
+
 			return style;
 		}
 	},
 	methods: {
 		// 显示视频播放弹窗
 		showVideo(item) {
-			let url = item.videoUrl || '';
-			// 处理视频URL：完整链接直接使用，否则通过 $util.img() 转换
-			if (url && url.indexOf('http://') !== 0 && url.indexOf('https://') !== 0) {
-				url = this.$util.img(url);
-			}
-			this.video_url = url;
+			this.video_url = item.videoUrl;
 			this.popupVideoWidth = 0;
 			this.popupVideoHeight = 0;
 			this.$refs.videoPopup.open();
@@ -609,6 +625,22 @@ export default {
 	left: 0;
 }

+/* #ifdef MP-WEIXIN */
+.adaptive-video {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+/* #endif */
+
+/* #ifdef MP-HARMONY */
+.adaptive-video {
+	position: static;
+	display: block;
+	box-sizing: border-box;
+}
+/* #endif */
+
 .video-nav {
 	padding: 16rpx;
 	box-sizing: border-box;
--- a/components-diy/diy-video.vue
+++ b/components-diy/diy-video.vue
@@ -11,9 +11,6 @@
 			:style="videoWarpCss"
 			controls
 			preload="metadata"
-			playsinline
-			webkit-playsinline
-			x5-playsinline
 			@loadedmetadata="onVideoLoaded"
 			@click="handlerClick(videoUrl)"
 		></video>
@@ -109,11 +106,11 @@ export default {
 			}

 			// #ifdef H5
-			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
+			style += 'padding-top: ' + (ratio * 100) + '%;';
 			// #endif

 			// #ifdef MP-WEIXIN
-			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
+			style += 'padding-top: ' + (ratio * 100) + '%;';
 			// #endif

 			// #ifdef MP-HARMONY
--- a/components/hover-nav/hover-nav.vue
+++ b/components/hover-nav/hover-nav.vue
@@ -743,53 +743,7 @@ export default {
      this.$langConfig.change(targetLang, url);
    },

-    /**
-     * 客服按钮点击的统一入口。
-     *
-     * 关键修复:智能客服(AI 客服)类型需要走 ai-chat 页面,
-     *   且必须在 URL 上注入 __dyu=FloatBtn 标记,
-     *   让 ai-chat/index.vue 的 onLoad(options) 识别"来自悬浮按钮/浮动按钮",
-     *   commit setBottomNavHidden(true) 隐藏底部 tabBar。
-     *
-     * 为什么不在 customer-service.js#openAiChatService 统一注入:
-     *   该方法是通用 AI 客服入口,被多处复用(hover-nav / 商品详情页 / 会员中心 / DIY 浮动按钮等),
-     *   其中 DIY 浮动按钮(diy-float-btn.vue)已自行注入 __dyu=FloatBtn;其他入口(商品详情页等)
-     *   是否要隐藏 tabBar 是另一个独立的产品决策,不能在此一刀切。
-     *   因此由调用方按需注入:本方法(hover-nav)显式注入,diy-float-btn 显式注入,
-     *   其他入口保持原样。
-     *
-     * 与 diy-float-btn.vue#onFloatBtnClick 的行为完全一致,只是触发位置不同。
-     */
    handleUnifiedKefuClick() {
-      // 仅智能客服(aikefu)类型需要走 ai-chat 页面并隐藏 tabBar;
-      // 其他类型(企业微信 / 第三方 / 小程序原生客服等)由 customerService 内部
-      // 路由到对应渠道(navigateToMiniProgram / openCustomerServiceChat 等),
-      // 与底部 tabBar 无关,继续走原统一入口。
-      if (this.customerService && this.customerService.isAIKefu && this.customerService.isAIKefu()) {
-        // 清除未读数(与 openAiChatService 行为保持一致)
-        if (typeof this.setAiUnreadCount === 'function') {
-          this.setAiUnreadCount(0);
-        } else if (this.$store && typeof this.$store.commit === 'function') {
-          try { this.$store.commit('setAiUnreadCount', 0); } catch (e) { /* 兼容旧 store */ }
-        }
-
-        // 注入 __dyu=FloatBtn 标记,与 diy-float-btn.vue#onFloatBtnClick 语义一致
-        const aiChatUrl = `${this.$util.PAGE_KEY_MAP.PAGE_AI_CHAT}?__dyu=FloatBtn`;
-        uni.navigateTo({
-          url: aiChatUrl,
-          fail: (err) => {
-            console.error('[hover-nav] 跳转 AI智能客服失败:', err);
-            // H5 兜底
-            // #ifdef H5
-            window.location.href = aiChatUrl;
-            // #endif
-            uni.showToast({ title: this.$lang('customerService.openFailed'), icon: 'none' });
-          }
-        });
-        return;
-      }
-
-      // 非智能客服类型:走原统一入口(企业微信 / 第三方 / 微信原生客服 等)
      this.customerService.handleUnifiedKefuClick({
        sendMessageTitle: '来自悬浮按钮的咨询',
        sendMessagePath: '/pages/index/index'
--- a/components/ns-form/ns-form.vue
+++ b/components/ns-form/ns-form.vue
@@ -4,8 +4,8 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Text'">
                <view class="order-cell" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
                    <view class="box">
                        <input
@@ -22,21 +22,28 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Textarea'">
                <view class="order-cell flex-box textarea" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
                    <view class="box">
-                        <!-- 所有平台统一通过 formConfig.textareaRows / item.value.rows 控制显示行数：
-                             - H5 / 微信：原生 textarea 识别 :rows 属性，可视高度 = rows × line-height（CSS 控制 line-height）；
-                             - 鸿蒙：渲染为原生 ArkUI TextArea，CSS height 不生效，必须靠 :rows 控制。
-                             行数和行高全部由 formConfig 动态下发，不再硬编码 176rpx / row=2。 -->
+                        <!-- #ifdef MP-HARMONY -->
+                        <!-- 鸿蒙元服务渲染为原生 ArkUI TextArea，必须用 :rows 控制初始显示行数；CSS height 在原生组件上不生效 -->
                        <textarea
-                            :rows="item.value.rows || textareaRowsValue"
+                            :rows="item.value.rows || 2"
                            :placeholder="item.value.placeholder"
                            placeholder-class="placeholder color-tip"
                            v-model="item.val"
-                            :style="textareaStyle"
+                            :style="inputStyle"
                        ></textarea>
+                        <!-- #endif -->
+                        <!-- #ifndef MP-HARMONY -->
+                        <textarea
+                            :placeholder="item.value.placeholder"
+                            placeholder-class="placeholder color-tip"
+                            v-model="item.val"
+                            :style="inputStyle"
+                        ></textarea>
+                        <!-- #endif -->
                    </view>
                </view>
            </view>
@@ -48,11 +55,11 @@
                            <text class="tit">{{ item.value.title }}</text>
                            <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        </view>
-                        <view :class="['box', 'box-flex']">
+                        <view class="box">
                            <text v-if="item.val != ''">{{ item.val }}</text>
                            <text v-else class="color-tip">{{ $lang('components.nsForm.selectPlaceholder') }}</text>
-                            <text class="iconfont icon-right"></text>
                        </view>
+                        <text class="iconfont icon-right"></text>
                    </view>
                </view>
            </picker>
@@ -60,11 +67,11 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Checkbox'">
                <view class="order-cell" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
-                    <view :class="['box', 'check-group-box', 'option-layout-' + (item.value.option_layout || 'wrap')]">
-                        <checkbox-group @change="checkboxChange($event, index)" :style="item._optionLayoutStyle">
+                    <view class="box check-group-box">
+                        <checkbox-group @change="checkboxChange($event, index)">
                            <label v-for="(v, k) in item.option_lists" :key="k">
                                <checkbox :value="v.value" :checked="v.checked" />
                                <view class="checkbox">
@@ -80,11 +87,11 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Radio'">
                <view class="order-cell" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
-                    <view :class="['box', 'radio-group-box', 'option-layout-' + (item.value.option_layout || 'wrap')]">
-                        <radio-group @change="radioChange($event, index)" :style="item._optionLayoutStyle">
+                    <view class="box radio-group-box">
+                        <radio-group @change="radioChange($event, index)">
                            <label v-for="(v, k) in item.option_lists" :key="k">
                                <radio :value="v.value" :checked="item.val == v.value" />
                                <view class="radio-box">
@@ -100,8 +107,8 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Img'">
                <view class="order-cell flex-box" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
                    <view class="box img-boxs">
                        <view class="img-box" v-for="(v, k) in item.img_lists" :key="k" @click="uploadImg(index)">
@@ -116,23 +123,23 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Date'">
                <view class="order-cell" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
-                        <view :class="['box', 'box-flex']">
-                            <picker mode="date" :value="item.val" @change="bindDateChange($event, index)">
-                                <view class="uni-input" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
-                            </picker>
-                            <text class="iconfont icon-right"></text>
-                        </view>
+                    <view class="box box-flex">
+                        <picker mode="date" :value="item.val" @change="bindDateChange($event, index)">
+                            <view class="uni-input" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
+                        </picker>
                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
            </view>

            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Datelimit'">
                <view class="order-cell flex-box" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
                    <view class="box date-boxs">
                        <view class="date-box">
@@ -157,23 +164,23 @@
            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Time'">
                <view class="order-cell" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
-                        <view :class="['box', 'box-flex']">
-                            <picker mode="time" :value="item.val" @change="bindTimeChange($event, index)">
-                                <view class="uni-input" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
-                            </picker>
-                            <text class="iconfont icon-right"></text>
-                        </view>
+                    <view class="box box-flex">
+                        <picker mode="time" :value="item.val" @change="bindTimeChange($event, index)">
+                            <view class="uni-input" :class="{ 'color-tip': !item.val }">{{ item.val ? item.val : item.value.placeholder }}</view>
+                        </picker>
                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
            </view>

            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'Timelimit'">
                <view class="order-cell flex-box" :style="rowCellStyle">
                    <view class="name" :style="nameWidthStyle">
-                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
                    <view class="box date-boxs">
                        <view class="date-box">
@@ -196,20 +203,20 @@
            </view>

            <view class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle" v-if="item.controller == 'City'">
-                    <view class="order-cell" :style="rowCellStyle">
-                        <view class="name" :style="nameWidthStyle">
-                            <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
-                            <text class="tit">{{ item.value.title }}</text>
-                        </view>
-                        <view :class="['box', 'box-flex']">
-                            <pick-regions :default-regions="item.default_regions" :select-arr="item.select_arr" @getRegions="handleGetRegions($event, index)">
-                                <view class="select-address " :class="{ empty: !item.val, 'color-tip': !item.val }">
-                                    {{ item.val ? item.val : (item.select_arr == '2' ? $lang('components.nsForm.selectProvinceCity') : $lang('components.nsForm.selectProvinceCityDistrict')) }}
-                                </view>
-                            </pick-regions>
-                            <text class="iconfont icon-right"></text>
-                        </view>
+                <view class="order-cell box-flex" :style="rowCellStyle">
+                    <view class="name" :style="nameWidthStyle">
+                        <text class="tit">{{ item.value.title }}</text>
+                        <text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
                    </view>
+                    <view class="box">
+                        <pick-regions :default-regions="item.default_regions" :select-arr="item.select_arr" @getRegions="handleGetRegions($event, index)">
+                            <view class="select-address " :class="{ empty: !item.val, 'color-tip': !item.val }">
+                                {{ item.val ? item.val : (item.select_arr == '2' ? $lang('components.nsForm.selectProvinceCity') : $lang('components.nsForm.selectProvinceCityDistrict')) }}
+                            </view>
+                        </pick-regions>
+                    </view>
+                    <text class="iconfont icon-right"></text>
+                </view>
            </view>
        </block>
    </view>
@@ -263,33 +270,21 @@
            config() {
                // 1) 内置默认值（最低优先级，与重构前的硬编码值一一对应，确保未传 formConfig 时零回归）
                const defaults = {
-                    formPaddingX: 28,
+                    formPaddingX: 0,
                    formBgColor: '#ffffff',
-                    rowPaddingY: 24,
+                    rowPaddingY: 20,
                    rowMinHeight: 60,
-                    labelGap: 20,
-                    inputHeight: 84,
-                    inputRadius: 16,
-                    labelWidthMode: 'auto',    // 与 ns-newform 对齐：标签在上、输入框在下，整行宽度
+                    labelGap: 16,
+                    inputHeight: 60,
+                    inputRadius: 0,
+                    labelWidthMode: 'fixed',   // 旧版 width: 80vw 用 fixed 180rpx 等价替代
                    labelFixedWidth: 180,
-                    labelFontSize: 32,
+                    labelFontSize: 28,
                    labelColor: '#1f2937',
-                    labelFontWeight: 700,
-                    labelAutoMaxWidth: 200,
                    requiredColor: '#ef4444',
-                    checkedColor: '#3b82f6',
-                    placeholderColor: '#9ca3af',
+                    checkedColor: '#ff4544',
+                    placeholderColor: '#909399',
                    placeholderFontSize: 28,
-                    // textarea 显示行数 / 行高（与 ns-newform 对齐）
-                    // 改用 :rows + line-height 驱动高度：rows 给原生 <textarea>（H5/微信原生层/鸿蒙 ArkUI 都识别），
-                    // line-height 用于在 textareaStyle 里算出对应的 px 高度；不再写死 176rpx。
-                    textareaRows: 4,
-                    textareaLineHeight: 44,
-                    // 输入框视觉增强（与 ns-newform 对齐）
-                    inputBorderColor: '#e5e7eb',
-                    inputBgColor: '#f9fafb',
-                    inputFocusBorderColor: '#ff4544',
-                    inputFocusBgColor: '#ffffff',
                    showRowDivider: true,
                    rowDividerColor: '#f0f0f0'
                };
@@ -313,17 +308,10 @@
                    labelFixedWidth: pick('labelFixedWidth', 'label_fixed_width'),
                    labelFontSize: pick('labelFontSize', 'label_font_size'),
                    labelColor: pick('labelColor', 'label_color'),
-                    labelFontWeight: pick('labelFontWeight', 'label_font_weight'),
                    requiredColor: pick('requiredColor', 'required_color'),
                    checkedColor: pick('checkedColor', 'checked_color'),
                    placeholderColor: pick('placeholderColor', 'placeholder_color'),
                    placeholderFontSize: pick('placeholderFontSize', 'placeholder_font_size'),
-                    textareaRows: pick('textareaRows', 'textarea_rows'),
-                    textareaLineHeight: pick('textareaLineHeight', 'textarea_line_height'),
-                    inputBorderColor: pick('inputBorderColor', 'input_border_color'),
-                    inputBgColor: pick('inputBgColor', 'input_bg_color'),
-                    inputFocusBorderColor: pick('inputFocusBorderColor', 'input_focus_border_color'),
-                    inputFocusBgColor: pick('inputFocusBgColor', 'input_focus_bg_color'),
                    showRowDivider: pick('showRowDivider', 'show_row_divider'),
                    rowDividerColor: pick('rowDividerColor', 'row_divider_color')
                };
@@ -375,18 +363,10 @@
                    '--label-fixed-width': this.$util.rpx(cfg.labelFixedWidth),
                    '--label-font-size': this.$util.rpx(num(cfg.labelFontSize, 28)),
                    '--label-color': cfg.labelColor,
-                    '--label-font-weight': cfg.labelFontWeight,
                    '--required-color': cfg.requiredColor,
                    '--checked-color': cfg.checkedColor,
                    '--placeholder-color': cfg.placeholderColor,
                    '--placeholder-font-size': this.$util.rpx(num(cfg.placeholderFontSize, 28)),
-                    '--textarea-rows': num(cfg.textareaRows, 4),
-                    '--textarea-line-height': this.$util.rpx(num(cfg.textareaLineHeight, 44)),
-                    // 输入框视觉增强（与 ns-newform 对齐）
-                    '--input-border-color': cfg.inputBorderColor,
-                    '--input-bg-color': cfg.inputBgColor,
-                    '--input-focus-border-color': cfg.inputFocusBorderColor,
-                    '--input-focus-bg-color': cfg.inputFocusBgColor,
                    '--row-divider-color': cfg.rowDividerColor,
                    '--show-row-divider': cfg.showRowDivider === false ? '0' : '1'
                });
@@ -404,10 +384,13 @@
                    'min-height': this.$util.rpx(this.config.rowMinHeight)
                });
            },
-            // 标签宽度：垂直布局下标签整行显示，宽度交由 CSS（.name { width:100% }）控制；
-            // 字号 / 颜色 / 字重已由 .form-wrap 注入的 --label-* 变量统一驱动，无需 inline 注入。
+            // 标签宽度：根据 labelWidthMode 决定；fixed 用 --label-fixed-width，auto 用 maxLabelWidth
            nameWidthStyle() {
-                return {};
+                const cfg = this.config;
+                if (cfg.labelWidthMode === 'fixed') {
+                    return { width: this.$util.rpx(cfg.labelFixedWidth) };
+                }
+                return this.maxLabelWidth ? { width: this.$util.rpx(this.maxLabelWidth) } : { width: 'auto' };
            },
            // 输入框样式（input / textarea 共用）
            inputStyle() {
@@ -419,42 +402,6 @@
                    'line-height': this.$util.rpx(this.config.inputHeight)
                });
            },
-            // textarea 显示行数（来自 formConfig.textareaRows，未配置时回退到默认 4）
-            textareaRowsValue() {
-                const n = parseInt(this.config.textareaRows, 10);
-                return Number.isFinite(n) && n > 0 ? n : 4;
-            },
-            // textarea 行高（来自 formConfig.textareaLineHeight，用于 :rows × line-height 算出固定可视高度）
-            textareaLineHeightValue() {
-                const n = parseInt(this.config.textareaLineHeight, 10);
-                return Number.isFinite(n) && n > 0 ? n : 44;
-            },
-            // textarea 专用 inline style（所有平台统一使用，见 template 中 textarea 节点）
-            // 设计要点：
-            // 1) 不复用 inputStyle 的 min-height / line-height：那两个值取自 inputHeight（默认 60rpx），
-            //    对 textarea 太小，会让原生 textarea 单行过高、可视区域过小；
-            // 2) 不使用 auto-height：原生 textarea 上 auto-height 会让组件随内容无限扩展，
-            //    遮挡后续组件，导致"看不到下面的其他组件"；
-            // 3) 高度 = rows × lineHeight（两个值都由 formConfig 动态下发，不再写死 176rpx）：
-            //    - H5 浏览器 / 微信原生层：原生 <textarea> 同时识别 :rows 和 CSS line-height，
-            //      高度由浏览器自然算出，与 :rows 完全一致；
-            //    - 鸿蒙 ArkUI：原生 TextArea 只识别 :rows，不识别 CSS height，所以我们在 JS 里
-            //      显式算 height = rows × lineHeight 反向写出，保证三端可视高度像素级一致。
-            textareaStyle() {
-                const lh = this.$util.rpx(this.textareaLineHeightValue);
-                const rows = this.textareaRowsValue;
-                // 加上 padding(12rpx 上下) 和 border(1rpx 上下) 的占用，避免与 :rows 算出的高度不一致时被截断
-                const paddings = this.$util.rpx(24) + this.$util.rpx(2);
-                const h = (this.$util.rpx(this.textareaLineHeightValue * (rows - 1)) + lh) + paddings;
-                return this.$util.objToStyle({
-                    'height': h,
-                    'min-height': h,
-                    'line-height': lh,
-                    'border-radius': this.$util.rpx(this.config.inputRadius),
-                    'font-size': this.$util.rpx(this.config.labelFontSize),
-                    'color': this.config.labelColor
-                });
-            },
            // 必填星号颜色
            requiredColor() {
                return this.config.requiredColor;
@@ -484,33 +431,10 @@
            }
        },
        methods: {
-            // 预计算每项的 option_layout inline style（与 ns-newform 对齐）
-            // 跨端兼容：小程序 / 鸿蒙元服务 WXML 不支持模板里的方法调用，必须预计算到 item 上
-            recomputeItemStyles() {
-                if (!this.formData || this.formData.length === 0) return;
-                this.formData.forEach((item) => {
-                    const itemValue = (item && item.value) || {};
-                    const optLayout = itemValue.option_layout;
-                    const optStyle = {};
-                    if (optLayout === 'vertical') {
-                        optStyle['flex-direction'] = 'column';
-                        optStyle['align-items'] = 'flex-start';
-                        optStyle['gap'] = '8px';
-                    } else {
-                        // wrap 模式
-                        optStyle['flex-direction'] = 'row';
-                        optStyle['align-items'] = 'center';
-                        optStyle['gap'] = '6px';
-                    }
-                    this.$set(item, '_optionLayoutStyle', optStyle);
-                });
-            },
            initFormData() {
                // 深拷贝 prop 数据到本地状态，避免 mutate 上游
                this.formData = JSON.parse(JSON.stringify(this.data || []));
                this.processFormData();
-                // 预计算每项 inline style（与 ns-newform 对齐，跨端兼容）
-                this.recomputeItemStyles();
            },
            setFormData() {
                this.initFormData();
@@ -518,9 +442,7 @@
            },
            processFormData() {
                this.formData.forEach(item => {
-                    // Text / Textarea：当 placeholder 为空字符串或没有值时，不设置默认值
-                    const skipDefault = (item.controller == 'Text' || item.controller == 'Textarea') && !item.value.placeholder;
-                    if (!item.val && !skipDefault) item.val = item.value.default ? item.value.default : '';
+                    if (!item.val) item.val = item.value.default ? item.value.default : '';

                    if (item.value.options) {
                        item.option_lists = [];
@@ -945,31 +867,22 @@
       后端 formConfig 一律以 rpx 传递，前端按 rpx 写入；
       仅 H5 端需要在 JS computed（formWrapStyle 等）里通过 _rpx() 转 px。 */
    .form-wrap {
-        --form-padding-x: 28rpx;
+        --form-padding-x: 0rpx;
        --form-bg-color: #ffffff;
-        --row-padding-y: 24rpx;
+        --row-padding-y: 20rpx;
        --row-min-height: 60rpx;
-        --label-gap: 20rpx;
-        --input-height: 84rpx;
-        --input-radius: 16rpx;
+        --label-gap: 16rpx;
+        --input-height: 60rpx;
+        --input-radius: 0rpx;
        --label-fixed-width: 180rpx;
-        --label-font-size: 32rpx;
+        --label-font-size: 28rpx;
        --label-color: #1f2937;
-        --label-font-weight: 700;
        --required-color: #ef4444;
        --placeholder-font-size: 28rpx;
-        --checked-color: #3b82f6;
-        --placeholder-color: #9ca3af;
-        // textarea 行数 / 行高（运行时被 formWrapStyle 注入的 inline 覆盖；这里是兜底）
-        --textarea-rows: 4;
-        --textarea-line-height: 48rpx;
-        // 输入框视觉增强（与 ns-newform 对齐）
-        --input-border-color: #e5e7eb;
-        --input-bg-color: #ffffff;
-        --input-focus-border-color: #3b82f6;
-        --input-focus-bg-color: #ffffff;
+        --checked-color: #ff4544;
+        --placeholder-color: #909399;
        --row-divider-color: #f0f0f0;
-        --show-row-divider: 0;
+        --show-row-divider: 1;
    }

    .order-wrap {
@@ -987,8 +900,7 @@

    .order-cell {
        display: flex;
-        flex-direction: column; // 与 ns-newform vertical 对齐：标签在上、输入框在下
-        align-items: flex-start;
+        align-items: center;
        background: #fff;
        position: relative;
        min-height: var(--row-min-height, 60rpx);
@@ -1021,23 +933,17 @@
        }

        .name {
-            width: 100%;
+            width: var(--label-fixed-width, 180rpx);
            overflow: hidden;
            text-overflow: ellipsis;
            white-space: nowrap;
-            display: flex;
-            align-items: center;
-            min-height: var(--input-height, 60rpx);
-            line-height: 1.5;
-            margin-bottom: var(--label-gap, 20rpx);
-            margin-right: 0;
+            margin-right: var(--label-gap, 16rpx);
        }

        .tit {
            text-align: left;
            font-size: var(--label-font-size, $font-size-base);
            color: var(--label-color, #1f2937);
-            font-weight: var(--label-font-weight, 700);

            text {
                font-size: var(--label-font-size, $font-size-base);
@@ -1047,49 +953,36 @@
        .required {
            color: var(--required-color, #ef4444);
            font-size: var(--label-font-size, 28rpx);
-            margin-right: 6rpx;
-            font-weight: bold;
+            margin-left: 4rpx;
+            width: 14rpx;
            text-align: left;
            display: inline-block;
-            vertical-align: middle;
        }

        .box {
            flex: 1;
-            width: 100%;
-            padding: 0;
+            padding: 0 10rpx;
            line-height: inherit;
            text-align: left;

-            // H5 端 <input> 可能被 uni-app 编译为 <uni-input> 包装组件，::v-deep 穿透 scoped 命中真实原生 input
-            ::v-deep input,
            input {
                font-size: var(--label-font-size, $font-size-base);
                text-align: left;
                color: var(--label-color, #1f2937);
                // 显式 height / line-height / min-height 同步覆盖 WebView 默认与鸿蒙原生 TextInput 的固有高度，
                // 避免 placeholder / 文字下半部分被裁切
-                line-height: var(--input-height, 84rpx);
-                height: var(--input-height, 84rpx);
-                min-height: var(--input-height, 84rpx);
-                border-radius: var(--input-radius, 16rpx);
+                line-height: var(--input-height, 60rpx);
+                height: var(--input-height, 60rpx);
+                min-height: var(--input-height, 60rpx);
+                border-radius: var(--input-radius, 0rpx);
                box-sizing: border-box;
-                width: 100%;
-                padding: 0 24rpx;
-                // 输入框视觉增强（与 ns-newform 对齐）
-                border: 1rpx solid var(--input-border-color, #e5e7eb);
-                background: var(--input-bg-color, #ffffff);
-                transition: all 0.3s ease;
-
-                &:focus {
-                    background: var(--input-focus-bg-color, #ffffff);
-                    border-color: var(--input-focus-border-color, #3b82f6);
-                }
+                padding: 0;
+                background: transparent;

                // 原生 placeholder 样式（WebView / H5 生效；小程序/鸿蒙的 placeholder
                // 通过 placeholder-class="placeholder" 钩子走 .placeholder 规则）
                &::placeholder {
-                    color: var(--placeholder-color, #9ca3af);
+                    color: var(--placeholder-color, #909399);
                    font-size: var(--placeholder-font-size, 28rpx);
                }
            }
@@ -1097,47 +990,32 @@
            // placeholder-class 钩子：在鸿蒙原生 TextInput / WebView 中都生效，
            // 限定在 .form-wrap 内避免污染全局 .placeholder / .color-tip
            .placeholder {
-                color: var(--placeholder-color, #9ca3af);
+                color: var(--placeholder-color, #909399);
                font-size: var(--placeholder-font-size, 28rpx);
-                line-height: var(--input-height, 84rpx);
+                line-height: var(--input-height, 60rpx);
            }

-            ::v-deep textarea,
            textarea {
                font-size: var(--label-font-size, $font-size-base);
                width: 100%;
                color: var(--label-color, #1f2937);
-                // 行高由 formConfig.textareaLineHeight（兜底 48rpx）控制；
-                // 高度 = rows × line-height + padding + border，所有值都从 CSS 变量读取，
-                // 真正做到了"rows 改 → 高度自动改"。
-                line-height: var(--textarea-line-height, 48rpx);
-                min-height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
-                height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
+                // 鸿蒙元服务渲染为原生 ArkUI TextArea，不识别 CSS height，由 :rows 控制行数；
+                // 这里给所有端都设一个最小高度基线，避免空内容时塌缩
+                min-height: 88rpx;
+                height: 88rpx;
+                line-height: 44rpx;
                text-align: left;
-                border-radius: var(--input-radius, 16rpx);
+                border-radius: var(--input-radius, 0rpx);
                box-sizing: border-box;
-                padding: 12rpx 24rpx;
-                // 输入框视觉增强（与 ns-newform 对齐）
-                border: 1rpx solid var(--input-border-color, #e5e7eb);
-                background: var(--input-bg-color, #ffffff);
-                transition: all 0.3s ease;
-
-                &:focus {
-                    background: var(--input-focus-bg-color, #ffffff);
-                    border-color: var(--input-focus-border-color, #3b82f6);
-                }
+                padding: 0;
+                background: transparent;
            }

            .uni-input {
                font-size: var(--label-font-size, $font-size-base);
                color: var(--label-color, #1f2937);
-                line-height: var(--input-height, 84rpx);
-                min-height: var(--input-height, 84rpx);
-                // 输入框视觉增强（与 ns-newform 对齐）
-                border: 1rpx solid var(--input-border-color, #e5e7eb);
-                background: var(--input-bg-color, #ffffff);
-                border-radius: var(--input-radius, 16rpx);
-                transition: all 0.3s ease;
+                line-height: var(--input-height, 60rpx);
+                min-height: var(--input-height, 60rpx);
            }

            .select-address {
@@ -1146,36 +1024,17 @@
            }

            .color-tip {
-                color: var(--placeholder-color, #9ca3af);
+                color: var(--placeholder-color, #909399);
            }

-            // 让原生 picker / 自定义 pick-regions 撑满父容器（纵向布局下 label 在上、控件在下）
-            picker,
-            .pick-regions {
-                display: block;
-                width: 100%;
-                min-width: 0;
+            checkbox-group {
+                display: flex;
+                flex-wrap: wrap;
            }

-            // 在 box-flex（带右侧箭头）场景下，picker 不应占满，留出右侧箭头空间
-            &.box-flex {
-                picker,
-                .pick-regions {
-                    width: auto;
-                }
-
-                .iconfont.icon-right {
-                    flex-shrink: 0;
-                    margin-left: 8rpx;
-                    line-height: 1;
-                }
-            }
-
-            checkbox-group,
            radio-group {
                display: flex;
                flex-wrap: wrap;
-                width: 100%;
            }

            label {
@@ -1185,39 +1044,6 @@
                margin-right: 30rpx;
            }

-            // 选项排列样式：vertical = 每个选项独立一行；wrap（默认）= 横向自动换行
-            // 注意：option-layout-* 是 .box 自身的类，必须用 & 嵌套，否则编译成 .box .option-layout-* 会选不中
-            &.option-layout-vertical {
-                checkbox-group,
-                radio-group {
-                    flex-direction: column;
-                    align-items: flex-start;
-                }
-
-                label {
-                    width: 100%;
-                    margin-right: 0;
-                    margin-bottom: 16rpx;
-
-                    &:last-child {
-                        margin-bottom: 0;
-                    }
-                }
-            }
-
-            &.option-layout-wrap {
-                checkbox-group,
-                radio-group {
-                    flex-direction: row;
-                    align-items: center;
-                }
-
-                label {
-                    margin-right: 30rpx;
-                    margin-bottom: 0;
-                }
-            }
-
            &.img-boxs {
                display: flex;
                align-items: center;
@@ -1293,11 +1119,10 @@
                align-items: center;
                line-height: 1;

-                    .iconfont {
-                        font-size: 40rpx;
-                        margin-right: 10rpx;
-                        color: #d1d5db;
-                    }
+                .iconfont {
+                    font-size: 32rpx;
+                    margin-right: 10rpx;
+                }
            }
        }

@@ -1311,11 +1136,10 @@
                align-items: center;
                line-height: 1;

-                    .iconfont {
-                        font-size: 40rpx;
-                        margin-right: 10rpx;
-                        color: #d1d5db;
-                    }
+                .iconfont {
+                    font-size: 32rpx;
+                    margin-right: 10rpx;
+                }
            }
        }

--- a/components/ns-goods-recommend/ns-goods-recommend.vue
+++ b/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -10,14 +10,14 @@
 			return {
 				list: [],
 				config: {
-					title: '',
+					title: '猜你喜欢',
 					sources: 'sort',
 					supportPage: [],
 					goodsIds: [],
 					fontWeight: false,
 					padding: 0,
 					cartEvent: 'detail',
-					text: '',
+					text: '购买',
 					textColor: '#FFFFFF',
 					theme: 'default',
 					aroundRadius: 25,
@@ -67,13 +67,10 @@
 			}
 		},
 		mounted() {
-		// 初始化 i18n 默认文案,实际展示以服务端配置 config.title / config.text 为准
-		if (!this.config.title) this.config.title = this.$lang('common.goodsRecommendTitle');
-		if (!this.config.text) this.config.text = this.$lang('buyNow');
-		if (this.auto) {
-			this.getLikeList();
-		}
-	},
+			if (this.auto) {
+				this.getLikeList();
+			}
+		},
 		methods: {
 			init() {
 				this.list = [];
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -56,18 +56,10 @@

 					<!-- 手机号授权按钮 -->
 					<block v-if="isAgree">
-						<!-- #ifdef MP-WEIXIN -->
 						<button class="auth-login save-btn border-0" style="border: none;" open-type="getPhoneNumber"
 							@getphonenumber="getPhoneNumber">
 							<text style="color: #fff; font-size: 30rpx;">{{ $lang('components.ns-login.agreeAndAuthorizeMobile') }}</text>
 						</button>
-						<!-- #endif -->
-						<!-- #ifdef MP-HARMONY -->
-						<!-- 鸿蒙元服务无 getPhoneNumber 微信 API,改为弹出手机号+验证码表单 -->
-						<button class="auth-login save-btn border-0" style="border: none;" @tap="showHarmonyMobileForm = true">
-							<text style="color: #fff; font-size: 30rpx;">{{ $lang('components.ns-login.agreeAndAuthorizeMobile') }}</text>
-						</button>
-						<!-- #endif -->
 					</block>
 					<block v-else>
 						<button class="auth-login save-btn border-0" style="border: none;" @tap="authno">
@@ -75,27 +67,6 @@
 						</button>
 					</block>

-					<!-- #ifdef MP-HARMONY -->
-					<!-- 鸿蒙专属:手机号+验证码表单 -->
-					<view v-if="showHarmonyMobileForm" class="harmony-mobile-form" @touchmove.prevent.stop>
-						<view class="item-wrap">
-							<text class="label">{{ $lang('components.ns-login.mobileLabel') }}</text>
-							<input type="number" :placeholder="$lang('components.ns-login.mobilePlaceholder')" v-model="formData.mobile" maxlength="11" />
-						</view>
-						<view class="item-wrap" v-if="isOpenCaptcha == 1">
-							<text class="label">{{ $lang('components.ns-login.captchaLabel') }}</text>
-							<input type="number" :placeholder="$lang('components.ns-login.captchaPlaceholder')" v-model="formData.vercode" maxlength="4" />
-							<image :src="captcha.img" class="captcha" @tap="getCaptcha" show-menu-by-longpress></image>
-						</view>
-						<view class="item-wrap">
-							<text class="label">{{ $lang('components.ns-login.dynacodeLabel') }}</text>
-							<input type="number" :placeholder="$lang('components.ns-login.dynacodePlaceholder')" v-model="formData.dynacode" maxlength="4" />
-							<view class="send color-base-text" @tap="sendMobileCode">{{ dynacodeData.codeText }}</view>
-						</view>
-						<button type="default" class="save-btn" @tap="harmonySaveMobile" :disabled="isDisabled">{{ $lang('components.ns-login.save') }}</button>
-					</view>
-					<!-- #endif -->
-
 					<view @tap="closeLogin"
 						style="font-size: 30rpx; color: #888; text-align: center; padding-top: 10rpx;">
 						{{ $lang('components.ns-login.notNow') }}
@@ -138,20 +109,11 @@

 						<view class="item-wrap" v-if="forceBindingMobileControl">
 							<text class="label">{{ $lang('components.ns-login.mobileLabel') }}</text>
-							<!-- #ifdef MP-WEIXIN -->
 							<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0"
 								@getphonenumber="getPhoneNumber">
 								<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
 								<text class="color-base-text" v-else>{{ $lang('components.ns-login.getMobile') }}</text>
 							</button>
-							<!-- #endif -->
-							<!-- #ifdef MP-HARMONY -->
-							<!-- 鸿蒙无 getPhoneNumber,展示手动输入的手机号,没有时显示"获取手机号"提示用户去上面表单录入 -->
-							<view class="auth-login border-0" :plain="true">
-								<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
-								<text class="color-base-text" v-else @tap="showHarmonyMobileForm = true">{{ $lang('components.ns-login.getMobile') }}</text>
-							</view>
-							<!-- #endif -->
 						</view>
 						<button type="default" class="save-btn" @tap="saveMp" :disabled="isDisabled">{{ $lang('components.ns-login.save') }}</button>
 					</template>
@@ -208,16 +170,12 @@ export default {
 				isSend: false
 			},
 			// 小程序获取手机号所需数据
-		authMobileData: {
-			iv: '',
-			encryptedData: ''
-		},
-		site_name: '',
-		// #ifdef MP-HARMONY
-		// 鸿蒙专属:控制手机号+验证码表单显示
-		showHarmonyMobileForm: false,
-		// #endif
-	};
+			authMobileData: {
+				iv: '',
+				encryptedData: ''
+			},
+			site_name: ''
+		};
 	},
 	options: {
 		styleIsolation: 'shared'
@@ -245,7 +203,7 @@ export default {
 			if (this.forceBindingMobileControl) {
 				if (this.formData.mobile.length == 0) return true;

-				// #ifdef H5 || MP-HARMONY
+				// #ifdef H5
 				// 验证码
 				if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
 				// 动态码
@@ -325,69 +283,14 @@ export default {


 			// #ifdef MP-WEIXIN
-			// 真机 __usePrivacyCheck__ 开启时 getPhoneNumber 属于微信隐私接口，
-			// 必须先完成平台级隐私协议授权，否则点击"授权手机号"按钮会直接报
-			// "privacy permission is not authorized or buttonId is invalid"。
-			// 这里在登录链路前主动检查并弹隐私弹窗，授权完成后再继续登录。
-			this.ensureWxPrivacyAuthorized(() => {
-				this.getCode(authData => {
-					this.authLogin(authData, 'authOnlyLogin');
-				}, (err) => {
-					callback && callback(err);
-				});
+			this.getCode(authData => {
+				this.authLogin(authData, 'authOnlyLogin');
+			}, (err) => {
+				callback && callback(err);
 			});
 			// #endif
 		},

-		// 微信小程序: 确保平台级隐私协议已授权后再执行回调
-		ensureWxPrivacyAuthorized(done) {
-			try {
-				if (typeof wx === 'undefined' || !wx.getPrivacySetting) {
-					// 低版本基础库无隐私 API, 直接放行
-					done();
-					return;
-				}
-				wx.getPrivacySetting({
-					success: (res) => {
-						if (!res || !res.needAuthorization) {
-							// 已授权或无隐私指引配置, 直接放行
-							done();
-							return;
-						}
-						// 需要授权: 优先弹自建隐私弹窗(内含 agreePrivacyAuthorization 按钮,
-						// 点击同意即完成平台级授权); 用户同意后通过 privacy:agreed 事件继续
-						const popup = this.$refs.privacyPopup;
-						if (popup && typeof popup.showPrivacyPopup === 'function') {
-							const onAgreed = () => {
-								uni.$off('privacy:agreed', onAgreed);
-								uni.$off('privacy:disagreed', onDisagreed);
-								done();
-							};
-							const onDisagreed = () => {
-								uni.$off('privacy:agreed', onAgreed);
-								uni.$off('privacy:disagreed', onDisagreed);
-								// 用户拒绝隐私协议: 不继续登录链路(隐私接口也不可用)
-							};
-							uni.$off('privacy:agreed', onAgreed);
-							uni.$off('privacy:disagreed', onDisagreed);
-							uni.$on('privacy:agreed', onAgreed);
-							uni.$on('privacy:disagreed', onDisagreed);
-							popup.showPrivacyPopup();
-						} else if (typeof wx.requirePrivacyAuthorize === 'function') {
-							// 无 privacy-popup 实例时退回微信官方隐私弹窗
-							wx.requirePrivacyAuthorize({
-								success: () => done(),
-								fail: () => { }
-							});
-						}
-					},
-					fail: () => done()
-				});
-			} catch (e) {
-				done();
-			}
-		},
-
 		// 跳转去登录页
 		toLoginH5Page(mode = 'navigateTo') {
 			if (this.url) this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {
@@ -440,7 +343,7 @@ export default {
 		openCompleteInfoPop() {
 			this.getRegisterConfig();

-			// #ifdef H5 || MP-HARMONY
+			// #ifdef H5
 			if (!this.storeToken) this.getCaptchaConfig();
 			// #endif

@@ -669,24 +572,8 @@ export default {
 					}
 				});
 			} else {
-				const errMsg = (e.detail && e.detail.errMsg) || '';
-				// #ifdef MP-WEIXIN
-				// 隐私协议未授权时 getPhoneNumber 会直接失败:
-				// "getPhoneNumber:fail privacy permission is not authorized or buttonId is invalid"
-				// 此时不再抛原始错误, 引导用户同意隐私弹窗后重新点授权按钮
-				if (errMsg.indexOf('privacy') !== -1) {
-					this.$util.showToast({
-						title: this.$lang('components.ns-login.pleaseAgreePrivacy')
-					});
-					const popup = this.$refs.privacyPopup;
-					if (popup && typeof popup.showPrivacyPopup === 'function') {
-						popup.showPrivacyPopup();
-					}
-					return;
-				}
-				// #endif
 				this.$util.showToast({
-					title: errMsg
+					title: e.detail.errMsg
 				})
 			}
 		},
@@ -789,26 +676,6 @@ export default {
 			this.forceBindMobile();
 		},

-		// #ifdef MP-HARMONY
-		// 鸿蒙元服务保存手机号:复用 H5 的强制绑定手机号流程
-		harmonySaveMobile() {
-			if (this.forceBindingMobileControl) {
-				let data = {
-					mobile: this.formData.mobile,
-					key: this.formData.key,
-					code: this.formData.dynacode
-				};
-				if (this.captcha.id != '') {
-					data.captcha_id = this.captcha.id;
-					data.captcha_code = this.formData.vercode;
-				}
-				if (!this.verify(data)) return;
-			}
-			// 鸿蒙环境下通常也开启了 forceBindingMobileControl(走 forceBindMobile 接口)
-			this.forceBindMobile();
-		},
-		// #endif
-
 		// 微信小程序保存数据
 		saveMp() {
 			if (this.formData.mobile === '') {
--- a/components/ns-navbar/ns-navbar.vue
+++ b/components/ns-navbar/ns-navbar.vue
@@ -53,7 +53,7 @@
 let systemInfo = uni.getSystemInfoSync();
 let menuButtonInfo = {};
 // 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
-// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-HARMONY
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif

--- a/components/ns-newform/ns-newform.vue
+++ b/components/ns-newform/ns-newform.vue
@@ -5,14 +5,14 @@
 			<view v-if="item.controller == 'Text'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]" :style="rowCellStyle">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'align-left']" :style="item._boxAlignStyle">
-						<input
-							type="text"
-							:placeholder="item.value.placeholder"
-							placeholder-class="placeholder color-tip"
+						<input 
+							type="text" 
+							:placeholder="item.value.placeholder || $lang('components.ns-newform.inputPlaceholder')" 
+							placeholder-class="placeholder color-tip" 
 							v-model="item.val"
 						/>
 					</view>
@@ -23,20 +23,14 @@
 			<view v-if="item.controller == 'Textarea'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', 'flex-box', 'textarea', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'align-left']" :style="item._boxAlignStyle">
-						<!-- 所有平台统一通过 formConfig.textareaRows / item.value.rows 控制显示行数：
-						     - H5 / 微信：原生 textarea 识别 :rows 属性；
-						     - 鸿蒙：渲染为 ArkUI 原生 TextArea，CSS height 不生效，必须靠 :rows 控制。
-						     rows 全部由 formConfig 动态下发，与 ns-form 行为保持一致。 -->
-						<textarea
-							:rows="item.value.rows || textareaRowsValue"
-							:placeholder="item.value.placeholder"
-							placeholder-class="placeholder color-tip"
+						<textarea 
+							:placeholder="item.value.placeholder || $lang('components.ns-newform.inputPlaceholder')" 
+							placeholder-class="placeholder color-tip" 
 							v-model="item.val"
-							:style="textareaStyle"
 						></textarea>
 					</view>
 				</view>
@@ -51,8 +45,8 @@
 				>
 					<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 						<view class="name" :style="item._labelStyle">
-							<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 							<text class="tit">{{ item.value.title }}</text>
+							<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						</view>
 						<view :class="['box', 'box-flex', 'align-right']">
 							<text v-if="item.val != ''">{{ item.val }}</text>
@@ -67,23 +61,22 @@
 			<view v-if="item.controller == 'Checkbox'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
-					<view :class="['box', 'check-group-box', 'align-left', 'option-layout-' + (item.value.option_layout || 'vertical')]">
-						<checkbox-group @change="checkboxChange($event, index)" :style="item._optionLayoutStyle">
+					<view :class="['box', 'check-group-box', 'align-left']">
+						<checkbox-group @change="checkboxChange($event, index)">
 							<label v-for="(v, k) in item.option_lists" :key="k">
 								<checkbox :value="v.value" :checked="v.checked"></checkbox>
 								<view class="checkbox">
-								<text 
-									:class="[
-										'iconfont',
-										'check-icon',
-										!v.checked ? 'icon-fuxuankuang2' : '',
-										v.checked ? 'icon-fuxuankuang1' : ''
-									]"
-									:style="{ color: v.checked ? checkedColor : '' }"
-								></text>
+									<text 
+										:class="[
+											'iconfont',
+											!v.checked ? 'icon-fuxuankuang2' : '',
+											v.checked ? 'icon-fuxuankuang1' : ''
+										]"
+										:style="{ color: v.checked ? checkedColor : '' }"
+									></text>
 									{{ v.value }}
 								</view>
 							</label>
@@ -96,23 +89,22 @@
 			<view v-if="item.controller == 'Radio'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
-					<view :class="['box', 'radio-group-box', 'align-left', 'option-layout-' + (item.value.option_layout || 'vertical')]">
-						<radio-group @change="radioChange($event, index)" :style="item._optionLayoutStyle">
+					<view :class="['box', 'radio-group-box', 'align-left']">
+						<radio-group @change="radioChange($event, index)">
 							<label v-for="(v, k) in item.option_lists" :key="k">
 								<radio :value="v.value" :checked="item.val == v.value"></radio>
 								<view class="radio-box">
-								<text 
-									:class="[
-										'iconfont',
-										'radio-icon',
-										item.val != v.value ? 'icon-yuan_checkbox' : '',
-										item.val == v.value ? 'icon-yuan_checked' : ''
-									]"
-									:style="{ color: item.val == v.value ? checkedColor : '' }"
-								></text>
+									<text 
+										:class="[
+											'iconfont',
+											item.val != v.value ? 'icon-yuan_checkbox' : '',
+											item.val == v.value ? 'icon-yuan_checked' : ''
+										]"
+										:style="{ color: item.val == v.value ? checkedColor : '' }"
+									></text>
 									{{ v.value }}
 								</view>
 							</label>
@@ -125,8 +117,8 @@
 			<view v-if="item.controller == 'Img'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', 'flex-box', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'img-boxs', 'align-left']" :style="item._boxAlignStyle">
 						<view v-for="(v, k) in item.img_lists" :key="k" class="img-box" @tap="uploadImg(index)">
@@ -144,8 +136,8 @@
 			<view v-if="item.controller == 'Date'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'box-flex', 'align-right']">
 						<picker
@@ -166,8 +158,8 @@
 			<view v-if="item.controller == 'Datelimit'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', 'flex-box', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'date-boxs', 'align-center']" :style="item._boxAlignStyle">
 						<view class="date-box">
@@ -205,8 +197,8 @@
 			<view v-if="item.controller == 'Time'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'box-flex', 'align-right']">
 						<picker
@@ -227,8 +219,8 @@
 			<view v-if="item.controller == 'Timelimit'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', 'flex-box', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'date-boxs', 'align-center']" :style="item._boxAlignStyle">
 						<view class="date-box">
@@ -266,8 +258,8 @@
 			<view v-if="item.controller == 'City'" class="order-wrap" :class="rowWrapClass" :style="rowWrapStyle">
 				<view :class="['order-cell', { 'vertical-layout': mode === 'vertical' }]">
 					<view class="name" :style="item._labelStyle">
-						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 						<text class="tit">{{ item.value.title }}</text>
+						<text class="required" :style="{ color: requiredColor }">{{ item.value.required ? '*' : '' }}</text>
 					</view>
 					<view :class="['box', 'box-flex', 'align-right']">
 						<pick-regions
@@ -304,7 +296,7 @@ export default {
 		},
 		mode: {
 			type: String,
-			default: 'vertical',
+			default: 'horizontal',
 			validator: (value) => !value || ['horizontal', 'vertical'].includes(value)
 		},
 		// 表单配置（按平台差异化）
@@ -364,40 +356,28 @@ export default {
 	config() {
 		// 内置默认值（最低优先级）- 与后端 D:\projects\shop-projects\backend\src\app\component\view\form\js\design.js getDefaultFormData().formConfig 对齐
 		const defaults = {
-			formPaddingX: 28,
+			formPaddingX: 14,
 			bannerPaddingX: 0,
-			tipPaddingX: 28,
-			rowPaddingY: 24,
+			tipPaddingX: 14,
+			rowPaddingY: 4,
 			rowMinHeight: 60,
-			labelGap: 20,
+			labelGap: 16,
 			formBgColor: '#ffffff',
 			rowDividerColor: '#f0f0f0',
-			showRowDivider: false,
-			inputHeight: 84,
-			inputRadius: 16,
+			showRowDivider: true,
+			inputHeight: 60,
+			inputRadius: 10,
 			labelWidthMode: 'auto',
 			labelFixedWidth: 180,
-			labelFontSize: 32,
+			labelFontSize: 28,
 			labelColor: '#1f2937',
-			labelFontWeight: 700,
-			labelAutoMaxWidth: 200,    // auto 模式下 label 宽度上限（rpx），超过后 ellipsis 截断
 			requiredColor: '#ef4444',
-			checkedColor: '#3b82f6',
-			placeholderColor: '#9ca3af',
+			checkedColor: '#ff4544',
+			placeholderColor: '#ddd',
 			placeholderFontSize: 28,
-			// textarea 显示行数 / 行高（与 ns-form 保持一致，由 formConfig 覆盖）
-			// 改用 :rows + line-height 驱动高度，rows 给原生 <textarea>，line-height 在 textareaStyle 算 px 高度
-			textareaRows: 4,
-			textareaLineHeight: 48,
-			// 输入框视觉增强（可由后端 form_config 覆盖）
-			inputBorderColor: '#e5e7eb',
-			inputBgColor: '#ffffff',
-			inputFocusBorderColor: '#3b82f6',
-			inputFocusBgColor: '#ffffff',
-			labelFontWeight: 700,
 			// 提交按钮
 			submitColor: '#ffffff',
-			submitBgColor: '#3b82f6',
+			submitBgColor: '#ff4544',
 			submitMarginTop: 0,         // 提交按钮顶部外边距（rpx）：调整表单与按钮之间的距离
 			// 提示语
 			tipFontSize: 32,
@@ -464,15 +444,6 @@ export default {
 				'--checked-color': cfg.checkedColor,
 				'--placeholder-color': cfg.placeholderColor,
 				'--placeholder-font-size': this.$util.rpx(num(cfg.placeholderFontSize, 28)),
-				// textarea 行数 / 行高（CSS 兜底 + JS 算高度都用得到）
-				'--textarea-rows': num(cfg.textareaRows, 4),
-				'--textarea-line-height': this.$util.rpx(num(cfg.textareaLineHeight, 44)),
-				// 输入框视觉增强（边框 / 背景 / 聚焦 / label 字重）
-				'--input-border-color': cfg.inputBorderColor,
-				'--input-bg-color': cfg.inputBgColor,
-				'--input-focus-border-color': cfg.inputFocusBorderColor,
-				'--input-focus-bg-color': cfg.inputFocusBgColor,
-				'--label-font-weight': cfg.labelFontWeight,
 				'--submit-color': cfg.submitColor,
 				'--submit-bg-color': cfg.submitBgColor,
 				'--submit-margin-top': this.$util.rpx(cfg.submitMarginTop || 0),
@@ -512,30 +483,6 @@ export default {
 				'border-radius': this.$util.rpx(this.config.inputRadius)
 			});
 		},
-		// textarea 显示行数（来自 formConfig.textareaRows，未配置时回退到默认 4）
-		textareaRowsValue() {
-			const n = parseInt(this.config.textareaRows, 10);
-			return Number.isFinite(n) && n > 0 ? n : 4;
-		},
-		// textarea 行高（来自 formConfig.textareaLineHeight，用于 :rows × line-height 算出可视高度）
-		textareaLineHeightValue() {
-			const n = parseInt(this.config.textareaLineHeight, 10);
-			return Number.isFinite(n) && n > 0 ? n : 44;
-		},
-		// textarea 专用 inline style（所有平台统一使用，见 template 中 textarea 节点）
-		// 高度 = rows × lineHeight + padding + border，由 formConfig 动态控制，与 ns-form 同公式
-		textareaStyle() {
-			const lh = this.$util.rpx(this.textareaLineHeightValue);
-			const rows = this.textareaRowsValue;
-			const paddings = this.$util.rpx(24) + this.$util.rpx(2); // padding 12rpx 上下 + border 1rpx 上下
-			const h = (this.$util.rpx(this.textareaLineHeightValue * (rows - 1)) + lh) + paddings;
-			return this.$util.objToStyle({
-				'height': h,
-				'min-height': h,
-				'line-height': lh,
-				'border-radius': this.$util.rpx(this.config.inputRadius)
-			});
-		},
 		labelStyle() {
 			const style = {
 				fontSize: this.$util.rpx(this.config.labelFontSize),
@@ -589,24 +536,6 @@ export default {
 				// item 级别 box 对齐方式（与原 getItemBoxAlignStyle 逻辑一致）
 				const align = itemValue.input_align;
 				this.$set(item, '_boxAlignStyle', align ? { 'text-align': align } : {});
-
-			// 选项排列样式：默认 vertical（每项一行），仅当后端显式配置 wrap 时横向换行
-			// 走 inline style（不依赖 dev 编译产物的 SCSS 类，跨端兼容更稳）
-			// 直接写 flex-direction 等 CSS 属性，inline style 优先级最高
-			const optLayout = itemValue.option_layout;
-			const optStyle = {};
-			if (optLayout === 'wrap') {
-				// wrap 模式：横向自动换行
-				optStyle['flex-direction'] = 'row';
-				optStyle['align-items'] = 'center';
-				optStyle['gap'] = '12rpx';
-			} else {
-				// vertical 模式（默认）：每项独立一行
-				optStyle['flex-direction'] = 'column';
-				optStyle['align-items'] = 'flex-start';
-				optStyle['gap'] = '20rpx';
-			}
-			this.$set(item, '_optionLayoutStyle', optStyle);
 			});
 		},
 		// 容器样式（提供给外部 diy-form 使用）
@@ -630,13 +559,8 @@ export default {
 				if (len > maxChars) maxChars = len;
 			});
 			// 与后端公式一致：chars * (fontSize/2) * 1.1 + 12，单位 px → 转 rpx（×2）
-			let widthPx = Math.max(40, maxChars * (fontSize / 2) * 1.1 + 12);
-			let widthRpx = Math.round(widthPx * 2);
-			// auto 模式下加宽度上限：超长 title 撑爆布局时，按 labelAutoMaxWidth 截断（rpx）
-			// 上限内 ellipsis 截断，保证控件区有足够空间；上限外也不会让 label 占满整行
-			const maxWidthRpx = parseInt(this.config.labelAutoMaxWidth) || 200;
-			if (widthRpx > maxWidthRpx) widthRpx = maxWidthRpx;
-			this.maxLabelWidth = widthRpx;
+			const widthPx = Math.max(40, maxChars * (fontSize / 2) * 1.1 + 12);
+			this.maxLabelWidth = Math.round(widthPx * 2);
 			// 宽度变了，需要把全局 nameWidthStyle 重新合到每项 _labelStyle 里
 			this.recomputeItemStyles();
 		},
@@ -654,9 +578,7 @@ export default {
 		
 		processFormData() {
 			this.formData.forEach((item) => {
-				// Text / Textarea：当 placeholder 为空字符串或没有值时，不设置默认值
-				const skipDefault = (item.controller == 'Text' || item.controller == 'Textarea') && !item.value.placeholder;
-				if (!item.val && !skipDefault) {
+				if (!item.val) {
 					item.val = item.value.default ? item.value.default : '';
 				}
 				
@@ -1015,38 +937,29 @@ export default {
 .form-wrap {
 	background: #fff;
 	/* 默认值兜底：与 ns-newform.config 默认值一致 */
-	--form-padding-x: 28rpx;
+	--form-padding-x: 14rpx;
 	--banner-padding-x: 0rpx;
-	--tip-padding-x: 28rpx;
-	--tip-font-size: 32rpx;
+	--tip-padding-x: 14rpx;
+	--tip-font-size: 24rpx;
 	--tip-color: #666666;
 	--tip-bg-color: #ffffff;
-	--row-padding-y: 24rpx;
+	--row-padding-y: 4rpx;
 	--row-min-height: 60rpx;
-	--label-gap: 20rpx;
+	--label-gap: 16rpx;
 	--form-bg-color: #ffffff;
 	--row-divider-color: #f0f0f0;
-	--input-height: 84rpx;
-	--input-radius: 16rpx;
+	--input-height: 60rpx;
+	--input-radius: 10rpx;
 	--label-fixed-width: 180rpx;
-	--label-font-size: 32rpx;
+	--label-font-size: 28rpx;
 	--label-color: #1f2937;
 	--required-color: #ef4444;
-	--checked-color: #3b82f6;
+	--checked-color: #ff4544;
 	--submit-color: #ffffff;
-	--submit-bg-color: #3b82f6;
-	--placeholder-color: #9ca3af;
+	--submit-bg-color: #ff4544;
+	--placeholder-color: #ddd;
 	--placeholder-font-size: 28rpx;
-	// textarea 行数 / 行高（运行时被 formWrapStyle 注入的 inline 覆盖；这里是兜底）
-	--textarea-rows: 4;
-	--textarea-line-height: 48rpx;
-	// 输入框视觉增强（边框 / 背景 / 聚焦 / label 字重）
-	--input-border-color: #e5e7eb;
-	--input-bg-color: #ffffff;
-	--input-focus-border-color: #3b82f6;
-	--input-focus-bg-color: #ffffff;
-	--label-font-weight: 700;
-	--show-row-divider: 0;
+	--show-row-divider: 1;

 	// 与后端 form-preview-wrap.no-divider-all 对齐：整组隐藏所有行分割线
 	&.no-divider-all {
@@ -1097,14 +1010,13 @@ export default {
 		&.vertical-layout {
 			flex-direction: column;
 			align-items: flex-start;
-
+			
 			.name {
 				width: 100%;
-				min-height: auto;
-				margin-bottom: var(--label-gap, 20rpx);
+				margin-bottom: 8rpx;
 				margin-right: 0;
 			}
-
+			
 			.box {
 				width: 100%;
 			}
@@ -1154,7 +1066,7 @@ export default {
 				text-align: left;
 				font-size: var(--item-label-font-size, var(--label-font-size, 28rpx));
 				color: var(--item-label-color, var(--label-color, #1f2937));
-				font-weight: var(--item-label-font-weight, var(--label-font-weight, 600));
+				font-weight: 500;
 				letter-spacing: 0.2rpx;

 				text {
@@ -1165,7 +1077,7 @@ export default {
 			.required {
 				color: var(--required-color, #ef4444);
 				font-size: var(--item-label-font-size, var(--label-font-size, 28rpx));
-				margin-right: 6rpx;
+				margin-left: 4rpx;
 				font-weight: bold;
 				display: inline-block;
 				vertical-align: middle;
@@ -1222,112 +1134,51 @@ export default {
 				width: 100%;
 			}
 			
-			// H5 端 <input> 被 uni-app 编译为 <uni-input> 自定义组件，
-			// 真实 <input> 是其子节点，需要 ::v-deep 穿透 scoped 才能命中
-			::v-deep input {
-				font-size: var(--label-font-size, 28rpx);
-				text-align: left;
-				height: var(--input-height, 84rpx);
-				border: 1rpx solid var(--input-border-color, #e5e7eb);
-				border-radius: var(--input-radius, 16rpx);
-				line-height: calc(var(--input-height, 84rpx) - 2rpx);
-				padding: 0 24rpx;
-				background: var(--input-bg-color, #ffffff);
-				color: var(--label-color, #1f2937);
-				transition: all 0.3s ease;
-				width: 100%;
-				box-sizing: border-box;
-
-				&:focus {
-					background: var(--input-focus-bg-color, #ffffff);
-					border-color: var(--input-focus-border-color, #3b82f6);
-				}
-
-				&::placeholder {
-					color: var(--placeholder-color, #9ca3af);
-					font-size: var(--placeholder-font-size, 28rpx);
-				}
-			}
-
-			// 非 H5 端（小程序 / 鸿蒙 / App）<input> 是直接原生元素，普通选择器即可
 			input {
 				font-size: var(--label-font-size, 28rpx);
 				text-align: left;
-				height: var(--input-height, 84rpx);
-				border: 1rpx solid var(--input-border-color, #e5e7eb);
-				border-radius: var(--input-radius, 16rpx);
-				line-height: calc(var(--input-height, 84rpx) - 2rpx);
-				padding: 0 24rpx;
-				background: var(--input-bg-color, #ffffff);
+				height: var(--input-height, 60rpx);
+				border: none;
+				border-radius: var(--input-radius, 10rpx);
+				line-height: var(--input-height, 60rpx);
+				padding: 0;
+				background: transparent;
 				color: var(--label-color, #1f2937);
 				transition: all 0.3s ease;
 				width: 100%;
 				box-sizing: border-box;
-
+				
 				&:focus {
-					background: var(--input-focus-bg-color, #ffffff);
-					border-color: var(--input-focus-border-color, #3b82f6);
+					background: transparent;
 				}
-
+				
 				&::placeholder {
-					color: var(--placeholder-color, #9ca3af);
+					color: var(--placeholder-color, #ddd);
 					font-size: var(--placeholder-font-size, 28rpx);
 				}
 			}
-
-			// H5 端 <textarea> 被 uni-app 编译为 <uni-textarea> 自定义组件，
-			// 真实 <textarea> 是其子节点，需要 ::v-deep 穿透 scoped 才能命中
-			::v-deep textarea {
-				font-size: var(--label-font-size, 28rpx);
-				width: 100%;
-				// 行高 / 高度全部由 formConfig 动态决定（CSS 兜底公式与 JS textareaStyle 一致）
-				line-height: var(--textarea-line-height, 48rpx);
-				min-height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
-				height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
-				text-align: left;
-				border: 1rpx solid var(--input-border-color, #e5e7eb);
-				border-radius: var(--input-radius, 16rpx);
-				padding: 12rpx 24rpx;
-				background: var(--input-bg-color, #ffffff);
-				color: var(--label-color, #1f2937);
-				transition: all 0.3s ease;
-				box-sizing: border-box;
-
-				&:focus {
-					background: var(--input-focus-bg-color, #ffffff);
-					border-color: var(--input-focus-border-color, #3b82f6);
-				}
-
-				&::placeholder {
-					color: var(--placeholder-color, #9ca3af);
-					font-size: var(--placeholder-font-size, 28rpx);
-				}
-			}
-
-			// 非 H5 端（小程序 / 鸿蒙 / App）<textarea> 是直接原生元素，普通选择器即可
+			
 			textarea {
 				font-size: var(--label-font-size, 28rpx);
 				width: 100%;
-				// 行高 / 高度全部由 formConfig 动态决定（与 ::v-deep textarea 同步）
-				line-height: var(--textarea-line-height, 48rpx);
-				min-height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
-				height: calc(var(--textarea-rows, 4) * var(--textarea-line-height, 48rpx) + 26rpx);
+				min-height: 120rpx;
+				line-height: 1.5;
 				text-align: left;
-				border: 1rpx solid var(--input-border-color, #e5e7eb);
-				border-radius: var(--input-radius, 16rpx);
-				padding: 12rpx 24rpx;
-				background: var(--input-bg-color, #ffffff);
+				border: none;
+				border-radius: var(--input-radius, 10rpx);
+				padding: 0;
+				background: transparent;
 				color: var(--label-color, #1f2937);
 				transition: all 0.3s ease;
 				box-sizing: border-box;
-
+				height: auto;
+				
 				&:focus {
-					background: var(--input-focus-bg-color, #ffffff);
-					border-color: var(--input-focus-border-color, #3b82f6);
+					background: transparent;
 				}
-
+				
 				&::placeholder {
-					color: var(--placeholder-color, #9ca3af);
+					color: var(--placeholder-color, #ddd);
 					font-size: var(--placeholder-font-size, 28rpx);
 				}
 			}
@@ -1335,22 +1186,22 @@ export default {
 			.uni-input, .select-address {
 				display: inline-block;
 				padding: 0;
-				border-radius: var(--input-radius, 16rpx);
+				border-radius: var(--input-radius, 10rpx);
 				background: transparent;
 				border: none;
 				color: var(--label-color, #1f2937);
 				font-size: var(--label-font-size, 28rpx);
 				transition: all 0.3s ease;
-				min-height: var(--input-height, 84rpx);
+				min-height: var(--input-height, 60rpx);
 				box-sizing: border-box;
-				line-height: var(--input-height, 84rpx);
-
+				line-height: var(--input-height, 60rpx);
+				
 				&.color-tip {
-					color: var(--placeholder-color, #9ca3af);
+					color: var(--placeholder-color, #ddd);
 				}
-
+				
 				&.empty {
-					color: var(--placeholder-color, #9ca3af);
+					color: var(--placeholder-color, #ddd);
 				}
 			}
 			
@@ -1388,23 +1239,6 @@ export default {
 				}
 			}

-			// 选项排列样式：vertical = 每个选项独立一行；wrap = 横向自动换行
-			// option-layout-* 是 .box 自身的类，必须用 & 嵌套，否则编译成 .box .option-layout-* 选不中实际 DOM
-			&.option-layout-vertical {
-				checkbox-group,
-				radio-group {
-					flex-direction: column;
-					align-items: flex-start;
-					width: 100%;
-
-					label {
-						width: 100%;
-						justify-content: flex-start;
-						padding: 12rpx 0;
-					}
-				}
-			}
-
 			label {
 				display: inline-flex;
 				align-items: center;
@@ -1430,14 +1264,7 @@ export default {
 			.radio-box {
 				display: inline-flex;
 				align-items: center;
-				gap: 12rpx;
-			}
-
-			.check-icon,
-			.radio-icon {
-				font-size: 40rpx;
-				line-height: 1;
-				color: #d1d5db;
+				gap: 8rpx;
 			}
 			
 			&.img-boxs {
@@ -1530,7 +1357,7 @@ export default {

 <style lang="scss" scoped>
 .placeholder {
-	color: #9ca3af;
+	color: #909399;
 	font-size: 28rpx;

 	// #ifdef H5
@@ -1539,6 +1366,6 @@ export default {
 }

 .color-tip {
-	color: #9ca3af;
+	color: #909399;
 }
 </style>
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -70,11 +70,37 @@ export default {
        return {
            isIphoneX: false,
            payIndex: 0,
-            payTypeList: [],
+            // #ifdef H5
+            payTypeList: [{
+                name: this.$lang('components.nsPayment.alipay'),
+                icon: 'icon-zhifubaozhifu-',
+                type: 'alipay'
+            },
+            {
+                name: this.$lang('components.nsPayment.wechatpay'),
+                icon: 'icon-weixin1',
+                type: 'wechatpay'
+            }
+            ],
            timer: null,
+            // #endif
            // #ifdef MP-WEIXIN
+            payTypeList: [{
+                name: this.$lang('components.nsPayment.wechatpay'),
+                provider: 'wxpay',
+                icon: 'icon-weixin1',
+                type: 'wechatpay'
+            }],
            isMatched: 0, // 支付是否需要校验
            // #endif
+            // #ifdef MP-ALIPAY
+            payTypeList: [{
+                name: this.$lang('components.nsPayment.alipay'),
+                icon: 'icon-zhifubaozhifu-',
+                type: 'alipay',
+                provider: 'alipay'
+            }],
+            // #endif
            payInfo: {},
            balanceConfig: 0,
            // 预售页面判断
@@ -82,30 +108,6 @@ export default {
        };
    },
    created(e) {
-        // #ifdef H5
-        this.payTypeList = [
-            { name: this.$lang('components.nsPayment.alipay'), icon: 'icon-zhifubaozhifu-', type: 'alipay' },
-            { name: this.$lang('components.nsPayment.wechatpay'), icon: 'icon-weixin1', type: 'wechatpay' },
-        ];
-        // #endif
-        // #ifdef MP-WEIXIN
-        this.payTypeList = [
-            { name: this.$lang('components.nsPayment.wechatpay'), provider: 'wxpay', icon: 'icon-weixin1', type: 'wechatpay' },
-        ];
-        // #endif
-        // #ifdef MP-ALIPAY
-        this.payTypeList = [
-            { name: this.$lang('components.nsPayment.alipay'), icon: 'icon-zhifubaozhifu-', type: 'alipay', provider: 'alipay' },
-        ];
-        // #endif
-        // #ifdef MP-HARMONY
-        // 鸿蒙元服务的支付通道: 与微信小程序相同的 provider='wxpay',
-        // 但走鸿蒙 JSSDK 的 requestPayment(走鸿蒙支付服务而非 wx.requestPayment)
-        this.payTypeList = [
-            { name: this.$lang('components.nsPayment.wechatpay'), provider: 'wxpay', icon: 'icon-weixin1', type: 'wechatpay' },
-        ];
-        // #endif
-
        let url;
        // #ifdef H5
        url = window.location.href
--- a/components/ns-video-player-popup/ns-video-player-popup.vue
+++ b/components/ns-video-player-popup/ns-video-player-popup.vue
@@ -9,13 +9,9 @@
                <view class="video-popup-body">
                    <video 
                        v-if="videoUrl" 
-                        id="popupVideoPlayer"
                        :src="videoUrl"
                        controls 
                        autoplay 
-                        playsinline
-                        webkit-playsinline
-                        x5-playsinline
                        class="video-player"
                    ></video>
                    <view v-else class="video-error">{{ $lang('components.ns-video-player-popup.videoUrlNotExist') }}</view>
@@ -26,8 +22,6 @@
 </template>

 <script>
-import { playVideoInContext } from '@/common/js/video-helper.js';
-
 export default {
    name: 'ns-video-player-popup',
    props: {
@@ -82,10 +76,6 @@ export default {
         * @param {Object} e - 弹窗状态变化事件
         */
        onVideoPopupChange(e) {
-            // H5 端弹窗显示后触发播放：避免 autoplay 被浏览器拦截 / 弹窗动画未完成被 pause() 打断
-            if (e && e.show) {
-                playVideoInContext('popupVideoPlayer', this);
-            }
            this.$emit('popup-change', e);
        }
    }
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -95,16 +95,6 @@
                    i18nKey: 'components.payment.alipay'
                }],
                // #endif
-                // #ifdef MP-HARMONY
-                // 鸿蒙元服务的支付通道: provider='wxpay' 由鸿蒙 JSSDK 接管
-                payTypeList: [{
-                    name: '微信支付',
-                    provider: 'wxpay',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay',
-                    i18nKey: 'components.payment.wechatpay'
-                }],
-                // #endif
                payInfo: null,
                balanceConfig: 0,
                // 预售页面判断
--- a/components/privacy-popup/privacy-popup.vue
+++ b/components/privacy-popup/privacy-popup.vue
@@ -1,13 +1,4 @@
 <template>
-	<!-- #ifdef MP-HARMONY -->
-	<!--
-		鸿蒙元服务已接入平台隐私托管, 由鸿蒙系统自动弹出系统级隐私弹窗,
-		应用层不再渲染自建 privacy-popup (避免出现"多次弹出隐私弹窗"被驳回)。
-		此处保留空模板, 组件实例仍存在 (供其他平台 share 同一份代码),
-		但模板不会渲染任何内容, 鸿蒙用户看不到自建弹窗。
-	-->
-	<!-- #endif-->
-	<!-- #ifndef MP-HARMONY -->
 	<view>
 		<view class="privacy-mask" v-if="showPop">
 			<view class="privacy-wrap">
@@ -15,7 +6,7 @@
 				<view class="privacy-desc">
 					{{ i18n.descPrefix }}
 					<text class="privacy-link" @tap="openPrivacyContract">{{ i18n.privacyContractName }}</text>
-					<!-- #ifdef QUICKAPP-WEBVIEW || H5 -->
+					<!-- #ifdef QUICKAPP-WEBVIEW || H5 || MP-HARMONY -->
 					<text class="privacy-link" @tap="openPrivacyService">{{ i18n.privacyServiceName }}</text>
 					<!-- #endif -->
 					{{ i18n.descSuffix }}
@@ -26,15 +17,13 @@
 					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization"
 						@agreeprivacyauthorization="handleAgree">{{ i18n.agreeBtn }}</button>
 					<!-- #endif -->
-					<!-- #ifdef H5 -->
-					<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree">{{ i18n.agreeBtn
-						}}</button>
+					<!-- #ifdef H5 || MP-HARMONY -->
+					<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree">{{ i18n.agreeBtn }}</button>
 					<!-- #endif -->
 				</view>
 			</view>
 		</view>
 	</view>
-	<!-- #endif -->
 </template>

 <script>
@@ -59,12 +48,6 @@ export default {
 			// 平台提供的隐私协议名称(由 wx.getPrivacySetting 等异步设置)
 			// 弹窗前才参与 i18n.privacyContractName 的填充
 			platformContractName: '',
-			// 平台协议名称就绪 Promise:
-			//   created() 中发起异步查询, success/fail 时 resolve
-			//   popUp() 中 await 此 Promise 后再调 prepareI18n(), 保证 $lang() 与
-			//   platformContractName 都已经准备好, 不会出现"空串被永久缓存"的问题
-			//   (与 i18n-lazy mixin 的"boot 完成才能 prepareI18n"是同源契约)
-			platformContractNameReady: null,
 			// 弹窗文案: 模板只读 i18n.xxx
 			// 初值为空串, 弹窗前在 popUp() 中**同步**填充
 			// 此时 App.vue 已 await boot() + await PrivacyManager.show() 完成,
@@ -87,22 +70,10 @@ export default {
 	// 所以 listener 可在 created 注册, 但 callback 仍要 nextTick 渲染
 	created() {
 		try {
-			// 创建平台协议名称就绪 Promise
-			// 后续 wx/has/uni.* 三端的异步 API 都会挂到这个 promise 上 resolve,
-			// popUp() 中 await 后再 prepareI18n(), 保证 platformContractName 已就绪
-			// (与 i18n-lazy mixin 的"boot 完成才能 prepareI18n"契约同源)
-			this.platformContractNameReady = new Promise((resolve) => {
-				this._resolvePlatformContractName = resolve
-			})
-
 			// #ifdef MP-WEIXIN
 			wx.getPrivacySetting({
 				success: (res) => {
 					this.platformContractName = res.privacyContractName || ''
-					this._resolvePlatformContractName && this._resolvePlatformContractName()
-				},
-				fail: () => {
-					this._resolvePlatformContractName && this._resolvePlatformContractName()
 				}
 			})
 			// #endif
@@ -114,28 +85,13 @@ export default {
 						if (res.privacyContractName) {
 							this.platformContractName = res.privacyContractName
 						}
-						this._resolvePlatformContractName && this._resolvePlatformContractName()
-					},
-					fail: () => {
-						this._resolvePlatformContractName && this._resolvePlatformContractName()
 					},
 				})
-			} else {
-				// 无 API 时立即 resolve (避免 await 永久阻塞)
-				this._resolvePlatformContractName && this._resolvePlatformContractName()
 			}
 			// #endif

 			// #ifdef MP-HARMONY
-			// 鸿蒙元服务: 已接入平台隐私托管, 隐私协议名称由鸿蒙系统管理
-			// 应用层不再调 uni.getPrivacySetting (避免和系统托管弹窗冲突)
-			// 立即 resolve, 让 popUp 的 await 不永久阻塞
-			this._resolvePlatformContractName && this._resolvePlatformContractName()
-			// #endif
-
-			// #ifdef H5
-			// H5 无平台隐私 API, 立即 resolve
-			this._resolvePlatformContractName && this._resolvePlatformContractName()
+			// 鸿蒙元服务: 隐私授权由系统管理, 无需应用层查询 privacyContractName
 			// #endif

 			// 提前注册 listener (晚于 created 早于 mounted, 减少事件丢失窗口)
@@ -223,14 +179,14 @@ export default {
 		 * 统一弹窗 + 关闭其他页面的弹窗
 		 * 通过 uni.$emit('privacy:forceClose') 通知其他实例关闭
 		 */
-		async showPrivacyPopup() {
+		showPrivacyPopup() {
 			// 先通知其他实例关闭
-			try { uni.$emit('privacy:forceClose'); } catch (e) { }
+			try { uni.$emit('privacy:forceClose'); } catch (e) {}
 			// 直接弹窗: boot 阶段已经保证 bundle 完整
 			//  完整性校验在 lang.js _bootImpl() 中完成(检查 defaultAppNameMp 等关键 key)
 			//  不完整时 force 重试, 仍不完整则报错不静默回退
 			//  所以这里无需再检测/自愈, 信任 boot 已就绪
-			await this.popUp()
+			this.popUp()
 		},

 		/**
@@ -281,18 +237,18 @@ export default {
 			// #ifdef MP-WEIXIN
 			if (wx.onNeedPrivacyAuthorization) {
 				wx.onNeedPrivacyAuthorization((resolve) => {
-					// 关键: 微信规定 resolve({ event: 'agree' }) 必须携带 buttonId
-					// (值为页面上 open-type="agreePrivacyAuthorization" 按钮的 id),
-					// 缺 buttonId 的 agree 会被判定非法, 被拦截的隐私接口(如 getPhoneNumber)
-					// 直接报 "privacy permission is not authorized or buttonId is invalid"。
-					// 所以无论 storage 是否标记过同意, 都必须弹自定义弹窗让用户点同意按钮。
-					if (typeof this.privacyAuthorization === 'function') {
-						// 存 resolve 等用户操作, 由 handleAgree 携带 buttonId='agree-btn' 放行
-						this.privacyAuthorization(resolve)
+					// 检查是否已同意
+					if (!PrivacyManager.needShow()) {
+						// 已同意, 直接放行
+						resolve({ event: 'agree' })
 					} else {
-						// 兜底: 组件未就绪, disagree 放行避免平台 API 永久挂起
-						// (disagree 无需 buttonId, 不会产生非法 resolve)
-						resolve({ event: 'disagree' })
+						// 需要弹窗, 存 resolve 等用户操作
+						if (typeof this.privacyAuthorization === 'function') {
+							this.privacyAuthorization(resolve)
+						} else {
+							// 兜底: 组件未就绪, 直接放行避免 API 卡死
+							resolve({ event: 'agree' })
+						}
 					}
 				})
 			}
@@ -309,8 +265,7 @@ export default {
 			// #endif

 			// #ifdef MP-HARMONY
-			// 鸿蒙元服务: 已接入平台隐私托管, 系统级弹窗由鸿蒙自动弹出
-			// 不再监听 uni.onPrivacyAuthorizationChange (避免和系统托管冲突)
+			// 鸿蒙元服务: 隐私授权由系统自动管理, 无需应用层监听
 			// #endif
 		},

@@ -329,22 +284,22 @@ export default {
 		 */
 		closeOtherPagePopUp(closePopUp) {
 			// 通过全局事件通知所有页面关闭弹窗
-			try { uni.$emit('privacy:closeOthers', this._uid); } catch (e) { }
+			try { uni.$emit('privacy:closeOthers', this._uid); } catch (e) {}
 		},

 		openPrivacyContract() {
 			// #ifdef MP-WEIXIN
 			wx.openPrivacyContract({
-				success(res) { },
-				fail(err) { }
+				success(res) {},
+				fail(err) {}
 			});
 			// #endif

 			// #ifdef QUICKAPP-WEBVIEW
 			if (typeof has != 'undefined' && has?.openPrivacySetting) {
 				has.openPrivacySetting({
-					success: (res) => { },
-					fail: (err) => { }
+					success: (res) => {},
+					fail: (err) => {}
 				});
 			} else {
 				this.$util.redirectTo(privacyContractPage);
@@ -352,8 +307,8 @@ export default {
 			// #endif

 			// #ifdef MP-HARMONY
-			// 鸿蒙元服务: 走平台隐私托管, 协议查看由鸿蒙系统接管
-			// (隐私弹窗本身不再在鸿蒙上弹出, 这里也基本不会被触发)
+			// 鸿蒙元服务: 使用应用内协议页面
+			this.$util.redirectTo(privacyContractPage);
 			// #endif

 			// #ifdef H5
@@ -365,8 +320,8 @@ export default {
 			// #ifdef QUICKAPP-WEBVIEW
 			if (typeof has != 'undefined' && has?.openPrivacySetting) {
 				has.openPrivacySetting({
-					success: (res) => { },
-					fail: (err) => { }
+					success: (res) => {},
+					fail: (err) => {}
 				});
 			} else {
 				this.$util.redirectTo(privacyServicePage);
@@ -374,7 +329,7 @@ export default {
 			// #endif

 			// #ifdef MP-HARMONY
-			// 鸿蒙元服务: 走平台隐私托管, 协议查看由鸿蒙系统接管
+			this.$util.redirectTo(privacyServicePage);
 			// #endif

 			// #ifdef H5
@@ -389,7 +344,7 @@ export default {
 			this.privacyResolves.clear()

 			// 先通知其他实例关闭, 再关闭自己, 避免叠层
-			try { uni.$emit('privacy:forceClose'); } catch (e) { }
+			try { uni.$emit('privacy:forceClose'); } catch (e) {}
 			this.disPopUp()

 			// 修复: 拒绝时不写 privacyAgreed, 允许下次再弹
@@ -414,7 +369,7 @@ export default {
 			this.privacyResolves.clear()

 			// 先通知其他实例关闭, 再关闭自己
-			try { uni.$emit('privacy:forceClose'); } catch (e) { }
+			try { uni.$emit('privacy:forceClose'); } catch (e) {}
 			this.disPopUp()

 			// 由 PrivacyManager 管理 storage
@@ -435,9 +390,9 @@ export default {
 		 */
 		i18nPrepareFn() {
 			let appName, privacyContractName, privacyServiceName;
-
+			
 			// 关键: appName 必须先解析为字符串, 才能作为 descPrefix/descSuffix 的参数
-			// #ifdef H5
+			// #ifdef H5 || MP-HARMONY
 			appName = this.$lang('components.privacyPopup.defaultAppNameH5');
 			privacyContractName = this.platformContractName || this.$lang('components.privacyPopup.defaultContractNameH5');
 			privacyServiceName = this.$lang('components.privacyPopup.defaultServiceNameH5');
@@ -461,33 +416,20 @@ export default {
 			return result;
 		},

-		async popUp() {
+		popUp() {
 			// 弹窗前**一次性**计算所有 i18n 文案
-			// 必须先等两类数据准备好:
-			//   1) Lang.boot() 完成 — 由 i18n-lazy mixin 隐含保证
-			//      (调用方 App.vue 在 await PrivacyManager.show() 后才触发弹窗,
-			//       PrivacyManager.show() await 了 boot 守卫)
-			//   2) platformContractName 就绪 — 微信/快应用/鸿蒙三端的 API 都是异步的,
-			//      success 回调时机不确定, 直接 prepareI18n() 会读到空字符串, 导致
-			//      "空串被永久缓存" (与 i18n-lazy mixin 警告的问题同源)
-			// 因此这里 await platformContractNameReady, 然后再 prepareI18n。
-			if (this.platformContractNameReady) {
-				try {
-					await this.platformContractNameReady
-				} catch (e) {
-					// 防御性: 即便 ready 出错也继续 (走 fallback 默认文案)
-				}
-			}
+			// boot 阶段已用 isBundleComplete() 保证 bundle 完整
+			// $lang() 返回真实翻译(效果与 H5 一致)
 			this.prepareI18n();
 			this.showPop = true;
 			// 通知 PrivacyManager 弹窗实际显示状态 (用于 rules-updated 双阶段重评估)
-			try { uni.$emit && uni.$emit('privacy:popup-state', { showing: true }) } catch (e) { }
+			try { uni.$emit && uni.$emit('privacy:popup-state', { showing: true }) } catch (e) {}
 		},

 		disPopUp() {
 			this.showPop = false;
 			// 通知 PrivacyManager 弹窗实际显示状态 (用于 rules-updated 双阶段重评估)
-			try { uni.$emit && uni.$emit('privacy:popup-state', { showing: false }) } catch (e) { }
+			try { uni.$emit && uni.$emit('privacy:popup-state', { showing: false }) } catch (e) {}
 		},
 	},
 	beforeDestroy() {
@@ -496,11 +438,6 @@ export default {
 		uni.$off('privacy:show', this.handlePrivacyShow)
 		uni.$off('privacy:forceClose', this.handleForceClose)
 		uni.$off('privacy:re-evaluate', this.handleReEvaluate)
-		// 销毁时强制 resolve, 避免 popUp() 中的 await 永久挂起 (例如用户提前离开页面)
-		if (typeof this._resolvePlatformContractName === 'function') {
-			this._resolvePlatformContractName()
-			this._resolvePlatformContractName = null
-		}
 	},
 }
 </script>
@@ -554,7 +491,7 @@ export default {
 .privacy-button-btn {
 	color: #FFF;
 	font-size: 30rpx;
-	/* #ifdef QUICKAPP-WEBVIEW || H5 */
+	/* #ifdef QUICKAPP-WEBVIEW || H5 || MP-HARMONY */
 	font-size: 28rpx;
 	/* #endif */
 	font-weight: 500;
--- a/lang-bundle.json
+++ b/lang-bundle.json
--- a/lang/en-us/ai-chat/index.js
+++ b/lang/en-us/ai-chat/index.js
@@ -136,8 +136,4 @@ export const lang = {
 	logInitNavbarFailed: 'Failed to initialize navigation bar',
 	logChatComponentNotInit: 'Chat component not initialized',
 	logServicerConfigNotLoaded: '[AI Customer Service] servicerConfig not loaded, retrying after 200ms...'
-
-	// ====== AI Agent general copy (customer service is the first agent) ======
-	aiAgentDefaultTitle: 'AI Agent',
-	aiAgentOpenFailed: 'Failed to open AI Agent, please try again later',
-	aiAgentNotConfigured: 'This AI Agent is not enabled'}
+}
--- a/lang/en-us/common.js
+++ b/lang/en-us/common.js
@@ -2,10 +2,10 @@ export const lang = {

 	// 底部选项卡
 	tabBar: {
-		home: 'Home',
-		category: 'Category',
-		cart: 'Cart',
-		member: 'Me',
+		home: 'index',
+		category: 'category',
+		cart: 'cart',
+		member: 'member',
 	},

 	//公共
@@ -57,7 +57,6 @@ export const lang = {
 	// diy custom page (diy-specific copy, generic HTTP errors reuse http.*)
 	diy: {
 		networkErrorTitle: 'Notice',
-		networkError: 'Network error, please try again later',
 		retry: 'Retry',
 		noDiyData: 'Custom page data not configured',
 		locationNotAvailable: 'Location not available',
@@ -112,7 +111,6 @@ export const lang = {
 		notSupported: 'Current environment does not support WeChat Channel',
 		missingFields: 'Missing required field: {field}',
 		playFailed: 'WeChat video playback failed!',
-		wechatMpOnly: 'WeChat Channel only plays in WeChat Mini Program',
 	},

 	// uniapp utility functions
@@ -258,14 +256,7 @@ export const lang = {
 	addToCartFailMin: 'Minimum purchase quantity not met',
 	addToCartFailStock: 'Insufficient Stock',

-	// generic submit/version/loading text (key lives in root because common.js's lang object IS the common namespace)
-	submitSuccess: 'Submit Success',
-	submitFail: 'Submit Failed',
-	versionInfo: 'Version Info',
-	commitId: 'Commit ID',
-	buildTime: 'Build Time',
-	loading: 'Loading...',
-
+	// 咨询
 	consult: 'Consult Now',
 	consultSuccess: 'Consultation Successful',
 	consultFail: 'Consultation Failed',
--- a/lang/en-us/components-diy/diy-recommend.js
+++ b/lang/en-us/components-diy/diy-recommend.js
@@ -0,0 +1,38 @@
+/**
+ * 推荐系统 diy 组件 6 个组件共用 i18n 文案 (English)
+ * 同 zh-cn 一致,文案翻译为英文
+ */
+export const lang = {
+    'diy-recommend-code': {
+        myCode: 'My Referral Code',
+        copy: 'Copy',
+        copySuccess: 'Copied',
+        shareTip: 'Copy the link and share it with enterprises to bind',
+    },
+    'diy-recommend-balance': {
+        available: 'Withdrawable',
+        frozen: 'Frozen',
+        probationDays: '{days} days remaining',
+        passedProbation: 'Probation passed',
+        totalEarned: 'Total earned',
+    },
+    'diy-recommend-stat': {
+        totalRecommend: 'Referred',
+        totalEntered: 'Entered',
+        totalEarned: 'Earned',
+    },
+    'diy-recommend-records': {
+        recent: 'Recent Referrals',
+        viewAll: 'View all',
+        empty: 'No referrals yet',
+    },
+    'diy-recommend-rules': {
+        title: 'Reward Rules',
+    },
+    'diy-recommend-action': {
+        withdrawNow: 'Withdraw Now',
+        withdrawList: 'Records',
+        applyEnterprise: 'Apply',
+    },
+    loadFail: 'Failed to load, please retry',
+};
--- a/lang/en-us/components/ns-login.js
+++ b/lang/en-us/components/ns-login.js
@@ -45,7 +45,6 @@ export const lang = {
 		loggingIn: 'Logging in',
 		loginFailed: 'Login failed',
 		pleaseAuthorizeMobile: 'Please authorize your mobile number',
-		pleaseAgreePrivacy: 'Please agree to the Privacy Policy and retry',
 		pleaseEnterNickname: 'Please enter nickname',
 		avatarPullFailed: 'Avatar pull failed',
 	}
--- a/lang/en-us/form/form.js
+++ b/lang/en-us/form/form.js
@@ -7,18 +7,5 @@ export const lang = {
 	submitSuccess: 'Submitted successfully',
 	// Form information not available
 	noFormInfo: 'Form information not available',
-	// Behavior settings
-	// Captcha input placeholder
-	captchaPlaceholder: 'Please enter the captcha',
-	// Captcha required
-	captchaRequired: 'Please enter the captcha',
-	// Captcha error
-	captchaError: 'Incorrect captcha, please try again',
-	// Submit limit reached
-	submitLimit: 'Submission limit reached',
-	// Form not open
-	notOpen: 'The form is not open yet',
-	// Login required
-	loginRequired: 'Please log in first',

 }
--- a/lang/en-us/pay/index.js
+++ b/lang/en-us/pay/index.js
@@ -3,6 +3,5 @@ export const lang = {
 	title: 'Payment Method',
 	paymentAmount: 'Payment Amount',
 	confirmPayment: 'Confirm Payment',
-	seeOrder: 'View Order',
-	payInfoNotFound: 'Payment info not found!'
+	seeOrder: 'View Order'
 }
--- a/lang/zh-cn/ai-chat/index.js
+++ b/lang/zh-cn/ai-chat/index.js
@@ -1,6 +1,6 @@
 export const lang = {
 	//title为每个页面的标题
-	title: 'AI智能',
+	title: 'AI智能客服',

 	// ====== 通用 ======
 	cancel: '取消',
@@ -136,8 +136,4 @@ export const lang = {
 	logInitNavbarFailed: '初始化导航栏失败',
 	logChatComponentNotInit: '聊天组件未初始化',
 	logServicerConfigNotLoaded: '【AI客服】servicerConfig 未加载，200ms后重试...'
-
-	// ====== AI Agent 通用文案(智能客服是首个 agent) ======
-	aiAgentDefaultTitle: 'AI 智能体',
-	aiAgentOpenFailed: '打开 AI 智能体失败,请稍后再试',
-	aiAgentNotConfigured: '该 AI 智能体暂未启用'}
+}
--- a/lang/zh-cn/common.js
+++ b/lang/zh-cn/common.js
@@ -64,7 +64,6 @@ export const lang = {
 	// diy 自定义页面(diy 专属文案,通用网络/接口错误复用 http.*)
 	diy: {
 		networkErrorTitle: '提示',
-		networkError: '网络异常，请稍后重试',
 		retry: '重试',
 		noDiyData: '未配置自定义页面数据',
 		locationNotAvailable: '未获取到定位',
@@ -112,7 +111,6 @@ export const lang = {
 		notSupported: '当前环境不支持微信视频号',
 		missingFields: '缺少必要字段: {field}',
 		playFailed: '微信视频播放失败!',
-		wechatMpOnly: '视频号仅支持在微信小程序环境中播放',
 	},

 	// uniapp 工具函数
@@ -256,14 +254,6 @@ export const lang = {
 	addToCartFailMin: '已达到最小购买数量',
 	addToCartFailStock: '库存不足',

-	// 通用提交/版本/loading 文案(原本该走 common.* 命名空间,因 common.js 整体即 common namespace,放在 root)
-	submitSuccess: '提交成功',
-	submitFail: '提交失败',
-	versionInfo: '版本信息',
-	commitId: '提交 ID',
-	buildTime: '构建时间',
-	loading: '加载中...',
-
 	consult: '立即咨询',
 	consultSuccess: '咨询成功',
 	consultFail: '咨询失败',
--- a/lang/zh-cn/components-diy/diy-recommend.js
+++ b/lang/zh-cn/components-diy/diy-recommend.js
@@ -0,0 +1,52 @@
+/**
+ * 推荐系统 diy 组件 6 个组件共用 i18n 文案
+ * 加载路径: pages-tool 中 $lang('components-diy.diy-recommend-code.xxx')
+ * 模块前缀已经写好,这里只导出组件名下的 key
+ */
+export const lang = {
+    // ---- diy-recommend-code ----
+    'diy-recommend-code': {
+        myCode: '我的推荐码',
+        copy: '复制',
+        copySuccess: '已复制',
+        shareTip: '复制推荐链接分享给企业,对方填表时填入即可绑定',
+    },
+
+    // ---- diy-recommend-balance ----
+    'diy-recommend-balance': {
+        available: '可提现余额',
+        frozen: '待结算(冻结中)',
+        probationDays: '考察期 {days} 天',
+        passedProbation: '已过考察期',
+        totalEarned: '累计总收益',
+    },
+
+    // ---- diy-recommend-stat ----
+    'diy-recommend-stat': {
+        totalRecommend: '累计推荐',
+        totalEntered: '已入驻',
+        totalEarned: '累计收益',
+    },
+
+    // ---- diy-recommend-records ----
+    'diy-recommend-records': {
+        recent: '最近推荐',
+        viewAll: '查看全部',
+        empty: '暂无推荐记录',
+    },
+
+    // ---- diy-recommend-rules ----
+    'diy-recommend-rules': {
+        title: '奖励规则',
+    },
+
+    // ---- diy-recommend-action ----
+    'diy-recommend-action': {
+        withdrawNow: '立即提现',
+        withdrawList: '提现记录',
+        applyEnterprise: '入驻申请',
+    },
+
+    // ---- 通用 ----
+    loadFail: '加载失败,请稍后重试',
+};
--- a/lang/zh-cn/components/ns-login.js
+++ b/lang/zh-cn/components/ns-login.js
@@ -45,7 +45,6 @@ export const lang = {
 		loggingIn: '登录中',
 		loginFailed: '登录失败',
 		pleaseAuthorizeMobile: '请授权您的手机号码',
-		pleaseAgreePrivacy: '请先同意《隐私条款》后重试',
 		pleaseEnterNickname: '请输入昵称',
 		avatarPullFailed: '头像拉取失败',
 	}
--- a/lang/zh-cn/form/form.js
+++ b/lang/zh-cn/form/form.js
@@ -6,17 +6,4 @@ export const lang = {
 	submitSuccess: '提交成功',
 	// 未获取到表单信息
 	noFormInfo: '未获取到表单信息',
-	// 行为设置相关
-	// 请输入验证码
-	captchaPlaceholder: '请输入验证码',
-	// 请输入验证码（校验提示）
-	captchaRequired: '请输入验证码',
-	// 验证码错误
-	captchaError: '验证码错误，请重试',
-	// 提交次数已达上限
-	submitLimit: '提交次数已达上限',
-	// 表单未开放
-	notOpen: '表单未开放',
-	// 请先登录
-	loginRequired: '请先登录',
 }
--- a/lang/zh-cn/pay/index.js
+++ b/lang/zh-cn/pay/index.js
@@ -3,6 +3,5 @@ export const lang = {
 	title: '支付方式',
 	paymentAmount: '支付金额',
 	confirmPayment: '确认支付',
-	seeOrder: '查看订单',
-	payInfoNotFound: '未获取到支付信息！'
+	seeOrder: '查看订单'
 }
--- a/main.js
+++ b/main.js
@@ -80,18 +80,10 @@ Vue.mixin(MpShareDefault);
 // lang.js 在翻译覆写更新时 commit('setComponentRefresh'),
 // golbalConfig.js 已把 componentRefresh 注册为全局 computed,
 // 在此 watch 它并 $forceUpdate,触发所有页面内 {{$lang('xxx')}} 重新求值
-// 同时调用 lang.refresh() 让当前页面的 navigationBarTitleText 跟随语种变化
-// (pages.json 里的硬编码中文标题需要被 $lang('title') 覆盖)
 Vue.mixin({
 	watch: {
 		componentRefresh() {
 			this.$forceUpdate();
-			try {
-				if (this.$langConfig && typeof this.$langConfig.refresh === 'function') {
-					// emit=false: lang.js 已 emit 过,这里避免重复 store.commit
-					this.$langConfig.refresh(false);
-				}
-			} catch (e) { /* 容错:refresh 失败不影响主流程 */ }
 		}
 	}
 });
--- a/manifest.json
+++ b/manifest.json
@@ -136,23 +136,7 @@
    "sassImplementationName" : "dart-sass",
    "mp-harmony" : {
        "distribute" : {
-            "bundleName" : "com.atomicservice.6917607804641099460"
-        },
-        // 隐私托管: 元服务必须使用 AGC 后台的标准化隐私声明托管服务,
-        // 弹窗由鸿蒙系统自动弹出, 应用层不能自建.
-        // 下方的 privacy 块仅作为应用内协议页兜底 (例如用户在系统设置里手动查看协议),
-        // 不参与首次启动弹窗逻辑.
-        "privacy" : {
-            "privacyContractUrl" : "YOUR_DOMAIN/api/agreementview/privacy?uniacid=YOUR_UNIACID",
-            "serviceContractUrl" : "YOUR_DOMAIN/api/agreementview/service?uniacid=YOUR_UNIACID",
-            "privacyContractName" : {
-                "zh" : "隐私政策",
-                "en" : "Privacy Policy"
-            },
-            "serviceContractName" : {
-                "zh" : "用户服务协议",
-                "en" : "User Service Agreement"
-            }
+            "bundleName" : "com.atomicservice.6917577984608507983"
        }
    }
 }
--- a/package.json
+++ b/package.json
@@ -1,92 +1,72 @@
-{
-    "scripts": {
-        "mp-weixin": "node scripts/mp-weixin.patch.js",
-        "i18n:check": "node scripts/i18n-check.js",
-        "test": "node scripts/test-gate.js",
-        "test:util": "node --test tests/util.test.js",
-        "prebuild": "npm run test",
-        "prestart": "npm run test"
-    },
-    "devDependencies": {
-        "dart-sass": "^1.25.0",
-        "terser-webpack-plugin": "^5.3.10",
-        "zion-uniapp-mp-load-package": "^1.0.13"
-    },
-    "dependencies": {
-        "jweixin-module": "^1.6.0"
-    },
-    "uni-app": {
-        "scripts": {
-            "weixin": {
-                "title": "微信小程序自定义发行",
-                "env": {
-                    "UNI_PLATFORM": "mp-weixin"
-                },
-                "define": {
-                    "MP_WEIXIN": true,
-                    "PRODUCTION": true
-                }
-            },
-            "h5-xcx20.5g-quickapp.com": {
-                "title": "H5-xcx20.5g-quickapp.com",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "https://xcx20.5g-quickapp.com/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            },
-            "h5-xcx.aigc-quickapp.com": {
-                "title": "H5-xcx.aigc-quickapp.com",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "https://xcx.aigc-quickapp.com/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            },
-            "h5-5g.aigc-quickapp.com": {
-                "title": "H5-5g.aigc-quickapp.com",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "https://5g.aigc-quickapp.com/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            },
-            "h5-test.aigc-quickapp.com": {
-                "title": "H5-test.aigc-quickapp.com",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "https://test.aigc-quickapp.com/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            },
-            "http://localhost:8050/": {
-                "title": "H5-localhost:8050",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "http://localhost:8050/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            },
-            "http://192.168.8.118:8050/": {
-                "title": "H5-192.168.8.118:8050",
-                "env": {
-                    "UNI_PLATFORM": "h5",
-                    "UNI_APP_DOMAIN": "http://192.168.8.118:8050/"
-                },
-                "define": {
-                    "PRODUCTION": true
-                }
-            }
-        }
-    }
-}
+{
+  "scripts": {
+    "mp-weixin": "node scripts/mp-weixin.patch.js",
+    "i18n:check": "node scripts/i18n-check.js",
+    "test": "node scripts/test-gate.js",
+    "test:util": "node --test tests/util.test.js",
+    "prebuild": "npm run test",
+    "prestart": "npm run test"
+  },
+  "devDependencies": {
+    "dart-sass": "^1.25.0",
+    "terser-webpack-plugin": "^5.3.10",
+    "zion-uniapp-mp-load-package": "^1.0.13"
+  },
+  "dependencies": {
+    "jweixin-module": "^1.6.0"
+  },
+  "uni-app": {
+    "scripts": {
+      "weixin": {
+        "title": "微信小程序自定义发行",
+        "env": {
+          "UNI_PLATFORM": "mp-weixin"
+        },
+        "define": {
+          "MP_WEIXIN": true,
+          "PRODUCTION": true
+        }
+      },
+      "h5-xcx20.5g-quickapp.com": {
+        "title": "H5-xcx20.5g-quickapp.com",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "UNI_APP_DOMAIN": "https://xcx20.5g-quickapp.com/"
+        },
+        "define": {
+          "PRODUCTION": true
+        }
+      },
+      "h5-xcx.aigc-quickapp.com": {
+        "title": "H5-xcx.aigc-quickapp.com",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "UNI_APP_DOMAIN": "https://xcx.aigc-quickapp.com/"
+        },
+        "define": {
+          "PRODUCTION": true
+        }
+      },
+      "h5-5g.aigc-quickapp.com": {
+        "title": "H5-5g.aigc-quickapp.com",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "UNI_APP_DOMAIN": "https://5g.aigc-quickapp.com/"
+        },
+        "define": {
+          "PRODUCTION": true
+        }
+      },
+      "h5-test.aigc-quickapp.com": {
+        "title": "H5-test.aigc-quickapp.com",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "UNI_APP_DOMAIN": "https://test.aigc-quickapp.com/"
+        },
+        "define": {
+          "PRODUCTION": true
+        }
+      }
+    }
+  }
+}
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,6 @@
 					"diy-pintuan": "view",
 					"diy-presale": "view",
 					"diy-quick-nav": "view",
-					"diy-recommend-code": "view",
 					"diy-rich-text": "view",
 					"diy-rubik-cube": "view",
 					"diy-search": "view",
@@ -1086,64 +1085,7 @@
 				{
 					"path": "ai-chat/index",
 					"style": {
-						"navigationBarTitleText": "AI智能客服",
-						"componentPlaceholder": {
-							"diy-article": "view",
-							"diy-audio": "view",
-							"diy-bargain": "view",
-							"diy-bottom-nav": "view",
-							"diy-category": "view",
-							"diy-category-item": "view",
-							"diy-channel-list": "view",
-							"diy-channel-video": "view",
-							"diy-comp-extend": "view",
-							"diy-coupon": "view",
-							"diy-digit": "view",
-							"diy-fenxiao-goods-list": "view",
-							"diy-float-btn": "view",
-							"diy-follow-official-account": "view",
-							"diy-form": "view",
-							"diy-goods-brand": "view",
-							"diy-goods-list": "view",
-							"diy-goods-recommend": "view",
-							"diy-graphic-nav": "view",
-							"diy-group": "view",
-							"diy-groupbuy": "view",
-							"diy-horz-blank": "view",
-							"diy-horz-line": "view",
-							"diy-hot-area": "view",
-							"diy-icon": "view",
-							"diy-image-nav": "view",
-							"diy-img-ads": "view",
-							"diy-index-page": "view",
-							"diy-kefu": "view",
-							"diy-listmenu": "view",
-							"diy-live": "view",
-							"diy-many-goods-list": "view",
-							"diy-map": "view",
-							"diy-member-info": "view",
-							"diy-member-my-order": "view",
-							"diy-merch-list": "view",
-							"diy-notes": "view",
-							"diy-notice": "view",
-							"diy-payment-qrcode": "view",
-							"diy-picture": "view",
-							"diy-pinfan": "view",
-							"diy-pintuan": "view",
-							"diy-presale": "view",
-							"diy-quick-nav": "view",
-							"diy-recommend-code": "view",
-							"diy-rich-text": "view",
-							"diy-rubik-cube": "view",
-							"diy-search": "view",
-							"diy-seckill": "view",
-							"diy-store": "view",
-							"diy-store-label": "view",
-							"diy-tab": "view",
-							"diy-text": "view",
-							"diy-video": "view",
-							"diy-video-list": "view"
-						}
+						"navigationBarTitleText": "AI智能客服"
 					}
 				},
 				{
@@ -1155,10 +1097,7 @@
 				{
 					"path": "vr/index",
 					"style": {
-						// #ifdef APP-PLUS
-						"navigationStyle": "custom",
-						// #endif									
-						"navigationBarTitleText": "工厂展示"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1352,7 +1291,6 @@
 							"diy-pintuan": "view",
 							"diy-presale": "view",
 							"diy-quick-nav": "view",
-							"diy-recommend-code": "view",
 							"diy-rich-text": "view",
 							"diy-rubik-cube": "view",
 							"diy-search": "view",
@@ -2209,9 +2147,7 @@
 				{
 					"path": "form/formdata",
 					"style": {
-						// APP 端原本就是 custom；微信小程序 / 华为快应用 / 鸿蒙元服务
-						// 的原生 navbar 不支持自定义左侧 Home 按钮，需要切到 custom 自绘
-						// #ifdef APP-PLUS || MP
+						// #ifdef APP-PLUS
 						"navigationStyle": "custom",
 						// #endif
 						"navigationBarTitleText": "",
@@ -2445,8 +2381,7 @@
 				{
 					"path": "file-preview/file-preview",
 					"style": {
-						"navigationBarTitleText": "文件预览",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "文件预览"
 					}
 				}
 			]
@@ -2487,7 +2422,8 @@
 			"uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue",
 			"mescroll-uni": "@/components/mescroll/my-list-mescroll.vue",
 			"ns-goods-sku-*(\\W.*)": "@/components/ns-goods-sku/ns-goods-sku$1.vue",
-			"diy-*(\\W.*)": "@/components-diy/diy$1.vue"
+			"diy-*(\\W.*)": "@/components-diy/diy$1.vue",
+			"diy-recommend-*": "@/components-diy/diy-recommend-$1.vue"
 		}
 	},
 	"preloadRule": {
--- a/pages/index/public/js/index.js
+++ b/pages/index/public/js/index.js
@@ -55,7 +55,7 @@ export default {
 	onShow() {
 		// 获取关注公众号二维码
 		this.getFollowQrcode();
-
+		
 		// 重新获取店铺信息
 		this.shopInfo = uni.getStorageSync('shopInfo');
 	},
@@ -160,10 +160,10 @@ export default {
 			} catch (e) {}
 			if (v && v.commitId) {
 				uni.showModal({
-				title: this.$lang('versionInfo'),
-				content: `${this.$lang('commitId')}: ${v.commitId}\n${this.$lang('buildTime')}: ${v.buildTime}\n${Config.baseUrl}`,
-				showCancel: false
-			});
+					title: '版本信息',
+					content: `提交 ID: ${v.commitId}\n构建时间: ${v.buildTime}\n${Config.baseUrl}`,
+					showCancel: false
+				});
 			} else {
 				console.error('未获取到构建版本信息');
 			}
--- a/pages_goods/_components/goods-detail-view/goods-detail-view.vue
+++ b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
@@ -1,31 +1,9 @@
 <template>
    <view>
-        <!-- 骨架屏：商品详情加载时按结构分段占位（banner / 价格 / 标题 / 规格 / 商家 / 详情 / 推荐）
-             关闭条件: loading=false 且已拿到真实商品数据(goods_id>0); 任一不满足都保留骨架屏 -->
-        <view v-if="loading || !hasRealData" class="goods-detail-skeleton">
-            <x-skeleton data-component-name="goods-detail-view-banner" :loading="true" :configs="skeletonBanner"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-price" :loading="true" :configs="skeletonPrice"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-title" :loading="true" :configs="skeletonTitle"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-sku" :loading="true" :configs="skeletonSku"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-merch" :loading="true" :configs="skeletonMerch"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-detail" :loading="true" :configs="skeletonDetail"></x-skeleton>
-            <x-skeleton data-component-name="goods-detail-view-recommend" :loading="true" :configs="skeletonRecommend"></x-skeleton>
-            <!-- 底部 action 骨架占位：与 ns-goods-action 同样 fixed bottom, 避免数据未到时底部跳变 -->
-            <view class="goods-detail-skeleton-action">
-                <view class="skeleton-action-icons">
-                    <view class="skeleton-action-icon" v-for="i in 2" :key="'sk-act-icon-' + i"></view>
-                </view>
-                <view class="skeleton-action-btn"></view>
-                <view class="skeleton-action-btn primary"></view>
-            </view>
-        </view>
        <!-- 修复鸿蒙元服务: 移除无效的 scroll-y="true" 属性 (scroll-y 是 <scroll-view> 的指令属性)
             鸿蒙 JSVM 早期版本遇到无效 attribute 会让 view 子树静默不渲染, 导致整个详情页空白 -->
-        <view v-else class="goods-detail-wrap">
-            <!-- 操作区域 slot: 与 .goods-detail 同一 v-else 分支, 避免骨架屏状态下被父组件渲染真实按钮(基于默认 goods_state=0 显示"该商品已下架") -->
-            <slot name="action"></slot>
-            <view class="goods-detail" :class="isIphoneX ? 'active' : ''">
-                <view class="goods-container">
+        <view class="goods-detail" :class="isIphoneX ? 'active' : ''">
+            <view class="goods-container">
                <!-- AI客服悬浮按钮 -->
                <view class="ai-chat-float-btn" @tap.stop="$emit('aiChatClick')" v-if="showAIChatBtn">
                    <image :src="aiAvatarUrl" mode="aspectFill" class="ai-avatar-icon" />
@@ -56,11 +34,10 @@
                        </view>
                    </view>

-                    <!-- 商品视频：objectFit=contain 保留原始宽高比，在固定高度的图片容器内居中播放 -->
+                    <!-- 商品视频 -->
                    <view class="goods-video" :class="{ show: switchMedia == 'video' }">
                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
-                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="contain"
-                            playsinline webkit-playsinline x5-playsinline></video>
+                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
                    </view>

                    <!-- 切换视频、图片 -->
@@ -484,7 +461,7 @@
                                        <text>{{ $lang('goods.detail.detailView.generateSharePoster') }}</text>
                                    </button>
                                </view>
-                                <!-- #ifdef H5 || MP-HARMONY -->
+                                <!-- #ifdef H5 -->
                                <view class="share-box" @click="copyUrl">
                                    <button class="share-btn" :plain="true">
                                        <view class="iconfont icon-fuzhilianjie"></view>
@@ -499,10 +476,11 @@
                </view>

                <slot name="fixedbtn"></slot>
-                </view>
            </view>
        </view>

+        <!-- 操作区域 -->
+        <slot name="action"></slot>
        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
        <ns-login ref="login"></ns-login>
    </view>
@@ -525,142 +503,11 @@ export default {
            default: () => {
                return {};
            }
-        },
-        // 是否显示骨架屏（true：展示骨架；false：展示真实内容）
-        loading: {
-            type: Boolean,
-            default: true
        }
    },
    components: {
        pengpaiFadeinOut
    },
-    data() {
-        // 商品详情骨架屏：模拟「轮播图 + 价格行 + 标题简介 + 规格行 + 商家 + 详情 + 推荐」
-        return {
-            // 1. 轮播图：方形 banner 占位
-            skeletonBanner: {
-                padding: '0',
-                gridRows: 1,
-                gridColumns: 1,
-                gridRowsGap: '24rpx',
-                headShow: true,
-                headWidth: '100%',
-                headHeight: '750rpx',
-                headBorderRadius: '0',
-                textShow: false
-            },
-            // 2. 价格行：一行价 + 一行原价
-            skeletonPrice: {
-                padding: '24rpx 24rpx 16rpx',
-                gridRows: 2,
-                gridColumns: 1,
-                gridRowsGap: '16rpx',
-                itemDirection: 'column',
-                itemAlign: 'flex-start',
-                headShow: false,
-                textShow: true,
-                textRows: 1,
-                textRowsGap: '0',
-                textWidth: ['40%', '30%'],
-                textHeight: ['48rpx', '24rpx'],
-                textBorderRadius: '6rpx'
-            },
-            // 3. 标题/简介：标题两行 + 简介 + 标签
-            skeletonTitle: {
-                padding: '8rpx 24rpx 24rpx',
-                gridRows: 1,
-                gridColumns: 1,
-                gridRowsGap: '20rpx',
-                itemDirection: 'column',
-                itemAlign: 'flex-start',
-                headShow: false,
-                textShow: true,
-                textRows: 4,
-                textRowsGap: '16rpx',
-                textWidth: ['90%', '60%', '100%', '40%'],
-                textHeight: ['40rpx', '40rpx', '24rpx', '24rpx'],
-                textBorderRadius: '6rpx'
-            },
-            // 4. 规格行：单行高度的小条
-            skeletonSku: {
-                padding: '20rpx 24rpx',
-                gridRows: 1,
-                gridColumns: 1,
-                gridRowsGap: '0',
-                itemDirection: 'row',
-                itemAlign: 'center',
-                headShow: true,
-                headWidth: '120rpx',
-                headHeight: '32rpx',
-                headBorderRadius: '6rpx',
-                textShow: true,
-                textRows: 1,
-                textRowsGap: '0',
-                textWidth: '60%',
-                textHeight: '28rpx',
-                textBorderRadius: '6rpx',
-                itemGap: '20rpx'
-            },
-            // 5. 商家：头像 + 名称
-            skeletonMerch: {
-                padding: '24rpx',
-                gridRows: 1,
-                gridColumns: 1,
-                gridRowsGap: '0',
-                itemDirection: 'row',
-                itemAlign: 'center',
-                headShow: true,
-                headWidth: '80rpx',
-                headHeight: '80rpx',
-                headBorderRadius: '50%',
-                textShow: true,
-                textRows: 2,
-                textRowsGap: '12rpx',
-                textWidth: ['50%', '80%'],
-                textHeight: ['28rpx', '20rpx'],
-                textBorderRadius: '6rpx',
-                itemGap: '24rpx'
-            },
-            // 6. 商品详情：多行段落
-            skeletonDetail: {
-                padding: '24rpx',
-                gridRows: 1,
-                gridColumns: 1,
-                gridRowsGap: '0',
-                itemDirection: 'column',
-                itemAlign: 'flex-start',
-                headShow: false,
-                textShow: true,
-                textRows: 6,
-                textRowsGap: '16rpx',
-                textWidth: ['100%', '100%', '90%', '100%', '80%', '60%'],
-                textHeight: '24rpx',
-                textBorderRadius: '6rpx'
-            },
-            // 7. 推荐：两列卡片缩略图
-            skeletonRecommend: {
-                padding: '24rpx',
-                gridRows: 1,
-                gridColumns: 2,
-                gridRowsGap: '24rpx',
-                gridColumnsGap: '24rpx',
-                itemDirection: 'column',
-                itemAlign: 'flex-start',
-                headShow: true,
-                headWidth: '100%',
-                headHeight: '320rpx',
-                headBorderRadius: '12rpx',
-                textShow: true,
-                textRows: 2,
-                textRowsGap: '12rpx',
-                textWidth: ['100%', '70%'],
-                textHeight: ['24rpx', '24rpx'],
-                textBorderRadius: '6rpx',
-                itemGap: '12rpx'
-            }
-        };
-    },
    computed: {
        aiAvatarUrl() {
            return this.$util.img(IMAGE_CONFIG.aiAvatar);
@@ -679,11 +526,6 @@ export default {
        hasDetailContent() {
            const hasPdf = this.goodsSkuDetail && this.goodsSkuDetail.pdf_url;
            return hasPdf || this.hasHtmlTab;
-        },
-        // 是否有真实商品数据: goods_id > 0 才算拿到商品详情
-        // 用于「未拿到任何数据时不显示真实内容」, 避免加载失败/异常时切到空详情页
-        hasRealData() {
-            return this.goodsSkuDetail && Number(this.goodsSkuDetail.goods_id) > 0;
        }
    },
    mixins: [scroll, detail]
@@ -692,79 +534,6 @@ export default {

 <style lang="scss">
@import '@/common/css/goods_detail.scss';
-
-/* 骨架屏外层：与商品详情整体上对齐，左右内边距由各 skeleton 自己控制 */
-.goods-detail-skeleton {
-	width: 100%;
-	background-color: #fff;
-}
-
-/* 底部 action 骨架占位：与 ns-goods-action 同样 fixed bottom, 高度接近真实按钮 */
-.goods-detail-skeleton-action {
-	position: fixed;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	height: 100rpx;
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	z-index: 9;
-	padding: 0 16rpx;
-	box-sizing: border-box;
-	border-top: 1rpx solid #f2f2f2;
-	padding-bottom: env(safe-area-inset-bottom);
-}
-
-.goods-detail-skeleton-action .skeleton-action-icons {
-	display: flex;
-	align-items: center;
-	margin-right: 16rpx;
-}
-
-.goods-detail-skeleton-action .skeleton-action-icon {
-	width: 60rpx;
-	height: 60rpx;
-	border-radius: 50%;
-	background-color: #EAEDF5;
-	background: linear-gradient(90deg, #EAEDF5 25%, #F9FAFF 37%, #EAEDF5 50%);
-	background-size: 400% 100%;
-	animation: skActAnim 1.8s ease infinite;
-	margin-right: 16rpx;
-}
-
-.goods-detail-skeleton-action .skeleton-action-icon:last-child {
-	margin-right: 0;
-}
-
-.goods-detail-skeleton-action .skeleton-action-btn {
-	flex: 1;
-	height: 70rpx;
-	border-radius: 10rpx;
-	margin-right: 16rpx;
-	background-color: #EAEDF5;
-	background: linear-gradient(90deg, #EAEDF5 25%, #F9FAFF 37%, #EAEDF5 50%);
-	background-size: 400% 100%;
-	animation: skActAnim 1.8s ease infinite;
-}
-
-.goods-detail-skeleton-action .skeleton-action-btn:last-child {
-	margin-right: 0;
-}
-
-.goods-detail-skeleton-action .skeleton-action-btn.primary {
-	background: linear-gradient(90deg, #d8d8d8 25%, #ececec 37%, #d8d8d8 50%);
-	background-size: 400% 100%;
-}
-
-@keyframes skActAnim {
-	0% {
-		background-position: 100% 50%;
-	}
-	100% {
-		background-position: 0 50%;
-	}
-}
 </style>
 <style scoped>
 .ai-chat-float-btn {
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -384,14 +384,5 @@ export default {
 	border-radius: 20rpx 20rpx 0 0;
 }

-// 购物车页面SKU弹窗底部按钮上移，避开底部导航栏
-::v-deep .goods-sku .sku-info .footer {
-	bottom: calc(30rpx + env(safe-area-inset-bottom) + 112rpx) !important;
-}
-
-::v-deep .goods-sku .sku-info .body-item {
-	padding-bottom: 112rpx;
-}
-
@import './public/css/cart.scss';
 </style>
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -2,7 +2,7 @@
 	<view :style="themeColor">
 		<!-- 使用 item.id / componentName 稳定 key 避免 v-for 在 diyData 整体重赋值时把组件整个销毁重建, 引发频闪 -->
 		<view v-if="diyData && diyData.value && diyData.value.length">
-			<block v-for="(item, index) in diyData.value" :key="index">
+			<block v-for="(item, index) in diyData.value" :key="item.id || item.componentName || index">
 				<view v-if="item.componentName == 'GoodsCategory'">
 					<diy-category @tologin="toLogin" ref="category" :value="item"></diy-category>
 				</view>
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -8,7 +8,7 @@
 		</view> -->
 		<!-- #endif -->

-		<goods-detail-view :goodsSkuDetail="goodsSkuDetail" :loading="loading" ref="goodsDetailView" @aiChatClick="sendToAIChat(goodsSkuDetail)">
+		<goods-detail-view :goodsSkuDetail="goodsSkuDetail" ref="goodsDetailView" @aiChatClick="sendToAIChat(goodsSkuDetail)">
 			<!-- 价格区域 -->
 			<template v-slot:price>
 				<!-- 限时折扣 -->
@@ -74,9 +74,7 @@
 							</view>
 							<view class="follow-and-share">
 								<text class="follow iconfont icon-share" @click="openSharePopup()"></text>
-								<!-- #ifndef MP-HARMONY -->
 								<text class="share iconfont" @click="editCollection()" :class="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"></text>
-								<!-- #endif -->
 							</view>
 						</block>
 						<block v-else>
@@ -459,7 +457,7 @@
 							/>
 							<block v-else>
 								<ns-goods-action-icon :text="$lang('goods.detail.home')" icon="icon-shouye1" @click="goHome" />
-
+								
 								<!-- #ifdef MP-WEIXIN -->
 									<ns-goods-action-icon
 										:text="$lang('goods.detail.cart')"
@@ -467,12 +465,9 @@
 									icon="icon-gouwuche2"
 									:corner-mark="cartNumber > 0 ? cartNumber + '' : ''"
 									@click="goCart"
-									/>
+								/>
 								<ns-goods-action-icon :text="$lang('goods.detail.kefu')" icon="icox icox-kefu" :send-data="contactData" :chatParam="chatRoomParams" />
 								<!-- #endif -->
-								<!-- #ifdef MP-HARMONY -->
-								<!-- 鸿蒙平台: 隐藏购物车、客服、收藏按钮 -->
-								<!-- #endif -->
 								<!-- #ifdef H5 -->
 								<ns-goods-action-icon :text="$lang('goods.detail.follow')" :icon="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"  @click="editCollection" />
 								<!-- #endif -->
@@ -528,9 +523,7 @@
 		</goods-detail-view>
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 		<ns-login ref="login"></ns-login>
-		<!-- 商品详情页已有骨架屏, 不再启用 loading-cover 全屏遮罩(initShow=false),
-		     否则骨架屏会被遮罩盖住、用户看不到任何占位过渡 -->
-		<loading-cover ref="loadingCover" :initShow="false"></loading-cover>
+		<loading-cover ref="loadingCover"></loading-cover>

 		<!-- 隐私弹窗 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
@@ -603,7 +596,7 @@ export default {
 			uni.setStorageSync('selectedProduct', productInfo);
 			
 			uni.navigateTo({
-				url: this.$util.PAGE_KEY_MAP.PAGE_AI_CHAT
+				url: '/pages_tool/ai-chat/index'
 			});
 		},
 		
--- a/pages_goods/public/js/detail.js
+++ b/pages_goods/public/js/detail.js
@@ -4,10 +4,7 @@ export default {
 			goodsRoute: '/pages_goods/detail',
 			couponList: [], //优惠券列表
 			couponBtnSwitch: false, //获取优惠券防止重复提交
-			// 商品详情骨架屏：true 显示骨架，false 显示真实内容
-			// 首屏进入即为 true，商品详情数据首屏渲染完成后（与 loading-cover 同时机）置 false
-			loading: true,
-
+			
 			posterApi: '/api/goods/poster',

 			//满减活动
@@ -106,12 +103,13 @@ export default {
 			await this.getGoodsSkuDetail();
 		} catch (e) {
 			console.error('getGoodsSkuDetail failed:', e);
-			// 失败时不关闭骨架屏, 由视图层 hasRealData(goods_id>0) 自动保留占位,
-			// 避免错误地把页面切到"空详情"状态
-			uni.showToast({
-				title: this.$lang ? this.$lang('common.networkError') : '网络异常，请重试',
-				icon: 'none'
-			});
+			// 即使失败也要保证 loading-cover 关闭, 避免空白屏
+			setTimeout(() => {
+				try {
+					const ref = this.$refs && this.$refs.loadingCover;
+					if (ref && typeof ref.hide === 'function') ref.hide();
+				} catch (e2) { /* swallow */ }
+			}, 0);
 		}
 	},
 	onHide() {
@@ -181,10 +179,7 @@ export default {
 				this.chatRoomParams = {
 					sku_id: this.goodsSkuDetail.sku_id
 				};
-				// 鸿蒙兼容: 后端在部分场景下可能不返回 goods_promotion, 缺字段直接 .[0] 会抛 TypeError,
-				// 整个 onShow 走 catch 路径无法关闭骨架屏, 表现为"数据已回来但永远显示骨架屏"
-				const promotionList = this.goodsSkuDetail?.goods_promotion || [];
-				let typeId = promotionList.length > 0 ? promotionList[0] : undefined;
+				let typeId = this.goodsSkuDetail.goods_promotion[0];
 				if (typeId) {
 					// 限时折扣
 					if (typeId.discount_id) {
@@ -202,22 +197,21 @@ export default {
 				// 兼容鸿蒙元服务: $nextTick 在某些 JSVM 实现下不可靠, 用 setTimeout 兜底
 				// #ifdef MP-HARMONY
 				await new Promise(resolve => setTimeout(resolve, 16));
-				// 修复鸿蒙元服务: 不依赖 setTimeout 关闭骨架屏.
-				// 鸿蒙 JSVM 在 onShow 早期窗口的 setTimeout 回调有时被推迟/丢弃, 表现为"数据已回来但永远显示骨架屏".
-				// 数据已赋值 + 首屏让步, 同步直接关闭骨架屏, 由 hasRealData 兜底避免空详情.
-				this.loading = false;
 				// #endif

 				// #ifndef MP-HARMONY
 				await this.$nextTick();
-				// 关闭商品详情骨架屏: 在真实数据首屏渲染完成后再隐藏骨架屏,
-				// 用户会看到骨架屏 → 真实详情 的清晰过渡
-				// 最短展示 300ms: 数据请求很快时也保留足够感知时间, 否则一闪而过用户根本看不到骨架屏
-				setTimeout(() => {
-					this.loading = false;
-				}, 300);
 				// #endif

+				// 关闭 loading-cover 提前到 nextTick 后, 让用户看到首屏内容
+				// 用 setTimeout 0 推迟到下一个 task, 避开当前 sync 阶段 vendor 报错导致 hide 失败
+				setTimeout(() => {
+					try {
+						const ref = this.$refs && this.$refs.loadingCover;
+						if (ref && typeof ref.hide === 'function') ref.hide();
+					} catch (e) { /* swallow */ }
+				}, 0);
+
 				// 处理商品数据 (同步字段变换 + 后台并发 getGoodsForm)
 				await this.handleGoodsSkuData();

@@ -255,7 +249,7 @@ export default {
 				}

 				// 优惠券
-				if (Array.isArray(this.goodsSkuDetail.coupon_list)) {
+				if (this.goodsSkuDetail.coupon_list) {
 					this.couponList = this.goodsSkuDetail.coupon_list;
 					this.couponList.forEach(v => {
 						if (v.count == v.lead_count) v.useState = 2;
--- a/pages_goods/public/js/list.js
+++ b/pages_goods/public/js/list.js
@@ -37,7 +37,7 @@ export default {
 				fontWeight: false,
 				padding: 0,
 				cartEvent: "detail",
-				text: "",
+				text: "购买",
 				textColor: "#FFFFFF",
 				theme: "default",
 				aroundRadius: 25,
@@ -67,7 +67,7 @@ export default {
 	},

 	onLoad(options) {
-		this.config.text = this.$lang('goods.list.buyText') || this.$lang('buyNow');
+		this.config.text = this.$lang('goods.list.buyText');

 		this.$api.sendRequest({
 			url: '/api/lucky/status',
--- a/pages_order/_components/common-payment/common-payment.vue
+++ b/pages_order/_components/common-payment/common-payment.vue
@@ -234,7 +234,7 @@
 						<view class="order-cell coupon" v-if="modules.indexOf('coupon') != -1">
 							<text class="tit">{{ $lang('order.payment.orderMoney.coupon') }}</text>
 							<view class="box text-overflow"@click="openSiteCoupon(calculateGoodsData.merch_id)">
-								<template v-if="(orderCreateData.coupon && orderCreateData.coupon[calculateGoodsData.merch_id] && orderCreateData.coupon[calculateGoodsData.merch_id].coupon_id)">
+								<template v-if="orderCreateData.coupon[calculateGoodsData.merch_id].coupon_id">
 									<text class="money price-font" style="max-width: 100%;">{{ $lang('order.payment.orderMoney.couponSelected', { count: 1 }) }}</text>
 								<!-- 	<text class="unit price-font">优惠</text>
 									<text class="money price-font">{{ (calculateData && calculateData.coupon_money ? calculateData.coupon_money : 0) | moneyFormat }}</text> -->
@@ -550,7 +550,7 @@
 											<view v-if="couponItem.type == 'discount' && couponItem.discount_limit > 0" class="limit">{{ $lang('order.payment.couponPopup.maxDiscount', { amount: couponItem.discount_limit }) }}</view>
 											<view class="time font-size-goods-tag">{{ $lang('order.payment.couponPopup.validPeriod') }}{{ couponItem.end_time ? $util.timeStampTurnTime(couponItem.end_time) : $lang('order.payment.couponPopup.permanentValid') }}</view>
 										</view>
-										<view class="iconfont" :class="selectCouponMap[merchCoupon.merch_id] == couponItem.coupon_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+										<view class="iconfont" :class="selectCouponId == couponItem.coupon_id ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 									</view>
 								</view>
 							</view>
--- a/pages_order/_components/common-payment/payment.js
+++ b/pages_order/_components/common-payment/payment.js
@@ -55,8 +55,7 @@ export default {
 				merch_id: 0,
 				data: []
 			},
-			// 按 merch_id 隔离,避免多商户之间互相污染
-			selectCouponMap: {}
+			selectCouponId:0
 		}
 	},
 	inject: ['promotion'],
@@ -86,7 +85,7 @@ export default {
 		goodsData() {
 			if (this.paymentData) {
 				this.paymentData.goods_list.forEach(item => {
-					if (item.sku_spec_format && typeof item.sku_spec_format === 'string') item.sku_spec_format = JSON.parse(item.sku_spec_format);
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
 				})
 				return this.paymentData;
 			}
@@ -94,7 +93,7 @@ export default {
 		calculateGoodsData() {
 			if (this.calculateData) {
 				this.calculateData.goods_list.forEach(item => {
-					if (item.sku_spec_format && typeof item.sku_spec_format === 'string') item.sku_spec_format = JSON.parse(item.sku_spec_format);
+					if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
 				})
 				return this.calculateData;
 			}
@@ -190,7 +189,7 @@ export default {
 		//多商户商品分类
 		goodsSpecFormat(goods_list){
 			goods_list.forEach(item => {
-				if (item.sku_spec_format && typeof item.sku_spec_format === 'string') item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
 			})
 			return goods_list
 		},
@@ -250,11 +249,7 @@ export default {
 						this.modules = data.modules;
 						
 						//记录多商户优惠券
-						// 兜底为对象,避免后续被当作数组处理
-						if (!data.coupon || typeof data.coupon !== 'object' || Array.isArray(data.coupon)) {
-							data.coupon = {};
-						}
-						this.orderCreateData.coupon = data.coupon;
+						this.orderCreateData.coupon = data.coupon
 						
 						//查询优惠券
 						this.getCouponList();
@@ -370,17 +365,7 @@ export default {
 							}
 						});
 						//多商户
-						// 保留用户已选的 coupon_id,后端回传的 res.data.coupon 默认都是 0 会覆盖掉
-						const prevCoupon = (this.orderCreateData.coupon && typeof this.orderCreateData.coupon === 'object' && !Array.isArray(this.orderCreateData.coupon)) ? this.orderCreateData.coupon : {};
-						this.orderCreateData.coupon = res.data.coupon || {};
-						if (this.orderCreateData.coupon && typeof this.orderCreateData.coupon === 'object' && !Array.isArray(this.orderCreateData.coupon)) {
-							Object.keys(prevCoupon).forEach(merch_id => {
-								const chosen = prevCoupon[merch_id] && prevCoupon[merch_id].coupon_id;
-								if (chosen && (!this.orderCreateData.coupon[merch_id] || !this.orderCreateData.coupon[merch_id].coupon_id)) {
-									this.orderCreateData.coupon[merch_id] = { coupon_id: chosen };
-								}
-							});
-						}
+						this.orderCreateData.coupon = res.data.coupon
 						// if (!res.data.coupon_id) this.orderCreateData.coupon.coupon_id = 0;
 						// else this.orderCreateData.coupon.coupon_id = res.data.coupon_id;

@@ -746,52 +731,44 @@ export default {
 			this.tempData = null;
 		},
 		//优惠券单独多商户
-	/**
-	 * 显示店铺优惠券信息
-	 * @param {Object} siteId
-	 * @param {Object} couponData
-	 */
-	openSiteCoupon(merch_id) {
-
-		this.tempData = this.$util.deepClone(this.orderCreateData);
-		this.merchCoupon.merch_id = merch_id;
-		// 从当前订单已选的 coupon_id 取值,没有则取弹窗里缓存的,再没有为 0
-		const exist = this.orderCreateData.coupon && this.orderCreateData.coupon[merch_id];
-		const cached = this.selectCouponMap[merch_id] || 0;
-		this.selectCouponMap[merch_id] = exist ? (exist.coupon_id || 0) : cached;
-		// this.selectCouponMoney = this.orderCreateData.coupon[siteId].coupon_money;
-
-		// 兜底: 列表为空时给一个空数组,弹窗不会渲染空指针
-		this.merchCoupon.data = (this.coupon_list && this.coupon_list[merch_id]) || [];
-		this.$refs.couponPopup.open();
-		this.$forceUpdate();
-	},
-	/**商户选择券*/
-	selectCoupon(data, merch_id) {
-
-		// if (this.orderCreateData.coupon[merch_id].coupon_id == data.coupon_id){
-		// 	this.orderCreateData.coupon[merch_id].coupon_id = 0
-		// }else{
-		// 	this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
-		// };
-		const cur = this.selectCouponMap[merch_id] || 0;
-		this.selectCouponMap[merch_id] = (cur != data.coupon_id) ? data.coupon_id : 0;
-		this.$forceUpdate();
-		// this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
-	},
-	//确定使用优惠券
-	useCpopon() {
-		const merch_id = this.merchCoupon.merch_id;
-		// 确保 orderCreateData.coupon 是对象结构,后端按 merch_id 取值
-		if (!this.orderCreateData.coupon || typeof this.orderCreateData.coupon !== 'object' || Array.isArray(this.orderCreateData.coupon)) {
-			this.orderCreateData.coupon = {};
-		}
-		this.orderCreateData.coupon[merch_id] = {
-			coupon_id: this.selectCouponMap[merch_id] || 0
-		};
-		this.$refs.couponPopup.close();
-		this.calculate();
-	},
+		/**
+		 * 显示店铺优惠券信息
+		 * @param {Object} siteId
+		 * @param {Object} couponData
+		 */
+		openSiteCoupon(merch_id) {
+		
+			this.tempData = this.$util.deepClone(this.orderCreateData);
+			this.merchCoupon.merch_id = merch_id;
+			this.selectCouponId = this.orderCreateData.coupon[merch_id].coupon_id;
+			// this.selectCouponMoney = this.orderCreateData.coupon[siteId].coupon_money;
+		
+			this.merchCoupon.data = this.coupon_list[merch_id];
+			this.$refs.couponPopup.open();
+			this.$forceUpdate();
+		},
+		/**商户选择券*/
+		selectCoupon(data,merch_id) {
+		
+			// if (this.orderCreateData.coupon[merch_id].coupon_id == data.coupon_id){
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = 0
+			// }else{
+			// 	this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+			// };
+			if (this.selectCouponId != data.coupon_id) {
+				this.selectCouponId = data.coupon_id;
+			} else {
+				this.selectCouponId = 0;
+			}
+			this.$forceUpdate();
+			// this.orderCreateData.coupon[merch_id].coupon_id = data.coupon_id
+		},
+		//确定使用优惠券
+		useCpopon() {
+			this.orderCreateData.coupon[this.merchCoupon.merch_id].coupon_id = this.selectCouponId;
+			this.$refs.couponPopup.close();
+			this.calculate();
+		},
 		
 		//-------------------
 		/**
--- a/pages_promotion/merch/public/js/list.js
+++ b/pages_promotion/merch/public/js/list.js
@@ -39,7 +39,7 @@ export default {
 				fontWeight: false,
 				padding: 0,
 				cartEvent: "detail",
-				text: '',
+				text: this.$lang('merch.list.buyText'),
 				textColor: "#FFFFFF",
 				theme: "default",
 				aroundRadius: 25,
@@ -66,7 +66,6 @@ export default {
 	},

 	onLoad(options) {
-		this.config.text = this.$lang('merch.list.buyText');
 		this.categoryId = options.category_id || 0;
 		this.keyword = options.keyword || '';
 		this.coupon = options.coupon || 0;
--- a/pages_tool/ai-chat/ai-chat-message.vue
+++ b/pages_tool/ai-chat/ai-chat-message.vue
@@ -397,7 +397,7 @@ export default {
      scrollTop: 0,
      scrollIntoViewId: null,
      hasMoreHistory: false,
-      loadingText: '',
+      loadingText: this.$lang('ai-chat.index.loadMoreHistory'),
      voiceInputing: false,
      audioContext: null,
      currentAudio: null,
@@ -417,7 +417,7 @@ export default {
      localUserAvatar: '',
    showAvatarSelector: false, // 头像选择弹窗控制
    localUserNickname: '', // 当前用户昵称
-    defaultNickname: '', // 默认昵称
+    defaultNickname: this.$lang('ai-chat.index.defaultNickname'), // 默认昵称
    showNicknameEditor: false, // 昵称编辑弹窗控制
    // AI头像错误状态
    avatarError: false,
@@ -493,9 +493,6 @@ export default {
    created() {
      this.messages = [...this.initialMessages]
      this.messageId = this.messages.length
-      // 初始化 i18n 字段(在 created 中同步赋值,避免 remote-only 首屏 data() 缓存空串)
-      this.loadingText = this.$lang('ai-chat.index.loadMoreHistory')
-      this.defaultNickname = this.$lang('ai-chat.index.defaultNickname')
      this.initAudioContext()
      // 初始化用户头像（缓存优先）
      this.initUserAvatarData()
--- a/pages_tool/ai-chat/index.vue
+++ b/pages_tool/ai-chat/index.vue
@@ -13,7 +13,7 @@
    <!-- #endif -->

    <!-- 聊天内容区域：从导航栏下方到容器底部 -->
-    <view class="chat-content" :style="{ bottom: tabBarHeight }">
+    <view class="chat-content">
      <ai-chat-message 
        ref="chat"
        :initial-messages="initialMessages"
@@ -68,15 +68,6 @@
        </view>
      </view>
    </view>
-
-    <!-- 底部导航栏(仅在 tabBar 场景下显示):
-         通过 golbalConfig mixin 的 shouldShowTabBar 控制 v-show,
-         组件内部已绑定 data-component-name="diy-bottom-nav"。
-         - 后端把 ai-chat 配为底部导航栏项 → 用户点击该项进入 → tabBar 显示并高亮对应项
-         - 浮动按钮(diy-float-btn)进入时 onLoad commit setBottomNavHidden(true)
-           → shouldShowTabBar=false → tabBar 隐藏
-         - 离开页面(onUnload)还原 bottomNavHidden → 不污染其他页面 -->
-    <diy-bottom-nav></diy-bottom-nav>
  </view>
 </template>

@@ -96,9 +87,6 @@ export default {
    return {
      initialMessages: [],
      fallbackWelcome: '',
-      // AI Agent 通用入参(链接系统透传;老客服入口不传也能跑,默认 agent_aikefu)
-      agentId: 'agent_aikefu',
-      pageTitle: '',

      // --- 系统导航栏/状态栏相关 ---
      navBarHeight: 44,   // uni-page-head 系统导航栏，默认高度为44px
@@ -117,15 +105,7 @@ export default {
      keyboardHeight: 0,

      // 事件处理器引用（用于清理）
-      safeEventHandlers: new Map(),
-
-      // 是否从浮动按钮进入
-      // 用来在运行时区分两种场景:
-      //   1) 后台把 ai-chat 配为底部导航栏 tabBar 项 → 用户点击该项进入 → 底部 tabBar 显示并高亮
-      //   2) 浮动按钮(diy-float-btn)的链接指向 ai-chat → 用户点击浮动按钮进入 → 底部 tabBar 隐藏
-      // 通过 onLoad(options).from 判定;同时会通过 $store.state.bottomNavHidden 临时隐藏 tabBar,
-      // 并在 onUnload 还原,避免影响其他页面。
-      isFromFloatBtn: false,
+      safeEventHandlers: new Map()
    }
  },
  
@@ -147,21 +127,6 @@ export default {
  async onLoad(options) {
    this.fallbackWelcome = this.$lang('ai-chat.index.fallbackWelcome');

-    // ====== AI Agent 通用入参(链接系统 -> 通用 agent_id/title) ======
-    // 老客服入口不传 options 也能跑(智能客服是首个 agent,默认 agent_aikefu)。
-    // 新增 AI 销售/HR/...智能体只需在 link.page_params.agent_id 传不同值,
-    // 当前 onShow/initChat 不区分 agent 行为,后续按业务扩展按 agentId 路由即可。
-    try {
-      this.agentId = (options && options.agent_id) || 'agent_aikefu';
-      const rawTitle = (options && options.title) || this.$lang('ai-chat.index.title');
-      this.pageTitle = decodeURIComponent(rawTitle);
-      // 同步 agentId 给 ai-service,后续 sendMessage / WS auth 自动带新 agent_id
-      try { aiService.setAgentId(this.agentId); } catch (e) { /* 兼容旧 ai-service 版本 */ }
-    } catch (e) {
-      this.agentId = 'agent_aikefu';
-      this.pageTitle = this.$lang('ai-chat.index.title');
-    }
-
    // ✅ 修改：取消权限校验，允许所有客服类型访问此页面
    // const hasAccess = this.checkAccessPermission();
    // if (!hasAccess) {
@@ -169,27 +134,7 @@ export default {
    //   return;
    // }

-    this.$langConfig.title(this.pageTitle || this.$lang('ai-chat.index.title'));
-
-    // ====== 区分底部导航栏/浮动按钮两种进入来源 ======
-    // diy-float-btn 跳转时会在 link 上注入 __dyu=FloatBtn
-    // (见 diy-float-btn.vue#onFloatBtnClick)
-    // 这种情况应当隐藏底部 tabBar(AI 客服页是全屏聊天体验,不应被 tabBar 占用屏幕)
-    // 而点击底部导航栏 tabBar 项进入时,通常不会携带 __dyu query,
-    // 此时 tabBar 正常显示并由 checkTabBarActive 步骤2精确命中高亮当前项。
-    // 用 __dyu 这种 3 字符 + 双下划线前缀的命名,几乎不可能与业务 page_params 冲突
-    // (业务方不会使用 __ 开头的短变量名)。
-    const dyuEntry = (options && options.__dyu) || '';
-    if (dyuEntry === 'FloatBtn') {
-      this.isFromFloatBtn = true;
-      // 临时隐藏底部导航栏;onUnload 会还原。
-      try {
-        this.$store.commit('setBottomNavHidden', true);
-      } catch (e) { /* 兼容没有该 mutation 的旧 store */ }
-    } else {
-      this.isFromFloatBtn = false;
-    }
-
+    this.$langConfig.title(this.$lang('ai-chat.index.title'));
    this.initChat();
  },
  
@@ -235,15 +180,6 @@ export default {
    console.log(this.$lang('ai-chat.index.logOnUnloadTriggered'));
    this.cleanup();
    aiService.disconnectWebSocket();
-
-    // 还原底部导航栏显示状态:如果 onLoad 时因为来自浮动按钮而临时隐藏,
-    // 必须在页面卸载时还原,否则返回到 tabBar 页时 tabBar 会保持隐藏状态。
-    if (this.isFromFloatBtn) {
-      try {
-        this.$store.commit('setBottomNavHidden', false);
-      } catch (e) { /* 兼容没有该 mutation 的旧 store */ }
-      this.isFromFloatBtn = false;
-    }
  },

  methods: {
@@ -711,9 +647,7 @@ export default {
  /* #endif */
  left: 0;
  right: 0;
-  /* bottom 由模板动态绑定到 tabBarHeight:
-     - 浮动按钮入口 / 其他隐藏 tabBar 场景:0rpx,占满到底部
-     - tabBar 项入口:tabBarHeight,避免被底部 tabBar 遮挡聊天内容 */
+  bottom: 0;
 }

 /* 底部tabBar占位样式 */
--- a/pages_tool/file-preview/file-preview.vue
+++ b/pages_tool/file-preview/file-preview.vue
@@ -1,93 +1,35 @@
 <template>
    <view class="file-preview-container" :style="themeColor">
-        <!-- #ifdef MP-WEIXIN -->
-        <!-- 微信小程序：web-view 是原生组件，必须用 cover-view 盖在上面；cover-view 不支持 iconfont，改用 cover-image PNG -->
-        <cover-view class="mp-header">
-            <cover-view class="mp-header-inner">
-                <cover-view class="nav-btn back-btn" @click="goBack">
-                    <cover-image src="/static/img/icon-back.png" class="nav-icon"></cover-image>
-                </cover-view>
-                <cover-view class="header-title">{{ headerTitle }}</cover-view>
-                <button class="nav-btn share-btn" open-type="share" hover-class="none">
-                    <cover-image src="/static/img/icon-share.png" class="nav-icon"></cover-image>
-                </button>
-            </cover-view>
-            <!-- 状态栏占位（navigationStyle custom 时，避免被时间/电量遮挡） -->
-            <cover-view class="mp-status-bar" :style="{ height: statusBarHeight + 'px' }"></cover-view>
-        </cover-view>
-        <!-- #endif -->
-
-        <!-- #ifndef MP-WEIXIN -->
-        <!-- 非小程序：普通 view + iconfont 即可 -->
        <view class="header">
-            <view class="nav-btn back-btn" @click="goBack">
+            <view class="back-btn" @click="goBack">
                <text class="iconfont icon-back"></text>
            </view>
-            <view class="header-title">{{ headerTitle }}</view>
-            <button class="nav-btn share-btn" open-type="share" hover-class="none" @click.stop>
-                <text class="iconfont icon-fenxiang"></text>
-            </button>
+            <view class="header-title">{{ fileName }}</view>
+            <view class="placeholder"></view>
        </view>
-        <!-- #endif -->
-
-        <!-- #ifdef MP-WEIXIN -->
-        <!-- 微信小程序 web-view 是全屏原生组件，父容器 padding/margin 对它无效，必须在它前面放一个等高的占位 view 把它顶下去 -->
-        <view class="mp-content-spacer" :style="{ height: headerTotalHeightPx + 'px' }"></view>
-        <!-- #endif -->
-
+        
        <view class="content">
            <!-- PDF 文件预览 -->
            <view v-if="fileType === 'pdf'" class="file-viewer">
-                <!-- #ifdef H5 -->
-                <!-- H5 端：web-view 渲染为 iframe，若被 X-Frame-Options/CORS 拦截则显示空白；额外提供"新标签页打开"与"下载"按钮兜底 -->
-                <view class="h5-action-bar">
-                    <view class="h5-action-tip">如页面空白，请使用下方按钮：</view>
-                    <view class="h5-action-btns">
-                        <button class="h5-action-btn primary" @click="openInNewTab">新标签页打开</button>
-                        <button class="h5-action-btn" @click="triggerDownload">下载文件</button>
-                    </view>
-                </view>
-                <!-- #endif -->
                <web-view v-if="fileUrl" :src="fileUrl"></web-view>
                <view v-else class="error-message">{{ $lang('file-preview.file-preview.fileUrlNotExist') }}</view>
            </view>
-
+            
            <!-- Word 文件预览 -->
            <view v-else-if="fileType === 'word'" class="file-viewer">
-                <!-- #ifdef H5 -->
-                <view class="h5-action-bar">
-                    <view class="h5-action-tip">浏览器可能无法直接内嵌预览 Word，建议下载后查看：</view>
-                    <view class="h5-action-btns">
-                        <button class="h5-action-btn primary" @click="triggerDownload">下载文件</button>
-                        <button class="h5-action-btn" @click="openInNewTab">新标签页打开</button>
-                    </view>
-                </view>
-                <!-- #endif -->
                <web-view v-if="fileUrl" :src="fileUrl"></web-view>
                <view v-else class="error-message">{{ $lang('file-preview.file-preview.fileUrlNotExist') }}</view>
            </view>
-
+            
            <!-- 视频文件预览 -->
            <view v-else-if="fileType === 'video'" class="video-viewer">
-                <video v-if="fileUrl" id="filePreviewVideo" :src="fileUrl" controls class="video-player"></video>
+                <video v-if="fileUrl" :src="fileUrl" controls autoplay class="video-player"></video>
                <view v-else class="error-message">{{ $lang('file-preview.file-preview.videoUrlNotExist') }}</view>
            </view>
-
+            
            <!-- 其他文件类型 -->
            <view v-else class="file-viewer">
-                <!-- #ifdef H5 -->
-                <view v-if="fileUrl" class="h5-action-bar">
-                    <view class="h5-action-tip">{{ $lang('file-preview.file-preview.unsupportedFileType') }}</view>
-                    <view class="h5-action-btns">
-                        <button class="h5-action-btn primary" @click="triggerDownload">下载文件</button>
-                        <button class="h5-action-btn" @click="openInNewTab">新标签页打开</button>
-                    </view>
-                </view>
-                <view v-else class="error-message">{{ $lang('file-preview.file-preview.fileUrlNotExist') }}</view>
-                <!-- #endif -->
-                <!-- #ifndef H5 -->
                <view class="error-message">{{ $lang('file-preview.file-preview.unsupportedFileType') }}</view>
-                <!-- #endif -->
            </view>
        </view>
    </view>
@@ -99,114 +41,32 @@ export default {
        return {
            fileName: '',
            fileUrl: '',
-            fileType: '',
-            statusBarHeight: 20,
-            windowWidth: 375
+            fileType: ''
        };
    },
-    computed: {
-        // #ifdef MP-WEIXIN
-        // 整个自定义 header 高度（状态栏 + 标题栏 88rpx），单位 px —— 用于占位 view 和内容区下移
-        headerTotalHeightPx() {
-            const rpxToPx = this.windowWidth / 750;
-            return this.statusBarHeight + Math.round(88 * rpxToPx);
-        },
-        // #endif
-        // 页面标题栏显示的短标题（避免超长挤压分享按钮；对用户无意义的tmp名统一显示通用"文件预览"）
-        headerTitle() {
-            const name = (this.fileName || '').trim();
-            // 如果是临时文件名（tmp_ 开头 或 带路径hash的长串），统一显示通用"文件预览"
-            if (/^tmp_/i.test(name) || (name.length > 30 && /[a-f0-9]{20,}/i.test(name))) {
-                return this.$lang('file-preview.file-preview.title');
-            }
-            // 否则显示原始文件名（列表里传入的，如"乐瑞固企业介绍"，本身就短）
-            if (name) {
-                // JS 层保险截断（超过16字 + …），应对 cover-view CSS 省略号不生效
-                if (name.length > 16) return name.slice(0, 16) + '…';
-                return name;
-            }
-            return this.$lang('file-preview.file-preview.title');
-        },
-        // 分享的真实标题（好友收到的卡片显示真实文件名，不截断）
-        shareTitle() {
-            const name = (this.fileName || '').trim();
-            if (name && !/^tmp_/i.test(name)) return name;
-            return this.$lang('file-preview.file-preview.title');
-        },
-        // 分享路径：只带文件三要素，不挂推荐码/关系
-        sharePath() {
-            const query = [];
-            if (this.fileName) query.push(`fileName=${encodeURIComponent(this.fileName)}`);
-            if (this.fileUrl) query.push(`fileUrl=${encodeURIComponent(this.fileUrl)}`);
-            if (this.fileType) query.push(`fileType=${encodeURIComponent(this.fileType)}`);
-            return `/pages_tool/file-preview/file-preview${query.length ? '?' + query.join('&') : ''}`;
-        },
-        themeColor() {
-            if (this.$shop && this.$shop.themeColor) {
-                return `--theme-color: ${this.$shop.themeColor};`;
-            }
-            return '';
-        }
-    },
    onLoad(option) {
        // 解析传递的参数
        if (option.fileName) {
            this.fileName = decodeURIComponent(option.fileName);
        }
+        
        if (option.fileUrl) {
            this.fileUrl = decodeURIComponent(option.fileUrl);
        }
+        
        if (option.fileType) {
            this.fileType = decodeURIComponent(option.fileType);
        } else {
+            // 根据文件名后缀推断文件类型
            this.inferFileType();
        }
-        // #ifdef MP-WEIXIN
-        const sys = uni.getSystemInfoSync();
-        this.statusBarHeight = sys.statusBarHeight || 20;
-        this.windowWidth = sys.windowWidth || 375;
-        // #endif
    },
-    onReady() {
-        // 视频加载后手动触发一次播放占位（去掉 autoplay 防自动播放被系统拦截）
-        // #ifndef H5
-        if (this.fileType === 'video' && this.fileUrl) {
-            try {
-                const ctx = uni.createVideoContext('filePreviewVideo', this);
-                if (ctx && typeof ctx.play === 'function') { /* 留给用户点击，不自动播 */ }
-            } catch (e) {}
-        }
-        // #endif
-    },
-    // #ifdef MP-WEIXIN
-    // 微信小程序：右上角胶囊"分享给朋友" / button[open-type=share] 触发
-    onShareAppMessage() {
-        return {
-            title: this.shareTitle,
-            path: this.sharePath
-        };
-    },
-    // 微信小程序：分享到朋友圈
-    onShareTimeline() {
-        return {
-            title: this.shareTitle,
-            query: this.sharePath.split('?')[1] || ''
-        };
-    },
-    // #endif
    methods: {
+        /**
+         * 根据文件名后缀推断文件类型
+         */
        inferFileType() {
-            if (this.fileUrl) {
-                const clean = String(this.fileUrl).split('?')[0];
-                const ext = clean.split('.').pop().toLowerCase();
-                if (['pdf'].includes(ext)) {
-                    this.fileType = 'pdf';
-                } else if (['doc', 'docx'].includes(ext)) {
-                    this.fileType = 'word';
-                } else if (['mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv'].includes(ext)) {
-                    this.fileType = 'video';
-                }
-            } else if (this.fileName) {
+            if (this.fileName) {
                const ext = this.fileName.split('.').pop().toLowerCase();
                if (['pdf'].includes(ext)) {
                    this.fileType = 'pdf';
@@ -217,48 +77,13 @@ export default {
                }
            }
        },
+        
+        /**
+         * 返回上一页
+         */
        goBack() {
-            const pages = getCurrentPages();
-            if (pages && pages.length > 1) {
-                uni.navigateBack();
-            } else {
-                uni.switchTab({ url: '/pages/index/index' }).catch(() => {
-                    uni.navigateBack();
-                });
-            }
-        },
-        // #ifdef H5
-        // H5 端：新标签页打开文件（绕过 iframe X-Frame-Options/CORS 限制）
-        openInNewTab() {
-            if (!this.fileUrl) return;
-            try {
-                window.open(this.fileUrl, '_blank', 'noopener,noreferrer');
-            } catch (e) {
-                uni.showToast({ title: '打开失败，请稍后重试', icon: 'none' });
-            }
-        },
-        // H5 端：通过 <a download> 触发浏览器下载（最稳定的跨浏览器方案）
-        triggerDownload() {
-            if (!this.fileUrl) return;
-            try {
-                const link = document.createElement('a');
-                link.href = this.fileUrl;
-                link.target = '_blank';
-                link.rel = 'noopener noreferrer';
-                if (this.fileName) {
-                    // 仅提示浏览器用这个名字；受 CORS 影响，跨域文件时 download 属性可能被忽略，
-                    // 此时浏览器会直接按服务器返回的文件名/直接显示，但不会丢失文件本身
-                    link.download = this.fileName;
-                }
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            } catch (e) {
-                // 兜底：新标签页打开
-                this.openInNewTab();
-            }
+            uni.navigateBack();
        }
-        // #endif
    }
 };
 </script>
@@ -267,10 +92,7 @@ export default {
 .file-preview-container {
    min-height: 100vh;
    background-color: #f5f5f5;
-    display: flex;
-    flex-direction: column;
-
-    /* =================== 非 MP 端 header =================== */
+    
    .header {
        display: flex;
        align-items: center;
@@ -279,34 +101,22 @@ export default {
        padding: 0 30rpx;
        background-color: #fff;
        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-        z-index: 10;
-
-        .nav-btn {
-            flex-shrink: 0;
+        
+        .back-btn {
            width: 60rpx;
            height: 60rpx;
            display: flex;
            align-items: center;
            justify-content: center;
-            padding: 0;
-            background: transparent;
-            line-height: 1;
-            border: none;
-            margin: 0;
-            &::after { border: none; }
-        }
-
-        .back-btn {
+            
            .icon-back {
-                font-size: 36rpx;
+                font-size: 32rpx;
                color: #333;
            }
        }
-
+        
        .header-title {
            flex: 1;
-            min-width: 0;
            font-size: 32rpx;
            font-weight: 600;
            color: #333;
@@ -314,91 +124,17 @@ export default {
            overflow: hidden;
            text-overflow: ellipsis;
            white-space: nowrap;
-            margin: 0 20rpx;
        }
-
-        .share-btn {
-            .icon-fenxiang {
-                font-size: 34rpx;
-                color: #333;
-            }
+        
+        .placeholder {
+            width: 60rpx;
        }
    }
-
-    /* =================== MP 端 header (cover-view 浮层) =================== */
-    /* #ifdef MP-WEIXIN */
-    .mp-header {
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-        z-index: 9999;
-        background-color: #ffffff;
-        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-
-        .mp-status-bar {
-            width: 100%;
-        }
-
-        .mp-header-inner {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            height: 88rpx;
-            padding: 0 20rpx;
-            width: 100%;
-            box-sizing: border-box;
-        }
-
-        .nav-btn {
-            flex-shrink: 0;
-            width: 64rpx;
-            height: 64rpx;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            padding: 0;
-            background: transparent;
-            line-height: 1;
-            border: none;
-            margin: 0;
-            &::after { border: none; }
-        }
-
-        .nav-icon {
-            width: 40rpx;
-            height: 40rpx;
-            display: block;
-        }
-
-        .header-title {
-            flex: 1;
-            min-width: 0;
-            font-size: 32rpx;
-            font-weight: 600;
-            color: #333;
-            text-align: center;
-            margin: 0 16rpx;
-            /* cover-view 下 ellipsis 支持有限，JS 层（headerTitle computed）已经做了截断，这里再冗余防守 */
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-        }
-    }
-    /* #endif */
-
-    /* =================== 内容区 =================== */
+    
    .content {
        flex: 1;
-        /* #ifdef MP-WEIXIN */
-        /* 给浮层 header（statusBar+88rpx）留位置，避免内容顶上去 */
-        padding-top: calc(var(--mp-header-h, 120rpx));
-        /* #endif */
-        padding-left: 20rpx;
-        padding-right: 20rpx;
-        padding-bottom: 20rpx;
-        box-sizing: border-box;
-
+        padding: 20rpx;
+        
        .file-viewer {
            width: 100%;
            min-height: 80vh;
@@ -406,7 +142,7 @@ export default {
            border-radius: 12rpx;
            overflow: hidden;
            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-
+            
            .error-message {
                width: 100%;
                height: 80vh;
@@ -416,52 +152,8 @@ export default {
                color: #999;
                font-size: 28rpx;
            }
-
-            /* #ifdef H5 */
-            /* H5 兜底操作栏（PDF/Word 被 X-Frame-Options 拦截时显示）*/
-            .h5-action-bar {
-                padding: 24rpx 28rpx 20rpx;
-                background: linear-gradient(180deg, #fffbe6 0%, #ffffff 100%);
-                border-bottom: 1rpx solid #f0e9c8;
-
-                .h5-action-tip {
-                    font-size: 26rpx;
-                    color: #8a6d1b;
-                    margin-bottom: 18rpx;
-                    line-height: 1.5;
-                }
-
-                .h5-action-btns {
-                    display: flex;
-                    gap: 20rpx;
-
-                    .h5-action-btn {
-                        flex: 1;
-                        height: 72rpx;
-                        line-height: 72rpx;
-                        padding: 0;
-                        font-size: 28rpx;
-                        border-radius: 36rpx;
-                        background: #f2f3f5;
-                        color: #333;
-                        border: 1rpx solid #e2e4e8;
-                        margin: 0;
-
-                        &::after { border: none; }
-
-                        &.primary {
-                            background: linear-gradient(90deg, #ff7e47 0%, #f73131 100%);
-                            color: #fff;
-                            border-color: transparent;
-                            font-weight: 600;
-                            box-shadow: 0 4rpx 12rpx rgba(247, 49, 49, 0.25);
-                        }
-                    }
-                }
-            }
-            /* #endif */
        }
-
+        
        .video-viewer {
            width: 100%;
            min-height: 80vh;
@@ -469,12 +161,12 @@ export default {
            border-radius: 12rpx;
            overflow: hidden;
            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-
+            
            .video-player {
                width: 100%;
                height: 80vh;
            }
-
+            
            .error-message {
                width: 100%;
                height: 80vh;
--- a/pages_tool/files/list.vue
+++ b/pages_tool/files/list.vue
@@ -13,18 +13,12 @@
          <view class="article-wrap">
            <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
            <block v-for="(item, index) in list" :key="index">
-              <view class="item" @tap="toDetail(item)">
-                <view class="pdf-icon">
-                  <text class="pdf-icon-p">P</text>
-                  <view class="pdf-icon-fold"></view>
-                  <view class="pdf-icon-lines">
-                    <view class="pdf-icon-line"></view>
-                    <view class="pdf-icon-line"></view>
-                    <view class="pdf-icon-line"></view>
-                  </view>
+              <view class="item" @tap="toDetail(item.$orig)">
+                <view class="article-img">
+                  <image class="cover-img" :src="item.g1" mode="widthFix" @error="imgError(index)" show-menu-by-longpress></image>
                </view>
                <view class="info-wrap">
-                  <view class="title">{{ item.files_title }}</view>
+                  <view class="title">{{ item.$orig.files_title }}</view>
                  <view class="read-wrap">
                    <text>{{ $lang('files.list.viewPdf') }}</text>
                  </view>
@@ -90,10 +84,8 @@ export default {
          if (res.code === 0 && res.data) {
            list = res.data.list
            if (!this.title && res.data.list.length > 0) {
-              const first = res.data.list[0]
-              const firstOrig = (first && first.$orig) ? first.$orig : first
              uni.setNavigationBarTitle({
-                title: firstOrig.category_name || ''
+                title: res.data.list[0].category_name
              })
            }
          } else {
@@ -106,18 +98,9 @@ export default {
            this.list = []
          }
          this.list = this.list.concat(list.map(item => {
-            // 兼容两种后端结构：自带 $orig（如 cases 接口）或扁平结构
-            const src = (item && item.$orig) ? item.$orig : item
-            return {
-              files_id: src.files_id,
-              files_title: src.files_title,
-              files_url: src.files_url,
-              files_desc: src.files_desc,
-              category_id: src.category_id,
-              category_name: src.category_name,
-              // 保留完整原对象引用，避免后续扩展字段丢失
-              $orig: src
-            }
+            const orig = item
+            const g1 = this.$util.img("addon/personnel/shop/view/enterprise/fileicon.png")
+            return { $orig: orig, g1: g1 }
          }))
          if (this.$refs.loadingCover) {
            this.$refs.loadingCover.hide()
@@ -132,121 +115,41 @@ export default {
      })
    },
    toDetail(item) {
-      const title = (item.files_title || '文件').toString().replace(/[\\/:*?"<>|\r\n\t]/g, '_');
-      // 根据 URL 推断后缀（若无扩展名则默认 pdf）
-      let ext = 'pdf';
-      if (item.files_url) {
-        const clean = item.files_url.split('?')[0];
-        const matched = clean.match(/\.([a-zA-Z0-9]+)$/);
-        if (matched) ext = matched[1].toLowerCase();
-      }
-      const fileName = `${title}.${ext}`;
-      const fileType =
-        ['pdf'].includes(ext) ? 'pdf'
-        : ['doc', 'docx'].includes(ext) ? 'word'
-        : ['mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv'].includes(ext) ? 'video'
-        : 'pdf';
-      const previewPage = `/pages_tool/file-preview/file-preview?fileName=${encodeURIComponent(fileName)}&fileUrl=${encodeURIComponent(item.files_url)}&fileType=${encodeURIComponent(fileType)}`;
-
-      // ========== H5 端：跳转预览页（web-view 走 iframe）；失败则新标签页打开原链接 ==========
-      // #ifdef H5
-      uni.navigateTo({
-        url: previewPage,
-        fail: () => {
-          try { window.open(item.files_url, '_blank'); } catch (e) {
-            uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' });
-          }
-        }
-      });
-      return;
-      // #endif
-
-      // ========== 非 H5 端：下载文件后按平台分支打开 ==========
-      uni.showLoading({ title: this.$lang('files.list.loading'), mask: true });
-      uni.downloadFile({
-        url: item.files_url,
-        success: res => {
-          if (res.statusCode !== 200) {
-            uni.hideLoading();
-            uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' });
-            return;
-          }
-
-          // ----- 微信小程序：saveFile 重命名 + openDocument（短文件名标题）-----
-          // #ifdef MP-WEIXIN
-          const fs = uni.getFileSystemManager();
-          // 重命名临时文件到用户目录，用短文件名 —— openDocument 的标题会取 filePath 的文件名部分，从而显示短名"乐瑞固企业介绍"而非 tmp_xxx
-          const targetPath = `${wx.env.USER_DATA_PATH}/fs_${Date.now()}_${title}.${ext}`;
-          try {
-            // saveFile：复制临时文件到持久目录并改名（临时文件在某些基础库上禁止直接 rename）
-            fs.saveFile({
-              tempFilePath: res.tempFilePath,
-              filePath: targetPath,
-              success: r => {
-                uni.hideLoading();
-                uni.openDocument({
-                  filePath: r.savedFilePath,
-                  fileType: ext,
-                  showMenu: true,
-                  fail: () => {
-                    uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' });
-                  },
-                  complete: () => {
-                    // 预览结束后清理，避免占用持久空间（失败忽略）
-                    try { fs.removeSavedFile({ filePath: r.savedFilePath }); } catch (e) {}
-                  }
-                });
-              },
-              fail: () => {
-                // saveFile 失败（配额等），直接用临时文件 openDocument 兜底
-                uni.hideLoading();
-                uni.openDocument({
-                  filePath: res.tempFilePath,
-                  fileType: ext,
-                  showMenu: true,
-                  fail: () => uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' })
-                });
-              }
-            });
-          } catch (e) {
-            // 极端异常兜底
-            uni.hideLoading();
-            uni.openDocument({
-              filePath: res.tempFilePath,
-              fileType: ext,
-              showMenu: true,
-              fail: () => uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' })
-            });
-          }
-          // #endif
-
-          // ----- App / 其他小程序：直接 openDocument 打开临时文件；失败兜底跳转预览页 -----
-          // #ifndef MP-WEIXIN
-          uni.hideLoading();
-          uni.openDocument({
-            filePath: res.tempFilePath,
-            fileType: ext,
-            showMenu: true,
-            fail: () => {
-              uni.navigateTo({
-                url: previewPage,
-                fail: () => uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' })
-              });
+      uni.showLoading({
+        title: this.$lang('files.list.loading')
+      })
+      try {
+        uni.downloadFile({
+          url: item.files_url,
+          success: res => {
+            if (res.statusCode === 200) {
+              uni.openDocument({
+                filePath: res.tempFilePath,
+                success: () => {
+                },
+                fail: () => {
+                },
+                complete: () => {
+                  uni.hideLoading()
+                }
+              })
+            }
+          },
+          fail: () => {
+            uni.hideLoading()
+          },
+          complete: res => {
+            if (res.statusCode === 404) {
+              uni.showToast({
+                title: this.$lang('files.list.fileNotExist'),
+                icon: 'none'
+              })
            }
-          });
-          // #endif
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' });
-        },
-        complete: res => {
-          if (res && res.statusCode === 404) {
-            uni.hideLoading();
-            uni.showToast({ title: this.$lang('files.list.fileNotExist'), icon: 'none' });
          }
-        }
-      });
+        })
+      } catch (e) {
+        uni.hideLoading()
+      }
    },
    imgError(index) {
      if (this.list[index]) {
@@ -321,70 +224,18 @@ export default {
  border-radius: 16rpx;
 }

-.article-wrap .item .pdf-icon {
+.article-wrap .item .article-img {
  margin-right: 20rpx;
  width: 80rpx;
  height: 80rpx;
-  flex-shrink: 0;
-  background-color: #e64340;
-  border-radius: 10rpx;
-  position: relative;
  overflow: hidden;
-  box-shadow: 0 2rpx 8rpx rgba(230, 67, 64, 0.2);
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-p {
-  position: absolute;
-  top: 2rpx;
-  left: 8rpx;
-  color: #ffffff;
-  font-size: 40rpx;
-  font-weight: 900;
-  font-family: Arial, Helvetica, sans-serif;
-  line-height: 1;
-  letter-spacing: 0;
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-fold {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 24rpx;
-  height: 24rpx;
-  background: linear-gradient(135deg, transparent 50%, #ffeceb 50%);
-  border-bottom-left-radius: 4rpx;
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-lines {
-  position: absolute;
-  right: 6rpx;
-  bottom: 6rpx;
-  width: 36rpx;
  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
+  align-items: center;
+  justify-content: center;
 }

-.article-wrap .item .pdf-icon .pdf-icon-line {
+.article-wrap .item .article-img image {
  width: 100%;
-  height: 3rpx;
-  background-color: #ffffff;
-  opacity: 0.85;
-  margin-bottom: 4rpx;
-  border-radius: 2rpx;
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-line:nth-child(1) {
-  width: 100%;
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-line:nth-child(2) {
-  width: 80%;
-}
-
-.article-wrap .item .pdf-icon .pdf-icon-line:nth-child(3) {
-  width: 60%;
-  margin-bottom: 0;
 }

 .article-wrap .item .info-wrap {
@@ -392,21 +243,16 @@ export default {
  display: flex;
  flex-direction: column;
  justify-content: space-between;
-  min-width: 0;
 }

 .article-wrap .item .info-wrap .title {
  font-weight: 700;
-  color: #303133;
  overflow: hidden;
  text-overflow: ellipsis;
  display: -webkit-box;
  -webkit-line-clamp: 1;
  -webkit-box-orient: vertical;
-  font-size: 28rpx;
-  line-height: 1.4;
-  white-space: normal;
-  word-break: break-all;
+  font-size: 24rpx;
 }

 .article-wrap .item .info-wrap .read-wrap {
--- a/pages_tool/form/form.vue
+++ b/pages_tool/form/form.vue
@@ -6,28 +6,11 @@
            </view>
            <view class="system-form-wrap">
                <view class="form-title">{{ $lang('form.form.title') }}</view>
-                <ns-form :data="detail.json_data" :formConfig="mergedFormConfig" ref="form"></ns-form>
-                <!-- 行为设置：提交验证码 -->
-                <view class="captcha-wrap" v-if="behavior.captcha == 1">
-                    <input class="captcha-input" type="text" v-model="captcha.code" :placeholder="$lang('form.form.captchaPlaceholder')" />
-                    <!-- #ifdef H5 -->
-                    <img v-if="captcha.img" class="captcha-img" :src="captcha.img" @click="getCaptcha()">
-                    <!-- #endif -->
-                    <!-- #ifndef H5 -->
-                    <image v-if="captcha.img" class="captcha-img" :src="captcha.img" mode="aspectFill" @click="getCaptcha()"></image>
-                    <!-- #endif -->
-                    <view class="captcha-btn" @click="getCaptcha()">{{ captcha.img ? '换一张' : '获取验证码' }}</view>
-                </view>
+                <ns-form :data="detail.json_data" :formConfig="detail.form_config" ref="form"></ns-form>
                <button type="primary" size="mini" class="button mini" @click="create()">{{ $lang('common.submit') }}</button>
            </view>
        </view>
-        <!-- 空态：除 ns-empty 文案外，追加一个可手动点的登录按钮——解决一切自动弹窗时序问题后的最后兜底 -->
-        <view v-else>
-            <ns-empty :text="emptyText"></ns-empty>
-            <view v-if="!complete" style="padding: 20rpx 40rpx 40rpx; display: flex; justify-content: center;">
-                <button type="primary" size="mini" @click="forceOpenLogin">点击登录查看表单</button>
-            </view>
-        </view>
+        <ns-empty :text="complete ? $lang('form.form.submitSuccess') : $lang('form.form.noFormInfo')" v-else></ns-empty>

        <loading-cover ref="loadingCover"></loading-cover>
        <ns-login ref="login"></ns-login>
@@ -46,56 +29,9 @@
                detail: null,
                isRepeat: false,
                complete: false,
-                scroll: true,
-                urlParams: {},
-                // 登录后回跳地址（供 ns-login / H5 重定向使用）
-                backUrl: '',
-                // 行为设置（后端 __form_config__.behavior 下发，含默认值）
-                behavior: {},
-                // 非成功状态的空态文案（表单未开放/需登录/加载失败等）
-                formError: '',
-                // 图形验证码（behavior.captcha=1 时展示）
-                captcha: { id: '', img: '', code: '' },
-                // 是否已加载过验证码（避免 onShow 重复刷新导致 session 错乱）
-                captchaLoaded: false,
-                // 登录拦截时暂存待提交数据：组件内存（MP 不丢态）+ 本地存储（H5 登录整页回跳后从存储恢复）
-                pendingSubmit: null,
-                // onLoad→getData 比 ns-login 挂载早时，用此标志在 mounted 再兜底弹登录（避免 ref 空报错）
-                pendingLoginRequired: false
+                scroll:true
            };
        },
-        computed: {
-            // 前端视觉默认：强制覆盖后端 form_config 中可能存在的旧默认（horizontal / 红按钮 / 灰背景等），
-            // 与 diy-form 路径（formdata.vue 的 styleDefaults）保持一致，使系统表单页也统一呈现新设计稿样式。
-            // 后端仍保留行为类配置（behavior / submitText 等），本合并仅覆盖视觉字段。
-            mergedFormConfig() {
-                const styleDefaults = {
-                    formLayout: 'vertical',
-                    formPaddingX: 28,
-                    rowPaddingY: 24,
-                    labelGap: 20,
-                    labelFontSize: 32,
-                    labelFontWeight: 700,
-                    labelColor: '#1f2937',
-                    inputHeight: 84,
-                    inputRadius: 16,
-                    inputBgColor: '#ffffff',
-                    inputBorderColor: '#e5e7eb',
-                    inputFocusBorderColor: '#3b82f6',
-                    inputFocusBgColor: '#ffffff',
-                    placeholderColor: '#9ca3af',
-                    placeholderFontSize: 28,
-                    checkedColor: '#3b82f6',
-                    showRowDivider: false,
-                    submitColor: '#ffffff',
-                    submitBgColor: '#3b82f6'
-                };
-                return Object.assign({}, this.detail ? (this.detail.form_config || {}) : {}, styleDefaults);
-            },
-            emptyText() {
-                return this.complete ? this.$lang('form.form.submitSuccess') : (this.formError || this.$lang('form.form.noFormInfo'));
-            }
-        },
        onLoad(data) {
            // #ifdef MP-ALIPAY
            let options = my.getLaunchOptionsSync();
@@ -103,115 +39,27 @@
            // #endif

            this.id = data.id || 0;
-
-            // 通用 URL 参数收集：除 id/scene 外的所有参数都透传给后端
-            // 后端会做卫生过滤并广播事件，供 recommend 等插件消费
-		    const reservedKeys = ['uniacid', 'id', 'scene'];
-            this.urlParams = {};
-            for (let key in data) {
-                if (reservedKeys.indexOf(key) !== -1) continue;
-                this.urlParams[key] = data[key];
-            }
-
            if (data.scene) {
                var sceneParams = decodeURIComponent(data.scene);
                sceneParams = sceneParams.split('&');
                if (sceneParams.length) {
                    sceneParams.forEach(item => {
-                        if (!item) return;
-                        // 兼容标准 key=value（id=13&uniacid=1）与旧式 id-13 两种 scene 格式
-                        let pair = item.split('=');
-                        if (pair.length === 2) {
-                            const key = pair[0];
-                            const val = pair[1];
-                            if (key === 'id') this.id = val;
-                            else if (key === 'uniacid') this.uniacid = val;
-                            else this.urlParams[key] = val;
-                        } else if (item.indexOf('id') === 0 && item.indexOf('-') !== -1) {
-                            // 旧格式兜底：id-13
-                            this.id = item.split('-')[1];
-                        }
+                        if (item.indexOf('id') != -1) this.id = item.split('-')[1];
                    });
                }
            }
-
-            // #ifdef H5
-            // H5：从 window.location.href 解析参数，兼容 history 路由 (?key=val) 与 hash 路由 (#/path?key=val) 两种形式
-            // 保证 recommend_code / uniacid 等参数不丢失
-            try {
-                const href = window.location.href;
-                let queryStr = '';
-                const hashIdx = href.indexOf('#');
-                const qIdx = href.indexOf('?');
-                if (qIdx !== -1 && (hashIdx === -1 || qIdx < hashIdx)) {
-                    // history 模式：? 在 # 之前（或无 #）
-                    queryStr = href.substring(qIdx + 1, hashIdx !== -1 ? hashIdx : href.length);
-                } else if (hashIdx !== -1) {
-                    // hash 模式：# 之后可能还有 ?
-                    const afterHash = href.substring(hashIdx + 1);
-                    const hq = afterHash.indexOf('?');
-                    if (hq !== -1) queryStr = afterHash.substring(hq + 1);
-                }
-                if (queryStr) {
-                    const pairs = queryStr.split('&');
-                    for (const p of pairs) {
-                        if (!p) continue;
-                        const eq = p.indexOf('=');
-                        let k, v;
-                        if (eq === -1) { k = decodeURIComponent(p); v = ''; }
-                        else { k = decodeURIComponent(p.substring(0, eq)); v = decodeURIComponent(p.substring(eq + 1)); }
-                        if (k === 'id') { if (!this.id) this.id = v; }
-                        else if (k === 'uniacid') { /* reserved, 透传到后端时不进 urlParams */ }
-                        else if (k === 'scene') { continue; }
-                        else { if (this.urlParams[k] === undefined) this.urlParams[k] = v; }
-                    }
-                }
-            } catch (e) {}
-            // #endif
-
-            // 构建登录回跳地址：包含 id + 所有 urlParams（尤其 recommend_code），
-            // 供 ns-login 弹窗登录成功或 H5 整页重定向登录后回到本页
-            const backQuery = [];
-            if (this.id) backQuery.push('id=' + encodeURIComponent(this.id));
-            for (const k in this.urlParams) {
-                const v = this.urlParams[k];
-                if (v !== undefined && v !== null && v !== '') {
-                    backQuery.push(encodeURIComponent(k) + '=' + encodeURIComponent(v));
-                }
-            }
-            this.backUrl = '/pages_tool/form/form' + (backQuery.length ? '?' + backQuery.join('&') : '');
        },
        onShow() {
-            // 打开是否需要登录由后端 behavior 决定（info 返回 FORM_LOGIN_REQUIRED 时弹登录）
+			if (!this.storeToken) {
+				this.redirectTologin('/pages_tool/form/form?id=' + this.id);
+				return;
+			}
+
            this.getData();
        },
-        mounted() {
-            // 1) 兜底 A：onLoad→getData 回调比 ns-login 挂载还早时，pendingLoginRequired=true
-            //    挂载完成再最后尝试一次自动弹窗
-            if (this.pendingLoginRequired) {
-                const tryOpen = () => {
-                    try {
-                        if (this.$refs.login && typeof this.$refs.login.open === 'function') {
-                            this.$refs.login.open(this.backUrl);
-                        }
-                    } catch (e) { console.warn('[FORM] mounted login.open failed:', e); }
-                };
-                this.$nextTick(tryOpen);
-                this.pendingLoginRequired = false;
-            }
-            // 2) 兜底 B：登录态在组件创建之前就已写入（token 提前 race），但 info 因时序没拿到数据
-            //    此时用户实际上已经登录，再拉一次 info 就能拿到真实表单数据
-            if (this.storeToken && !this.detail) {
-                this.$nextTick(() => { this.getData(); });
-            }
-        },
        watch: {
            storeToken: function(nVal, oVal) {
-                if (nVal) {
-                    this.getData();
-                    // 填写需登录：弹窗登录成功后自动续提交
-                    this.resumeSubmitAfterLogin();
-                }
+                if (nVal) this.getData();
            }
        },
        methods: {
@@ -221,303 +69,38 @@
                    data: {
                        form_id: this.id
                    },
-                    success: res => { this._handleInfoResponse(res); },
-                    fail: err => { this._handleInfoFailure(err); }
-                });
-            },
-            // ====== 表单 info 响应统一处理（剥离自 getData，便于严格判定与复用） ======
-            // 成功分支必须同时满足：code==0 + data 是对象 + 内含 json_data 或 form_config
-            // 只要不满足就是"没拿到有效表单"，然后用最宽的条件判定是否是登录拦截：
-            //   - 消息包含 FORM_LOGIN_REQUIRED / LOGIN_REQUIRED / 请先登录 / 登录相关中文
-            //   - 或者 data 无效（null/undefined/''/{}/非对象）+ 用户未登录 + 有 form_id
-            // 命中任一 → 一律弹登录 + 友好文案"请先登录"，不再误显示"未获取到表单信息"
-            _handleInfoResponse(res) {
-                try {
-                    const payload = (res && typeof res === 'object') ? res : {};
-                    const dataObj = payload.data;
-
-                    // —— 1) 严格判定：是否拿到了真正的表单结构？ ——
-                    const hasValidFormData =
-                        payload.code == 0 &&
-                        dataObj !== null && dataObj !== undefined && dataObj !== '' &&
-                        typeof dataObj === 'object' &&
-                        (dataObj.json_data !== undefined || dataObj.form_config !== undefined);
-
-                    if (hasValidFormData) {
-                        this.detail = dataObj;
-                        this.formError = '';
-                        this.behavior = (dataObj.form_config && dataObj.form_config.behavior) || {};
-                        if (this.behavior.captcha == 1 && !this.captchaLoaded) this.getCaptcha();
-                        this.resumeSubmitAfterLogin();
-                        // 本地缓存一份字段 JSON：下次再打开时如果仍被登录拦截，可作为 skeleton 兜底
-                        try { uni.setStorageSync('form_fields_cache_' + this.id, dataObj.json_data); } catch (e) {}
-                        // 成功分支同样必须关闭 loading 遮罩：
-                        // 之前这里直接 return 跳过了函数底部的 hide()，导致登录后进入表单一直转圈
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                        return;
-                    }
-
-                    // —— 2) 没拿到有效结构 → 宽网判定：是否属于"需要登录"场景？ ——
-                    const msg = (payload.message || '').toString();
-                    const isFormNotOpen = (msg === 'FORM_NOT_OPEN');
-
-                    const isLoginMsg =
-                        msg === 'FORM_LOGIN_REQUIRED' ||
-                        msg === 'LOGIN_REQUIRED' ||
-                        msg.indexOf('请先登录') !== -1 ||
-                        (msg.indexOf('登录') !== -1 && msg.indexOf('请') !== -1) ||
-                        (msg.toLowerCase().indexOf('login') !== -1 && msg.toLowerCase().indexOf('required') !== -1);
-
-                    const dataIsEmpty =
-                        !dataObj ||
-                        dataObj === '' ||
-                        dataObj === null ||
-                        dataObj === undefined ||
-                        (typeof dataObj === 'object' && !dataObj.json_data && !dataObj.form_config &&
-                         ((Array.isArray(dataObj) && dataObj.length === 0) ||
-                          (!Array.isArray(dataObj) && Object.keys(dataObj).length === 0)));
-
-                    // 最宽判定：只要不是"表单未开放"，且（显式登录消息 OR 空数据+未登录+有 id）都按登录拦截处理
-                    const shouldTriggerLogin =
-                        !isFormNotOpen &&
-                        (isLoginMsg || (dataIsEmpty && !this.storeToken && this.id));
-
-                    if (shouldTriggerLogin && this.storeToken) {
-                        // 已登录（storeToken 存在）但后端仍返回登录拦截：
-                        // 登录一次后就不再自动弹登录/跳登录页（防止 H5 登录回跳后 token 未被
-                        // 及时认可或双请求竞态时反复弹登录的死循环），仅展示空态文案 + 手动登录按钮
-                        this.formError = this.$lang('form.form.loginRequired');
-                    } else if (shouldTriggerLogin) {
-                        this.formError = this.$lang('form.form.loginRequired');
-                        this._openLoginWithRetry();
-                    } else if (isFormNotOpen) {
-                        this.formError = this.$lang('form.form.notOpen');
-                    } else {
-                        this.formError = msg || this.$lang('form.form.noFormInfo');
-                    }
-                } catch (e) {
-                    console.warn('[FORM] _handleInfoResponse exception:', e && e.message ? e.message : e);
-                    this.formError = this.$lang('form.form.noFormInfo');
-                }
-                if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-            },
-            // info 接口网络失败时也做同样判定：未登录+有 id 就尝试启动登录流程，至少让用户先完成登录
-            // （登录成功后会再次 getData，那时网络一般已经正常）
-            _handleInfoFailure(err) {
-                try {
-                    if (this.id && !this.storeToken) {
-                        this.formError = this.$lang('form.form.loginRequired');
-                        this._openLoginWithRetry();
-                    } else {
-                        this.formError = this.$lang('form.form.noFormInfo');
-                    }
-                } catch (e) {
-                    this.formError = this.$lang('form.form.noFormInfo');
-                }
-                if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-            },
-            // 打开登录：3 次 setTimeout 重试（0ms / 60ms / 320ms）
-            // 彻底覆盖 onLoad→回调→ns-login 尚未挂载的所有时序问题
-            _openLoginWithRetry() {
-                // 防重复触发：3 秒内只允许自动弹一次登录
-                // （响应回调 / mounted 兜底 / watcher 同时命中时只生效一次，避免 H5 反复跳登录页）
-                const now = Date.now();
-                if (this._lastAutoLoginAt && (now - this._lastAutoLoginAt) < 3000) return;
-                this._lastAutoLoginAt = now;
-                const url = this.backUrl;
-                let attempts = 0;
-                const delays = [0, 60, 320];
-                const tryOnce = () => {
-                    try {
-                        if (this.$refs.login && typeof this.$refs.login.open === 'function') {
-                            this.$refs.login.open(url);
-                            this.pendingLoginRequired = false;
-                            return true;
-                        }
-                    } catch (e) {
-                        console.warn('[FORM] login.open attempt ' + (attempts + 1) + ' failed:', e);
-                    }
-                    attempts++;
-                    if (attempts < delays.length) {
-                        setTimeout(tryOnce, delays[attempts]);
-                    } else {
-                        // 三次全失败：交给 mounted 钩子最后兜底
-                        this.pendingLoginRequired = true;
-                    }
-                    return false;
-                };
-                tryOnce();
-            },
-            // 模板空态按钮的手动入口：用户主动点击也能打开登录弹窗（最后一道防线）
-            forceOpenLogin() {
-                this._openLoginWithRetry();
-            },
-            // 图形验证码（点击图片/按钮刷新；提交失败后自动刷新）
-            getCaptcha() {
-                this.captchaLoaded = true;
-                this.$api.sendRequest({
-                    url: '/api/captcha/captcha',
-                    data: {
-                        captcha_id: this.captcha.id
-                    },
                    success: res => {
                        if (res.code == 0 && res.data) {
-                            this.captcha.id = res.data.id;
-                            this.captcha.img = res.data.img ? res.data.img.replace(/\r\n/g, '') : '';
-                            this.captcha.code = '';
+                            this.detail = res.data;
                        }
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    },
+                    fail: res => {
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
                    }
                });
            },
-            // 登录拦截时保存待提交数据（组件内存 + 本地存储，H5 登录会整页回跳）
-            savePendingSubmit(formData) {
-                const data = formData || (this.$refs.form && this.$refs.form.formData) || null;
-                const payload = {
-                    formId: this.id,
-                    urlParams: this.urlParams,
-                    formData: data,
-                    captchaId: this.captcha.id,
-                    captchaCode: this.captcha.code,
-                    ts: Date.now()
-                };
-                this.pendingSubmit = payload;
-                try { uni.setStorageSync('form_pending_submit', payload); } catch (e) {}
-                // H5 整页回跳标记：仅当确由登录拦截触发时才允许自动续提交，避免陈旧数据被误提交
-                try { uni.setStorageSync('form_pending_from_login', 1); } catch (e) {}
-            },
-            // 仅在已登录时取回并消费待提交数据（未登录 / 非登录回跳 / 过期不消费，避免误提交）；取后清除
-            takePendingSubmit() {
-                let payload = this.pendingSubmit;
-                const fromStorage = !payload;
-                if (fromStorage) {
-                    try { payload = uni.getStorageSync('form_pending_submit'); } catch (e) {}
-                }
-                if (!payload || !payload.formData) return null;
-                if (!this.storeToken) return null;
-                // H5 存储路径：必须是因登录拦截触发的回跳，否则视为陈旧数据，清理后不提交
-                if (fromStorage) {
-                    let fromLogin = false;
-                    try { fromLogin = uni.getStorageSync('form_pending_from_login'); } catch (e) {}
-                    if (!fromLogin) {
-                        this.pendingSubmit = null;
-                        try { uni.removeStorageSync('form_pending_submit'); } catch (e) {}
-                        return null;
-                    }
-                }
-                // 仅消费 10 分钟内的待提交，避免极旧数据被自动提交
-                if (payload.ts && Date.now() - payload.ts > 10 * 60 * 1000) {
-                    this.pendingSubmit = null;
-                    try { uni.removeStorageSync('form_pending_submit'); } catch (e) {}
-                    try { uni.removeStorageSync('form_pending_from_login'); } catch (e) {}
-                    return null;
-                }
-                this.pendingSubmit = null;
-                try { uni.removeStorageSync('form_pending_submit'); } catch (e) {}
-                try { uni.removeStorageSync('form_pending_from_login'); } catch (e) {}
-                return payload;
-            },
-            // 登录成功后：回填已填数据并自动续提交
-            resumeSubmitAfterLogin() {
-                const pending = this.takePendingSubmit();
-                if (!pending) return;
-                // 回填表单字段（nextTick 确保 ns-form 已挂载），避免 H5 整页回跳后好友看到空白表单
-                this.$nextTick(() => this.restoreFormData(pending.formData));
-                // 验证码：MP 登录不丢态可直接提交；H5 回跳后验证码失效，需重新获取并让用户重填
-                if (this.behavior.captcha == 1 && !this.captcha.code) {
-                    this.getCaptcha();
-                    this.$util.showToast({ title: '请重新输入验证码后提交' });
-                    return;
-                }
-                this.create();
-            },
-            // 将保存的 formData 回填到 ns-form
-            restoreFormData(formData) {
-                try {
-                    const form = this.$refs.form;
-                    if (form && Array.isArray(formData)) {
-                        form.formData = JSON.parse(JSON.stringify(formData));
-                        if (typeof form.processFormData === 'function') form.processFormData();
-                    }
-                } catch (e) {}
-            },
-            // 填完跳转：消费统一链接选择器的完整对象（wap_url 外链/页面路径、外部小程序、拨打电话）
-            doRedirect(link) {
-                const fallback = () => { this.complete = true; this.detail = null; };
-                if (!link) return fallback();
-                if (link.appid) {
-                    // 跳转其他微信小程序
-                    wx.navigateToMiniProgram({ appId: link.appid, path: link.page || '', fail: fallback });
-                } else if (link.mobile) {
-                    uni.makePhoneCall({ phoneNumber: String(link.mobile), fail: fallback });
-                    fallback();
-                } else if (link.wap_url) {
-                    if (/^https?:\/\//i.test(link.wap_url)) {
-                        uni.navigateTo({ url: '/pages_tool/webview/webview?src=' + encodeURIComponent(link.wap_url), fail: fallback });
-                    } else {
-                        uni.navigateTo({ url: link.wap_url, fail: fallback });
-                    }
-                } else {
-                    fallback();
-                }
-            },
            create() {
                if (this.$refs.form.verify()) {
                    if (this.isRepeat) return;
-                    const behavior = this.behavior || {};
-
-                    // 填写需登录 / 限填（后端强制，前端提前拦截优化体验）
-                    if ((behavior.require_login_submit == 1 || behavior.submit_limit > 0) && !this.storeToken) {
-                        // 保存已填写数据，登录成功（MP 弹窗 / H5 回跳）后自动续提交，避免数据丢失
-                        this.savePendingSubmit();
-                        this.$refs.login && this.$refs.login.open(this.backUrl);
-                        return;
-                    }
-                    // 验证码必填
-                    if (behavior.captcha == 1 && !this.captcha.code) {
-                        this.$util.showToast({ title: this.$lang('form.form.captchaRequired') });
-                        return;
-                    }
-
                    this.isRepeat = true;
-                    const submitCaptchaId = String(this.captcha.id || '');
-                    const submitCaptchaCode = String(this.captcha.code || '').toUpperCase();
-                    console.log('[FORM-SUBMIT-CAPTCHA]', { captcha_id: submitCaptchaId, captcha_code: submitCaptchaCode, raw_code: this.captcha.code });
+
                    this.$api.sendRequest({
                        url: '/form/api/form/create',
                        data: {
                            form_id: this.id,
-                            form_data: typeof this.$refs.form.formData === 'string' ? this.$refs.form.formData : JSON.stringify(this.$refs.form.formData),
-                            url_params: JSON.stringify(this.urlParams),
-                            member_id: this.memberInfo ? this.memberInfo.id : 0,
-                            captcha_id: submitCaptchaId,
-                            captcha_code: submitCaptchaCode
+                            form_data: typeof this.$refs.form.formData === 'string' ? this.$refs.form.formData : JSON.stringify(this.$refs.form.formData)
                        },
                        success: res => {
                            if (res.code == 0) {
-                                this.$util.showToast({ title: this.$lang('form.form.submitSuccess') });
-                                const link = behavior.redirect;
+                                this.$util.showToast({ title: this.$lang('form.form.submitSuccess') })
                                setTimeout(() => {
-                                    link ? this.doRedirect(link)
-                                         : (this.complete = true, this.detail = null);
-                                }, link ? 800 : 1500);
-                            } else {
-                                this.isRepeat = false;
-                                if (res.message == 'FORM_LOGIN_REQUIRED') {
-                                    // 提交时后端仍要求登录（如登录态过期）：暂存数据，重登后自动续提交
-                                    this.savePendingSubmit();
-                                    this.$refs.login && this.$refs.login.open(this.backUrl);
-                                } else if (res.message == 'CAPTCHA_ERROR' || res.message == 'CAPTCHA_FAILURE') {
-                                    this.$util.showToast({ title: this.$lang('form.form.captchaError') });
-                                    if (behavior.captcha == 1) this.getCaptcha();
-                                } else if (res.message == 'FORM_SUBMIT_LIMIT') {
-                                    this.$util.showToast({ title: this.$lang('form.form.submitLimit') });
                                    this.complete = true;
                                    this.detail = null;
-                                } else if (res.message == 'FORM_NOT_OPEN') {
-                                    this.$util.showToast({ title: this.$lang('form.form.notOpen') });
-                                } else {
-                                    this.$util.showToast({ title: res.message });
-                                }
+                                }, 1500)
+                            } else {
+                                this.isRepeat = false;
+                                this.$util.showToast({ title: res.message })
                            }
                        }
                    });
@@ -552,48 +135,6 @@
            padding-top: 20rpx;
        }

-        .captcha-wrap {
-            display: flex;
-            align-items: center;
-            background: #fff;
-            border-radius: 12rpx;
-            padding: 16rpx 20rpx;
-            margin-top: 24rpx;
-
-            .captcha-input {
-                flex: 1;
-                height: 84rpx;
-                line-height: 84rpx;
-                font-size: 28rpx;
-                border: 1rpx solid #e5e7eb;
-                border-radius: 16rpx;
-                padding: 0 24rpx;
-                box-sizing: border-box;
-                background: #ffffff;
-            }
-
-            .captcha-img {
-                width: 200rpx;
-                height: 72rpx;
-                margin-left: 20rpx;
-                border-radius: 12rpx;
-                border: 2rpx solid #e5e7eb;
-            }
-
-            .captcha-btn {
-                margin-left: 20rpx;
-                height: 72rpx;
-                line-height: 72rpx;
-                padding: 0 24rpx;
-                font-size: 26rpx;
-                color: #ff4544;
-                background: #fff;
-                border: 2rpx solid #ff4544;
-                border-radius: 12rpx;
-                white-space: nowrap;
-            }
-        }
-
        .button {
            height: 80rpx;
            line-height: 80rpx !important;
@@ -621,4 +162,4 @@
 	bottom: 180rpx !important;
 	/* #endif */
 }
-</style>
+</style>
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -79,7 +79,7 @@ export default {
 		setPublicShare() {
 			let shareUrl = this.$config.h5Domain + '/pages_tool/help/list';
 			this.$util.setPublicShare({
-				title: this.$lang('help.list.title'),
+				title: '帮助中心',
 				desc: '',
 				link: shareUrl,
 				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
--- a/pages_tool/login/login.vue
+++ b/pages_tool/login/login.vue
@@ -7,7 +7,7 @@
 				</view>
 			</view>
 			<view class="body-wrap">
-			<view class="form-wrap">
+				<view class="form-wrap">
 					<view class="input-wrap" v-show="loginMode == 'mobile'">
 						<view class="content">
 							<!-- 	<view class="area-code">+86</view> -->
@@ -324,16 +324,16 @@ export default {
 			}
 		},
 		mobileAuthLogin(e) {
-		if (e.detail.errMsg == 'getPhoneNumber:ok') {
-			var data = {
-				iv: e.detail.iv,
-				encryptedData: e.detail.encryptedData
-			};
-			if (Object.keys(this.authInfo).length) {
-				Object.assign(data, this.authInfo);
-				if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
-				if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
-			}
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
+				var data = {
+					iv: e.detail.iv,
+					encryptedData: e.detail.encryptedData
+				};
+				if (Object.keys(this.authInfo).length) {
+					Object.assign(data, this.authInfo);
+					if (this.authInfo.nickName) data.nickname = this.authInfo.nickName;
+					if (this.authInfo.avatarUrl) data.headimg = this.authInfo.avatarUrl;
+				}
 				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');

 				if (this.isSub) return;
--- a/pages_tool/member/assets.vue
+++ b/pages_tool/member/assets.vue
@@ -95,10 +95,7 @@ export default {

 		// 判断登录
 		if (!this.storeToken) {
-			// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流:
-			// 微信小程序 / 鸿蒙下跳首页 INDEX_PAGE_URL, 走 ns-login 原生授权弹窗;
-			// H5 / APP 下跳原生登录页 LOGIN_PAGE_URL)
-			this.redirectToLoginOnce();
+			this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 		} else {
 			this.getAccountInfo();
 		}
@@ -115,8 +112,8 @@ export default {
 							this.fenxiao_info = res.data.fenxiao_info;
 						}
 					} else if (res.code == -1) {
-						// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
-						this.redirectToLoginOnce();
+						this.clearLoginState();
+						this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 					}
 				}
 			});
--- a/pages_tool/member/cancellation.vue
+++ b/pages_tool/member/cancellation.vue
@@ -20,10 +20,7 @@

 <script>
 import htmlParser from '@/common/js/html-parser';
-import memberPublic from './public/js/member-public.js';
-
 export default {
-	mixins: [memberPublic],
 	data() {
 		return {
 			agreement: {},
@@ -34,10 +31,7 @@ export default {
 		if (option.back) this.back = option.back;
 		// 判断登录
 		if (!this.storeToken) {
-			// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流:
-			// 微信小程序 / 鸿蒙下跳首页 INDEX_PAGE_URL, 走 ns-login 原生授权弹窗;
-			// H5 / APP 下跳原生登录页 LOGIN_PAGE_URL)
-			this.redirectToLoginOnce();
+			this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 		} else {
 			this.getCancelAgreement();
 		}
@@ -51,8 +45,9 @@ export default {
 						this.agreement = res.data;
 						if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
 					} else if (res.code == -1) {
-						// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
-						this.redirectToLoginOnce();
+						this.$store.commit('setToken', '');
+						this.$store.commit('setMemberInfo', '');
+						this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 					}
 				}
 			});
--- a/pages_tool/member/cancelrefuse.vue
+++ b/pages_tool/member/cancelrefuse.vue
@@ -13,10 +13,7 @@
 </template>

 <script>
-import memberPublic from './public/js/member-public.js';
-
 export default {
-	mixins: [memberPublic],
 	components: {},
 	data() {
 		return {
@@ -29,8 +26,7 @@ export default {

 		// 判断登录
 		if (!this.storeToken) {
-			// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
-			this.redirectToLoginOnce();
+			this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 		} else {
 			this.getStatus();
 		}
@@ -43,8 +39,9 @@ export default {
 					if (res.code >= 0) {
 						this.reason = res.data.reason;
 					} else if (res.code == -1) {
-						// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
-						this.redirectToLoginOnce();
+						this.$store.commit('setToken', '');
+						this.$store.commit('setMemberInfo', '');
+						this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 					}
 				}
 			});
--- a/pages_tool/member/cancelstatus.vue
+++ b/pages_tool/member/cancelstatus.vue
@@ -49,10 +49,7 @@
 		onLoad(option) {
 			// 判断登录
 			if (!this.storeToken) {
-				// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流:
-				// 微信小程序 / 鸿蒙下跳首页 INDEX_PAGE_URL, 走 ns-login 原生授权弹窗;
-				// H5 / APP 下跳原生登录页 LOGIN_PAGE_URL)
-				this.redirectToLoginOnce();
+				this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 			} else {
 				this.getStatus();
 			}
@@ -73,8 +70,8 @@
 						}

 						if (res.code == -1) {
-							// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
-							this.redirectToLoginOnce();
+							this.clearLoginState();
+							this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 						}
 					}
 				});
--- a/pages_tool/member/cancelsuccess.vue
+++ b/pages_tool/member/cancelsuccess.vue
@@ -19,10 +19,7 @@
 		components: {},
 		data() {
 			return {
-				state: '',
-				// 防抖锁: 防止 onLoad 的 getStatus 异步回调 和 用户点击 success 按钮
-				// 短时间内连发 reLaunch, 触发微信小程序 "appLaunch with non-empty page stack" native 错误
-				_navigated: false
+				state: ''
 			};
 		},
 		onLoad(option) {
@@ -31,8 +28,7 @@

 			// 判断登录
 			if (!this.storeToken) {
-				// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁)
-				this.redirectToLoginOnce();
+				this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 			} else {
 				this.getStatus();
 			}
@@ -44,17 +40,16 @@
 					success: res => {
 						if (res.code >= 0) {
 							if (res.data && res.data.status == 1) {
-								// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁)
-								// 跟 success 按钮共享防抖, 避免同时触发
-								this.redirectToLoginOnce();
+								this.clearLoginState();
+								this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 							}
 						}
 					}
 				});
 			},
 			success() {
-				// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁)
-				this.redirectToLoginOnce();
+				this.clearLoginState();
+				this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 			}
 		}
 	};
--- a/pages_tool/member/index.vue
+++ b/pages_tool/member/index.vue
@@ -113,32 +113,6 @@ export default {
 	},	
 	onShow() {
 		this.$util.hideHomeButton();
-	},
-	// 覆写 mixin 的分享钩子：优先使用推荐码组件存储的分享数据
-	onShareAppMessage() {
-		try {
-			var shareDataStr = uni.getStorageSync('_recommendShareData');
-			if (shareDataStr) {
-				uni.removeStorageSync('_recommendShareData');
-				return JSON.parse(shareDataStr);
-			}
-		} catch(e) {}
-		return this.mpShareData?.appMessage;
-	},
-	onShareTimeline() {
-		try {
-			var shareDataStr = uni.getStorageSync('_recommendShareData');
-			if (shareDataStr) {
-				uni.removeStorageSync('_recommendShareData');
-				var d = JSON.parse(shareDataStr);
-				var query = '';
-				if (d.path && d.path.indexOf('?') >= 0) {
-					query = d.path.split('?')[1];
-				}
-				return { title: d.title, query: query, imageUrl: d.imageUrl || '' };
-			}
-		} catch(e) {}
-		return this.mpShareData?.timeLine;
 	},	
 	methods: {

--- a/pages_tool/member/public/js/member-public.js
+++ b/pages_tool/member/public/js/member-public.js
@@ -1,6 +1,6 @@
 export default {
 	methods: {
-		// 清除登录态（token / 会员信息 / 购物车 / 本地存储）
+		// 清除登录态（token / 用户信息 / 购物车 / 本地存储）
 		clearLoginState() {
 			this.$store.commit('setToken', '');
 			this.$store.commit('setMemberInfo', '');
@@ -9,48 +9,6 @@ export default {
 			uni.removeStorageSync('privacyAgreed');
 		},

-		// 跨平台登录入口:小程序下用 ns-login 原生授权弹窗 (走 wx.login / getPhoneNumber),
-		// H5 / 快应用 / APP 下用原生登录页 /pages_tool/login/login (手机号+动态码表单).
-		//
-		// 修复背景: 之前所有跳转统一用 LOGIN_PAGE_URL (/pages_tool/login/login),
-		// 这个原生登录页在微信小程序下是 form 提交 (像 H5), 没有走 wx.login 授权。
-		// 期望行为:
-		//   - 微信小程序 / 鸿蒙元服务 / 其他小程序: 跳到首页 /pages/index/index,
-		//     首页挂载了 <ns-login ref="login">, 用户后续操作触发 _requireHomeAuth
-		//     时会自动弹 ns-login 弹窗, 走原生 wx.login / getPhoneNumber 授权.
-		//   - H5 / 快应用 / APP: 保持跳 LOGIN_PAGE_URL (原生登录页), 表单流程正常.
-		getLoginEntryUrl() {
-			// #ifdef MP-WEIXIN || MP-HARMONY || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-KUAISHOU || MP-JD || MP-360 || MP-XHS
-			return this.$util.INDEX_PAGE_URL;
-			// #endif
-			// #ifndef MP-WEIXIN || MP-HARMONY || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-KUAISHOU || MP-JD || MP-360 || MP-XHS
-			return this.$util.LOGIN_PAGE_URL;
-			// #endif
-		},
-
-		// 统一的"跳登录入口"封装, 包含组件级防抖锁 + 清登录态 + reLaunch
-		//
-		// 为什么需要防抖: 微信小程序下, 短时间内连发 reLaunch 会触发
-		// "appLaunch with non-empty page stack" native 错误 (页面销毁未完成, 新 launch 时栈非空).
-		// 注销/退出流程中常见并发场景:
-		//   - cancelsuccess.vue onLoad 调 getStatus 异步回调 + 用户点 "完成" 按钮
-		//   - 多个 submitCancelApply 同时被触发
-		// 防抖策略: 同一组件实例 800ms 内只能跳一次, 之后忽略
-		// (util.js reLaunch 分支还有 300ms 全局锁作为第二道防线)
-		redirectToLoginOnce() {
-			// 组件级防抖: 800ms 内重复调用直接忽略
-			const now = Date.now();
-			if (this._lastLoginRedirectAt && now - this._lastLoginRedirectAt < 800) {
-				console.warn('[member-public] redirectToLoginOnce 防抖: 800ms 内重复调用已忽略');
-				return;
-			}
-			this._lastLoginRedirectAt = now;
-			this.clearLoginState();
-			// 小程序下 getLoginEntryUrl() 返回首页 (走 ns-login 原生授权弹窗),
-			// H5 / APP 下返回原生登录页 (form 提交)
-			this.$util.redirectTo(this.getLoginEntryUrl(), {}, 'reLaunch');
-		},
-
 		// 退出登录
 		logout() {
 			uni.showModal({
@@ -58,8 +16,8 @@ export default {
 				content: this.$lang('logoutContent'),
 				success: (res) => {
 					if (res.confirm) {
-						// 统一的跳登录入口: 内部带防抖锁, 避免连发 reLaunch
-						this.redirectToLoginOnce();
+						this.clearLoginState();
+						this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 					}
 				}
 			});
@@ -92,8 +50,8 @@ export default {
 							this.$util.redirectTo('/pages_tool/member/cancellation');
 						}
 					} else if (res.code == -1) {
-						// 统一的跳登录入口: 内部带防抖锁, 避免连发 reLaunch
-						this.redirectToLoginOnce();
+						this.clearLoginState();
+						this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 					}
 				}
 			});
@@ -111,15 +69,11 @@ export default {
 							url: '/membercancel/api/membercancel/apply',
 							success: rres => {
 								if (rres.code >= 0) {
-									// 注销申请提交成功后立刻清空登录态,
-									// 避免用户通过标题栏/导航栏返回到会员中心等页面时仍能看到账号信息
 									if (options.clearStateAndRedirect) {
-										// 跳登录入口: 内部带防抖锁, 避免连发 reLaunch
-										this.redirectToLoginOnce();
-									} else {
-										// 跳 cancelstatus (审核中), 也走 reLaunch 清栈
 										this.clearLoginState();
-										this.$util.redirectTo('/pages_tool/member/cancelstatus', {}, 'reLaunch');
+										this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
+									} else {
+										this.$util.redirectTo('/pages_tool/member/cancelstatus');
 									}
 								} else {
 									this.$util.showToast({
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -77,7 +77,7 @@ export default {
 		setPublicShare() {
 			let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
 			this.$util.setPublicShare({
-				title: this.$lang('notice.list.title'),
+				title: '公告',
 				desc: '',
 				link: shareUrl,
 				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
@@ -85,7 +85,7 @@ export default {
 		}
 	},
 	onShareAppMessage(res) {
-		var title = this.$lang('notice.list.title');
+		var title = '公告';
 		var path = '/pages_tool/notice/list';
 		return {
 			title: title,
--- a/pages_tool/pay/index.vue
+++ b/pages_tool/pay/index.vue
@@ -51,7 +51,7 @@ export default {
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					} else {
 						this.$util.showToast({
-							title: this.$lang('pay.index.payInfoNotFound')
+							title: '未获取到支付信息！'
 						});
 						setTimeout(() => {
 							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
--- a/pages_tool/vr/index.vue
+++ b/pages_tool/vr/index.vue
@@ -1,6 +1,9 @@
 <template>
-	<view :style="themeColor" class="vr-page">
-		<web-view :src="src" class="vr-webview" @titleUpdate="forceCustomTitle"></web-view>
+	<view :style="themeColor">
+		<web-view :src="src"></web-view>
+		<!-- 顶部导航覆盖层:使用 cover-view 兼容微信小程序的 web-view 原生组件 -->
+		<cover-view class="vr-nav-back icondiy icon-system-arrow-go-back-line" @click="navigateBack"></cover-view>
+		<cover-view class="vr-nav-home icondiy icon-system-home-2-line" @click="goHome"></cover-view>
 	</view>
 </template>

@@ -8,73 +11,72 @@
 export default {
 	data() {
 		return {
-			src: '',
-			title: '',
-			customTitle: '',
-			titleTimer: null
+			src: ''
 		};
 	},
 	onLoad(option) {
-		this.customTitle = option?.title || '工厂展示';
-		this.title = this.customTitle;
-		uni.setNavigationBarTitle({ title: this.customTitle });
+		// this.src = decodeURIComponent(option.src);
 		this.$api.sendRequest({
 			url: '/api/config/defaultvr',
 			success: res => {
 				if (res.code == 0) {
-					this.customTitle = res.data.title;
-					this.title = this.customTitle;
-					uni.setNavigationBarTitle({ title: this.customTitle });
-					this.src = res.data.url;
-					this.startTitleGuard();
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+					this.src = res.data.url
 				}
 			},
 			fail: res => {
 			}
 		});
 	},
-	onShow() {
-		if (this.customTitle) {
-			uni.setNavigationBarTitle({ title: this.customTitle });
-		}
-	},
-	onUnload() {
-		this.clearTitleGuard();
-	},
 	methods: {
-		forceCustomTitle() {
-			uni.setNavigationBarTitle({ title: this.customTitle });
-		},
-		startTitleGuard() {
-			this.clearTitleGuard();
-			let count = 0;
-			this.titleTimer = setInterval(() => {
-				uni.setNavigationBarTitle({ title: this.customTitle });
-				count++;
-				if (count >= 10) {
-					this.clearTitleGuard();
-				}
-			}, 100);
-		},
-		clearTitleGuard() {
-			if (this.titleTimer) {
-				clearInterval(this.titleTimer);
-				this.titleTimer = null;
+		navigateBack() {
+			const pages = getCurrentPages();
+			if (pages.length > 1) {
+				uni.navigateBack({
+					delta: 1
+				});
+			} else {
+				// 直接进入的场景(分享链接 / 外部链接 / 扫码等),页面栈只有当前页,
+				// navigateBack 会失败。重定向到首页,保证用户能离开 VR 页面。
+				uni.reLaunch({
+					url: this.$util.PAGE_KEY_MAP.PAGE_INDEX
+				});
 			}
+		},
+		goHome() {
+			uni.reLaunch({
+				url: this.$util.PAGE_KEY_MAP.PAGE_INDEX
+			});
 		}
 	}
 };
 </script>

 <style lang="scss">
-.vr-page {
-	height: 100vh;
-	width: 100%;
-	background: #fff;
+.vr-nav-back,
+.vr-nav-home {
+	position: absolute;
+	top: 34rpx;
+	z-index: 5;
+	width: 72rpx;
+	height: 72rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	color: #fff;
+	border-radius: 50%;
+	text-align: center;
+	box-sizing: border-box;
 }

-.vr-webview {
-	width: 100%;
-	height: 100%;
+.vr-nav-back {
+	left: 34rpx;
+	line-height: 60rpx;
+}
+
+.vr-nav-home {
+	right: 34rpx;
+	font-size: 40rpx;
+	line-height: 72rpx;
 }
 </style>
--- a/remove-huawei-node-from-path.ps1
+++ b/remove-huawei-node-from-path.ps1
@@ -1,62 +0,0 @@
-$ErrorActionPreference = 'Stop'
-
-$target = 'C:\Program Files\Huawei QuickApp IDE\resources\app\extensions\deveco-debug\lib\toolkit\nodeTool'
-
-$before = [Environment]::GetEnvironmentVariable('Path', 'Machine')
-
-Write-Host '=== Before: target entries in Machine PATH ==='
-$before -split ';' | ForEach-Object {
-    if ($_.Trim() -ieq $target) {
-        Write-Host ("  [" + $_ + "]")
-    }
-}
-
-$entries = $before -split ';'
-$kept = New-Object System.Collections.Generic.List[string]
-$removed = New-Object System.Collections.Generic.List[string]
-foreach ($e in $entries) {
-    $t = $e.Trim()
-    if ($t -ieq $target) {
-        $removed.Add($e)
-    } elseif ($t -ne '') {
-        $kept.Add($e)
-    }
-}
-$after = [string]::Join(';', $kept.ToArray())
-
-if ($removed.Count -eq 0) {
-    Write-Host 'Target entry not found, nothing to do.'
-    exit 0
-}
-
-try {
-    [Environment]::SetEnvironmentVariable('Path', $after, 'Machine')
-    Write-Host ''
-    Write-Host '=== Result ==='
-    Write-Host ("  Removed entries: " + $removed.Count)
-    foreach ($r in $removed) { Write-Host ("    - " + $r) }
-    Write-Host ("  Remaining entries: " + $kept.Count)
-    Write-Host '  Write OK.'
-} catch {
-    Write-Host ''
-    Write-Host ('  Write FAILED (admin required?): ' + $_.Exception.Message)
-    exit 1
-}
-
-Write-Host ''
-Write-Host '=== Verify after write ==='
-$verify = [Environment]::GetEnvironmentVariable('Path', 'Machine')
-$stillThere = 0
-foreach ($e in ($verify -split ';')) {
-    if ($e.Trim() -ieq $target) { $stillThere++ }
-}
-if ($stillThere -gt 0) {
-    Write-Host '  FAIL: target still present.'
-    exit 1
-} else {
-    Write-Host '  OK: target no longer in Machine PATH.'
-}
-
-Write-Host ''
-Write-Host 'Note: env var change does NOT affect already-running processes.'
-Write-Host 'Reopen cmd / Git Bash / HBuilderX to see updated where node.'
--- a/scripts/check-subpackage-sync.js
+++ b/scripts/check-subpackage-sync.js
@@ -1,209 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-console */
-/**
- * scripts/check-subpackage-sync.js
- *
- * 检查 mp-harmony 项目的子包 HAR 配置在 4 个地方是否同步:
- *   1. mp-harmony/build-profile.json5 的 modules 数组
- *   2. entry/oh-package.json5 的 dependencies
- *   3. entry/har-deps-required.json5 的 requiredHarDeps (单一事实源)
- *   4. ascf_build 实际目录
- *
- * 任何一处不一致 → 立即报错并指出哪一处需要修改。
- * 防止新增/删除子包时漏改某处导致 build/runtime 故障。
- *
- * 使用:
- *   node scripts/check-subpackage-sync.js
- *   node scripts/check-subpackage-sync.js --strict  # 不一致即 exit 1 (CI 用)
- *
- * 输出:
- *   ✓ 5 个子包配置完全一致
- *   或
- *   ✘ 缺失 [pages_extra] 在以下位置:
- *     - build-profile.json5 (mp-harmony)
- *     - entry/oh-package.json5
- *     建议操作: ...
- */
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const JSON5 = require('json5');
-
-function loadJson5(filePath) {
-  const raw = fs.readFileSync(filePath, 'utf8');
-  return JSON5.parse(raw);
-}
-
-function exists(p) {
-  try {
-    fs.accessSync(p, fs.constants.F_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function listDirs(p) {
-  try {
-    return fs.readdirSync(p, { withFileTypes: true })
-      .filter(e => e.isDirectory())
-      .map(e => e.name)
-      .sort();
-  } catch {
-    return [];
-  }
-}
-
-function diff(a, b) {
-  const aSet = new Set(a);
-  const bSet = new Set(b);
-  const onlyA = [...aSet].filter(x => !bSet.has(x));
-  const onlyB = [...bSet].filter(x => !aSet.has(x));
-  return { onlyA, onlyB };
-}
-
-function color(s, c) {
-  if (!process.stdout.isTTY) return s;
-  const codes = { red: '\x1b[31m', green: '\x1b[32m', yellow: '\x1b[33m', cyan: '\x1b[36m', gray: '\x1b[90m', reset: '\x1b[0m' };
-  return codes[c] + s + codes.reset;
-}
-
-function main() {
-  const ROOT = path.resolve(__dirname, '..');
-  const strict = process.argv.includes('--strict');
-
-  // === 单一事实源: har-deps-required.json5 ===
-  const configPath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'entry', 'har-deps-required.json5');
-  if (!exists(configPath)) {
-    console.error(color(`✘ 缺少白名单配置: ${configPath}`, 'red'));
-    process.exit(strict ? 1 : 0);
-  }
-  const config = loadJson5(configPath);
-  const canonical = (config.requiredHarDeps || []).slice().sort();
-  console.log(color('=== mp-harmony 子包配置一致性检查 ===', 'cyan'));
-  console.log(`白名单 (har-deps-required.json5): ${canonical.join(', ')}\n`);
-
-  const errors = [];
-  const warnings = [];
-
-  // === 检查 1: mp-harmony/build-profile.json5 的 modules 数组 ===
-  const buildProfilePath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'build-profile.json5');
-  const buildProfileModules = [];
-  if (!exists(buildProfilePath)) {
-    errors.push(`build-profile.json5 不存在: ${buildProfilePath}`);
-  } else {
-    try {
-      const bp = loadJson5(buildProfilePath);
-      // modules 是顶层数组, 包含 entry + 5 个子包
-      // entry 也算一个 module, 但它不在我们的白名单里
-      const moduleNames = (bp.modules || []).map(m => m.name).filter(n => n && n !== 'entry');
-      buildProfileModules.push(...moduleNames);
-      const d = diff(canonical, buildProfileModules);
-      if (d.onlyA.length) {
-        errors.push(`build-profile.json5 缺失子包: [${d.onlyA.join(', ')}]`);
-        console.log(`  ${color('✘', 'red')} build-profile.json5: 缺失 [${d.onlyA.join(', ')}]`);
-      } else if (d.onlyB.length) {
-        errors.push(`build-profile.json5 多了子包: [${d.onlyB.join(', ')}]`);
-        console.log(`  ${color('✘', 'red')} build-profile.json5: 多了 [${d.onlyB.join(', ')}]`);
-      } else {
-        console.log(`  ${color('✔', 'green')} build-profile.json5: ${buildProfileModules.length} 个子包模块与白名单一致`);
-      }
-    } catch (e) {
-      errors.push(`build-profile.json5 解析失败: ${e.message}`);
-    }
-  }
-
-  // === 检查 2: entry/oh-package.json5 的 dependencies ===
-  const ohPkgPath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'entry', 'oh-package.json5');
-  const ohPkgDeps = [];
-  if (!exists(ohPkgPath)) {
-    errors.push(`entry/oh-package.json5 不存在: ${ohPkgPath}`);
-  } else {
-    try {
-      const op = loadJson5(ohPkgPath);
-      const deps = op.dependencies || {};
-      // 提取 5 个 file: 依赖 (key 是包名)
-      ohPkgDeps.push(...Object.keys(deps).filter(k => deps[k] && deps[k].startsWith('file:')));
-      const d = diff(canonical, ohPkgDeps);
-      if (d.onlyA.length) {
-        errors.push(`entry/oh-package.json5 缺失 file: 依赖: [${d.onlyA.join(', ')}]`);
-        console.log(`  ${color('✘', 'red')} entry/oh-package.json5: 缺失 [${d.onlyA.join(', ')}]`);
-      } else if (d.onlyB.length) {
-        warnings.push(`entry/oh-package.json5 多了 file: 依赖: [${d.onlyB.join(', ')}] (可能是新的子包还未更新白名单)`);
-        console.log(`  ${color('⚠', 'yellow')} entry/oh-package.json5: 多了 [${d.onlyB.join(', ')}]`);
-      } else {
-        console.log(`  ${color('✔', 'green')} entry/oh-package.json5: ${ohPkgDeps.length} 个 file: 依赖与白名单一致`);
-      }
-    } catch (e) {
-      errors.push(`entry/oh-package.json5 解析失败: ${e.message}`);
-    }
-  }
-
-  // === 检查 3: ascf_build 实际目录 ===
-  const ascfBuildRoot = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'ascf', 'ascf_build');
-  const ascfBuildDirs = listDirs(ascfBuildRoot);
-  const ascfBuildD = diff(canonical, ascfBuildDirs);
-  if (ascfBuildD.onlyA.length) {
-    errors.push(`ascf_build/ 目录缺失子包: [${ascfBuildD.onlyA.join(', ')}]`);
-    console.log(`  ${color('✘', 'red')} ascf_build/: 缺失 [${ascfBuildD.onlyA.join(', ')}]`);
-  } else if (ascfBuildD.onlyB.length) {
-    warnings.push(`ascf_build/ 多了子包: [${ascfBuildD.onlyB.join(', ')}] (可能是历史遗留)`);
-    console.log(`  ${color('⚠', 'yellow')} ascf_build/: 多了 [${ascfBuildD.onlyB.join(', ')}]`);
-  } else {
-    console.log(`  ${color('✔', 'green')} ascf_build/: ${ascfBuildDirs.length} 个子包目录与白名单一致`);
-  }
-
-  // === 检查 4: 每个子包的关键文件是否齐全 ===
-  console.log(color('--- 子包关键文件检查 ---', 'cyan'));
-  for (const pkg of canonical) {
-    const pkgRoot = path.join(ascfBuildRoot, pkg);
-    const requiredFiles = [
-      'oh-package.json5',
-      'build-profile.json5',
-      'hvigorfile.ts',
-      'obfuscation-rules.txt',
-      'src/main/module.json5',
-    ];
-    const missing = requiredFiles.filter(f => !exists(path.join(pkgRoot, f)));
-    if (missing.length) {
-      errors.push(`${pkg} 缺失文件: [${missing.join(', ')}]`);
-      console.log(`  ${color('✘', 'red')} ${pkg}: 缺失 [${missing.join(', ')}]`);
-    } else {
-      console.log(`  ${color('✔', 'green')} ${pkg}: 关键文件齐备`);
-    }
-  }
-
-  // === 总结 ===
-  console.log();
-  if (warnings.length) {
-    console.log(color(`警告 (${warnings.length}):`, 'yellow'));
-    for (const w of warnings) console.log('  - ' + w);
-  }
-  if (errors.length) {
-    console.log();
-    console.log(color(`错误 (${errors.length}):`, 'red'));
-    for (const e of errors) console.log('  - ' + e);
-    console.log();
-    console.log(color('✘ 子包配置不一致, 鸿蒙构建可能失败。', 'red'));
-    console.log(color('  修复步骤:', 'gray'));
-    console.log(color('  1. 修改 entry/har-deps-required.json5 的 requiredHarDeps (单一事实源)', 'gray'));
-    console.log(color('  2. 在 ascf_build/<pkg>/ 创建新子包模板 (含 oh-package.json5 / build-profile.json5 / ...) ', 'gray'));
-    console.log(color('  3. 在 mp-harmony/build-profile.json5 的 modules 数组加新模块', 'gray'));
-    console.log(color('  4. 在 entry/oh-package.json5 的 dependencies 加 "file:../ascf/ascf_build/<pkg>"', 'gray'));
-    console.log(color('  5. 在 DevEco Sync 项目 (让 ohpm 处理 file: 依赖)', 'gray'));
-    console.log(color('  6. 跑 node scripts/check-subpackage-sync.js --strict 验证', 'gray'));
-    process.exit(strict ? 1 : 0);
-  }
-
-  console.log(color(`✔ 5 个子包配置完全一致 (${canonical.length} 个包)`, 'green'));
-  process.exit(0);
-}
-
-try {
-  main();
-} catch (e) {
-  console.error(color(`脚本异常: ${e.stack || e.message}`, 'red'));
-  process.exit(1);
-}
--- a/scripts/check-title-keys.js
+++ b/scripts/check-title-keys.js
@@ -1,58 +0,0 @@
-// 检查 20 个硬编码导航标题的页面,其语言包是否都有 title key
-const paths = [
-    ['pages_goods/category','商品分类'],
-    ['pages_goods/cart','购物车'],
-    ['pages_goods/detail','商品详情'],
-    ['pages_goods/list','商品列表'],
-    ['pages_promotion/merch/merchcategory','入驻商户'],
-    ['pages_promotion/merch/detail','商户首页'],
-    ['pages_promotion/fenxiao/ranking_list','排行榜'],
-    ['pages_promotion/fenxiao/child_fenxiao','分销商'],
-    ['pages_tool/ai-chat/index','AI智能客服'],
-    ['pages_tool/contact/contact','电子名片'],
-    ['pages_tool/member/info','个人资料'],
-    ['pages_tool/order/activist','退款'],
-    ['pages_tool/login/login','登录'],
-    ['pages_tool/weapp/order_shipping','小程序发货'],
-    ['pages_tool/seal/structure','结构选型'],
-    ['pages_tool/seal/medium/search','介质材料搜索'],
-    ['pages_tool/seal/medium/detail','搜索结果'],
-    ['pages_tool/cases/index','案例展示'],
-    ['pages_tool/files/list','查看文件'],
-    ['pages_tool/file-preview/file-preview','文件预览'],
-];
-
-function toLang(p) {
-    const parts = p.split('/');
-    if (parts[0] === 'pages_tool') return parts.slice(1).join('/');
-    if (parts[0] === 'pages_goods') return 'goods/' + parts.slice(1).join('/');
-    if (parts[0] === 'pages_member') return 'member/' + parts.slice(1).join('/');
-    if (parts[0] === 'pages_order') return 'order/' + parts.slice(1).join('/');
-    if (parts[0] === 'pages_promotion') {
-        if (['point','fenxiao','merch'].includes(parts[1])) return parts.slice(1).join('/');
-        return parts.slice(1).join('/');
-    }
-    return p;
-}
-
-const fs = require('fs');
-const path = require('path');
-
-for (const [p, hardcoded] of paths) {
-    const lp = toLang(p);
-    for (const loc of ['zh-cn','en-us']) {
-        const fp = path.join('lang', loc, lp + '.js');
-        if (!fs.existsSync(fp)) {
-            console.log(`MISSING ${loc}/${lp}`);
-            continue;
-        }
-        try {
-            const m = require(path.resolve(fp)).lang;
-            const title = m && m.title;
-            const status = title === undefined ? 'NO title' : (title === hardcoded ? 'ZH-only?' : 'OK');
-            console.log(`${loc}/${lp}.title = ${JSON.stringify(title)} [${status}]`);
-        } catch (e) {
-            console.log(`ERR ${loc}/${lp}: ${e.message}`);
-        }
-    }
-}
--- a/scripts/fix-subpackage-module-names.js
+++ b/scripts/fix-subpackage-module-names.js
@@ -1,429 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-console */
-/**
- * scripts/fix-subpackage-module-names.js
- *
- * 修正 ascf_build/<pkg>/ 子包 HAR 元数据中的 name 字段,确保鸿蒙工具链
- * (ohpm install / hvigor schema / 运行时依赖解析) 一致通过。
- *
- * 涉及两个文件:
- *   1. ascf_build/<pkg>/oh-package.json5       — top-level `name`
- *      ohpm install 会读取这个字段,空字符串会报:
- *        "00604007 Field IS Empty Error: The name of package .../pages_tool cannot be empty"
- *
- *   2. ascf_build/<pkg>/src/main/module.json5  — `module.name`
- *      hvigor build 时 schema 校验要求匹配 ^[a-zA-Z][0-9a-zA-Z_.]*$,
- *      空字符串会报:
- *        "Schema validate failed: must match pattern ^[a-zA-Z][0-9a-zA-Z_.]*$"
- *
- * 修复策略:
- *   遍历 SUBPACKAGE_NAMES 数组里的包, 用包目录名覆盖两处的 name,
- *   保留其他字段 (version / description / dependencies / deviceTypes 等)。
- *   如果文件不存在, 按合理默认值新建一份。
- *
- * 使用方式:
- *   # 命令 1: 直接跑这个脚本
- *   node scripts/fix-subpackage-module-names.js
- *
- *   # 命令 2: 作为模块 require
- *   node -e "require('./scripts/fix-subpackage-module-names').fixSubpackageModuleNames()"
- *
- *   # 命令 3: 由 vue.config.js 顶层 IIFE 自动调用
- *   # (HBuilderX / vue-cli-service / node -e 触发时, 自动执行)
- *
- *   # CI 兜底校验:
- *   node stub-app-projects/mp-harmony/entry/scripts/check-har-deps.js --strict
- */
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const SUBPACKAGE_NAMES = [
-  'components_diy',
-  'pages_goods',
-  'pages_order',
-  'pages_promotion',
-  'pages_tool',
-];
-
-/**
- * 修正 ascf_build/<pkg>/ 子包的 name 字段 (oh-package.json5 + module.json5)
- *
- * @param {object} [opts]
- * @param {string} [opts.ascfBuildRoot] - ascf_build 根目录, 默认基于本脚本位置推算
- * @param {boolean} [opts.silent=false] - true 时不打日志
- * @returns {{fixedCount: number, results: Array<{pkg: string, file: string, status: 'created'|'fixed'|'unchanged'|'error', message?: string}>}}
- */
-function fixSubpackageModuleNames({ ascfBuildRoot, silent = false } = {}) {
-  const root = ascfBuildRoot
-    || path.resolve(__dirname, '..', 'stub-app-projects', 'mp-harmony', 'ascf', 'ascf_build');
-  const log = silent ? () => {} : console.log;
-  log(`\n🔧 [fix-subpackage-module-names] 修正 ascf_build 子包 name (oh-package.json5 + module.json5)...`);
-
-  const results = [];
-
-  for (const pkg of SUBPACKAGE_NAMES) {
-    results.push(...fixOhPackageJson5({ pkg, root, silent: true, log }));
-    results.push(...fixModuleJson5({ pkg, root, silent: true, log }));
-  }
-
-  const fixedCount = results.filter(r => r.status === 'fixed' || r.status === 'created').length;
-  log(`   📊 修正完成: ${fixedCount} 个文件被更新\n`);
-  return { fixedCount, results };
-}
-
-/**
- * 修正 ascf_build/<pkg>/oh-package.json5 的 top-level `name` 字段
- *
- * 默认内容参考项目内已有 HAR (components_diy / pages_goods 等):
- *   {
- *     "name": "<pkg>",
- *     "version": "1.0.0",
- *     "description": "Please describe the basic information.",
- *     "main": "Index.ets",
- *     "author": "",
- *     "license": "Apache-2.0",
- *     "packageType": "InterfaceHar",
- *     "dependencies": {}
- *   }
- */
-function fixOhPackageJson5({ pkg, root, silent, log }) {
-  const ohPkgJson5Path = path.join(root, pkg, 'oh-package.json5');
-  const defaultDoc = {
-    name: pkg,
-    version: '1.0.0',
-    description: 'Please describe the basic information.',
-    main: 'Index.ets',
-    author: '',
-    license: 'Apache-2.0',
-    packageType: 'InterfaceHar',
-    dependencies: {},
-  };
-
-  let current = null;
-  if (fs.existsSync(ohPkgJson5Path)) {
-    try {
-      // oh-package.json5 是 JSON5, 可能含 // 注释。Node 内置 JSON.parse 不能处理,
-      // 用 stripJson5Comments + JSON.parse 处理最常见情况。
-      const raw = fs.readFileSync(ohPkgJson5Path, 'utf8');
-      const cleaned = stripJson5Comments(raw);
-      current = JSON.parse(cleaned);
-    } catch (e) {
-      if (!silent) log(`   ⚠️ ${pkg}/oh-package.json5 解析失败, 使用默认: ${e.message}`);
-      current = null;
-    }
-  }
-
-  const relPath = `${pkg}/oh-package.json5`;
-  if (!current || typeof current !== 'object') {
-    try {
-      fs.mkdirSync(path.dirname(ohPkgJson5Path), { recursive: true });
-      fs.writeFileSync(ohPkgJson5Path, JSON.stringify(defaultDoc, null, 2) + '\n', 'utf8');
-      if (!silent) log(`   🆕 ${relPath}: 已创建 (name="${pkg}")`);
-      return [{ pkg, file: 'oh-package.json5', status: 'created' }];
-    } catch (e) {
-      if (!silent) log(`   ❌ ${relPath}: 创建失败: ${e.message}`);
-      return [{ pkg, file: 'oh-package.json5', status: 'error', message: e.message }];
-    }
-  }
-
-  const oldName = current.name;
-  if (oldName !== pkg) {
-    current.name = pkg;
-    try {
-      fs.writeFileSync(ohPkgJson5Path, JSON.stringify(current, null, 2) + '\n', 'utf8');
-      if (!silent) log(`   ✅ ${relPath}: name "${oldName || '(空)'}" → "${pkg}"`);
-      return [{ pkg, file: 'oh-package.json5', status: 'fixed', oldName }];
-    } catch (e) {
-      if (!silent) log(`   ❌ ${relPath}: 写入失败: ${e.message}`);
-      return [{ pkg, file: 'oh-package.json5', status: 'error', message: e.message }];
-    }
-  }
-
-  if (!silent) log(`   ✔️  ${relPath}: name = "${pkg}" (无须修正)`);
-  return [{ pkg, file: 'oh-package.json5', status: 'unchanged' }];
-}
-
-/**
- * 修正 ascf_build/<pkg>/src/main/module.json5 的 `module.name` 字段
- */
-function fixModuleJson5({ pkg, root, silent, log }) {
-  const moduleJson5Path = path.join(root, pkg, 'src', 'main', 'module.json5');
-  const defaultDoc = {
-    module: {
-      name: pkg,
-      type: 'shared',
-      description: 'subpackage',
-      deviceTypes: ['phone', 'tablet'],
-      deliveryWithInstall: true,
-      installationFree: true,
-    },
-  };
-
-  let current = null;
-  if (fs.existsSync(moduleJson5Path)) {
-    try {
-      const raw = fs.readFileSync(moduleJson5Path, 'utf8');
-      const cleaned = stripJson5Comments(raw);
-      current = JSON.parse(cleaned);
-    } catch (e) {
-      if (!silent) log(`   ⚠️ ${pkg}/src/main/module.json5 解析失败, 使用默认: ${e.message}`);
-      current = null;
-    }
-  }
-
-  const relPath = `${pkg}/src/main/module.json5`;
-  if (!current || !current.module || typeof current.module !== 'object') {
-    try {
-      fs.mkdirSync(path.dirname(moduleJson5Path), { recursive: true });
-      fs.writeFileSync(moduleJson5Path, JSON.stringify(defaultDoc, null, 2) + '\n', 'utf8');
-      if (!silent) log(`   🆕 ${relPath}: 已创建 (name="${pkg}")`);
-      return [{ pkg, file: 'module.json5', status: 'created' }];
-    } catch (e) {
-      if (!silent) log(`   ❌ ${relPath}: 创建失败: ${e.message}`);
-      return [{ pkg, file: 'module.json5', status: 'error', message: e.message }];
-    }
-  }
-
-  const oldName = current.module.name;
-  if (oldName !== pkg) {
-    current.module.name = pkg;
-    try {
-      fs.writeFileSync(moduleJson5Path, JSON.stringify(current, null, 2) + '\n', 'utf8');
-      if (!silent) log(`   ✅ ${relPath}: module.name "${oldName || '(空)'}" → "${pkg}"`);
-      return [{ pkg, file: 'module.json5', status: 'fixed', oldName }];
-    } catch (e) {
-      if (!silent) log(`   ❌ ${relPath}: 写入失败: ${e.message}`);
-      return [{ pkg, file: 'module.json5', status: 'error', message: e.message }];
-    }
-  }
-
-  if (!silent) log(`   ✔️  ${relPath}: module.name = "${pkg}" (无须修正)`);
-  return [{ pkg, file: 'module.json5', status: 'unchanged' }];
-}
-
-/**
- * 简单 JSON5 注释剥离
- * 处理 // 单行注释 和 /* 块注释 *\/, 跳过字符串字面量内的 //
- * 注意: 不处理裸 key、单引号字符串、Unicode 转义等 JSON5 扩展
- *       (本项目实际遇到的文件都是标准 JSON + 注释, 足够覆盖)
- */
-function stripJson5Comments(input) {
-  let out = '';
-  let i = 0;
-  const n = input.length;
-  while (i < n) {
-    const c = input[i];
-    const next = i + 1 < n ? input[i + 1] : '';
-    if (c === '/' && next === '*') {
-      i += 2;
-      while (i < n && !(input[i] === '*' && input[i + 1] === '/')) i++;
-      i += 2;
-      continue;
-    }
-    if (c === '/' && next === '/') {
-      i += 2;
-      while (i < n && input[i] !== '\n') i++;
-      continue;
-    }
-    if (c === '"' || c === "'") {
-      const quote = c;
-      out += c;
-      i++;
-      while (i < n) {
-        const sc = input[i];
-        if (sc === '\\') {
-          out += sc + (input[i + 1] || '');
-          i += 2;
-          continue;
-        }
-        out += sc;
-        i++;
-        if (sc === quote) break;
-      }
-      continue;
-    }
-    out += c;
-    i++;
-  }
-  return out;
-}
-
-// 顶层 IIFE: 直接执行脚本时自动跑 (CLI 行为)
-function main() {
-  try {
-    fixSubpackageModuleNames();
-  } catch (e) {
-    console.error('[fix-subpackage-module-names] 执行失败:', e.message);
-    process.exit(1);
-  }
-}
-
-/**
- * 同步子包配置一致性检查 (被 vue.config.js 顶层 IIFE 调用)
- *
- * 用途: HBuilderX 触发 require('./vue.config.js') 时, 在修完 name 之后
- *       跑一次 4 处一致性检查, 立即告诉用户哪些地方没改。
- *
- * 检查项 (复用 SUBPACKAGE_NAMES 数组):
- *   1. mp-harmony/build-profile.json5 的 modules 数组 (排除 entry)
- *   2. entry/oh-package.json5 的 file: 依赖
- *   3. ascf_build 实际目录
- *
- * 与 scripts/check-subpackage-sync.js 的区别:
- *   - check-subpackage-sync.js: CLI/CI 用, --strict 可 exit 1
- *   - runSyncCheck: vue.config.js IIFE 用, 默认不抛错, 仅打印
- *
- * @param {object} [opts]
- * @param {boolean} [opts.silent=false]  - true 时不打日志
- * @param {boolean} [opts.exitOnError=false] - true 时不一致即抛错 (CLI 模式)
- * @returns {{ok: boolean, errors: string[], warnings: string[]}}
- */
-function runSyncCheck({ silent = false, exitOnError = false } = {}) {
-  const log = silent ? () => {} : console.log;
-  const ROOT = path.resolve(__dirname, '..');
-
-  // 读取白名单 (从 har-deps-required.json5 拿, 与 check-subpackage-sync.js 保持一致)
-  // 注: 优先用 json5 npm 包 (项目已装), 失败则回退到内置 SUBPACKAGE_NAMES
-  const configPath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'entry', 'har-deps-required.json5');
-  let canonical = SUBPACKAGE_NAMES.slice().sort();
-  try {
-    if (fs.existsSync(configPath)) {
-      const raw = fs.readFileSync(configPath, 'utf8');
-      let cfg = null;
-      try {
-        // 优先: json5 包 (支持裸 key, 注释, 单引号字符串)
-        cfg = require('json5').parse(raw);
-      } catch (e1) {
-        // 回退: 手写 JSON5 解析 (剥注释后用 JSON.parse)
-        try {
-          const cleaned = stripJson5Comments(raw);
-          cfg = JSON.parse(cleaned);
-        } catch (e2) {
-          if (!silent) console.warn(`   ⚠️ har-deps-required.json5 解析失败 (json5: ${e1.message}; json: ${e2.message}), 用内置 SUBPACKAGE_NAMES`);
-        }
-      }
-      if (cfg && Array.isArray(cfg.requiredHarDeps) && cfg.requiredHarDeps.length) {
-        canonical = cfg.requiredHarDeps.slice().sort();
-      }
-    }
-  } catch (e) {
-    if (!silent) console.warn('   ⚠️ 读取 har-deps-required.json5 失败, 用内置 SUBPACKAGE_NAMES:', e.message);
-  }
-
-  const canonicalSet = new Set(canonical);
-  const errors = [];
-  const warnings = [];
-
-  // 工具: 列出某目录下的子目录
-  function listSubdirs(p) {
-    try {
-      return fs.readdirSync(p, { withFileTypes: true })
-        .filter(e => e.isDirectory())
-        .map(e => e.name)
-        .sort();
-    } catch {
-      return [];
-    }
-  }
-
-  function diff(b) {
-    const bSet = new Set(b);
-    return {
-      onlyA: [...canonicalSet].filter(x => !bSet.has(x)),
-      onlyB: [...bSet].filter(x => !canonicalSet.has(x)),
-    };
-  }
-
-  // === 检查 1: build-profile.json5 ===
-  const buildProfilePath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'build-profile.json5');
-  let buildProfileModules = [];
-  if (!fs.existsSync(buildProfilePath)) {
-    warnings.push(`build-profile.json5 不存在: ${buildProfilePath}`);
-  } else {
-    try {
-      const raw = fs.readFileSync(buildProfilePath, 'utf8').replace(/\/\/.*$/gm, '');
-      const bp = JSON.parse(raw);
-      buildProfileModules = (bp.modules || []).map(m => m.name).filter(n => n && n !== 'entry');
-    } catch (e) {
-      errors.push(`build-profile.json5 解析失败: ${e.message}`);
-    }
-  }
-  const d1 = diff(buildProfileModules);
-  if (d1.onlyA.length) errors.push(`build-profile.json5 缺失子包: [${d1.onlyA.join(', ')}]`);
-  if (d1.onlyB.length) errors.push(`build-profile.json5 多了子包: [${d1.onlyB.join(', ')}]`);
-
-  // === 检查 2: entry/oh-package.json5 ===
-  const ohPkgPath = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'entry', 'oh-package.json5');
-  let ohPkgDeps = [];
-  if (!fs.existsSync(ohPkgPath)) {
-    warnings.push(`entry/oh-package.json5 不存在: ${ohPkgPath}`);
-  } else {
-    try {
-      const raw = fs.readFileSync(ohPkgPath, 'utf8').replace(/\/\/.*$/gm, '');
-      const op = JSON.parse(raw);
-      const deps = op.dependencies || {};
-      ohPkgDeps = Object.keys(deps).filter(k => deps[k] && deps[k].startsWith('file:'));
-    } catch (e) {
-      errors.push(`entry/oh-package.json5 解析失败: ${e.message}`);
-    }
-  }
-  const d2 = diff(ohPkgDeps);
-  if (d2.onlyA.length) errors.push(`entry/oh-package.json5 缺失 file: 依赖: [${d2.onlyA.join(', ')}]`);
-  if (d2.onlyB.length) warnings.push(`entry/oh-package.json5 多了 file: 依赖: [${d2.onlyB.join(', ')}] (可能是新子包未更新白名单)`);
-
-  // === 检查 3: ascf_build 实际目录 ===
-  const ascfBuildRoot = path.join(ROOT, 'stub-app-projects', 'mp-harmony', 'ascf', 'ascf_build');
-  const ascfBuildDirs = listSubdirs(ascfBuildRoot);
-  const d3 = diff(ascfBuildDirs);
-  if (d3.onlyA.length) errors.push(`ascf_build/ 目录缺失子包: [${d3.onlyA.join(', ')}]`);
-  if (d3.onlyB.length) warnings.push(`ascf_build/ 多了子包: [${d3.onlyB.join(', ')}] (可能是历史遗留)`);
-
-  // === 输出 ===
-  if (silent) {
-    // 静默模式仅返回结果
-    return { ok: errors.length === 0, errors, warnings };
-  }
-
-  const c = (s, color) => {
-    if (!process.stdout.isTTY) return s;
-    const codes = { red: '\x1b[31m', green: '\x1b[32m', yellow: '\x1b[33m', cyan: '\x1b[36m', gray: '\x1b[90m', reset: '\x1b[0m' };
-    return codes[color] + s + codes.reset;
-  };
-
-  if (errors.length === 0 && warnings.length === 0) {
-    log(c(`\n🔍 [sync check] ✓ ${canonical.length} 个子包在 3 处配置完全一致 (build-profile / oh-package / ascf_build)`, 'green'));
-  } else {
-    log(c(`\n🔍 [sync check] ${errors.length === 0 ? '⚠️' : '✘'} 4 处子包配置不一致:`, errors.length === 0 ? 'yellow' : 'red'));
-    for (const w of warnings) log(c(`  ⚠️  ${w}`, 'yellow'));
-    for (const e of errors) log(c(`  ✘ ${e}`, 'red'));
-    if (errors.length > 0) {
-      log(c(`\n   修复: 同步更新以下 4 个文件 (whitelist 是 har-deps-required.json5):`, 'gray'));
-      log(c(`   1. entry/har-deps-required.json5 (whitelist, 单一事实源)`, 'gray'));
-      log(c(`   2. mp-harmony/build-profile.json5 modules 数组`, 'gray'));
-      log(c(`   3. entry/oh-package.json5 dependencies 加 "file:../ascf/ascf_build/<pkg>"`, 'gray'));
-      log(c(`   4. ascf_build/<pkg>/ 实际目录`, 'gray'));
-      log(c(`   DevEco Build 仍会因 ohpm 校验而失败, 修完再发`, 'gray'));
-    }
-  }
-  log('');
-
-  if (exitOnError && errors.length > 0) {
-    throw new Error(`[sync check] ${errors.length} 个不一致`);
-  }
-
-  return { ok: errors.length === 0, errors, warnings };
-}
-
-// 判断是否作为 CLI 直接执行 (vs 作为模块被 require)
-if (require.main === module) {
-  main();
-}
-
-module.exports = {
-  fixSubpackageModuleNames,
-  runSyncCheck,
-  SUBPACKAGE_NAMES,
-};
--- a/scripts/hardcoded_cn_real.json
+++ b/scripts/hardcoded_cn_real.json
@@ -1,264 +0,0 @@
-{
-  "uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue": [
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "取消",
-      "line": 6
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "确定",
-      "line": 7
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "{{ (nowDate.year || '') + '年' + (nowDate.month || '') + '月' }}",
-      "line": 15
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "日",
-      "line": 27
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "一",
-      "line": 28
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "二",
-      "line": 29
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "三",
-      "line": 30
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "四",
-      "line": 31
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "五",
-      "line": 32
-    },
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "六",
-      "line": 33
-    }
-  ],
-  "pages_promotion/fenxiao/withdraw_list.vue": [
-    {
-      "kind": "js-text",
-      "match": "已转账",
-      "line": 45
-    },
-    {
-      "kind": "js-text",
-      "match": "待审核",
-      "line": 49
-    },
-    {
-      "kind": "js-text",
-      "match": "已审核",
-      "line": 53
-    },
-    {
-      "kind": "js-text",
-      "match": "已拒绝",
-      "line": 57
-    }
-  ],
-  "uni_modules/mp-html/components/mp-html/node/node.vue": [
-    {
-      "kind": "js-text",
-      "match": "uni.showActionSheet({\n          itemList: ['保存图片'],\n          success: () => {\n            const save = path => {\n              uni.saveImageToPhotosAlbum({\n   ",
-      "line": 289
-    },
-    {
-      "kind": "js-text",
-      "match": "uni.showToast({\n                  title: '链接已复制'\n                })",
-      "line": 368
-    },
-    {
-      "kind": "js-text",
-      "match": "保存成功",
-      "line": 297
-    },
-    {
-      "kind": "js-text",
-      "match": "链接已复制",
-      "line": 369
-    }
-  ],
-  "components-diy/diy-form.vue": [
-    {
-      "kind": "js-text",
-      "match": "uni.showToast({\n\t\t\t\t\t\t\ttitle: '提交成功',\n\t\t\t\t\t\t\ticon: 'success'\n\t\t\t\t\t\t})",
-      "line": 305
-    },
-    {
-      "kind": "js-text",
-      "match": "uni.showToast({\n\t\t\t\t\t\t\ttitle: res.message || '提交失败',\n\t\t\t\t\t\t\ticon: 'none'\n\t\t\t\t\t\t})",
-      "line": 314
-    },
-    {
-      "kind": "js-text",
-      "match": "提交成功",
-      "line": 306
-    }
-  ],
-  "uni_modules/uni-count-down/components/uni-count-down/uni-count-down.vue": [
-    {
-      "kind": "template",
-      "tag": "view",
-      "text": "{{ showColon ? ':' : '时' }}",
-      "line": 19
-    },
-    {
-      "kind": "template",
-      "tag": "view",
-      "text": "{{ showColon ? ':' : '分' }}",
-      "line": 27
-    },
-    {
-      "kind": "template",
-      "tag": "view",
-      "text": "秒",
-      "line": 35
-    }
-  ],
-  "components/ns-goods-recommend/ns-goods-recommend.vue": [
-    {
-      "kind": "js-text",
-      "match": "猜你喜欢",
-      "line": 13
-    },
-    {
-      "kind": "js-text",
-      "match": "购买",
-      "line": 20
-    }
-  ],
-  "components-diy/diy-channel-list.vue": [
-    {
-      "kind": "js-text",
-      "match": "uni.showToast({\n\t\t\t\t\t\t\t\ttitle: '视频号仅支持在微信小程序环境中播放',\n\t\t\t\t\t\t\t\ticon: 'none',\n\t\t\t\t\t\t\t\tduration: 2000\n\t\t\t\t\t\t\t})",
-      "line": 207
-    },
-    {
-      "kind": "js-text",
-      "match": "视频号仅支持在微信小程序环境中播放",
-      "line": 208
-    }
-  ],
-  "pages/index/public/js/index.js": [
-    {
-      "kind": "js-text",
-      "match": "uni.showModal({\n\t\t\t\t\ttitle: '版本信息',\n\t\t\t\t\tcontent: `提交 ID: ${v.commitId}\\n构建时间: ${v.buildTime}\\n${Config.baseUrl}`,\n\t\t\t\t\tshowCancel: false\n\t\t\t\t})",
-      "line": 160
-    },
-    {
-      "kind": "js-text",
-      "match": "版本信息",
-      "line": 161
-    }
-  ],
-  "uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue": [
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}",
-      "line": 13
-    },
-    {
-      "kind": "template",
-      "tag": "view",
-      "text": "确认",
-      "line": 87
-    }
-  ],
-  "uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue": [
-    {
-      "kind": "js-text",
-      "match": "商品库存不足",
-      "line": 131
-    },
-    {
-      "kind": "js-text",
-      "match": "商品最少购买",
-      "line": 135
-    }
-  ],
-  "common/js/mp-share-default.js": [
-    {
-      "kind": "js-text",
-      "match": "小程序分享",
-      "line": 85
-    }
-  ],
-  "common/js/splash-state.js": [
-    {
-      "kind": "js-text",
-      "match": "uni.showLoading({ title: opts.title || '加载中...', mask: false })",
-      "line": 111
-    }
-  ],
-  "pages/index/index.vue": [
-    {
-      "kind": "template",
-      "tag": "text",
-      "text": "{{ diyLoadErrorMsg || '网络异常，请稍后重试' }}",
-      "line": 8
-    }
-  ],
-  "pages_goods/public/js/list.js": [
-    {
-      "kind": "js-text",
-      "match": "购买",
-      "line": 40
-    }
-  ],
-  "pages_tool/help/list.vue": [
-    {
-      "kind": "js-text",
-      "match": "帮助中心",
-      "line": 82
-    }
-  ],
-  "pages_tool/notice/list.vue": [
-    {
-      "kind": "js-text",
-      "match": "公告",
-      "line": 80
-    }
-  ],
-  "pages_tool/pay/index.vue": [
-    {
-      "kind": "js-text",
-      "match": "未获取到支付信息！",
-      "line": 54
-    }
-  ],
-  "uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue": [
-    {
-      "kind": "js-text",
-      "match": "日期和时间",
-      "line": 112
-    }
-  ]
-}
--- a/scripts/hardcoded_cn_scan.json
+++ b/scripts/hardcoded_cn_scan.json
--- a/scripts/harmony.patch.js
+++ b/scripts/harmony.patch.js
@@ -35,347 +35,6 @@ async function syncSiteToStub(mode = 'production') {
  }
 }

-/**
- * 同步 manifest.json 的 mp-harmony.privacy 配置到 stub 项目的 app.json
- *
- * 背景:
- *   鸿蒙元服务上架审核需要从 app.json 读 privacy.privacyContractUrl 等字段,
- *   实际生效的是编译产物里 ascf/ascf_src/app.json (ascf_build 拷贝自此)。
- *   但当前 build 流程不会自动从 manifest.json 注入 privacy 字段,
- *   如果只改 manifest.json 而忘记改 app.json, 审核时拿到的是旧 URL。
- *
- * 同步策略:
- *   1. 读取 manifest.json 的 mp-harmony.privacy, 期望里面含占位符 YOUR_DOMAIN / YOUR_UNIACID
- *   2. 从 site.js 解析 baseUrl (域名) + uniacid
- *   3. 把占位符替换成 site.js 里的真实值, 写入 stub app.json
- *   4. 若 manifest.json 中无 mp-harmony.privacy → 保留 app.json 现有配置 (向后兼容)
- *   5. 若 site.js 缺 baseUrl 或 uniacid → 跳过同步, 警告用户
- *
- * 设计取舍:
- *   - manifest.json 用占位符占位 (避免每个 uniacid 切换都要改一次 manifest)
- *   - site.js 永远是真实值来源 (这是项目里已经存在的部署配置)
- *   - 同步在构建时执行, 一份配置适配所有 uniacid
- *
- * 依赖: syncSiteToStub 必须先于本函数执行 (在 main() 中已保证)
- */
-
-/**
- * 鲁棒的 JSONC 注释剥离 (跳过字符串字面量, 只剥真正的注释)
- * 原因: manifest.json 顶部有 /* ... *\/ 注释, 用正则 `/\*[\s\S]*?\*\//g` 简单剥离时,
- *       会跨过字符串字面量, 把"https://..."注释中的字符拼到真实 URL 后面,
- *       引入换行符导致 JSON.parse 失败 (Bad control character)。
- *       必须逐字符扫描, 跳过字符串内的 /*、//。
- */
-function stripJsonComments(input) {
-  let out = '';
-  let i = 0;
-  const n = input.length;
-  while (i < n) {
-    const c = input[i];
-    const next = i + 1 < n ? input[i + 1] : '';
-    if (c === '/' && next === '*') {
-      i += 2;
-      while (i < n && !(input[i] === '*' && input[i + 1] === '/')) i++;
-      i += 2;
-      continue;
-    }
-    if (c === '/' && next === '/') {
-      i += 2;
-      while (i < n && input[i] !== '\n') i++;
-      continue;
-    }
-    if (c === '"') {
-      out += c;
-      i++;
-      while (i < n) {
-        const sc = input[i];
-        if (sc === '\\') {
-          out += sc + (input[i + 1] || '');
-          i += 2;
-          continue;
-        }
-        out += sc;
-        i++;
-        if (sc === '"') break;
-      }
-      continue;
-    }
-    out += c;
-    i++;
-  }
-  return out;
-}
-
-/**
- * 从 site.js 提取 baseUrl + uniacid
- *
- * site.js 形如:
- *   module.exports = {
- *     baseUrl: "https://xcx.aigc-quickapp.com/",//修改域名
- *     uniacid: 2482,//后台对应uniacid
- *   };
- *
- * 不直接 require, 因为:
- *   1. site.js 在前端构建产物中用, 可能依赖一些运行时变量 (uni/Config/...)
- *   2. 同步逻辑要在 vue.config.js 触发, 不希望引入额外依赖
- *   3. regex 提取足够安全, 避免执行任意 JS
- *
- * @returns {{baseUrl: string, uniacid: string}|null} 解析失败返回 null
- */
-function parseSiteConfig(siteJsSource) {
-  // baseUrl: 单/双引号字符串, 可带尾斜杠
-  const baseUrlMatch = siteJsSource.match(/baseUrl\s*:\s*['"]([^'"]+)['"]/)
-  // uniacid: 数字或字符串
-  const uniacidMatch = siteJsSource.match(/uniacid\s*:\s*['"]?(\d+)['"]?/)
-  if (!baseUrlMatch || !uniacidMatch) {
-    return null
-  }
-  return {
-    baseUrl: baseUrlMatch[1],
-    uniacid: uniacidMatch[1],
-  }
-}
-
-/**
- * 把 baseUrl 拆成 protocol + host (无尾斜杠)
- * 因为 site.js 的 baseUrl 通常带尾斜杠, 占位符 YOUR_DOMAIN
- * 在 URL 中间出现 (例: https://YOUR_DOMAIN/api/xxx), 直接拼接
- * 会产生双斜杠. 这里规范化为"协议://域名(无尾斜杠)".
- *
- * @param {string} baseUrl 例: "https://xcx.aigc-quickapp.com/"
- * @returns {string} 例: "https://xcx.aigc-quickapp.com"
- */
-function normalizeBaseUrlForPlaceholder(baseUrl) {
-  // 去掉尾斜杠
-  let url = baseUrl.replace(/\/+$/, '')
-  // 若没有协议, 加 https:// (避免出现 //xcx... 这种相对协议)
-  if (!/^https?:\/\//i.test(url)) {
-    url = 'https://' + url
-  }
-  return url
-}
-
-/**
- * 递归替换隐私配置对象中的占位符
- * @param {*} value 任意 JSON 值
- * @param {object} siteConfig {baseUrl, uniacid}
- * @returns {*} 替换后的新值 (不修改原对象)
- */
-function replacePlaceholders(value, siteConfig) {
-  if (typeof value === 'string') {
-    return value
-      .replace(/YOUR_DOMAIN/g, siteConfig.baseUrl)
-      .replace(/YOUR_UNIACID/g, siteConfig.uniacid)
-  }
-  if (Array.isArray(value)) {
-    return value.map(v => replacePlaceholders(v, siteConfig))
-  }
-  if (value !== null && typeof value === 'object') {
-    const out = {}
-    for (const k of Object.keys(value)) {
-      out[k] = replacePlaceholders(value[k], siteConfig)
-    }
-    return out
-  }
-  return value
-}
-
-/**
- * 自定义错误: 验证 app.json 写后内容失败时抛出
- * 上层 try/catch 会捕获并 process.exitCode = 1, 让 vue.config.js / npm run build 失败
- */
-class AppJsonVerificationError extends Error {
-  constructor(messages) {
-    super('app.json 写后验证失败:\n  - ' + messages.join('\n  - '))
-    this.name = 'AppJsonVerificationError'
-    this.messages = messages
-  }
-}
-
-/**
- * 验证写完的 app.json 内容正确
- *
- * 关键字段:
- *   - 顶级 privacy 块存在
- *   - privacyContractUrl / serviceContractUrl 都以 https:// + baseUrl 开头
- *   - URL 不含占位符 YOUR_DOMAIN / YOUR_UNIACID
- *   - URL 不含双协议头 (https://https://)
- *   - URL 不含双斜杠 (https://x.com//api)
- *   - URL 的 uniacid= 参数值 == siteConfig.uniacid
- *   - JSON 仍能正确 parse (没有序列化失败)
- *
- * 失败行为: 抛 AppJsonVerificationError, 包含所有不通过项
- *
- * @param {string} appJsonPath
- * @param {{baseUrl: string, uniacid: string}} siteConfig
- */
-async function verifyWrittenAppJson(appJsonPath, siteConfig) {
-  const errors = []
-
-  // 1. 重新读取 + parse
-  let written
-  try {
-    const raw = await fsp.readFile(appJsonPath, 'utf8')
-    written = JSON.parse(raw)
-  } catch (e) {
-    throw new AppJsonVerificationError([`文件读取/解析失败: ${e.message}`])
-  }
-
-  // 2. 顶级 privacy 块
-  const privacy = written.privacy
-  if (!privacy || typeof privacy !== 'object') {
-    throw new AppJsonVerificationError(['privacy 块缺失或不是对象'])
-  }
-
-  // 3. URL 字段检查
-  const urlFields = ['privacyContractUrl', 'serviceContractUrl']
-  for (const field of urlFields) {
-    const url = privacy[field]
-    if (typeof url !== 'string') {
-      errors.push(`${field} 缺失或不是字符串 (实际: ${typeof url})`)
-      continue
-    }
-
-    // 不含占位符
-    if (/YOUR_DOMAIN|YOUR_UNIACID/.test(url)) {
-      errors.push(`${field} 仍含占位符: ${url}`)
-    }
-
-    // 不含双协议头
-    if (/^https:\/\/https:|^http:\/\/http:/i.test(url)) {
-      errors.push(`${field} 含双协议头: ${url}`)
-    }
-
-    // 不含双斜杠 (协议头之后, 路径开始之前)
-        // 关键: 截到第一个 ? 或 # 之前, 检查是否含 // (避免误报 query 里的 //)
-        const afterProtocol = url.replace(/^https?:\/\//i, '')
-        const queryStart = afterProtocol.search(/[?#]/)
-        const beforeQuery = queryStart === -1 ? afterProtocol : afterProtocol.slice(0, queryStart)
-        if (beforeQuery.includes('//')) {
-          errors.push(`${field} 路径部分含双斜杠 (双斜杠 bug): ${url}`)
-        }
-
-    // 必须以 https:// + siteConfig.baseUrl 开头
-    const expectedPrefix = siteConfig.baseUrl + '/'
-    if (!url.startsWith(expectedPrefix)) {
-      errors.push(`${field} 不是以 "${expectedPrefix}" 开头 (实际: ${url.slice(0, expectedPrefix.length + 10)})`)
-    }
-
-    // uniacid= 参数值 == siteConfig.uniacid
-    const uniacidMatch = url.match(/[?&]uniacid=([^&]+)/)
-    if (!uniacidMatch) {
-      errors.push(`${field} 缺少 uniacid= 参数: ${url}`)
-    } else if (uniacidMatch[1] !== siteConfig.uniacid) {
-      errors.push(`${field} 的 uniacid=${uniacidMatch[1]} 不等于 site.js 的 uniacid=${siteConfig.uniacid}`)
-    }
-  }
-
-  // 4. contractName 字段未被破坏 (manifest 里的 zh/en name 应该原样保留)
-  const nameFields = ['privacyContractName', 'serviceContractName']
-  for (const field of nameFields) {
-    const name = privacy[field]
-    if (!name || typeof name !== 'object' || !name.zh || !name.en) {
-      errors.push(`${field} 结构损坏 (应有 zh/en): ${JSON.stringify(name)}`)
-    }
-  }
-
-  if (errors.length > 0) {
-    throw new AppJsonVerificationError(errors)
-  }
-}
-
-/**
- * 同步 privacy 到**任意**目标 app.json 路径
- *
- * @param {string} appJsonPath 目标 app.json 文件绝对路径
- * @param {string} [label] 标识 (用于日志, 例 "stub" / "build")
- * @returns {Promise<{written: boolean, siteConfig?: object}>}
- *
- * 应用场景:
- *   - syncPrivacyToPath('stub-app-projects/.../app.json', 'stub')
- *     → 写 stub ascf_src/app.json (HBuilderX 之外的源)
- *   - syncPrivacyToPath('unpackage/dist/build/.mp-harmony/app.json', 'build')
- *     → 写 HBuilderX 构建产物的 app.json, **必须**在打 ZIP 之前
- *     → 否则发行 ZIP 里的 app.json 仍是占位符
- */
-async function syncPrivacyToPath(appJsonPath, label = '') {
-  try {
-    const cwd = path.join(__dirname, '..');
-    const manifestPath = path.join(cwd, 'manifest.json');
-    const siteJsPath = path.join(cwd, 'site.js');
-
-    if (!await exists(manifestPath)) {
-      console.warn('[harmony.patch] manifest.json 不存在, 跳过 privacy 同步');
-      return { written: false };
-    }
-    if (!await exists(appJsonPath)) {
-      console.warn(`[harmony.patch] app.json 不存在 (${label || appJsonPath}), 跳过 privacy 同步`);
-      return { written: false };
-    }
-
-    // 1. 读 manifest.json, 提取 mp-harmony.privacy 配置 (含占位符)
-    const manifestRaw = await fsp.readFile(manifestPath, 'utf8');
-    const manifestClean = stripJsonComments(manifestRaw);
-    const manifest = JSON.parse(manifestClean);
-    const privacyConfigTemplate = manifest && manifest['mp-harmony'] && manifest['mp-harmony'].privacy;
-
-    if (!privacyConfigTemplate) {
-      return { written: false };
-    }
-
-    // 2. 读 site.js, 提取真实 baseUrl + uniacid
-    if (!await exists(siteJsPath)) {
-      console.warn('[harmony.patch] site.js 不存在, 跳过 privacy 同步');
-      return { written: false };
-    }
-    const siteJsSource = await fsp.readFile(siteJsPath, 'utf8');
-    const siteConfigRaw = parseSiteConfig(siteJsSource);
-    if (!siteConfigRaw) {
-      console.warn('[harmony.patch] ⚠️ site.js 解析失败 (找不到 baseUrl / uniacid), 跳过 privacy 同步');
-      return { written: false };
-    }
-    const siteConfig = {
-      baseUrl: normalizeBaseUrlForPlaceholder(siteConfigRaw.baseUrl),
-      uniacid: siteConfigRaw.uniacid,
-    };
-
-    // 3. 占位符替换
-    const privacyConfig = replacePlaceholders(privacyConfigTemplate, siteConfig)
-
-    // 4. 校验替换结果
-    const finalStr = JSON.stringify(privacyConfig)
-    if (/YOUR_DOMAIN|YOUR_UNIACID/.test(finalStr)) {
-      console.warn('[harmony.patch] ⚠️ 替换后仍含占位符, 跳过写入. 请检查 site.js / manifest.json 配置')
-      return { written: false };
-    }
-
-    // 5. 写目标 app.json
-    const appJsonRaw = await fsp.readFile(appJsonPath, 'utf8');
-    const appJson = JSON.parse(appJsonRaw);
-    appJson.privacy = privacyConfig;
-    await fsp.writeFile(appJsonPath, JSON.stringify(appJson, null, 2) + '\n', 'utf8');
-    const labelSuffix = label ? ` (${label})` : '';
-    console.log(`[harmony.patch] privacy 配置已同步到 app.json${labelSuffix} (baseUrl=${siteConfig.baseUrl}, uniacid=${siteConfig.uniacid})`);
-
-    // 6. 写后验证
-    await verifyWrittenAppJson(appJsonPath, siteConfig)
-    return { written: true, siteConfig }
-  } catch (err) {
-    console.error(`[harmony.patch] 同步 privacy 配置失败 (${label || appJsonPath}):`, err);
-    process.exitCode = 1;
-    return { written: false }
-  }
-}
-
-/**
- * 同步 privacy 到 stub ascf_src/app.json (兼容旧调用)
- */
-async function syncPrivacyToStub() {
-  const cwd = path.join(__dirname, '..');
-  const stubAppJsonPath = path.join(cwd, 'stub-app-projects', 'mp-harmony', 'ascf', 'ascf_src', 'app.json');
-  return syncPrivacyToPath(stubAppJsonPath, 'stub');
-}
-
 async function copyAssets(mode = 'production') {
  try {
    const cwd = path.join(__dirname, '..');
@@ -437,8 +96,7 @@ async function main() {
  const argv = process.argv.slice(2);
  const options = {
    noZip: argv.includes('--no-zip'),
-    mode: 'production',
-    syncPrivacyOnly: argv.includes('--sync-privacy-only'),
+    mode: 'production'
  };

  const modeIndex = argv.indexOf('--mode');
@@ -446,46 +104,18 @@ async function main() {
    options.mode = argv[modeIndex + 1];
  }

-  // 子命令: --sync-privacy-only
-  //   vue.config.js _copyMpHarmonyBuild() 后, 构建产物的 app.json
-  //   会覆盖 stub ascf_src/app.json (因为产物里 app.json 含占位符)。
-  //   vue.config.js 此时再 exec 这个子命令, 强制重新同步一次。
-  if (options.syncPrivacyOnly) {
-    console.log('[harmony.patch] --sync-privacy-only: 重新同步 privacy (覆盖 _copyMpHarmonyBuild 的拷贝)');
-    await syncPrivacyToStub();
-    return;
-  }
-
  // 同步 site.js 到 stub 项目源码目录，确保编译时能动态导入
  await syncSiteToStub(options.mode);

-  // 同步 manifest.json 的 mp-harmony.privacy 到 stub app.json (防止上架时 URL 不同步)
-  await syncPrivacyToStub();
-
  await copyAssets(options.mode);

-  // 关键: 在打 ZIP 之前, 同步一次 **构建产物** 的 app.json
-  //   HBuilderX 构建产物的 app.json 含占位符, 不修正就直接打 ZIP,
-  //   发行包里的 app.json 还是占位符, 上架会被审核驳回。
-  //   这步必须在 ZIP 之前, 必须在 _copyMpHarmonyBuild 之后 (vue.config.js 顺序)。
-  if (!options.noZip && options.mode === 'production') {
-    const cwd = path.join(__dirname, '..');
-    const buildAppJsonPath = path.join(cwd, 'unpackage', 'dist', 'build', '.mp-harmony', 'app.json');
-    if (await exists(buildAppJsonPath)) {
-      console.log('[harmony.patch] 同步构建产物的 app.json (打 ZIP 前)');
-      await syncPrivacyToPath(buildAppJsonPath, 'build');
-    } else {
-      console.warn(`[harmony.patch] 构建产物的 app.json 不存在: ${buildAppJsonPath}`);
-    }
-  }
-
  if (!options.noZip && options.mode === 'production') {
    const cwd = path.join(__dirname, '..');
    const sourceDir = path.join(cwd, 'unpackage', 'dist', 'build', '.mp-harmony');
    const destDir = path.join(cwd, 'unpackage', 'dist', 'build');
    const zipFilePath = await createZipWithSystemCommand(sourceDir, destDir, 'mp-harmony');
    console.log(`ZIP 文件路径: ${zipFilePath}`);
-
+    
    await openFileDirectory(zipFilePath);
  } else {
    console.log('跳过创建 ZIP 文件和打开目录');
--- a/scripts/lang_audit_report_v2.json
+++ b/scripts/lang_audit_report_v2.json
@@ -1,77 +1,14 @@
 {
-  "bundle_version": "1784767380",
+  "bundle_version": "1782901586",
  "bundle_lang": "zh-cn",
-  "bundle_leaves": 2659,
-  "code_calls_total": 2693,
-  "code_unique_keys": 2097,
-  "found_in_bundle": 2086,
+  "bundle_leaves": 2649,
+  "code_calls_total": 2677,
+  "code_unique_keys": 2083,
+  "found_in_bundle": 2082,
  "missing_summary": {
-    "TRULY_MISSING": 12,
    "SYNTAX_BUG": 1
  },
  "missing_classified": {
-    "TRULY_MISSING": [
-      {
-        "key": "common.buyNow",
-        "file": "components\\ns-goods-recommend\\ns-goods-recommend.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "wechatChannel.wechatMpOnly",
-        "file": "components-diy\\diy-channel-list.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "common.submitSuccess",
-        "file": "components-diy\\diy-form.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "submitFail",
-        "file": "components-diy\\diy-form.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "diy.networkError",
-        "file": "pages\\index\\index.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "versionInfo",
-        "file": "pages\\index\\public\\js\\index.js",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "commitId",
-        "file": "pages\\index\\public\\js\\index.js",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "buildTime",
-        "file": "pages\\index\\public\\js\\index.js",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "diy.networkError",
-        "file": "pages_goods\\category.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "goods.detail.formEmptyTip",
-        "file": "pages_goods\\detail.vue",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "common.buyNow",
-        "file": "pages_goods\\public\\js\\list.js",
-        "reason": "not in bundle, not local"
-      },
-      {
-        "key": "pay.index.payInfoNotFound",
-        "file": "pages_tool\\pay\\index.vue",
-        "reason": "not in bundle, not local"
-      }
-    ],
    "SYNTAX_BUG": [
      {
        "key": "order.list.status.",
@@ -82,8 +19,18 @@
  },
  "placeholder_issues": [],
  "data_lang_issues": {
+    "components\\ns-payment\\ns-payment.vue": [
+      "components.nsPayment.alipay"
+    ],
    "pages_promotion\\fenxiao\\apply.vue": [
      "fenxiao.apply.pleaseEnterName"
+    ],
+    "pages_promotion\\merch\\public\\js\\list.js": [
+      "merch.list.buyText"
+    ],
+    "pages_tool\\ai-chat\\ai-chat-message.vue": [
+      "ai-chat.index.loadMoreHistory",
+      "ai-chat.index.defaultNickname"
    ]
  },
  "hardcoded_navbar_titles": [
@@ -174,11 +121,6 @@
    "common.tabBar.cart",
    "common.tabBar.member"
  ],
-  "local_only_keys": [
-    "buildTime",
-    "commitId",
-    "submitFail",
-    "versionInfo"
-  ],
+  "local_only_keys": [],
  "bundle_only_keys_in_unique": []
 }
--- a/scripts/scan-hardcoded-cn.py
+++ b/scripts/scan-hardcoded-cn.py
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-# 精筛 v2:剥离 HTML 注释和 JS 注释后,再扫硬编码中文(只关注真实会被渲染的)
-import os, re, json
-from collections import defaultdict
-
-ROOT = r'D:\projects\shop-projects\frontend'
-SKIP_DIR = {'node_modules', '.unpackage', 'unpackage', '.git', 'dist', 'stub-app-projects', 'lang', 'tests', 'docs', 'scripts', 'common/mixin'}
-
-CN = re.compile(r'[\u4e00-\u9fff]')
-LANG_RE = re.compile(r'\$lang\(')
-
-TPL_RE = re.compile(r'<template[^>]*>([\s\S]*?)</template>', re.I)
-TAG_RE = re.compile(r'<([a-zA-Z][\w-]*)\b[^>]*>([^<>\n]+)</\1>')
-HTML_COMMENT_RE = re.compile(r'<!--[\s\S]*?-->')
-
-JS_TRIGGERS = [
-    re.compile(r'uni\.show(?:Toast|Modal|ActionSheet|Loading)\s*\(\s*\{[\s\S]*?\}\s*\)', re.S),
-    re.compile(r'wx\.show(?:Toast|Modal|ActionSheet|Loading)\s*\(\s*\{[\s\S]*?\}\s*\)', re.S),
-    re.compile(r'\btitle\s*:\s*[\'"]([^\'"]*?)[\'"]'),
-    re.compile(r'\bcontent\s*:\s*[\'"]([^\'"]*?)[\'"]'),
-    re.compile(r'\btext\s*:\s*[\'"]([^\'"]*?)[\'"]'),
-    re.compile(r'\bplaceholder\s*:\s*[\'"]([^\'"]*?)[\'"]'),
-    re.compile(r'\balert\s*\(\s*[\'"]([^\'"]*?)[\'"]'),
-    re.compile(r'\bconfirm\s*\(\s*[\'"]([^\'"]*?)[\'"]'),
-]
-
-def strip_all_comments(text, is_vue=False):
-    text = HTML_COMMENT_RE.sub(lambda m: ' ' * len(m.group()), text)
-    text = re.sub(r'/\*[\s\S]*?\*/', lambda m: ' ' * len(m.group()), text)
-    text = re.sub(r'//[^\n]*', lambda m: ' ' * len(m.group()), text)
-    return text
-
-results = defaultdict(list)
-
-for dirpath, dirnames, filenames in os.walk(ROOT):
-    if any(s in dirpath.replace('\\', '/') for s in SKIP_DIR):
-        continue
-    for fn in filenames:
-        if not fn.endswith(('.vue', '.js')):
-            continue
-        fp = os.path.join(dirpath, fn)
-        rel = os.path.relpath(fp, ROOT).replace('\\', '/')
-        try:
-            content = open(fp, 'r', encoding='utf-8').read()
-        except UnicodeDecodeError:
-            continue
-
-        stripped = strip_all_comments(content)
-
-        if fn.endswith('.vue'):
-            for m in TPL_RE.finditer(stripped):
-                tpl = m.group(1)
-                for tag in TAG_RE.finditer(tpl):
-                    inner = tag.group(2).strip()
-                    if CN.search(inner) and not LANG_RE.search(inner):
-                        line_no = stripped[:m.start(1) + tpl.find(inner)].count('\n') + 1
-                        results[rel].append({'kind': 'template', 'tag': tag.group(1), 'text': inner[:160], 'line': line_no})
-
-        for trig in JS_TRIGGERS:
-            for m in trig.finditer(stripped):
-                text = (m.group(1) if m.lastindex else m.group(0))
-                if not CN.search(text):
-                    continue
-                if LANG_RE.search(text):
-                    continue
-                line_no = stripped[:m.start()].count('\n') + 1
-                results[rel].append({'kind': 'js-text', 'match': text[:160], 'line': line_no})
-
-ranked = sorted(results.items(), key=lambda kv: -len(kv[1]))
-print(f'total files: {len(ranked)}')
-print(f'total hits:  {sum(len(v) for v in ranked)}')
-
-out = []
-for f, hits in ranked[:60]:
-    out.append({'file': f, 'hits': len(hits), 'samples': hits[:3]})
-print(json.dumps(out, ensure_ascii=False, indent=2))
-
-with open(os.path.join(ROOT, 'scripts', 'hardcoded_cn_real.json'), 'w', encoding='utf-8') as f:
-    json.dump({k: v for k, v in ranked}, f, ensure_ascii=False, indent=2)
-print('saved hardcoded_cn_real.json')
--- a/scripts/verify_diy_recommend.js
+++ b/scripts/verify_diy_recommend.js
@@ -0,0 +1,30 @@
+// Quick parse check for the 6 diy-recommend components
+const fs = require('fs');
+const path = require('path');
+
+const files = [
+    'diy-recommend-code.vue',
+    'diy-recommend-balance.vue',
+    'diy-recommend-stat.vue',
+    'diy-recommend-records.vue',
+    'diy-recommend-rules.vue',
+    'diy-recommend-action.vue',
+];
+
+const base = path.join(__dirname, '..', 'components-diy');
+let ok = 0;
+for (const f of files) {
+    const p = path.join(base, f);
+    if (!fs.existsSync(p)) { console.log('✗', f, 'MISSING'); continue; }
+    const content = fs.readFileSync(p, 'utf8');
+    // Check has template/script/style
+    const hasT = /<template>/i.test(content) && /<\/template>/i.test(content);
+    const hasS = /<script>/i.test(content) && /<\/script>/i.test(content);
+    const hasC = /<style /i.test(content) && /<\/style>/i.test(content);
+    const nameMatch = content.match(/name:\s*['"](\S+)['"]/);
+    const name = nameMatch ? nameMatch[1] : '?';
+    console.log(`✓ ${f.padEnd(34)} name="${name}"  T:${hasT} S:${hasS} C:${hasC}`);
+    if (hasT && hasS && hasC) ok++;
+}
+console.log(`\n${ok}/${files.length} OK`);
+process.exit(ok === files.length ? 0 : 1);
--- a/site.js
+++ b/site.js
@@ -1,4 +1,4 @@
 module.exports = {
-  baseUrl: "https://5g.aigc-quickapp.com/",//修改域名
-  uniacid: 248,//后台对应uniacid
+  baseUrl: "https://xcx2.aigc-quickapp.com/",//修改域名
+  uniacid: 2482,//后台对应uniacid
 };
--- a/stub-app-projects/mp-harmony/AppScope/app.json5
+++ b/stub-app-projects/mp-harmony/AppScope/app.json5
@@ -1,6 +1,6 @@
 {
  "app": {
-    "bundleName": "com.atomicservice.6917610986330791161",
+    "bundleName": "com.atomicservice.6917600524822452448",
    "bundleType": "atomicService",
    "vendor": "example",
    "versionCode": 1000000,
--- a/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/build-profile.json5
+++ b/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/build-profile.json5
@@ -1,25 +0,0 @@
-{
-  "apiType": "stageMode",
-  "buildOption": {
-  },
-  "buildOptionSet": [
-    {
-      "name": "release",
-      "arkOptions": {
-        "obfuscation": {
-          "ruleOptions": {
-            "enable": true,
-            "files": [
-              "./obfuscation-rules.txt"
-            ]
-          }
-        }
-      },
-    },
-  ],
-  "targets": [
-    {
-      "name": "default"
-    }
-  ]
-}
--- a/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/hvigorfile.ts
+++ b/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/hvigorfile.ts
@@ -1,6 +0,0 @@
-import { hspTasks } from '@ohos/hvigor-ohos-plugin';
-
-export default {
-  system: hspTasks,
-  plugins: []
-}
--- a/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/obfuscation-rules.txt
+++ b/stub-app-projects/mp-harmony/ascf/ascf_build/components_diy/obfuscation-rules.txt
@@ -1,18 +0,0 @@
-# Define project specific obfuscation rules here.
-# You can include the obfuscation configuration files in the current module's build-profile.json5.
-#
-# For more details, see
-#   https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5
-
-# Obfuscation options:
-# -disable-obfuscation: disable all obfuscations
-# -enable-property-obfuscation: obfuscate the property names
-# -enable-toplevel-obfuscation: obfuscate the names in the global scope
-# -compact: remove unnecessary blank spaces and all line feeds
-# -remove-log: remove all console.* statements
-# -print-namecache: print the name cache that contains the mapping from the old names to new names
-# -apply-namecache: reuse the given cache file
-
-# Keep options:
-# -keep-property-name: specifies property names that you want to keep
-# -keep-global-name: specifies names that you want to keep in the global scope
--- a/Show More
+++ b/Show More