chore：加了首页导航栏，一键导航在弹窗下面

.local.config.js

@@ -2,54 +2,46 @@
 // 复制此文件并重命名为 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/',
-    }, 
-	   '47': { // 修改弹窗
-	       uniacid: 47,
-	       domain: 'https://5g.aigc-quickapp.com/',
-	   },   
-	   '2075': { // 
-	       uniacid: 2075,
-	       domain: 'https://xcx.aigc-quickapp.com/',
-	   },   
-})['47']; // 选择要使用的环境配置
+	'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/',
+	},
+	'2812': { // IVD数商模式
+		uniacid: 2812,
+		domain: 'https://xcx6.aigc-quickapp.com/',
+	},
+	'1': { // 开发平台
+		uniacid: 1,
+		domain: 'https://dev.aigc-quickapp.com',
+	},
+	'1-test': { // 测试平台
+		uniacid: 1,
+		domain: 'https://test.aigc-quickapp.com',
+	},
+})['2812']; // 选择要使用的环境配置
 
 export default localDevConfig;

.local.config.js.example

@@ -18,10 +18,6 @@ const localDevConfig = ({
         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/',
@@ -46,10 +42,6 @@ const localDevConfig = ({
         uniacid: 2,
         domain: 'http://localhost:8050/',
     },    
-    'local-2-dev': { // 本地开发测试平台
-        uniacid: 2,
-        domain: 'http://localhost:8050/',
-    },     
-})['2812']; // 选择要使用的环境配置
+})['2811']; // 选择要使用的环境配置
 
 export default localDevConfig;

common/js/ai-service.js

@@ -60,107 +60,55 @@ export default {
   /**
    * 流式消息入口（自动适配平台）
    */
- async sendStreamMessage(message, onChunk, onComplete) {
-   // #ifdef MP-WEIXIN
-   return new Promise((resolve, reject) => {
-     const socketTask = wx.connectSocket({
-       url: 'wss://dev.aigc-quickapp.com/ws/aikefu',
-       header: {}
-     });
- 
-     let content = '';
-     let conversationId = '';
-     let isAuthenticated = false;
- 
-     socketTask.onOpen(() => {
-       console.log('WebSocket 连接成功，开始认证...');
-       socketTask.send({
-         data: JSON.stringify({
-           action: 'auth',
-           uniacid: store.state.uniacid || '1',
-           token: store.state.token || 'test_token',
-           user_id: store.state.memberInfo?.id || 'anonymous'
-         })
-       });
-     });
- 
-     socketTask.onMessage((res) => {
-       try {
-         const data = JSON.parse(res.data);
-         console.log('收到 WebSocket 消息:', data);
- 
-         if (data.type === 'auth_success') {
-           console.log('认证成功，发送聊天消息...');
-           isAuthenticated = true;
-           socketTask.send({
-             data: JSON.stringify({
-               action: 'chat',
-               uniacid: store.state.uniacid || '1',
-               query: message,
-               user_id: store.state.memberInfo?.id || 'anonymous',
-               conversation_id: this.getConversationId() || ''
-             })
-           });
-         } else if (data.type === 'auth_failed') {
-           const errorMsg = '认证失败，请重新登录';
-           console.error(errorMsg, data);
-           reject(new Error(errorMsg));
-           if (onComplete) onComplete({ error: errorMsg });
-           socketTask.close();
-         }
- 
-         // 处理流式消息块
-         else if (data.type === 'message' || data.event === 'message') {
-           const text = data.answer || data.content || data.text || '';
-           content += text;
-           if (onChunk) onChunk(text);
-         }
- 
-         // 处理流结束
-         else if (data.event === 'message_end' || data.type === 'message_end') {
-           conversationId = data.conversation_id || '';
-           if (conversationId) {
-             this.setConversationId(conversationId);
-           }
-           if (onComplete) {
-             onComplete({ content, conversation_id: conversationId });
-           }
-           resolve({ content, conversation_id: conversationId });
-           socketTask.close();
-         }
- 
-         // 可选：处理 done
-         else if (data.type === 'done') {
-           console.log('对话完成:', data);
-         }
- 
-       } catch (e) {
-         console.error('WebSocket 消息解析失败:', e, '原始数据:', res.data);
-       }
-     });
- 
-     socketTask.onError((err) => {
-       const errorMsg = 'WebSocket 连接失败';
-       console.error(errorMsg, err);
-       reject(new Error(errorMsg));
-       if (onComplete) onComplete({ error: errorMsg });
-     });
- 
-     socketTask.onClose(() => {
-       console.log('WebSocket 连接已关闭');
-     });
- 
-     const timeout = setTimeout(() => {
-       if (!isAuthenticated || content === '') {
-         console.warn('WebSocket 超时，强制关闭');
-         socketTask.close();
-         reject(new Error('AI服务响应超时'));
-         if (onComplete) onComplete({ error: 'AI服务响应超时' });
-       }
-     }, 10000);
-   });
+  async sendStreamMessage(message, onChunk, onComplete) {
+    // #ifdef MP-WEIXIN
+    // 微信小程序：降级为普通请求 + 前端打字模拟
+    try {
+      const result = await this.sendMessage(message);
+      const content = result.content || '';
+      const conversationId = result.conversationId || '';
+
+      // 保存会话ID（确保连续对话）
+      if (conversationId) {
+        this.setConversationId(conversationId);
+      }
+
+      // 模拟打字效果
+      let index = 0;
+      const chunkSize = 2; // 每次显示2个字符
+      return new Promise((resolve) => {
+        const timer = setInterval(() => {
+          if (index < content.length) {
+            const chunk = content.substring(index, index + chunkSize);
+            index += chunkSize;
+            if (onChunk) onChunk(chunk);
+          } else {
+            clearInterval(timer);
+            if (onComplete) {
+              onComplete({
+                content: content,
+                conversation_id: conversationId
+              });
+            }
+            resolve({ content, conversation_id: conversationId });
+          }
+        }, 80); // 打字速度：80ms/次
+      });
+    } catch (error) {
+      console.error('小程序流式消息降级失败:', error);
+      if (onComplete) {
+        onComplete({ error: error.message || '发送失败' });
+      }
+      throw error;
+    }
     // #endif
-},
+
+    // #ifdef H5
+    // H5：使用真实流式（EventSource / Fetch）
+    return this.sendHttpStream(message, onChunk, onComplete);
+    // #endif
+  },
+
   /**
    * HTTP 流式请求（仅 H5 使用）
    */
@@ -183,75 +131,64 @@ export default {
           conversation_id: this.getConversationId() || ''
         })
       });
-  
-      if (!response.ok || !response.body) {
-        throw new Error('无效响应');
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}`);
       }
-  
+      if (!response.body) {
+        throw new Error('响应体不可用');
+      }
+
       const reader = response.body.getReader();
       const decoder = new TextDecoder('utf-8');
       let buffer = '';
       let content = '';
       let conversationId = '';
-  
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-  
-        buffer += decoder.decode(value, { stream: true });
-  
-        // 按行分割，保留不完整的最后一行
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || ''; // 未完成的行留到下次
-  
+
+      function processBuffer(buf, callback) {
+        const lines = buf.split('\n');
+        buf = lines.pop() || '';
         for (const line of lines) {
           const trimmed = line.trim();
           if (trimmed.startsWith('data:')) {
-            try {
-              const jsonStr = trimmed.slice(5).trim();
-              if (jsonStr && jsonStr !== '[DONE]') {
+            const jsonStr = trimmed.slice(5).trim();
+            if (jsonStr) {
+              try {
                 const data = JSON.parse(jsonStr);
                 if (data.event === 'message') {
                   const text = data.answer || data.text || '';
                   content += text;
-                  if (onChunk) onChunk(text);
+                  callback(text);
                 }
                 if (data.conversation_id) {
                   conversationId = data.conversation_id;
                 }
                 if (data.event === 'message_end') {
-                  // 可提前结束
+                  // 可选：提前完成
                 }
+              } catch (e) {
+                console.warn('解析流数据失败:', e);
               }
-            } catch (e) {
-              console.warn('解析失败:', e, line);
             }
           }
         }
+        return buf;
       }
-  
-      // 处理最后残留的 buffer（如果有）
-      if (buffer.trim().startsWith('data:')) {
-        try {
-          const jsonStr = buffer.trim().slice(5);
-          if (jsonStr) {
-            const data = JSON.parse(jsonStr);
-            if (data.event === 'message') {
-              const text = data.answer || '';
-              content += text;
-              if (onChunk) onChunk(text);
-            }
-            if (data.conversation_id) {
-              conversationId = data.conversation_id;
-            }
-          }
-        } catch (e) {
-          console.warn('最后 buffer 解析失败:', e);
-        }
+
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        buffer = processBuffer(buffer, (chunk) => {
+          if (onChunk) onChunk(chunk);
+        });
       }
-  
+
       if (onComplete) {
-        onComplete({ content, conversation_id: conversationId });
+        onComplete({
+          content,
+          conversation_id: conversationId
+        });
       }
       return { content, conversation_id: conversationId };
     } catch (error) {
@@ -259,6 +196,11 @@ export default {
       throw error;
     }
     // #endif
+
+    // #ifdef MP-WEIXIN
+    // 理论上不会执行到这里，但防止 fallback
+    return this.sendStreamMessage(message, onChunk, onComplete);
+    // #endif
   },
 
   /**

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 外部最新配置
@@ -28,29 +83,28 @@ export class CustomerService {
             return this.latestPlatformConfig;
         }
 
-        // 优先级：外部传入 > vuex store > 空对象
+        // 优先级：外部传入的最新配置 > vuex配置 > 空对象
         const servicerConfig = this.externalConfig || this.vm.$store.state.servicerConfig || {};
         console.log(`【实时客服配置】`, servicerConfig);
 
         let platformConfig = null;
-
         // #ifdef H5
-        platformConfig = servicerConfig.h5 && typeof servicerConfig.h5 === 'object' ? servicerConfig.h5 : null;
+        platformConfig = servicerConfig.h5 ? (typeof servicerConfig.h5 === 'object' ? servicerConfig.h5 : null) : null;
         // #endif
 
         // #ifdef MP-WEIXIN
-        platformConfig = servicerConfig.weapp && typeof servicerConfig.weapp === 'object' ? servicerConfig.weapp : null;
+        platformConfig = servicerConfig.weapp ? (typeof servicerConfig.weapp === 'object' ? servicerConfig.weapp : null) : null;
         // #endif
 
         // #ifdef MP-ALIPAY
-        platformConfig = servicerConfig.aliapp && typeof servicerConfig.aliapp === 'object' ? servicerConfig.aliapp : null;
+        platformConfig = servicerConfig.aliapp ? (typeof servicerConfig.aliapp === 'object' ? servicerConfig.aliapp : null) : null;
         // #endif
 
         // #ifdef PC
-        platformConfig = servicerConfig.pc && typeof servicerConfig.pc === 'object' ? servicerConfig.pc : null;
+        platformConfig = servicerConfig.pc ? (typeof servicerConfig.pc === 'object' ? servicerConfig.pc : null) : null;
         // #endif
 
-        // 防止空数组被当作有效配置
+        // 处理空数组情况（你的配置中pc/aliapp是空数组，转为null）
         if (Array.isArray(platformConfig)) {
             platformConfig = null;
         }
@@ -76,15 +130,6 @@ export class CustomerService {
         return config && typeof config === 'object' && config.type;
     }
 
-    /**
-     * 检查是否有有效的客服配置（用于判断是否显示客服按钮）
-     * @returns {Boolean}
-     */
-    hasValidKefuConfig() {
-        const config = this.getPlatformConfig();
-        return config && typeof config === 'object' && config.type && config.type !== 'none';
-    }
-
     /**
      * 验证客服配置完整性
      * @returns {Object} 验证结果
@@ -99,18 +144,32 @@ export class CustomerService {
             warnings: []
         };
 
-        if (!config || !config.type) {
+        if (!config) {
             result.isValid = false;
-            result.errors.push('客服类型未配置');
+            result.errors.push('客服配置不存在');
             return result;
         }
 
+        if (config.type === 'aikefu') {
+            return result;
+        }
+
+        if (!config.type) {
+            result.isValid = false;
+            result.errors.push('客服类型未配置');
+        }
+
         if (config.type === 'wxwork') {
-            if (!wxworkConfig || !wxworkConfig.enable) {
-                result.warnings.push('企业微信未启用');
-            }
-            if (!wxworkConfig.contact_url) {
-                result.warnings.push('企业微信活码链接未配置');
+            if (!wxworkConfig) {
+                result.isValid = false;
+                result.errors.push('企业微信配置不存在');
+            } else {
+                if (!wxworkConfig.enable) {
+                    result.warnings.push('企业微信功能未启用');
+                }
+                if (!wxworkConfig.contact_url) {
+                    result.warnings.push('企业微信活码链接未配置，将使用原有客服方式');
+                }
             }
         }
 
@@ -118,39 +177,16 @@ export class CustomerService {
     }
 
     /**
-     * 跳转到 AI 客服页面（Dify）
+     * 跳转到AI客服页面
      */
-    openDifyService() {
-        try {
-            // 清除未读数（如果存在）
-            if (typeof this.vm.setAiUnreadCount === 'function') {
-                this.vm.setAiUnreadCount(0);
-            }
-
-            // ✅ 修正路径：必须与 pages.json 中注册的路径一致
-            const aiChatUrl = '/pages_tool/ai-chat/index';
-
-            // ✅ 使用 navigateTo 保留返回栈（体验更好）
-            uni.navigateTo({
-                url: aiChatUrl,
-                fail: (err) => {
-                    console.error('跳转 AI 客服失败:', err);
-                    // H5 兜底
-                    // #ifdef H5
-                    window.location.href = aiChatUrl;
-                    // #endif
-                    uni.showToast({ title: '打开客服失败', icon: 'none' });
-                }
-            });
-        } catch (e) {
-            console.error('跳转 AI 客服异常:', e);
-            uni.showToast({ title: '打开客服失败', icon: 'none' });
-        }
+    openAIKeFuService() {
+        const vm = this.vm;
+        vm.$util.redirectTo(vm.$util.AI_CHAT_PAGE_URL);
     }
 
     /**
-     * 处理客服点击事件（统一入口）
-     * @param {Object} options 选项参数（用于消息卡片等）
+     * 处理客服点击事件
+     * @param {Object} options 选项参数
      */
     handleCustomerClick(options = {}) {
         const validation = this.validateConfig();
@@ -165,61 +201,51 @@ export class CustomerService {
         }
 
         const config = this.getPlatformConfig();
-        console.log('【当前客服配置】', config);
-        console.log('【客服类型】', config.type);
-        
-        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
+        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
 
         if (config.type === 'none') {
             this.showNoServicePopup();
             return;
         }
 
-        // 核心路由：根据 type 决定行为
+        // 核心分支：根据最新的type处理
         switch (config.type) {
             case 'aikefu':
-                console.log('【跳转 AI 客服】目标路径: /pages_tool/ai-chat/index');
-                this.openDifyService();
+                this.openAIKeFuService();
                 break;
             case 'wxwork':
-                console.log('【跳转企业微信客服】');
                 this.openWxworkService(false, config, options);
                 break;
             case 'third':
-                console.log('【跳转第三方客服】');
-                this.openThirdService(config);
-                break;
-            case 'miniprogram':
-                console.log('【跳转第三方小程序客服】');
                 this.openThirdService(config);
                 break;
             case 'niushop':
-                console.log('【跳转牛商客服】');
                 this.openNiushopService(niushop);
                 break;
             case 'weapp':
-                console.log('【跳转微信官方客服】');
                 this.openWeappService(config, options);
                 break;
             case 'aliapp':
-                console.log('【跳转支付宝客服】');
                 this.openAliappService(config);
                 break;
             default:
-                console.error('【未知客服类型】', config.type);
                 this.makePhoneCall();
         }
     }
 
-    // ================== 各类型客服实现 ==================
-
+    /**
+     * 打开企业微信客服
+     * @param {boolean} useOriginalService 是否使用原有客服方式
+     * @param {Object} servicerConfig 客服配置
+     * @param {Object} options 选项参数
+     */
     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 (!useOriginalService && wxworkConfig?.enable && wxworkConfig?.contact_url) {
+        if (wxworkConfig?.enable && wxworkConfig?.contact_url && !useOriginalService) {
             wx.navigateToMiniProgram({
                 appId: 'wxeb490c6f9b154ef9',
                 path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(wxworkConfig.contact_url)}`,
