Merge pull request 'docs: 更新readme文档结构和内容' (#2) from dev/1.0 into main

Reviewed-on: #2

.gitignore

@@ -2,3 +2,4 @@
 /.hbuilderx
 /.idea
 /node_modules
+/iconfont-preview.html

.local.config.js

@@ -0,0 +1,47 @@
+// 本地调试配置示例文件
+// 复制此文件并重命名为 local.config.js 以使用自定义本地配置
+
+const localDevConfig = ({
+    '460': { // 制氧设备平台
+        uniacid: 460,
+        domain: 'https://xcx30.5g-quickapp.com/',
+    },
+    '576-xcx30.5g': { // 活性石灰装备
+        uniacid: 576,
+        domain: 'https://xcx30.5g-quickapp.com/',
+    },    
+    '2285': { // 数码喷墨墨水
+        uniacid: 2285,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },
+    '2811': { // POCT检测分析平台
+        uniacid: 2811,
+        domain: 'https://xcx6.aigc-quickapp.com/',
+    },  
+    '2724': { // 生物菌肥
+        uniacid: 2724,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },     
+    '2505': { // 煤矿钻机
+        uniacid: 2505,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },   
+    '2777': { // 养老服务
+        uniacid: 2777,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },         
+    '1': { // 开发平台
+        uniacid: 1,
+        domain: 'https://dev.aigc-quickapp.com',
+    },
+    '1-test': { // 测试平台
+        uniacid: 1,
+        domain: 'https://test.aigc-quickapp.com',
+    },
+    'local-2': { // 测试平台
+        uniacid: 2,
+        domain: 'http://localhost:8050/',
+    },    
+})['2811']; // 选择要使用的环境配置
+
+export default localDevConfig;

.local.config.js.example

@@ -6,10 +6,34 @@ const localDevConfig = ({
         uniacid: 460,
         domain: 'https://xcx30.5g-quickapp.com/',
     },
+    '576-xcx30.5g': { // 活性石灰装备
+        uniacid: 576,
+        domain: 'https://xcx30.5g-quickapp.com/',
+    },    
     '2285': { // 数码喷墨墨水
         uniacid: 2285,
         domain: 'https://xcx.aigc-quickapp.com/',
     },
+    '2811': { // POCT检测分析平台
+        uniacid: 2811,
+        domain: 'https://xcx6.aigc-quickapp.com/',
+    },  
+    '2812': { // IVD数商模式
+        uniacid: 2812,
+        domain: 'https://xcx6.aigc-quickapp.com/',
+    },    
+    '2724': { // 生物菌肥
+        uniacid: 2724,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },     
+    '2505': { // 煤矿钻机
+        uniacid: 2505,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },   
+    '2777': { // 养老服务
+        uniacid: 2777,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },         
     '1': { // 开发平台
         uniacid: 1,
         domain: 'https://dev.aigc-quickapp.com',
@@ -18,6 +42,14 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-})['2285']; // 选择要使用的环境配置
+    'local-2': { // 测试平台
+        uniacid: 2,
+        domain: 'http://localhost:8050/',
+    },    
+    'local-2-dev': { // 本地开发测试平台
+        uniacid: 2,
+        domain: 'http://localhost:8050/',
+    },     
+})['2812']; // 选择要使用的环境配置
 
 export default localDevConfig;

App.vue

@@ -1,19 +1,17 @@
 <script>
 	import auth from 'common/js/auth.js';
-	import { themeConfig } from 'common/js/config-external.js'
 	import configExternal from 'common/js/config-external.js'