@@ -230,16 +256,9 @@ export class CustomerService {
                 }
             });
         } else {
-            // 检查是否有企业微信配置
-            if (!config.wxwork_url && !config.corpid) {
-                console.error('企业微信配置不完整，缺少 wxwork_url 或 corpid');
-                uni.showToast({ title: '企业微信配置不完整', icon: 'none' });
-                this.fallbackToPhoneCall();
-                return;
-            }
             wx.openCustomerServiceChat({
-                extInfo: { url: config.wxwork_url || '' },
-                corpId: config.corpid || '',
+                extInfo: { url: config.wxwork_url },
+                corpId: config.corpid,
                 showMessageCard: true,
                 sendMessageTitle,
                 sendMessagePath,
@@ -249,181 +268,227 @@ export class CustomerService {
         // #endif
 
         // #ifdef H5
-        if (!useOriginalService && wxworkConfig?.enable && wxworkConfig?.contact_url) {
+        if (wxworkConfig?.enable && wxworkConfig?.contact_url) {
             window.location.href = wxworkConfig.contact_url;
         } else if (config.wxwork_url) {
-            window.location.href = config.wxwork_url;
+            location.href = config.wxwork_url;
         } else {
             this.fallbackToPhoneCall();
         }
         // #endif
     }
 
+    /**
+     * 打开第三方客服
+     * @param {Object} config 客服配置
+     */
     openThirdService(config) {
-        console.log('【第三方客服配置】', config);
-        console.log('【配置字段】', Object.keys(config));
-        
-        // 支持多种可能的字段名
-        const miniAppId = config.mini_app_id || config.miniAppId || config.appid || config.appId || config.app_id;
-        const miniAppPath = config.mini_app_path || config.miniAppPath || config.path || config.page_path || '';
-        
-        console.log('【解析后的小程序配置】AppID:', miniAppId, 'Path:', miniAppPath);
-        
-        // 优先处理第三方微信小程序客服
-        if (miniAppId) {
-            console.log('【跳转第三方小程序】AppID:', miniAppId, 'Path:', miniAppPath);
-            // #ifdef MP-WEIXIN
-            wx.navigateToMiniProgram({
-                appId: miniAppId,
-                path: miniAppPath,
-                success: () => {
-                    console.log('【跳转第三方小程序成功】');
-                },
-                fail: (err) => {
-                    console.error('【跳转第三方小程序失败】', err);
-                    uni.showToast({ title: '跳转失败，请稍后重试', icon: 'none' });
-                }
-            });
-            // #endif
-            // #ifdef H5
-            uni.showToast({ title: '第三方小程序客服仅在微信小程序中可用', icon: 'none' });
-            // #endif
-            return;
-        }
-        
-        // 处理第三方链接客服
         if (config.third_url) {
-            console.log('【跳转第三方链接】', config.third_url);
-            // #ifdef H5
             window.location.href = config.third_url;
-            // #endif
-            // #ifdef MP-WEIXIN
-            uni.setClipboardData({
-                data: config.third_url,
-                success: () => {
-                    uni.showToast({ title: '链接已复制，请在浏览器打开', icon: 'none' });
-                }
-            });
-            // #endif
         } else {
-            console.error('【第三方客服配置不完整】缺少 mini_app_id 或 third_url');
             this.fallbackToPhoneCall();
         }
     }
 
+    /**
+     * 打开牛商客服
+     * @param {Object} niushop 牛商参数
+     */
     openNiushopService(niushop) {
-        if (Object.keys(niushop).length > 0 && this.vm.$util?.redirectTo) {
+        if (Object.keys(niushop).length > 0) {
             this.vm.$util.redirectTo('/pages_tool/chat/room', niushop);
         } else {
             this.makePhoneCall();
         }
     }
 
+    /**
+     * 打开微信小程序客服
+     * @param {Object} config 客服配置
+     * @param {Object} options 选项参数
+     */
     openWeappService(config, options = {}) {
-        // 如果 useOfficial 为 true 或 undefined，则使用原生系统客服（由 button open-type="contact" 触发）
-        // 此方法仅用于自定义跳转（如 useOfficial: false）
-        if (config.useOfficial !== false) {
-            // 不做任何事，应由 <button open-type="contact"> 触发
-            console.log('使用微信官方客服，请确保按钮为 <button open-type="contact">');
+        if (!this.shouldUseCustomService(config)) {
+            console.log('使用官方微信小程序客服');
             return;
         }
+
+        console.log('使用自定义微信小程序客服');
         this.handleCustomWeappService(config, options);
     }
 
+    /**
+     * 处理自定义微信小程序客服
+     * @param {Object} config 客服配置
+     * @param {Object} options 选项参数
+     */
     handleCustomWeappService(config, options = {}) {
+        const { sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
+
         if (config.customServiceUrl) {
             let url = config.customServiceUrl;
             const params = [];
-            const { sendMessageTitle, sendMessagePath, sendMessageImg } = options;
             if (sendMessageTitle) params.push(`title=${encodeURIComponent(sendMessageTitle)}`);
             if (sendMessagePath) params.push(`path=${encodeURIComponent(sendMessagePath)}`);
             if (sendMessageImg) params.push(`img=${encodeURIComponent(sendMessageImg)}`);
+
             if (params.length > 0) {
                 url += (url.includes('?') ? '&' : '?') + params.join('&');
             }
-            uni.navigateTo({ url });
+
+            uni.navigateTo({
+                url: url,
+                fail: (err) => {
+                    console.error('跳转自定义客服页面失败:', err);
+                    this.tryThirdPartyService(config, options);
+                }
+            });
             return;
         }
+
         this.tryThirdPartyService(config, options);
     }
 
+    /**
+     * 尝试使用第三方客服
+     * @param {Object} config 客服配置
+     * @param {Object} options 选项参数
+     */
     tryThirdPartyService(config, options = {}) {
-        // 支持第三方微信小程序客服
-        if (config.thirdPartyMiniAppId || config.mini_app_id) {
-            // #ifdef MP-WEIXIN
-            wx.navigateToMiniProgram({
-                appId: config.thirdPartyMiniAppId || config.mini_app_id,
-                path: config.thirdPartyMiniAppPath || config.mini_app_path || ''
-            });
-            // #endif
-            return;
-        }
-        
-        // 支持第三方链接客服
-        if (config.thirdPartyServiceUrl || config.third_url) {
-            const serviceUrl = config.thirdPartyServiceUrl || config.third_url;
+        if (config.thirdPartyServiceUrl) {
             // #ifdef H5
-            window.open(serviceUrl, '_blank');
+            window.open(config.thirdPartyServiceUrl, '_blank');
             // #endif
+
             // #ifdef MP-WEIXIN
-            uni.setClipboardData({ data: serviceUrl });
-            uni.showToast({ title: '客服链接已复制', icon: 'none' });
+            if (config.thirdPartyMiniAppId) {
+                wx.navigateToMiniProgram({
+                    appId: config.thirdPartyMiniAppId,
+                    path: config.thirdPartyMiniAppPath || '',
+                    fail: (err) => {
+                        console.error('跳转第三方小程序失败:', err);
+                        this.fallbackToPhoneCall();
+                    }
+                });
+            } else {
+                uni.setClipboardData({
+                    data: config.thirdPartyServiceUrl,
+                    success: () => {
+                        uni.showModal({
+                            title: '客服链接已复制',
+                            content: '客服链接已复制到剪贴板，请在浏览器中粘贴访问',
+                            showCancel: false
+                        });
+                    }
+                });
+            }
             // #endif
             return;
         }
-        
+
         this.fallbackToPhoneCall();
     }
 
-    openAliappService(config) {
-        if (config.type === 'aikefu') {
-            this.openDifyService();
-        } else if (config.type === 'third') {
-            this.openThirdService(config);
-        } else {
-            // 支付宝原生客服由 button open-type="contact" 触发，此处不处理
-            console.log('使用支付宝官方客服');
-        }
-    }
-
-    // ================== 辅助方法 ==================
-
-    makePhoneCall() {
-        this.vm.$api.sendRequest({
-            url: '/api/site/shopcontact',
-            success: res => {
-                if (res.code === 0 && res.data?.mobile) {
-                    uni.makePhoneCall({ phoneNumber: res.data.mobile });
-                } else {
-                    uni.showToast({ title: '暂无客服电话', icon: 'none' });
+    /**
+     * 降级到电话客服
+     */
+    fallbackToPhoneCall() {
+        uni.showModal({
+            title: '联系客服',
+            content: '在线客服暂时不可用，是否拨打电话联系客服？',
+            success: (res) => {
+                if (res.confirm) {
+                    this.makePhoneCall();
                 }
-            },
-            fail: () => {
-                uni.showToast({ title: '获取客服电话失败', icon: 'none' });
             }
         });
     }
 
-    showNoServicePopup() {
-        const siteInfo = this.vm.$store.state.siteInfo || {};
-        const message = siteInfo?.site_tel 
-            ? `请联系客服，客服电话是 ${siteInfo.site_tel}` 
-            : '抱歉，商家暂无客服，请线下联系';
-        uni.showModal({ title: '联系客服', content: message, showCancel: false });
+    /**
+     * 打开支付宝小程序客服
+     * @param {Object} config 客服配置
+     */
+    openAliappService(config) {
+        console.log('支付宝小程序客服', config);
+        switch (config.type) {
+            case 'aikefu':
+                this.openAIKeFuService();
+                break;
+            case 'third':
+                this.openThirdService(config);
+                break;
+            default:
+                console.log('使用支付宝官方客服');
+                break;
+        }
     }
 
-    showConfigErrorPopup(errors) {
+    /**
+     * 拨打电话
+     */
+    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: mobile
+                    });                    
+                } else {
+                    uni.showToast({
+                        title: '暂无客服电话',
+                        icon: 'none'
+                    });                    
+                }
+            }
+        });
+    }
+
+    /**
+     * 显示无客服弹窗
+     */
+    showNoServicePopup() {
+        const siteInfo = this.vm.$store.state.siteInfo || {};
+        const message = siteInfo?.site_tel
+            ? `请联系客服，客服电话是${siteInfo.site_tel}`
+            : '抱歉，商家暂无客服，请线下联系';
+
         uni.showModal({
-            title: '客服配置错误',
-            content: `配置有误：\n${errors.join('\n')}`,
+            title: '联系客服',
+            content: message,
             showCancel: false
         });
     }
 
+    /**
+     * 显示配置错误弹窗
+     * @param {Array} errors 错误列表
+     */
+    showConfigErrorPopup(errors) {
+        const message = errors.join('\n');
+        uni.showModal({
+            title: '配置错误',
+            content: `客服配置有误：\n${message}`,
+            showCancel: false
+        });
+    }
+
+    /**
+     * 降级处理：使用原有客服方式
+     */
     fallbackToOriginalService() {
         uni.showModal({
             title: '提示',
-            content: '无法直接添加企业微信，是否使用其他方式联系客服？',
+            content: '无法直接添加企业微信客服，是否使用其他方式联系客服？',
             success: (res) => {
                 if (res.confirm) {
                     this.openWxworkService(true);
@@ -432,19 +497,9 @@ export class CustomerService {
         });
     }
 
-    fallbackToPhoneCall() {
-        uni.showModal({
-            title: '提示',
-            content: '在线客服不可用，是否拨打电话联系客服？',
-            success: (res) => {
-                if (res.confirm) this.makePhoneCall();
-            }
-        });
-    }
-
     /**
-     * 获取按钮配置（用于 template 中 v-if / open-type 判断）
-     * @returns {Object}
+     * 获取客服按钮配置
+     * @returns {Object} 按钮配置
      */
     getButtonConfig() {
         const config = this.getPlatformConfig();
@@ -452,10 +507,11 @@ export class CustomerService {
 
         let openType = '';
         // #ifdef MP-WEIXIN
-        if (config.type === 'weapp' && config.useOfficial !== false) {
-            openType = 'contact';
+        if (config.type === 'weapp') {
+            openType = config.useOfficial !== false ? 'contact' : '';
         }
         // #endif
+
         // #ifdef MP-ALIPAY
         if (config.type === 'aliapp') openType = 'contact';
         // #endif
@@ -464,241 +520,26 @@ export class CustomerService {
     }
 
     /**
-     * 获取客服按钮图标
-     * @returns {String} 图标URL
+     * 判断是否应该使用自定义客服处理
+     * @param {Object} config 客服配置
+     * @returns {boolean} 是否使用自定义客服
      */
-    getKefuButtonIcon() {
-        const shopInfo = this.vm.shopInfo || {};
-        const config = this.getPlatformConfig();
-
-        if (config?.type === 'aikefu') {
-            return shopInfo.aiAgentimg || '';
-        } else if (config?.type === 'wxwork' || config?.type === 'qyweixin') {
-            return shopInfo.aiAgentimg || '';
-        } else if (config?.type === 'third') {
-            return '';
-        }
-        return shopInfo.kefuimg || this.vm.$util?.getDefaultImage()?.kefu || '';
-    }
-
-    /**
-     * 判断是否为微信官方客服
-     * @returns {Boolean}
-     */
-    isWeappOfficialKefu() {
-        const config = this.getPlatformConfig();
-        return config?.type === 'weapp';
-    }
-
-    /**
-     * 判断是否为智能客服
-     * @returns {Boolean}
-     */
-    isAIKefu() {
-        const config = this.getPlatformConfig();
-        return config?.type === 'aikefu';
-    }
-
-    /**
-     * 判断是否为企业微信客服
-     * @returns {Boolean}
-     */
-    isWxworkKefu() {
-        const config = this.getPlatformConfig();
-        return config?.type === 'wxwork' || config?.type === 'qyweixin';
-    }
-
-    /**
-     * 判断是否为第三方客服
-     * @returns {Boolean}
-     */
-    isThirdKefu() {
-        const config = this.getPlatformConfig();
-        return config?.type === 'third';
-    }
-
-    /**
-     * 判断是否需要同时显示小程序系统客服
-     * @returns {Boolean}
-     */
-    shouldShowExtraWeappSystemKefu() {
-        const config = this.getPlatformConfig();
-        return (config?.show_system_service === true || config?.show_system_service === '1') && config?.type !== 'weapp';
-    }
-
-    /**
-     * 计算容器高度
-     * @param {Boolean} isLanguageSwitchEnabled 是否启用语言切换
-     * @param {Boolean} showWeappSystemKefu 是否显示小程序系统客服
-     * @param {Boolean} fixBtnShow 是否显示按钮
-     * @returns {String} 高度值（px）
-     */
-    getContainerHeight(isLanguageSwitchEnabled, showWeappSystemKefu, fixBtnShow) {
-        if (!fixBtnShow) return '160px';
-
-        let buttonCount = 1;
-        if (isLanguageSwitchEnabled) buttonCount++;
-        if (showWeappSystemKefu) buttonCount++;
-
-        const totalRpx = 94 * buttonCount - 14;
-        const pxValue = Math.round(totalRpx * 0.5);
-
-        return `${pxValue}px`;
-    }
-
-    /**
-     * 获取未读消息数量
-     * @returns {Number}
-     */
-    getUnreadCount() {
-        return this.vm.$store?.state?.aiUnreadCount || 0;
-    }
-
-    /**
-     * 拨打电话联系客服
-     * @param {String} phoneNumber 电话号码
-     */
-    makePhoneCallByNumber(phoneNumber) {
-        if (phoneNumber) {
-            uni.makePhoneCall({ phoneNumber });
-        } else {
-            this.makePhoneCall();
-        }
-    }
-
-    /**
-     * 打开 AI 智能助手
-     */
-    openAIChat() {
-        try {
-            if (typeof this.vm.setAiUnreadCount === 'function') {
-                this.vm.setAiUnreadCount(0);
-            }
-
-            const aiChatUrl = '/pages_tool/ai-chat/index';
-
-            uni.navigateTo({
-                url: aiChatUrl,
-                fail: (err) => {
-                    console.error('跳转 AI 客服失败:', err);
-                    // #ifdef H5
-                    window.location.href = aiChatUrl;
-                    // #endif
-                    uni.showToast({ title: '打开客服失败', icon: 'none' });
-                }
-            });
-        } catch (e) {
-            console.error('跳转 AI 客服异常:', e);
-            uni.showToast({ title: '打开客服失败', icon: 'none' });
-        }
-    }
-
-    /**
-     * 打开客服选择对话框（预留方法）
-     */
-    openCustomerSelectPopupDialog() {
-        uni.showToast({ title: '客服选择功能开发中', icon: 'none' });
-    }
-
-    /**
-     * 打开客服选择弹出层（ActionSheet）
-     * @param {Array} kefuList 客服列表
-     */
-    openKefuSelectPopup(kefuList) {
-        const kefuNames = kefuList.map(item => item.name);
-        uni.showActionSheet({
-            itemList: kefuNames,
-            success: (res) => {
-                const selectedKefu = kefuList[res.tapIndex];
-                const cs = createCustomerService(this.vm, selectedKefu);
-
-                if (selectedKefu.isOfficial) {
-                    uni.openCustomerServiceConversation({
-                        sessionFrom: 'weapp',
-                        showMessageCard: true
-                    });
-                } else if (selectedKefu.id === 'qyweixin-kefu') {
-                    if (uni.getSystemInfoSync().platform === 'wechat') {
-                        uni.navigateTo({
-                            url: '/pages_tool/qyweixin-kefu/index'
-                        });
-                    } else {
-                        const qyweixinUrl = this.vm.shopInfo?.qyweixinUrl;
-                        if (qyweixinUrl) {
-                            window.location.href = qyweixinUrl;
-                        } else {
-                            uni.showToast({ title: '企业微信客服未配置', icon: 'none' });
-                        }
-                    }
-                } else {
-                    cs.handleCustomerClick();
-                }
-            }
-        });
-    }
-
-    /**
-     * 核心方法：统一客服入口（带验证和配置检查）
-     * @param {Object} options 选项参数
-     */
-    handleUnifiedKefuClick(options = {}) {
-        const validation = this.validateConfig();
-
-        console.log('【客服配置验证】', validation);
-
-        if (!validation.isValid) {
-            console.error('客服配置无效:', validation.errors);
-            uni.showToast({ title: '客服暂不可用', icon: 'none' });
-            return;
-        }
-
-        if (validation.warnings.length > 0) {
-            console.warn('客服配置警告:', validation.warnings);
-        }
-
-        const platformConfig = this.getPlatformConfig();
-        console.log('【当前客服配置】', platformConfig);
-
-        // 检查企业微信配置
-        if (platformConfig.type === 'wxwork') {
-            const wxworkConfig = this.getWxworkConfig();
-            console.log('【企业微信配置】', wxworkConfig);
-
-            // #ifdef MP-WEIXIN
-            if (!wxworkConfig?.enable || !wxworkConfig?.contact_url) {
-                console.warn('企业微信配置不完整，使用原生客服');
-                uni.showToast({ title: '企业微信配置不完整', icon: 'none' });
-            }
-            // #endif
-
-            // #ifdef H5
-            if (!wxworkConfig?.contact_url && !platformConfig.wxwork_url) {
-                console.error('企业微信链接未配置');
-                uni.showToast({ title: '企业微信链接未配置', icon: 'none' });
-                return;
-            }
-            // #endif
-        }
-
-        // 直接调用统一处理方法，由 CustomerService 内部根据配置路由
-        try {
-            this.handleCustomerClick({
-                sendMessageTitle: options.sendMessageTitle || '来自悬浮按钮的咨询',
-                sendMessagePath: options.sendMessagePath || '/pages/index/index'
-            });
-        } catch (error) {
-            console.error('客服处理失败:', error);
-            uni.showToast({ title: '打开客服失败', icon: 'none' });
+    shouldUseCustomService(config) {
+        // #ifdef MP-WEIXIN
+        if (config?.type === 'weapp') {
+            return config.useOfficial === false;
         }
+        // #endif
+        return true;
     }
 }
 
 /**
  * 创建客服服务实例
- * @param {Object} vueInstance Vue 实例（通常是 this）
- * @param {Object} externalConfig 可选：外部传入的最新配置（如从 DIY 数据中提取）
- * @returns {CustomerService}
+ * @param {Object} vueInstance Vue实例
+ * @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

@@ -609,10 +609,10 @@ export default {
 	},
 	// 分享给好友
 	onShareAppMessage() {
-		return this.mpShareData?.appMessage;
+		return this.mpShareData.appMessage;
 	},
 	// 分享到朋友圈
 	onShareTimeline() {
-		return this.mpShareData?.timeLine;
+		return this.mpShareData.timeLine;
 	}
 }

common/js/golbalConfig.js

@@ -7,7 +7,7 @@ export default {
 	computed: {
 		// 是否是英文环境
 		isEnEnv() {
-			return this.$langConfig.getCurrentLocale() === 'en-us';
+			return uni.getStorageSync('lang') === 'en-us';
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;
@@ -65,10 +65,6 @@ export default {
 		componentRefresh() {
 			return this.$store.state.componentRefresh;
 		},
-		// AI客服配置
-		globalAIKefuConfig() {
-			return this.$store.state.globalAIKefuConfig;
-		},
 		// 客服配置
 		servicerConfig() {
 			return this.$store.state.servicerConfig;

common/js/lang.js

@@ -54,30 +54,18 @@ function loadLangPackSync(lang, path) {
 	}
 }
 
-function getCurrentLocale() {
-	return uni.getStorageSync('lang') || "zh-cn"; 
-}
-
-
 export default {
 	langList: langConfig.langList,
-
-	/**
-	 * 获得当前本地语言
-	 * @returns 
-	 */
-	getCurrentLocale,
-
 	/**
 	 * * 解析多语言
 	 * @param {Object} field
 	 */
 	lang(field) {
-		let _page = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_page) return;
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
+
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
-		const locale = getCurrentLocale(); // 获得当前本地语言
-		
 		let value = ''; // 存放解析后的语言值
 		let langPath = ''; // 存放当前页面语言包路径
 
@@ -86,7 +74,7 @@ export default {
 			var lang = loadLangPackSync(locale, 'common');
 			
 			//当前页面语言包（同步加载）
-			let route = _page.route;
+			let route = _this.route;
 			langPath = processRoutePath(route);
 			
 			// 加载当前页面语言包
@@ -140,11 +128,11 @@ export default {
 	 * @param {String} url 切换后跳转的页面url
 	 */
 	change(value, url = '/pages_tool/member/index') {
-		let _page = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_page) return;
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
 
 		uni.setStorageSync("lang", value);
-		const locale = getCurrentLocale();
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
 		// 清空已加载的语言包缓存
 		for (let key in loadedLangPacks) {
@@ -161,10 +149,9 @@ export default {
 	},
 	//刷新标题、tabbar
 	refresh() {
-		let _page = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_page) return;
-
-		const locale = getCurrentLocale();
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 	
 		this.title(this.lang("title"));
 
@@ -215,4 +202,4 @@ export default {
 		}
 		return list;
 	}
-}
+}

common/js/uniapp.utils.js

@@ -6,23 +6,13 @@
 /**
  * 显示错误信息
  * @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,
-        })
-    }
+const showError = (err) => {
+    uni.showToast({
+        title: err?.message || err?.errMsg || err?.toString(),
+        icon: 'none',
+        duration: 2000
+    });
 }
 
 /**
@@ -43,92 +33,43 @@ export const makePhoneCall = (mobile) => {
 }
 
 /**
- * 拷贝文本（返回 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);
+export const copyText = (text, { copySuccess = '', copyFailed = '' } = {}) => {
+    try {
+        console.log('copyText');
+        uni.setClipboardData({
+            data: `${text}`,
+            success: () => {
+                console.error('复制成功');
+                try {
+                    uni.showToast({
+                        title: copySuccess,
+                        icon: 'success',
+                        duration: 2000
+                    });
+                } catch (e) {
+                    showError(e);
                 }
-            });
-        } 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);
+            },
+            fail: (err) => {
+                console.error('复制失败:', err);
+                try {
+                    uni.showToast({
+                        title: err.message || err.errMsg || copyFailed,
+                        icon: 'none',
+                        duration: 2000
+                    });
+                } catch (e) {
+                    showError(e);
+                }
+            }
         });
+    } catch (err) {
+        showError(err);
+    }
 }
 
 /**

common/js/util.js

@@ -130,7 +130,9 @@ export default {
 	 */
 	redirectTo(to, param = {}, mode = 'navigateTo') {
 		let url = to;
-
+ if (to.indexOf('/article/list') !== -1) {
+        mode = 'reLaunch';
+    }
 		// 替换url中的前缀
 		console.log('页面跳转 redirectTo', to, param, mode);
 		url = adaptSubpackageUrl(url);
@@ -843,15 +845,6 @@ export default {
 			uni.navigateBack();
 		}
 	},
-	/**
-	 * 隐藏“返回首页/小房子”按钮
-	 * 这个函数，用到页面show, onshow 的生命周期时
-	 */
-	hideHomeButton() {
-		// #ifdef MP-WEIXIN
-		wx.hideHomeButton();
-		// #endif
-	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）

components-diy/diy-article.vue

@@ -7,7 +7,7 @@
 					:autoplay="swiperConfig.autoplay !== false" :circular="swiperConfig.circular !== false"
 					:interval="swiperConfig.interval || 3000" :duration="swiperConfig.duration || 500"
 					:display-multiple-items="safeDisplayMultipleItems">
-					<swiper-item v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)">
+					<swiper-item v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="swiper-item-content">
 							<view :class="['item', value.ornament.type]" :style="itemCss">
 								<view class="article-img">

components-diy/diy-audio.vue

@@ -11,7 +11,7 @@
 			<view class="time" :style="{ color: value.timecolor }">
 				{{ audiotime }}
 			</view>
-			<view @tap.stop="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"
+			<view @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"
 				style="padding-top: 18rpx"></view>
 		</view>
 		<view class="fui-audio style3" :style="{ background: value.background }" v-else>
@@ -30,7 +30,7 @@
 				<!-- {{audios[value.id].audiotime}} -->
 				{{ audiotime }}
 			</view>
-			<view @tap.stop="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"></view>
+			<view @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"></view>
 		</view>
 	</view>
 </template>

components-diy/diy-bargain.vue

@@ -15,7 +15,7 @@
 					:style="{ color: value.titleStyle.textColor }">低至0元免费拿</view>
 				<view class="head-right"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="$util.redirectTo('/pages_promotion/bargain/list')">
+					@click="$util.redirectTo('/pages_promotion/bargain/list')">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
@@ -23,7 +23,7 @@
 
 			<!-- 商品列表 -->
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -84,7 +84,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -130,7 +130,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-bottom-nav.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-bottom-nav" v-if="tabBarList && tabBarList.list">
 		<view class="tab-bar" :style="{ backgroundColor: tabBarList.backgroundColor }">
 			<view class="tabbar-border"></view>
-			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @tap.stop="redirectTo(item.link)">
+			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @click="redirectTo(item.link)">
 				<view class="bd">
 					<block v-if="item.link.wap_url == '/pages_goods/cart'">
 						<view class="icon" v-if="tabBarList.type == 1 || tabBarList.type == 2"

components-diy/diy-category-item.vue

@@ -1,7 +1,7 @@
 <template>
 	<view data-component-name="diy-category-item" class="item-wrap" :class="type">
 		<block v-if="type == 'category' && category.child_list && category.child_list.length">
-			<view class="category-adv" v-if="category.image_adv" @tap.stop="diyRedirectTo(category.link_url)">
+			<view class="category-adv" v-if="category.image_adv" @click="diyRedirectTo(category.link_url)">
 				<image :src="$util.img(category.image_adv)" mode="widthFix" />
 			</view>
 
@@ -9,7 +9,7 @@
 				<view class="category-title">{{ category.category_name }}</view>
 				<view class="category-list">
 					<view class="category-item" v-for="(one, oneIndex) in category.child_list" :key="oneIndex"
-						@tap.stop="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
+						@click="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
 						<view class="img-box">
 							<image :src="$util.img(one.image)" mode="widthFix" />
 						</view>
@@ -23,7 +23,7 @@
 					<view class="category-title">{{ one.category_name }}</view>
 					<view class="category-list">
 						<view class="category-item" v-for="(two, twoIndex) in one.child_list" :key="twoIndex"
-							@tap.stop="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
+							@click="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
 							<view class="img-box">
 								<image :src="$util.img(two.image)" mode="widthFix" :lazy-load="true" />
 							</view>
@@ -44,22 +44,22 @@
 							:class="{ 'screen-category-4': value.template == 4 }" :scroll-with-animation="true"
 							:scroll-into-view="scrollIntoView">
 							<view class="item" id="category-2--1" :class="{ selected: categoryId == -1 }"
-								@tap.stop="selectCategory(-1)">全部</view>
+								@click="selectCategory(-1)">全部</view>
 							<view class="item" :id="'category-2-' + oneIndex"
-								:class="{ selected: categoryId == oneIndex }" @tap.stop="selectCategory(oneIndex)"
+								:class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)"
 								v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 								{{ one.category_name }}
 							</view>
 						</scroll-view>
-						<view class="iconfont icon-unfold" @tap.stop="$refs.screenCategoryPopup.open()"></view>
+						<view class="iconfont icon-unfold" @click="$refs.screenCategoryPopup.open()"></view>
 					</view>
 					<uni-popup type="top" ref="screenCategoryPopup">
-						<view class="screen-category-popup" @tap.stop="$refs.screenCategoryPopup.close()">
+						<view class="screen-category-popup" @click="$refs.screenCategoryPopup.close()">
 							<scroll-view scroll-y="true" class="screen-category"
 								:class="{ 'screen-category-4': value.template == 4 }">
 								<view class="title">全部</view>
 								<view class="item" :class="{ selected: categoryId == oneIndex }"
-									@tap.stop="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
+									@click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
 									:key="oneIndex">
 									{{ one.category_name }}
 								</view>
@@ -81,13 +81,13 @@
 						:data-template="value.template">
 						<block v-if="goodsList.length">
 							<view class="goods-item" v-for="(item, index) in goodsList" :key="index">
-								<view class="goods-img" @tap.stop="toDetail(item)">
+								<view class="goods-img" @click="toDetail(item)">
 									<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)" />
 									<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}
 									</view>
 								</view>
 								<view class="info-wrap">
-									<view class="name-wrap" @tap.stop="toDetail(item)">
+									<view class="name-wrap" @click="toDetail(item)">
 										<view class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
 									</view>
 									<view class="price-wrap">
@@ -122,25 +122,25 @@
 										</view>
 										<!-- <view class="right-wrap" v-if="value.template == 2 || value.template == 4">
 											<block v-if="item.is_virtual">
-												<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+												<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 											</block>
 											<block v-else>
-												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @tap.stop="selectSku(item)">
+												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @click="selectSku(item)">
 													<text>选规格</text>
 													<text class="num-tag" v-if="item.num">{{ item.num }}</text>
 												</view>
 												<block v-else>
 													<block v-if="cartList['goods_' + item.goods_id]&&cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
-														<view class="num-action reduce" @tap.stop="reduce(item)">
+														<view class="num-action reduce" @click="reduce(item)">
 															<text class="iconfont icon-jian"></text>
 														</view>
 														<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' + item.sku_id].num }}</view>
-														<view class="num-action" :id="'cart-num-' + index" @tap.stop="increase($event, item)">
+														<view class="num-action" :id="'cart-num-' + index" @click="increase($event, item)">
 															<text class="iconfont icon-jia"></text>
 															<view class="click-event"></view>
 														</view>
 													</block>
-													<view class="num-action" v-else :id="'cart-num-' + index" @tap.stop="increase($event, item, 0)">
+													<view class="num-action" v-else :id="'cart-num-' + index" @click="increase($event, item, 0)">
 														<text class="iconfont icon-jia"></text>
 														<view class="click-event"></view>
 													</view>
@@ -148,7 +148,7 @@
 											</block>
 										</view> -->
 										<!-- 	<view class="right-wrap" v-if="value.template == 3">
-											<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+											<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 										</view> -->
 									</view>
 								</view>
@@ -158,7 +158,7 @@
 							<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix" />
 						</view>
 						<!-- 		<view class="end-tips" ref="endTips" v-if="last && (categoryId == -1 || !category.child_list || (category.child_list && categoryId == category.child_list.length - 1))">已经到底了~</view>
-						<view class="end-tips" ref="endTips" v-else @tap.stop="switchCategory('next')">
+						<view class="end-tips" ref="endTips" v-else @click="switchCategory('next')">
 							<text class="iconfont icon-xiangshangzhanhang"></text>
 							上滑查看下一分类
 						</view> -->
@@ -173,13 +173,13 @@
 				<view class="goods-list" :class="{ 'double-column': !isList, 'single-column': isList }"
 					:data-template="value.template">
 					<view class="goods-item" v-for="(item, index) in goodsList" :key="index">
-						<view class="goods-img" @tap.stop="toDetail(item)">
+						<view class="goods-img" @click="toDetail(item)">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"
 								:lazy-load="true" />
 							<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}</view>
 						</view>
 						<view class="info-wrap">
-							<view class="name-wrap" @tap.stop="toDetail(item)">
+							<view class="name-wrap" @click="toDetail(item)">
 								<view class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
 							</view>
 							<view class="price-wrap">
@@ -214,30 +214,30 @@
 								</view>
 								<view class="right-wrap" v-if="value.template == 2">
 									<block v-if="item.is_virtual">
-										<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+										<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 									</block>
 									<block v-else>
 										<view v-if="item.goods_spec_format" class="color-base-bg select-sku"
-											@tap.stop="selectSku(item)">
+											@click="selectSku(item)">
 											<text>选规格</text>
 											<text class="num-tag" v-if="item.num">{{ item.num }}</text>
 										</view>
 										<block v-else>
 											<block
 												v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
-												<view class="num-action reduce" @tap.stop="reduce(item)">
+												<view class="num-action reduce" @click="reduce(item)">
 													<text class="iconfont icon-jian"></text>
 												</view>
 												<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' +
 													item.sku_id].num }}</view>
 												<view class="num-action" :id="'cart-num-' + index"
-													@tap.stop="increase($event, item)">
+													@click="increase($event, item)">
 													<text class="iconfont icon-jia"></text>
 													<view class="click-event"></view>
 												</view>
 											</block>
 											<view class="num-action" v-else :id="'cart-num-' + index"
-												@tap.stop="increase($event, item, 0)">
+												@click="increase($event, item, 0)">
 												<text class="iconfont icon-jia"></text>
 												<view class="click-event"></view>
 											</view>
@@ -245,7 +245,7 @@
 									</block>
 								</view>
 								<view class="right-wrap" v-if="value.template == 3">
-									<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+									<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 								</view>
 							</view>
 						</view>

components-diy/diy-category.vue

@@ -3,9 +3,9 @@
 		:style="{ height: 'calc(100vh - ' + tabBarHeight + ')' }">
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- <block v-if="value.template == 4">
-			<view class="search-box" v-if="value.search" @tap.stop="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
+			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
 				<view class="search-content">
-					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @tap.stop="onClickSearch()" disabled="true" />
+					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 			</view>
@@ -13,35 +13,35 @@
 		</block> -->
 		<block v-if="value.template != 4">
 			<!-- 			<view :style="navbarInnerStyle">商品分类</view> -->
-			<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()"
+			<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()"
 				:style="wxSearchHeight">
 				<view class="search-content">
 					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')"
-						confirm-type="search" @tap.stop="onClickSearch()"
+						confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()"
 						disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-					@tap.stop.prevent="changeListStyle()"></view>
+					@click.stop.prevent="changeListStyle()"></view>
 			</view>
 		</block>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()">
+		<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()">
 			<view class="search-content">
 				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search"
-					@tap.stop="onClickSearch()" disabled="true" />
+					@click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
 			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-				@tap.stop.prevent="changeListStyle()"></view>
+				@click.stop.prevent="changeListStyle()"></view>
 		</view>
 		<!-- #endif -->
 		<view class="template-four wx" v-if="value.template == 4">
 			<scroll-view scroll-x="true" class="template-four-wrap" :scroll-with-animation="true"
 				:scroll-into-view="'category-one-' + oneCategorySelect" enable-flex="true">
 				<view class="category-item" :id="'category-one-' + index" v-for="(item, index) in templateFourData"
-					:key="index" :class="{ select: oneCategorySelect == index }" @tap.stop="templateFourOneFn(index)">
+					:key="index" :class="{ select: oneCategorySelect == index }" @click="templateFourOneFn(index)">
 					<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
 						<image :src="$util.img(item.image)" mode="aspectFill" />
 					</view>
@@ -49,7 +49,7 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view class="category-item-all" @tap.stop="$refs.templateFourPopup.open()">
+			<view class="category-item-all" @click="$refs.templateFourPopup.open()">
 				<view class="category-item-all-wrap">
 					<text class="text">展开</text>
 					<image class="img" :src="$util.img('/public/uniapp/category/unfold.png')" mode="aspectFill"></image>
@@ -59,7 +59,7 @@
 				<view class="template-four-popup">
 					<scroll-view scroll-y="true" class="template-four-scroll" enable-flex="true">
 						<view class="item" :class="{ selected: oneCategorySelect == index }"
-							@tap.stop="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
+							@click="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
 							<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
 								<image :src="$util.img(item.image)" mode="aspectFill"></image>
 							</view>
@@ -67,7 +67,7 @@
 								item.category_name }}</view>
 						</view>
 					</scroll-view>
-					<view class="pack-up" @tap.stop="$refs.templateFourPopup.close()">
+					<view class="pack-up" @click="$refs.templateFourPopup.close()">
 						<text>点击收起</text>
 						<text class="iconfont icon-iconangledown-copy"></text>
 					</view>
@@ -83,7 +83,7 @@
 							{ select: select == index },
 							{ 'border-bottom': value.template == 4 && select + 1 === index },
 							{ 'border-top': value.template == 4 && select - 1 === index }
-						]" @tap.stop="switchOneCategory(index)">
+						]" @click="switchOneCategory(index)">
 							<view class="">{{ item.category_name }}</view>
 						</view>
 					</view>
@@ -130,7 +130,7 @@
 
 		<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
 			<view class="left-wrap">
-				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @tap.stop="$util.redirectTo('/pages_goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -141,7 +141,7 @@
 					<text class="unit font-size-tag price-font">.{{ cartTotalMoney[1] ? cartTotalMoney[1] : '00' }}</text>
 				</view>
 			</view>
-			<view class="right-wrap"><button type="primary" class="settlement-btn" @tap.stop="settlement">去结算</button>
+			<view class="right-wrap"><button type="primary" class="settlement-btn" @click="settlement">去结算</button>
 			</view>
 		</view> -->
 

components-diy/diy-channel-video.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="video-info">
 				<!-- 视频标题，支持多行显示控制 -->
-				<view class="video-title" :style="[{ '--title-line-clamp': titleLineClamp }]">{{ value.videoTitle }}
+				<view class="video-title" :style="{ '--title-line-clamp': titleLineClamp }">{{ value.videoTitle }}
 				</view>
 				<!-- 视频统计信息 -->
 				<view class="video-stats" v-if="showViewCount && value.showViewCount">{{ value.viewCount }}次观看</view>
@@ -22,7 +22,7 @@
 		</view>
 
 		<!-- 跳转式视频播放 -->
-		<view v-else @tap.stop="playVideo" class="video-container">
+		<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]">
@@ -34,7 +34,7 @@
 			</view>
 			<view class="video-info">
 				<!-- 视频标题，支持多行显示控制 -->
-				<view class="video-title" :style="[{ '--title-line-clamp': titleLineClamp }]">{{ value.videoTitle }}
+				<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>

components-diy/diy-coupon.vue

@@ -16,7 +16,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
@@ -52,7 +52,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
 									v-if="!parseInt(item.discount)">
@@ -87,7 +87,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-num" :style="{ color: value.moneyColor }"
 								v-if="!parseInt(item.discount)">
 								<text class="font-size-tag coupon-sign">￥</text>
@@ -124,7 +124,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
 									v-if="!parseInt(item.discount)">
@@ -153,7 +153,7 @@
 					<view class="coupon-all">
 						<view class="coupon-box">
 							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index"
-								@tap.stop="couponAction(item, index)">
+								@click="couponAction(item, index)">
 								<image :src="$util.img('public/uniapp/coupon/style5_bg.png')"></image>
 								<view class="coupon">
 									<view class="coupon-info">
@@ -199,7 +199,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-1.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-content">
 								<view class="price-wrap">
 									<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00'
@@ -229,7 +229,7 @@
 							<text class="limit" :style="{ color: value.limitColor }" v-else>无门槛使用</text>
 						</view>
 
-						<div v-if="computedCouponList.length <= 2" @tap.stop="$util.redirectTo('/pages_goods/category')"
+						<div v-if="computedCouponList.length <= 2" @click="$util.redirectTo('/pages_goods/category')"
 							class="coupon coupon-null" :style="{
 								color: value.moneyColor,
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-2.png') + ')',
@@ -250,7 +250,7 @@
 				<scroll-view class="coupon-style-seven" scroll-x="true">
 					<view class="wrap">
 						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index"
-							@tap.stop="couponAction(item, index)">
+							@click="couponAction(item, index)">
 							<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
 							<view class="coupon">
 								<view class="coupon-info">

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

@@ -1,7 +1,7 @@
 <template>
 	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length"
 		:class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
-		<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 			:class="[value.ornament.type]" :style="goodsItemCss">
 			<view class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 				<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -32,14 +32,14 @@
 							background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
 							color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
 							borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-						}" @tap.stop="followGoods(item, index)">
+						}" @click.stop="followGoods(item, index)">
 							关注
 						</view>
 						<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 1" :style="{
 							background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
 							color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
 							borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-						}" @tap.stop="delFollowTip(item, index)">
+						}" @click.stop="delFollowTip(item, index)">
 							取消关注
 						</view>
 					</view>

components-diy/diy-float-btn.vue

@@ -3,7 +3,7 @@
 		:class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }"
 		:style="style">
 		<block v-for="(item, index) in value.list" :key="index">
-			<view class="button-box" @tap.stop="$util.diyRedirectTo(item.link)"
+			<view class="button-box" @click="$util.diyRedirectTo(item.link)"
 				:style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
 				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit"
 					:show-menu-by-longpress="true" />

components-diy/diy-form.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 		</view>
-		<view @tap.stop="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
+		<view @click="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
 	</view>
 </template>
 

components-diy/diy-goods-brand.vue

@@ -8,7 +8,7 @@
 				<view class="ul-wrap">
 					<view class="li-item" v-for="(item, index) in list" :key="index">
 						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit"
-							@tap.stop="handlerClick(item)" @error="imgError(index)"
+							@click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)"
 							:style="itemCss" />
 					</view>
 				</view>

components-diy/diy-goods-list.vue

@@ -2,8 +2,8 @@
 	<x-skeleton data-component-name="diy-goods-list" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view :class="['goods-list', goodsValue.template, goodsValue.style]" :style="goodsListWarpCss">
 			<template v-if="goodsValue.template != 'horizontal-slide'">
-				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-img-wrap">
 						<image class="goods-img"
 							:src="$util.img(item.goods_image, { size: goodsValue.template == 'large-mode' ? 'big' : 'mid' })"
@@ -70,7 +70,7 @@
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
 									borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 								</view>
 
@@ -79,7 +79,7 @@
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
 									borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 								</view>
 
@@ -90,7 +90,7 @@
 									fontWeight: goodsValue.btnStyle.theme == 'diy' ? (goodsValue.btnStyle.fontWeight ? 'bold' : 'normal') : '',
 									padding: goodsValue.btnStyle.theme == 'diy' ? '0 ' + goodsValue.btnStyle.padding * 2 + 'rpx' : ''
 								}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									{{ goodsValue.btnStyle.text }}
 									<view class="click-event"></view>
 									<!-- <text class="cart-num" v-if="cartList['goods_' + item.goods_id]">{{ cartList['goods_' + item.goods_id].num }}</text> -->
@@ -100,7 +100,7 @@
 								<view v-else-if="goodsValue.btnStyle.style == 'icon-diy'" :style="{
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="icon-diy click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 									<diy-icon :icon="goodsValue.btnStyle.iconDiy.icon"
 										:value="goodsValue.btnStyle.iconDiy.style ? goodsValue.btnStyle.iconDiy.style : null"></diy-icon>
@@ -112,8 +112,8 @@
 			</template>
 			<scroll-view v-if="goodsValue.template == 'horizontal-slide' && goodsValue.slideMode == 'scroll'"
 				class="scroll" :scroll-x="true">
-				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-img-wrap">
 						<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)"
@@ -179,7 +179,7 @@
 				<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 					:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 					<view class="goods-item" v-for="(dataItem, dataIndex) in list[pageIndex]" :key="dataIndex"