+	
 	import {
 		Weixin
 	} from 'common/js/wx-jssdk.js';
 
 	export default {
 		mixins: [auth],
-		onLaunch: function(options) {
+		onLaunch: async function(options) {
 			// 方式：支持快应用，从url中query部分获取uniacid，或useragent中获取uniacid
-			// console.log(options.query.uniacid)
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
-				console.log(uni.getStorageSync('uniacid'))
 			}
 			uni.hideTabBar();
 
@@ -42,7 +40,7 @@
 			// #endif
 
 			// #ifdef H5
-			if (uni.getSystemInfoSync().platform == 'ios') {
+			if (this.$util.getDeviceInfo().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
 			// #endif
@@ -63,7 +61,9 @@
 
 			// 主题风格
 			if (uni.getStorageSync('themeStyle')) {
-				this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
+				const themeData = await configExternal.loadTheme(uni.getStorageSync('themeStyle'));
+				this.$store.commit('setThemeStyle', themeData);
+				this.$store.dispatch('themeColorSet');
 			}
 
 			// 插件是否存在

common/css/diy.scss

@@ -123,7 +123,7 @@ image {
 }
 
 .choose-store {
-    /deep/ .uni-popup__wrapper{
+    ::v-deep .uni-popup__wrapper{
         background: none!important;
     }
 }

common/css/goods_detail.scss

@@ -870,13 +870,13 @@
 // 海报
 // .uni-popup__wrapper-box
 .poster-layer {
-    /deep/ .uni-popup__wrapper.center {
+    ::v-deep .uni-popup__wrapper.center {
         width: 100vw!important;
         height: 100vh!important;
         background: none!important;
     }
     
-    /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+    ::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
         max-width: 100vw!important;
         max-height: 100vh!important;
         background: none!important;

common/css/main.scss

@@ -559,7 +559,7 @@ scroll-view ::-webkit-scrollbar {
 	background-color: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	width: 0;
 	height: 0;
 	background-color: transparent;
@@ -609,7 +609,7 @@ scroll-view ::-webkit-scrollbar {
 	font-weight: 500!important;
 }
 
-/deep/ .reward-popup .uni-popup__wrapper-box {
+::v-deep .reward-popup .uni-popup__wrapper-box {
 	background: none !important;
 	max-width: unset !important;
 	max-height: unset !important;
@@ -618,7 +618,7 @@ scroll-view ::-webkit-scrollbar {
 
 // #ifdef H5
 // 下拉加载动画【页面】
-/deep/ body uni-page-refresh div{
+::v-deep body uni-page-refresh div{
 	width: 14rpx !important;
 	height: 14rpx !important;
 	background-color: #ccc;
@@ -626,7 +626,7 @@ scroll-view ::-webkit-scrollbar {
 	clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important;
 	animation:.6s backgroundChange linear infinite;
 }
-/deep/ body uni-page-refresh div::after{
+::v-deep body uni-page-refresh div::after{
 	content: "";
 	position: absolute;
 	left: -22rpx;
@@ -636,7 +636,7 @@ scroll-view ::-webkit-scrollbar {
 	background-color: #ccc;
 	animation:.5s backgroundChange linear infinite;
 }
-/deep/ body uni-page-refresh div::before{
+::v-deep body uni-page-refresh div::before{
 	content: "";
 	position: absolute;
 	right: -22rpx;
@@ -646,15 +646,15 @@ scroll-view ::-webkit-scrollbar {
 	background-color: #ccc;
 	animation:.7s backgroundChange linear infinite;
 }
-/deep/ body uni-page-refresh > div > div{
+::v-deep body uni-page-refresh > div > div{
 	display: none !important;
 }
 
 // 下拉加载动画【scroll-view】
-/deep/ body .uni-scroll-view-refresher{
+::v-deep body .uni-scroll-view-refresher{
 	background-color: transparent !important;
 }
-/deep/ body .uni-scroll-view-refresher div{
+::v-deep body .uni-scroll-view-refresher div{
 	left: 50%;
 	top: 50%;
 	transform: translate(-50%, -50%);
@@ -666,7 +666,7 @@ scroll-view ::-webkit-scrollbar {
 	clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important;
 	animation:.6s backgroundChange linear infinite;
 }
-/deep/ body .uni-scroll-view-refresher div::after{
+::v-deep body .uni-scroll-view-refresher div::after{
 	content: "";
 	position: absolute;
 	left: -22rpx;
@@ -676,7 +676,7 @@ scroll-view ::-webkit-scrollbar {
 	background-color: #ccc;
 	animation:.5s backgroundChange linear infinite;
 }
-/deep/ body .uni-scroll-view-refresher div::before{
+::v-deep body .uni-scroll-view-refresher div::before{
 	content: "";
 	position: absolute;
 	right: -22rpx;
@@ -686,7 +686,7 @@ scroll-view ::-webkit-scrollbar {
 	background-color: #ccc;
 	animation:.7s backgroundChange linear infinite;
 }
-/deep/ body .uni-scroll-view-refresher > div > div{
+::v-deep body .uni-scroll-view-refresher > div > div{
 	display: none !important;
 }
 @keyframes backgroundChange {
@@ -874,3 +874,5 @@ scroll-view ::-webkit-scrollbar {
     display: inline-block;
     z-index: 100;
 }
+
+@import './mp_html_patch.scss';

common/css/mp_html_patch.scss

@@ -0,0 +1,4 @@
+// 修复图片垂直对齐问题，解决两张图片上下有空白缝隙问题
+::v-deep ._img {
+    vertical-align: top;
+}

common/css/order_parment.scss

@@ -377,7 +377,7 @@ view {
 	}
 }
 
-/deep/ .goods-form {
+::v-deep .goods-form {
 	display: flex;
 	align-items: center;
 	position: relative;
@@ -1354,7 +1354,7 @@ view {
 		border-bottom: 2rpx solid #F4F4F6;
 	}
 
-	/deep/ .form-wrap {
+	::v-deep .form-wrap {
 		margin: 0 24rpx;
 
 		.icon-right {

common/js/config-external.js

@@ -14,7 +14,7 @@ export const langConfig = {
 // 主题配置
 export const themeConfig = {
   // 主题列表
-  themeList: ['default', 'red', 'green', 'blue'],
+  themeList: ['default', 'red', 'green', 'blue', 'pink', 'gold', 'purple', 'yellow', 'black'],
   // 默认主题
   defaultTheme: 'default'
 };
@@ -98,27 +98,6 @@ class ConfigExternal {
     return this.loadPromises[key];
   }
 
-  /**
-   * 加载主题配置（同步方式）
-   * @param {string} theme - 主题名称
-   * @returns {object} - 主题配置
-   */
-  loadThemeSync(theme = themeConfig.defaultTheme) {
-    if (this.loadedConfigs[`theme_${theme}`]) {
-      return this.loadedConfigs[`theme_${theme}`];
-    }
-
-    try {
-      // 动态加载主题配置
-      const themeData = require(`@/common/js/style_color.js`)[theme];
-      this.loadedConfigs[`theme_${theme}`] = themeData;
-      return themeData;
-    } catch (error) {
-      console.error(`加载主题 ${theme} 失败:`, error);
-      return {};
-    }
-  }
-
   /**
    * 加载主题配置（异步方式）
    * @param {string} theme - 主题名称
@@ -136,7 +115,8 @@ class ConfigExternal {
     this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
       try {
         // 动态加载主题配置
-        const themeData = require(`@/common/js/style_color.js`)[theme];
+        const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+        // console.log('async themeData => ', themeData);
         this.loadedConfigs[`theme_${theme}`] = themeData;
         resolve(themeData);
       } catch (error) {

common/js/config.js

@@ -20,6 +20,10 @@ try {
 // 默认域名, 自定义发行时可以修改
 let defaultDomain = ''; 
 
+// #ifdef H5_XCX_5G_QUICKAPP_COM
+defaultDomain = 'https://xcx20.5g-quickapp.com';
+// #endif
+
 // #ifdef H5_XCX_AIGC_QUICKAPP_COM
 defaultDomain = 'https://xcx.aigc-quickapp.com/';
 // #endif
@@ -43,6 +47,7 @@ let localDevConfig = { uniacid: 0, domain: defaultDomain };
 
 // #ifndef PRODUCTION
 // 尝试动态加载本地配置文件
+if (process?.env?.NODE_ENV === 'development') {
     try {
         // 尝试从项目根目录加载本地配置文件
         // 使用相对路径的方式，确保在不同平台下都能正确解析
@@ -57,12 +62,20 @@ try {
         console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
         // #endif
     }
+}
 // #endif
 
 const { uniacid = 0, domain = defaultDomain } = localDevConfig ?? { uniacid: 0, domain: defaultDomain }
 
-// 调试版本，配置说明
-const devCfg = {
+export default {
+    /**
+     * 1.开发调试模式
+     * 去掉注释 ...defaultCfg;
+     * 注释掉 ...releaseCfg,
+     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
+     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
+     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
+     */
     // 商户ID
     uniacid: uniacid, //825
 
@@ -92,18 +105,9 @@ const devCfg = {
 
     // // H5端域名
     // h5Domain: 'http://saas.cn/',
-};
 
-var config = {
-    /**
-     * 1.开发调试模式
-     * 去掉注释 ...devCfg;
-     * 注释掉 ...releaseCfg,
-     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
-     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
-     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
-     */
-    ...(releaseCfg ?? devCfg),
+    // 发行版本配置
+    ...(releaseCfg || {}),
 
 
     // 腾讯地图key 
@@ -118,5 +122,3 @@ var config = {
     // 版本号 
     version: '1.0'
 };
-
-export default config;

common/js/customer-service.js

@@ -2,13 +2,68 @@
  * 客服统一处理服务
  * 整合各种客服方式，提供统一的调用接口
  */
-export class CustomerService {
-    constructor(vueInstance, externalConfig = null) {
+class CustomerService {
+    constructor(vueInstance, externalConfig = {}) {
+        if (!vueInstance.$lang) {
+            throw new Error('CustomerService 必须在 Vue 实例中初始化');
+        }
+
         this.vm = vueInstance;
         this.externalConfig = externalConfig; // 外部传入的最新配置（优先级最高）
         this.latestPlatformConfig = null;
     }
 
+    getSupoortKeFuList() {
+        if (!this.vm) return [];
+
+        const vm = this.vm;
+
+        return [
+            {
+                id: 'weixin-official',
+                name: vm.$lang('customer.weChatKefu'),
+                isOfficial: true,
+                type: 'weapp'
+            },
+            {
+                id: 'custom-kefu',
+                name: vm.$lang('customer.systemKefu'),
+                isOfficial: false
+            },
+            {
+                id: 'qyweixin-kefu',
+                name: vm.$lang('customer.weChatWorkKefu'),
+                isOfficial: false
+            },
+        ]
+    }
+
+    /**
+     * 打开客服选择弹窗
+     */
+    openCustomerSelectPopupDialog() {
+        const kefu_list = this.getSupoortKeFuList();
+        const kefuNames = kefu_list.map(item => item.name);
+
+        uni.showActionSheet({
+            itemList: kefuNames,
+            success: (res) => {
+                const kefu = kefu_list[res.tapIndex];
+                this.externalConfig = kefu ?? this.externalConfig ?? {};
+                if (kefu.isOfficial) {
+                    uni.openCustomerServiceConversation({
+                        sessionFrom: 'weapp',
+                        showMessageCard: true
+                    });
+                } else if (kefu.id === 'custom-kefu') {
+                    this.handleCustomerClick();
+                } else if (kefu.id === 'qyweixin-kefu') {
+                    this.handleQyWeixinKefuClick();
+                }
+            }
+        });
+    }
+
     /**
      * 强制刷新配置（支持传入外部配置）
      * @param {Object} externalConfig 外部最新配置
@@ -122,35 +177,11 @@ export class CustomerService {
     }
 
     /**
-     * 跳转到Dify客服页面
+     * 跳转到AI客服页面
      */
-    openDifyService() {
-        try {
-            if (this.vm.setAiUnreadCount) {
-                this.vm.setAiUnreadCount(0);
-            }
-            // 强制跳转，忽略框架层的封装
-            uni.redirectTo({
-                url: '/pages_tool/ai-chat/index',
-                fail: (err) => {
-                    // 兜底：使用window.location跳转（H5）
-                    // #ifdef H5
-                    window.location.href = '/pages_tool/ai-chat/index';
-                    // #endif
-                    console.error('跳转Dify客服失败:', err);
-                    uni.showToast({
-                        title: '跳转客服失败',
-                        icon: 'none'
-                    });
-                }
-            });
-        } catch (e) {
-            console.error('跳转Dify客服异常:', e);
-            uni.showToast({
-                title: '跳转客服失败',
-                icon: 'none'
-            });
-        }
+    openAIKeFuService() {
+        const vm = this.vm;
+        vm.$util.redirectTo(vm.$util.AI_CHAT_PAGE_URL);
     }
 
     /**
@@ -170,7 +201,7 @@ export class CustomerService {
         }
 
         const config = this.getPlatformConfig();
-        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
+        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
 
         if (config.type === 'none') {
             this.showNoServicePopup();
@@ -180,7 +211,7 @@ export class CustomerService {
         // 核心分支：根据最新的type处理
         switch (config.type) {
             case 'aikefu':
-                this.openDifyService();
+                this.openAIKeFuService();
                 break;
             case 'wxwork':
                 this.openWxworkService(false, config, options);
@@ -211,7 +242,7 @@ export class CustomerService {
     openWxworkService(useOriginalService = false, servicerConfig = null, options = {}) {
         const config = servicerConfig || this.getPlatformConfig();
         const wxworkConfig = this.getWxworkConfig();
-        const { sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
+        const { sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
 
         // #ifdef MP-WEIXIN
         if (wxworkConfig?.enable && wxworkConfig?.contact_url && !useOriginalService) {
@@ -292,7 +323,7 @@ export class CustomerService {
      * @param {Object} options 选项参数
      */
     handleCustomWeappService(config, options = {}) {
-        const { sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
+        const { sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
 
         if (config.customServiceUrl) {
             let url = config.customServiceUrl;
@@ -381,7 +412,7 @@ export class CustomerService {
         console.log('支付宝小程序客服', config);
         switch (config.type) {
             case 'aikefu':
-                this.openDifyService();
+                this.openAIKeFuService();
                 break;
             case 'third':
                 this.openThirdService(config);
@@ -395,13 +426,22 @@ export class CustomerService {
     /**
      * 拨打电话
      */
-    makePhoneCall() {
-        this.vm.$api.sendRequest({
-            url: '/api/site/shopcontact',
-            success: res => {
-                if (res.code === 0 && res.data?.mobile) {
+    makePhoneCall(mobileNumber) {
+        if (mobileNumber) {
+            return uni.makePhoneCall({
+                phoneNumber: mobileNumber
+            });
+        }
+
+        // 从缓存中获取电话信息
+        uni.getStorage({
+            key: 'shopInfo',
+            success: (res) => {
+                const shopInfo = res.data;
+                const mobile = shopInfo?.mobile ?? '';
+                if (mobile) {
                     uni.makePhoneCall({
-                        phoneNumber: res.data.mobile
+                        phoneNumber: mobile
                     });                    
                 } else {
                     uni.showToast({
@@ -409,12 +449,6 @@ export class CustomerService {
                         icon: 'none'
                     });                    
                 }
-            },
-            fail: () => {
-                uni.showToast({
-                    title: '获取客服电话失败',
-                    icon: 'none'
-                });
             }
         });
     }
@@ -506,6 +540,6 @@ export class CustomerService {
  * @param {Object} externalConfig 外部最新配置
  * @returns {CustomerService} 客服服务实例
  */
-export function createCustomerService(vueInstance, externalConfig = null) {
+export function createCustomerService(vueInstance, externalConfig = {}) {
     return new CustomerService(vueInstance, externalConfig);
 }

common/js/diy.js

@@ -1,7 +1,9 @@
 import WxMap from 'common/js/map-wx-jssdk.js';
 import Config from '@/common/js/config.js';
+import util from '@/common/js/util.js';
+
+let systemInfo = util.getDeviceInfo();
 
-let systemInfo = uni.getSystemInfoSync();
 export default {
 	data() {
 		return {

common/js/golbalConfig.js

@@ -1,21 +1,8 @@
 export default {
-	data() {
-		return {
-			// 页面样式，动态设置主色调
-			themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
-		}
-	},
 	onLoad() { },
 	onShow() {
 		// 刷新多语言
 		this.$langConfig.refresh();
-		let time = setInterval(() => {
-			let theme = this.themeStyle;
-			if (theme && theme.main_color) {
-				this.themeColorSet();
-				clearInterval(time);
-			}
-		}, 50);
 	},
 	computed: {
 		// 是否是英文环境
@@ -25,6 +12,9 @@ export default {
 		themeStyle() {
 			return this.$store.state.themeStyle;
 		},		
+		themeColor() {
+			return this.$store.state.themeColor;
+		},
 		// 插件是否存在
 		addonIsExist() {
 			return this.$store.state.addonIsExist;
@@ -79,6 +69,10 @@ export default {
 		servicerConfig() {
 			return this.$store.state.servicerConfig;
 		},
+		// 企业微信配置
+		wxworkConfig() {
+			return this.$store.state.wxworkConfig;
+		},
 		diySeckillInterval() {
 			return this.$store.state.diySeckillInterval;
 		},
@@ -111,25 +105,7 @@ export default {
 		}
 	},
 	methods: {
-		themeColorSet() {
-			let theme = this.themeStyle;
-			this.themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
-			if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
-			Object.keys(theme).forEach(key => {
-				let data = theme[key];
-				if (typeof (data) == "object") {
-					Object.keys(data).forEach(k => {
-						this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
-					});
-				} else if (typeof (key) == "string" && key) {
-					this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
-				}
-			});
-			for (let i = 9; i >= 5; i--) {
-				let color = this.$util.colourBlend(theme.main_color, '#ffffff', (i / 10));
-				this.themeColor += `--base-color-light-${i}:${color};`;
-			}
-		},
+
 		// 颜色变浅（>0）、变深函数（<0）
 		lightenDarkenColor(color, amount) {
 
@@ -173,7 +149,7 @@ export default {
 			if (isJump && route != 'pages/index/index') {
 				uni.setStorageSync('manual_change_store', true); // 手动切换门店
 				this.$store.dispatch('getCartNumber'); //重新获取购物车数据
-				this.$util.redirectTo('/pages/index/index');
+				this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 			}
 		}
 	},

common/js/goods_detail_base.js

@@ -240,7 +240,7 @@ export default {
 		},
 		goHome() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo('/pages/index/index');
+			this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 		},
 		goCart() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转

common/js/http.js

@@ -49,7 +49,7 @@ export default {
 		}
 
 		var method = params.data != undefined ? 'POST' : 'GET', // 请求方式
-			url = Config.baseUrl + params.url, // 请求路径
+			url = (Config.baseUrl + params.url).replace(/(?<!:)\/+/g, '/'), // 请求路径
 			data = {
 				app_type,
 				app_type_name

common/js/lang.js

@@ -1,8 +1,8 @@
 import { langConfig } from './config-external.js';
 
-var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+
 // 缓存已加载的语言包
-var loadedLangPacks = {};
+const loadedLangPacks = {};
 
 // 处理页面目录映射
 function processRoutePath(route) {
@@ -64,14 +64,18 @@ export default {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
 
-		var value = '';
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+
+		let value = ''; // 存放解析后的语言值
+		let langPath = ''; // 存放当前页面语言包路径
+
 		try {
 			//公共语言包（同步加载）
 			var lang = loadLangPackSync(locale, 'common');
 			
 			//当前页面语言包（同步加载）
 			let route = _this.route;
-			let langPath = processRoutePath(route);
+			langPath = processRoutePath(route);
 			
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
@@ -99,7 +103,7 @@ export default {
 			}
 			
 		} catch (e) {
-			console.error('解析语言包失败:', e);
+			console.error('解析语言包失败:', e, { langPath, field, locale });
 			value = field;
 		}
 
@@ -112,7 +116,10 @@ export default {
 		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
 		// 多语言调试，注释后可以关闭控制台输出
-		// console.log(`字段: ${field}, 值: ${value}`)
+		if (field == value) {
+			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
+		}
+
 		return value;
 	},
 	/**
@@ -125,10 +132,14 @@ export default {
 		if (!_this) return;
 
 		uni.setStorageSync("lang", value);
-		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
 		// 清空已加载的语言包缓存
-		loadedLangPacks = {};
+		for (let key in loadedLangPacks) {
+			if (!key.startsWith(locale)) {
+				delete loadedLangPacks[key];
+			}
+		}
 
 		this.refresh();
 
@@ -140,7 +151,7 @@ export default {
 	refresh() {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
-		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 	
 		this.title(this.lang("title"));
 

common/js/map/openMap.js

@@ -1,3 +1,4 @@
+import util from '@/common/js/util.js'
 import TransformCoordinate from './transformCoordinate.js'
 
 function openMapByDefault(latitude, longitude, name) {
@@ -85,7 +86,8 @@ export default {
 	openMap(latitude, longitude, name, coord_type = 'gcj02') {
 		let arr = getCoordByType(longitude, latitude, coord_type)
 		// #ifdef APP-PLUS
-		switch (uni.getSystemInfoSync().platform) {
+		let platform = util.getDeviceInfo().platform;
+		switch (platform) {
 			case 'android':
 				console.log('运行Android上')
 				openMapByAndroid(arr[1], arr[0], name)

common/js/navigation.js

@@ -1,4 +1,5 @@
-import { EventSafety } from './event-safety'
+import { EventSafety } from '@/common/js/event-safety.js'
+import util from '@/common/js/util.js'
 
 export class NavigationHelper {
   constructor() {
@@ -59,7 +60,7 @@ export class NavigationHelper {
       // 微信小程序精确计算
       try {
         const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
-        const systemInfo = uni.getSystemInfoSync()
+        let systemInfo = util.getDeviceInfo();
         
         const height = menuButtonInfo.bottom + 
                       (menuButtonInfo.top - systemInfo.statusBarHeight)
@@ -119,7 +120,7 @@ export class NavigationHelper {
   // 获取状态栏高度
   getStatusBarHeight() {
     // #ifdef MP-WEIXIN
-    const systemInfo = uni.getSystemInfoSync()
+    let systemInfo = util.getDeviceInfo();
     return systemInfo.statusBarHeight || 20
     // #endif
     // #ifdef H5
@@ -138,7 +139,7 @@ export class NavigationHelper {
   // 获取安全区域
   getSafeAreaInsets() {
     try {
-      const systemInfo = uni.getSystemInfoSync()
+      let systemInfo = util.getDeviceInfo();
       return systemInfo.safeArea || {
         top: 0,
         bottom: 0,

common/js/share.js

@@ -0,0 +1,100 @@
+// 文件分享工具函数
+export default {
+    /**
+     * 生成文件预览链接
+     * @param {Object} file - 文件对象，包含 name 和 url 属性
+     * @returns {string} - 生成的文件预览链接
+     */
+    generateFilePreviewUrl(file) {
+        // 推断文件类型
+        let fileType = '';
+        if (file.name) {
+            const ext = file.name.split('.').pop().toLowerCase();
+            if (['pdf'].includes(ext)) {
+                fileType = 'pdf';
+            } else if (['doc', 'docx'].includes(ext)) {
+                fileType = 'word';
+            } else if (['mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv'].includes(ext)) {
+                fileType = 'video';
+            }
+        }
+        
+        // 构建文件预览链接
+        const previewUrl = `/pages_tool/file-preview/file-preview?fileName=${encodeURIComponent(file.name)}&fileUrl=${encodeURIComponent(file.url || '')}&fileType=${encodeURIComponent(fileType)}`;        
+        return previewUrl;
+    },
+    
+    /**
+     * 分享文件
+     * @param {Object} file - 文件对象，包含 name 和 url 属性
+     * @param {string} title - 分享标题，默认使用文件名
+     * @param {string} desc - 分享描述，默认使用固定文案
+     */
+    shareFile(file, title = file.name, desc = '查看企业文件：' + file.name) {
+        // 生成文件预览链接
+        const filePreviewUrl = this.generateFilePreviewUrl(file);
+        
+        // #ifdef H5
+        // H5 平台分享
+        if (navigator.share) {
+            // 使用 Web Share API
+            navigator.share({
+                title: title,
+                text: desc,
+                url: filePreviewUrl
+            }).catch(err => {
+                console.error('分享失败:', err);
+                uni.showToast({ title: '分享失败', icon: 'none' });
+            });
+        } else {
+            // 不支持 Web Share API 的浏览器
+            uni.setClipboardData({
+                data: filePreviewUrl,
+                success: () => {
+                    uni.showToast({ title: '链接已复制，请粘贴分享', icon: 'success' });
+                },
+                fail: () => {
+                    uni.showToast({ title: '复制失败', icon: 'none' });
+                }
+            });
+        }
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        // 微信小程序分享
+        uni.showActionSheet({
+            itemList: ['发送给朋友', '分享到朋友圈'],
+            success: (res) => {
+                if (res.tapIndex === 0) {
+                    // 发送给朋友
+                    uni.shareAppMessage({
+                        title: title,
+                        path: filePreviewUrl,
+                        success: () => {
+                            uni.showToast({ title: '分享成功', icon: 'success' });
+                        },
+                        fail: () => {
+                            uni.showToast({ title: '分享失败', icon: 'none' });
+                        }
+                    });
+                } else if (res.tapIndex === 1) {
+                    // 分享到朋友圈
+                    uni.shareTimeline({
+                        title: desc,
+                        path: filePreviewUrl,
+                        success: () => {
+                            uni.showToast({ title: '分享成功', icon: 'success' });
+                        },
+                        fail: () => {
+                            uni.showToast({ title: '分享失败', icon: 'none' });
+                        }
+                    });
+                }
+            },
+            fail: () => {
+                // 用户取消分享
+            }
+        });
+        // #endif
+    }
+};

common/js/style_color.js

@@ -1,3 +1,12 @@
+/**
+ * 颜色配置
+ * 包含默认颜色和其他颜色
+ * 特别注意：
+ * 1. 分组不会被计算成Key，分组下的属性会被计算成Key
+ * 2. 分组下的属性如果有相同的Key，会被覆盖
+ * 3. 例如：hoverNav，hoverNav_bg_color和hoverNav_text_color, 不会生成hoverNav_hoverNav_bg_color和hoverNav_hoverNav_text_color
+ * 问题原因：历史遗留
+ */
 export default {
 	'default': {
 		//红色
@@ -11,7 +20,7 @@ export default {
 		main_color_shallow: '#FFF4F4',//淡背景
 		price_color: 'rgb(252,82,39)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgb(252,82,39,1)',//价格
 			promotion_tag: '#FF4646',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -22,35 +31,39 @@ export default {
 			goods_btn_color: '#FF4646',//按钮颜色
 			goods_btn_color_shallow: '#F7B500',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC'
+			hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
+		},
 	},
 	'green': {
 		name: 'green',
@@ -63,7 +76,7 @@ export default {
 		main_color_shallow: '#F0FFF5',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#19C650',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -74,35 +87,39 @@ export default {
 			goods_btn_color: '#19C650',//按钮颜色
 			goods_btn_color_shallow: '#FA6400',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#19C650',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	},
 	'blue': {
 		name: 'blue',
@@ -115,7 +132,7 @@ export default {
 		main_color_shallow: '#E2F3FF',
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#36ABFF',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -126,35 +143,39 @@ export default {
 			goods_btn_color: '#36ABFF',//按钮颜色
 			goods_btn_color_shallow: '#FA6400',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#36ABFF',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	},
 	'pink': {
 		name: 'pink',
@@ -167,7 +188,7 @@ export default {
 		main_color_shallow: '#FFF5F8',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#FF407E',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -178,35 +199,39 @@ export default {
 			goods_btn_color: '#FF407E',//按钮颜色
 			goods_btn_color_shallow: '#F7B500',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#FF407E',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	},
 	'gold': {
 		name: 'gold',
@@ -219,7 +244,7 @@ export default {
 		main_color_shallow: '#FFFAF1',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#CFAF70',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -230,35 +255,39 @@ export default {
 			goods_btn_color: '#CFAF70',//按钮颜色
 			goods_btn_color_shallow: '#444444',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#CFAF70',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	},
 	'purple': {
 		name: 'purple',
@@ -271,7 +300,7 @@ export default {
 		main_color_shallow: '#F8F3FF',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#A253FF',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -282,35 +311,39 @@ export default {
 			goods_btn_color: '#A253FF',//按钮颜色
 			goods_btn_color_shallow: '#222222',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#A253FF',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	},
 	'yellow': {
 		name: 'yellow',
@@ -323,7 +356,7 @@ export default {
 		main_color_shallow: '#FFFBEF',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#303133',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#FFD009',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -334,35 +367,39 @@ export default {
 			goods_btn_color: '#FFD009',//按钮颜色
 			goods_btn_color_shallow: '#1D262E',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#FFD009',//背景色
+			hover_nav_text_color: '#303133'
+		},
 	},
 	'black': {
 		name: 'black',
@@ -375,7 +412,7 @@ export default {
 		main_color_shallow: '#efefef',//淡背景
 		price_color: 'rgba(255,0,0,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		goods_detail: {
+		...{
 			goods_price: 'rgba(255,0,0,1)',//价格
 			promotion_tag: '#222222',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -386,34 +423,38 @@ export default {
 			goods_btn_color: '#222222',//按钮颜色
 			goods_btn_color_shallow: '#FA8B00',//副按钮颜色
 		},
-		pintuan: {
+		...{
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		super_member: {
+		...{
 			super_member_start_bg: '#fadcb5',
 			super_member_end_bg: '#f6bd74',
 			super_member_start_text_color: '#ab6126',
 			super_member_end_text_color: '#d19336',
 		},
-		bargain: {
+		...{
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		seckill: {
+		...{
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		giftcard: {
+		...{
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		groupby: {
+		...{
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
+		...{
+			hover_nav_bg_color: '#222222',//背景色
+			hover_nav_text_color: '#FFFFFF'
+		},
 	}
 }

common/js/uniapp.utils.js

@@ -0,0 +1,148 @@
+/**
+ * 将常用的Uniapp提供的函数，存放到这里，按需引用
+ */
+
+
+/**
+ * 显示错误信息
+ * @param {Exception} err 
+ * @param {Boolean} useModal 
+ */
+const showError = (err, useModal = false) => {
+    const content = err?.message || err?.errMsg || err?.toString();
+    if (!useModal) {
+        uni.showToast({
+            title: content,
+            icon: 'none',
+            duration: 3000
+        });
+    } else {
+        uni.showModal({
+            title: '错误提示',
+            content,
+            showCancel: false,
+        })
+    }
+}
+
+/**
+ * 打电话
+ * @param {string} mobile 电话号码
+ */
+export const makePhoneCall = (mobile) => {
+    try {
+        uni.makePhoneCall({
+            phoneNumber: `${mobile}`,
+            success(e) {
+                console.log(e);
+            }
+        });
+    } catch (err) {
+        showError(err);
+    }
+}
+
+/**
+ * 拷贝文本（返回 Promise）
+ * @param {*} text 
+ * @param {*} options
+ * @returns {Promise} 返回 Promise，成功时 resolve，失败时 reject
+ */
+export const copyTextAsync = (text, { copySuccess = '', copyFailed = '' } = {}) => {
+    return new Promise((resolve, reject) => {
+        // 输入验证
+        if (!text && text !== '') {
+            const error = new Error('复制文本不能为空');
+            showError(error);
+            reject(error);
+            return;
+        }
+
+        // 超时监测
+        const timeoutId = setTimeout(() => {
+            let error = new Error('复制操作长时间无响应，请检查相关权限及配置是否正确');
+            // #ifdef MP-WEIXIN
+            error = new Error([
+                '复制操作长时间无响应!',
+                '原因：',
+                '1.微信平台->用户隐私保护指引->"剪贴板"功能未添加或审核未通过；',
+                '2.微信平台对剪贴板API调用频率有限制'
+            ].join('\r\n'));
+            // #endif
+            showError(error, true);
+            reject(error);
+        }, 5000);
+
+        try {
+            uni.setClipboardData({
+                data: `${text}`,
+                success: (res) => {
+                    clearTimeout(timeoutId);
+
+                    try {
+                        if (copySuccess) {
+                            uni.showToast({
+                                title: copySuccess,
+                                icon: 'success',
+                                duration: 2000
+                            });
+                        }
+                    } catch (e) {
+                        showError(e);
+                    }
+
+                    resolve(res);
+                },
+                fail: (err) => {
+                    clearTimeout(timeoutId);
+                    try {
+                        uni.showToast({
+                            title: err.message || err.errMsg || copyFailed || '复制失败',
+                            icon: 'none',
+                            duration: 2000
+                        });
+                    } catch (e) {
+                        showError(e);
+                    }
+                    reject(err);
+                }
+            });
+        } catch (err) {
+            clearTimeout(timeoutId);
+            showError(err);
+            reject(err);
+        }
+    });
+}
+
+/**
+ * 拷贝文本（回调形式，兼容旧代码）
+ * @param {*} text 
+ * @param {*} options
+ * @param {Function} callback 回调函数，接收 (success, error) 参数
+ */
+export const copyText = (text, options = {}, callback) => {
+    copyTextAsync(text, options)
+        .then(res => {
+            if (callback) callback(true, null);
+        })
+        .catch(err => {
+            if (callback) callback(false, err);
+        });
+}
+
+/**
+ * 打开定位
+ * @param {Object} options 
+ */
+export const openLocation = ({ latitude, longitude, name } = {}) => {
+    try {
+        uni.openLocation({
+            latitude,
+            longitude,
+            name,
+        });
+    } catch (err) {
+        showError(err);
+    }
+}

common/js/util.js

@@ -7,15 +7,20 @@ import {
 
 
 
-// 首页路径
+// 关于页面路径，使用常量导出
 export const INDEX_PAGE_URL = '/pages/index/index';
+export const CATEGORY_PAGE_URL = '/pages_goods/category';
+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';
 
 // 当前最新的tabBar.list (参见pages.json 中的tabBar.list 配置)
 export const systemTabBarList = [
 	INDEX_PAGE_URL,
-	'/pages_goods/category',
-	'/pages_tool/contact/contact',
-	'/pages_tool/member/index'
+	CATEGORY_PAGE_URL,
+	CONTACT_PAGE_URL,
+	MEMBER_PAGE_URL
 ];
 
 /**
@@ -32,10 +37,28 @@ export const adaptSubpackageUrl = (url) => {
 	 */
 	// 定义前缀映射表
 	const urlPrefixMap = {
+		'/pages/promotion/': '/pages_promotion/',
+		'/pages/order/': '/pages_order/',
 		'/pages/goods/': '/pages_goods/',
+
 		'/pages/contact/': '/pages_tool/contact/',
 		'/pages/member/': '/pages_tool/member/',
-		'/pages/vr': '/pages_tool/vr/'
+		'/pages/login/': '/pages_tool/login/',
+		'/pages/agreement/': '/pages_tool/agreement/',
+		'/pages/article/': '/pages_tool/article/',
+		'/pages/cases/': '/pages_tool/cases/',
+		'/pages/contact/': '/pages_tool/contact/',
+		'/pages/files/': '/pages_tool/files/',
+		'/pages/form/': '/pages_tool/form/',
+		'/pages/help/': '/pages_tool/help/',
+		'/pages/notice/': '/pages_tool/notice/',
+		'/pages/pay/': '/pages_tool/pay/',
+		'/pages/recharge/': '/pages_tool/recharge/',
+		'/pages/seal/': '/pages_tool/seal/',
+		'/pages/storeclose/': '/pages_tool/storeclose/',
+		'/pages/vr/': '/pages_tool/vr/',
+		'/pages/weapp/': '/pages_tool/weapp/',
+		'/pages/webview/': '/pages_tool/webview/',
 	};
 
 	// 构建正则表达式
@@ -61,18 +84,55 @@ export const adaptSubpackageUrl = (url) => {
 	return replacePrefix(url);
 }
 
+/**
+ * 检查tabBar是否激活
+ * @param {string} linkUrl 链接路径 /pages/goods/category
+ * @param {string} currentPageRoute 当前页面路径 /pages_goods/category
+ * @returns {boolean} 是否激活
+ */
+export const checkTabBarActive = (linkUrl, currentPageRoute) => {
+	const linkUrlParts = adaptSubpackageUrl(linkUrl).split('/');
+	const currentPageRouteParts = currentPageRoute.split('/');
+
+	// console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts});
+
+	try {
+		// 二级页面
+		if (linkUrlParts[2] === currentPageRouteParts[2]) {
+			return true;
+		}
+
+		// 一级页面，限定只能是goods相关
+		if (linkUrlParts[1] === currentPageRouteParts[1] && linkUrlParts[1] === 'pages_goods') {
+			return true;
+		}
+	} catch (error) {
+		console.error('diy-bottom-nav verify error:', error);
+	}
+
+	return false;
+}
+
 export default {
+	/** 导出页面URL常量 */
+	MEMBER_PAGE_URL,
+	CATEGORY_PAGE_URL,
+	CONTACT_PAGE_URL,
+	INDEX_PAGE_URL,
+	LOGIN_PAGE_URL,
+	AI_CHAT_PAGE_URL,
+
 	/**
 	 * 页面跳转
 	 * @param {string} to 跳转链接 /pages/idnex/index
-	 * @param {Object} param 参数 {key : value, ...}
-	 * @param {string} mode 模式
+	 * @param {Object} param 参数 {key : value, ...}, 默认{}
+	 * @param {string} mode 模式 navigateTo、redirectTo、reLaunch、tabbar, 默认navigateTo
 	 */
-	redirectTo(to, param, mode) {
+	redirectTo(to, param = {}, mode = 'navigateTo') {
 		let url = to;
 
 		// 替换url中的前缀
-		console.log('redirectTo', to, param, mode);
+		console.log('页面跳转 redirectTo', to, param, mode);
 		url = adaptSubpackageUrl(url);
 		console.log('adaptSubpackageUrl', url);
 
@@ -99,26 +159,26 @@ export default {
 		// 如果url不包含tabBarList中的路径，根据mode判断跳转方式
 		switch (mode) {
 			case 'tabbar':
-				// 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
+				// 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。重置页面栈，仅保留 tabBar 页面
 				uni.switchTab({
 					url
 				});
 				break;
 			case 'redirectTo':
-				// 关闭当前页面，跳转到应用内的某个页面。
+				// 关闭当前页面，跳转到应用内的某个页面。替换栈顶页面，长度不变（上限10层）
 				uni.redirectTo({
 					url
 				});
 				break;
 			case 'reLaunch':
-				// 关闭所有页面，打开到应用内的某个页面。
+				// 关闭所有页面，打开到应用内的某个页面。清空栈后打开新页面，长度=1
 				uni.reLaunch({
 					url
 				});
 				break;
 			default:
-				// 保留当前页面，跳转到应用内的某个页面
-				console.log('保留当前页面，跳转到应用内的某个页面', url);
+				// 保留当前页面，跳转到应用内的某个页面，新增页面到栈顶，长度+1（上限10层）
+				console.log('保留当前页面，navigateTo跳转到应用内的某个页面', url);
 				uni.navigateTo({
 					url
 				});
@@ -130,8 +190,6 @@ export default {
 	 * @param {Object} params 参数，针对商品、相册里面的图片区分大中小，size: big、mid、small
 	 */
 	img(img_path, params) {
-
-
 		var path = "";
 		if (img_path != undefined && img_path != "") {
 			if (img_path.split(',').length > 1) {
@@ -491,7 +549,7 @@ export default {
 	 * 检测苹果X以上的手机
 	 */
 	isIPhoneX() {
-		let res = uni.getSystemInfoSync();
+		let res = this.getDeviceInfo();
 		if (res.model.search('iPhone X') != -1) {
 			return true;
 		}
@@ -499,13 +557,33 @@ export default {
 	},
 	//判断安卓还是iOS
 	isAndroid() {
-		let platform = uni.getSystemInfoSync().platform
+		let platform = this.getDeviceInfo().platform;
 		if (platform == 'ios') {
 			return false;
 		} else if (platform == 'android') {
 			return true;
 		}
 	},
+	/**
+	 * 获取设备信息（包含降级处理）
+	 */
+	getDeviceInfo() {
+		try {
+			return uni.getDeviceInfo();
+		} catch (e) {
+			return uni.getSystemInfoSync();
+		}
+	},
+	/**
+	 * 获取窗口信息（包含降级处理）
+	 */
+	getWindowInfo() {
+		try {
+			return uni.getWindowInfo();
+		} catch (e) {
+			return uni.getSystemInfoSync();
+		}
+	},
 	/**
 	 * 深度拷贝对象
 	 * @param {Object} obj
@@ -527,6 +605,36 @@ export default {
 		}
 		return cloneObj
 	},
+
+
+
+	/**
+	 * 打开微信企业客服
+	 * @param {Function} fallbackFunc 降级处理函数
+	 */
+	openWxWorkServiceChat(fallbackFunc) {
+		// #ifdef MP-WEIXIN
+		let wxworkConfig = store.state?.wxworkConfig
+		if (wxworkConfig?.enable && wxworkConfig?.contact_url) {
+			// 直接使用活码链接跳转
+			wx.navigateToMiniProgram({
+				appId: 'wxeb490c6f9b154ef9', // 是企业微信官方小程序的AppID（固定值, 由腾讯企业微信团队维护, 不需要修改，用于展示"添加企业微信联系人"的官方页面）
+				path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(wxworkConfig?.contact_url)}`,
+				success: () => {
+					console.log('跳转企业微信成功');
+				},
+				fail: (err) => {
+					console.error('跳转企业微信失败:', err);
+					// 降级处理：使用原有客服方式
+					fallbackFunc && fallbackFunc();
+				}
+			});
+		} else {
+			fallbackFunc && fallbackFunc();
+		}
+		// #endif		
+	},
+
 	/**
 	 * 自定义模板的跳转链接
 	 * @param {Object} link
@@ -549,7 +657,6 @@ export default {
 
 		} else if (link.appid) {
 			// 跳转其他小程序
-
 			uni.navigateToMiniProgram({
 				appId: link.appid,
 				path: link.page
@@ -557,7 +664,6 @@ export default {
 
 		} else if (link.name == 'MOBILE' && !link.wap_url) {
 			// 拨打电话
-
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
 				success: (res) => {
@@ -590,6 +696,7 @@ export default {
 					// #endif
 
 					// #ifdef MP-WEIXIN
+					this.openWxWorkServiceChat(() => {
 						wx.openCustomerServiceChat({
 							extInfo: {
 								url: config.wxwork_url
@@ -600,6 +707,8 @@ export default {
 							sendMessagePath: 'this.sendMessagePath',
 							sendMessageImg: 'this.sendMessageImg'
 						});
+					});
+
 					// #endif
 					break;
 				case 'third':
@@ -650,7 +759,7 @@ export default {
 	 */
 	uniappIsIPhoneX() {
 		let isIphoneX = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let systemInfo = this.getDeviceInfo();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone X') != -1 || systemInfo.model.search('iPhone 11') != -1 || systemInfo.model.search('iPhone 12') != -1 || systemInfo.model.search('iPhone 13') != -1) {
 			isIphoneX = true;
@@ -677,7 +786,7 @@ export default {
 	 */
 	uniappIsIPhone11() {
 		let isIphone11 = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let systemInfo = this.getDeviceInfo();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone 11') != -1) {
 			isIphone11 = true;
@@ -688,7 +797,7 @@ export default {
 	// #ifdef H5
 	//判断该浏览器是否为safaria浏览器
 	isSafari() {
-		let res = uni.getSystemInfoSync();
+		let res = this.getDeviceInfo();
 		var ua = navigator.userAgent.toLowerCase();
 		if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
 			ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&
@@ -727,13 +836,22 @@ export default {
 		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 		return routes.length ? routes[routes.length - 1].route : '';
 	},
-	goBack(backUrl = '/pages/index/index') {
+	goBack(backUrl = INDEX_PAGE_URL) {
 		if (getCurrentPages().length == 1) {
 			this.redirectTo(backUrl);
 		} else {
 			uni.navigateBack();
 		}
 	},
+	/**
+	 * 隐藏“返回首页/小房子”按钮
+	 * 这个函数，用到页面show, onshow 的生命周期时
+	 */
+	hideHomeButton() {
+		// #ifdef MP-WEIXIN
+		wx.hideHomeButton();
+		// #endif
+	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）
@@ -1083,5 +1201,74 @@ export default {
 	verifyMobile(mobile) {
 		var parse = /^\d{11}$/.test(mobile);
 		return parse;
+	},
+	/**
+	 * 判断是否为快应用环境
+	 * @returns {boolean} 是否为快应用
+	 */
+	isQuickApp() {
+		// #ifndef QUICKAPP-WEBVIEW
+		let _isQuickApp = false;
+		try {
+			const ua = navigator?.userAgent?.toLowerCase();
+			// console.log('ua = ', ua);
+			_isQuickApp = ua.indexOf('quickapp') !== -1;
+
+			if (!_isQuickApp) {
+				// 特殊说明由于网站是嵌入到快应用的Webview组件中<web>，UA中不会包含quickapp字符串，
+				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
+				_isQuickApp = ua.indexOf('uniacid=') !== -1;
+			}
+		} catch (e) { }
+
+		if (!_isQuickApp) {
+			const systemInfo = this.getDeviceInfo();
+			_isQuickApp = systemInfo?.platform === 'quickapp' || process?.env?.UNI_PLATFORM === 'quickapp';
+		}
+		return _isQuickApp;
+		// #endif
+
+		return true;
+	},
+	/**
+	 * 判断是否为华为快应用环境
+	 * @returns {boolean} 是否为华为快应用
+	 */
+	isHuaweiQuickApp() {
+		if (!this.isQuickApp()) return false;
+
+		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
+		const systemInfo = this.getDeviceInfo();
+		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' ||
+			(typeof qh !== 'undefined' && qh.platform === 'huawei');
+		// #endif
+		return true;
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名
+	 * @param {string} str 蛇形命名字符串
+	 * @returns {string} 驼峰命名字符串
+	 */
+	snakeToCamel(str) {
+		return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名（递归处理对象中的所有属性名）
+	 * @param {Object} obj 包含蛇形命名字符串属性的对象
+	 * @returns {Object} 驼峰命名字符串属性的对象
+	 */
+	snakeToCamelForObj(obj) {
+		if (typeof obj !== 'object' || obj === null) return obj;
+		if (Array.isArray(obj)) return obj.map(this.snakeToCamelForObj.bind(this));
+		const newObj = {};
+		for (const key in obj) {
+			if (Object.hasOwnProperty.call(obj, key)) {
+				const newKey = this.snakeToCamel(key);
+				newObj[newKey] = this.snakeToCamelForObj(obj[key]);
+			}
+		}
+		return newObj;
 	}
 }

components-diy/css/common-channel.scss

@@ -0,0 +1,143 @@
+// 公共微信视频号样式
+
+// CSS 变量
+:root {
+	// 尺寸变量
+	--channel-play-btn-size: 80rpx;
+	--channel-play-btn-small-size: 60rpx;
+	--channel-play-btn-icon-size: 40rpx;
+	--channel-play-btn-icon-small-size: 30rpx;
+	--channel-border-radius: 12rpx;
+	--channel-stats-padding: 10rpx;
+	--channel-info-wrap-padding: 10rpx 0;
+	
+	// 字体变量
+	--channel-name-font-size: 28rpx;
+	--video-title-font-size: 28rpx;
+	--video-title-small-font-size: 24rpx;
+	--video-stats-font-size: 24rpx;
+	--channel-stats-font-size: 20rpx;
+	
+	// 颜色变量
+	--channel-name-color: #333;
+	--video-title-color: #333;
+	--video-title-small-color: #666;
+	--video-stats-color: #999;
+	--channel-stats-color: #fff;
+	--channel-border-color: #f0f0f0;
+	--channel-play-btn-bg: rgba(0, 0, 0, 0.4);
+	--channel-stats-bg: linear-gradient(transparent, rgba(0, 0, 0, 0.6));
+	
+	// 间距变量
+	--channel-name-margin-bottom: 4rpx;
+	--video-title-margin-bottom: 8rpx;
+}
+
+// 响应式设计
+@media (max-width: 375px) {
+	:root {
+		--channel-play-btn-size: 70rpx;
+		--channel-play-btn-small-size: 50rpx;
+		--channel-play-btn-icon-size: 35rpx;
+		--channel-play-btn-icon-small-size: 25rpx;
+		--channel-name-font-size: 24rpx;
+		--video-title-font-size: 24rpx;
+	}
+}
+
+@media (min-width: 750px) {
+	:root {
+		--channel-play-btn-size: 90rpx;
+		--channel-play-btn-small-size: 70rpx;
+		--channel-play-btn-icon-size: 45rpx;
+		--channel-play-btn-icon-small-size: 35rpx;
+		--channel-name-font-size: 32rpx;
+		--video-title-font-size: 32rpx;
+	}
+}
+
+// 播放按钮样式
+.channel-play-btn {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: var(--channel-play-btn-size);
+	height: var(--channel-play-btn-size);
+	background-color: var(--channel-play-btn-bg);
+	border-radius: 50%;
+
+	.play-icon {
+		width: var(--channel-play-btn-icon-size);
+		height: var(--channel-play-btn-icon-size);
+	}
+}
+
+// 小尺寸播放按钮（用于列表）
+.channel-play-btn.small {
+	width: var(--channel-play-btn-small-size);
+	height: var(--channel-play-btn-small-size);
+
+	.play-icon {
+		width: var(--channel-play-btn-icon-small-size);
+		height: var(--channel-play-btn-icon-small-size);
+	}
+}
+
+// 视频统计信息
+.channel-stats {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: var(--channel-stats-bg);
+	padding: var(--channel-stats-padding);
+	color: var(--channel-stats-color);
+	font-size: var(--channel-stats-font-size);
+}
+
+// 视频信息容器
+.channel-info-wrap {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+	padding: var(--channel-info-wrap-padding);
+
+	.channel-name {
+		margin-bottom: var(--channel-name-margin-bottom);
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		font-size: var(--channel-name-font-size);
+		font-weight: 500;
+		color: var(--channel-name-color);
+	}
+
+	.video-title {
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		font-size: var(--video-title-small-font-size);
+		color: var(--video-title-small-color);
+	}
+}
+
+// 视频标题
+.video-title {
+	font-size: var(--video-title-font-size);
+	font-weight: 500;
+	color: var(--video-title-color);
+	margin-bottom: var(--video-title-margin-bottom);
+	line-height: 1.4;
+}
+
+// 视频统计信息（非绝对定位版本）
+.video-stats {
+	font-size: var(--video-stats-font-size);
+	color: var(--video-stats-color);
+}
+
+

components-diy/diy-article.vue

@@ -3,7 +3,7 @@
 		<view class="article-wrap" :style="warpCss">
 			<view :class="['list-wrap', value.style]" :style="warpCss">
 				<!-- 自动垂直滚动 -->
-				<swiper class="auto-scroll-swiper" :style="swiperStyle" :vertical="swiperConfig.vertical !== false"
+				<swiper class="auto-scroll-swiper" :style="[swiperStyle]" :vertical="swiperConfig.vertical !== false"
 					:autoplay="swiperConfig.autoplay !== false" :circular="swiperConfig.circular !== false"
 					:interval="swiperConfig.interval || 3000" :duration="swiperConfig.duration || 500"
 					:display-multiple-items="safeDisplayMultipleItems">

components-diy/diy-bargain.vue

@@ -365,7 +365,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -374,7 +374,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-bottom-nav.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { adaptSubpackageUrl } from '@/common/js/util.js'
+import { adaptSubpackageUrl, checkTabBarActive } from '@/common/js/util.js'
 import DiyMinx from './minx.js'
 // 底部导航栏
 export default {
@@ -145,7 +145,7 @@ export default {
 			let linkUrl = link.wap_url;
 
 			// 首页特殊处理
-			if (linkUrl === '/pages/index/index' && this.name === 'DIY_VIEW_INDEX') {
+			if (linkUrl === this.$util.INDEX_PAGE_URL && this.name === 'DIY_VIEW_INDEX') {
 				return true;
 			}
 
@@ -154,7 +154,7 @@ export default {
 				return true;
 			}
 
-			return false;
+			return checkTabBarActive(linkUrl, currentPageRoute);
 		}
 	}
 };

components-diy/diy-category-item.vue

@@ -100,7 +100,7 @@
 													parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 											</block>
 											<block v-else>
-												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
 											</block>
 										</view>
 										<view class="member-price-tag"
@@ -192,7 +192,7 @@
 											parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 									</block>
 									<block v-else>
-										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '咨询' }}</text>
+										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
 									</block>
 
 								</view>
@@ -1160,7 +1160,7 @@ export default {
 				.right-wrap {
 					display: flex;
 					align-items: center;
-					justify-content: end;
+					justify-content: flex-end;
 
 					.num {
 						width: auto;
@@ -1314,7 +1314,7 @@ export default {
 	}
 }
 
-/deep/ .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
@@ -1348,7 +1348,7 @@ export default {
 	justify-content: center;
 }
 
-/deep/ .loading-layer {
+::v-deep .loading-layer {
 	background: #fff !important;
 }
 

components-diy/diy-category.vue

@@ -161,15 +161,11 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 
-import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
 import DiyMinx from './minx.js'
 var contentWrapHeight, query, cartPosition;
 
 // 商品分类
 export default {
-	components: {
-		nsGoodsSkuCategory
-	},
 	name: 'diy-category',
 	props: {
 		value: {
@@ -552,7 +548,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .category-page-wrap {
 	width: 100vw;
 	// height: calc(100vh - var(--tab-bar-height, 0));
@@ -610,10 +606,10 @@ export default {
 	view {
 		color: #222222;
 		width: 100%;
-		white-space: nowrap;
-		text-overflow: ellipsis;
+		white-space: break-word;
 		overflow: hidden;
 		text-align: center;
+		font-size: 10px;
 	}
 
 	&.border-top {
@@ -630,6 +626,7 @@ export default {
 		view {
 			color: #333;
 			font-weight: bold;
+			font-size: $font-size-base;
 		}
 
 		&::before {
@@ -821,7 +818,7 @@ export default {
 		z-index: 2;
 	}
 
-	/deep/ .template-four {
+	::v-deep .template-four {
 		position: relative;
 		z-index: 1;
 

components-diy/diy-channel-list.vue

@@ -0,0 +1,645 @@
+<template>
+	<view class="channel-list-container" :style="[componentStyle, { '--row-count': value.rowCount }]">
+		<!-- 轮播模式 -->
+		<swiper v-if="value.showStyle == 'carousel' && carouselConfig.type != 'hide'" :indicator-dots="isIndicatorDots"
+			:autoplay="carouselConfig.autoplay || false" :interval="carouselConfig.interval || 3000"
+			:duration="carouselConfig.duration || 500" :circular="carouselConfig.circular || false"
+			:style="swiperHeight" class="channel-swiper">
+			<swiper-item v-for="(slide, slideIndex) in swiperSlides" :key="slideIndex">
+				<view :class="['swiper-slide-content', 'row1-of' + value.rowCount]">
+					<view v-for="(item, index) in slide" :key="index" :class="['channel-item', value.mode]">
+						<!-- 视频号视频卡片，轮播模式 -->
+						<diy-channel-video :value="item" @video-play="playVideo" :list-mode="true"
+							:title-line-clamp="value.titleLineClamp" :show-play-btn="value.showPlayBtn"
+							:show-view-count="value.showViewCount" :cover-style="computedCoverStyle"
+							:play-btn-style="value.playBtnStyle" :aspect-ratio="value.aspectRatio" />
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+		<!-- 固定布局模式 -->
+		<view v-else-if="value.showStyle == 'fixed'" :class="['channel-list', 'row1-of' + value.rowCount]">
+			<view v-for="(item, index) in value.list" :key="index" class="channel-item">
+				<!-- 视频号视频卡片，列表模式 -->
+				<diy-channel-video :value="item" @video-play="playVideo" :list-mode="true"
+					:title-line-clamp="value.titleLineClamp" :show-play-btn="value.showPlayBtn"
+					:show-view-count="value.showViewCount" :cover-style="computedCoverStyle"
+					:play-btn-style="value.playBtnStyle" :aspect-ratio="value.aspectRatio" />
+			</view>
+		</view>
+
+		<!-- 其他布局模式（如滚动布局） -->
+		<scroll-view v-else
+			:class="['channel-nav', value.showStyle == 'fixed' ? 'fixed-layout' : 'singleSlide', 'row1-of' + value.rowCount]"
+			:scroll-x="true"
+			:scroll-y="false"
+			:enhanced="true"
+			:bounces="false">
+			<view class="uni-scroll-view-content">
+				<view v-for="(item, index) in value.list" :key="index"
+					:class="['channel-nav-item', value.mode, 'row1-of' + value.rowCount]">
+					<!-- 视频号视频卡片，滚动模式 -->
+					<diy-channel-video :value="item" @video-play="playVideo" :list-mode="true"
+						:title-line-clamp="value.titleLineClamp" :show-play-btn="value.showPlayBtn"
+						:show-view-count="value.showViewCount" :cover-style="computedCoverStyle"
+						:play-btn-style="value.playBtnStyle" :aspect-ratio="value.aspectRatio" />
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+/**
+ * 微信视频号列表组件
+ * 支持多种布局模式，包括固定布局和滚动布局
+ * 可配置列数、视频高度、标题行数等属性
+ * 用于在页面中展示多个微信视频号视频
+ */
+import DiyMinx from './minx.js'
+import { wechatChannelUtil, wechatChannelConfig } from './js/wechat-channel.js'
+
+export default {
+	name: 'diy-channel-list',
+	props: {
+		/**
+		 * 组件配置数据
+		 * @type {Object}
+		 * @default () => ({})
+			 * @property {string} showStyle - 显示样式，可选值：carousel, fixed, singleSlide
+			 * @property {number} rowCount - 每行显示的视频数量
+			 * @property {Array} list - 视频列表数据
+			 * @property {string} componentBgColor - 组件背景色
+			 * @property {string} componentAngle - 组件圆角类型，可选值：round
+			 * @property {number} topAroundRadius - 顶部圆角半径
+			 * @property {number} bottomAroundRadius - 底部圆角半径
+			 * @property {Object} ornament - 装饰效果配置
+			 * @property {boolean} showViewCount - 是否显示播放量，可选值：true, false
+			 * @property {number} titleLineClamp - 标题显示行数
+			 * @property {string} aspectRatio - 视频比例，可选值：16:9, 3:4
+			 * @property {boolean} showPlayBtn - 是否显示播放按钮
+			 * @property {Object} coverStyle - 视频封面图样式
+			 * @property {Object} playBtnStyle - 播放按钮样式
+			 * @property {string} mode - 显示模式, 可选值：video, text, image, graphic
+			 * @property {number} imageSize - 图片尺寸（仅在特定模式下使用）
+			 * @property {number} pageCount - 每页显示的视频数量
+			 * @property {Object} carousel - 轮播配置
+			 * @property {string} carousel.type - 轮播类型，可选值：default, hide
+			 * @property {boolean} carousel.autoplay - 是否自动播放，默认false
+			 * @property {number} carousel.interval - 自动播放间隔，默认3000ms
+			 * @property {number} carousel.duration - 切换动画时长，默认500ms
+			 * @property {boolean} carousel.circular - 是否循环播放，默认false
+		 */
+		value: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	mixins: [DiyMinx],
+	data() {
+		return {
+			pageWidth: '', // 页面宽度
+			indicatorDots: false, // 是否显示轮播指示器
+			swiperCurrent: 0 // 当前轮播索引
+		}
+	},
+	created() {
+		// 组件创建时的逻辑
+		// 可以在这里进行初始化操作，如获取页面宽度等
+	},
+	mounted() {
+		// 组件挂载后添加鼠标拖拽滚动功能
+		if (!['fixed', 'carousel'].includes(this.value?.showStyle)) {
+			this.$nextTick(() => {
+				this.addMouseDragScroll();
+			});
+		}
+	},
+	watch: {
+		/**
+		 * 组件刷新监听
+		 * 当组件需要刷新时触发
+		 * @param {*} newValue - 新值
+		 */
+		componentRefresh(newValue) {
+			// 监听组件刷新
+			// 可以在这里处理组件刷新时的逻辑
+		}
+	},
+	computed: {
+		carouselConfig() {
+			return this.value?.carousel || {
+				type: 'default',
+				autoplay: false,
+				interval: 3000,
+				duration: 500,
+				circular: true
+			}
+		},
+		/**
+		 * 组件样式
+		 * 根据配置动态生成样式字符串，包括背景色、圆角、阴影和边框
+		 * @returns {string} 样式字符串
+		 */
+		componentStyle() {
+			const style = {};
+			// 背景色
+			if (this.value?.componentBgColor) {
+				style.backgroundColor = this.value?.componentBgColor;
+			}
+
+			// 圆角样式
+			if (this.value?.componentAngle == 'round') {
+				style.borderTopLeftRadius = (2 * this.value?.topAroundRadius) + 'rpx';
+				style.borderTopRightRadius = (2 * this.value?.topAroundRadius) + 'rpx';
+				style.borderBottomLeftRadius = (2 * this.value?.bottomAroundRadius) + 'rpx';
+				style.borderBottomRightRadius = (2 * this.value?.bottomAroundRadius) + 'rpx';
+			}
+
+			// 装饰效果：阴影
+			style.boxShadow = this.value?.ornament?.type == 'shadow' ? '0 0 10rpx ' + this.value?.ornament?.color : '';
+			// 装饰效果：边框
+			style.border = this.value?.ornament?.type == 'stroke' ? '2rpx solid ' + this.value?.ornament?.color : '';
+
+			return style;
+		},
+
+		/**
+		 * 轮播高度
+		 * 根据模式和配置计算轮播高度
+		 * @returns {string} 轮播高度样式
+		 */
+		swiperHeight() {
+			let height = 0;
+
+			const pageCount = this.value?.pageCount || 1;
+
+			// 根据不同模式计算高度
+			if (this.value?.mode == 'graphic') {
+				height = (49 + this.value?.imageSize) * pageCount;
+			} else if (this.value?.mode == 'img') {
+				height = (22 + this.value?.imageSize) * pageCount;
+			} else if (this.value?.mode == 'text') {
+				height = 43 * pageCount;
+			} else { // 默认视频模式
+				if (this.value?.aspectRatio == '16:9') {
+					height = [250, 160, 140, 120][this.value.rowCount - 1];
+				} else {
+					height = [510, 280, 220, 180][this.value.rowCount - 1];
+				}
+			}
+
+			return 'height:' + (2 * height) + 'rpx';
+		},
+
+		/**
+		 * 是否显示指示器
+		 * 根据轮播配置和列表长度判断是否显示指示器
+		 * @returns {boolean} 是否显示指示器
+		 */
+		isIndicatorDots() {
+			// 当轮播类型不是隐藏，且视频数量超过一页时显示指示器
+			const pageCount = this.value?.pageCount || 1;
+			return this.value?.carousel?.type != 'hide' && Math.ceil(this.value?.list?.length / (pageCount * this.value?.rowCount)) > 1
+		},
+
+		/**
+		 * 轮播幻灯片数据
+		 * 将视频列表分割成轮播所需的幻灯片数据
+		 * @returns {Array} 轮播幻灯片数据
+		 */
+		swiperSlides() {
+			const slides = [];
+			const list = this.value?.list || [];
+			const pageSize = (this.value?.pageCount || 1) * (this.value?.rowCount || 1);
+
+			// 将列表数据分割成每页显示的数量
+			for (let i = 0; i < list.length; i += pageSize) {
+				slides.push(list.slice(i, i + pageSize));
+			}
+
+			return slides;
+		},
+		/**
+		 * 视频封面样式
+		 * 根据aspectRatio属性动态计算封面样式
+		 * @returns {Object} 封面样式对象
+		 */
+		computedCoverStyle() {
+			const aspectRatio = this.value?.aspectRatio || '16:9';
+			let paddingTop = '56.25%'; // 默认 16:9 比例
+
+			if (aspectRatio === '3:4') {
+				paddingTop = '133.33%'; // 3:4 比例
+			}
+
+			return {
+				width: '100%',
+				height: '0',
+				paddingTop: paddingTop
+			};
+		}
+	},
+	methods: {
+		/**
+		 * 播放视频
+		 * 触发 video-play 事件，并在微信小程序中调用视频播放接口
+		 * @param {Object} item - 视频数据对象
+		 */
+		async playVideo(item) {
+			await this.__$emitEvent({
+				eventName: 'video-play',
+				data: item,
+				promiseCallback: async (event, handler, awaitedResult) => {
+					if (!awaitedResult) return;
+					try {
+						// 发送视频被点击播放事件
+						this.$emit('channel-video-click-play', item);
+						console.log('播放视频:', item);
+
+						// #ifdef MP-WEIXIN
+						// 在微信小程序环境中调用视频播放接口
+						await wechatChannelUtil.playVideo(item);
+						// #endif
+
+						// #ifndef MP-WEIXIN
+						if (item?.channelType === 'wechat') {
+							uni.showToast({
+								title: '视频号仅支持在微信小程序环境中播放',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							// 在非微信小程序环境中，直接触发事件
+							this.$emit('video-play', item);
+						}
+						// #endif						
+					} catch (err) {
+						console.error('打开视频号失败', err);
+					}
+				}
+			})
+		},
+
+		/**
+		 * 图片加载错误处理
+		 * 当图片加载失败时，设置默认图片
+		 * @param {number} index - 图片索引
+		 */
+		imgError(index) {
+			// 图片加载失败的处理逻辑
+			console.log('图片加载失败:', index);
+			// 为失败的图片设置默认图片
+			const item = this.value.list[index];
+			if (item) {
+				// 使用默认图片替代加载失败的图片
+				// #ifdef MP-WEIXIN
+				item.coverUrl = wechatChannelConfig.video.defaultCoverUrl;
+				// #endif
+			}
+		},
+		/**
+		 * 添加鼠标拖拽滚动功能
+		 * 在Web环境中实现与微信小程序相同的拖拽滚动效果
+		 */
+		addMouseDragScroll() {
+			// 只在Web环境中添加
+			// #ifndef MP
+			console.log('addMouseDragScroll called');
+
+			let isDragging = false;
+			let startX = 0;
+			let startScrollLeft = 0;
+			let currentScrollElement = null;
+
+			// 查找最近的可滚动祖先元素
+			const findScrollableParent = (element) => {
+				while (element && element !== document) {
+					const style = window.getComputedStyle(element);
+					if (style.overflowX === 'auto' || style.overflowX === 'scroll') {
+						return element;
+					}
+					element = element.parentElement;
+				}
+				return null;
+			};
+
+			// 鼠标按下事件
+			const handleMouseDown = (e) => {
+				// 检查是否点击在组件内
+				if (this.$el.contains(e.target)) {
+					console.log('mousedown event in component:', e);
+					// 查找可滚动元素
+					currentScrollElement = findScrollableParent(e.target);
+					if (currentScrollElement) {
+						console.log('Found scrollable element:', currentScrollElement);
+						isDragging = true;
+						startX = e.pageX;
+						startScrollLeft = currentScrollElement.scrollLeft;
+						currentScrollElement.style.cursor = 'grabbing';
+					}
+				}
+			};
+
+			// 鼠标移动事件
+			const handleMouseMove = (e) => {
+				if (!isDragging || !currentScrollElement) return;
+				console.log('mousemove event:', e);
+				e.preventDefault();
+				const dx = e.pageX - startX;
+				currentScrollElement.scrollLeft = startScrollLeft - dx;
+				console.log('scrollLeft:', currentScrollElement.scrollLeft);
+			};
+
+			// 鼠标释放事件
+			const handleMouseUp = () => {
+				if (isDragging && currentScrollElement) {
+					console.log('mouseup event');
+					currentScrollElement.style.cursor = 'grab';
+				}
+				isDragging = false;
+				currentScrollElement = null;
+			};
+
+			// 添加全局事件监听器
+			document.addEventListener('mousedown', handleMouseDown);
+			document.addEventListener('mousemove', handleMouseMove);
+			document.addEventListener('mouseup', handleMouseUp);
+			document.addEventListener('mouseleave', handleMouseUp);
+
+			console.log('Global mouse event listeners added');
+
+			// 组件销毁时移除事件监听器
+			this.$once('hook:beforeDestroy', () => {
+				document.removeEventListener('mousedown', handleMouseDown);
+				document.removeEventListener('mousemove', handleMouseMove);
+				document.removeEventListener('mouseup', handleMouseUp);
+				document.removeEventListener('mouseleave', handleMouseUp);
+				console.log('Global mouse event listeners removed');
+			});
+
+			// 为所有.channel-nav元素添加必要的样式
+			setTimeout(() => {
+				const channelNavs = document.querySelectorAll('.channel-nav');
+				console.log('Found channel-nav elements:', channelNavs.length);
+				channelNavs.forEach(element => {
+					element.style.overflowX = 'auto';
+					element.style.overflowY = 'hidden';
+					element.style.whiteSpace = 'nowrap';
+					element.style.width = '100%';
+					element.style.maxWidth = '100%';
+					element.style.cursor = 'grab';
+					element.style.userSelect = 'none'; // 防止文本选择
+					console.log('Added styles to channel-nav:', element);
+				});
+			}, 100); // 延迟执行，确保DOM已完全渲染
+
+			console.log('Mouse drag scroll setup completed');
+			// #endif
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+@import './css/common-channel.scss';
+
+.channel-list-container {
+	padding: 16px 16px 0px;
+}
+
+/**
+ * 列表布局样式
+ */
+.channel-list {
+	display: grid;
+	grid-template-columns: repeat(var(--row-count, 2), 1fr);
+	gap: 8px;
+}
+
+/**
+ * 导航布局样式
+ * 支持固定布局和滚动布局
+ */
+.channel-nav {
+	box-sizing: border-box;
+	padding: 16rpx;
+
+	// 确保在H5环境中可以水平滚动
+	overflow-x: auto;
+	white-space: nowrap;
+
+	// 隐藏滚动条但保留滚动功能
+	::-webkit-scrollbar {
+		display: none;
+	}
+
+	scrollbar-width: none;
+	-ms-overflow-style: none;
+
+	// 启用触摸滚动和鼠标拖拽滚动
+	-webkit-overflow-scrolling: touch;
+	scroll-behavior: smooth;
+
+	.uni-scroll-view-content {
+		/* #ifdef MP-WEIXIN */
+		display: flex;
+		flex-wrap: nowrap;
+		gap: 16rpx;
+		/* #endif */
+		/* #ifndef MP-WEIXIN */
+		display: grid;
+		grid-template-columns: repeat(var(--row-count, 2), 1fr);
+		gap: 16rpx;
+		/* #endif */
+	}
+
+	// 单滑动模式
+	&.singleSlide {
+		.uni-scroll-view-content {
+			display: flex;
+			flex-wrap: nowrap;
+			gap: 16rpx;
+			white-space: nowrap;
+		}
+
+		.channel-nav-item {
+			flex-shrink: 0;
+			width: 280rpx;
+		}
+	}
+
+	.channel-nav-item {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		
+		/* #ifdef MP-WEIXIN */
+		&.row1-of1 {
+			width: 100%;
+		}
+		&.row1-of2 {
+			width: calc(50% - 8rpx);
+		}
+		&.row1-of3 {
+			width: calc(33.333% - 10.67rpx);
+		}
+		&.row1-of4 {
+			width: calc(25% - 12rpx);
+		}
+		/* #endif */
+	}
+
+	// 1 列布局
+	&.row1-of1 {
+		.uni-scroll-view-content {
+			// #ifndef MP-WEIXIN
+			grid-template-columns: 1fr;
+			// #endif
+		}
+	}
+
+	// 2 列布局
+	&.row1-of2 {
+		.uni-scroll-view-content {
+			// #ifndef MP-WEIXIN
+			grid-template-columns: repeat(2, 1fr);
+			// #endif
+
+		}
+	}
+
+	// 3 列布局
+	&.row1-of3 {
+		.uni-scroll-view-content {
+			// #ifndef MP-WEIXIN
+			grid-template-columns: repeat(3, 1fr);
+			// #endif
+
+		}
+	}
+
+	// 4 列布局
+	&.row1-of4 {
+		.uni-scroll-view-content {
+			// #ifndef MP-WEIXIN
+			grid-template-columns: repeat(4, 1fr);
+			// #endif
+
+		}
+	}
+}
+
+/**
+ * 确保所有视频卡片高度一致
+ */
+.channel-item,
+.channel-nav-item {
+	display: flex;
+	flex-direction: column;
+}
+
+/**
+ * 轮播样式
+ * 支持轮播模式的布局和样式
+ */
+.channel-swiper {
+	width: 100%;
+	box-sizing: border-box;
+
+	.swiper-slide-content {
+		display: grid;
+		grid-template-columns: repeat(var(--row-count, 2), 1fr);
+		gap: 16rpx;
+		box-sizing: border-box;
+
+		.channel-item {
+			display: flex;
+			flex-direction: column;
+			box-sizing: border-box;
+		}
+
+		// 轮播模式下的 1 列布局
+		&.row1-of1 {
+			grid-template-columns: 1fr;
+		}
+
+		// 轮播模式下的 2 列布局
+		&.row1-of2 {
+			grid-template-columns: repeat(2, 1fr);
+		}
+
+		// 轮播模式下的 3 列布局
+		&.row1-of3 {
+			grid-template-columns: repeat(3, 1fr);
+		}
+
+		// 轮播模式下的 4 列布局
+		&.row1-of4 {
+			grid-template-columns: repeat(4, 1fr);
+		}
+	}
+}
+
+/**
+ * 响应式调整
+ * 在小屏幕设备上调整布局和间距
+ */
+@media (max-width: 375px) {
+
+	.channel-list,
+	.channel-nav,
+	.channel-swiper .swiper-slide-content {
+		gap: 12rpx;
+		padding: 12rpx;
+	}
+
+	// 小屏幕上的单滑动模式
+	.channel-nav {
+		&.singleSlide {
+			.uni-scroll-view-content {
+				gap: 12rpx;
+			}
+
+			.channel-nav-item {
+				width: 240rpx;
+			}
+		}
+	}
+}
+
+/**
+ * 视频比例样式调整
+ * 根据不同的视频比例调整布局
+ */
+
+// // 3:4 比例的视频卡片样式
+// .channel-video.ratio-3-4 {
+// 	// 调整视频卡片的整体高度
+// 	::v-deep .video-cover-wrap {
+// 		padding-top: 133.33%; // 3:4 比例
+// 	}
+
+// 	// 列表模式下的3:4比例调整
+// 	&.list-mode {
+// 		::v-deep .video-cover-wrap {
+// 			padding-top: 133.33%; // 3:4 比例
+// 		}
+// 	}
+// }
+
+// // 16:9 比例的视频卡片样式（默认）
+// .channel-video.ratio-16-9 {
+// 	// 保持默认的16:9比例
+// 	::v-deep .video-cover-wrap {
+// 		padding-top: 56.25%; // 16:9 比例
+// 	}
+
+// 	// 列表模式下的16:9比例保持默认
+// 	&.list-mode {
+// 		::v-deep .video-cover-wrap {
+// 			padding-top: 56.25%; // 16:9 比例
+// 		}
+// 	}
+// }</style>

components-diy/diy-channel-video.vue

@@ -0,0 +1,489 @@
+<template>
+	<view class="channel-video" :class="{ 'list-mode': listMode }">
+		<!-- 嵌入式视频播放 -->
+		<view v-if="canUseEmbedMode" class="embed-video-container">
+			<view class="video-cover-wrap" :style="[coverStyle]">
+				<!-- #ifdef MP-WEIXIN -->
+				<native-component>
+					<!-- 嵌入式视频播放组件 -->
+					<channel-video :feed-id="value.feedId" :finder-user-name="value.finderUserName"
+						:feed-token="value.feedToken" :auto-play="autoPlay">
+					</channel-video>
+				</native-component>
+				<!-- #endif -->
+			</view>
+			<view class="video-info">
+				<!-- 视频标题，支持多行显示控制 -->
+				<view class="video-title" :style="{ '--title-line-clamp': titleLineClamp }">{{ value.videoTitle }}
+				</view>
+				<!-- 视频统计信息 -->
+				<view class="video-stats" v-if="showViewCount && value.showViewCount">{{ value.viewCount }}次观看</view>
+			</view>
+		</view>
+
+		<!-- 跳转式视频播放 -->
+		<view v-else @click.stop="playVideo" class="video-container">
+			<view class="video-cover-wrap" :style="[coverStyle]">
+				<image class="video-cover" :src="$util.img(value.coverUrl)" mode="aspectFill"></image>
+				<view class="channel-play-btn" v-if="showPlayBtn" :style="[playBtnStyle]">
+					<view class="play-icon-css"></view>
+				</view>
+				<view class="video-stats-overlay" v-if="showViewCount && value.showViewCount">
+					{{ value.viewCount }}次观看
+				</view>
+			</view>
+			<view class="video-info">
+				<!-- 视频标题，支持多行显示控制 -->
+				<view class="video-title" :style="{ '--title-line-clamp': titleLineClamp }">{{ value.videoTitle }}
+				</view>
+				<!-- 视频统计信息，非列表模式下显示 -->
+				<view class="video-stats" v-if="showViewCount && value.showViewCount && !listMode">{{ value.viewCount }}次观看</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+import { wechatChannelUtil, wechatChannelConfig } from './js/wechat-channel.js'
+
+/**
+ * 微信视频号视频卡片组件
+ * 支持嵌入式播放和跳转式播放两种模式
+ * 可配置列表模式、视频高度、标题行数等属性
+ */
+export default {
+	name: 'diy-channel-video',
+	props: {
+		/**
+		 * 视频数据对象
+		 * @type {Object}
+		 * @required
+		 * @property {string} feedId - 视频 feedId
+		 * @property {string} feedToken - 视频 token
+		 * @property {string} coverUrl - 视频封面图
+		 * @property {string} videoTitle - 视频标题
+		 * @property {number} viewCount - 观看次数
+		 * @property {boolean} showViewCount - 是否显示观看次数
+		 * @property {boolean} embedMode - 是否启用嵌入式播放
+		 */
+		value: {
+			type: Object,
+			required: true
+		},
+		/**
+		 * 是否为列表模式
+		 * @type {boolean}
+		 * @default false
+		 */
+		listMode: {
+			type: Boolean,
+			default: false
+		},
+		/** 是否显示观看次数，由父组件可以整体配置 */
+		showViewCount: {
+			type: Boolean,
+			default: true
+		},
+		/**
+		 * 标题显示行数
+		 * @type {number}
+		 * @default 1
+		 */
+		titleLineClamp: {
+			type: Number,
+			default: 1
+		},
+		/** 是否显示播放按钮 */
+		showPlayBtn: {
+			type: Boolean,
+			default: true
+		},
+		/**
+		 * 视频封面图样式
+		 * 采用 16:9 比例的响应式高度
+		 */
+		coverStyle: {
+			type: Object,
+			default: () => ({
+				width: '100%',
+				height: '0',
+				paddingTop: '56.25%' // 16:9 比例
+			})
+		},
+		/**
+		 * 播放按钮样式
+		 */
+		playBtnStyle: {
+			type: Object,
+			default: () => ({
+				width: '60rpx',
+				height: '60rpx',
+				borderRadius: '30rpx',
+				backgroundColor: 'rgba(0, 0, 0, 0.6)'
+			})
+		},
+		/** 是否自动播放 */
+		autoPlay: {
+			type: Boolean,
+			default: false
+		},
+	},
+	computed: {
+		/**
+		 * 是否支持嵌入式播放
+		 * @returns {boolean}
+		 */
+		canUseEmbedMode() {
+			// #ifdef MP-WEIXIN
+			const enableEmbedMode = Boolean(this.value?.embedMode)
+				&& Boolean(this.value?.feedToken)
+				&& wechatChannelUtil.isEmbedModeSupported();
+			console.log('enableEmbedMode', enableEmbedMode);
+			return enableEmbedMode;
+			// #endif
+			return false
+		}
+	},
+	methods: {
+		/**
+		 * 播放视频
+		 * 触发 video-play 事件，由父组件处理具体播放逻辑
+		 */
+		async playVideo() {
+			this.$emit('video-play', this.value);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import './css/common-channel.scss';
+
+/**
+ * 视频卡片容器样式
+ * 包含卡片基础样式、悬停效果和列表模式样式
+ */
+.channel-video {
+	position: relative;
+	background-color: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+
+	// 悬停效果
+	&:hover {
+		transform: translateY(-4rpx);
+		box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.15);
+	}
+
+	// 列表模式样式调整
+	&.list-mode {
+		border-radius: 10rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.08);
+
+		.video-info {
+			padding: 14rpx;
+
+			.video-title {
+				font-size: 24rpx;
+				margin-bottom: 6rpx;
+			}
+		}
+	}
+}
+
+/**
+ * 视频容器样式
+ * 用于跳转式播放模式
+ */
+.video-container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+/**
+ * 嵌入式视频容器样式
+ * 与视频容器样式保持一致
+ */
+.embed-video-container {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+/**
+ * 视频封面容器
+ */
+.video-cover-wrap {
+	position: relative;
+	width: 100%;
+	padding-top: 56.25%;
+	/* 16:9 比例 */
+	height: 0;
+	overflow: hidden;
+	border-radius: 12rpx 12rpx 0 0;
+	transition: transform 0.3s ease;
+
+	// 悬停时缩放效果
+	.channel-video:hover & {
+		transform: scale(1.02);
+	}
+
+	// 列表模式下的边框圆角调整
+	.channel-video.list-mode & {
+		border-radius: 10rpx 10rpx 0 0;
+	}
+}
+
+/**
+ * 视频封面图片
+ * 绝对定位填充整个容器
+ */
+.video-cover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	transition: transform 0.3s ease;
+}
+
+/**
+ * 视频统计信息遮罩
+ * 显示在视频封面底部
+ */
+.video-stats-overlay {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
+	padding: 12rpx 16rpx;
+	color: #fff;
+	font-size: 20rpx;
+	text-align: right;
+	font-weight: 500;
+	transition: opacity 0.3s ease;
+
+	// 悬停时的透明度变化
+	.channel-video:hover & {
+		opacity: 1;
+	}
+
+	.channel-video:not(:hover) & {
+		opacity: 0.8;
+	}
+}
+
+/**
+ * 视频信息区域
+ * 包含标题和统计信息
+ */
+.video-info {
+	padding: 16rpx;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	background-color: #fff;
+	transition: background-color 0.3s ease;
+
+	// 悬停时的背景色变化
+	.channel-video:hover & {
+		background-color: #fafafa;
+	}
+}
+
+/**
+ * 视频标题
+ * 支持多行显示控制和渐变遮罩效果
+ */
+.video-title {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #222;
+	margin-bottom: 10rpx;
+	line-height: 1.4;
+	display: -webkit-box;
+	-webkit-line-clamp: var(--title-line-clamp, 2);
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	transition: color 0.3s ease;
+	position: relative;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: normal;
+
+	// 悬停时的颜色变化
+	.channel-video:hover & {
+		color: #000;
+	}
+
+	// 列表模式下的样式调整
+	.channel-video.list-mode & {
+		-webkit-line-clamp: var(--title-line-clamp, 1);
+		font-size: 24rpx;
+		margin-bottom: 6rpx;
+		font-weight: 500;
+		color: #333;
+		line-height: 1.3;
+	}
+
+	// 添加渐变遮罩效果，让过长的文字有柔和的结束
+	&::after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		width: 40rpx;
+		height: 1.4em;
+		background: linear-gradient(to right, transparent, #fff 90%);
+		pointer-events: none;
+	}
+
+	// 列表模式下的遮罩高度调整
+	.channel-video.list-mode &::after {
+		height: 1.3em;
+	}
+
+	// 根据行数调整遮罩高度
+	&[style*="--title-line-clamp: 1"]::after {
+		height: 1.4em;
+	}
+
+	&[style*="--title-line-clamp: 3"]::after {
+		height: 4.2em;
+	}
+
+	&[style*="--title-line-clamp: 4"]::after {
+		height: 5.6em;
+	}
+
+	// 列表模式下的多行遮罩高度调整
+	.channel-video.list-mode &[style*="--title-line-clamp: 1"]::after {
+		height: 1.3em;
+	}
+
+	.channel-video.list-mode &[style*="--title-line-clamp: 3"]::after {
+		height: 3.9em;
+	}
+
+	.channel-video.list-mode &[style*="--title-line-clamp: 4"]::after {
+		height: 5.2em;
+	}
+}
+
+/**
+ * 视频统计信息
+ * 显示观看次数等数据
+ */
+.video-stats {
+	font-size: 22rpx;
+	color: #999;
+	margin-top: 6rpx;
+	transition: color 0.3s ease;
+
+	// 悬停时的颜色变化
+	.channel-video:hover & {
+		color: #666;
+	}
+}
+
+/**
+ * 列表模式下的播放按钮样式
+ * 更小的尺寸和悬停效果
+ */
+.channel-video.list-mode .channel-play-btn {
+	width: 50rpx;
+	height: 50rpx;
+	background-color: rgba(0, 0, 0, 0.5);
+	transition: all 0.3s ease;
+
+	// 悬停效果
+	&:hover {
+		background-color: rgba(0, 0, 0, 0.7);
+		transform: scale(1.1);
+	}
+
+	// 播放图标尺寸
+	.play-icon {
+		width: 25rpx;
+		height: 25rpx;
+	}
+}
+
+/**
+ * 通用播放按钮样式优化
+ * 添加悬停效果
+ */
+.channel-play-btn {
+	transition: all 0.3s ease;
+
+	// 悬停效果
+	&:hover {
+		background-color: rgba(0, 0, 0, 0.6);
+		transform: scale(1.05);
+	}
+}
+
+/**
+ * 纯 CSS 播放按钮图标
+ */
+.play-icon-css {
+	width: 0;
+	height: 0;
+	border-top: 12rpx solid transparent;
+	border-bottom: 12rpx solid transparent;
+	border-left: 18rpx solid #fff;
+	margin-left: 4rpx;
+	transition: transform 0.3s ease;
+
+	// 悬停时的缩放效果
+	.channel-play-btn:hover & {
+		transform: scale(1.1);
+	}
+
+	// 列表模式下的尺寸调整
+	.channel-video.list-mode & {
+		border-top: 10rpx solid transparent;
+		border-bottom: 10rpx solid transparent;
+		border-left: 15rpx solid #fff;
+		margin-left: 3rpx;
+	}
+}
+
+/**
+ * 原生组件样式控制
+ * 确保 native-component 和 channel-video 正确填充容器
+ */
+native-component {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 1;
+}
+
+/**
+ * channel-video 组件样式控制
+ * 避免受到 wx-channel-video 全局样式的影响
+ */
+channel-video {
+	width: 100%;
+	height: 100%;
+	min-width: 100%;
+	min-height: 100%;
+	max-width: 100%;
+	max-height: 100%;
+	object-fit: cover;
+}
+</style>

components-diy/diy-coupon.vue

@@ -454,7 +454,7 @@ export default {
 					}
 				});
 			} else {
-				this.$refs.login.open('/pages/index/index');
+				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
 				this.couponBtnSwitch = false;
 			}
 		},
@@ -488,7 +488,7 @@ export default {
 }
 
 // 风格一
-/deep/.coupon-style-one {
+::v-deep .coupon-style-one {
 	height: 110rpx;
 
 	.coupon-item-box {
@@ -534,7 +534,7 @@ export default {
 }
 
 // 风格二
-/deep/.coupon-style-two {
+::v-deep .coupon-style-two {
 	height: 96rpx;
 
 	.coupon-item-box {
@@ -591,7 +591,7 @@ export default {
 	background-size: 100% 100%;
 }
 
-/deep/.coupon-style-three {
+::v-deep .coupon-style-three {
 	height: 284rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
@@ -638,7 +638,7 @@ export default {
 }
 
 // 风格四
-/deep/.coupon-style-four {
+::v-deep .coupon-style-four {
 	height: 108rpx;
 
 	.coupon-item-box {
@@ -997,7 +997,7 @@ export default {
 }
 
 //风格七
-/deep/ .coupon-style-seven {
+::v-deep .coupon-style-seven {
 	.wrap {
 		display: flex;
 	}
@@ -1075,7 +1075,7 @@ export default {
 	}
 }
 
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -1084,7 +1084,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-digit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="componentStyle">
+	<view :style="componentStyle" data-component-name="diy-digit">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
@@ -38,16 +38,10 @@
 </template>
 
 <script>
-import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
-import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 // 自定义数字展示
 export default {
 	name: 'diy-digit',
-	components: {
-		uvCountTo,
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,
@@ -96,7 +90,7 @@ export default {
 
 		// 页面跳转
 		redirectTo(item) {
-			if (!item.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
+			if (!item.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {
 				console.log(item);
 				this.$util.diyRedirectTo(item);
 			} else {

components-diy/diy-fenxiao-goods-list.vue

@@ -75,7 +75,7 @@ export default {
 		this.currentRoute = '/' + currentPage.route;
 		if (!this.storeToken) {
 			this.$util.redirectTo(
-				'/pages_tool/login/login',
+				this.$util.LOGIN_PAGE_URL,
 				{
 					back: this.currentRoute
 				},

components-diy/diy-goods-brand.vue

@@ -19,8 +19,6 @@
 
 <script>
 // 商品品牌
-import uniGrid from '@/components/uni-grid/uni-grid.vue';
-import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 
 import DiyMinx from './minx.js'
 // 自定义商品品牌展示	
@@ -31,10 +29,6 @@ export default {
 			type: Object
 		}
 	},
-	components: {
-		uniGrid,
-		uniGridItem
-	},
 	data() {
 		return {
 			list: [],

components-diy/diy-goods-list.vue

@@ -253,15 +253,12 @@
 </template>
 
 <script>
-import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
 import DiyMinx from './minx.js'
+import util from '@/common/js/util.js'
 
 // 自定义商品列表展示
 export default {
 	name: 'diy-goods-list',
-	components: {
-		nsGoodsSkuIndex
-	},
 	props: {
 		value: {
 			type: Object,
@@ -331,7 +328,7 @@ export default {
 			if (this.goodsValue.ornament.type == 'stroke') {
 				obj += 'border:' + '2rpx solid ' + this.goodsValue.ornament.color + ';';
 			}
-			const screenWidth = uni.getSystemInfoSync().windowWidth;
+			let screenWidth = util.getWindowInfo().windowWidth;
 			if (this.value.template == 'horizontal-slide') {
 				var width = '';
 				if (this.value.slideMode == 'scroll' && this.value.goodsMarginType == 'diy') width = this.rpxUpPx(
@@ -411,7 +408,7 @@ export default {
 			}
 		},
 		rpxUpPx(res) {
-			const screenWidth = uni.getSystemInfoSync().windowWidth;
+			const screenWidth = util.getWindowInfo().windowWidth;
 			var data = (screenWidth * parseInt(res)) / 750;
 			return Math.floor(data);
 		},

components-diy/diy-graphic-nav.vue

@@ -159,7 +159,7 @@ export default {
         redirectTo(link) {
 
             if (link.wap_url) {
-                if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+                if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
                     this.$refs.login.open(link.wap_url);
                     return;
                 }

components-diy/diy-group.vue

@@ -251,6 +251,11 @@
 				<diy-icon :value="item"></diy-icon>
 			</template>
 
+			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
+				<!-- 视频号列表 -->
+				<diy-channel-list :value="item"></diy-channel-list>
+			</template>
+
 			<!-- 自定义扩展组件 -->
 			<diy-comp-extend :value="item"></diy-comp-extend>
 		</view>
@@ -260,8 +265,8 @@
 <script>
 // 组件组展示
 import DiyMinx from './minx.js'
+
 export default {
-	components: {},
 	props: {
 		diyData: {
 			type: Object

components-diy/diy-groupbuy.vue

@@ -274,7 +274,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -283,7 +283,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-image-nav.vue

@@ -38,14 +38,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue'
+
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
-	components: {
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,
@@ -119,7 +116,7 @@ export default {
 
 		// 页面跳转
 		redirectTo(link) {
-			if (!link.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
+			if (!link.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {
 				this.$util.diyRedirectTo(link);
 			} else {
 				this.$refs.login.open(link.wap_url);

components-diy/diy-img-ads.vue

@@ -280,39 +280,39 @@ export default {
 }
 
 /* 隐藏滚动条，但依旧具备可以滚动的功能 */
-/deep/.uni-scroll-view::-webkit-scrollbar {
+::v-deep .uni-scroll-view::-webkit-scrollbar {
 	display: none;
 }
 
-.swiper /deep/ .uni-swiper-dots-horizontal {
+.swiper ::v-deep .uni-swiper-dots-horizontal {
 	bottom: 25rpx;
 }
 
-.swiper-left /deep/ .uni-swiper-dots-horizontal {
+.swiper-left ::v-deep .uni-swiper-dots-horizontal {
 	left: 40rpx;
 	transform: translate(0);
 }
 
-.swiper-right /deep/ .uni-swiper-dots-horizontal {
+.swiper-right ::v-deep .uni-swiper-dots-horizontal {
 	right: 40rpx;
 	display: flex;
 	justify-content: flex-end;
 	transform: translate(0);
 }
 
-.carousel-angle /deep/ .uni-swiper-dots-horizontal .uni-swiper-dot {
+.carousel-angle ::v-deep .uni-swiper-dots-horizontal .uni-swiper-dot {
 	width: 24rpx;
 	border-radius: 0;
 	height: 8rpx;
 }
 
-.swiper.ns-indicator-dots /deep/ .uni-swiper-dot {
+.swiper.ns-indicator-dots ::v-deep .uni-swiper-dot {
 	width: 18rpx;
 	height: 6rpx;
 	border-radius: 4rpx;
 }
 
-.swiper.ns-indicator-dots /deep/ .uni-swiper-dot-active {
+.swiper.ns-indicator-dots ::v-deep .uni-swiper-dot-active {
 	width: 36rpx;
 }
 </style>

components-diy/diy-index-page.vue

@@ -169,7 +169,6 @@
 </template>
 
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -189,9 +188,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsLoading
-	},
 	data() {
 		return {
 			pageIndex: 0, //当前选中分类id
@@ -736,7 +732,7 @@ export default {
 	margin-top: 100rpx;
 }
 
-/deep/.uni-scroll-view::-webkit-scrollbar {
+::v-deep .uni-scroll-view::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 }

components-diy/diy-kefu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-kefu" class="diy-kefu" :style="style">
-		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list">
+		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list" :key="index">
 			<view class="fui-list jump" v-if="index == 0">
 				<view class="fui-list-media">
 					<image class="round" :src="$util.img(item.imageUrl)" style="border-radius:6rpx"></image>

components-diy/diy-listmenu.vue

@@ -1,5 +1,5 @@
 <template>
-	<view data-component-name="diy-picture" class="diy-picture" :style="style">
+	<view data-component-name="diy-listmenu" class="diy-listmenu" :style="style">
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
@@ -62,8 +62,8 @@ export default {
 	methods: {
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
-					this.$refs.login.open(link.wap_url);
+				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+					this.$refs?.login?.open(link.wap_url);
 					return;
 				}
 			}

components-diy/diy-map.vue

@@ -3,11 +3,18 @@
 		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item, index) in value.list">
 			<map id="map" style="width: 100%; height:600rpx" scale="12" :markers="markerst" bindupdated="bindupdated"
 				:longitude="item.lng" :latitude="item.lat" show-location>
-				<cover-view
+				<!-- <cover-view
 					style="position:absolute;right:10px;bottom:30rpx;z-index:99999;background:#4390FF;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;"
 					@click="handlerClick(item)" @tap="handlerClick(item)">
 					<cover-view style="font-size:24rpx">一键导航</cover-view>
-				</cover-view>
+				</cover-view> -->
+
+				<!-- 使用非原生cover-view, 解决原生cover-view组件渲染机制z-index失效的问题 -->
+				<div
+					style="position:absolute;right:12rpx;bottom:48rpx;z-index:1;background:#4390FF;padding:0rpx 20rpx;border-radius:8rpx;color: #fff;"
+					@click="handlerClick(item)">
+					<span style="font-size:24rpx;color: #fff;">一键导航</span>
+				</div>			
 			</map>
 		</view>
 

components-diy/diy-member-info.vue

@@ -64,7 +64,7 @@
 						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
-				<view class="info-wrap" v-else :style="infoStyle" @click="redirect('/pages/member/index')">
+				<view class="info-wrap" v-else :style="infoStyle" @click="redirect($util.MEMBER_PAGE_URL)">
 					<view class="headimg">
 						<image :src="$util.getDefaultImage().head" mode="widthFix"></image>
 					</view>
@@ -243,7 +243,7 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 // 自定义会员中心——会员信息展示
-import nsContact from '@/components/ns-contact/ns-contact.vue';
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-member-info',
@@ -259,9 +259,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsContact
-	},
 	data() {
 		return {
 			info: null,
@@ -548,7 +545,7 @@ export default {
 		 */
 		redirectBeforeAuth(url) {
 			if (!this.storeToken) {
-				this.$refs.login.open('/pages/member/index');
+				this.$refs.login.open(this.$util.MEMBER_PAGE_URL);
 				return;
 			}
 
@@ -586,7 +583,7 @@ export default {
 					url: '/wechat/api/wechat/authcode',
 					data: {
 						scopes: 'snsapi_userinfo',
-						redirect_url: this.$config.h5Domain + '/pages/member/index'
+						redirect_url: this.$config.h5Domain + this.$util.MEMBER_PAGE_URL
 					},
 					success: res => {
 						if (res.code >= 0) {
@@ -1383,11 +1380,11 @@ export default {
 	}
 }
 
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none !important;
 }
 
-/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: #fff !important;
 }
 
@@ -1487,8 +1484,8 @@ export default {
 }
 </style>
 <style scoped>
-.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom,
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
 }

components-diy/diy-notes.vue

@@ -157,7 +157,7 @@ export default {
 		/* 点赞 */
 		giveLike(noteId, index) {
 			if (!this.storeToken) {
-				this.$refs.login.open('/pages/index/index');
+				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
 				return;
 			}
 

components-diy/diy-picture.vue

@@ -65,7 +65,7 @@ export default {
 		},
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}

components-diy/diy-pinfan.vue

@@ -319,7 +319,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -328,7 +328,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-pintuan.vue

@@ -391,7 +391,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -400,7 +400,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-presale.vue

@@ -276,7 +276,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -285,7 +285,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-quick-nav.vue

@@ -61,7 +61,7 @@ export default {
 	methods: {
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}

components-diy/diy-search.vue

@@ -198,7 +198,7 @@ export default {
 		},
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
+				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}
@@ -257,7 +257,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .uni-input-placeholder {
+::v-deep .uni-input-placeholder {
 	overflow: initial;
 }
 

components-diy/diy-seckill.vue

@@ -536,7 +536,7 @@ scroll-view ::-webkit-scrollbar {
 	touch-action: none;
 }
 
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -545,7 +545,7 @@ scroll-view ::-webkit-scrollbar {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-store-label.vue

@@ -140,7 +140,7 @@ export default {
 		display: flex;
 		align-items: baseline;
 
-		/deep/ .uni-scroll-view-content {
+		::v-deep .uni-scroll-view-content {
 			display: flex;
 			align-items: center;
 		}
@@ -148,7 +148,7 @@ export default {
 		&.between {
 			justify-content: space-between;
 
-			/deep/.uni-scroll-view-content {
+			::v-deep .uni-scroll-view-content {
 				justify-content: space-between;
 			}
 		}

components-diy/diy-text.vue

@@ -324,7 +324,7 @@ export default {
 			await this.__$emitEvent({
 				eventName: 'text-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-					$util.diyRedirectTo(link);
+					this.$util.diyRedirectTo(link);
 				}
 			})
 		}

components-diy/diy-video-list.vue

@@ -62,13 +62,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
-	components: {
-		uniPopup
-	},
 	props: {
 		value: {
 			type: Object,

components-diy/js/wechat-channel.js

@@ -0,0 +1,188 @@
+// 微信视频号组件配置
+export const wechatChannelConfig = {
+	// 图标相关
+	icon: {
+		defaultSize: 80, // 默认图标尺寸（rpx）
+		smallSize: 60, // 小图标尺寸（rpx）
+		channelArrowSize: 24, // 频道箭头图标尺寸（rpx）
+		channelArrow: 'addon/personnel/shop/view/enterprise/arrow.png', // 频道箭头图标路径
+	},
+
+
+	// 视频相关配置
+	video: {
+		defaultHeight: 320, // 默认视频高度（rpx）
+		minHeight: 200, // 最小视频高度（rpx）
+		maxHeight: 500, // 最大视频高度（rpx）
+		defaultCoverUrl: 'addon/personnel/shop/view/enterprise/default-video-cover.png', // 默认视频封面
+	},
+
+	// 播放按钮配置
+	playButton: {
+		size: 80, // 标准尺寸（rpx）
+		smallSize: 60, // 小尺寸（rpx）
+		iconSize: 40, // 标准图标尺寸（rpx）
+		smallIconSize: 30, // 小图标尺寸（rpx）
+		background: 'rgba(0, 0, 0, 0.4)', // 背景颜色
+	},
+
+	// 布局配置
+	layout: {
+		borderRadius: 12, // 圆角（rpx）
+		padding: 16, // 内边距（rpx）
+		margin: 10, // 外边距（rpx）
+	},
+
+	// 字体配置
+	font: {
+		channelNameSize: 28, // 频道名称字体大小（rpx）
+		videoTitleSize: 28, // 视频标题字体大小（rpx）
+		statsSize: 24, // 统计信息字体大小（rpx）
+	},
+
+	// 颜色配置
+	color: {
+		channelName: '#333', // 频道名称颜色
+		videoTitle: '#333', // 视频标题颜色
+		stats: '#999', // 统计信息颜色
+		border: '#f0f0f0', // 边框颜色
+	},
+
+	// 微信相关配置
+	wechat: {
+		minSdkVersion: '2.19.2', // 最小微信基础库版本
+		embedComponent: 'channel-video', // 嵌入式视频组件名称
+	},
+
+	// 错误提示配置
+	error: {
+		notWechat: '当前环境不是微信小程序',
+		lowVersion: '当前微信基础库版本过低，需要 2.19.2 或以上版本',
+		notSupported: '当前环境不支持微信视频号',
+		missingFields: '缺少必要字段: {field}',
+	},
+};
+
+// 获取配置项的辅助函数
+export const getwechatChannelConfig = (key, defaultValue = null) => {
+	const keys = key.split('.');
+	let config = wechatChannelConfig;
+
+	for (const k of keys) {
+		if (config[k] === undefined) {
+			return defaultValue;
+		}
+		config = config[k];
+	}
+
+	return config;
+};
+
+// 微信视频号工具函数
+export const wechatChannelUtil = {
+	// 版本比较
+	versionCompare(v1, v2) {
+		const arr1 = v1.split('.');
+		const arr2 = v2.split('.');
+		for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
+			const num1 = parseInt(arr1[i] || 0);
+			const num2 = parseInt(arr2[i] || 0);
+			if (num1 > num2) return 1;
+			if (num1 < num2) return -1;
+		}
+		return 0;
+	},
+
+	// 检查是否支持嵌入式播放
+	isEmbedModeSupported() {
+		return typeof wx !== 'undefined' && wx.canIUse(wechatChannelConfig.wechat.embedComponent);
+	},
+
+	// 获取默认视频封面
+	getDefaultCoverUrl() {
+		return wechatChannelConfig.video.defaultCoverUrl;
+	},
+
+	// 数据校验
+	validateVideoData(item) {
+		const requiredFields = ['feedId', 'finderUserName'];
+		for (const field of requiredFields) {
+			if (!item[field]) {
+				throw new Error(`缺少必要字段: ${field}`);
+			}
+		}
+		return true;
+	},
+
+	// 播放视频
+	playVideo(item) {
+		return new Promise((resolve, reject) => {
+			try {
+				// 数据校验
+				this.validateVideoData(item);
+			} catch (err) {
+				this.handleError(err, item);
+				reject(err);
+				return;
+			}
+
+			// 检查微信环境
+			if (typeof wx === 'undefined') {
+				const err = new Error(wechatChannelConfig.error.notWechat);
+				this.handleError(err, item);
+				reject(err);				
+				return;
+			}
+
+			// 检查基础库版本
+			const systemInfo = wx.getSystemInfoSync();
+			const SDKVersion = systemInfo.SDKVersion;
+			if (this.versionCompare(SDKVersion, wechatChannelConfig.wechat.minSdkVersion) < 0) {
+				const err = new Error(wechatChannelConfig.error.lowVersion);
+				this.handleError(err, item);
+				reject(err);
+				return;
+			}
+
+			// 调用微信视频号播放API
+			if (wx.openChannelsActivity) {
+				wx.openChannelsActivity({
+					feedId: item.feedId,
+					finderUserName: item.finderUserName,
+					success: (res) => {
+						console.log('打开视频号成功', res);
+						resolve(res);
+					},
+					fail: (err) => {
+						this.handleError(err, item);
+						reject(err);
+					}
+				});
+			} else {
+				const err = new Error(wechatChannelConfig.error.notSupported);
+				this.handleError(err, item);
+				reject(err);
+			}
+		});
+	},
+
+	// 统一错误处理
+	handleError(err, item) {
+		console.error('微信视频号错误:', err);
+		const { message = '', errMsg = '微信视频播放失败!', errCode = -1 } = err;
+
+		// 错误码5: 表示用户点击了取消. openChannelsActivity:fail cancel
+		if ([5].includes(errCode)) {
+			return;
+		}
+
+		const showErrorToast = (otherMsgs = []) => {
+			uni.showToast({
+				title: [errMsg, message,...otherMsgs].join('\n'),
+				icon: 'none',
+				duration: 2000
+			});
+		}
+		showErrorToast();
+	}
+};

components/ai-chat-message/ai-chat-message.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "ns-loading": "../ns-loading/ns-loading"
-  }
-}

components/chat-message/chat-message.vue

@@ -71,11 +71,7 @@
 </template>
 
 <script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
 	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -98,12 +94,6 @@
 				currImg: ''
 			};
 		},
-		components: {
-			nsChatGoods,
-			nsChatOrder,
-			uniPopup,
-			nsChatReceiveGoods
-		},
 		mounted() {
 			this.avatar = this.$util.img(this.siteInfo.logo_square);
 			this.myHeadImg = this.$util.img(this.memberInfo.headimg);
@@ -166,11 +156,11 @@
 </script>
 
 <style lang="scss">
-	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background-color: #000;
 	}
 
-	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 		max-width: 100%;
 		width: 100%;
 	}

components/goods-detail-view/goods-detail-view.vue

@@ -1,455 +0,0 @@
-<template>
-    <view>
-        <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
-            <view class="goods-container">
-                <!-- 弹幕 -->
-                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
-
-                <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
-                    <!-- 商品图片 -->
-                    <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
-                                <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
-                                </view>
-                            </swiper-item>
-                        </swiper>
-                        <view class="img-indicator-dots">
-                            <text>{{ swiperCurrent }}</text>
-                            <text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
-                        </view>
-                    </view>
-
-                    <!-- 商品视频 -->
-                    <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="cover"></video>
-                    </view>
-
-                    <!-- 切换视频、图片 -->
-                    <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
-                    </view>
-                </view>
-
-                <!-- 价格区域 -->
-                <view class="goods-gression">
-                    <slot name="price"></slot>
-                </view>
-
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-
-                    <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
-                        <block v-if="deliveryType">
-                            <view class="box">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
-                                </block>
-                            </view>
-                            <text class="iconfont icon-right"></text>
-                        </block>
-                        <block v-else>
-                            <view class="box">未配置</view>
-                        </block>
-                    </view>
-
-                    <!-- 门店 -->
-               <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
-                        <view class="label">门店</view>
-                        <view class="list-wrap">
-                            <view class="name-wrap">
-                                <text class="icondiy icon-system-shop"></text>
-                                <text class="name">{{globalStoreInfo.store_name}}</text>
-                            </view>
-                            <view class="other-wrap">
-                                <text class="distance" v-if="parseFloat(globalStoreInfo.distance)">距离{{ globalStoreInfo.distance > 1 ? globalStoreInfo.distance + 'km' : globalStoreInfo.distance * 1000 + 'm' }}</text>
-                                <text class="decorate" v-if="parseFloat(globalStoreInfo.distance)">.</text>
-                                <view class="address">{{ globalStoreInfo.full_address + globalStoreInfo.address }}
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view> -->
-
-                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
-                        <view class="label">服务</view>
-                        <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
-                                <view class="item-wrap-box">
-                                    <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <text>{{ item.service_name }}</text>
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-		
-                </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-                    <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        <view class="list-wrap" style="display: flex;">
-                            <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                            </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-                </view>
-
-                <!-- 配送方式 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="deliveryType" type="bottom">
-                        <view class="deliverytype-popup-layer popup-layer">
-                            <view class="head-wrap" @click="$refs.deliveryType.close()">
-                                <text>配送</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y class="type-body">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
-                                        <text class="iconfont" :class="item.icon"></text>
-                                        <view class="content">
-                                            <view class="title">{{ item.name }}</view>
-                                            <view class="desc">{{ item.desc }}</view>
-                                        </view>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 商品服务 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="merchantsServicePopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer">
-                            <view class="head-wrap" @click="closeMerchantsServicePopup()">
-                                <text>商品服务</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <view class="info-wrap">
-                                        <text class="title">{{ item.service_name }}</text>
-                                        <text class="describe" v-if="item.desc">{{ item.desc }}</text>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                            <view class="button-box">
-                                <button type="primary" @click="closeMerchantsServicePopup()">确定</button>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 门店列表 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="storeListPopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
-                            <view class="head-wrap" @click="closeStoreListPopup()">
-                                <text>门店列表</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
-                                        <view class="item-box">
-                                            <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else/>
-                                            </view>
-                                            <view class="item-info">
-                                                <view class="item-title">
-                                                    <text class="title">{{ item.store_name }}</text>
-                                                    <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
-                                                    </text>
-                                                </view>
-                                                <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
-                                                </view>
-                                                <view class="item-address">{{ item.full_address + item.address }}</view>
-                                            </view>
-                                            <view class="item-right"><text class="iconfont icon-right"></text></view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 业务区域 -->
-                <slot name="business"></slot>
-
-                <view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
-                    <view class="community-box">
-                        <image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
-                        <view class="community-content">
-                            <view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
-                            <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
-                        </view>
-                    </view>
-                    <view class="community-btn" @click="onCommunity()">添加</view>
-                </view>
-
-                <!-- 促销 -->
-            <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
-                    <view class="community-model-content" @click.stop>
-                        <view class="community-model-content-radius">
-                            <view>添加社群</view>
-                        </view>
-                        <view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
-                            <image :src="goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1 ? $util.img(goodsSkuDetail.qr_data.qr_img) : $util.img('public/uniapp/goods/detail_erweiImage.png') " mode="aspectFill" show-menu-by-longpress="true"/>
-                        </view>
-                        <view class="community-model-content-text">长按识别二维码，添加社群</view>
-                    </view>
-                    <view class="community-model-close" @click.stop="onCloseCommunity()">
-                        <text class="iconfont icon-close"></text>
-                    </view>
-                </view> -->
-
-                <!-- 参与流程 -->
-                <slot name="articipation"></slot>
-
-                <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
-                    <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
-                        <view class="tit">
-                            <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
-                            <view>
-                                <text class="color-title font-size-base">
-                                    评价
-                                    <text class="font-size-base">({{ evaluateCount }})</text>
-                                </text>
-                                <text class="evaluate-item-empty" v-if="!evaluateCount">暂无评价</text>
-                                <view class="evaluate-item-empty" v-else>
-                                    <text class="font-size-tag">查看全部</text>
-                                    <text class="iconfont icon-right font-size-tag"></text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index"
-                            v-if="item.content">
-                            <view class="evaluator">
-                                <view class="evaluator-info">
-                                    <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                    </view>
-                                    <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
-                                        </text>
-                                        <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-                                        <view v-if="item.scores" class="evaluator-xing">
-                                            <xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
-                                        </view>
-                                    </view>
-                                </view>
-                                <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
-                            </view>
-                            <view class="cont margin-top">{{ item.content }}</view>
-                            <scroll-view scroll-x="true">
-                                <view class="evaluate-img" v-if="item.images">
-                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-                                        <image :src="$util.img(img)" mode="aspectFill" />
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </view>
-                </view>
-				
-                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
-                    <view class="title">规格属性</view>
-                    <view class="attr-wrap">
-                        <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
-                            <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
-                                <text class="attr-name">{{ item.attr_name }}</text>
-                                <text class="value-name">{{ item.attr_value_name }}</text>
-                            </view>
-                        </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
-                            <block v-if="!goodsAttrShow">
-                                展开<text class="iconfont icon-iconangledown"></text>
-                            </block>
-                            <block v-else>
-                                收起<text class="iconfont icon-iconangledown-copy"></text>
-                            </block>
-                        </view>
-                    </view>
-                </view>
-
-				
-
-                <!-- 详情 -->
-                <view class="goods-detail-tab">
-                    <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
-                    </view>
-                    <view class="detail-content active">
-                        <view class="detail-content-item">
-                            <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
-                            </view>
-                            <view class="goods-details active" v-else></view>
-                            <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 商品推荐 -->
-                <ns-goods-recommend ref="goodrecommend" route="goods_detail"></ns-goods-recommend>
-
-                <ns-copyright></ns-copyright>
-
-                <!-- 海报 -->
-                <view @touchmove.prevent.stop class="poster-layer">
-                    <uni-popup ref="posterPopup" type="center">
-                        <template v-if="poster != '-1'">
-                            <view class="poster-wrap">
-                                <view class="image-wrap">
-                                    <image :src="$util.img(poster)" :show-menu-by-longpress="true" mode="widthFix" />
-                                    <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
-                                </view>
-                                <!-- #ifdef MP || APP-PLUS  -->
-                                <view class="save-btn" @click="saveGoodsPoster()">保存图片</view>
-                                <!-- #endif -->
-                                <!-- #ifdef H5 -->
-                                <view class="save-btn">长按图片进行保存</view>
-                                <!-- #endif -->
-                            </view>
-                        </template>
-                    </uni-popup>
-                </view>
-
-                <!-- 分享弹窗 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="sharePopup" type="bottom" class="share-popup">
-                        <view>
-                            <view class="share-title">分享</view>
-                            <view class="share-content">
-                                <!-- #ifdef MP -->
-                                <view class="share-box">
-                                    <button class="share-btn" :plain="true" open-type="share">
-                                        <view class="iconfont icon-share-friend"></view>
-                                        <text>分享给好友</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <!-- #ifdef MP-WEIXIN -->
-                                <view class="share-box" v-if="goodsCircle">
-                                    <button class="share-btn" :plain="true" @click="openBusinessView">
-                                        <view class="iconfont icon-haowuquan"></view>
-                                        <text>分享到好物圈</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <view class="share-box" @click="openPosterPopup">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-pengyouquan"></view>
-                                        <text>生成分享海报</text>
-                                    </button>
-                                </view>
-                                <!-- #ifdef H5 -->
-                                <view class="share-box" @click="copyUrl">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-fuzhilianjie"></view>
-                                        <text>复制链接</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-                            </view>
-                            <view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <slot name="fixedbtn"></slot>
-            </view>
-        </view>
-
-        <!-- 操作区域 -->
-        <slot name="action"></slot>
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-        <ns-login ref="login"></ns-login>
-    </view>
-</template>
-
-<script>
-    // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
-    import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import detail from './detail.js';
-
-    export default {
-        name: 'goods-detail-view',
-        props: {
-            goodsSkuDetail: {
-                type: Object,
-                default: () => {
-                    return {};
-                }
-            }
-        },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
-        mixins: [scroll, detail]
-    };
-</script>
-
-<style lang="scss">
-    @import '@/common/css/goods_detail.scss';
-</style>
-<style scoped></style>

components/hover-nav/hover-nav.vue

@@ -1,129 +1,128 @@
 <template>
   <!-- 悬浮按钮 -->
-	<view v-if="pageCount == 1 || need" class="fixed-box" 
-		:style="[{ height: fixBtnShow ? '400rpx' : '320rpx' }, customContainerStyle]">
-		<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
-		<!-- 切换语言按钮 -->
-		<button class="btn-item" v-if="fixBtnShow && isLanguageSwitchEnabled" @click="toggleLanguage()"
-			:style="[{ backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text :style="customTextStyle">{{ currentLangDisplayName }}</text>
-		</button>
-		<!-- 客服按钮 -->
-		<!-- #ifdef MP-WEIXIN -->
-		<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp"
-			showMessageCard="true"
-			:style="[{ backgroundImage: 'url(' + (kefuimg ? kefuimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text class="icox icox-kefu" v-if="!kefuimg"></text>
-			<!-- 	<view>首页</view> -->
-		</button>
-		<!-- #endif -->
-		<view class="btn-item" v-if="fixBtnShow" @click="call()"
-			:style="[{ backgroundImage: 'url(' + (phoneimg ? phoneimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
-			<!-- <view>我的</view> -->
+  <view v-if="pageCount == 1 || need" class="fixed-box" :style="[customContainerStyle, {
+    height: fixBtnShow ? '400rpx' : '320rpx',
+    backgroundImage: bgUrl ? `url(${bgUrl})` : '',
+    backgroundSize: 'cover'
+  }]">
+
+    <!-- 中英文切换按钮 -->
+    <view v-if="isLanguageSwitchEnabled && fixBtnShow" class="btn-item common-bg" @click="toggleLanguage">
+      <text>{{ currentLangDisplayName }}</text>
     </view>
 
-		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-			<text class="iconfont icon-unfold"></text>
+    <!-- AI 智能助手 -->
+    <view v-if="fixBtnShow && enableAIChat" class="btn-item common-bg" @click="openAIChat"
+      :style="{ backgroundImage: aiAgentimg ? `url(${aiAgentimg})` : '', backgroundSize: '100% 100%' }">
+      <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
     </view>
-		<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
-			@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-			<view class="">快捷</view>
-			<view>导航</view>
-		</view> -->
+
+    <!-- 微信小程序客服按钮 -->
+    <!-- #ifdef MP-WEIXIN -->
+    <button class="btn-item common-bg" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"
+      :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+      <text class="icox icox-kefu" v-if="!kefuimg"></text>
+    </button>
+    <!-- #endif -->
+
+    <!-- 普通客服（仅当未启用 AI 时显示） -->
+    <!-- #ifdef H5 -->
+    <template v-if="fixBtnShow">
+      <button class="btn-item common-bg" hoverClass="none" @click="openCustomerSelectPopup"
+        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+        <text class="icox icox-kefu" v-if="!kefuimg"></text>
+      </button>
+    </template>
+    <!-- #endif -->
+
+    <!-- 电话按钮（始终显示） -->
+    <view v-if="fixBtnShow" class="btn-item common-bg" @click="call()"
+      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+      <text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+    </view>
+
   </view>
 </template>
 
 <script>
+import { createCustomerService } from '@/common/js/customer-service.js';
+
 export default {
   name: 'hover-nav',
   props: {
-		need: {
-			type: Boolean,
-			default: false
-		}
+    need: { type: Boolean, default: false }
   },
   data() {
     return {
       pageCount: 0,
       fixBtnShow: true,
-			tel: '',
-			kefuimg: '',
-			phoneimg: '',
-			shopInfo: null, // 店铺信息对象
 
-			// --- 语言切换相关 ---
-			currentLangIndex: 0,  // 当前选中的语言索引
-			langIndexMap: {},     // 语言索引到语言值的映射
-			isLanguageSwitchEnabled: false,  // 是否启用语言切换
+      shopInfo: null,
+      currentLangIndex: 0,
+      langIndexMap: {},
 
-			// --- 其他 ---
+      customerService: null,
     };
   },
+  computed: {
+    // 安全读取 shopInfo 中的字段，避免 undefined 报错
+    bgUrl() {
+      return this.shopInfo?.bgUrl || '';
+    },
+    aiAgentimg() {
+      return this.shopInfo?.aiAgentimg || '';
+    },
+    kefuimg() {
+      return this.shopInfo?.kefuimg || this.$util.getDefaultImage().kefu;
+    },
+    phoneimg() {
+      return this.shopInfo?.phoneimg || this.$util.getDefaultImage().phone;
+    },
+    tel() {
+      return this.shopInfo?.mobile || '';
+    },
+    isLanguageSwitchEnabled() {
+      return !!this.shopInfo?.ischina;
+    },
+    enableAIChat() {
+      return !!this.shopInfo?.enableAIChat;
+    },
+    currentLangDisplayName() {
+      const lang = this.langIndexMap[this.currentLangIndex];
+      return lang === 'zh-cn' ? 'EN' : 'CN';
+    },
+    customContainerStyle() {
+      return this.shopInfo?.floatingButton?.container || {};
+    },
+    customButtonStyle() {
+      return this.shopInfo?.floatingButton?.button || {};
+    }
+  },
   created() {
-		// 初始化语言设置
+    this.customerService = createCustomerService(this);
     this.initLanguage();
-
-		this.kefuimg = this.$util.getDefaultImage().kefu
-		this.phoneimg = this.$util.getDefaultImage().phone
-		this.pageCount = getCurrentPages().length;
-
-		// 从店铺信息中获取相关信息
     uni.getStorage({
       key: 'shopInfo',
       success: (e) => {
-				console.log(`获取到的shopInfo:${JSON.stringify(e.data)}`)
         this.shopInfo = e.data;
-
-				// 从店铺信息中获取手机号
-				this.tel = e.data.mobile
-				// 从店铺信息中获取是否启用语言切换
-				this.isLanguageSwitchEnabled = e.data.ischina;
-			}
-		})
-
-	},
-	computed: {
-		currentLangDisplayName() {
-			// 语言切换按钮显示名称，当前语言为中文时显示EN，否则显示CN
-			// 根据 langIndexMap 获取当前语言值
-			const lang = this.langIndexMap[this.currentLangIndex];
-			return lang == 'zh-cn' ? 'EN' : 'CN';
-		},
-
-		// 获取容器的自定义样式
-		customContainerStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.container || {};
-		},
-
-		// 获取按钮的自定义样式
-		customButtonStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.button || {};
-		},
-
-		// 获取文本的自定义样式
-		customTextStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.text || {};
       }
+    });
   },
   methods: {
-		initLanguage() {
-			// 初始化语言列表
-			this.langList = this.$langConfig.list();
 
-			// 初始化语言索引映射
+    /**
+     * 初始化多语言配置
+     */
+    initLanguage() {
+      this.langList = this.$langConfig.list();
+      this.langIndexMap = {};
       for (let i = 0; i < this.langList.length; i++) {
         this.langIndexMap[i] = this.langList[i].value;
       }
-
-			// 获取存储的语言设置
       const savedLang = uni.getStorageSync('lang');
       if (savedLang) {
         for (let i = 0; i < this.langList.length; i++) {
-					if (this.langList[i].value == savedLang) {
+          if (this.langList[i].value === savedLang) {
             this.currentLangIndex = i;
             break;
           }
@@ -132,58 +131,51 @@ export default {
         this.currentLangIndex = 0;
       }
     },
-		//拨打电话
+
+    /**
+     * 电话联系客服
+     */
     call() {
-			uni.makePhoneCall({
-				phoneNumber: this.tel + ''
-			})
+      this.customerService.makePhoneCall(this.tel);
     },
+
+    /**
+     * 切换中英文语言，并刷新当前页面（保留所有参数）
+     */
     toggleLanguage() {
-			// 切换语言索引
-			this.currentLangIndex = this.currentLangIndex == 0 ? 1 : 0;
+      this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
       const targetLang = this.langIndexMap[this.currentLangIndex];
 
-			// 获取当前页面路由
-			let currentRoute = this.$util.getCurrentRoute().path;
-			// 切换语言并重新加载当前页面
-			this.$langConfig.change(targetLang, currentRoute);
+      // 调用语言切换逻辑（设置 storage + 清空缓存）
+      this.$langConfig.change(targetLang);
+    },
 
+    /**
+     * 打开 AI 智能助手
+     */
+    openAIChat() {
+      this.$util.redirectTo(this.$util.AI_CHAT_PAGE_URL);
+    },
+
+    /**
+     * 打开客服选择对话框
+     */
+    openCustomerSelectPopup() {
+      this.customerService.openCustomerSelectPopupDialog();
+    }
   }
 }
-};
 </script>
 
-<style lang="scss">
-.container-box {
-	width: 100%;
-
-	.item-wrap {
-		border-radius: 10rpx;
-
-		.image-box {
-			border-radius: 10rpx;
-		}
-
-		image {
-			width: 100%;
-			height: auto;
-			border-radius: 10rpx;
-			will-change: transform;
-		}
-	}
-}
-
-//悬浮按钮
+<style lang="scss" scoped>
 .fixed-box {
   position: fixed;
   right: 0rpx;
   bottom: 240rpx;
-	// #ifdef H5
+  /* #ifdef H5 */
   bottom: 320rpx;
-	// #endif
+  /* #endif */
   z-index: 10;
-	// background: #fff;
-	// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
   border-radius: 120rpx;
   padding: 20rpx 0;
   display: flex;
@@ -193,6 +185,7 @@ export default {
   box-sizing: border-box;
   transition: 0.3s;
   overflow: hidden;
+}
 
 .btn-item {
   display: flex;
@@ -202,17 +195,24 @@ export default {
   line-height: 1;
   margin: 14rpx 0;
   transition: 0.1s;
-		background: #c6251b;
-		color: #fff;
+  color: var(--hover-nav-text-color);
   border-radius: 40rpx;
   width: 80rpx;
   height: 80rpx;
   padding: 0;
   overflow: hidden;
+}
 
-		text {
+/* 定义共同的背景颜色 */
+.common-bg {
+  background-color: var(--hover-nav-bg-color);
+  /* 使用变量以保持一致性 */
+}
+
+.btn-item text {
   font-size: 28rpx;
 }
+
 .iconfont,
 .icox {
   font-size: 36rpx;
@@ -222,25 +222,28 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-			border-radius: 40rpx;
-			/* 确保图标本身也是圆形 */
+  margin: 14rpx 0;
+  border-radius: 50rpx;
+  width: 80rpx;
+  height: 80rpx;
+  padding: 0;
+  position: relative;
 }
 
-		view {
-			font-size: 26rpx;
+.iconfont text,
+.icox text {
+  font-size: 36rpx;
   font-weight: bold;
 }
 
-		&.show {
-			transform: rotate(180deg);
-		}
 
-		&.switch {}
 
-		&.icon-xiala {
-			margin: 0;
-			margin-top: 0.1rpx;
-		}
-	}
+.ai-icon {
+  font-size: 40rpx;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 </style>

components/mescroll/mescroll-uni.vue

@@ -62,8 +62,6 @@
 	// 引入回到顶部组件
 	import MescrollTop from './components/mescroll-top.vue';
 
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-
 	export default {
 		name: 'mescroll-uni',
 		components: {

components/ns-contact/ns-contact.vue

@@ -3,28 +3,37 @@
         <slot></slot>
         <!-- #ifdef MP-ALIPAY -->
         <view class="contact-button" @click="contactServicer">
-            <contact-button :tnt-inst-id="config.instid" :scene="config.scene" size="1000rpx" v-if="config.type == 'aliapp'"/>
+            <contact-button :tnt-inst-id="config.instid" :scene="config.scene" size="1000rpx"
+                v-if="config.type == 'aliapp'" />
         </view>
         <!-- #endif -->
-        <!-- #ifndef MP-ALIPAY -->
-        <button
-            type="default"
-            hover-class="none"
-            :open-type="openType"
-            class="contact-button"
-            @click="contactServicer"
-            :send-message-title="sendMessageTitle"
-            :send-message-path="sendMessagePath"
-            :send-message-img="sendMessageImg"
-            :show-message-card="true"></button>
+
+        <!-- #ifdef MP-WEIXIN -->
+        <!-- 微信小程序官方客服按钮 -->
+        <button v-if="useOfficialService" type="default" hover-class="none" open-type="contact" 
+            class="contact-button" sessionFrom="weapp" showMessageCard="true"
+            :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath"
+            :send-message-img="sendMessageImg"></button>
+        
+        <!-- 微信小程序自定义客服按钮 -->
+        <button v-else type="default" hover-class="none" class="contact-button" @click="contactServicer"></button>
         <!-- #endif -->
+        
+        <!-- #ifndef MP-WEIXIN && MP-ALIPAY -->
+        <!-- 其他平台保持原逻辑 -->
+        <button type="default" hover-class="none" :open-type="openType" class="contact-button" @click="contactServicer"
+            :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath"
+            :send-message-img="sendMessageImg" :show-message-card="true"></button>
+        <!-- #endif -->
+
         <uni-popup ref="servicePopup" type="center">
             <view class="service-popup-wrap">
                 <view class="head-wrap" @click="$refs.servicePopup.close()">
                     <text>联系客服</text>
                     <text class="iconfont icon-close"></text>
                 </view>
-                <view class="body-wrap">{{ siteInfo.site_tel ? '请联系客服，客服电话是' + siteInfo.site_tel : '抱歉，商家暂无客服，请线下联系' }}</view>
+                <view class="body-wrap">{{ siteInfo.site_tel ? '请联系客服，客服电话是' + siteInfo.site_tel : '抱歉，商家暂无客服，请线下联系' }}
+                </view>
             </view>
         </uni-popup>
     </view>
@@ -32,6 +41,8 @@
 
 <!-- 客服组件 -->
 <script>
+import { createCustomerService } from '@/common/js/customer-service.js';
+
 export default {
     name: 'ns-contact',
     props: {
@@ -56,76 +67,64 @@
     },
     data() {
         return {
-                config: null,
-                openType: ''
+            customerService: null,
+            buttonConfig: null
         };
     },
-        created() {
-            if (this.servicerConfig) {
-                // #ifdef H5
-                this.config = this.servicerConfig.h5;
-                // #endif
+    computed: {
+        /**
+         * 是否使用官方客服
+         */
+        useOfficialService() {
+            if (!this.buttonConfig) return true;
             
             // #ifdef MP-WEIXIN
-                this.config = this.servicerConfig.weapp;
-                if (this.config.type == 'weapp') this.openType = 'contact';
+            // 如果是微信小程序，检查配置
+            if (this.buttonConfig.type === 'weapp') {
+                // 默认使用官方客服，除非明确设置为false
+                return this.buttonConfig.useOfficial !== false;
+            }
             // #endif
             
-                // #ifdef MP-ALIPAY
-                this.config = this.servicerConfig.aliapp;
-                if (this.config.type == 'aliapp') this.openType = 'contact';
-                // #endif
+            return false;
+        },
+        
+        /**
+         * 客服配置
+         */
+        config() {
+            return this.customerService?.getPlatformConfig() || {};
+        },
+        
+        /**
+         * 打开类型
+         */
+        openType() {
+            return this.buttonConfig?.openType || '';
         }
     },
+    created() {
+        // 初始化客服服务
+        this.customerService = createCustomerService(this);
+        this.buttonConfig = this.customerService.getButtonConfig();
+    },
     methods: {
         /**
          * 联系客服
          */
         contactServicer() {
-                if (this.config.type == 'none') {
-                    this.$refs.servicePopup.open();
+            // 如果是微信/支付宝小程序客服，由系统自动处理
+            if (this.buttonConfig.openType === 'contact') {
+                return;
             }
-                if (this.openType == 'contact') return;
 
-                switch (this.config.type) {
-                    case 'wxwork':
-                        // #ifdef H5
-                        location.href = this.config.wxwork_url;
-                        // #endif
-                        // #ifdef MP-WEIXIN
-                        wx.openCustomerServiceChat({
-                            extInfo: { url: this.config.wxwork_url },
-                            corpId: this.config.corpid,
-                            showMessageCard: true,
+            // 使用统一客服处理
+            this.customerService.handleCustomerClick({
+                niushop: this.niushop,
                 sendMessageTitle: this.sendMessageTitle,
                 sendMessagePath: this.sendMessagePath,
                 sendMessageImg: this.sendMessageImg
             });
-                        // #endif
-                        break;
-                    case 'third':
-                        location.href = this.config.third_url;
-                        break;
-                    case 'niushop':
-                        this.$util.redirectTo('/pages_tool/chat/room', this.niushop);
-                        break;
-                    default:
-                        this.makePhoneCall();
-                }
-            },
-            /**
-             * 店铺联系方式
-             */
-            makePhoneCall() {
-                this.$api.sendRequest({
-                    url: '/api/site/shopcontact',
-                    success: res => {
-                        if (res.code == 0 && res.data.mobile) uni.makePhoneCall({
-                            phoneNumber: res.data
-                                .mobile
-                        });
-                    }
-                });
         }
     }
 };

components/ns-empty/ns-empty.vue

@@ -45,7 +45,7 @@ export default {
 			if (this.emptyBtn.url) {
 				this.$util.redirectTo(this.emptyBtn.url, {}, 'redirectTo');
 			} else {
-				this.$util.redirectTo('/pages/index/index');
+				this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 			}
 		},
 		re(text) {

components/ns-form/ns-form.vue

@@ -200,12 +200,8 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     export default {
         name: 'ns-form',
-        components: {
-            pickRegions
-        },
         props: {
             data: {
                 type: Array,

components/ns-goods-action-icon/ns-goods-action-icon.vue

@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
@@ -72,9 +71,6 @@ export default {
 			}
 		}
 	},
-	components:{
-		nsContact
-	},
 	methods: {
 		clickEvent() {
 			this.$emit('click');

components/ns-goods-recommend/ns-goods-recommend.vue

@@ -3,16 +3,9 @@
 </template>
 
 <script>
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-
 	// 商品推荐
 	export default {
 		name: 'ns-goods-recommend',
-		components: {
-			nsLoading,
-			nsGoodsSkuIndex
-		},
 		data() {
 			return {
 				list: [],

components/ns-goods-sku/ns-goods-sku-category.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-sku" @touchmove.prevent.stop>
-		<uni-popup ref="skuPopup" :type="popupType">
+		<uni-popup-sku-category ref="skuPopup" :type="popupType">
 			<view class="sku-layer">
 				<view class="sku-content">
 					<view class="sku-info" :style="{ height: systemInfo.windowHeight * 2 + 'rpx' }">
@@ -9,7 +9,8 @@
 								<image :src="$util.img(goodsDetail.sku_image, { size: 'mid' })" @error="imageError()" />
 							</view>
 							<view class="main">
-								<view class="goodname">{{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ? goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
+								<view class="goodname">{{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ?
+									goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
 								<view class="other-info">
 									<view class="stock color-tip" v-if="goodsDetail.stock_show">
 										库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
@@ -21,7 +22,8 @@
 						</view>
 						<view class="body-item">
 							<scroll-view scroll-y class="wrap">
-								<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format" :key="index">
+								<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format"
+									:key="index">
 									<text class="title font-size-tag">{{ item.spec_name }}</text>
 									<view class="sku-list_item">
 										<view v-for="(item_value, index_value) in item.value" :key="index_value" :class="{
@@ -29,7 +31,9 @@
 											disabled: item_value['disabled'] || (!item_value['selected'] && disabled)
 										}" class="items color-line-border font-size-tag"
 											@click="change(item_value.sku_id, item_value.spec_id)">
-											<image v-if="item_value.image" :src="$util.img(item_value.image, { size: 'small' })" @error="valueImageError(index, index_value)" />
+											<image v-if="item_value.image"
+												:src="$util.img(item_value.image, { size: 'small' })"
+												@error="valueImageError(index, index_value)" />
 											<text>{{ item_value.spec_value_name }}</text>
 										</view>
 									</view>
@@ -40,7 +44,8 @@
 							<view class="sku-name font-size-goods-tag">
 								<template v-if="goodsDetail.sku_spec_format" class="color-tip">
 									已选择：
-									<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format" :key="index">{{ item.spec_value_name }}</text>
+									<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format"
+										:key="index">{{ item.spec_value_name }}</text>
 								</template>
 							</view>
 							<view class="footer-bottom">
@@ -55,15 +60,19 @@
 											<text class="desc iconfont icon-jianshao color-base-text"></text>
 											<view class="click-event"></view>
 										</view>
-										<input type="number" class="uni-input" @blur="blur" v-model="number" placeholder="0" @input="keyInput(false)" />
-										<view class="num-action" :id="'select-sku-num-' + goodsDetail.goods_id" @click="changeNum('+', $event)">
-											<text class="add iconfont icon-add-fill color-base-text change_hover"></text>
+										<input type="number" class="uni-input" @blur="blur" v-model="number"
+											placeholder="0" @input="keyInput(false)" />
+										<view class="num-action" :id="'select-sku-num-' + goodsDetail.goods_id"
+											@click="changeNum('+', $event)">
+											<text
+												class="add iconfont icon-add-fill color-base-text change_hover"></text>
 											<view class="click-event"></view>
 										</view>
 									</view>
 									<view v-else-if="number == 0 && isLoad">
 										<view class="num-action">
-											<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0" @click="confirm($event)">加入购物车</button>
+											<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0"
+												@click="confirm($event)">加入购物车</button>
 											<button type="primary" disabled="true" v-else>确定</button>
 											<view class="click-event"></view>
 										</view>
@@ -75,20 +84,16 @@
 				</view>
 			</view>
 			<view class="sku-close iconfont icon-close-guanbi" @click="closeSkuPopup()"></view>
-		</uni-popup>
+		</uni-popup-sku-category>
 
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku-new.vue';
 // 商品SKU
 export default {
 	name: 'ns-goods-sku-category',
-		components: {
-			uniPopup
-		},
 	props: {
 		disabled: {
 			type: Boolean,
@@ -119,7 +124,7 @@
 		};
 	},
 	created() {
-			this.systemInfo = uni.getSystemInfoSync();
+		this.systemInfo = this.$util.getDeviceInfo();
 	},
 	watch: {
 		pointLimit(newNum, oldNum) {
@@ -838,15 +843,15 @@
 	z-index: 5;
 }
 
-	/deep/ .uni-popup__wrapper {
+::v-deep .uni-popup__wrapper {
 	background: transparent !important;
 }
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
 }
 
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
 }
 </style>

components/ns-goods-sku/ns-goods-sku-index.vue

@@ -2,18 +2,16 @@
 	<view class="goods-sku">
 		<ns-login ref="login"></ns-login>
 		<!-- sku选择 -->
-		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
+		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id"
+			:goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy"
+			@refresh="refreshGoodsSkuDetail"></ns-goods-sku>
 	</view>
 </template>
 
 <script>
-	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
 // 商品SKU
 export default {
 	name: 'ns-goods-sku-index',
-		components: {
-			nsGoodsSku
-		},
 	data() {
 		return {
 			timeout: {},
@@ -30,7 +28,7 @@
 		 */
 		addCart(config, data, event) {
 			if (!this.storeToken) {
-					this.$refs.login.open('/pages/index/index')
+				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
 				return;
 			}
 			if (config == "detail" || data.is_virtual) {

components/ns-goods-sku/ns-goods-sku.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-sku" @touchmove.prevent.stop>
-		<uni-popup ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+		<uni-popup-sku ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
 			<view class="sku-info" :style="{ height: skuHeight }">
 				<view class="header">
 					<block v-if="type == 'point' && goodsDetail.type && goodsDetail.type != 1">
@@ -208,19 +208,15 @@
 					<button type="primary" v-else disabled="true">该商品已下架</button>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup-sku>
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
-		components: {
-			uniPopup
-		},
 		props: {
 			goodsId: {
 				type: [Number, String],
@@ -270,7 +266,7 @@
 		},
 		created() {
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			this.systemInfo = uni.getSystemInfoSync();
+			this.systemInfo = this.$util.getDeviceInfo();
 			this.isLoad = true;
 			if (this.goodsId && this.goodsDetail.goods_spec_format) {
 				this.skuId = this.goodsDetail.sku_id;
@@ -417,7 +413,7 @@
 							this.isLoad = false;
 							if (callback) callback();
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -445,7 +441,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -471,7 +467,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -504,7 +500,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -531,7 +527,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -557,7 +553,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -583,7 +579,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -610,7 +606,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});
@@ -634,7 +630,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}
 					}
 				});

components/ns-login/ns-login.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- 完善会员资料 -->
 		<view @touchmove.prevent.stop class="complete-info-popup">
-			<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
+			<uni-popup ref="completeInfoPopup" type="center" :maskClick="false">
 				<view class="complete-info-wrap">
 					<!-- #ifdef H5 -->
 					<template v-if="forceBindingMobileControl">
@@ -32,77 +32,105 @@
 
 					<!-- #ifdef MP -->
 					<view class="head">
-						<text class="title">
-							获取您的昵称、头像
-							<template v-if="forceBindingMobileControl">
-								、手机号
-							</template>
-						</text>
+						<text class="title">欢迎来到 {{ site_name }}</text>
 						<text class="color-tip tips">
-							获取用户头像、昵称
-							<template v-if="forceBindingMobileControl">
-								、手机号
-							</template>
-							完善个人资料，主要用于向用户提供具有辨识度的用户中心界面
+							<template>{{ forceBindingMobileControl ? '使用手机号登录，' : '注册登录，' }}</template>
+							获得订单、售后等服务。
 						</text>
 						<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
 					</view>
+
+					<!-- 协议勾选 -->
+					<view style="display: flex;">
+						<view class="iconfont"
+							:class="isAgree ? 'icon-fuxuankuang1 color-base-text' : 'icon-fuxuankuang2'"
+							@click="isAgree = !isAgree"></view>
+						<view style="text-align: left; margin-left: 10rpx; padding-top: 2rpx; font-size: 28rpx;">
+							我同意
+							<text style="color: #4395ff;"
+								@click="tourl('/pages_tool/agreement/contenr?type=0')">《隐私条款》</text>
+							<text style="color: #4395ff;"
+								@click="tourl('/pages_tool/agreement/contenr?type=1')">《用户服务协议》</text>
+						</view>
+					</view>
+
+					<!-- 手机号授权按钮 -->
+					<block v-if="isAgree">
+						<button class="auth-login save-btn border-0" style="border: none;" open-type="getPhoneNumber"
+							@getphonenumber="getPhoneNumber">
+							<text style="color: #fff; font-size: 30rpx;">同意隐私协议并授权手机号</text>
+						</button>
+					</block>
+					<block v-else>
+						<button class="auth-login save-btn border-0" style="border: none;" @click="authno">
+							<text style="color: #fff; font-size: 30rpx;">授权手机号码</text>
+						</button>
+					</block>
+
+					<view @click="closeLogin"
+						style="font-size: 30rpx; color: #888; text-align: center; padding-top: 10rpx;">
+						暂不登录
+					</view>
+
+					<!-- 昵称和头像模式 -->
+					<template v-if="enableNickAndAvatar">
 						<!-- #ifdef MP-WEIXIN -->
 						<view class="item-wrap">
 							<text class="label">头像</text>
 							<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+								<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+									@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 								<text class="iconfont icon-right color-tip"></text>
 							</button>
 						</view>
 						<view class="item-wrap">
 							<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+							<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+								maxlength="50" />
 						</view>
 						<!-- #endif  -->
 
 						<!-- #ifdef MP-ALIPAY -->
 						<view class="item-wrap">
 							<text class="label">头像</text>
-						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo" :plain="true" class="border-0">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+							<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo"
+								:plain="true" class="border-0">
+								<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+									@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 								<text class="iconfont icon-right color-tip"></text>
 							</button>
 						</view>
 						<view class="item-wrap">
 							<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+							<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+								maxlength="50" />
 						</view>
 						<!-- #endif  -->
+
 						<view class="item-wrap" v-if="forceBindingMobileControl">
 							<text class="label">手机号</text>
-						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0" @getphonenumber="getPhoneNumber">
+							<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>获取手机号</text>
 							</button>
 						</view>
 						<button type="default" class="save-btn" @click="saveMp" :disabled="isDisabled">保存</button>
+					</template>
 					<!-- #endif  -->
 				</view>
 			</uni-popup>
 		</view>
 
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
+		<!-- 隐私弹窗 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
 
 		<register-reward ref="registerReward"></register-reward>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import registerReward from '@/components/register-reward/register-reward.vue';
 
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
 import auth from '@/common/js/auth.js';
 import validate from '@/common/js/validate.js';
@@ -110,15 +138,12 @@
 export default {
 	mixins: [auth],
 	name: 'ns-login',
-		components: {
-			uniPopup,
-			registerReward,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
 	data() {
 		return {
+			// 是否开启昵称和头像
+			enableNickAndAvatar: false,
+			// 协议勾选
+			isAgree: false,
 			url: '',
 			registerConfig: {},
 			avatarUrl: '', // 头像预览路径
@@ -148,7 +173,8 @@
 			authMobileData: {
 				iv: '',
 				encryptedData: ''
-				}
+			},
+			site_name: ''
 		};
 	},
 	options: {
@@ -178,13 +204,10 @@
 				if (this.formData.mobile.length == 0) return true;
 
 				// #ifdef H5
-
 				// 验证码
 				if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
-
 				// 动态码
 				if (this.formData.dynacode.length == 0) return true;
-
 				// #endif
 			}
 			return false;
@@ -195,7 +218,25 @@
 			else return false;
 		}
 	},
+	created() {
+		const siteInfo = uni.getStorageSync('siteInfo');
+		if (siteInfo) {
+			this.site_name = siteInfo.site_name;
+		}
+	},
 	methods: {
+		// 同意协议
+		authno() {
+			if (!this.isAgree) {
+				this.$util.showToast({ title: '请确认相关协议' });
+			}
+		},
+
+		// 关闭登录
+		closeLogin() {
+			this.$refs.completeInfoPopup.close();
+		},
+
 		// 获取注册配置
 		getRegisterConfig(callback = null) {
 			this.$api.sendRequest({
@@ -208,7 +249,9 @@
 				}
 			});
 		},
-			open(url) {
+
+		// 打开弹窗
+		open(url = '', mode = 'navigateTo') {
 			if (url) this.url = url;
 			// #ifdef MP
 			this.getCode(authData => {
@@ -220,35 +263,47 @@
 			if (this.$util.isWeChatMiniProgram()) {
 				// 微信小程序环境，使用微信授权登录
 				let authData = uni.getStorageSync('authInfo');
-					if (authData) this.authLogin(authData);
-					else this.getCode();
+				if (authData) {
+					this.authLogin(authData);
+				} else {
+					this.getCode(authData => {
+						this.authLogin(authData, 'authOnlyLogin');
+					});
+				}
 			} else if (this.$util.isWeiXin()) {
 				// 微信浏览器环境，显示登录页面
-					this.toLogin();
+				this.toLogin(mode);
 			} else {
 				// 其他浏览器环境，显示登录页面
-					this.toLogin();
+				this.toLogin(mode);
 			}
 			// #endif
 
 			// #ifndef MP || H5
-				this.toLogin();
+			this.toLogin(mode);
 			// #endif
 		},
+
 		// 跳转去登录页
-			toLogin() {
-				if (this.url) this.$util.redirectTo('/pages_tool/login/login', {
+		toLogin(mode = 'navigateTo') {
+			if (this.url) this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {
 				back: encodeURIComponent(this.url)
-				});
-				else this.$util.redirectTo('/pages_tool/login/login');
+			}, mode);
+			else this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {}, mode);
 		},
+
+		// 取消完善信息
 		cancelCompleteInfo() {
 			if (this.$refs.completeInfoPopup) this.$refs.completeInfoPopup.close();
 			this.$store.commit('setBottomNavHidden', false); // 显示底部导航
 		},
+
+		// 昵称失焦
 		blurNickName(e) {
 			if (e.detail.value) this.nickName = e.detail.value;
 		},
+
+		// 选择头像
 		onChooseAvatar(e) {
 			this.avatarUrl = e.detail.avatarUrl;
 			uni.getFileSystemManager().readFile({
@@ -256,7 +311,6 @@
 				encoding: 'base64', //编码格式
 				success: res => {
 					let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
-
 					this.$api.uploadBase64({
 						base64,
 						success: res => {
@@ -277,6 +331,8 @@
 				}
 			});
 		},
+
+		// 打开完善信息弹窗
 		openCompleteInfoPop() {
 			this.getRegisterConfig();
 
@@ -289,6 +345,7 @@
 			});
 			this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
 		},
+
 		// 获取前台登录验证码开关配置
 		getCaptchaConfig() {
 			this.$api.sendRequest({
@@ -301,6 +358,7 @@
 				}
 			});
 		},
+
 		// 获取验证码
 		getCaptcha() {
 			this.$api.sendRequest({
@@ -316,6 +374,7 @@
 				}
 			});
 		},
+
 		// 发送手机动态码
 		sendMobileCode() {
 			if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
@@ -377,6 +436,8 @@
 				}
 			});
 		},
+
+		// 刷新动态码数据
 		refreshDynacodeData() {
 			this.getCaptcha();
 			clearInterval(this.dynacodeData.timer);
@@ -387,6 +448,8 @@
 				isSend: false
 			};
 		},
+
+
 		// 表单验证
 		verify(data) {
 			let rule = [{
@@ -421,6 +484,7 @@
 				return false;
 			}
 		},
+
 		// 微信公众号强制绑定手机号
 		forceBindMobile() {
 			let authData = uni.getStorageSync('authInfo');
@@ -468,13 +532,17 @@
 				}
 			});
 		},
+
 		// 微信小程序获取手机号
 		getPhoneNumber(e) {
-				console.log(e)
-				if (e.detail.errMsg == 'getPhoneNumber:ok') {
-					let authData = uni.getStorageSync('authInfo');
-					if (authData) Object.assign(this.authMobileData, authData, e.detail);
-					if (uni.getStorageSync('source_member')) this.authMobileData.source_member = uni.getStorageSync('source_member');
+			if (e.detail.errMsg === 'getPhoneNumber:ok') {
+				const authInfo = uni.getStorageSync('authInfo');
+				if (authInfo) {
+					Object.assign(this.authMobileData, authInfo, e.detail);
+				}
+				if (uni.getStorageSync('source_member')) {
+					this.authMobileData.source_member = uni.getStorageSync('source_member');
+				}
 
 				this.$api.sendRequest({
 					url: '/api/tripartite/getPhoneNumber',
@@ -482,6 +550,9 @@
 					success: res => {
 						if (res.code >= 0) {
 							this.formData.mobile = res.data.mobile;
+							if (!this.enableNickAndAvatar) { // 不开启昵称和头像绑定,直接保存手机号
+								this.saveMp();
+							}
 						} else {
 							this.formData.mobile = '';
 							this.$util.showToast({
@@ -496,6 +567,7 @@
 				})
 			}
 		},
+
 		// 微信小程序强制绑定手机号
 		bindMobile() {
 			let data = this.authMobileData;
@@ -527,9 +599,8 @@
 				}
 			});
 		},
-			/**
-			 * 授权登录
-			 */
+
+		// 授权登录
 		authLogin(data, type = 'authLogin') {
 			uni.showLoading({
 				title: '登录中'
@@ -577,7 +648,8 @@
 				}
 			});
 		},
-			// 微信公众号，强制绑定手机号，验证
+
+		// H5保存:微信公众号，强制绑定手机号，验证
 		saveH5() {
 			if (this.$util.isWeiXin() && this.forceBindingMobileControl) {
 				let data = {
@@ -593,24 +665,35 @@
 			}
 			this.forceBindMobile();
 		},
+
 		// 微信小程序保存数据
 		saveMp() {
-				if (this.nickName.length == 0) {
-					this.$util.showToast({
-						title: '请输入昵称'
-					});
+			if (this.formData.mobile === '') {
+				this.$util.showToast({ title: '请授权您的手机号码' });
 				return;
 			}
-				let authData = uni.getStorageSync('authInfo');
-				if (authData) Object.assign(authData, {
+
+			if (this.nickName.length == 0 && this.enableNickAndAvatar) {
+				this.$util.showToast({ title: '请输入昵称' });
+				return;
+			}
+
+			let authInfo = uni.getStorageSync('authInfo');
+			if (authInfo) {
+				Object.assign(authInfo, {
 					nickName: this.nickName,
 					avatarUrl: this.headImg
 				});
-				uni.setStorageSync('authInfo', authData);
+				uni.setStorageSync('authInfo', authInfo);
+			}
 
-				if (this.forceBindingMobileControl) this.bindMobile();
-				else this.authLogin(authData);
+			if (this.forceBindingMobileControl) {
+				this.bindMobile();
+			} else {
+				this.authLogin(authInfo);
+			}
 		},
+
 		// #ifdef MP-ALIPAY
 		aliappGetUserinfo() {
 			my.getOpenUserInfo({
@@ -652,6 +735,8 @@
 			});
 		},
 		// #endif
+
+		// 获取会员信息
 		getMemberInfo() {
 			this.$api.sendRequest({
 				url: '/api/member/info',
@@ -662,12 +747,17 @@
 					}
 				}
 			});
+		},
+
+		// 跳转页面
+		tourl(url) {
+			this.$util.redirectTo(url);
 		}
 	}
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .complete-info-popup {
 	.complete-info-wrap {
 		background: #fff;
@@ -675,16 +765,16 @@
 
 		.head {
 			position: relative;
-				border-bottom: 2rpx solid $color-line;
 			padding-bottom: 20rpx;
+			text-align: center;
 
 			.title {
-					font-size: $font-size-toolbar;
+				font-size: 30rpx;
 				display: block;
 			}
 
 			.tips {
-					font-size: $font-size-base;
+				font-size: 28rpx;
 				display: block;
 			}
 
@@ -697,19 +787,19 @@
 				height: 56rpx;
 				line-height: 56rpx;
 				text-align: right;
-					font-size: $font-size-toolbar;
-					font-weight: bold;
+				font-size: 32rpx;
+				font-weight: 700;
 			}
 		}
 
 		.item-wrap {
-				border-bottom: 2rpx solid $color-line;
+			border-bottom: 2rpx solid #eee;
 			display: flex;
 			align-items: center;
 			padding: 16rpx 0;
 
 			.label {
-					font-size: $font-size-toolbar;
+				font-size: 32rpx;
 				margin-right: 40rpx;
 				width: 100rpx;
 			}
@@ -723,7 +813,7 @@
 				text-align: left;
 				display: flex;
 				align-items: center;
-					font-size: $font-size-toolbar;
+				font-size: 32rpx;
 				border: none;
 
 				image {
@@ -732,27 +822,27 @@
 					border-radius: 10rpx;
 					overflow: hidden;
 				}
-				}
 
 				.iconfont {
 					flex: 1;
 					text-align: right;
-					font-size: $font-size-tag;
+					font-size: 24rpx;
+				}
 			}
 
 			input {
 				flex: 1;
 				height: 80rpx;
 				box-sizing: border-box;
-					font-size: $font-size-toolbar;
+				font-size: 32rpx;
 			}
 
 			.send {
-					border: 2rpx solid $base-color;
+				border: 2rpx solid var(--base-color);
 				height: 60rpx;
 				line-height: 60rpx;
 				border-radius: 60rpx;
-					font-size: $font-size-tag;
+				font-size: 24rpx;
 				text-align: center;
 				padding: 0 40rpx;
 			}
@@ -771,27 +861,27 @@
 		}
 
 		.save-btn {
-				width: 280rpx;
+			width: 100%;
 			height: 90rpx;
 			line-height: 90rpx;
 			background-color: #07c160;
 			color: #fff;
 			margin: 40rpx auto 20rpx;
+			border-radius: 50rpx;
 		}
 	}
-	}
-</style>
-<style scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
+
+	&.reward-popup .uni-popup__wrapper-box {
 		background: none !important;
 		max-width: unset !important;
 		max-height: unset !important;
 		overflow: unset !important;
 	}
 
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+	&.uni-popup__wrapper.bottom,
+	&.uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 		border-top-left-radius: 30rpx !important;
 		border-top-right-radius: 30rpx !important;
 	}
+}
 </style>

components/ns-mp-html/ns-mp-html.vue

@@ -17,7 +17,7 @@
 
 <style lang="scss">
 	.mp-html{
-		/deep/ img{
+		::v-deep img{
 			width:100% !important;
 			display:block;
 		}

components/ns-payment/ns-payment.vue

@@ -22,10 +22,12 @@
                     </view>
                     <block v-if="payMoney > 0">
                         <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
+                                @click="payIndex = index">
                                 <view class="iconfont" :class="item.icon"></view>
                                 <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                                <text class="iconfont"
+                                    :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
                             </view>
                         </block>
                         <block v-else>
@@ -43,8 +45,6 @@
 
 <!-- 旧版支付组件 订单表不为order表 的订单支付时使用该组件  -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
 
 // #ifdef H5
 import { Weixin } from 'common/js/wx-jssdk.js';
@@ -52,10 +52,6 @@
 
 export default {
     name: 'ns-payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
     props: {
         balanceDeduct: {
             type: [Number, String],
@@ -189,7 +185,7 @@
                             title: '未获取到支付信息！'
                         });
                         setTimeout(() => {
-                                this.$util.redirectTo('/pages/index/index');
+                            this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
                         }, 1500);
                     }
                 }

components/ns-select-time/ns-select-time.vue

@@ -30,12 +30,8 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	name: "nsSelectTime",
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			//选中日期的键值

components/ns-video-player-popup/ns-video-player-popup.vue

@@ -0,0 +1,145 @@
+<template>
+    <view class="video-player-popup">
+        <uni-popup ref="videoPopup" type="center" :mask-click="true" @change="onVideoPopupChange">
+            <view class="video-popup-content">
+                <view class="video-popup-header">
+                    <text class="video-popup-title">{{ videoTitle }}</text>
+                    <text class="iconfont icon-close" @click="close"></text>
+                </view>
+                <view class="video-popup-body">
+                    <video 
+                        v-if="videoUrl" 
+                        :src="videoUrl"
+                        controls 
+                        autoplay 
+                        class="video-player"
+                    ></video>
+                    <view v-else class="video-error">视频地址不存在</view>
+                </view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'ns-video-player-popup',
+    props: {
+        /**
+         * 当前播放的视频信息
+         * @type {Object}
+         * @property {string} title - 视频标题
+         * @property {string} videoUrl - 视频地址
+         */
+        currentVideo: {
+            type: Object,
+            default: null
+        }
+    },
+    computed: {
+        videoUrl() {
+            return this.currentVideo?.videoUrl || '';
+        },
+
+        videoTitle() {
+            return this.currentVideo?.title || '';
+        },
+        /**
+         * 视频弹窗是否显示
+         * @type {boolean}
+         */
+        isVisible() {
+            return this.$refs.videoPopup?.visible || false;
+        }
+    },
+    methods: {
+        /**
+         * 打开视频弹窗
+         */
+        open() {
+            if (this.$refs.videoPopup) {
+                this.$refs.videoPopup.open();
+            }
+        },
+
+        /**
+         * 关闭视频弹窗
+         */
+        close() {
+            if (this.$refs.videoPopup) {
+                this.$refs.videoPopup.close();
+            }
+        },
+
+        /**
+         * 视频弹窗状态变化
+         * @param {Object} e - 弹窗状态变化事件
+         */
+        onVideoPopupChange(e) {
+            this.$emit('popup-change', e);
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+/* 视频播放弹窗样式 */
+.video-player-popup {
+    .video-popup-content {
+        width: 90%;
+        max-width: 600rpx;
+        background-color: #fff;
+        border-radius: 12rpx;
+        overflow: hidden;
+        box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.15);
+    }
+
+    .video-popup-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20rpx;
+        border-bottom: 1rpx solid #f0f0f0;
+        background-color: #fafafa;
+
+        .video-popup-title {
+            font-size: 28rpx;
+            font-weight: 600;
+            color: #333;
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .icon-close {
+            font-size: 32rpx;
+            color: #999;
+            padding: 0 10rpx;
+        }
+    }
+
+    .video-popup-body {
+        padding: 20rpx;
+
+        .video-player {
+            width: 100%;
+            height: 400rpx;
+            background-color: #000;
+            border-radius: 8rpx;
+        }
+
+        .video-error {
+            width: 100%;
+            height: 400rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background-color: #f5f5f5;
+            border-radius: 8rpx;
+            color: #999;
+            font-size: 28rpx;
+        }
+    }
+}
+</style>

components/payment/payment.vue

@@ -43,9 +43,6 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
     // #ifdef H5
     import {
         Weixin
@@ -54,10 +51,6 @@
 
     export default {
         name: 'payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
         props: {
             // 是否可用余额支付
             balanceUsable: {

components/privacy-popup/privacy-popup.vue

@@ -0,0 +1,385 @@
+<template>
+	<view>
+		<view class="privacy-mask" v-if="showPop">
+			<view class="privacy-wrap">
+				<view class="privacy-title">用户隐私保护提示</view>
+				<view class="privacy-desc">
+					感谢您使用{{ appName }}，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{ privacyContractName }}</text>
+					<!-- #ifdef QUICKAPP-WEBVIEW || H5 -->
+					<text class="privacy-link" @tap="openPrivacyService">{{ privacyServiceName }}</text>
+					<!-- #endif -->
+					,当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用{{ appName }}相关功能。
+				</view>
+				<view class="privacy-button-flex">
+					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
+					<!-- #ifdef QUICKAPP-WEBVIEW || MP-WEIXIN -->
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization"
+						@agreeprivacyauthorization="handleAgree">同意并继续</button>
+					<!-- #endif -->
+					<!-- #ifdef WEB || H5 -->
+					<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree" @click="handleAgree">同意并继续</button>
+					<!-- #endif -->
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// #ifdef QUICKAPP-WEBVIEW
+import has from '@system.has'
+// #endif
+
+const closeOtherPagePopUpHooks = new Set();
+const privacyContractPage = '/pages_tool/agreement/contenr?type=0';
+const privacyServicePage = '/pages_tool/agreement/contenr?type=1';
+
+export default {
+	name: 'PrivacyPopup',
+	data() {
+		return {
+			agree: false,
+			showPop: false,
+			privacyAuthorization: null,
+			privacyResolves: new Set(),
+			privacyContractName: '用户隐私保护指引',
+			appName: '本小程序',
+			// #ifdef WEB || H5
+			appName: '本应用',
+			privacyContractName: '《隐私条款》',
+			privacyServiceName: '《用户服务协议》',
+			// #endif
+		}
+	},
+	mounted() {
+		this.listenPrivacySettingChange()
+		this.curPageShow()
+	},
+	created() {
+		try {
+			// #ifdef MP-WEIXIN
+			//查询微信侧记录的用户是否有待同意的隐私政策信息
+			wx.getPrivacySetting({
+				success: (res) => {
+					// console.log('隐私政策信息', res);
+					// console.log(res.privacyContractName);
+					this.privacyContractName = res.privacyContractName
+				}
+			});
+			// #endif
+
+			// #ifdef QUICKAPP-WEBVIEW || H5
+			if (this.$util.isQuickApp()) {
+				if (typeof has != 'undefined' && has?.getPrivacySetting) {
+					has.getPrivacySetting({
+						success: (res) => {
+							if (res.privacyContractName) {
+								this.privacyContractName = res.privacyContractName
+							}
+						},
+					})
+				}
+			}
+			// #endif
+		} catch (e) {
+			console.error("=========低版本基础库==========", e)
+		}
+	},
+	methods: {
+		getPrivacySettingByQuickApp() {
+			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+			if (this.$util.isQuickApp()) {
+				if (typeof has != 'undefined' && has?.getPrivacySetting) {
+					has.getPrivacySetting({
+						success: (res) => {
+							// console.log(res)
+							if (res.needAuthorization) {
+								this.popUp()
+								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+								this.closeOtherPagePopUp(this.disPopUp)
+							} else {
+								this.$emit('agree')
+							}
+						},
+					})
+				} else {
+					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理，判断是否已经授权
+					if (uni.getStorageSync('privacyAgreed')) {
+						this.$emit('agree')
+					} else {
+						this.popUp()
+						// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+						this.closeOtherPagePopUp(this.disPopUp)
+					}
+				}
+			}
+			// #endif
+		},
+
+		listenPrivacySettingChange() {
+			// #ifdef MP-WEIXIN
+			// 监听微信侧隐私政策授权变化事件
+			if (wx.onNeedPrivacyAuthorization) {
+				wx.onNeedPrivacyAuthorization((resolve) => {
+					if (typeof this.privacyAuthorization === 'function') {
+						this.privacyAuthorization(resolve)
+					}
+				})
+			}
+			// #endif
+
+			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+			if (this.$util.isQuickApp()) {
+				// 监听快速应用侧隐私政策授权变化事件
+				if (typeof has != 'undefined' && has?.onPrivacySettingChange) {
+					has.onPrivacySettingChange((res) => {
+						// console.log(res)
+						if (res.needAuthorization) {
+							this.popUp()
+							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+							this.closeOtherPagePopUp(this.disPopUp)
+						} else {
+							this.$emit('agree')
+						}
+					})
+				}
+			}
+			// #endif
+
+			// 主动查询用户隐私政策授权状态，针对快速应用
+			this.getPrivacySettingByQuickApp();
+		},
+		// 主动查询用户隐私政策授权状态
+		proactive() {
+			// #ifdef MP-WEIXIN
+			if (wx.getPrivacySetting) {
+				wx.getPrivacySetting({
+					success: (res) => {
+						// console.log(res)
+						if (res.needAuthorization) {
+							this.popUp()
+							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+							this.closeOtherPagePopUp(this.disPopUp)
+						} else {
+							this.$emit('agree')
+						}
+					},
+				});
+			} else {
+				this.$emit('agree')
+			}
+			// #endif
+
+			// #ifdef QUICKAPP-WEBVIEW
+			this.getPrivacySettingByQuickApp();
+			// #endif
+		},
+		//初始化监听程序
+		curPageShow() {
+			closeOtherPagePopUpHooks.add(this.disPopUp)
+			this.privacyAuthorization = resolve => {
+				this.privacyResolves.add(resolve)
+				//打开弹窗
+				this.popUp()
+				// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+				this.closeOtherPagePopUp(this.disPopUp)
+			}
+		},
+		// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+		closeOtherPagePopUp(closePopUp) {
+			closeOtherPagePopUpHooks.forEach(hook => {
+				if (closePopUp !== hook) {
+					hook()
+				}
+			})
+		},
+		//打开隐私协议
+		openPrivacyContract() {
+			// #ifdef MP-WEIXIN
+			wx.openPrivacyContract({
+				success(res) {
+					// console.log('打开隐私协议', res);
+				},
+				fail(err) {
+					// console.error('打开隐私协议失败', err)
+				}
+			});
+			// #endif
+
+			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+			if (this.$util.isQuickApp()) {
+				if (typeof has != 'undefined' && has?.openPrivacySetting) {
+					has.openPrivacySetting({
+						success: (res) => {
+							// console.log('打开隐私协议', res);
+						},
+						fail: (err) => {
+							// console.error('打开隐私协议失败', err)
+						}
+					});
+				} else {
+					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
+					this.$util.redirectTo(privacyContractPage);
+				}
+			} else {
+				// H5 环境下的处理逻辑
+				this.$util.redirectTo(privacyContractPage);
+			}
+			// #endif
+		},
+		//打开用户服务协议
+		openPrivacyService() {
+			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+			if (this.$util.isQuickApp()) {
+				if (typeof has != 'undefined' && has?.openPrivacySetting) {
+					has.openPrivacySetting({
+						success: (res) => {
+							// console.log('打开用户服务协议', res);
+						},
+						fail: (err) => {
+							// console.error('打开用户服务协议失败', err)
+						}
+					});
+				} else {
+					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
+					this.$util.redirectTo(privacyServicePage);
+				}
+			} else {
+				// H5 环境下的处理逻辑
+				this.$util.redirectTo(privacyServicePage);
+			}
+			// #endif
+		},
+		// 不同意
+		handleDisagree() {
+			this.privacyResolves.forEach(resolve => {
+				resolve({
+					event: 'disagree',
+				})
+			})
+			this.privacyResolves.clear()
+			//关闭弹窗
+			this.disPopUp()
+			//退出小程序
+			uni.showModal({
+				content: '未同意隐私协议，无法使用相关功能',
+				success: () => {
+					this.$emit('disagree')
+				}
+			})
+		},
+		// 同意并继续
+		handleAgree() {
+			this.privacyResolves.forEach(resolve => {
+				resolve({
+					event: 'agree',
+					buttonId: 'agree-btn'
+				})
+			})
+			this.privacyResolves.clear()
+			//关闭弹窗
+			this.disPopUp()
+
+			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+			// 保存用户授权状态到本地存储，用于快应用Webview组件中的H5方式处理
+			uni.setStorageSync('privacyAgreed', true);		
+			// #endif	
+			this.$emit('agree')
+		},
+		//打开弹窗
+		popUp() {
+			this.showPop = true;
+		},
+		//关闭弹窗
+		disPopUp() {
+			this.showPop = false;
+		},
+	},
+	beforeDestroy() {
+		// 清理事件监听器和集合
+		this.privacyResolves.clear()
+		closeOtherPagePopUpHooks.delete(this.disPopUp)
+		// 注意：这里需要根据实际情况清理微信和快速应用的事件监听器
+		// 由于微信的 wx.onNeedPrivacyAuthorization 没有对应的 off 方法，这里可能需要其他方式处理
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.privacy-mask {
+	position: fixed;
+	z-index: 5000;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.2);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.privacy-wrap {
+	width: 632rpx;
+	padding: 48rpx 30rpx;
+	box-sizing: border-box;
+	background: #fff;
+	border-radius: 16rpx;
+}
+
+.privacy-title {
+	padding: 0rpx 30rpx 40rpx 30rpx;
+	font-weight: 700;
+	font-size: 36rpx;
+	text-align: center;
+}
+
+.privacy-desc {
+	font-size: 30rpx;
+	color: #555;
+	line-height: 2;
+	text-align: left;
+	padding: 0 40rpx;
+}
+
+.privacy-link {
+	color: #2f80ed;
+}
+
+.privacy-button-flex {
+	display: flex;
+	padding: 20rpx 40rpx;
+}
+
+.privacy-button-btn {
+	color: #FFF;
+	font-size: 30rpx;
+	// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
+	font-size: 28rpx;
+	// #endif
+	font-weight: 500;
+	line-height: 100rpx;
+	text-align: center;
+	height: 100rpx;
+	border-radius: 20rpx;
+	border: none;
+	background: #07c160;
+	flex: 1;
+	margin-right: 30rpx;
+	justify-content: center;
+}
+
+.privacy-button-btn::after {
+	border: none;
+}
+
+.bg-disagree {
+	color: #07c160;
+	background: #f2f2f2;
+}
+
+.bg-agree {
+	margin-right: 0rpx;
+}
+</style>

components/register-reward/register-reward.vue

@@ -78,14 +78,9 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				reward: null,
@@ -143,7 +138,7 @@
 						break;
 					default:
 						if (this.back) this.$util.redirectTo(decodeURIComponent(this.back), {}, 'redirectTo');
-						else this.$util.redirectTo('/pages/index/index');
+						else this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						break;
 				}
 			}
@@ -151,7 +146,7 @@
 	};
 </script>
 <style scoped>
-	.register-box /deep/ .uni-scroll-view {
+	.register-box ::v-deep .uni-scroll-view {
 		background: unset !important;
 	}
 
@@ -160,11 +155,11 @@
 		overflow-y: scroll;
 	}
 
-	.register-box /deep/.uni-popup__wrapper-box {
+	.register-box ::v-deep .uni-popup__wrapper-box {
 		overflow: unset !important;
 	}
 
-	.reward-popup /deep/.uni-popup__wrapper {
+	.reward-popup ::v-deep .uni-popup__wrapper {
 		background: none;
 	}
 </style>

components/to-top/to-top.vue

@@ -27,7 +27,7 @@ export default {
 <style>
 /* 回到顶部的按钮 */
 .mescroll-totop {
-	z-index: 99;
+	z-index: 2147483647;
 	position: fixed !important; /* 加上important避免编译到H5,在多mescroll中定位失效 */
 	right: 46rpx !important;
 	bottom: 272rpx !important;

components/wx-privacy-popup/privacy-popup.vue

@@ -1,232 +0,0 @@
-<template>
-	<view v-if="showPop">
-		<view class="privacy-mask">
-			<view class="privacy-wrap">
-				<view class="privacy-title">用户隐私保护提示</view>
-				<view class="privacy-desc">
-					感谢您使用本小程序，在使用前您应当阅读并同意
-					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
-					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
-				</view>
-				<view class="privacy-button-flex">
-					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
-					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				agree: false,
-				showPop: false,
-				privacyAuthorization: null,
-				privacyResolves: new Set(),
-				closeOtherPagePopUpHooks: new Set(),
-				privacyContractName: '用户隐私保护指引'
-			}
-		},
-		mounted() {
-			this.init()
-			this.curPageShow()
-		},
-		created() {
-			let that = this
-			//查询微信侧记录的用户是否有待同意的隐私政策信息
-			try {
-				wx.getPrivacySetting({
-					success(res) {
-						// console.log('隐私政策信息', res);
-						// console.log(res.privacyContractName);
-						that.privacyContractName = res.privacyContractName
-					}
-				});
-			} catch (e) {
-				// console.log("=========低版本基础库==========")
-			}
-		},
-		methods: {
-			// 监听何时需要提示用户阅读隐私政策
-			init() {
-				let that = this;
-				if (wx.onNeedPrivacyAuthorization) {
-					wx.onNeedPrivacyAuthorization((resolve) => {
-						if (typeof that.privacyAuthorization === 'function') {
-							that.privacyAuthorization(resolve)
-						}
-					})
-				}
-			},
-			proactive() {
-				let that = this
-				if (wx.getPrivacySetting) {
-					wx.getPrivacySetting({
-						success: (res) => {
-							// console.log(res)
-							if (res.needAuthorization) {
-								that.popUp()
-								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-								this.closeOtherPagePopUp(this.disPopUp)
-							} else {
-								this.$emit('agree')
-							}
-						},
-					});
-				} else {
-					this.$emit('agree')
-				}
-			},
-			//初始化监听程序
-			curPageShow() {
-				this.privacyAuthorization = resolve => {
-					this.privacyResolves.add(resolve)
-					//打开弹窗
-					this.popUp()
-					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-					this.closeOtherPagePopUp(this.disPopUp)
-				}
-				this.closeOtherPagePopUpHooks.add(this.disPopUp)
-			},
-			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-			closeOtherPagePopUp(closePopUp) {
-				this.closeOtherPagePopUpHooks.forEach(hook => {
-					if (closePopUp !== hook) {
-						hook()
-					}
-				})
-			},
-			//打开隐私协议
-			openPrivacyContract() {
-				wx.openPrivacyContract({
-					success(res) {
-						// console.log('打开隐私协议', res);
-					},
-					fail(err) {
-						// console.error('打开隐私协议失败', err)
-					}
-				});
-			},
-			// 不同意
-			handleDisagree() {
-				this.privacyResolves.forEach(resolve => {
-					resolve({
-						event: 'disagree',
-					})
-				})
-				this.privacyResolves.clear()
-				//关闭弹窗
-				this.disPopUp()
-				//退出小程序
-				uni.showModal({
-					content: '未同意隐私协议，无法使用相关功能',
-					success: () => {
-						this.$emit('disagree')
-					}
-				})
-			},
-			// 同意并继续
-			handleAgree() {
-				this.privacyResolves.forEach(resolve => {
-					resolve({
-						event: 'agree',
-						buttonId: 'agree-btn'
-					})
-				})
-				this.privacyResolves.clear()
-				//关闭弹窗
-				this.disPopUp()
-				this.$emit('agree')
-			},
-			//打开弹窗
-			popUp() {
-				if (this.showPop === false) {
-					this.showPop = true
-				}
-			},
-			//关闭弹窗
-			disPopUp() {
-				if (this.showPop === true) {
-					this.showPop = false
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.privacy-mask {
-		position: fixed;
-		z-index: 5000;
-		top: 0;
-		right: 0;
-		left: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.2);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.privacy-wrap {
-		width: 632rpx;
-		padding: 48rpx 30rpx;
-		box-sizing: border-box;
-		background: #fff;
-		border-radius: 16rpx;
-	}
-
-	.privacy-title {
-		padding: 0rpx 30rpx 40rpx 30rpx;
-		font-weight: 700;
-		font-size: 36rpx;
-		text-align: center;
-	}
-
-	.privacy-desc {
-		font-size: 30rpx;
-		color: #555;
-		line-height: 2;
-		text-align: left;
-		padding: 0 40rpx;
-	}
-
-	.privacy-link {
-		color: #2f80ed;
-	}
-
-	.privacy-button-flex {
-		display: flex;
-		padding: 20rpx 40rpx;
-	}
-
-	.privacy-button-btn {
-		color: #FFF;
-		font-size: 30rpx;
-		font-weight: 500;
-		line-height: 100rpx;
-		text-align: center;
-		height: 100rpx;
-		border-radius: 20rpx;
-		border: none;
-		background: #07c160;
-		flex: 1;
-		margin-right: 30rpx;
-		justify-content: center;
-	}
-
-	.privacy-button-btn::after {
-		border: none;
-	}
-
-	.bg-disagree {
-		color: #07c160;
-		background: #f2f2f2;
-	}
-
-	.bg-agree {
-		margin-right: 0rpx;
-	}
-</style>

docs/H5_ROUTER_FIX_README.md

@@ -0,0 +1,32 @@
+# H5路由模式修复说明
+
+## 问题描述
+生产环境下，导航到子页面（如 `/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）后刷新页面，会导致页面空白，显示 `<html><head></head><body></body></html>`。
+
+## 根本原因
+1. 应用使用了H5的`history`路由模式
+2. 生产服务器没有配置路由回退机制
+3. 刷新时，浏览器直接向服务器请求完整URL路径，服务器无法找到对应的资源，返回空HTML
+
+## 解决方案
+将H5路由模式从`history`改为`hash`模式。Hash模式下，所有路由请求都会指向应用根路径，避免服务器配置问题。
+
+## 修改内容
+修改 `manifest.json` 文件中的H5路由配置：
+
+```json
+"h5": {
+    "router": {
+        "mode": "hash",  // 从 "history" 改为 "hash"
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+## 预期效果
+- 子页面刷新后不再空白
+- URL格式变为 `http://domain/hwappx/test/#/pages_tool/form/formdata?id=73&uniacid=2793`
+- 无需修改服务器配置
+
+## 构建部署
+修改后，需要重新构建H5版本并部署到生产环境。可以通过HBuilderX或其他uni-app构建工具进行构建。

docs/HISTORY_MODE_SUB_DIR_DEPLOY.md

@@ -0,0 +1,756 @@
+# H5 History模式子目录部署配置指南
+
+## 场景说明
+您的uni-app H5应用部署在现有网站的子目录 `/hwappx/test/` 下，需要使用`history`路由模式，并解决刷新页面空白的问题。
+
+## 配置步骤
+
+### 1. 应用配置（已完成）
+确保`manifest.json`中的H5路由配置正确设置了`base`路径：
+
+```json
+"h5": {
+    "router": {
+        "mode": "history",
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+### 2. 服务器配置
+服务器需要配置路由回退，将所有指向`/hwappx/test/`下不存在文件的请求重定向到`/hwappx/test/index.html`。
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    # 主网站根目录
+    root /path/to/main/website;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # H5应用子目录的路由回退配置
+    location /hwappx/test/ {
+        # 确保静态文件能被正确访问
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+    
+    # 主网站的其他配置
+    location / {
+        # 主网站的原有配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### .htaccess文件配置（放在`/hwappx/test/`目录下）
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+##### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+    
+    # H5应用子目录配置
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+    
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+在`/hwappx/test/`目录下创建`web.config`文件：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode Sub Directory">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// H5应用静态文件和路由回退
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app')));
+
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+## 配置关键点
+
+1. **base路径一致性**：
+   - `manifest.json`中的`base`配置必须与部署路径一致：`/hwappx/test/`
+   - 服务器配置中的重定向路径必须包含完整的base路径
+
+2. **静态资源处理**：
+   - 确保CSS、JS、图片等静态资源能够被正确访问
+   - 静态资源的URL应该自动包含base路径
+
+3. **路由回退规则**：
+   - 规则必须限定在`/hwappx/test/`路径下
+   - 只重定向不存在的文件和目录请求
+
+## 验证方法
+
+1. 构建H5应用并部署到服务器的`/hwappx/test/`目录
+2. 访问应用首页：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+
+## 常见问题排查
+
+1. **404错误**：
+   - 检查服务器配置中的重定向路径是否正确
+   - 确保`base`路径配置一致
+
+2. **页面样式缺失**：
+   - 检查静态资源URL是否包含了正确的base路径
+   - 确认CSS文件路径是否正确
+
+3. **路由无法跳转**：
+   - 检查`manifest.json`中的路由配置
+   - 确认服务器重定向规则是否生效
+
+## 部署注意事项
+
+1. 配置完成后需要重启服务器
+2. 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的规则
+3. 如果使用CDN，需要确保CDN也配置了相应的路由回退规则
+4. 定期检查服务器日志，确保配置正常工作
+
+## 总结
+通过正确配置应用的`base`路径和服务器的路由回退规则，您的uni-app H5应用可以在子目录`/hwappx/test/`下成功使用`history`路由模式，并且解决刷新页面空白的问题。
+
+---
+
+## 多子目录部署支持
+
+### 场景说明
+如果您需要在同一服务器上部署多个使用`history`模式的uni-app H5应用，例如：
+- `/hwapp/`
+- `/hwappx/test/`
+- `/hwappx/comoon/`
+- `/hwappx/1000/`
+
+您可以按照以下配置方法实现多子目录部署。
+
+### 1. 每个应用的manifest.json配置
+每个应用都需要在`manifest.json`中配置正确的`base`路径：
+
+#### 应用1：部署到 `/hwapp/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwapp/"
+  }
+}
+```
+
+#### 应用2：部署到 `/hwappx/test/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/test/"
+  }
+}
+```
+
+#### 应用3：部署到 `/hwappx/comoon/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/comoon/"
+  }
+}
+```
+
+#### 应用4：部署到 `/hwappx/1000/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/1000/"
+  }
+}
+```
+
+### 2. 服务器多子目录配置
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 应用1: /hwapp/
+    location /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 应用2: /hwappx/test/
+    location /hwappx/test/ {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+
+    # 应用3: /hwappx/comoon/
+    location /hwappx/comoon/ {
+        try_files $uri $uri/ /hwappx/comoon/index.html;
+    }
+
+    # 应用4: /hwappx/1000/
+    location /hwappx/1000/ {
+        try_files $uri $uri/ /hwappx/1000/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### 方法1：在每个子目录下创建.htaccess文件
+
+在`/hwapp/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwapp/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwapp/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/test/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/comoon/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/comoon/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/comoon/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/1000/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/1000/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/1000/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在主配置文件中统一配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    # 应用1: /hwapp/
+    <Directory /path/to/main/website/hwapp>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwapp/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwapp/index.html [L]
+    </Directory>
+
+    # 应用2: /hwappx/test/
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+
+    # 应用3: /hwappx/comoon/
+    <Directory /path/to/main/website/hwappx/comoon>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/comoon/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/comoon/index.html [L]
+    </Directory>
+
+    # 应用4: /hwappx/1000/
+    <Directory /path/to/main/website/hwappx/1000>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/1000/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/1000/index.html [L]
+    </Directory>
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+
+在每个子目录下创建`web.config`文件：
+
+##### 应用1：/hwapp/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwapp">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用2：/hwappx/test/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/test">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用3：/hwappx/comoon/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/comoon">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/comoon/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用4：/hwappx/1000/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/1000">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/1000/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 应用1: /hwapp/
+app.use('/hwapp', express.static(path.join(__dirname, 'h5-app1')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app1', 'index.html'));
+});
+
+// 应用2: /hwappx/test/
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app2')));
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app2', 'index.html'));
+});
+
+// 应用3: /hwappx/comoon/
+app.use('/hwappx/comoon', express.static(path.join(__dirname, 'h5-app3')));
+app.get('/hwappx/comoon/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app3', 'index.html'));
+});
+
+// 应用4: /hwappx/1000/
+app.use('/hwappx/1000', express.static(path.join(__dirname, 'h5-app4')));
+app.get('/hwappx/1000/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app4', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 3. 多子目录部署验证
+
+对于每个应用，执行以下验证步骤：
+
+1. 构建应用并部署到对应的子目录
+2. 访问应用首页，例如：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面，例如：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+5. 直接访问子页面URL，验证是否能正常加载
+
+### 4. 多子目录部署注意事项
+
+1. **路径隔离**：每个应用必须部署在独立的子目录下，避免文件和路由冲突
+2. **base一致性**：每个应用的`manifest.json`中的`base`配置必须与部署路径完全一致
+3. **服务器规则**：每个子目录都需要独立的路由回退规则
+4. **静态资源**：确保每个应用的静态资源URL包含了正确的base路径
+5. **缓存设置**：可以为不同应用设置不同的缓存策略
+6. **日志分离**：建议为不同应用配置独立的访问日志，便于问题排查
+
+### 5. 常见问题排查
+
+1. **应用间冲突**：
+   - 确保每个应用使用独立的子目录
+   - 检查`base`路径配置是否唯一
+
+2. **路由混乱**：
+   - 验证服务器配置中的重定向路径是否正确
+   - 检查应用的路由配置是否与其他应用冲突
+
+3. **静态资源404**：
+   - 确认静态资源URL是否包含了正确的base路径
+   - 检查服务器配置是否正确处理了静态资源请求
+
+4. **配置不生效**：
+   - 配置完成后重启服务器
+   - 清除浏览器缓存后重试
+
+通过以上配置，您可以在同一服务器上成功部署多个使用`history`模式的uni-app H5应用，每个应用都能独立运行并支持刷新操作。
+
+---
+
+## 通配符配置方案
+
+### 场景说明
+如果您的子目录有明确的命名规则（如您的`/hwapp/`、`/hwappx/test/`、`/hwappx/comoon/`、`/hwappx/1000/`等），可以使用通配符配置来简化服务器设置，避免为每个子目录手动添加配置。
+
+### 子目录规则分析
+根据您的子目录结构，可以分为两类：
+1. 一级子目录：`/hwapp/`
+2. `/hwappx/`下的所有二级子目录：`/hwappx/*/`
+
+### 服务器通配符配置
+
+#### 1. Nginx配置
+使用正则表达式location来匹配子目录模式：
+
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 匹配 /hwapp/ 一级子目录
+    location = /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    location ~ ^/hwapp/(.*)$ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 匹配 /hwappx/ 下的所有二级子目录，如 /hwappx/test/、/hwappx/comoon/、/hwappx/1000/ 等
+    location ~ ^/hwappx/([^/]+)/(.*)$ {
+        # 提取子目录名，重定向到对应目录的index.html
+        try_files $uri $uri/ /hwappx/$1/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2. Apache配置
+
+##### 方法1：使用RewriteRule的正则表达式
+
+在主网站根目录的`.htaccess`文件中添加：
+
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  
+  # 匹配 /hwapp/ 一级子目录
+  RewriteRule ^hwapp/(.*)$ /hwapp/index.html [L]
+  
+  # 匹配 /hwappx/ 下的所有二级子目录
+  RewriteRule ^hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在虚拟主机配置中使用
+
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    RewriteEngine On
+    
+    # 匹配 /hwapp/ 一级子目录
+    RewriteRule ^/hwapp/(.*)$ /hwapp/index.html [L]
+    
+    # 匹配 /hwappx/ 下的所有二级子目录
+    RewriteRule ^/hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 3. IIS配置
+
+在主网站根目录的`web.config`文件中添加：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <!-- 匹配 /hwapp/ 一级子目录 -->
+        <rule name="History Mode hwapp Wildcard" stopProcessing="true">
+          <match url="^hwapp/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+        
+        <!-- 匹配 /hwappx/ 下的所有二级子目录 -->
+        <rule name="History Mode hwappx Wildcard" stopProcessing="true">
+          <match url="^hwappx/([^/]+)/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/{R:1}/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 4. Express.js配置
+
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 匹配 /hwapp/ 一级子目录
+app.use('/hwapp', express.static(path.join(__dirname, 'hwapp')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'hwapp', 'index.html'));
+});
+
+// 匹配 /hwappx/ 下的所有二级子目录
+// 使用路由参数来捕获子目录名
+app.get('/hwappx/:subdir/*', (req, res) => {
+    const subdir = req.params.subdir;
+    const appPath = path.join(__dirname, `hwappx/${subdir}`);
+    
+    // 检查应用目录是否存在
+    const fs = require('fs');
+    if (fs.existsSync(appPath)) {
+        res.sendFile(path.join(appPath, 'index.html'));
+    } else {
+        res.status(404).send('Application not found');
+    }
+});
+
+// 为 /hwappx/ 下的每个子目录提供静态文件服务
+app.use('/hwappx', express.static(path.join(__dirname, 'hwappx')));
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 通配符配置优势
+
+1. **减少配置量**：无需为每个新子目录手动添加配置
+2. **自动适应**：新添加的符合规则的子目录会自动应用路由回退
+3. **统一管理**：所有同类应用的配置集中管理，便于维护
+4. **规则灵活**：可以根据实际需要调整正则表达式匹配规则
+
+### 通配符配置注意事项
+
+1. **规则顺序**：确保更具体的规则优先于通配符规则
+2. **性能考虑**：过于复杂的正则表达式可能影响服务器性能
+3. **目录验证**：在Express.js等代码级配置中，建议添加目录存在性检查
+4. **冲突避免**：确保通配符规则不会与主网站或其他应用的路由冲突
+5. **测试充分**：配置后要充分测试各种子目录的访问情况
+
+### 验证方法
+
+1. 部署一个符合规则的新子目录应用，如 `/hwappx/newapp/`
+2. 访问应用首页：`http://yourdomain.com/hwappx/newapp/`
+3. 导航到子页面并刷新，验证是否正常显示
+4. 直接访问子页面URL，验证是否能正常加载
+
+通过以上通配符配置，您可以轻松管理大量符合规则的子目录应用，避免重复配置工作。

docs/SERVER_ROUTER_FALLBACK_CONFIG.md

@@ -0,0 +1,140 @@
+# H5 History模式服务器路由回退配置指南
+
+## 配置原理
+当使用H5的`history`路由模式时，所有直接访问的URL（如刷新页面）都会发送到服务器。服务器需要配置路由回退，将所有匹配不到实际文件的请求重定向到应用的`index.html`，让客户端路由处理URL。
+
+## 服务器配置示例
+
+### 1. Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    root /path/to/your/h5/dist;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # 所有其他请求重定向到index.html
+    location / {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+}
+```
+
+### 2. Apache配置
+需要确保启用了`mod_rewrite`模块
+
+#### .htaccess文件配置
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+#### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/your/h5/dist
+    
+    <Directory /path/to/your/h5/dist>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+</VirtualHost>
+```
+
+### 3. Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 静态文件服务
+app.use('/hwappx/test/', express.static(path.join(__dirname, 'dist')));
+
+// 路由回退
+app.get('*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'dist', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 4. IIS配置
+需要安装URL重写模块（URL Rewrite Module）
+
+#### web.config文件配置
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Handle History Mode and custom 404/500" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+      <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+## 配置要点
+
+1. **base路径设置**：确保服务器配置中的路径与`manifest.json`中的`base`配置一致
+   ```json
+   "h5": {
+       "router": {
+           "mode": "history",
+           "base": "/hwappx/test/"
+       }
+   }
+   ```
+
+2. **静态资源处理**：确保图片、CSS、JS等静态文件能够被正确访问
+
+3. **缓存策略**：为静态文件设置合理的缓存过期时间
+
+## 验证配置
+
+1. 部署配置后的应用到服务器
+2. 访问应用首页
+3. 导航到子页面（如`/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）
+4. 刷新页面，验证页面是否正常显示
+
+## 注意事项
+
+- 配置完成后需要重启服务器生效
+- 确保服务器有权限读取配置文件
+- 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的路由回退规则
+- 如果使用CDN，需要确保CDN也配置了相应的路由回退规则

docs/WECHAT_CHANNEL_INTEGRATION.md

@@ -0,0 +1,568 @@
+# 微信视频号集成指南
+
+## 1. 概述
+
+本文档提供了在UniApp项目中集成微信视频号的详细指导，包括组件实现、配置修改和使用方法。
+
+## 2. 准备工作
+
+### 2.1 微信小程序配置
+
+在 `manifest.json` 文件中，需要确保微信小程序配置正确：
+
+```json
+"mp-weixin": {
+    "appid": "你的小程序appid",
+    "setting": {
+        "urlCheck": false,
+        "postcss": false,
+        "es6": true,
+        "minified": true
+    },
+    "usingComponents": true,
+    "permission": {
+        "scope.userLocation": {
+            "desc": "为了更好地为您提供服务"
+        }
+    },
+    "requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"],
+    "__usePrivacyCheck__": true,
+    "optimization": {
+        "subPackages": true
+    }
+}
+```
+
+### 2.2 微信视频号API权限与关联
+
+#### 2.2.1 权限说明
+
+`wx.openChannelsActivity` API 是小程序的基础能力，不需要单独开通权限，但需要满足以下条件：
+
+- **跳转打开视频号视频**：无主体限制，基础库版本 2.19.2 及以上
+- **内嵌视频号视频**：
+  - 从基础库版本 2.25.1 至 2.31.1，小程序需与视频号视频相同主体或关联主体
+  - 从基础库版本 2.31.1 开始，非个人主体小程序可内嵌非同主体/关联主体视频号视频
+
+#### 2.2.2 小程序与视频号关联（可选）
+
+虽然跳转打开视频号视频无主体限制，但如果需要内嵌非同主体视频号视频（基础库 2.31.1 以下），则需要关联小程序与视频号：
+
+1. **小程序管理员操作**
+   - 登录微信小程序后台
+   - 左侧菜单：设置 → 基本设置
+   - 向下滚动找到「关联设置」部分
+   - 点击「关联视频号」按钮
+   - 输入视频号名称或视频号ID
+   - 点击「搜索」找到对应的视频号
+   - 点击「发送关联邀请」
+
+2. **视频号管理员操作**
+   - 视频号管理员需要在24小时内确认关联邀请
+   - 视频号管理员登录 [视频号助手](https://channels.weixin.qq.com/)
+   - 进入「设置」→「关联设置」→「小程序关联」
+   - 找到待确认的关联邀请
+   - 点击「同意」完成关联
+
+3. **关联失败处理**
+   - 检查视频号是否已完成实名认证
+   - 检查小程序是否已发布上线
+   - 检查视频号名称或ID是否输入正确
+   - 如超过24小时未确认，需要重新发送关联邀请
+
+#### 2.2.3 关联条件
+
+- **小程序要求**：必须已经发布上线，未被处罚或限制
+- **视频号要求**：必须已经完成实名认证，状态正常
+- **数量限制**：同一个小程序最多可以关联50个视频号，同一个视频号最多可以关联50个小程序
+- **权限要求**：关联操作需要小程序管理员和视频号管理员共同确认
+- **主体要求**：小程序和视频号的主体可以不同，但需要双方管理员确认
+
+#### 2.2.4 功能验证
+
+可以通过以下方式验证视频号功能是否可用：
+
+1. **在微信开发者工具中验证**
+   - 在微信开发者工具中打开小程序
+   - 在控制台执行以下代码：
+     ```javascript
+     console.log('是否支持视频号API:', typeof wx !== 'undefined' && typeof wx.openChannelsActivity === 'function');
+     ```
+   - 如果返回 `true`，则表示API可用
+
+2. **在真机环境中验证**
+   - 使用微信扫码打开小程序
+   - 触发视频号相关功能
+   - 检查是否能正常打开视频号内容
+
+3. **功能验证失败处理**
+   - 检查微信小程序基础库版本是否满足要求（跳转打开需要 2.19.2+，内嵌打开需要 2.25.1+）
+   - 对于内嵌打开，检查主体是否满足要求或是否已关联
+   - 检查 `feedId` 等参数是否正确
+
+## 3. 组件使用
+
+### 3.1 视频号视频卡片组件 (diy-channel-video.vue)
+
+#### 基本用法
+
+```vue
+<diy-channel-video :value="videoData" @video-play="handlerVideoPlay" />
+```
+
+#### 属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| value | Object | 必填 | 视频数据对象 |
+| listMode | Boolean | false | 是否为列表模式 |
+| videoHeight | Number | 220 | 视频高度（仅适用于嵌入式播放） |
+| titleLineClamp | Number | 1 | 标题显示行数 |
+| showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| coverStyle | Object | {} | 视频封面图样式 |
+| playBtnStyle | Object | {} | 播放按钮样式 |
+| autoPlay | Boolean | false | 是否自动播放（仅适用于嵌入式播放） |
+
+#### value对象属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| feedId | String | "" | 视频 feedId |
+| finderUserName | String | "" | 视频号用户名 |
+| feedToken | String | "" | 视频 token |
+| coverUrl | String | "" | 视频封面图 |
+| videoTitle | String | "" | 视频标题 |
+| viewCount | Number | 0 | 观看次数 |
+| showViewCount | Boolean | false | 是否显示观看次数 |
+| embedMode | Boolean | false | 是否启用嵌入式播放 |
+
+#### 事件说明
+
+| 事件名 | 说明 | 参数 |
+|--------|------|------|
+| video-play | 点击视频播放时触发 | 视频数据对象 |
+
+### 3.2 视频号列表组件 (diy-channel-list.vue)
+
+#### 基本用法
+
+```vue
+<diy-channel-list :value="channelListData" />
+```
+
+#### 属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| value | Object | 必填 | 组件配置数据 |
+| value.list | Array | [] | 视频号列表数据 |
+| value.rowCount | Number | 2 | 每行显示的视频号数量 |
+| value.showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
+| value.mode | String | "" | 显示模式 |
+| value.font | Object | {} | 字体样式配置 |
+| value.componentBgColor | String | "#fff" | 组件背景颜色 |
+| value.componentAngle | String | "" | 组件圆角类型，可选值：round |
+| value.topAroundRadius | Number | 0 | 顶部圆角半径 |
+| value.bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| value.ornament | Object | {} | 装饰样式配置 |
+| value.titleLineClamp | Number | 1 | 标题显示行数 |
+| value.showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| value.aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| value.coverStyle | Object | {} | 视频封面图样式 |
+| value.playBtnStyle | Object | {} | 播放按钮样式 |
+| value.imageSize | Number | 0 | 图片尺寸（仅在特定模式下使用） |
+| value.pageCount | Number | 1 | 每页显示的视频数量 |
+| value.carousel | Object | {} | 轮播配置 |
+| value.carousel.type | String | "" | 轮播类型，可选值：default, hide |
+| value.carousel.autoplay | Boolean | false | 是否自动播放 |
+| value.carousel.interval | Number | 3000 | 自动播放间隔，单位毫秒 |
+| value.carousel.duration | Number | 500 | 切换动画时长，单位毫秒 |
+| value.carousel.circular | Boolean | false | 是否循环播放 |
+
+#### list数组项说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| channelName | String | "" | 视频号名称 |
+| coverUrl | String | "" | 视频封面URL |
+| videoTitle | String | "" | 视频标题 |
+| feedId | String | "" | 视频号内容ID，用于播放视频 |
+| viewCount | Number | 0 | 视频观看次数 |
+| embedMode | Boolean | false | 是否启用嵌入式播放 |
+| showViewCount | Boolean | false | 是否显示观看次数 |
+| finderUserName | String | "" | 视频号ID，用于嵌入式播放 |
+| feedToken | String | "" | 视频token，用于嵌入式播放 |
+
+## 4. 视频播放实现
+
+小程序提供两种打开视频号视频的方式：跳转打开和内嵌打开。
+
+### 4.1 跳转打开视频号视频
+
+组件内部使用微信小程序的 `wx.openChannelsActivity` API 来打开视频号内容：
+
+```javascript
+if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
+    wx.openChannelsActivity({
+        feedId: item.feedId, // 视频号内容ID，必填
+        finderUserName: item.finderUserName, // 视频号ID（可选）
+        success: (res) => {
+            console.log('打开视频号成功', res);
+        },
+        fail: (err) => {
+            console.error('打开视频号失败', err);
+            // 常见错误处理
+            if (err.errCode === 40001) {
+                console.error('未授权，请检查小程序是否与视频号关联');
+            } else if (err.errCode === 40002) {
+                console.error('参数错误，请检查feedId是否正确');
+            } else if (err.errCode === 40003) {
+                console.error('视频号内容不存在或已被删除');
+            }
+        }
+    });
+} else {
+    console.error('当前环境不支持微信视频号');
+}
+```
+
+### 4.2 内嵌视频号视频
+
+从基础库 2.25.1 开始支持，小程序可以通过 `channel-video` 组件在小程序中内嵌视频号视频，且支持无弹窗跳转打开视频号对应视频，使用该组件时需注意：
+
+- 组件调用无资质要求
+- 暂不支持纯图片视频号内容
+- 在 UniApp 中使用时，需要用 `<native-component>` 包裹以确保组件正确显示
+
+```vue
+<!-- #ifdef MP-WEIXIN -->
+<native-component>
+  <channel-video
+    feed-id="{{feedId}}"
+    finder-user-name="{{finderUserName}}"
+    feed-token="{{feedToken}}"
+    bindenterfullscreen="enterFullscreen"
+    bindexitfullscreen="exitFullscreen"
+    binderror="videoError"
+  ></channel-video>
+</native-component>
+<!-- #endif -->
+```
+
+### 4.3 API参数说明
+
+- **feedId**：视频号内容ID，必填，必须是有效的视频号内容ID
+- **finderUserName**：视频号ID，可选
+- **feedToken**：非同主体视频号视频的标识，从基础库 2.31.1 开始支持，非个人主体小程序可使用
+- **success**：调用成功的回调函数
+- **fail**：调用失败的回调函数
+- **complete**：调用完成的回调函数（无论成功或失败）
+
+### 4.4 错误码说明
+
+| 错误码 | 说明 | 解决方案 |
+|--------|------|----------|
+| 40001 | 未授权 | 对于内嵌打开，检查主体是否满足要求或是否已关联 |
+| 40002 | 参数错误 | 检查feedId是否正确，确保是有效的视频号内容ID |
+| 40003 | 视频号内容不存在或已被删除 | 确认feedId对应的视频号内容是否仍然存在 |
+| 40004 | 系统错误 | 稍后重试，或联系微信公众平台客服 |
+
+### 4.5 获取参数方法
+
+1. **获取finderUserName（视频号ID）**
+   - 登录视频号助手
+   - 在首页可以查看自己的视频号ID
+
+2. **获取feedId（视频号内容ID）**
+   - 登录视频号助手
+   - 在「动态管理」模块可以复制自己发表的每个视频对应的feedId
+
+3. **获取feed-token（非同主体视频号视频标识）**
+   - 登录MP平台，在「设置-基本设置-隐私与安全」找到「获取视频号视频ID权限」，并将开关打开
+   - 移动端找到想要内嵌的视频号视频，并复制该视频的feed-token
+   - 注意：打开开关后24小时内生效，失效后需要再次打开开关；开关打开状态仅对当前操作者生效
+
+### 4.6 主体判断逻辑
+
+#### 主体信息查询
+小程序主体信息可通过小程序资料页-开发团队进行查询，视频号主体信息可通过视频号首页-认证进行查询。
+
+#### 主体判断逻辑
+- **跳转打开视频号视频**：无主体限制，基础库版本 2.19.2 及以上
+- **内嵌视频号视频**：
+  - 从基础库版本 2.25.1 至 2.31.1，小程序需与视频号视频相同主体或关联主体
+  - 从基础库版本 2.31.1 开始，非个人主体小程序可内嵌非同主体/关联主体视频号视频
+
+关联主体申请流程可以参考：https://kf.qq.com/faq/190726e6JFja190726qMJBn6.html
+
+
+
+## 5. 注意事项
+
+### 5.1 环境限制
+
+- 微信视频号API只能在微信小程序环境中使用，其他环境（如H5、App）不支持
+- 跳转打开视频号视频需要微信小程序基础库版本 2.19.2 及以上
+- 内嵌视频号视频需要微信小程序基础库版本 2.25.1 及以上
+- 小程序与视频号关联仅在需要内嵌非同主体视频号视频（基础库 2.31.1 以下）时需要
+- 必须确保在 `manifest.json` 中设置 `usingComponents: true` 以启用组件支持
+
+### 5.2 数据格式
+
+确保传递给组件的数据格式正确，特别是 `feedId` 必须是有效的视频号内容ID
+
+### 5.3 图片资源
+
+- 视频号头像和封面图片建议使用CDN地址，确保加载速度
+- 图片尺寸建议：
+  - 头像：200x200px
+  - 封面：640x360px
+
+### 5.4 播放按钮图标
+
+- 组件支持两种播放按钮图标方式：
+  1. **图片图标**：通过 `playIcon` 属性设置，优先级较高
+  2. **纯 CSS 图标**：当 `playIcon` 不可用时，组件会自动使用纯 CSS 生成的播放图标，确保播放按钮始终可见
+
+- 纯 CSS 图标特点：
+  - 不依赖外部图片资源，加载更快
+  - 支持响应式调整大小
+  - 具有与图片图标相同的悬停效果
+  - 在所有环境中都能正常显示
+
+### 5.5 权限和关联
+
+- 确保在微信小程序后台开通了「打开视频号内容」权限
+- 确保小程序已与视频号成功关联
+- 关联操作需要小程序管理员和视频号管理员共同确认
+
+## 6. 常见问题
+
+### 6.1 视频无法播放
+
+- 检查 `feedId` 是否正确，确保是有效的视频号内容ID
+- 检查微信小程序基础库版本是否满足要求（跳转打开需要 2.19.2+，内嵌打开需要 2.25.1+）
+- 对于内嵌打开，检查主体是否满足要求（基础库 2.31.1 以下需要相同主体或关联主体）
+- 检查视频号内容是否仍然存在（未被删除）
+
+### 6.2 功能不可用
+
+- 确认当前环境是否为微信小程序环境
+- 检查微信小程序基础库版本是否满足要求
+- 对于内嵌打开，检查主体条件是否满足
+- 检查 `feedId` 等参数是否正确
+
+### 6.3 关联失败
+
+- 检查视频号是否已完成实名认证
+- 检查小程序是否已发布上线
+- 检查视频号名称或ID是否输入正确
+- 确认视频号管理员是否在24小时内确认关联邀请
+- 如超过24小时未确认，需要重新发送关联邀请
+
+### 6.4 组件显示异常
+
+- 检查传递给组件的数据格式是否正确
+- 确认图片资源是否可访问
+- 检查微信小程序基础库版本是否支持视频号API
+
+### 6.5 样式问题
+
+- 可通过组件的 `componentAngle`、`topAroundRadius`、`bottomAroundRadius` 等属性调整组件样式
+- 可通过 `componentBgColor` 属性调整组件背景颜色
+- 可通过 `font` 属性调整字体样式
+- 可通过 `aspectRatio` 属性调整视频比例，支持 '16:9' 和 '3:4' 两种比例
+
+### 6.6 环境兼容性问题
+
+- 微信视频号API只能在微信小程序环境中使用
+- 在其他环境中，组件会显示但无法播放视频
+- 建议在非小程序环境中添加友好的提示信息
+
+### 6.7 在uni-app中使用原生组件时，可能会遇到组件不显示的问题
+
+在uni-app中使用原生组件时，可能会遇到组件不显示的问题。以下是已验证的解决方案：
+
+#### 解决方案
+
+**方法一：使用 `<native-component>` 包裹**
+
+在 UniApp 中使用 `channel-video` 组件时，必须用 `<native-component>` 包裹以确保组件正确显示：
+
+``` vue
+<template>
+  <view>
+    <!-- #ifdef MP-WEIXIN -->
+    <native-component>
+      <channel-video 
+        feed-id="{{feedId}}" 
+        finder-user-name="{{finderUserName}}" 
+        feed-token="{{feedToken}}"
+        style="width: 100%; height: 320rpx;"
+      ></channel-video>
+    </native-component>
+    <!-- #endif -->
+  </view>
+</template>
+```
+
+**方法二：检查 `manifest.json` 配置**
+
+确保在 `manifest.json` 文件中正确设置了 `usingComponents: true`，特别是在 `mp-weixin` 部分：
+
+``` json
+"mp-weixin": {
+  "appid": "你的小程序appid",
+  "usingComponents": true,
+  // 其他配置...
+}
+```
+
+**方法三：检查微信小程序基础库版本**
+
+确保微信小程序基础库版本满足要求：
+- 跳转打开视频号视频需要基础库版本 2.19.2 及以上
+- 内嵌视频号视频需要基础库版本 2.25.1 及以上
+
+**方法四：检查参数是否正确**
+
+确保传递给 `channel-video` 组件的参数正确：
+- `feedId`：视频号内容ID，必填
+- `finderUserName`：视频号ID，可选
+- `feedToken`：非同主体视频号视频的标识，可选（基础库 2.31.1+）
+
+## 7. 示例代码
+
+### 7.1 视频号视频卡片组件示例
+
+```javascript
+// 视频卡片数据
+const videoData = {
+    channelName: "示例视频号",
+    coverUrl: "https://example.com/cover.jpg",
+    videoTitle: "这是一个示例视频，标题可能会很长，需要测试多行显示效果",
+    feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+    viewCount: 12345,
+    embedMode: false,
+    showViewCount: true,
+    finderUserName: "example_finder",
+    feedToken: "example_feed_token"
+};
+
+// 视频播放事件处理
+function handlerVideoPlay(data) {
+    console.log("视频播放", data);
+    // 可以在这里处理视频播放逻辑
+}
+```
+
+### 7.2 单个视频号示例
+
+```javascript
+// 单个视频号数据
+const channelData = {
+    channelName: "示例视频号",
+    avatarUrl: "https://example.com/avatar.jpg",
+    videoTitle: "这是一个示例视频，标题可能会很长，需要测试多行显示效果",
+    coverUrl: "https://example.com/cover.jpg",
+    feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+    viewCount: 12345,
+    showFollow: true,
+    componentAngle: "round",
+    topAroundRadius: 10,
+    bottomAroundRadius: 10,
+    embedMode: false,
+    showViewCount: true,
+    finderUserName: "example_finder",
+    feedToken: "example_feed_token",
+    titleLineClamp: 2,
+    showPlayBtn: true,
+    aspectRatio: "16:9",
+    coverStyle: {
+        width: "100%",
+        height: "0",
+        paddingTop: "56.25%" // 16:9 比例
+    },
+    playBtnStyle: {
+        width: "60rpx",
+        height: "60rpx",
+        borderRadius: "30rpx",
+        backgroundColor: "rgba(0, 0, 0, 0.6)"
+    }
+};
+```
+
+### 7.3 视频号列表示例
+
+```javascript
+// 视频号列表数据
+const channelListData = {
+    list: [
+        {
+            channelName: "示例视频号1",
+            coverUrl: "https://example.com/cover1.jpg",
+            videoTitle: "这是示例视频1，标题可能会很长，需要测试多行显示效果",
+            feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+            viewCount: 12345,
+            embedMode: false,
+            showViewCount: true,
+            finderUserName: "example_finder1",
+            feedToken: "example_feed_token1"
+        },
+        {
+            channelName: "示例视频号2",
+            coverUrl: "https://example.com/cover2.jpg",
+            videoTitle: "这是示例视频2，标题可能会很长，需要测试多行显示效果",
+            feedId: "v02004g10000c3f7m7j5u87l33n8f161",
+            viewCount: 67890,
+            embedMode: false,
+            showViewCount: true,
+            finderUserName: "example_finder2",
+            feedToken: "example_feed_token2"
+        }
+    ],
+    rowCount: 2,
+    showStyle: "fixed",
+    mode: "",
+    font: {
+        size: 14,
+        weight: "normal",
+        color: "#333"
+    },
+    componentBgColor: "#fff",
+    componentAngle: "round",
+    topAroundRadius: 10,
+    bottomAroundRadius: 10,
+    ornament: {},
+    titleLineClamp: 2,
+    showPlayBtn: true,
+    aspectRatio: "16:9",
+    coverStyle: {
+        width: "100%",
+        height: "0",
+        paddingTop: "56.25%" // 16:9 比例
+    },
+    playBtnStyle: {
+        width: "60rpx",
+        height: "60rpx",
+        borderRadius: "30rpx",
+        backgroundColor: "rgba(0, 0, 0, 0.6)"
+    },
+    imageSize: 150,
+    pageCount: 1,
+    carousel: {
+        type: "default",
+        autoplay: true,
+        interval: 3000,
+        duration: 500,
+        circular: true
+    }
+};
+```
+
+## 8. 总结
+
+通过本文档提供的组件和配置指导，你可以在UniApp项目中轻松集成微信视频号功能，为用户提供更加丰富的内容体验。
+
+如果在集成过程中遇到问题，请参考本文档的常见问题部分，或查阅微信官方文档获取更多帮助。

docs/WECHAT_MINIPROGRAM_PERMISSIONS.md

@@ -0,0 +1,199 @@
+# 微信小程序权限配置文档
+
+## 1. 权限体系概述
+
+微信小程序权限体系是微信为保护用户隐私和数据安全而设计的一套权限管理机制。小程序在使用某些功能时，需要向用户申请相应的权限，用户可以选择授权或拒绝。
+
+## 2. 权限分类
+
+微信小程序权限分为两大类：
+
+### 2.1 需要单独申请的权限
+
+这类权限需要通过 `wx.requestAuthorization` 或相关 API 向用户主动申请，用户会看到授权弹窗，必须明确同意后才能使用。
+
+### 2.2 不需要单独申请的权限
+
+这类权限不需要通过 API 主动申请，小程序在使用相关功能时会自动触发系统授权提示，或在某些场景下默认授权。
+
+## 3. 详细权限列表
+
+### 3.1 需要单独申请的权限
+
+| 权限名称 | 权限标识 | 描述 | 使用场景 |
+|---------|---------|------|----------|
+| 地理位置 | `scope.userLocation` | 获取用户地理位置 | 地图定位、附近商家等 |
+| 后台定位 | `scope.userLocationBackground` | 后台持续获取地理位置 | 外卖配送、打车等需要后台定位的场景 |
+| 录音 | `scope.record` | 录制音频 | 语音消息、语音识别等 |
+| 摄像头 | `scope.camera` | 使用摄像头 | 扫码、拍照、视频通话等 |
+| 通讯地址 | `scope.address` | 获取用户通讯地址 | 填写收货地址等 |
+| 发票抬头 | `scope.invoiceTitle` | 获取用户发票抬头 | 填写发票信息等 |
+| 微信运动步数 | `scope.werun` | 获取微信运动步数 | 步数统计、运动排名等 |
+| 保存到相册 | `scope.writePhotosAlbum` | 保存图片到相册 | 保存分享图片、截图等 |
+| 添加到日历 | `scope.addPhoneCalendar` | 添加事件到日历 | 预约提醒、活动安排等 |
+| 读取日历 | `scope.readPhoneCalendar` | 读取日历事件 | 日程管理、智能提醒等 |
+
+### 3.2 不需要单独申请的权限
+
+| 权限名称 | 权限标识 | 描述 | 使用场景 |
+|---------|---------|------|----------|
+| 剪贴板 | `scope.userClipboard` | 读写剪贴板 | 复制链接、粘贴内容等 |
+| 选择地址 | `scope.chooseAddress` | 选择收货地址 | 下单时选择地址 |
+| 选择发票 | `scope.chooseInvoice` | 选择发票 | 填写发票信息时选择 |
+| 选择发票抬头 | `scope.chooseInvoiceTitle` | 选择发票抬头 | 填写发票信息时选择 |
+| 获取网络状态 | - | 获取网络状态 | 网络请求、状态检测等 |
+| 获取设备信息 | - | 获取设备型号、操作系统等 | 适配不同设备、统计分析等 |
+| 获取窗口信息 | - | 获取窗口尺寸等 | 布局适配、响应式设计等 |
+
+## 4. 权限申请流程
+
+### 4.1 需要单独申请的权限
+
+1. 在 `manifest.json` 中配置权限描述
+2. 在代码中调用相关 API 前，先检查是否已授权
+3. 未授权时，调用 `wx.requestAuthorization` 申请权限
+4. 根据用户授权结果执行相应操作
+
+### 4.2 不需要单独申请的权限
+
+1. 在 `manifest.json` 中配置权限描述
+2. 直接调用相关 API，系统会自动处理授权逻辑
+
+## 5. 权限配置示例
+
+### 5.1 manifest.json 配置示例
+
+```json
+"mp-weixin": {
+  "appid": "wx29215aa1bd97bbd6",
+  "permission": {
+    "scope.userLocation": {
+      "desc": "为了更好地为您提供服务"
+    },
+    "scope.writePhotosAlbum": {
+      "desc": "为了更好地为您提供服务"
+    },
+    "scope.userClipboard": {
+      "desc": "为了方便您复制信息"
+    },
+    "scope.record": {
+      "desc": "用于语音录制功能"
+    },
+    "scope.camera": {
+      "desc": "用于拍摄照片或视频"
+    },
+    "scope.address": {
+      "desc": "用于获取您的通讯地址"
+    },
+    "scope.chooseAddress": {
+      "desc": "用于选择收货地址"
+    },
+    "scope.chooseInvoice": {
+      "desc": "用于选择发票"
+    },
+    "scope.chooseInvoiceTitle": {
+      "desc": "用于选择发票抬头"
+    }
+  },
+  "requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"]
+}
+```
+
+### 5.2 权限申请代码示例
+
+```javascript
+// 申请地理位置权限
+wx.getSetting({
+  success: (res) => {
+    if (!res.authSetting['scope.userLocation']) {
+      wx.requestAuthorization({
+        scope: 'scope.userLocation',
+        success: (authRes) => {
+          if (authRes.authSetting['scope.userLocation']) {
+            // 用户授权成功，可以使用地理位置相关功能
+            wx.getLocation({
+              type: 'wgs84',
+              success: (locationRes) => {
+                console.log('获取位置成功', locationRes);
+              }
+            });
+          }
+        },
+        fail: (err) => {
+          console.log('授权失败', err);
+        }
+      });
+    } else {
+      // 已经授权，可以直接使用
+      wx.getLocation({
+        type: 'wgs84',
+        success: (locationRes) => {
+          console.log('获取位置成功', locationRes);
+        }
+      });
+    }
+  }
+});
+```
+
+## 6. 注意事项和最佳实践
+
+### 6.1 注意事项
+
+1. **权限申请时机**：在真正需要使用权限时再申请，不要在小程序启动时就申请所有权限
+2. **权限描述**：在 `manifest.json` 中为每个权限提供清晰、准确的描述，说明为什么需要该权限
+3. **用户体验**：在申请权限前，先向用户解释为什么需要该权限，提高授权成功率
+4. **权限拒绝处理**：当用户拒绝授权时，提供合理的降级方案，不要直接阻断用户操作
+5. **隐私政策**：在小程序中提供隐私政策，说明如何使用用户数据
+
+### 6.2 最佳实践
+
+1. **按需申请**：只申请小程序真正需要的权限
+2. **逐步申请**：根据用户使用流程，逐步申请所需权限
+3. **合理降级**：当权限被拒绝时，提供替代方案
+4. **定期检查**：定期检查权限使用情况，移除不再需要的权限
+5. **权限管理**：在小程序设置中提供权限管理入口，方便用户查看和修改授权状态
+
+## 7. 相关 API
+
+### 7.1 权限相关 API
+
+- `wx.getSetting`：获取用户当前的授权状态
+- `wx.requestAuthorization`：请求用户授权
+- `wx.openSetting`：打开设置页面，引导用户修改授权状态
+
+### 7.2 常用功能 API
+
+- `wx.getLocation`：获取用户地理位置
+- `wx.chooseAddress`：选择收货地址
+- `wx.chooseInvoice`：选择发票
+- `wx.chooseInvoiceTitle`：选择发票抬头
+- `wx.getRecorderManager`：获取录音管理器
+- `wx.createCameraContext`：创建摄像头上下文
+
+## 8. 常见问题
+
+### 8.1 权限申请失败
+
+- **原因**：用户拒绝授权、系统限制、权限配置错误
+- **解决方法**：检查权限配置、提供合理的权限说明、引导用户在设置中开启权限
+
+### 8.2 权限被禁用
+
+- **原因**：用户在设置中关闭了权限
+- **解决方法**：使用 `wx.openSetting` 引导用户重新开启权限
+
+### 8.3 权限申请弹窗不显示
+
+- **原因**：用户之前拒绝过授权且选择了"不再询问"
+- **解决方法**：引导用户在设置中开启权限
+
+## 9. 总结
+
+合理配置和使用微信小程序权限，不仅可以保护用户隐私和数据安全，还能提升用户体验和小程序的可信度。开发者应该根据小程序的实际功能需求，按需申请权限，并为用户提供清晰、透明的权限使用说明。
+
+---
+
+**更新时间**：2026-01-06
+**适用微信版本**：最新版本
+**参考文档**：[微信小程序官方权限文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/authorize.html)

docs/components_usage_documentation.md

@@ -0,0 +1,834 @@
+# 组件使用情况文档
+
+提示词：请重新帮我分析 components 及 uni_modules 目录下的组件，被哪些页面/组件使用，按照Vue组件精确引用次数由多到少来排序，并更新到该文档中。
+
+## 1. 组件目录结构
+
+### 1.1 components 目录包含以下组件：
+
+- chat-message
+- hover-nav
+- l-time
+- loading-cover
+- mescroll
+- ns-adv
+- ns-chat
+- ns-contact
+- ns-copyright
+- ns-empty
+- ns-form
+- ns-goods-action
+- ns-goods-action-button
+- ns-goods-action-icon
+- ns-goods-recommend
+- ns-goods-sku
+- ns-loading
+- ns-login
+- ns-mp-html
+- ns-navbar
+- ns-payment
+- ns-progress
+- ns-select-time
+- ns-switch
+- ns-video-player-popup
+- payment
+- pick-regions
+- privacy-popup
+- register-reward
+- sx-rate
+- to-top
+- uv-count-to
+- wxwork-contact
+- xiao-star-component
+- yuyue-date
+
+### 1.2 uni_modules 目录包含以下组件：
+
+- mp-html
+- uni-badge
+- uni-calendar
+- uni-count-down
+- uni-datetime-picker
+- uni-drawer
+- uni-grid
+- uni-grid-item
+- uni-icons
+- uni-nav-bar
+- uni-number-box
+- uni-popup
+- uni-popup-sku
+- uni-popup-sku-category
+- uni-scss
+- uni-status-bar
+- uni-tag
+- x-skeleton
+
+## 2. 组件使用情况详细列表（按引用次数排序）
+
+### 2.1 loading-cover 组件（78次引用）
+
+**文件路径**：components/loading-cover/loading-cover.vue
+
+**引用情况**：
+- pages_tool/form/formdata.vue
+- pages_goods/detail.vue
+- pages_order/_components/common-payment/common-payment.vue
+- pages_tool/recharge/order_list.vue
+- pages_tool/recharge/list.vue
+- pages_tool/pay/index.vue
+- pages_tool/pay/result.vue
+- pages_tool/order/refund_type_select.vue
+- pages_tool/order/refund_goods_select.vue
+- pages_tool/order/refund_detail.vue
+- pages_tool/order/detail_virtual.vue
+- pages_tool/order/evaluate.vue
+- pages_tool/order/logistics.vue
+- pages_tool/order/refund.vue
+- pages_tool/order/refund_batch.vue
+- pages_tool/member/withdrawal.vue
+- pages_tool/member/withdrawal_detail.vue
+- pages_tool/notice/detail.vue
+- pages_tool/notice/list.vue
+- pages_tool/member/point.vue
+- pages_tool/member/point_detail.vue
+- pages_tool/member/invite_friends.vue
+- pages_tool/member/level.vue
+- pages_tool/member/level_growth_rules.vue
+- pages_tool/member/coupon.vue
+- pages_tool/member/footprint.vue
+- pages_tool/member/card_buy.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/balance.vue
+- pages_tool/member/balance_detail.vue
+- pages_tool/member/account.vue
+- pages_tool/member/account_edit.vue
+- pages_tool/member/address.vue
+- pages_tool/member/address_edit.vue
+- pages_tool/member/apply_withdrawal.vue
+- pages_tool/login/login.vue
+- pages_tool/help/detail.vue
+- pages_tool/help/list.vue
+- pages_tool/goods/coupon.vue
+- pages_tool/goods/coupon_receive.vue
+- pages_tool/goods/evaluate.vue
+- pages_tool/files/list.vue
+- pages_tool/form/form.vue
+- pages_tool/goods/brand.vue
+- pages_tool/article/detail.vue
+- pages_tool/article/list.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/order_list.vue
+- pages_promotion/point/payment.vue
+- pages_promotion/point/detail.vue
+- pages_promotion/merch/merchcategory.vue
+- pages_promotion/merch/detail.vue
+- pages_promotion/fenxiao/withdrawal_detail.vue
+- pages_promotion/fenxiao/withdraw_list.vue
+- pages_promotion/fenxiao/withdraw_apply.vue
+- pages_promotion/fenxiao/ranking_list.vue
+- pages_promotion/fenxiao/relation.vue
+- pages_promotion/fenxiao/team.vue
+- pages_promotion/fenxiao/order.vue
+- pages_promotion/fenxiao/order_detail.vue
+- pages_promotion/fenxiao/promote.vue
+- pages_promotion/fenxiao/promote_code.vue
+- pages_promotion/fenxiao/index.vue
+- pages_promotion/fenxiao/level.vue
+- pages_promotion/fenxiao/goods_list.vue
+- pages_promotion/fenxiao/apply.vue
+- pages_promotion/fenxiao/bill.vue
+- pages_promotion/fenxiao/child_fenxiao.vue
+- pages_order/detail_point.vue
+- pages_order/list.vue
+- pages_order/detail.vue
+- pages_order/detail_local_delivery.vue
+- pages_order/detail_pickup.vue
+- pages_goods/list.vue
+- pages_goods/cart.vue
+- pages_goods/category.vue
+- components-diy/diy-category-item.vue
+
+### 2.2 uni-popup 组件（66次引用）
+
+**文件路径**：uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+
+**引用情况**：
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+- pages_tool/member/index.vue
+- pages_goods/detail.vue
+- pages_order/payment.vue
+- pages_order/_components/common-payment/common-payment.vue
+- pages_tool/contact/contact.vue
+- components/ns-contact/ns-contact.vue
+- pages/index/index.vue
+- components/ns-video-player-popup/ns-video-player-popup.vue
+- pages/contact/contact.vue
+- uni_modules/uni-popup-sku/components/uni-popup-sku/uni-popup-sku.vue
+- uni_modules/uni-popup-sku-category/components/uni-popup-sku-category/uni-popup-sku-category.vue
+- pages_tool/recharge/list.vue
+- pages_tool/pay/result.vue
+- pages_tool/order/refund_type_select.vue
+- pages_tool/order/refund.vue
+- pages_tool/order/refund_batch.vue
+- pages_tool/member/invite_friends.vue
+- pages_tool/member/level.vue
+- pages_tool/member/card_buy.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/card.vue
+- pages_tool/login/login.vue
+- pages_tool/index/diy.vue
+- pages_tool/cases/index.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/payment.vue
+- pages_promotion/merch/public/category.scss
+- pages_promotion/point/detail.vue
+- pages_promotion/merch/merchcategory.vue
+- pages_promotion/merch/detail.vue
+- pages_promotion/fenxiao/promote_code.vue
+- pages_promotion/fenxiao/index.vue
+- pages_promotion/fenxiao/level.vue
+- pages_promotion/fenxiao/goods_list.vue
+- pages_promotion/fenxiao/apply.vue
+- pages_order/detail_point.vue
+- pages_order/detail.vue
+- pages_goods/list.vue
+- pages_goods/public/css/cart.scss
+- pages_goods/cart.vue
+- pages_goods/category.vue
+- components/yuyue-date/yuyue-date.vue
+- components/register-reward/register-reward.vue
+- components/pick-regions/pick-regions.vue
+- components/ns-select-time/ns-select-time.vue
+- components/payment/payment.vue
+- components/ns-payment/ns-payment.vue
+- components/ns-goods-sku/ns-goods-sku.vue
+- components/ns-login/ns-login.vue
+- pages_tool/_components/ns-new-gift/ns-new-gift.vue
+- components/ns-goods-sku/ns-goods-sku-category.vue
+- pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue
+- components/chat-message/chat-message.vue
+- components-diy/diy-video-list.vue
+- components-diy/diy-payment-qrcode.vue
+- components-diy/diy-notice.vue
+- components-diy/diy-member-info.vue
+- components-diy/diy-index-page.vue
+- components-diy/diy-category.vue
+- components-diy/diy-category-item.vue
+
+### 2.3 mescroll 组件（63次引用）
+
+**文件路径**：components/mescroll/
+
+**引用情况**：
+- pages_order/_components/common-payment/common-payment.vue
+- pages_tool/contact/contact.vue
+- lang/zh-cn/common.js
+- lang/en-us/common.js
+- pages.json
+- pages/index/index.vue
+- pages_tool/recharge/order_list.vue
+- pages_tool/recharge/list.vue
+- pages_tool/order/logistics.vue
+- pages_tool/member/withdrawal.vue
+- pages_tool/notice/list.vue
+- pages_tool/order/activist.vue
+- pages_tool/member/public/js/collection.js
+- pages_tool/member/point_detail.vue
+- pages_tool/member/coupon.vue
+- pages_tool/member/footprint.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/balance.vue
+- pages_tool/member/balance_detail.vue
+- pages_tool/member/account.vue
+- pages_tool/member/address.vue
+- pages_tool/goods/coupon.vue
+- pages_tool/goods/evaluate.vue
+- pages_tool/files/list.vue
+- pages_tool/goods/brand.vue
+- pages_tool/article/list.vue
+- pages_promotion/point/goods_list.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/order_list.vue
+- pages_promotion/merch/public/js/list.js
+- pages_promotion/merch/detail.vue
+- pages_promotion/fenxiao/withdraw_list.vue
+- pages_promotion/fenxiao/ranking_list.vue
+- pages_promotion/fenxiao/relation.vue
+- pages_promotion/fenxiao/team.vue
+- pages_promotion/fenxiao/public/js/goods_list.js
+- pages_promotion/fenxiao/order.vue
+- pages_promotion/fenxiao/goods_list.vue
+- pages_promotion/fenxiao/bill.vue
+- pages_promotion/fenxiao/child_fenxiao.vue
+- pages_order/list.vue
+- pages_goods/public/js/list.js
+- pages_goods/list.vue
+- components/to-top/to-top.vue
+- components-diy/diy-index-page.vue
+- components/ns-loading/ns-loading.vue
+
+### 2.4 ns-login 组件（53次引用）
+
+**文件路径**：components/ns-login/ns-login.vue
+
+**引用情况**：
+- pages_tool/form/formdata.vue
+- pages_goods/detail.vue
+- pages_order/_components/common-payment/common-payment.vue
+- pages/index/index.vue
+- pages_tool/recharge/order_list.vue
+- pages_tool/pay/cashier.vue
+- pages_tool/member/point.vue
+- pages_tool/member/invite_friends.vue
+- pages_tool/member/level.vue
+- pages_tool/member/coupon.vue
+- pages_tool/member/footprint.vue
+- pages_tool/member/info.vue
+- pages_tool/member/info_edit.vue
+- pages_tool/member/card_buy.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/card.vue
+- pages_tool/member/balance.vue
+- pages_tool/member/balance_detail.vue
+- pages_tool/member/account.vue
+- pages_tool/member/address.vue
+- pages_tool/goods/coupon.vue
+- pages_tool/goods/coupon_receive.vue
+- pages_tool/form/form.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/order_list.vue
+- pages_promotion/point/detail.vue
+- pages_promotion/merch/merchcategory.vue
+- pages_promotion/fenxiao/withdraw_list.vue
+- pages_promotion/fenxiao/relation.vue
+- pages_promotion/fenxiao/team.vue
+- pages_promotion/fenxiao/order.vue
+- pages_promotion/fenxiao/order_detail.vue
+- pages_promotion/fenxiao/promote.vue
+- pages_promotion/fenxiao/promote_code.vue
+- pages_promotion/fenxiao/index.vue
+- pages_promotion/fenxiao/child_fenxiao.vue
+- pages_order/list.vue
+- pages_goods/cart.vue
+- pages_goods/category.vue
+- components/ns-goods-sku/ns-goods-sku.vue
+- components/ns-goods-sku/ns-goods-sku-index.vue
+- components/ns-goods-sku/ns-goods-sku-category.vue
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+- components-diy/diy-search.vue
+- components-diy/diy-quick-nav.vue
+- components-diy/diy-notes.vue
+- components-diy/diy-member-info.vue
+- components-diy/diy-member-my-order.vue
+- components-diy/diy-image-nav.vue
+- components-diy/diy-graphic-nav.vue
+- components-diy/diy-digit.vue
+- components-diy/diy-coupon.vue
+
+### 2.5 ns-empty 组件（37次引用）
+
+**文件路径**：components/ns-empty/ns-empty.vue
+
+**引用情况**：
+- pages_tool/form/formdata.vue
+- pages_order/_components/common-payment/common-payment.vue
+- pages_tool/seal/medium/search.vue
+- pages_tool/recharge/order_list.vue
+- pages_tool/pay/cashier.vue
+- pages_tool/member/withdrawal.vue
+- pages_tool/notice/list.vue
+- pages_tool/order/activist.vue
+- pages_tool/member/point_detail.vue
+- pages_tool/member/invite_friends.vue
+- pages_tool/member/coupon.vue
+- pages_tool/member/footprint.vue
+- pages_tool/member/card_buy.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/balance_detail.vue
+- pages_tool/help/list.vue
+- pages_tool/goods/coupon.vue
+- pages_tool/goods/evaluate.vue
+- pages_tool/files/list.vue
+- pages_tool/form/form.vue
+- pages_tool/goods/brand.vue
+- pages_tool/article/list.vue
+- pages_promotion/point/goods_list.vue
+- pages_promotion/point/order_list.vue
+- pages_promotion/merch/detail.vue
+- pages_promotion/fenxiao/withdraw_list.vue
+- pages_promotion/fenxiao/ranking_list.vue
+- pages_promotion/fenxiao/relation.vue
+- pages_promotion/fenxiao/team.vue
+- pages_promotion/fenxiao/order.vue
+- pages_promotion/fenxiao/goods_list.vue
+- pages_promotion/fenxiao/bill.vue
+- pages_promotion/fenxiao/child_fenxiao.vue
+- pages_order/list.vue
+- pages_goods/list.vue
+- pages_goods/cart.vue
+- components-diy/diy-index-page.vue
+
+### 2.6 privacy-popup 组件（26次引用）
+
+**文件路径**：components/privacy-popup/privacy-popup.vue
+
+**引用情况**：
+- pages_tool/member/index.vue
+- pages_goods/detail.vue
+- pages/index/index.vue
+- pages_tool/webview/webview.vue
+- pages_tool/notice/detail.vue
+- pages_tool/notice/list.vue
+- pages_tool/help/detail.vue
+- pages_tool/help/list.vue
+- pages_tool/index/diy.vue
+- pages_tool/goods/coupon.vue
+- pages_tool/goods/coupon_receive.vue
+- pages_tool/files/list.vue
+- pages_tool/goods/brand.vue
+- pages_tool/article/detail.vue
+- pages_tool/article/list.vue
+- pages_promotion/point/goods_list.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/detail.vue
+- pages_promotion/merch/detail.vue
+- pages_promotion/fenxiao/promote.vue
+- pages_promotion/fenxiao/promote_code.vue
+- pages_promotion/fenxiao/goods_list.vue
+- pages_goods/list.vue
+- pages_goods/cart.vue
+- pages_goods/category.vue
+- components/ns-login/ns-login.vue
+
+### 2.7 x-skeleton 组件（19次引用）
+
+**文件路径**：uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
+
+**引用情况**：
+- pages.json
+- components-diy/diy-article.vue
+- components-diy/diy-seckill.vue
+- components-diy/diy-store-label.vue
+- components-diy/diy-presale.vue
+- components-diy/diy-pinfan.vue
+- components-diy/diy-pintuan.vue
+- components-diy/diy-notes.vue
+- components-diy/diy-merch-list.vue
+- components-diy/diy-live.vue
+- components-diy/diy-groupbuy.vue
+- components-diy/diy-goods-recommend.vue
+- components-diy/diy-goods-brand.vue
+- components-diy/diy-goods-list.vue
+- components-diy/diy-coupon.vue
+- components-diy/diy-bargain.vue
+
+### 2.8 ns-goods-sku 组件（13次引用）
+
+**文件路径**：components/ns-goods-sku/
+
+**引用情况**：
+- pages_goods/detail.vue
+- pages.json
+- store/index.js
+- pages_promotion/point/detail.vue
+- pages_promotion/merch/detail.vue
+- pages_goods/list.vue
+- pages_goods/cart.vue
+- components-diy/diy-goods-list.vue
+- components-diy/diy-category.vue
+
+### 2.9 to-top 组件（11次引用）
+
+**文件路径**：components/to-top/to-top.vue
+
+**引用情况**：
+- pages_goods/detail.vue
+- pages_tool/contact/contact.vue
+- pages/index/index.vue
+- pages_tool/member/level.vue
+- pages_tool/member/level_growth_rules.vue
+- pages_promotion/point/detail.vue
+- pages_goods/cart.vue
+- components/mescroll/mescroll-uni.vue
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+- common/css/goods_detail.scss
+
+### 2.10 ns-goods-recommend 组件（10次引用）
+
+**文件路径**：components/ns-goods-recommend/ns-goods-recommend.vue
+
+**引用情况**：
+- pages_tool/pay/result.vue
+- pages_tool/member/collection.vue
+- pages_tool/member/card.vue
+- pages_promotion/fenxiao/level.vue
+- pages_order/detail_point.vue
+- pages_order/detail.vue
+- pages_goods/cart.vue
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+
+### 2.11 ns-payment 组件（9次引用）
+
+**文件路径**：components/ns-payment/ns-payment.vue
+
+**引用情况**：
+- pages_tool/recharge/list.vue
+- pages_tool/member/card_buy.vue
+- pages_promotion/point/order_list.vue
+- pages_promotion/point/payment.vue
+- pages_order/detail_point.vue
+- pages_order/list.vue
+- pages_order/detail.vue
+
+### 2.12 ns-adv 组件（8次引用）
+
+**文件路径**：components/ns-adv/ns-adv.vue
+
+**引用情况**：
+- pages_tool/files/list.vue
+- pages_tool/goods/brand.vue
+- pages_tool/article/list.vue
+- pages_promotion/point/list.vue
+- pages_promotion/point/public/css/list.scss
+- pages_promotion/fenxiao/public/css/follow.scss
+
+### 2.13 ns-form 组件（8次引用）
+
+**文件路径**：components/ns-form/ns-form.vue
+
+**引用情况**：
+- pages_goods/detail.vue
+- pages_order/_components/common-payment/common-payment.vue
+- pages_tool/form/form.vue
+- pages_tool/_components/ns-newform/ns-newform.vue
+- components/ns-goods-sku/ns-goods-sku.vue
+- common/css/order_parment.scss
+
+### 2.14 uni-icons 组件（8次引用）
+
+**文件路径**：uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+
+**引用情况**：
+- uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+- uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
+- uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+
+### 2.15 ns-contact 组件（7次引用）
+
+**文件路径**：components/ns-contact/ns-contact.vue
+
+**引用情况**：
+- pages_tool/order/refund_detail.vue
+- pages_tool/member/contact.vue
+- pages_order/detail_point.vue
+- pages_order/detail.vue
+- components/ns-goods-action-icon/ns-goods-action-icon.vue
+
+### 2.16 ns-copyright 组件（7次引用）
+
+**文件路径**：components/ns-copyright/ns-copyright.vue
+
+**引用情况**：
+- pages_tool/member/index.vue
+- pages/index/index.vue
+- pages_tool/index/diy.vue
+- pages_promotion/fenxiao/promote.vue
+- pages_promotion/fenxiao/index.vue
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+
+### 2.17 hover-nav 组件（6次引用）
+
+**文件路径**：components/hover-nav/hover-nav.vue
+
+**引用情况**：
+- pages_tool/member/index.vue
+- pages_tool/contact/contact.vue
+- pages/index/index.vue
+- pages/contact/contact.vue
+
+### 2.18 pick-regions 组件（6次引用）
+
+**文件路径**：components/pick-regions/pick-regions.vue
+
+**引用情况**：
+- pages_tool/member/info_edit.vue
+- pages_tool/member/address_edit.vue
+- pages_tool/_components/ns-newform/ns-newform.vue
+- components/ns-form/ns-form.vue
+
+### 2.19 ns-navbar 组件（6次引用）
+
+**文件路径**：components/ns-navbar/ns-navbar.vue
+
+**引用情况**：
+- pages_tool/member/index.vue
+- pages_goods/detail.vue
+- pages/index/index.vue
+- pages_tool/index/diy.vue
+
+### 2.20 uni-drawer 组件（4次引用）
+
+**文件路径**：uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
+
+**引用情况**：
+- pages_promotion/point/goods_list.vue
+- pages_promotion/merch/detail.vue
+- pages_goods/list.vue
+
+### 2.21 uni-calendar 组件（4次引用）
+
+**文件路径**：uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+
+**引用情况**：
+- uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+- uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
+
+### 2.22 chat-message 组件（4次引用）
+
+**文件路径**：components/chat-message/chat-message.vue
+
+**引用情况**：
+- pages_tool/ai-chat/index.vue
+- pages_tool/ai-chat/ai-chat-message.vue
+
+### 2.23 ns-switch 组件（4次引用）
+
+**文件路径**：components/ns-switch/ns-switch.vue
+
+**引用情况**：
+- pages_order/_components/common-payment/common-payment.vue
+- components/payment/payment.vue
+- components/ns-payment/ns-payment.vue
+
+### 2.24 register-reward 组件（4次引用）
+
+**文件路径**：components/register-reward/register-reward.vue
+
+**引用情况**：
+- pages_tool/login/login.vue
+- components/ns-login/ns-login.vue
+
+### 2.25 sx-rate 组件（4次引用）
+
+**文件路径**：components/sx-rate/sx-rate.vue
+
+**引用情况**：
+- pages_tool/order/evaluate.vue
+
+### 2.26 uni-count-down 组件（3次引用）
+
+**文件路径**：uni_modules/uni-count-down/components/uni-count-down/uni-count-down.vue
+
+**引用情况**：
+- pages_goods/detail.vue
+- pages_order/list.vue
+- pages_order/detail.vue
+
+### 2.27 uni-badge 组件（3次引用）
+
+**文件路径**：uni_modules/uni-badge/components/uni-badge/uni-badge.vue
+
+**引用情况**：
+- uni_modules/uni-grid-item/components/uni-grid-item/uni-grid-item.vue
+
+### 2.28 uni-grid 组件（3次引用）
+
+**文件路径**：uni_modules/uni-grid/components/uni-grid/uni-grid.vue
+
+**引用情况**：
+- pages_tool/goods/brand.vue
+
+### 2.29 ns-loading 组件（5次引用）
+
+**文件路径**：components/ns-loading/ns-loading.vue
+
+**引用情况**：
+- pages_tool/ai-chat/ai-chat-message.vue
+- components/mescroll/mescroll-uni.vue
+- components-diy/diy-index-page.vue
+
+### 2.30 ns-goods-action 组件（5次引用）
+
+**文件路径**：components/ns-goods-action/ns-goods-action.vue
+
+**引用情况**：
+- pages_goods/detail.vue
+- components/ns-goods-action-icon/ns-goods-action-icon.vue
+- components/ns-goods-action-button/ns-goods-action-button.vue
+
+### 2.31 ns-chat 组件（5次引用）
+
+**文件路径**：components/ns-chat/
+
+**引用情况**：
+- components/chat-message/chat-message.vue
+
+### 2.32 ns-select-time 组件（3次引用）
+
+**文件路径**：components/ns-select-time/ns-select-time.vue
+
+**引用情况**：
+- pages_order/_components/common-payment/common-payment.vue
+- pages_promotion/point/payment.vue
+
+### 2.33 uv-count-to 组件（3次引用）
+
+**文件路径**：components/uv-count-to/uv-count-to.vue
+
+**引用情况**：
+- components-diy/diy-digit.vue
+
+### 2.34 ns-video-player-popup 组件（3次引用）
+
+**文件路径**：components/ns-video-player-popup/ns-video-player-popup.vue
+
+**引用情况**：
+- pages_tool/contact/contact.vue
+
+### 2.35 l-time 组件（3次引用）
+
+**文件路径**：components/l-time/l-time.vue
+
+**引用情况**：
+- common/css/icondiy.css
+
+### 2.36 pengpai-fadein-out 组件（3次引用）
+
+**文件路径**：components/pengpai-fadein-out/pengpai-fadein-out.vue
+
+**引用情况**：
+- pages_goods/_components/goods-detail-view/goods-detail-view.vue
+
+### 2.37 ns-progress 组件（2次引用）
+
+**文件路径**：components/ns-progress/ns-progress.vue
+
+**引用情况**：
+- pages_tool/member/level.vue
+
+### 2.38 payment 组件（2次引用）
+
+**文件路径**：components/payment/payment.vue
+
+**引用情况**：无直接引用
+
+### 2.39 uni-popup-sku 组件（2次引用）
+
+**文件路径**：uni_modules/uni-popup-sku/components/uni-popup-sku/uni-popup-sku.vue
+
+**引用情况**：无直接引用
+
+### 2.40 uni-popup-sku-category 组件（2次引用）
+
+**文件路径**：uni_modules/uni-popup-sku-category/components/uni-popup-sku-category/uni-popup-sku-category.vue
+
+**引用情况**：无直接引用
+
+### 2.41 uni-datetime-picker 组件（13次引用）
+
+**文件路径**：uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
+
+**引用情况**：
+- components/yuyue-date/yuyue-date.vue
+
+### 2.42 ns-mp-html 组件（1次引用）
+
+**文件路径**：components/ns-mp-html/ns-mp-html.vue
+
+**引用情况**：无引用
+
+### 2.43 wxwork-contact 组件（1次引用）
+
+**文件路径**：components/wxwork-contact/wxwork-contact.vue
+
+**引用情况**：无引用
+
+### 2.44 xiao-star-component 组件（1次引用）
+
+**文件路径**：components/xiao-star-component/xiao-star-component.vue
+
+**引用情况**：无引用
+
+### 2.45 yuyue-date 组件（1次引用）
+
+**文件路径**：components/yuyue-date/yuyue-date.vue
+
+**引用情况**：无引用
+
+### 2.46 uni-nav-bar 组件（1次引用）
+
+**文件路径**：uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
+
+**引用情况**：无直接引用
+
+### 2.47 uni-number-box 组件（1次引用）
+
+**文件路径**：uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+
+**引用情况**：无直接引用
+
+### 2.48 uni-status-bar 组件（1次引用）
+
+**文件路径**：uni_modules/uni-status-bar/components/uni-status-bar/uni-status-bar.vue
+
+**引用情况**：无直接引用
+
+### 2.49 uni-tag 组件（1次引用）
+
+**文件路径**：uni_modules/uni-tag/components/uni-tag/uni-tag.vue
+
+**引用情况**：无直接引用
+
+### 2.50 mp-html 组件（1次引用）
+
+**文件路径**：uni_modules/mp-html/components/mp-html/mp-html.vue
+
+**引用情况**：无直接引用
+
+### 2.51 uni-scss 组件（1次引用）
+
+**文件路径**：uni_modules/uni-scss/components/uni-scss/
+
+**引用情况**：无直接引用
+
+### 2.52 uni-grid-item 组件（1次引用）
+
+**文件路径**：uni_modules/uni-grid-item/components/uni-grid-item/uni-grid-item.vue
+
+**引用情况**：无直接引用
+
+## 3. 组件使用统计
+
+### 3.1 使用最广泛的组件（前10）
+
+1. loading-cover - 78个引用
+2. uni-popup - 66个引用
+3. mescroll - 63个引用
+4. ns-login - 53个引用
+5. ns-empty - 37个引用
+6. privacy-popup - 26个引用
+7. x-skeleton - 19个引用
+8. ns-goods-sku - 13个引用
+9. to-top - 11个引用
+10. ns-goods-recommend - 10个引用
+
+### 3.2 未被使用的组件
+
+- ns-mp-html
+- wxwork-contact
+- xiao-star-component
+- yuyue-date
+- uni-nav-bar
+- uni-number-box
+- uni-status-bar
+- uni-tag
+- mp-html
+- uni-scss
+
+## 4. 总结
+
+本项目的组件使用情况较为集中，核心组件如 loading-cover、uni-popup、mescroll、ns-login 等被广泛应用于多个页面。同时，也存在部分组件未被使用的情况，这些组件可能是为未来功能预留的，或者是已经被其他组件替代的。
+
+通过本文档，可以清晰了解每个组件的使用范围，为后续的组件优化和维护提供参考。
+
+**更新时间**：2026-01-16

docs/example/wechat-channel-demo.vue

@@ -0,0 +1,165 @@
+<template>
+	<view class="wechat-channel-demo">
+		<view class="demo-header">
+			<text class="demo-title">微信视频号集成示例</text>
+		</view>
+
+		<view class="demo-section">
+			<view class="section-title">单个视频号</view>
+			<diy-wechat-channel :value="channelData" />
+		</view>
+
+		<view class="demo-section">
+			<view class="section-title">视频号列表</view>
+			<diy-wechat-channel-list :value="channelListData" />
+		</view>
+
+		<view class="demo-section">
+			<view class="section-title">使用说明</view>
+			<view class="section-content">
+				<view class="content-item">1. 确保微信小程序已开通视频号权限</view>
+				<view class="content-item">2. 小程序需与视频号关联</view>
+				<view class="content-item">3. 传递正确的feedId用于播放视频</view>
+				<view class="content-item">4. 仅支持微信小程序环境</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import diyWechatChannel from '@/components-diy/diy-wechat-channel.vue'
+import diyWechatChannelList from '@/components-diy/diy-wechat-channel-list.vue'
+
+export default {
+	name: 'wechat-channel-demo',
+	components: {
+		diyWechatChannel,
+		diyWechatChannelList
+	},
+	data() {
+		return {
+			// 单个视频号数据
+			channelData: {
+				channelName: "示例视频号",
+				avatarUrl: "https://via.placeholder.com/100",
+				videoTitle: "这是一个示例视频，展示如何使用微信视频号组件",
+				coverUrl: "https://via.placeholder.com/640x360",
+				feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+				viewCount: 12345,
+				showFollow: true,
+				componentAngle: "round",
+				topAroundRadius: 10,
+				bottomAroundRadius: 10
+			},
+			// 视频号列表数据
+			channelListData: {
+				list: [
+					{
+						channelName: "示例视频号1",
+						coverUrl: "https://via.placeholder.com/640x360",
+						videoTitle: "这是示例视频1，展示如何使用微信视频号组件",
+						feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+						viewCount: 12345
+					},
+					{
+						channelName: "示例视频号2",
+						coverUrl: "https://via.placeholder.com/640x360",
+						videoTitle: "这是示例视频2，展示如何使用微信视频号组件",
+						feedId: "v02004g10000c3f7m7j5u87l33n8f161",
+						viewCount: 67890
+					},
+					{
+						channelName: "示例视频号3",
+						coverUrl: "https://via.placeholder.com/640x360",
+						videoTitle: "这是示例视频3，展示如何使用微信视频号组件",
+						feedId: "v02004g10000c3f7n7j5u87l33n8f162",
+						viewCount: 98765
+					},
+					{
+						channelName: "示例视频号4",
+						coverUrl: "https://via.placeholder.com/640x360",
+						videoTitle: "这是示例视频4，展示如何使用微信视频号组件",
+						feedId: "v02004g10000c3f7o7j5u87l33n8f163",
+						viewCount: 54321
+					}
+				],
+				rowCount: 2,
+				showStyle: "fixed",
+				font: {
+					size: 14,
+					weight: "normal",
+					color: "#333"
+				},
+				componentBgColor: "#fff",
+				componentAngle: "round",
+				topAroundRadius: 10,
+				bottomAroundRadius: 10
+			}
+		}
+	},
+	onLoad() {
+		console.log('微信视频号示例页面加载');
+	},
+	methods: {
+		// 可以在这里添加自定义方法
+	}
+}
+</script>
+
+<style scoped>
+.wechat-channel-demo {
+	padding: 20rpx;
+	background-color: #f5f5f5;
+}
+
+.demo-header {
+	text-align: center;
+	padding: 40rpx 0;
+	background-color: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 12rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+}
+
+.demo-title {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333;
+}
+
+.demo-section {
+	background-color: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 12rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
+	overflow: hidden;
+}
+
+.section-title {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333;
+	padding: 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.section-content {
+	padding: 20rpx;
+}
+
+.content-item {
+	font-size: 24rpx;
+	color: #666;
+	margin-bottom: 12rpx;
+	line-height: 1.5;
+}
+
+/* 组件样式调整 */
+.demo-section >>> .diy-wechat-channel {
+	margin: 20rpx;
+}
+
+.demo-section >>> .diy-wechat-channel-list {
+	margin: 20rpx;
+}
+</style>

lang/en-us/common.js

@@ -19,5 +19,17 @@ export const lang = {
 		currencySymbol: '¥',
 		submit: 'Submit',
 		searchTip: 'Please enter search keywords'
-	}
+	},
+
+	//customer service
+	customer: {
+		weChatKefu: 'WeChat Customer Service',
+		systemKefu: 'System Customer Service',
+		weChatWorkKefu: 'WeChat Work Customer Service',
+	},
+
+	login: 'Login/Register',
+	loginTips: 'Click to login and enjoy more exciting information',
+	toLogin: 'Go to login',
+	toGoodsCategoryPage: 'Go shopping',
 }

lang/en-us/contact/contact.js

@@ -1,4 +1,18 @@
 export const lang = {
 	//title为每个页面的标题
-	title: 'Electronic Card'
+	title: 'Electronic Card',
+	onlineMessage: 'Online Message',
+	call: 'One-click Call',
+	copy: 'Copy',
+	copyFailed: 'Copy Failed',
+	copySuccess: 'Copy Success',
+	oneClickNavigation: 'One-click Navigation',
+	name: 'Name',
+	contactInfo: 'Contact Info',
+	messageContent: 'Message Content',
+	pleaseEnterName: 'Please enter your name',
+	pleaseEnterMobile: 'Please enter your phone number',
+	pleaseEnterMessage: 'Please enter your message',
+	submit: 'Submit',
+	exclusiveCustomerService: 'Exclusive Customer Service'
 }

lang/en-us/member/index.js

@@ -45,4 +45,16 @@ export const lang = {
 	waitconfirm: 'Waitconfirm',
 	activist: 'Activist',
 	completed: 'Completed',
+
+	// 账户操作
+	logout: 'Logout',
+	cancellation: 'Account Cancellation',
+	logoutTitle: 'Tips',
+	logoutContent: 'Are you sure you want to log out',
+	cancellationTitle: 'Risk Warning',
+	cancellationContent: 'Are you sure you want to cancel your current account?',
+
+	// 协议
+	privacyPolicy: 'Privacy Policy',
+	registrationAgreement: 'Registration Agreement',
 }