-						@tap.stop="handlerClick(dataItem)"
+						@click="handlerClick(dataItem)" @tap="handlerClick(dataItem)"
 						:class="[goodsValue.ornament.type]" :style="goodsItemCss">
 						<view class="goods-img-wrap">
 							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"

components-diy/diy-goods-recommend.vue

@@ -13,7 +13,7 @@
 				<swiper-item v-for="(item, index) in page" :key="index"
 					:class="['swiper-item', [list[index].length / 3] >= 1 && 'flex-between']">
 					<view class="goods-item" v-for="(dataItem, dataIndex) in list[index]" :key="dataIndex"
-						@tap.stop="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+						@click="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 						<div class="goods-img-wrap">
 							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 								:src="$util.img(dataItem.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-graphic-nav.vue

@@ -9,13 +9,13 @@
                     <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
                         :key="index"
                         v-if="index >= [(numItem) * (value.pageCount * value.rowCount)] && index < [(numItem + 1) * (value.pageCount * value.rowCount)]"
-                        :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                        :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                         <!-- #endif -->
                         <!-- #ifdef H5 -->
                         <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
                             :key="index"
                             v-if="index >= [(numItem - 1) * (value.pageCount * value.rowCount)] && index < [numItem * (value.pageCount * value.rowCount)]"
-                            :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                            :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                             <!-- #endif -->
                             <view class="graphic-img" v-if="value.mode != 'text'"
                                 :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
@@ -62,7 +62,7 @@
                 <!-- #endif -->
 
                 <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list" :key="index"
-                    :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                    :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                     <view class="graphic-img" v-if="value.mode != 'text'"
                         :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
                         <image v-if="item.iconType == 'img'"

components-diy/diy-group.vue

@@ -251,11 +251,6 @@
 				<diy-icon :value="item"></diy-icon>
 			</template>
 
-			<template v-if="item.componentName == 'Tab'">
-				<!-- Tab 组件 -->
-				<diy-tab :value="item" :diyGlobal="diyGlobalData"></diy-tab>
-			</template>
-
 			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
 				<!-- 视频号列表 -->
 				<diy-channel-list :value="item"></diy-channel-list>
@@ -272,7 +267,6 @@
 import DiyMinx from './minx.js'
 
 export default {
-	name: 'diy-group',
 	props: {
 		diyData: {
 			type: Object
@@ -317,12 +311,7 @@ export default {
 			this.diyGlobalData.value.forEach((item, index) => {
 				item.pageStyle = '';
 				// 给每个组件增加位置属性，用于定位，搜索、分类导航等定位
-				// 如果是Tab组件内部的子组件，添加tabIndex前缀避免moduleIndex冲突
-				if (this.diyData.tabIndex !== undefined) {
-					item.moduleIndex = `${this.diyData.tabIndex}-${index + 1}`;
-				} else {
-					item.moduleIndex = index + 1;
-				}
+				item.moduleIndex = index + 1;
 
 				// 特殊处理搜索框 当显示位置为滚动至顶部固定时，只设置背景颜色
 				if (item.componentName == 'Search' && item.positionWay == 'fixed') {
@@ -357,12 +346,6 @@ export default {
 					}
 				});
 			} else data = this.setPagestyle;
-
-			console.log(`diy-group ['diyDataArray'] = `, {
-				data: data,
-				diyData: this.diyData,
-				diyGlobalData: this.diyGlobalData,
-			})
 			return data;
 		}
 	},

components-diy/diy-groupbuy.vue

@@ -2,7 +2,7 @@
 	<x-skeleton data-component-name="diy-groupbuy" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-groupbuy" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -39,7 +39,7 @@
 			</template>
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -81,7 +81,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-hot-area.vue

@@ -9,7 +9,7 @@
 				height: mapItem.height + '%',
 				left: mapItem.left + '%',
 				top: mapItem.top + '%'
-			}" @tap.stop="$util.diyRedirectTo(mapItem.link)"></view>
+			}" @click.stop="$util.diyRedirectTo(mapItem.link)"></view>
 		</view>
 	</view>
 </template>

components-diy/diy-image-nav.vue

@@ -15,12 +15,12 @@
 							'width': (item.imgWidth / 2 + 'rpx') + ';',
 							'height': (item.imgHeight / 2 + 'rpx') + ';'
 						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true" @tap.stop="redirectTo(item.link)"></image>
+							:show-menu-by-longpress="true" @tap="redirectTo(item.link)"></image>
 						<image v-else :style="{
 							'width': (item.imgWidth / 2 + 'rpx') + ';',
 							'height': (item.imgHeight / 2 + 'rpx') + ';'
 						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true" @tap.stop="previewImg(item.imageUrl)"></image>
+							:show-menu-by-longpress="true" @tap="previewImg(item.imageUrl)"></image>
 					</view>
 
 					<!-- 文字部分 -->
@@ -103,6 +103,17 @@ export default {
 		}
 	},
 	methods: {
+		// 预览图片
+		previewImg(imageUrl) {
+			uni.previewImage({
+				current: 0,
+				urls: [this.$util.img(imageUrl)],
+				success: (res) => { },
+				fail: (res) => { },
+				complete: (res) => { }
+			});
+		},
+
 		// 页面跳转
 		redirectTo(link) {
 			if (!link.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {

components-diy/diy-img-ads.vue

@@ -2,7 +2,8 @@
 	<view data-component-name="diy-img-ads" class="single-graph">
 		<view :style="imgAdsMarginWarp" class="swiper-box">
 			<block v-if="imgAdsValue.list.length == 1">
-				<view class="simple-graph-wrap" :style="imgAdsSwiper" @tap.stop="handlerClick(imgAdsValue.list[0].link)">
+				<view class="simple-graph-wrap" :style="imgAdsSwiper" @click="handlerClick(imgAdsValue.list[0].link)"
+					@tap="handlerClick(imgAdsValue.list[0].link)">
 					<image :style="{ height: imgAdsValue.list[0].imgHeight }"
 						:src="$util.img(imgAdsValue.list[0].imageUrl)" mode="widthFix" :show-menu-by-longpress="true" />
 				</view>
@@ -15,7 +16,7 @@
 				indicator-color="rgba(130, 130, 130, .5)" :indicator-active-color="imgAdsValue.indicatorColor"
 				@change="swiperChange">
 				<swiper-item class="swiper-item" :style="imgAdsSwiper" v-for="(item, index) in imgAdsValue.list"
-					:key="index" v-if="item.imageUrl" @tap.stop="handlerClick(item.link)">
+					:key="index" v-if="item.imageUrl" @click="handlerClick(item.link)" @tap="handlerClick(item.link)">
 					<view class="item" :style="imgAdsSwiper + 'height: ' + item.imgHeight">
 						<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 							:show-menu-by-longpress="true" />

components-diy/diy-index-page.vue

@@ -8,7 +8,7 @@
 						:style="{ background: value.backgroundColor ? value.backgroundColor : '', width: 'calc(100% - 48rpx)' }"
 						@touchmove.stop>
 						<view class="item" :id="'a' + index" v-for="(item, index) in cateList" :key="index"
-							@tap.stop="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
+							@click="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
 							:style="{ background: index == pageIndex && value.styleType == 'fill' ? value.selectColor : '' }">
 							<view class="text-con" :class="index == pageIndex ? 'active' : ''" :style="{
 								color: index == pageIndex ? '' : value.noColor
@@ -25,13 +25,13 @@
 						</view>
 					</scroll-view>
 					<text class="iconfont icon-unfold unfold-arrows" :style="{ color: value.moreColor }"
-						@tap.stop="unfoldMenu"></text>
+						@click="unfoldMenu"></text>
 				</view>
 				<uni-popup ref="navTopCategoryPop" type="top" :top="uniPopTop">
 					<view class="nav-topcategory-pop">
 						<text v-for="(item, index) in cateList" :key="index"
 							:class="['category-item', { 'color-base-text color-base-border active': pageIndex == index }]"
-							@tap.stop="changePageIndex(index)">
+							@click="changePageIndex(index)">
 							{{ item.short_name ? item.short_name : item.category_name }}
 						</text>
 					</view>
@@ -55,7 +55,7 @@
 										<view class="twoCategory min" v-if="twoCategorylist.length <= 5">
 											<view class="twoCategory-page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
-													:key="index" @tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="$util.img(item.image)" v-if="item.image"
 															mode="aspectFill" />
@@ -70,7 +70,7 @@
 											v-if="twoCategorylist.length > 5 && twoCategorylist.length <= 10">
 											<view class="twoCategory-page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
-													:key="index" @tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="$util.img(item.image)" v-if="item.image"
 															mode="aspectFill" />
@@ -86,7 +86,7 @@
 											<swiper-item class="twoCategory-page" v-for="page in maxPage" :key="page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
 													:key="index" v-if="index >= (page - 1) * 10 && index < page * 10"
-													@tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													@click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="item.image" mode="aspectFill" />
 														<view>{{ item.category_name }}</view>
@@ -108,7 +108,7 @@
 
 									<view class="goods-list double-column" v-if="goodsList[pageIndex].list.length">
 										<view class="goods-item" v-for="(item, index) in goodsList[pageIndex].list"
-											:key="index" @tap.stop="toDetail(item)">
+											:key="index" @click="toDetail(item)">
 											<view class="goods-img">
 												<image :src="goodsImg(item.goods_image)" mode="widthFix"
 													@error="imgError(index)" />

components-diy/diy-kefu.vue

@@ -14,7 +14,7 @@
 				</view>
 				<view class="fui-remark jump" style="padding-right: 20rpx; text-align: center; line-height: 140rpx;">
 					<span style="font-size:24rpx;padding: 14rpx 18rpx;border-radius:8rpx"
-						:style="{ background: item.BtBgColor, color: item.BtColor }" @tap.stop="previewSqs()">立即添加</span>
+						:style="{ background: item.BtBgColor, color: item.BtColor }" @click="previewSqs()">立即添加</span>
 				</view>
 			</view>
 		</view>

components-diy/diy-listmenu.vue

@@ -3,7 +3,7 @@
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
-			<view v-for="(item, index) in value.list" @tap.stop="redirectTo(item.link)" class="fui-cell"
+			<view v-for="(item, index) in value.list" @click="redirectTo(item.link)" class="fui-cell"
 				:class="item.iconType == 'img' ? 'img-cell' : ''">
 				<view class="fui-cell-icon" :style="{ 'color': item.style ? item.style.iconColor : '#333' }">
 					<diy-icon v-if="item.iconType == 'icon'" :icon="item.icon" :value="item.style ? item.style : null"

components-diy/diy-live.vue

@@ -1,6 +1,6 @@
 <template>
 	<x-skeleton data-component-name="diy-live" type="banner" :loading="loading" :configs="skeletonConfig">
-		<view class="live-wrap" @tap.stop="handlerClick(liveInfo.roomid)"
+		<view class="live-wrap" @click="handlerClick(liveInfo.roomid)" @tap="handlerClick(liveInfo.roomid)"
 			v-if="liveInfo">
 			<view class="banner-wrap">
 				<image

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

@@ -3,7 +3,7 @@
 		<scroll-view scroll-x="true" class="many-goods-list-head" :scroll-into-view="'a' + cateIndex"
 			:style="manyWrapCss">
 			<view v-for="(item, index) in value.list" class="scroll-item" :class="{ active: index == cateIndex }"
-				:id="'a' + index" :key="index" @tap.stop="handlerClick({ item, index })">
+				:id="'a' + index" :key="index" @click="handlerClick({ item, index })" @tap="handlerClick({ item, index })">
 				<view class="split-line" v-if="index > 0"></view>
 				<view class="cate">
 					<view class="name" :style="{ color: value.headStyle.titleColor }">{{ item.title }}</view>

components-diy/diy-map.vue

@@ -3,18 +3,11 @@
 		<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;"
-					@tap.stop="handlerClick(item)" @tap="handlerClick(item)">
+					@click="handlerClick(item)" @tap="handlerClick(item)">
 					<cover-view style="font-size:24rpx">一键导航</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;"
-					@tap.stop="handlerClick(item)">
-					<span style="font-size:24rpx;color: #fff;">一键导航</span>
-				</div>			
+				</cover-view>
 			</map>
 		</view>
 

components-diy/diy-member-info.vue

@@ -4,7 +4,7 @@
 		<view class="common-wrap info-wrap" :class="[`data-style-${value.style}`]">
 			<view class="member-info" :style="memberInfoStyle">
 				<view class="info-wrap" :style="infoStyle" v-if="memberInfo">
-					<view class="headimg" @tap.stop="getWxAuth">
+					<view class="headimg" @click="getWxAuth">
 						<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head"
 							mode="widthFix" @error="memberInfo.headimg = $util.getDefaultImage().head" />
 					</view>
@@ -12,10 +12,10 @@
 						<!-- #ifdef MP -->
 						<block
 							v-if="(memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile">
-							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击授权头像昵称</text></view>
+							<view class="nickname"><text class="name" @click="getWxAuth">点击授权头像昵称</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @tap.stop="getWxAuth">{{ memberInfo.nickname }}</text>
+							<text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text>
 							<view class="member-level"
 								v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level">
 								<!-- 	<text class="icondiy icon-system-huangguan"></text> -->
@@ -36,10 +36,10 @@
 						<!-- #ifdef H5 -->
 						<block
 							v-if="$util.isWeiXin() && ((memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile)">
-							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击获取微信头像</text></view>
+							<view class="nickname"><text class="name" @click="getWxAuth">点击获取微信头像</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @tap.stop="redirect('/pages_tool/member/info')">{{ memberInfo.nickname
+							<text class="name" @click="redirect('/pages_tool/member/info')">{{ memberInfo.nickname
 							}}</text>
 							<view class="member-level"
 								v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level">
@@ -61,10 +61,10 @@
 					</view>
 					<view v-if="ischina == 1"
 						style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000"
-						@tap.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
-				<view class="info-wrap" v-else :style="infoStyle" @tap.stop="redirect($util.MEMBER_PAGE_URL)">
+				<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>
@@ -75,12 +75,12 @@
 
 					<view v-if="ischina == 1"
 						style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000"
-						@tap.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
 				<view class="account-info" v-show="value.style == 1"
 					:style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance')">
+					<view class="account-item" @click="redirect('/pages_tool/member/balance')">
 						<view class="value price-font">
 							{{ memberInfo ? (parseFloat(memberInfo.balance) +
 								parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
@@ -88,12 +88,12 @@
 						<view class="title">{{ $lang('balance') }}</view>
 					</view>
 					<view class="solid"></view>
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+					<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 						<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
 						<view class="title">{{ $lang('point') }}</view>
 					</view>
 					<view class="solid"></view>
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+					<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 						<view class="value price-font">
 							{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 						</view>
@@ -110,8 +110,8 @@
 							<text>超级会员</text>
 						</view>
 						<view class="super-text">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
 							<text class="iconfont icon-right"></text>
 						</view>
 					</block>
@@ -121,8 +121,8 @@
 							<view class="desc">开通可享更多权益</view>
 						</view>
 						<view class="super-text">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</view>
 					</block>
 				</view>
@@ -134,25 +134,25 @@
 							<view class="desc">开通可享更多权益</view>
 						</view>
 						<view class="super-text" :class="{ 'more' : memberInfo && memberInfo.member_level_type }">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</view>
 					</view>
 					<view class="account-info" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance_detail')">
+						<view class="account-item" @click="redirect('/pages_tool/member/balance_detail')">
 							<view class="value price-font">
 								{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
 							</view>
 							<view class="title">余额</view>
 						</view>
 						<view class="solid"></view>
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+						<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 							<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}
 							</view>
 							<view class="title">积分</view>
 						</view>
 						<view class="solid"></view>
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+						<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 							<view class="value price-font">
 								{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 							</view>
@@ -161,7 +161,7 @@
 					</view>
 					<view class="style4-other">
 						<view class="style4-btn-wrap">
-							<view @tap.stop="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
+							<view @click="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
 						</view>
 					</view>
 				</view> -->
@@ -169,18 +169,18 @@
 
 			<view class="account-info" v-show="value.style == 2"
 				:style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance')">
+				<view class="account-item" @click="redirect('/pages_tool/member/balance')">
 					<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) +
 						parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
 					<view class="title">{{ $lang('balance') }}</view>
 				</view>
 				<view class="solid"></view>
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+				<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 					<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
 					<view class="title">{{ $lang('point') }}</view>
 				</view>
 				<view class="solid"></view>
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+				<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 					<view class="value price-font">
 						{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 					</view>
@@ -196,7 +196,7 @@
 					<view class="head">
 						<text class="title">获取您的昵称、头像</text>
 						<text class="color-tip tips">获取用户头像、昵称完善个人资料，主要用于向用户提供具有辨识度的用户中心界面</text>
-						<text class="iconfont icon-close color-tip" @tap.stop="cancelCompleteInfo"></text>
+						<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="item-wrap">
@@ -227,7 +227,7 @@
 						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" />
 					</view>
 					<!-- #endif -->
-					<button type="default" class="save-btn" @tap.stop="saveCompleteInfo" :disabled="isDisabled">保存</button>
+					<button type="default" class="save-btn" @click="saveCompleteInfo" :disabled="isDisabled">保存</button>
 				</view>
 			</uni-popup>
 		</view>

components-diy/diy-member-my-order.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-member-my-order" class="common-wrap" :style="warpCss">
 		<view class="order-wrap">
 			<view class="status-wrap">
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitpay')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitpay')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -21,7 +21,7 @@
 					</view>
 					<view class="title">{{ $lang('waitpay') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitsend')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitsend')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -40,7 +40,7 @@
 					</view>
 					<view class="title">{{ $lang('waitsend') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitconfirm')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitconfirm')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -59,7 +59,7 @@
 					</view>
 					<view class="title">{{ $lang('waitconfirm') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitrate')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitrate')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -76,7 +76,7 @@
 					</view>
 					<view class="title">{{ $lang('completed') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_tool/order/activist')">
+				<view class="item-wrap" @click="redirect('/pages_tool/order/activist')">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/refunding.png')" mode="widthFix" />

components-diy/diy-merch-list.vue

@@ -4,7 +4,7 @@
 			<view class="merch-wrap" :style="warpCss">
 				<view :class="['list-wrap', value.style]" :style="warpCss">
 					<view :class="['item', value.ornament.type]" v-for="(item, index) in list" :key="index"
-						:style="itemCss" @tap.stop="handlerClick(item)">
+						:style="itemCss" @click="handlerClick(item)" @tap="handlerClick(item)">
 						<view class="merch-img">
 							<image class="cover-img" :src="$util.img(item.merch_image)" mode="widthFix"
 								@error="imgError(index)" />
@@ -25,7 +25,7 @@
 					<!-- #endif -->
 
 					<view class="merch-nav-item graphic" v-for="(item, index) in list" :key="index"
-						:style="{ width: 100 / 4 + '%' }" @tap.stop="handlerClick(item)">
+						:style="{ width: 100 / 4 + '%' }" @click="handlerClick(item)" @tap="handlerClick(item)">
 						<view class="graphic-img" v-if="value.mode != 'text'"
 							:style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
 							<image

components-diy/diy-notes.vue

@@ -3,12 +3,13 @@
 		<view class="diy-notes" :style="{ backgroundColor: value.componentBgColor }">
 			<view class="diy-notes-top">
 				<view class="notes-title" :style="{ color: value.titleTextColor }">{{ value.title }}</view>
-				<view class="notes-more" @tap.stop="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}
+				<view class="notes-more" @click="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}
 				</view>
 			</view>
 
 			<scroll-view class="diy-notes-box" scroll-x="true" show-scrollbar="true">
-				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @tap.stop="handlerClick(item)" :style="notesItemStyle">
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :style="notesItemStyle">
 					<view class="notes-item" v-if="item.status == 1">
 						<view class="notes-item-con">
 							<view class="notes-title">{{ item.note_title }}</view>

components-diy/diy-notice.vue

@@ -41,12 +41,12 @@
 		<view @touchmove.prevent.stop>
 			<uni-popup ref="noticePopup" type="center">
 				<view class="notice-popup">
-					<view class="head-wrap" @tap.stop="closeNoticePopup">
+					<view class="head-wrap" @click="closeNoticePopup">
 						<text>公告</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">{{ notice }}</view>
-					<button type="primary" @tap.stop="closeNoticePopup">我知道了</button>
+					<button type="primary" @click="closeNoticePopup">我知道了</button>
 				</view>
 			</uni-popup>
 		</view>

components-diy/diy-payment-qrcode.vue

@@ -7,11 +7,11 @@
 					<!-- <text class="iconfont icon-shuaxin"></text> -->
 				</view>
 				<view class="qrocde-action">
-					<button type="primary" @tap.stop="toLink">
+					<button type="primary" @click="toLink">
 						<text class="iconfont icon-fukuanma"></text>
 						<text class="action-name">付款码</text>
 					</button>
-					<button type="primary" @tap.stop="openPaymentPopup">
+					<button type="primary" @click="openPaymentPopup">
 						<text class="iconfont icon-saomafu"></text>
 						<text class="action-name">扫码付</text>
 					</button>
@@ -26,12 +26,12 @@
 		<view @touchmove.prevent.stop>
 			<uni-popup ref="paymentPopup" type="center">
 				<view class="payment-popup">
-					<view class="head-wrap" @tap.stop="closePaymentPopup">
+					<view class="head-wrap" @click="closePaymentPopup">
 						<text>提示</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">扫码付请退出程序后直接使用微信扫一扫或返回上一页使用付款码进行支付</view>
-					<button type="primary" @tap.stop="closePaymentPopup">我知道了</button>
+					<button type="primary" @click="closePaymentPopup">我知道了</button>
 				</view>
 			</uni-popup>
 		</view>

components-diy/diy-picture.vue

@@ -3,9 +3,9 @@
 		<view class="fui-picture">
 			<view v-for="(item, index) in value.list" style="line-height: 0;">
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)"
-					v-if="item.link.wap_url" @tap.stop="handlerClick(item)"></image>
+					v-if="item.link.wap_url" @click="handlerClick(item)" @tap="handlerClick(item)"></image>
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else
-					@tap.stop="handlerClick(item)"></image>
+					@click="handlerClick(item)" @tap="handlerClick(item)"></image>
 			</view>
 			<!--   <view wx:if="{{!childitem.linkurl}}" bindtap="previewImg" data-src="{{childitem.imgurl}}" style="padding:{{diyitem.style.paddingtop==0?0:diyitem.style.paddingtop+'rpx'}} {{diyitem.style.paddingleft==0?0:diyitem.style.paddingleft+'rpx'}}" wx:for="{{diyitem.data}}" wx:for-index="childid" wx:for-item="childitem" wx:key="{{childid}}">
 		        <image mode="widthFix" src="{{childitem.imgurl}}" style="{{bannerheight?'height:'+bannerheight+'px':'height:auto'}}"></image>
@@ -52,6 +52,17 @@ export default {
 		}
 	},
 	methods: {
+		previewImg(img) {
+			// #ifdef MP-WEIXIN
+			uni.previewImage({
+				current: 0,
+				urls: [this.$util.img(img)],
+				success: function (res) { },
+				fail: function (res) { },
+				complete: function (res) { },
+			})
+			// #endif
+		},
 		redirectTo(link) {
 			if (link.wap_url) {
 				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
@@ -66,9 +77,7 @@ export default {
 			await this.__$emitEvent({
 				eventName: 'picture-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-
-					const link = item.link;
-					if (link?.name || link?.wap_url || link?.appid) {
+					if (item.link.wap_url) {
 						this.redirectTo(item.link);
 					} else {
 						this.previewImg(item.imageUrl);

components-diy/diy-pinfan.vue

@@ -2,7 +2,7 @@
 	<x-skeleton data-component-name="diy-pinfan" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-pinfan" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -61,7 +61,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -113,7 +113,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-pintuan.vue

@@ -31,14 +31,14 @@
 				</view>
 				<view class="head-right"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="$util.redirectTo('/pages_promotion/pintuan/list')">
+					@click="$util.redirectTo('/pages_promotion/pintuan/list')">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
 			</view>
 
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -100,7 +100,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -161,7 +161,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-presale.vue

@@ -2,8 +2,8 @@
 	<x-skeleton data-component-name="diy-presale" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-presale" v-if="list.length" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -40,8 +40,8 @@
 			</template>
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-						:class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+						@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 								:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -75,7 +75,8 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="handlerClick(item)" @tap="handlerClick(item)" :class="[value.ornament.type]"
+							:style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-quick-nav.vue

@@ -5,7 +5,7 @@
 			<view class="uni-scroll-view-content">
 				<!-- #endif -->
 				<view class="quick-nav-item" v-for="(item, index) in value.list" :key="index"
-					@tap.stop="handlerClick(item)"
+					@click="handlerClick(item)" @tap="handlerClick(item)"
 					:style="{ background: 'linear-gradient(to right,' + item.bgColorStart ? item.bgColorStart : '' + ',' + item.bgColorEnd ? item.bgColorEnd : '' + ')' }">
 					<view class="quick-img" v-if="item.imageUrl || item.icon">
 						<image v-if="item.iconType == 'img'"

components-diy/diy-rich-text.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-rich-text" class="rich-text-box" :style="richTextWarpCss">
-		<rich-text :nodes="html" @tap.stop="handlerClick"></rich-text>
+		<rich-text :nodes="html" @click="handlerClick" @tap="handlerClick"></rich-text>
 	</view>
 </template>
 

components-diy/diy-rubik-cube.vue

@@ -8,8 +8,9 @@
 			<!-- 1左2右 -->
 			<template v-if="value.mode == 'row1-lt-of2-rt'">
 				<view class="template-left">
-					<view :class="['item', value.mode]" @tap.stop="handlerClick(value.list[0].link, value.list[0].imageUrl)"
-					:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }">
+					<view :class="['item', value.mode]" @click="handlerClick(value.list[0].link)"
+						@tap="handlerClick(value.list[0].link)"
+						:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }">
 						<image :src="$util.img(value.list[0].imageUrl)" :mode="list[0].imageMode || 'scaleToFill'"
 							:style="list[0].pageItemStyle" :show-menu-by-longpress="true" />
 					</view>
@@ -18,8 +19,9 @@
 				<view class="template-right">
 					<template v-for="(item, index) in list">
 						<template v-if="index > 0">
-							<view :key="index" :class="['item', value.mode]" @tap.stop="handlerClick(item.link, item.imageUrl)"
-							:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
+							<view :key="index" :class="['item', value.mode]" @click="handlerClick(item.link)"
+								@tap="handlerClick(item.link)"
+								:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
 								<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 									:style="item.pageItemStyle" :show-menu-by-longpress="true" />
 							</view>
@@ -32,8 +34,8 @@
 			<template v-else-if="value.mode == 'row1-lt-of1-tp-of2-bm'">
 				<view class="template-left">
 					<view :class="['item', value.mode]"
-					:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }"
-					@tap.stop="handlerClick(value.list[0].link, value.list[0].imageUrl)">
+						:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }"
+						@click="handlerClick(value.list[0].link)" @tap="handlerClick(value.list[0].link)">
 						<image :src="$util.img(value.list[0].imageUrl)" :mode="list[0].imageMode || 'scaleToFill'"
 							:style="list[0].pageItemStyle" :show-menu-by-longpress="true" />
 					</view>
@@ -41,19 +43,20 @@
 
 				<view class="template-right">
 					<view :class="['item', value.mode]"
-					:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: list[1].imgWidth, height: list[1].imgHeight + 'px' }"
-					@tap.stop="handlerClick(value.list[1].link, value.list[1].imageUrl)">
+						:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: list[1].imgWidth, height: list[1].imgHeight + 'px' }"
+						@click="handlerClick(value.list[1].link)" @tap="handlerClick(value.list[1].link)">
 						<image :src="$util.img(value.list[1].imageUrl)" :mode="list[1].imageMode || 'scaleToFill'"
 							:style="list[1].pageItemStyle" :show-menu-by-longpress="true" />
 					</view>
 					<view class="template-bottom">
 						<template v-for="(item, index) in list">
 							<template v-if="index > 1">
-								<view :key="index" :class="['item', value.mode]" @tap.stop="handlerClick(item.link, item.imageUrl)" :style="{
-								marginRight: value.imageGap * 2 + 'rpx',
-								width: item.imgWidth,
-								height: item.imgHeight + 'px'
-							}">
+								<view :key="index" :class="['item', value.mode]" @click="handlerClick(item.link)"
+									@tap="handlerClick(item.link)" :style="{
+										marginRight: value.imageGap * 2 + 'rpx',
+										width: item.imgWidth,
+										height: item.imgHeight + 'px'
+									}">
 									<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 										:style="item.pageItemStyle" :show-menu-by-longpress="true" />
 								</view>
@@ -65,8 +68,8 @@
 
 			<template v-else>
 				<view :class="['item', value.mode]" v-for="(item, index) in list" :key="index"
-				@tap.stop="handlerClick(item.link, item.imageUrl)"
-				:style="{ marginRight: value.imageGap * 2 + 'rpx', marginBottom: value.imageGap * 2 + 'rpx', width: item.widthStyle, height: item.imgHeight + 'px' }">
+					@click="handlerClick(item.link)" @tap="handlerClick(item.link)"
+					:style="{ marginRight: value.imageGap * 2 + 'rpx', marginBottom: value.imageGap * 2 + 'rpx', width: item.widthStyle, height: item.imgHeight + 'px' }">
 					<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 						:style="item.pageItemStyle" :show-menu-by-longpress="true" />
 				</view>
@@ -371,16 +374,11 @@ export default {
 			return obj;
 		},
 
-		async handlerClick(link, imageUrl) {
+		async handlerClick(link) {
 			await this.__$emitEvent({
 				eventName: 'rubik-cube-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-
-					if (link?.name || link?.wap_url || link?.appid) {
-						this.$util.diyRedirectTo(link);
-					} else if (imageUrl){
-						this.previewImg(imageUrl);
-					}
+					this.$util.diyRedirectTo(link);
 				}
 			})
 		}

components-diy/diy-search.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-search" class="diy-search">
 		<view class="diy-search-wrap" :class="value.positionWay" :style="fixedCss">
 			<view :class="['search-box', 'search-box-' + value.searchStyle]" :style="searchWrapCss"
-				@tap.stop="handlerSearchClick">
+				@click="handlerSearchClick" @tap="handlerSearchClick">
 				<block v-if="[1, 2].includes(value.searchStyle)">
 					<view class="img" v-if="value.searchStyle == 2 && value.iconType == 'img'">
 						<image :src="$util.img(value.imageUrl)" mode="heightFix" />
@@ -14,30 +14,32 @@
 						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title"
 							v-model="searchText" @confirm="handlerSearchClick" disabled="true"
 							:placeholderStyle="placeholderStyle" />
-						<text class="iconfont icon-sousuo3" @tap.stop="handlerSearchClick"
+						<text class="iconfont icon-sousuo3" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
 					</view>
 				</block>
 				<block v-if="value.searchStyle == 3">
-					<view class="search-content" :style="inputStyle"
-						@tap.stop="handlerSearchClick">
+					<view class="search-content" :style="inputStyle" @click.stop="handlerSearchClick"
+						@tap="handlerSearchClick">
 						<text class="iconfont icon-sousuo3"
 							:style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
 						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title"
 							v-model="searchText" @confirm="handlerSearchClick" disabled="true"
-							@tap.stop="handlerSearchClick"
+							@click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:placeholderStyle="placeholderStyle" />
-						<text class="search-content-btn" @tap.stop="handlerSearchClick"
+						<text class="search-content-btn" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
 					</view>
 					<view class="img" v-if="value.iconType == 'img'"
-						@tap.stop="handlerRedirectToClick(value.searchLink)">
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(value.searchLink)">
 						<image :src="$util.img(value.imageUrl)" mode="heightFix" />
 					</view>
 					<diy-icon class="icon" v-if="value.iconType == 'icon'" :icon="value.icon"
 						:value="value.style ? value.style : 'null'"
 						:style="{ maxWidth: 30 * 2 + 'rpx', maxHeight: 30 * 2 + 'rpx' }"
-						@tap.stop="handlerRedirectToClick(value.searchLink)"></diy-icon>
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(value.searchLink)"></diy-icon>
 				</block>
 			</view>
 		</view>

components-diy/diy-seckill.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="marketimg-box-title-right" v-if="value.titleStyle.moreSupport"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="toMore">
+					@click="toMore">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
@@ -35,7 +35,7 @@
 
 			<view class="content-wrap">
 				<template v-if="value.template == 'row1-of1'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -105,7 +105,7 @@
 				</template>
 
 				<template v-if="value.template == 'row1-of2'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -150,7 +150,7 @@
 				<template v-if="value.template == 'horizontal-slide'">
 					<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true"
 						:show-scrollbar="false">
-						<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+						<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 							:class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -190,7 +190,7 @@
 						<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 							:class="['swiper-item', dataList[pageIndex] && [dataList[pageIndex].length / 3].length >= 1 && 'flex-between']">
 							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="dataIndex"
-								@tap.stop="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+								@click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 								<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 									<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 										:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-store.vue

@@ -3,7 +3,7 @@
 		<block v-if="value.style == 1">
 			<view class="store-box store-one">
 				<view class="store-info">
-					<view class="info-box" :style="{ color: value.textColor }" @tap.stop="toStoreList()">
+					<view class="info-box" :style="{ color: value.textColor }" @click="toStoreList()">
 						<block v-if="globalStoreInfo && globalStoreInfo.store_id">
 							<text class="title">{{ globalStoreInfo.store_name }}</text>
 							<text>
@@ -15,12 +15,12 @@
 					</view>
 					<view class="address-wrap" :style="{ color: value.textColor }">
 						<text class="iconfont icon-dizhi"></text>
-						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @tap.stop="mapRoute" class="address">{{
+						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @click="mapRoute" class="address">{{
 							globalStoreInfo.show_address }}</text>
 						<text v-else>获取当前位置...</text>
 					</view>
 				</view>
-				<view class="store-image" @tap.stop="selectStore()">
+				<view class="store-image" @click="selectStore()">
 					<image :src="$util.img(globalStoreInfo.store_image)"
 						v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
 					<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
@@ -29,9 +29,9 @@
 		</block>
 
 		<block v-if="value.style == 2">
-			<view class="store-box store-three" @tap.stop="toStoreList()">
+			<view class="store-box store-three" @click="toStoreList()">
 				<view class="store-info">
-					<view class="store-image" @tap.stop="selectStore()">
+					<view class="store-image" @click="selectStore()">
 						<image :src="$util.img(globalStoreInfo.store_image)"
 							v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
 						<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
@@ -47,13 +47,13 @@
 						<text class="title" v-else>定位中...</text>
 					</view>
 				</view>
-				<view class="store-icon" @tap.stop="search()"><text class="iconfont icon-sousuo3"
+				<view class="store-icon" @click.stop="search()"><text class="iconfont icon-sousuo3"
 						:style="{ color: value.textColor }"></text></view>
 			</view>
 		</block>
 
 		<block v-if="value.style == 3">
-			<view class="store-box store-four" @tap.stop="toStoreList()">
+			<view class="store-box store-four" @click="toStoreList()">
 				<view class="store-left-wrap">
 					<block v-if="globalStoreInfo && globalStoreInfo.store_id">
 						<text class="iconfont icon-weizhi" :style="{ color: value.textColor }"></text>
@@ -64,8 +64,8 @@
 				</view>
 				<view class="store-right-search">
 					<input type="text" class="uni-input font-size-tag" disabled placeholder="商品搜索"
-						@tap.stop="search()" />
-					<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
+						@click.stop="search()" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
 			</view>
 		</block>

components-diy/diy-text.vue

@@ -1,5 +1,6 @@
 <template>
-	<view data-component-name="diy-text" class="diy-text" @tap="handlerClick(value.link)" :style="warpCss">
+	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)"
+		@tap="handlerClick(value.link)" :style="warpCss">
 		<view :class="value.style == 'style-8' ? 'title2' : 'title'"
 			:style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor }">
 			<block v-if="value.style == 'style-0'" style="height: 40rpx; line-height: 40rpx;">
@@ -99,13 +100,13 @@
 								<image :src="$util.img('public/uniapp/diy/style9-2.png')" />
 							</view>
 							<view class="style9-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-								@tap.stop="handlerClick(value.more.link)">
+								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
 								{{ value.more.text }}
 								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 							</view>
 						</view>
 						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-						}}</text>
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -131,13 +132,13 @@
 								<image :src="$util.img('public/uniapp/diy/style10-2.png')"></image>
 							</view>
 							<view class="style10-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-								@tap.stop="handlerClick(value.more.link)">
+								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
 								{{ value.more.text }}
 								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 							</view>
 						</view>
 						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-						}}</text>
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -158,7 +159,7 @@
 										value.subTitle.text }}</view>
 								</view>
 								<view class="style11-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-									@tap.stop="$util.diyRedirectTo(value.more.link)">
+									@click.stop="$util.diyRedirectTo(value.more.link)">
 									{{ value.more.text }}
 									<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 								</view>
@@ -182,9 +183,9 @@
 					{{ value.text }}
 				</view>
 				<text class="style12-sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-				}}</text>
+					}}</text>
 				<view class="style12-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-					@tap.stop="$util.diyRedirectTo(value.more.link)">
+					@click.stop="$util.diyRedirectTo(value.more.link)">
 					<text>{{ value.more.text }}</text>
 					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 				</view>
@@ -277,7 +278,7 @@
 					<text :style="{ fontWeight: value.subTitle.fontWeight }">{{ value.subTitle.text }}</text>
 				</view>
 				<view class="style16-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-					@tap.stop="$util.diyRedirectTo(value.more.link)">
+					@click.stop="$util.diyRedirectTo(value.more.link)">
 					<text>{{ value.more.text }}</text>
 					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 				</view>

components-diy/diy-video.vue

@@ -1,7 +1,7 @@
 <template>
 	<video data-component-name="diy-video" class="diy-video" :src="$util.img(value.videoUrl)"
 		:poster="$util.img(value.imageUrl)" :style="videoWarpCss" objectFit="cover"
-		@tap="handlerClick(value.videoUrl)"></video>
+		@click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
 </template>
 
 <script>

components-diy/minx.js

@@ -5,18 +5,5 @@ export default {
             // console.log('__$emitEvent', payload)
             await this.$eventBus.emit(payload.eventName, payload.data, payload.promiseCallback)
         },
-
-        // 预览图片
-		previewImg(img) {
-			// #ifdef MP-WEIXIN
-			uni.previewImage({
-				current: 0,
-				urls: [this.$util.img(img)],
-				success: function (res) { },
-				fail: function (res) { },
-				complete: function (res) { },
-			})
-			// #endif
-		},        
     }
 }

components/chat-message/chat-message.vue

@@ -179,7 +179,6 @@
 	.chat-message {
 		width: 100%;
 		height: 100%;
-		background: white; /* 白色 */
 
 		.message {
 			padding: 13rpx 20rpx;
@@ -271,7 +270,7 @@
 				flex-direction: row-reverse;
 
 				.content {
-					background-color: #c4e0ff; /* 浅蓝色 */
+					background-color: #4cd964;
 					margin-right: 28rpx;
 					word-break: break-all;
 					line-height: 36rpx;

components/hover-nav/hover-nav.vue

@@ -1,71 +1,25 @@
 <template>
-  <view v-if="pageCount === 1 || need" class="fixed-box"
-    :style="[customContainerStyle, { 
-      height: containerHeight,
-      backgroundImage: bgUrl ? `url(${bgUrl})` : '',
-      backgroundSize: 'cover'
-    }]">
+  <!-- 悬浮按钮 -->
+  <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"
-    >
+    <view v-if="isLanguageSwitchEnabled && fixBtnShow" class="btn-item common-bg" @click="toggleLanguage">
       <text>{{ currentLangDisplayName }}</text>
     </view>
-    <!-- 微信官方客服按钮-->
-    <button 
-      v-if="fixBtnShow && hasValidKefuConfig && isWeappOfficialKefu"
-      class="btn-item common-bg"
-      open-type="contact"
-      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
-    >
-          <text class="icox icox-kefu" v-if="!kefuimg"></text>
-    </button>
 
-    <!-- 其他类型客服按钮（智能客服、企业微信等）-->
-    <view 
-      v-if="fixBtnShow && hasValidKefuConfig && !isWeappOfficialKefu && !showWeappSystemKefu"
-      class="btn-item common-bg"
-      @click="handleUnifiedKefuClick"
-      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
-    >
-      <text class="ai-icon" v-if="isAIKefu && !currentKefuImg">🤖</text>
-      <text class="ai-icon" v-if="isWxworkKefu && !currentKefuImg">💬</text>
-      <text class="ai-icon" v-if="!isAIKefu && !isWxworkKefu && !currentKefuImg">👤</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 
-      v-if="fixBtnShow && hasValidKefuConfig && !isWeappOfficialKefu && showWeappSystemKefu"
-      class="btn-item common-bg"
-      @click="handleUnifiedKefuClick"
-      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
-    >
-      <text class="ai-icon" v-if="isAIKefu && !currentKefuImg">🤖</text>
-      <text class="ai-icon" v-if="isWxworkKefu && !currentKefuImg">💬</text>
-      <text class="ai-icon" v-if="!isAIKefu && !isWxworkKefu && !currentKefuImg">👤</text>
-    </view>
-
-    <!-- 小程序系统客服按钮 -->
-    <button 
-      v-if="fixBtnShow && hasValidKefuConfig && showWeappSystemKefu"
-      class="btn-item common-bg"
-      open-type="contact"
-      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
-    >
-          <text class="icox icox-kefu" v-if="!kefuimg"></text>
-    </button>
-
-    
-
-    <!-- 电话按钮 -->
-    <view 
-      v-if="fixBtnShow" 
-      class="btn-item common-bg"
-      @click="call"
-      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]"
-    >
+    <!-- 电话按钮（始终显示） -->
+    <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>
 
@@ -84,13 +38,16 @@ export default {
     return {
       pageCount: 0,
       fixBtnShow: true,
+
       shopInfo: null,
       currentLangIndex: 0,
       langIndexMap: {},
-      customerService: null, 
+
+      customerService: null,
     };
   },
   computed: {
+    // 安全读取 shopInfo 中的字段，避免 undefined 报错
     bgUrl() {
       return this.shopInfo?.bgUrl || '';
     },
@@ -109,6 +66,9 @@ export default {
     isLanguageSwitchEnabled() {
       return !!this.shopInfo?.ischina;
     },
+    enableAIChat() {
+      return !!this.shopInfo?.enableAIChat;
+    },
     currentLangDisplayName() {
       const lang = this.langIndexMap[this.currentLangIndex];
       return lang === 'zh-cn' ? 'EN' : 'CN';
@@ -118,84 +78,30 @@ export default {
     },
     customButtonStyle() {
       return this.shopInfo?.floatingButton?.button || {};
-    },
-    unreadCount() {
-      const customerService = createCustomerService(this);
-      return customerService.getUnreadCount();
-    },
-    currentKefuImg() {
-      const customerService = createCustomerService(this);
-      return customerService.getKefuButtonIcon();
-    },
-    isWeappOfficialKefu() {
-      const customerService = createCustomerService(this);
-      return customerService.isWeappOfficialKefu();
-    },
-    isAIKefu() {
-      const customerService = createCustomerService(this);
-      return customerService.isAIKefu();
-    },
-    isWxworkKefu() {
-      const customerService = createCustomerService(this);
-      return customerService.isWxworkKefu();
-    },
-    isThirdKefu() {
-      const customerService = createCustomerService(this);
-      return customerService.isThirdKefu();
-    },
-    showWeappSystemKefu() {
-      const customerService = createCustomerService(this);
-      return customerService.shouldShowExtraWeappSystemKefu();
-    },
-    hasValidKefuConfig() {
-      const customerService = createCustomerService(this);
-      return customerService.hasValidKefuConfig();
-    },
-	//根据显示的按钮数量动态计算容器高度
-	   containerHeight() {
-	     if (!this.fixBtnShow) return '320rpx';
-	   
-	     let buttonCount = 1;
-	     if (this.isLanguageSwitchEnabled) buttonCount++;
-	     if (this.showWeappSystemKefu) buttonCount++;
-	     buttonCount++; 
-	     const totalRpx = 94 * buttonCount - 14;
-	     const pxValue = Math.round(totalRpx * 0.5);
-	   
-	     return ` $ {pxValue}px`;
-	   }
-	  },
-  watch: {
-    shopInfo: {
-      handler(newVal) {
-      },
-      immediate: true
     }
   },
   created() {
+    this.customerService = createCustomerService(this);
     this.initLanguage();
-    this.pageCount = getCurrentPages().length;
     uni.getStorage({
       key: 'shopInfo',
       success: (e) => {
-        console.log('【调试】当前 shopInfo:', e.data);
         this.shopInfo = e.data;
-      },
-      fail: () => {
-        console.warn('未获取到 shopInfo，使用默认设置');
       }
     });
-    // 初始化 customerService 实例
-    this.customerService = createCustomerService(this);
   },
   methods: {
+
+    /**
+     * 初始化多语言配置
+     */
     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 = this.$langConfig.getCurrentLocale();
+      const savedLang = uni.getStorageSync('lang');
       if (savedLang) {
         for (let i = 0; i < this.langList.length; i++) {
           if (this.langList[i].value === savedLang) {
@@ -208,30 +114,36 @@ export default {
       }
     },
 
+    /**
+     * 电话联系客服
+     */
     call() {
-      this.customerService.makePhoneCallByNumber(this.tel);
+      this.customerService.makePhoneCall(this.tel);
     },
 
+    /**
+     * 切换中英文语言，并刷新当前页面（保留所有参数）
+     */
     toggleLanguage() {
       this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
       const targetLang = this.langIndexMap[this.currentLangIndex];
 
-      uni.setStorageSync("lang", targetLang);
-
-      const pages = getCurrentPages();
-      const currentPage = pages[pages.length - 1];
-      const currentRoute = currentPage.route;
-
-      uni.reLaunch({
-        url: '/' + currentRoute
-      });
+      // 调用语言切换逻辑（设置 storage + 清空缓存）
+      this.$langConfig.change(targetLang);
     },
 
-    handleUnifiedKefuClick() {
-      this.customerService.handleUnifiedKefuClick({
-        sendMessageTitle: '来自悬浮按钮的咨询',
-        sendMessagePath: '/pages/index/index'
-      });
+    /**
+     * 打开 AI 智能助手
+     */
+    openAIChat() {
+      this.$util.redirectTo(this.$util.AI_CHAT_PAGE_URL);
+    },
+
+    /**
+     * 打开客服选择对话框
+     */
+    openCustomerSelectPopup() {
+      this.customerService.openCustomerSelectPopupDialog();
     }
   }
 }
@@ -266,15 +178,17 @@ export default {
   margin: 14rpx 0;
   transition: 0.1s;
   color: var(--hover-nav-text-color);
-  border-radius: 50%;
+  border-radius: 40rpx;
   width: 80rpx;
   height: 80rpx;
   padding: 0;
   overflow: hidden;
 }
 
+/* 定义共同的背景颜色 */
 .common-bg {
-  background-color: var(--hover-nav-bg-color); 
+  background-color: var(--hover-nav-bg-color);
+  /* 使用变量以保持一致性 */
 }
 
 .btn-item text {
@@ -304,6 +218,8 @@ export default {
   font-weight: bold;
 }
 
+
+
 .ai-icon {
   font-size: 40rpx;
   width: 100%;

components/ns-login/ns-login.vue

@@ -760,6 +760,7 @@ export default {
 <style lang="scss" scoped>
 .complete-info-popup {
 	.complete-info-wrap {
+	    z-index: 2147483646;
 		background: #fff;
 		padding: 50rpx 40rpx 40rpx;
 

lang/zh-cn/article/detail.js

@@ -1,4 +1,4 @@
 export const lang = {
 	//title为每个页面的标题
-	title: '文章详情'
+	title: '新闻'
 }

lang/zh-cn/article/list.js

@@ -1,5 +1,5 @@
 export const lang = {
 	//title为每个页面的标题
-	title: '文章列表',
+	title: '新闻',
 	emptyText:"当前暂无文章信息"
 }

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "frontend",
+  "name": "lucky_shop",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -83,7 +83,6 @@
       "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -95,7 +94,6 @@
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -106,8 +104,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
@@ -132,7 +129,6 @@
       "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -143,24 +139,21 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
       "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
       "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.12.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
       "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
@@ -168,7 +161,6 @@
       "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -180,8 +172,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
       "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.12.1",
@@ -189,7 +180,6 @@
       "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -203,7 +193,6 @@
       "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -214,7 +203,6 @@
       "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -224,8 +212,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
       "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.12.1",
@@ -233,7 +220,6 @@
       "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -251,7 +237,6 @@
       "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
@@ -266,7 +251,6 @@
       "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -280,7 +264,6 @@
       "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -296,7 +279,6 @@
       "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
@@ -307,16 +289,14 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true,
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/acorn": {
       "version": "8.12.1",
@@ -324,6 +304,7 @@
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -337,7 +318,6 @@
       "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -348,6 +328,7 @@
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -482,8 +463,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "CC-BY-4.0",
-      "peer": true
+      "license": "CC-BY-4.0"
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.4",
@@ -491,7 +471,6 @@
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -576,8 +555,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
       "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/enhanced-resolve": {
       "version": "5.17.1",
@@ -585,7 +563,6 @@
       "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -599,8 +576,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
       "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/escalade": {
       "version": "3.1.2",
@@ -608,7 +584,6 @@
       "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -619,7 +594,6 @@
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -634,7 +608,6 @@
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -648,7 +621,6 @@
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -659,7 +631,6 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -670,7 +641,6 @@
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -735,16 +705,14 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "peer": true
+      "license": "BSD-2-Clause"
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
@@ -822,8 +790,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -857,7 +824,6 @@
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.11.5"
       }
@@ -875,7 +841,6 @@
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -886,7 +851,6 @@
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -899,16 +863,14 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/node-releases": {
       "version": "2.0.18",
       "resolved": "https://repo.huaweicloud.com/repository/npm/node-releases/-/node-releases-2.0.18.tgz",
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -925,8 +887,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
       "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true,
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/punycode": {
       "version": "2.3.1",
@@ -1041,7 +1002,6 @@
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -1140,7 +1100,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escalade": "^3.1.2",
         "picocolors": "^1.0.1"
@@ -1168,7 +1127,6 @@
       "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -1232,7 +1190,6 @@
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -1303,7 +1260,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint/-/eslint-9.6.0.tgz",
       "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -1314,7 +1270,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -1324,8 +1279,7 @@
       "version": "1.0.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@types/json-schema": {
       "version": "7.0.15",
@@ -1347,7 +1301,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ast/-/ast-1.12.1.tgz",
       "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -1357,29 +1310,25 @@
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
       "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
       "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.12.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
       "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
       "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -1390,15 +1339,13 @@
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
       "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.12.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
       "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -1411,7 +1358,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
       "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -1421,7 +1367,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
       "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -1430,15 +1375,13 @@
       "version": "1.11.6",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
       "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.12.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
       "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -1455,7 +1398,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
       "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
@@ -1469,7 +1411,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
       "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -1482,7 +1423,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
       "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -1497,7 +1437,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
       "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
@@ -1507,28 +1446,26 @@
       "version": "1.2.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "acorn": {
       "version": "8.12.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "acorn-import-attributes": {
       "version": "1.9.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
       "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
-      "peer": true,
       "requires": {}
     },
     "ajv": {
@@ -1536,6 +1473,7 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "peer": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1606,15 +1544,13 @@
       "version": "1.0.30001649",
       "resolved": "https://repo.huaweicloud.com/repository/npm/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz",
       "integrity": "sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "chrome-trace-event": {
       "version": "1.0.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "commander": {
       "version": "2.20.3",
@@ -1668,15 +1604,13 @@
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
       "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "enhanced-resolve": {
       "version": "5.17.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
       "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -1686,22 +1620,19 @@
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
       "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "escalade": {
       "version": "3.1.2",
       "resolved": "https://repo.huaweicloud.com/repository/npm/escalade/-/escalade-3.1.2.tgz",
       "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -1712,7 +1643,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "peer": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -1721,8 +1651,7 @@
           "version": "5.3.0",
           "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-5.3.0.tgz",
           "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true,
-          "peer": true
+          "dev": true
         }
       }
     },
@@ -1730,15 +1659,13 @@
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "events": {
       "version": "3.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "3.1.3",
@@ -1781,15 +1708,13 @@
       "version": "0.4.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://repo.huaweicloud.com/repository/npm/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "has-flag": {
       "version": "4.0.0",
@@ -1842,8 +1767,7 @@
       "version": "2.3.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -1866,8 +1790,7 @@
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -1879,15 +1802,13 @@
       "version": "1.52.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://repo.huaweicloud.com/repository/npm/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -1896,15 +1817,13 @@
       "version": "2.6.2",
       "resolved": "https://repo.huaweicloud.com/repository/npm/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node-releases": {
       "version": "2.0.18",
       "resolved": "https://repo.huaweicloud.com/repository/npm/node-releases/-/node-releases-2.0.18.tgz",
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -1916,8 +1835,7 @@
       "version": "1.0.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
       "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "punycode": {
       "version": "2.3.1",
@@ -1989,8 +1907,7 @@
       "version": "2.2.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "terser": {
       "version": "5.31.3",
@@ -2037,7 +1954,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
       "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "escalade": "^3.1.2",
         "picocolors": "^1.0.1"
@@ -2057,7 +1973,6 @@
       "resolved": "https://repo.huaweicloud.com/repository/npm/watchpack/-/watchpack-2.4.1.tgz",
       "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -2100,8 +2015,7 @@
       "version": "3.2.3",
       "resolved": "https://repo.huaweicloud.com/repository/npm/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "zion-uniapp-mp-load-package": {
       "version": "1.0.13",

pages/index/index.vue

@@ -17,6 +17,10 @@
 					}}</view>
 			</view>
 
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view> -->
+
 			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
 				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
 				<template v-slot:components>
@@ -39,17 +43,35 @@
 				<view @touchmove.prevent.stop>
 					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
 						<view class="small-bot">
+							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
 							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
 								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
 								<swiper-item v-for="(item, index) in adv.list" :key="index">
 									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
 										:src="$util.img(item.imageUrl)" width="100%"></image>
+									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
 								</swiper-item>
 							</swiper>
 							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
 								<i class="iconfont icon-round-close" style="color:#fff"></i>
 							</view>
 						</view>
+						<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
 					</uni-popup>
 				</view>
 			</template>
@@ -79,7 +101,7 @@
 				</view>
 			</uni-popup>
 
-			<!-- 选择门店弹出框 -->
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
 			<view @touchmove.prevent.stop class="choose-store">
 				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
 					<view class="choose-store-popup">
@@ -114,27 +136,8 @@
 					</view>
 				</uni-popup>
 			</view>
-
 			<hover-nav :need="true"></hover-nav>
-			
-			<!-- 隐私协议弹窗 UI (新增) -->
-			<view v-if="showPrivacyModal" class="privacy-modal-mask" @touchmove.prevent>
-				<view class="privacy-modal-container">
-					<view class="modal-header">用户隐私保护提示</view>
-					<view class="modal-body">
-						<text>感谢您使用本应用，在使用前您应当阅读并同意</text>
-						<text class="link" @click="viewPrivacy('privacy')">《隐私条款》</text>
-						<text class="link" @click="viewPrivacy('agreement')">《用户服务协议》</text>
-						<text>，当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用相关功能。</text>
-					</view>
-					<view class="modal-footer">
-						<view class="btn btn-disagree" @click="handleDisagree">不同意</view>
-						<view class="btn btn-agree" @click="handleAgree">同意并继续</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 隐私协议组件 (原有) -->
+			<!-- 隐私协议 -->
 			<privacy-popup ref="privacyPopup"></privacy-popup>
 			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 			<ns-login ref="login"></ns-login>
@@ -143,132 +146,14 @@
 </template>
 
 <script>
+
+
 import diyJs from '@/common/js/diy.js';
 import scroll from '@/common/js/scroll-view.js';
 import indexJs from './public/js/index.js';
 
 export default {
-	mixins: [diyJs, scroll, indexJs],
-	data() {
-		return {
-			minScrollTop: 100,
-			wechatQrcode: '',
-			diyRoute: '/pages/index/index',
-			showPrivacyModal: false // 新增：控制隐私弹窗显示
-		};
-	},
-	onLoad(option) {
-		// #ifdef H5
-		if (option.module && option.module == 'locationPicker') {
-			option.name = '';
-		}
-		// #endif
-		this.name = option.name || 'DIY_VIEW_INDEX';
-	},
-	onShow() {
-		this.getFollowQrcode();
-		// 页面显示时检查隐私设置
-		this.checkPrivacySetting();
-	},
-	mounted() {
-		this.unsubscribe = this.$eventBus?.onMany([
-			'rubik-cube-tap',
-			'picture-tap',
-			'text-tap',
-			'goods-list-tap',
-			'presale-tap',
-			'notes-tap',
-			'merch-list-tap',
-			'map-tap',
-			'img-ads-tap',
-			'many-goods-list-tap',
-			'search-tap',
-		], this._handleDiyGroupInteractionEvent);
-	},
-	beforeDestroy() {
-		if (this.unsubscribe) this.unsubscribe();
-	},
-	methods: {
-		// 检查隐私弹窗逻辑
-		checkPrivacySetting() {
-			// 模拟检查本地存储，看用户是否已经同意过
-			// 实际项目中请替换为你真实的存储逻辑
-			const hasAgreed = uni.getStorageSync('HAS_AGREED_PRIVACY');
-			if (!hasAgreed) {
-				// 延迟显示，防止遮挡页面渲染
-				setTimeout(() => {
-					this.showPrivacyModal = true;
-				}, 500);
-			}
-		},
-		
-		// 用户点击同意
-		handleAgree() {
-			// 保存同意状态
-			uni.setStorageSync('HAS_AGREED_PRIVACY', true);
-			this.showPrivacyModal = false;
-		},
-
-		// 用户点击不同意
-		handleDisagree() {
-			// 微信小程序环境下，不同意通常退出小程序
-			// #ifdef MP-WEIXIN
-			uni.exitMiniProgram();
-			// #endif
-			// H5 或 App 下可以提示或直接不显示内容
-			// #ifndef MP-WEIXIN
-			uni.showToast({
-				title: '您已拒绝协议，无法使用',
-				icon: 'none',
-				duration: 2000
-			});
-			// 这里可以选择关闭页面或保持弹窗
-			// this.showPrivacyModal = false; 
-			// #endif
-		},
-
-		// 查看具体条款（可选功能）
-		viewPrivacy(type) {
-			// 这里可以跳转到具体的条款页面，或者使用你现有的 privacy-popup 组件
-			// 假设你有现成的组件逻辑：
-			if (this.$refs.privacyPopup) {
-				// 假设 privacy-popup 组件有一个 show 方法
-				// this.$refs.privacyPopup.show(type);
-			}
-			uni.showToast({
-				title: '请在此处实现查看条款逻辑',
-				icon: 'none'
-			});
-		},
-
-		getFollowQrcode() {
-			if (!this.$util.isWeiXin()) return;
-			this.$api.sendRequest({
-				url: '/wechat/api/wechat/followqrcode',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.wechatQrcode = res.data.qrcode;
-					}
-				}
-			});
-		},
-		officialAccountsOpen() {
-			this.$refs.officialAccountsPopup.open();
-		},
-		officialAccountsClose() {
-			this.$refs.officialAccountsPopup.close();
-		},
-		_handleDiyGroupInteractionEvent(payload) {
-			// #ifdef H5
-			return true;
-			// #endif
-			if (this.storeToken) {
-				return true;
-			}
-			this.$refs.login?.open();
-			return false;
-		}
-	}
+	mixins: [diyJs, scroll, indexJs]
 };
 </script>
 
@@ -314,74 +199,6 @@ export default {
 .small-bot-close i {
 	font-size: 60rpx;
 }
-
-/* 新增：隐私弹窗样式 */
-.privacy-modal-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(0, 0, 0, 0.6); // 半透明背景
-	z-index: 9999; // 确保层级最高
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.privacy-modal-container {
-	width: 80%;
-	background-color: #ffffff;
-	border-radius: 12rpx;
-	padding: 40rpx 30rpx;
-	text-align: center;
-}
-
-.modal-header {
-	font-size: 36rpx;
-	font-weight: bold;
-	color: #333;
-	margin-bottom: 20rpx;
-}
-
-.modal-body {
-	font-size: 28rpx;
-	color: #666;
-	line-height: 1.6;
-	text-align: left;
-	margin-bottom: 30rpx;
-}
-
-.link {
-	color: #007aff; // 蓝色链接
-	margin: 0 4rpx;
-}
-
-.modal-footer {
-	display: flex;
-	justify-content: space-between;
-	padding: 0 20rpx;
-}
-
-.btn {
-	flex: 1;
-	height: 80rpx;
-	line-height: 80rpx;
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	text-align: center;
-	margin: 0 15rpx;
-}
-
-.btn-disagree {
-	background-color: #f5f5f5;
-	color: #333;
-}
-
-.btn-agree {
-	background-color: #07c160; // 微信绿
-	color: #fff;
-}
 </style>
 <style scoped>
 .swiper ::v-deep .uni-swiper-dots-horizontal {

pages/index/public/js/index.js

@@ -1,119 +1,82 @@
 export default {
-    data() {
-        return {
-            minScrollTop: 100, // 设置回到顶端按钮显示要求，最小页面滚动距离
-            wechatQrcode: '', // 公众号二维码
-            diyRoute: '/pages/index/index',
-            showPrivacyModal: false // 新增：控制隐私弹窗显示的变量
-        };
-    },
-    onLoad(option) {
-        // #ifdef H5
-        // H5地图选择位置回调数据
-        if (option.module && option.module == 'locationPicker') {
-            option.name = ''; // 清空地址
-        }
-        // #endif
-        this.name = option.name || 'DIY_VIEW_INDEX'; // 根据店铺运营模式，打开平台（shop）或者连锁门店（stroe）页面，接口会自行判断
+	data() {
+		return {
+			minScrollTop: 100, // 设置回到顶端按钮显示要求，最小页面滚动距离
+			wechatQrcode: '', // 公众号二维码
+			diyRoute: '/pages/index/index'
+		};
+	},
+	onLoad(option) {
+		// #ifdef H5
+		// H5地图选择位置回调数据
+		if (option.module && option.module == 'locationPicker') {
+			option.name = ''; // 清空地址
+		}
+		// #endif
+		this.name = option.name || 'DIY_VIEW_INDEX'; // 根据店铺运营模式，打开平台（shop）或者连锁门店（stroe）页面，接口会自行判断
 
-    },
-    onShow() {
-        // 获取关注公众号二维码
-        this.getFollowQrcode();
-        
-        // 打开隐私弹窗
-        this.openPrivacyModal();
-    },
-    mounted() {
-        // 监听图片、文字、商品列表等组件的点击事件
-        this.unsubscribe = this.$eventBus?.onMany([
-            'rubik-cube-tap',
-            'picture-tap', 
-            'text-tap',
-            'goods-list-tap',
-            'presale-tap',
-            'notes-tap',
-            'merch-list-tap',
-            'map-tap',
-            'img-ads-tap',
-            'many-goods-list-tap',
-            'search-tap',
-        ], this._handleDiyGroupInteractionEvent);
-    },
-    beforeDestroy() {
-        // 移除图片点击事件监听
-        if (this.unsubscribe) this.unsubscribe();
-    },
-    methods: {
-        // 检查隐私设置（保留原有逻辑，如果不需要可删除）
-        checkPrivacySetting() {
-            setTimeout(() => {
-                if (this.$refs.privacyPopup) {
-                    this.$refs.privacyPopup.proactive();
-                }
-            }, 100);
-        },
+	},
+	onShow() {
+		// 获取关注公众号二维码
+		this.getFollowQrcode();
+	},
+	mounted() {
+		// 监听图片、文字、商品列表等组件的点击事件
+		this.unsubscribe = this.$eventBus?.onMany([
+			'rubik-cube-tap',
+			'picture-tap', 
+			'text-tap',
+			'goods-list-tap',
+			'presale-tap',
+			'notes-tap',
+			'merch-list-tap',
+			'map-tap',
+			'img-ads-tap',
+			'many-goods-list-tap',
+			'search-tap',
+		], this._handleDiyGroupInteractionEvent);
+	},
+	beforeDestroy() {
+		// 移除图片点击事件监听
+		if (this.unsubscribe) this.unsubscribe();
+	},
+	methods: {
+		// 关注公众号
+		getFollowQrcode() {
+			if (!this.$util.isWeiXin()) return;
+			this.$api.sendRequest({
+				url: '/wechat/api/wechat/followqrcode',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.wechatQrcode = res.data.qrcode;
+					}
+				}
+			});
+		},
+		officialAccountsOpen() {
+			this.$refs.officialAccountsPopup.open();
+		},
+		officialAccountsClose() {
+			this.$refs.officialAccountsPopup.close();
+		},
+		// 统一处理点击及触摸事件
+		_handleDiyGroupInteractionEvent(payload) {
+			// #ifdef H5
+			// 如果是 H5 环境，直接返回 true 继续传播
+			return true;
+			// #endif
 
-        // 新增：打开隐私弹窗的方法
-        openPrivacyModal() {
-            // 延迟一点执行，防止页面加载卡顿
-            setTimeout(() => {
-                this.showPrivacyModal = true;
-            }, 500);
-        },
+			// 如果已登录，直接返回 true 继续传播
+			if (this.storeToken) {
+				return true;
+			}
 
-        // 新增：处理用户点击“同意并继续”
-        handlePrivacyAgree() {
-            this.showPrivacyModal = false;
-            // 这里可以添加保存到本地存储的逻辑，表示用户已同意
-            uni.setStorageSync('hasAgreedPrivacy', true);
-        },
+			// 打开登录弹窗
+			// console.log('==> _handleDiyGroupInteractionEvent, 未登录，打开登录弹窗', { payload })
+			this.$refs.login?.open();
 
-        // 新增：处理用户点击“不同意”
-        handlePrivacyDisagree() {
-            this.showPrivacyModal = false;
-            // 如果不同意，通常退出小程序或关闭页面
-            uni.navigateBack({
-                delta: 1
-            });
-        },
-
-        // 关注公众号
-        getFollowQrcode() {
-            if (!this.$util.isWeiXin()) return;
-            this.$api.sendRequest({
-                url: '/wechat/api/wechat/followqrcode',
-                success: res => {
-                    if (res.code >= 0 && res.data) {
-                        this.wechatQrcode = res.data.qrcode;
-                    }
-                }
-            });
-        },
-        officialAccountsOpen() {
-            this.$refs.officialAccountsPopup.open();
-        },
-        officialAccountsClose() {
-            this.$refs.officialAccountsPopup.close();
-        },
-        // 统一处理点击及触摸事件
-        _handleDiyGroupInteractionEvent(payload) {
-            // #ifdef H5
-            // 如果是 H5 环境，直接返回 true 继续传播
-            return true;
-            // #endif
-
-            // 如果已登录，直接返回 true 继续传播
-            if (this.storeToken) {
-                return true;
-            }
-
-            // 打开登录弹窗
-            // console.log('==> _handleDiyGroupInteractionEvent, 未登录，打开登录弹窗', { payload })
-            this.$refs.login?.open();
-
-            // 阻止事件继续传播
-            return false;
-        }
-    }
-};
+			// 阻止事件继续传播
+			return false;
+		}
+	}
+}

pages_goods/category.vue

@@ -30,13 +30,13 @@ export default {
 		};
 	},
 	onLoad() {
-		this.$util.hideHomeButton();
 		//刷新多语言
 		this.$langConfig.refresh();
+
+		uni.hideTabBar();
 		this.getDiyInfo();
 	},
 	onShow() {
-		this.$util.hideHomeButton();
 		if (this.$refs.category) this.$refs.category[0].pageShow();
 	},
 	onUnload() {

pages_tool/agreement/contenr.vue

@@ -1,187 +1,52 @@
 <template>
-	<view class="view-container" :style="themeColor">
-		<!-- 加载状态 -->
-		<view v-if="loading" class="loading-state">
-			<view class="loading-spinner"></view>
-		</view>
-
-		<!-- 空状态 -->
-		<view v-else-if="!content" class="empty-state">
-			<view class="empty-icon">📄</view>
-			<text class="empty-title">暂无内容</text>
-			<text class="empty-desc">该协议内容暂未设置</text>
-			<button class="empty-button" @click="getcontent">重新加载</button>
-		</view>
-
-		<!-- 内容状态 -->
-		<rich-text v-else :nodes="content"></rich-text>
-
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+	<view style="padding: 20rpx;" :style="themeColor">
+		<rich-text :nodes="content"></rich-text>
 	</view>
 </template>
 
 <script>
 import htmlParser from '@/common/js/html-parser';
-import scroll from '@/common/js/scroll-view.js';
 export default {
-	data() {
-		return {
-			content: '',
-			type: '',
-			uniacid: 0,
-			loading: true
-		};
-	},
-	mixins: [scroll],
-	onLoad(option) {
+    data() {
+        return {
+			content:'',
+			type:'',
+			uniacid:0
+        };
+    },
+    onLoad(option) {
 		this.type = option.type
-		this.uniacid = option.uniacid ? option.uniacid : 0
-
-		this.isIphoneX = this.$util.uniappIsIPhoneX()
-		this.getcontent()
-	},
-	onShow() {
-
-	},
-	methods: {
-		getcontent() {
-			this.loading = true
+		this.uniacid = option.uniacid?option.uniacid:0
+		
+        this.isIphoneX = this.$util.uniappIsIPhoneX()
+		 this.getcontent()
+    },
+    onShow() {
+      
+    },
+    methods: {
+        getcontent() {
 			// privacy  content
 			var data = {
-				type: this.type
+				type:this.type
 			}
-			if (this.uniacid > 0) data.uniacid = this.uniacid
-			this.$api.sendRequest({
-				url: '/api/config/agreement',
-				data: data,
-				success: res => {
+			if(this.uniacid > 0) data.uniacid = this.uniacid
+            this.$api.sendRequest({
+               	url: '/api/config/agreement',
+				data:data,
+                success: res => {
 					console.log(res.data.title)
 					uni.setNavigationBarTitle({
-						title: res.data.title
+						title:res.data.title
 					})
 					this.content = res.data.content
-					this.loading = false
-				},
-				fail: () => {
-					this.loading = false
-				}
-			});
-		}
-	}
+				}                   
+            });
+        }
+    }
 };
 </script>
 
-<style lang="scss" scoped>
-.view-container {
-	padding: 40rpx;
-	background: #ffffff;
-	border-radius: 12rpx;
-	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06), 0 1rpx 2rpx rgba(0, 0, 0, 0.09);
-	margin: 4rpx 20rpx;
-	// max-width: 800rpx;
-	margin-left: auto;
-	margin-right: auto;
-	min-height: 100vh;
-	position: relative;
-	overflow: hidden;
-}
+<style lang="scss">
 
-// 增强纸张纹理效果
-.view-container::before {
-	content: '';
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 200 200"><defs><pattern id="grain" width="100" height="100" patternUnits="userSpaceOnUse"><circle cx="25" cy="25" r="0.5" fill="%23f5f5f5" opacity="0.3"/><circle cx="75" cy="75" r="0.3" fill="%23f0f0f0" opacity="0.2"/><circle cx="15" cy="85" r="0.4" fill="%23f8f8f8" opacity="0.25"/><circle cx="85" cy="15" r="0.2" fill="%23ebebeb" opacity="0.3"/><path d="M0 0L200 200M200 0L0 200" stroke="%23f2f2f2" stroke-width="0.3" fill="none" opacity="0.15"/></pattern></defs><rect width="200" height="200" fill="url(%23grain)"/></svg>');
-	opacity: 0.4;
-	pointer-events: none;
-}
-
-// 加载状态样式
-.loading-state {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	min-height: 60vh;
-	padding: 40rpx;
-
-	.loading-spinner {
-		width: 50rpx;
-		height: 50rpx;
-		border: 4rpx solid #f3f3f3;
-		border-top: 4rpx solid #6c8ebf;
-		border-radius: 50%;
-		animation: spin 1s linear infinite;
-		margin-bottom: 24rpx;
-	}
-}
-
-@keyframes spin {
-	0% {
-		transform: rotate(0deg);
-	}
-
-	100% {
-		transform: rotate(360deg);
-	}
-}
-
-// 空状态样式
-.empty-state {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	min-height: 60vh;
-	padding: 40rpx;
-	text-align: center;
-
-	.empty-icon {
-		font-size: 120rpx;
-		margin-bottom: 32rpx;
-		opacity: 0.6;
-	}
-
-	.empty-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #4e5969;
-		margin-bottom: 16rpx;
-	}
-
-	.empty-desc {
-		font-size: 24rpx;
-		color: #8492a6;
-		margin-bottom: 40rpx;
-		line-height: 1.6;
-	}
-
-	.empty-button {
-		width: 200rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		background-color: #6c8ebf;
-		color: white;
-		border: none;
-		border-radius: 35rpx;
-		font-size: 26rpx;
-		font-weight: 500;
-		box-shadow: 0 2rpx 8rpx rgba(108, 142, 191, 0.3);
-		transition: all 0.3s ease;
-
-		&:hover {
-			background-color: #5a78a8;
-			transform: translateY(-2rpx);
-			box-shadow: 0 4rpx 12rpx rgba(108, 142, 191, 0.4);
-		}
-	}
-}
-
-::v-deep .mescroll-totop {
-	right: 27rpx !important;
-	bottom: 120rpx !important;
-}
 </style>

pages_tool/article/detail.vue

@@ -1,156 +1,172 @@
 <template>
-	<view class="page" :style="themeColor">
-		<view class="help-title">{{ detail.article_title }}</view>
-		<view class="help-meta" v-if="detail.is_show_release_time == 1">
-			<text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
-		</view>
-		<view class="help-content"><rich-text :nodes="content"></rich-text></view>
-		<view class="bottom-area">
-			<view v-if="detail.is_show_read_num == 1">
-				阅读：
-				<text class="price-font">{{ detail.read_num + detail.initial_read_num }}</text>
-			</view>
-			<view v-if="detail.is_show_dianzan_num == 1">
-				<text class="price-font">{{ detail.dianzan_num + detail.initial_dianzan_num }}</text>
-				人已赞
-			</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
+    <view class="page" :style="themeColor">
+        <view class="help-title">{{ detail.article_title }}</view>
+        <view class="help-meta" v-if="detail.is_show_release_time == 1">
+            <text class="help-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
+        </view>
+        <view class="help-content"><rich-text :nodes="content"></rich-text></view>
+        <view class="bottom-area">
+            <view v-if="detail.is_show_read_num == 1">
+                阅读：
+                <text class="price-font">{{ detail.read_num + detail.initial_read_num }}</text>
+            </view>
+            <view v-if="detail.is_show_dianzan_num == 1">
+                <text class="price-font">{{ detail.dianzan_num + detail.initial_dianzan_num }}</text>
+                人已赞
+            </view>
+        </view>
+        <loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- 隐私弹窗 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-	</view>
+        <!-- 隐私弹窗 -->
+        <privacy-popup ref="privacyPopup"></privacy-popup>
+
+        
+        <view class="page-bottom" v-if="openBottomNav">
+            <diy-bottom-nav @callback="callback" :name="name" />
+        </view>
+    </view>
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				articleId: 0,
-				detail: {},
-				content: ''
-			};
-		},
-		onLoad(options) {
-			this.articleId = options.article_id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.articleId = sceneParams.split('-')[1];
-			}
-			if (this.articleId == 0) {
-				this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/article/info',
-					data: {
-						article_id: this.articleId
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.detail = res.data;
-							this.$langConfig.title(this.detail.article_title);
-							this.content = htmlParser(this.detail.article_content);
-							this.setPublicShare();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-							}, 2000);
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
-				this.$util.setPublicShare({
-					title: this.detail.article_title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = this.detail.article_title;
-			var path = '/pages_tool/article/detail?article_id=' + this.articleId;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.article_title;
-			var query = 'article_id=' + this.articleId;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
-		}
-	};
+import htmlParser from '@/common/js/html-parser';
+export default {
+    data() {
+        return {
+            articleId: 0,
+            detail: {},
+            content: '',
+            openBottomNav: true, 
+            name: 'article'     
+        };
+    },
+    onLoad(options) {
+        this.articleId = options.article_id || 0;
+        // 小程序扫码进入
+        if (options.scene) {
+            var sceneParams = decodeURIComponent(options.scene);
+            this.articleId = sceneParams.split('-')[1];
+        }
+        if (this.articleId == 0) {
+            this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+        }
+    },
+    onShow() {
+        this.getData();
+    },
+    methods: {
+        getData() {
+            this.$api.sendRequest({
+                url: '/api/article/info',
+                data: {
+                    article_id: this.articleId
+                },
+                success: res => {
+                    if (res.code == 0 && res.data) {
+                        this.detail = res.data;
+                        this.$langConfig.title(this.detail.article_title);
+                        this.content = htmlParser(this.detail.article_content);
+                        this.setPublicShare();
+                    } else {
+                        this.$util.showToast({
+                            title: res.message
+                        });
+                        setTimeout(() => {
+                            this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+                        }, 2000);
+                    }
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                },
+                fail: res => {
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                }
+            });
+        },
+        // 设置公众号分享
+        setPublicShare() {
+            let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
+            this.$util.setPublicShare({
+                title: this.detail.article_title,
+                desc: '',
+                link: shareUrl,
+                imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+            });
+        },
+        callback(data) {
+        }
+    },
+    onShareAppMessage(res) {
+        var title = this.detail.article_title;
+        var path = '/pages_tool/article/detail?article_id=' + this.articleId;
+        return {
+            title: title,
+            path: path,
+            success: res => {},
+            fail: res => {}
+        };
+    },
+    // 分享到朋友圈
+    onShareTimeline() {
+        var title = this.detail.article_title;
+        var query = 'article_id=' + this.articleId;
+        return {
+            title: title,
+            query: query,
+            imageUrl: ''
+        };
+    }
+};
 </script>
 
 <style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background: #ffffff;
-	}
+.page {
+    width: 100%;
+    height: 100%;
+    padding: 30rpx;
+    box-sizing: border-box;
+    background: #ffffff;
+}
 
-	.help-title {
-		font-size: $font-size-toolbar;
-		text-align: left;
-		font-weight: bold;
-	}
+.help-title {
+    font-size: $font-size-toolbar;
+    text-align: left;
+    font-weight: bold;
+}
 
-	.help-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-	}
+.help-content {
+    margin-top: $margin-updown;
+    word-break: break-all;
+}
 
-	.help-meta {
-		text-align: left;
-		margin-top: $margin-updown;
-		color: $color-tip;
+.help-meta {
+    text-align: left;
+    margin-top: $margin-updown;
+    color: $color-tip;
 
-		.help-time {
-			font-size: $font-size-tag;
-		}
-	}
+    .help-time {
+        font-size: $font-size-tag;
+    }
+}
 
-	.bottom-area {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 40rpx;
+.bottom-area {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 40rpx;
 
-		.price-font {
-			font-weight: normal !important;
-		}
+    .price-font {
+        font-weight: normal !important;
+    }
 
-		view {
-			color: #999;
-			font-size: 24rpx;
-		}
-	}
+    view {
+        color: #999;
+        font-size: 24rpx;
+    }
+}
+.page-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 999;
+}
 </style>

pages_tool/article/list.vue

@@ -1,215 +1,245 @@
 <template>
-	<view :style="themeColor">
-		<mescroll-uni @getData="getData" ref="mescroll">
-			<block slot="list">
-				<view class="article-wrap" v-if="list.length">
-					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
-					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
-						<view class="article-img">
-							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix"
-								@error="imgError(index)" />
-						</view>
-						<view class="info-wrap">
-							<text class="title">{{ item.article_title }}</text>
-							<view class="read-wrap">
-								<block v-if="item.category_name">
-									<text class="category-icon"></text>
-									<text>{{ item.category_name }}</text>
-								</block>
-								<text class="date">{{ $util.timeStampTurnTime(item.create_time, 'date') }}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-else class="empty-wrap"><ns-empty text="暂无文章" :isIndex="false"></ns-empty></view>
-				<loading-cover ref="loadingCover"></loading-cover>
-			</block>
-		</mescroll-uni>
+    <view :style="themeColor">
+        <!-- 主内容区域 -->
+        <view
+            class="page-img"
+            :style="{
+                backgroundColor: bgColor,
+                minHeight: openBottomNav ? 'calc(100vh - 55px)' : '100vh'
+            }"
+        >
+            <mescroll-uni @getData="getData" ref="mescroll">
+                <block slot="list">
+                    <view class="article-wrap" v-if="list.length">
+                        <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
+                        <view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
+                            <view class="article-img">
+                                <image
+                                    class="cover-img"
+                                    :src="$util.img(item.cover_img)"
+                                    mode="widthFix"
+                                    @error="imgError(index)"
+                                />
+                            </view>
+                            <view class="info-wrap">
+                                <text class="title">{{ item.article_title }}</text>
+                                <view class="read-wrap">
+                                    <block v-if="item.category_name">
+                                        <text class="category-icon"></text>
+                                        <text>{{ item.category_name }}</text>
+                                    </block>
+                                    <text class="date">{{ $util.timeStampTurnTime(item.create_time, 'date') }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-else class="empty-wrap">
+                        <ns-empty text="暂无文章" :isIndex="false"></ns-empty>
+                    </view>
+                    <loading-cover ref="loadingCover"></loading-cover>
+                </block>
+            </mescroll-uni>
 
-		<!-- 隐私弹窗 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-	</view>
+            <!-- 隐私弹窗 -->
+            <privacy-popup ref="privacyPopup"></privacy-popup>
+        </view>
+        <view class="page-bottom" v-if="openBottomNav">
+            <diy-bottom-nav @callback="callback" :name="name" />
+        </view>
+    </view>
 </template>
 
 <script>
 export default {
-	data() {
-		return {
-			list: []
-		};
-	},
-	onShow() {
-		this.setPublicShare();
-	},
-	methods: {
-		getData(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/article/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		toDetail(item) {
-			this.$util.redirectTo('/pages_tool/article/detail', {
-				article_id: item.article_id
-			});
-		},
-		imgError(index) {
-			if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
-		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
-			this.$util.setPublicShare({
-				title: '文章列表',
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-			});
-		}
-	},
-	onShareAppMessage(res) {
-		var title = '文章列表';
-		var path = '/pages_tool/article/list';
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		var title = '文章列表';
-		var query = '/pages_tool/article/list';
-		return {
-			title: title,
-			query: query,
-			imageUrl: ''
-		};
-	}
+    data() {
+        return {
+            list: [],
+            
+            openBottomNav: true, 
+            name: 'article',     
+            bgColor: '#ffffff' 
+        };
+    },
+    onShow() {
+        this.setPublicShare();
+		// 调用API隐藏返回首页按钮
+		wx.hideHomeButton();
+    },
+    methods: {
+        getData(mescroll) {
+            this.$api.sendRequest({
+                url: '/api/article/page',
+                data: {
+                    page_size: mescroll.size,
+                    page: mescroll.num
+                },
+                success: res => {
+                    let newArr = [];
+                    let msg = res.message;
+                    if (res.code == 0 && res.data) {
+                        newArr = res.data.list;
+                    } else {
+                        this.$util.showToast({
+                            title: msg
+                        });
+                    }
+                    mescroll.endSuccess(newArr.length);
+                    if (mescroll.num == 1) this.list = [];
+                    this.list = this.list.concat(newArr);
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                },
+                fail: res => {
+                    mescroll.endErr();
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                }
+            });
+        },
+        toDetail(item) {
+            this.$util.redirectTo('/pages_tool/article/detail', {
+                article_id: item.article_id
+            });
+        },
+        imgError(index) {
+            if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
+        },
+        setPublicShare() {
+            let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
+            this.$util.setPublicShare({
+                title: '新闻',
+                desc: '',
+                link: shareUrl,
+                imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+            });
+        },
+        callback(data) {
+        }
+    },
+    onShareAppMessage(res) {
+        var title = '新闻';
+        var path = '/pages_tool/article/list';
+        return {
+            title: title,
+            path: path,
+            success: res => {},
+            fail: res => {}
+        };
+    },
+    onShareTimeline() {
+        var title = '新闻';
+        var query = '/pages_tool/article/list';
+        return {
+            title: title,
+            query: query,
+            imageUrl: ''
+        };
+    }
 };
 </script>
 
 <style lang="scss" scoped>
 ::v-deep .fixed {
-	position: relative;
-	top: 0;
+    position: relative;
+    top: 0;
 }
 
 .empty-wrap {
-	padding-top: 200rpx;
+    padding-top: 200rpx;
 }
 
 .article-wrap {
-	background: #f8f8f8;
+    background: #f8f8f8;
 
-	.adv-wrap {
-		margin: 24rpx 24rpx 0 24rpx;
-		width: auto;
-	}
+    .adv-wrap {
+        margin: 24rpx 24rpx 0 24rpx;
+        width: auto;
+    }
 
-	.item {
-		display: flex;
-		padding: 20rpx;
-		background-color: #fff;
-		margin: 24rpx;
-		border-radius: 16rpx;
+    .item {
+        display: flex;
+        padding: 20rpx;
+        background-color: #fff;
+        margin: 24rpx;
+        border-radius: 16rpx;
 
-		.article-img {
-			margin-right: 20rpx;
-			width: 160rpx;
-			height: 160rpx;
-			overflow: hidden;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+        .article-img {
+            margin-right: 20rpx;
+            width: 160rpx;
+            height: 160rpx;
+            overflow: hidden;
+            display: flex;
+            align-items: center;
+            justify-content: center;
 
-			image {
-				width: 100%;
-			}
-		}
+            image {
+                width: 100%;
+            }
+        }
 
-		.info-wrap {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
+        .info-wrap {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
 
-			.title {
-				font-weight: bold;
-				margin-bottom: 10rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				font-size: 30rpx;
-				line-height: 1.5;
-			}
+            .title {
+                font-weight: bold;
+                margin-bottom: 10rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                font-size: 30rpx;
+                line-height: 1.5;
+            }
 
-			.abstract {
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				font-size: $font-size-tag;
-			}
+            .abstract {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                font-size: $font-size-tag;
+            }
 
-			.read-wrap {
-				display: flex;
-				color: #999ca7;
-				justify-content: flex-start;
-				align-items: center;
-				margin-top: 10rpx;
-				line-height: 1;
+            .read-wrap {
+                display: flex;
+                color: #999ca7;
+                justify-content: flex-start;
+                align-items: center;
+                margin-top: 10rpx;
+                line-height: 1;
 
-				text {
-					font-size: $font-size-tag;
-				}
+                text {
+                    font-size: $font-size-tag;
+                }
 
-				.iconfont {
-					font-size: 36rpx;
-					vertical-align: bottom;
-					margin-right: 10rpx;
-				}
+                .iconfont {
+                    font-size: 36rpx;
+                    vertical-align: bottom;
+                    margin-right: 10rpx;
+                }
 
-				.category-icon {
-					width: 8rpx;
-					height: 8rpx;
-					border-radius: 50%;
-					background: $base-color;
-					margin-right: 10rpx;
-				}
+                .category-icon {
+                    width: 8rpx;
+                    height: 8rpx;
+                    border-radius: 50%;
+                    background: $base-color;
+                    margin-right: 10rpx;
+                }
 
-				.date {
-					margin-left: 20rpx;
-				}
-			}
-		}
-	}
+                .date {
+                    margin-left: 20rpx;
+                }
+            }
+        }
+    }
+}
+.page-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 999;
 }
 </style>

pages_tool/contact/contact.vue

@@ -252,7 +252,6 @@ export default {
         };
     },
     onLoad(option) {
-        this.$util.hideHomeButton();
         this.$langConfig.refresh();
         this.$api.sendRequest({
             url: '/api/member/personnel',
@@ -302,9 +301,6 @@ export default {
             fail: res => { }
         });
     },
-	onShow() {
-		this.$util.hideHomeButton();
-	},    
     methods: {
         // 分享文件
         shareFile(file) {

pages_tool/member/index.vue

@@ -86,18 +86,16 @@ export default {
 		nsNewGift
 	},
 	mixins: [diyJs, indexJs],
-	onLoad() {
-		this.$util.hideHomeButton();
-	},	
-	onShow() {
-		this.$util.hideHomeButton();
-	},	
 	methods: {
 
 		tourl(url) {
 			this.$util.redirectTo(url);
 		},
-
+ onShow() {
+        this.setPublicShare();
+		// 调用API隐藏返回首页按钮
+		wx.hideHomeButton();
+    },
 		// 退出登录
 		logout() {
 			uni.showModal({
@@ -149,6 +147,7 @@ export default {
 
 	}
 };
+
 </script>
 
 <style lang="scss">

readme.md

@@ -1,150 +1,176 @@
 # 小程序及快应用前端源码
 
-## 1. 📋 项目说明
+来源于外包提供的源代码，"0731xcx20微信小程序(1).zip"
 
-该项目基于 **uni-app** 开发构建，请使用 [HBuilderX](https://www.dcloud.io/hbuilderx.html) 进行代码开发及构建发布。
 
-## 2. 🛠️ 开发说明
+## 项目说明
 
-- 源码基于 **Vue2** 版本
-- SCSS 采用 **dart-sass** 进行编译输出
+该项目基于 uniapp 开发构建，请使用(HBuilderX)[https://www.dcloud.io/hbuilderx.html] 进行代码开发及构建发布。
 
-## 3. 🔧 开发调试说明
+## 开发说明
 
-### 3.1 注意事项
+1. 源码基于Vue2版本，scss采用node-sass进行编译输出。
 
-- 应用访问等关键参数的配置来源于 `./common/js/config.js`
 
-### 3.2 本地调试
+## 开发调试说明
 
-`.local.config.js.example` 是本地调试配置示例。
+### 注意点
 
-拷贝 `.local.config.js.example` 为 `.local.config.js` 文件，默认开发调试模式会自动加载该文件
+应用访问等关键参数的配置来源于 `./common/js/config.js`
 
----
-
-## 4. 📦 发布说明
-
-### 4.1 小程序发布
-
-#### 4.1.1 基本操作步骤（通用版/定制化版）
-
-##### 4.1.1.1 【前置准备】
-1. 在项目根目录打开终端安装依赖：
-   ```bash
-   npm install
-   ```
-   *已有依赖可跳过此步骤*
-
-##### 4.1.1.2 【发布构建】
-1. 使用 HBuilderX 打开项目
-2. 选择菜单栏「发行」 → 「小程序-微信」→ 「发行」，等待构建完成
-   ⚠️ **注意**：底部控制台弹出"请在微信小程序开发者工具中点击上传"后再执行下一步
-3. 打开资源管理器→项目根目录，右键选择「在终端中打开」，执行命令：
-   ```bash
-   npm run mp-weixin
-   ```
-4. 找到项目根目录 `/unpackage/dist/build` 下生成的 mp-weixin 压缩包
-   💡 **示例**：`mp-weixin-2026-01-23-1769152056146.zip`
-   *同时该目录下会生成未压缩的 `mp-weixin` 目录*
-
-##### 4.1.1.3 【验证与重命名】
-1. 打开未压缩的 `mp-weixin` 目录，找到 `site.js` 文件，将文件内的 `uniacid` 值改为当前客户编号（如：2812）并保存
-2. 打开微信开发者工具，导入「mp-weixin」目录，点击「编译」，在开发者工具控制台验证有无报错，以及能否返回对应客户的业务数据
-3. 确保无误后将生成的 mp-weixin 压缩包重命名
-   - **定制化版**格式：`定制化-客户编号-域名-mp-weixin-当前日期-生成编号.zip`
-   - **通用版**无需重命名
-   
-   💡 **示例**：`custom-2812-xcx.aigc-quickapp.com-mp-weixin-2026-01-22-1769152056146.zip`
-   
-   🚫 **禁止**：压缩包命名禁止包含 `/ \ : * ? " < > |` 等特殊字符
-
-##### 4.1.1.4 【交付与最终发布】🔍
-1. 将重命名后的文件发送给技术人员
-   *📌通用版直接将生成的 mp-weixin 压缩包发送给技术人员*
-2. **技术人员操作流程**：
-    - 解压压缩包
-    - 确认 `site.js` 中的 `uniacid` 为客户编号
-    - 用微信开发者工具导入解压后的代码目录
-    - 编译验证无误后，上传发布
-
----
-
-### 4.2 快应用发布
-
-#### 4.2.1 基本操作（通用版/定制化版）
-
-##### 4.2.1.1 【发布构建】
-1. 使用 HBuilderX 打开项目
-2. 打开项目根目录的 `manifest.json` 文件，切换至可视化配置界面：
-   1. 依次点击「Web 配置」→「运行的基础配置」
-   2. 根据情况查看是否修改路径中/hwappx/？？？？/的客户编号
-    📌 **通用版**保留原有 `/hwappx/common/`
-   📌 **测试版**保留原有 `/hwappx/test/`
-   💡 **个性化定制示例**：`/hwappx/2811/`，其中 2811 为定制化版客户编号
-
-3. 选择菜单栏「发行」 → 「自定义发行」 →（「H5-xcx.aigc-quickapp.com」查看.local.config.js中站点的网址前缀，站点的网址前缀是什么就选自定义发行中相同的格式）
- 例如：网址是5g.aigc-quickapp.com，自定义发行就选H5-5g.aigc-quickapp.com
-      网址是dev.aigc-quickapp.com，自定义发行就选H5-xcx.aigc-quickapp.com
-4. 修改以下配置：
-   1. **网站标题**：快应用
-   2. **网站域名**：当前客户域名（示例：xcx.aigc-quickapp.com或者5g.aigc-quickapp.com）
-   3. 确认后点击「发行」等待构建完成
-
-   ⚠️ **注意**：底部控制台弹出“项目 lucky_shop 导出Web成功，路径为：D:\项目文件\项目根目录\unpackage\dist\build\web”后再执行下一步
-   💡 **示例**：`项目 lucky_shop 导出Web成功，路径为：D:\0.项目源码\lucky_shop\unpackage\dist\build\web`
-
-5. 按控制台提示的路径找到 `web` 目录，将该目录下所有文件手动打包成一个 `.zip` 压缩包
-   *仅打包文件，不包含外层 web 目录*
-
-##### 4.2.1.2 【重命名】
-1. 按版本类型规范重命名压缩包：
-   - **通用版**：`hwappx-common-域名-时间.zip`
-     💡 **示例**：`hwappx-common-xcx.aigc-quickapp.com-2026-01-24.zip`
-   
-   - **定制化版**：`客户名称-定制化---hwappx-客户编号-域名-时间.zip`
-     💡 **示例**：`POCT检测分析平台-定制化---hwappx-2811-xcx.aigc-quickapp.com-2026-01-24.zip`
-
-   🚫 **禁止**：压缩包命名禁止包含 `/ \ : * ? " < > |` 等特殊字符
-
-##### 4.2.1.3 【交付与最终发布】🔍
-1. 将重命名后的压缩包发送给运维人员
-2. **运维人员操作流程**：
-   1. 解压压缩包
-   2. 打开快应用开发者工具，导入解压后的代码目录
-   3. 验证代码无报错后，执行上传发布操作
-
----
-
-## 5. 📝 构建脚本说明
-
-### 5.1 可用的 npm 脚本命令
-
-| 命令 | 说明 |
-|------|------|
-| `npm run mp-weixin` | 默认构建（production模式，包含ZIP文件） |
-| `npm run mp-weixin:patch` | 只打补丁（production模式，不创建ZIP文件） |
-| `npm run mp-weixin:dev` | 开发模式构建（development模式，包含ZIP文件） |
-| `npm run mp-weixin:dev:patch` | 只打补丁（development模式，不创建ZIP文件） |
-
-### 5.2 构建脚本功能
-
-- 复制 `project.config.json` 和 `project.private.config.json` 文件到构建目录
-- 复制 `site.js` 文件到构建目录
-- 在 `vendor.js` 文件开头追加 `import site from "../site.js";` 语句
-- 支持创建构建结果的 ZIP 压缩包
-- 自动打开 ZIP 文件所在目录
-
----
-
-## 6. 🔄 版本历史
-
-### 6.1 v1.3
-- 修复微信小程序构建脚本，支持复制 `project.config.json` 和 `project.private.config.json` 文件
-- 增强构建脚本功能，添加命令行参数支持
-- 在 `package.json` 中添加相关 npm 脚本命令
-- 优化脚本执行逻辑，提高可靠性和灵活性
+### 小程序调试
 
 
 
+## 发布说明
 
+### 小程序发布
+
+基本操作步骤：
+
+1. 使用HBuilderX打开项目
+2. 选择菜单栏 "发行" -> "小程序-微信"，进行发布构建
+3. 然后在终端进入项目根目录，执行 `npm run mp-weixin` 手动输出构建包。例如：mp-weixin-2025-10-31-1761881054836.zip（改id）
+4. 然后将mp-weixin-2025-10-31-1761881054836发给微信开发定制客户技术人员，
+5. 定制客户技术人员可以修改解压后，修改项目根目录下的site.js，进行针对客户的信息配置，然后使用微信开发者工具打开发布后的代码进行上传发布
+
+参照：`common\js\config.js` 文件内容说明：
+
+```js
+// 发行版本，配置说明
+let releaseCfg = undefined;
+try {
+    if (site) {
+        releaseCfg = {
+            baseUrl: site.baseUrl,
+            imgDomain: site.baseUrl,
+            h5Domain: site.baseUrl,
+            uniacid: site.uniacid,
+        }
+    }
+} catch (e) {}
+
+// 调试版本，配置说明
+const devCfg = {
+    // 商户ID
+    uniacid: 460, //825
+
+    //api请求地址
+    baseUrl: 'https://xcx30.5g-quickapp.com/',
+
+    // 图片域名
+    imgDomain: 'https://xcx30.5g-quickapp.com/',
+
+    // H5端域名
+    h5Domain: 'https://xcx30.5g-quickapp.com/',
+
+    // // api请求地址
+    // baseUrl: 'https://tsaas.liveplatform.cn/',
+
+    // // 图片域名
+    // imgDomain: 'https://tsaas.liveplatform.cn/',
+
+    // // H5端域名
+    // h5Domain: 'https://tsaas.liveplatform.cn/',
+
+    // api请求地址
+    // baseUrl: 'http://saas.cn/',
+
+    // // 图片域名
+    // imgDomain: 'http://saas.cn/',
+
+    // // 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),
+
+
+    // 腾讯地图key 
+    mpKey: 'TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4',
+
+    //客服地址
+    webSocket: '{{$webSocket}}',
+
+    //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
+    pingInterval: 1500,
+
+    // 版本号 
+    version: '1.0'
+};
+
+export default config;
+```
+
+
+### 快应用发布
+1. 使用HBuilderX打开项目
+2. 点击项目中【⚙】manifest.jion--->web配置--->运行的基础路径--->/hwappx/改编号/ 
+"h5" : {
+    "sdkConfigs" : {
+        "maps" : {
+            "qqmap" : {
+                "key" : "TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4"
+            }
+        }
+    },
+    "router" : {
+        "mode" : "history",
+        "base" : "/hwappx/2811/"
+    },
+	
+（编号可以在.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',
+    },
+})['2811']; // 选择要使用的环境配置
+3. 选择菜单栏 "发行" ->自定义发行--->H5-xcx.aigc-quickapp.com "快应用"，网站标题为"快应用"  域名为xcx.aigc-quickapp.com 进行发布构建
+4. 在电脑本地文件夹里找到unpackage--->dist--->build--->h5中h5-xcx.aigc-quickapp.com--->进行手动打包，例如：static.zip
+（压缩包改id  公版--例如 hwappx-common-xcx.aigc-quickapp.com-2026-01-09.zip
+            定制化--例如 POCT检测分析平台-定制化--- hwappx-2811-xcx.aigc-quickapp.com-2026-01-09.zip）
+5. 然后将压缩包发给开发定制客户技术人员，
+6. 使用快应用开发者工具打开发布后的代码进行上传发布

site.js

@@ -1,4 +1,4 @@
 module.exports = {
-  baseUrl: "https://dev.aigc-quickapp.com/",//修改域名
-  uniacid: 1,//后台对应uniacid
+  baseUrl: "https://xcx6.aigc-quickapp.com/",//修改域名
+  uniacid: 2811,//后台对应uniacid
 };

store/index.js

@@ -65,7 +65,6 @@ const store = new Vuex.Store({
 		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
 		aiUnreadCount: 10, // AI未读消息数量
 		globalAIKefuConfig: null, // AI客服配置
-		 customerServiceType: 'ai',
 		globalStoreConfig: null, // 门店配置
 		globalStoreInfo: null, // 门店信息
 		defaultStoreInfo: null, // 默认门店
@@ -160,9 +159,6 @@ const store = new Vuex.Store({
 			state.globalAIKefuConfig = value;
 			uni.setStorageSync('globalAIKefuConfig', value); // 初始化数据调用
 		},
-		setCustomerServiceType(state, type) {
-		    state.customerServiceType = type;
-		  },
 		setGlobalStoreConfig(state, value) {
 			state.globalStoreConfig = value;
 			uni.setStorageSync('globalStoreConfig', value); // 初始化数据调用