chore:代码合并，整理功能

Reviewed-on: #3

.local.config.js

@@ -42,6 +42,6 @@ const localDevConfig = ({
         uniacid: 2,
         domain: 'http://localhost:8050/',
     },    
-})['2811']; // 选择要使用的环境配置
+})['1']; // 选择要使用的环境配置
 
 export default localDevConfig;

.local.config.js.example

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

common/js/ai-service.js

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

common/js/customer-service.js

@@ -2,68 +2,13 @@
  * 客服统一处理服务
  * 整合各种客服方式，提供统一的调用接口
  */
-class CustomerService {
+export class CustomerService {
-    constructor(vueInstance, externalConfig = {}) {
+    constructor(vueInstance, externalConfig = null) {
-        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 外部最新配置
@@ -83,28 +28,29 @@ class CustomerService {
             return this.latestPlatformConfig;
         }
 
-        // 优先级：外部传入的最新配置 > vuex配置 > 空对象
+        // 优先级：外部传入 > vuex store > 空对象
         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) : null;
+        platformConfig = servicerConfig.h5 && typeof servicerConfig.h5 === 'object' ? servicerConfig.h5 : null;
         // #endif
 
         // #ifdef MP-WEIXIN
-        platformConfig = servicerConfig.weapp ? (typeof servicerConfig.weapp === 'object' ? servicerConfig.weapp : null) : null;
+        platformConfig = servicerConfig.weapp && typeof servicerConfig.weapp === 'object' ? servicerConfig.weapp : null;
         // #endif
 
         // #ifdef MP-ALIPAY
-        platformConfig = servicerConfig.aliapp ? (typeof servicerConfig.aliapp === 'object' ? servicerConfig.aliapp : null) : null;
+        platformConfig = servicerConfig.aliapp && typeof servicerConfig.aliapp === 'object' ? servicerConfig.aliapp : null;
         // #endif
 
         // #ifdef PC
-        platformConfig = servicerConfig.pc ? (typeof servicerConfig.pc === 'object' ? servicerConfig.pc : null) : null;
+        platformConfig = servicerConfig.pc && typeof servicerConfig.pc === 'object' ? servicerConfig.pc : null;
         // #endif
 
-        // 处理空数组情况（你的配置中pc/aliapp是空数组，转为null）
+        // 防止空数组被当作有效配置
         if (Array.isArray(platformConfig)) {
             platformConfig = null;
         }
@@ -144,32 +90,18 @@ class CustomerService {
             warnings: []
         };
 
-        if (!config) {
+        if (!config || !config.type) {
-            result.isValid = false;
-            result.errors.push('客服配置不存在');
-            return result;
-        }
-
-        if (config.type === 'aikefu') {
-            return result;
-        }
-
-        if (!config.type) {
             result.isValid = false;
             result.errors.push('客服类型未配置');
+            return result;
         }
 
         if (config.type === 'wxwork') {
-            if (!wxworkConfig) {
+            if (!wxworkConfig || !wxworkConfig.enable) {
-                result.isValid = false;
+                result.warnings.push('企业微信未启用');
-                result.errors.push('企业微信配置不存在');
+            }
-            } else {
+            if (!wxworkConfig.contact_url) {
-                if (!wxworkConfig.enable) {
+                result.warnings.push('企业微信活码链接未配置');
-                    result.warnings.push('企业微信功能未启用');
-                }
-                if (!wxworkConfig.contact_url) {
-                    result.warnings.push('企业微信活码链接未配置，将使用原有客服方式');
-                }
             }
         }
 
@@ -177,16 +109,39 @@ class CustomerService {
     }
 
     /**
-     * 跳转到AI客服页面
+     * 跳转到 AI 客服页面（Dify）
      */
-    openAIKeFuService() {
+    openDifyService() {
-        const vm = this.vm;
+        try {
-        vm.$util.redirectTo(vm.$util.AI_CHAT_PAGE_URL);
+            // 清除未读数（如果存在）
+            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' });
+        }
     }
 
     /**
-     * 处理客服点击事件
+     * 处理客服点击事件（统一入口）
-     * @param {Object} options 选项参数
+     * @param {Object} options 选项参数（用于消息卡片等）
      */
     handleCustomerClick(options = {}) {
         const validation = this.validateConfig();
@@ -201,51 +156,61 @@ class CustomerService {
         }
 
         const config = this.getPlatformConfig();
-        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
+        console.log('【当前客服配置】', config);
+        console.log('【客服类型】', config.type);
+        
+        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
 
         if (config.type === 'none') {
             this.showNoServicePopup();
             return;
         }
 
-        // 核心分支：根据最新的type处理
+        // 核心路由：根据 type 决定行为
         switch (config.type) {
             case 'aikefu':
-                this.openAIKeFuService();
+                console.log('【跳转 AI 客服】目标路径: /pages_tool/ai-chat/index');
+                this.openDifyService();
                 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 (wxworkConfig?.enable && wxworkConfig?.contact_url && !useOriginalService) {
+        if (!useOriginalService && wxworkConfig?.enable && wxworkConfig?.contact_url) {
             wx.navigateToMiniProgram({
                 appId: 'wxeb490c6f9b154ef9',
                 path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(wxworkConfig.contact_url)}`,
@@ -256,9 +221,16 @@ 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 },
+                extInfo: { url: config.wxwork_url || '' },
-                corpId: config.corpid,
+                corpId: config.corpid || '',
                 showMessageCard: true,
                 sendMessageTitle,
                 sendMessagePath,
@@ -268,227 +240,181 @@ class CustomerService {
         // #endif
 
         // #ifdef H5
-        if (wxworkConfig?.enable && wxworkConfig?.contact_url) {
+        if (!useOriginalService && wxworkConfig?.enable && wxworkConfig?.contact_url) {
             window.location.href = wxworkConfig.contact_url;
         } else if (config.wxwork_url) {
-            location.href = config.wxwork_url;
+            window.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) {
+        if (Object.keys(niushop).length > 0 && this.vm.$util?.redirectTo) {
             this.vm.$util.redirectTo('/pages_tool/chat/room', niushop);
         } else {
             this.makePhoneCall();
         }
     }
 
-    /**
-     * 打开微信小程序客服
-     * @param {Object} config 客服配置
-     * @param {Object} options 选项参数
-     */
     openWeappService(config, options = {}) {
-        if (!this.shouldUseCustomService(config)) {
+        // 如果 useOfficial 为 true 或 undefined，则使用原生系统客服（由 button open-type="contact" 触发）
-            console.log('使用官方微信小程序客服');
+        // 此方法仅用于自定义跳转（如 useOfficial: false）
+        if (config.useOfficial !== false) {
+            // 不做任何事，应由 <button open-type="contact"> 触发
+            console.log('使用微信官方客服，请确保按钮为 <button open-type="contact">');
             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.thirdPartyServiceUrl) {
+        // 支持第三方微信小程序客服
-            // #ifdef H5
+        if (config.thirdPartyMiniAppId || config.mini_app_id) {
-            window.open(config.thirdPartyServiceUrl, '_blank');
-            // #endif
-
             // #ifdef MP-WEIXIN
-            if (config.thirdPartyMiniAppId) {
+            wx.navigateToMiniProgram({
-                wx.navigateToMiniProgram({
+                appId: config.thirdPartyMiniAppId || config.mini_app_id,
-                    appId: config.thirdPartyMiniAppId,
+                path: config.thirdPartyMiniAppPath || config.mini_app_path || ''
-                    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;
         }
-
+        
+        // 支持第三方链接客服
+        if (config.thirdPartyServiceUrl || config.third_url) {
+            const serviceUrl = config.thirdPartyServiceUrl || config.third_url;
+            // #ifdef H5
+            window.open(serviceUrl, '_blank');
+            // #endif
+            // #ifdef MP-WEIXIN
+            uni.setClipboardData({ data: serviceUrl });
+            uni.showToast({ title: '客服链接已复制', icon: 'none' });
+            // #endif
+            return;
+        }
+        
         this.fallbackToPhoneCall();
     }
 
-    /**
-     * 降级到电话客服
-     */
-    fallbackToPhoneCall() {
-        uni.showModal({
-            title: '联系客服',
-            content: '在线客服暂时不可用，是否拨打电话联系客服？',
-            success: (res) => {
-                if (res.confirm) {
-                    this.makePhoneCall();
-                }
-            }
-        });
-    }
-
-    /**
-     * 打开支付宝小程序客服
-     * @param {Object} config 客服配置
-     */
     openAliappService(config) {
-        console.log('支付宝小程序客服', config);
+        if (config.type === 'aikefu') {
-        switch (config.type) {
+            this.openDifyService();
-            case 'aikefu':
+        } else if (config.type === 'third') {
-                this.openAIKeFuService();
+            this.openThirdService(config);
-                break;
+        } else {
-            case 'third':
+            // 支付宝原生客服由 button open-type="contact" 触发，此处不处理
-                this.openThirdService(config);
+            console.log('使用支付宝官方客服');
-                break;
-            default:
-                console.log('使用支付宝官方客服');
-                break;
         }
     }
 
-    /**
+    // ================== 辅助方法 ==================
-     * 拨打电话
-     */
-    makePhoneCall(mobileNumber) {
-        if (mobileNumber) {
-            return uni.makePhoneCall({
-                phoneNumber: mobileNumber
-            });
-        }
 
-        // 从缓存中获取电话信息
+    makePhoneCall() {
-        uni.getStorage({
+        this.vm.$api.sendRequest({
-            key: 'shopInfo',
+            url: '/api/site/shopcontact',
-            success: (res) => {
+            success: res => {
-                const shopInfo = res.data;
+                if (res.code === 0 && res.data?.mobile) {
-                const mobile = shopInfo?.mobile ?? '';
+                    uni.makePhoneCall({ phoneNumber: res.data.mobile });
-                if (mobile) {
-                    uni.makePhoneCall({
-                        phoneNumber: mobile
-                    });                    
                 } else {
-                    uni.showToast({
+                    uni.showToast({ title: '暂无客服电话', icon: 'none' });
-                        title: '暂无客服电话',
-                        icon: 'none'
-                    });                    
                 }
+            },
+            fail: () => {
+                uni.showToast({ title: '获取客服电话失败', icon: 'none' });
             }
         });
     }
 
-    /**
-     * 显示无客服弹窗
-     */
     showNoServicePopup() {
         const siteInfo = this.vm.$store.state.siteInfo || {};
-        const message = siteInfo?.site_tel
+        const message = siteInfo?.site_tel 
-            ? `请联系客服，客服电话是${siteInfo.site_tel}`
+            ? `请联系客服，客服电话是 ${siteInfo.site_tel}` 
             : '抱歉，商家暂无客服，请线下联系';
-
+        uni.showModal({ title: '联系客服', content: message, showCancel: false });
-        uni.showModal({
-            title: '联系客服',
-            content: message,
-            showCancel: false
-        });
     }
 
-    /**
-     * 显示配置错误弹窗
-     * @param {Array} errors 错误列表
-     */
     showConfigErrorPopup(errors) {
-        const message = errors.join('\n');
         uni.showModal({
-            title: '配置错误',
+            title: '客服配置错误',
-            content: `客服配置有误：\n${message}`,
+            content: `配置有误：\n${errors.join('\n')}`,
             showCancel: false
         });
     }
 
-    /**
-     * 降级处理：使用原有客服方式
-     */
     fallbackToOriginalService() {
         uni.showModal({
             title: '提示',
-            content: '无法直接添加企业微信客服，是否使用其他方式联系客服？',
+            content: '无法直接添加企业微信，是否使用其他方式联系客服？',
             success: (res) => {
                 if (res.confirm) {
                     this.openWxworkService(true);
@@ -497,9 +423,19 @@ 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();
@@ -507,39 +443,24 @@ class CustomerService {
 
         let openType = '';
         // #ifdef MP-WEIXIN
-        if (config.type === 'weapp') {
+        if (config.type === 'weapp' && config.useOfficial !== false) {
-            openType = config.useOfficial !== false ? 'contact' : '';
+            openType = 'contact';
         }
         // #endif
-
         // #ifdef MP-ALIPAY
         if (config.type === 'aliapp') openType = 'contact';
         // #endif
 
         return { ...config, openType };
     }
-
-    /**
-     * 判断是否应该使用自定义客服处理
-     * @param {Object} config 客服配置
-     * @returns {boolean} 是否使用自定义客服
-     */
-    shouldUseCustomService(config) {
-        // #ifdef MP-WEIXIN
-        if (config?.type === 'weapp') {
-            return config.useOfficial === false;
-        }
-        // #endif
-        return true;
-    }
 }
 
 /**
  * 创建客服服务实例
- * @param {Object} vueInstance Vue实例
+ * @param {Object} vueInstance Vue 实例（通常是 this）
- * @param {Object} externalConfig 外部最新配置
+ * @param {Object} externalConfig 可选：外部传入的最新配置（如从 DIY 数据中提取）
- * @returns {CustomerService} 客服服务实例
+ * @returns {CustomerService}
  */
-export function createCustomerService(vueInstance, externalConfig = {}) {
+export function createCustomerService(vueInstance, externalConfig = null) {
     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 uni.getStorageSync('lang') === 'en-us';
+			return this.$langConfig.getCurrentLocale() === 'en-us';
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;
@@ -65,6 +65,10 @@ 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

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

common/js/util.js

@@ -843,6 +843,15 @@ 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" @click="toDetail(item)">
+					<swiper-item v-for="(item, index) in list" :key="index" @tap.stop="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 @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"
+			<view @tap.stop="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 @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"></view>
+			<view @tap.stop="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 }"
-					@click="$util.redirectTo('/pages_promotion/bargain/list')">
+					@tap.stop="$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" @click="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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" @click="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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"
-							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@tap.stop="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" @click="redirectTo(item.link)">
+			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @tap.stop="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" @click="diyRedirectTo(category.link_url)">
+			<view class="category-adv" v-if="category.image_adv" @tap.stop="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"
-						@click="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
+						@tap.stop="$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"
-							@click="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
+							@tap.stop="$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 }"
-								@click="selectCategory(-1)">全部</view>
+								@tap.stop="selectCategory(-1)">全部</view>
 							<view class="item" :id="'category-2-' + oneIndex"
-								:class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)"
+								:class="{ selected: categoryId == oneIndex }" @tap.stop="selectCategory(oneIndex)"
 								v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 								{{ one.category_name }}
 							</view>
 						</scroll-view>
-						<view class="iconfont icon-unfold" @click="$refs.screenCategoryPopup.open()"></view>
+						<view class="iconfont icon-unfold" @tap.stop="$refs.screenCategoryPopup.open()"></view>
 					</view>
 					<uni-popup type="top" ref="screenCategoryPopup">
-						<view class="screen-category-popup" @click="$refs.screenCategoryPopup.close()">
+						<view class="screen-category-popup" @tap.stop="$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 }"
-									@click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
+									@tap.stop="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" @click="toDetail(item)">
+								<view class="goods-img" @tap.stop="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" @click="toDetail(item)">
+									<view class="name-wrap" @tap.stop="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" @click="toDetail(item)">立即购买</view>
+												<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
 											</block>
 											<block v-else>
-												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @click="selectSku(item)">
+												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @tap.stop="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" @click="reduce(item)">
+														<view class="num-action reduce" @tap.stop="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" @click="increase($event, item)">
+														<view class="num-action" :id="'cart-num-' + index" @tap.stop="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" @click="increase($event, item, 0)">
+													<view class="num-action" v-else :id="'cart-num-' + index" @tap.stop="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" @click="toDetail(item)">立即购买</view>
+											<view class="color-base-bg select-sku" @tap.stop="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 @click="switchCategory('next')">
+						<view class="end-tips" ref="endTips" v-else @tap.stop="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" @click="toDetail(item)">
+						<view class="goods-img" @tap.stop="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" @click="toDetail(item)">
+							<view class="name-wrap" @tap.stop="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" @click="toDetail(item)">立即购买</view>
+										<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
 									</block>
 									<block v-else>
 										<view v-if="item.goods_spec_format" class="color-base-bg select-sku"
-											@click="selectSku(item)">
+											@tap.stop="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" @click="reduce(item)">
+												<view class="num-action reduce" @tap.stop="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"
-													@click="increase($event, item)">
+													@tap.stop="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"
-												@click="increase($event, item, 0)">
+												@tap.stop="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" @click="toDetail(item)">立即购买</view>
+									<view class="color-base-bg select-sku" @tap.stop="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" @click="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
+			<view class="search-box" v-if="value.search" @tap.stop="$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" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
+					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @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" @click="onClickSearch()" @tap.stop="onClickSearch()"
+			<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()"
 				:style="wxSearchHeight">
 				<view class="search-content">
 					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')"
-						confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()"
+						confirm-type="search" @tap.stop="onClickSearch()"
 						disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-					@click.stop.prevent="changeListStyle()"></view>
+					@tap.stop.prevent="changeListStyle()"></view>
 			</view>
 		</block>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()">
+		<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()">
 			<view class="search-content">
 				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search"
-					@click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
+					@tap.stop="onClickSearch()" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
 			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-				@click.stop.prevent="changeListStyle()"></view>
+				@tap.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 }" @click="templateFourOneFn(index)">
+					:key="index" :class="{ select: oneCategorySelect == index }" @tap.stop="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" @click="$refs.templateFourPopup.open()">
+			<view class="category-item-all" @tap.stop="$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 }"
-							@click="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
+							@tap.stop="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" @click="$refs.templateFourPopup.close()">
+					<view class="pack-up" @tap.stop="$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 }
-						]" @click="switchOneCategory(index)">
+						]" @tap.stop="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" @click="$util.redirectTo('/pages_goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @tap.stop="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -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" @click="settlement">去结算</button>
+			<view class="right-wrap"><button type="primary" class="settlement-btn" @tap.stop="settlement">去结算</button>
 			</view>
 		</view> -->
 

components-diy/diy-channel-video.vue

@@ -22,7 +22,7 @@
 		</view>
 
 		<!-- 跳转式视频播放 -->
-		<view v-else @click.stop="playVideo" class="video-container">
+		<view v-else @tap.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]">

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'
-							}" @click="couponAction(item, index)">
+							}" @tap.stop="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'
-							}" @click="couponAction(item, index)">
+							}" @tap.stop="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'
-							}" @click="couponAction(item, index)">
+							}" @tap.stop="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'
-							}" @click="couponAction(item, index)">
+							}" @tap.stop="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"
-								@click="couponAction(item, index)">
+								@tap.stop="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'
-							}" @click="couponAction(item, index)">
+							}" @tap.stop="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" @click="$util.redirectTo('/pages_goods/category')"
+						<div v-if="computedCouponList.length <= 2" @tap.stop="$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"
-							@click="couponAction(item, index)">
+							@tap.stop="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" @click="toDetail(item)"
+		<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="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'
-						}" @click.stop="followGoods(item, index)">
+						}" @tap.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'
-						}" @click.stop="delFollowTip(item, index)">
+						}" @tap.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" @click="$util.diyRedirectTo(item.link)"
+			<view class="button-box" @tap.stop="$util.diyRedirectTo(item.link)"
 				:style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
 				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit"
 					:show-menu-by-longpress="true" />

components-diy/diy-form.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 		</view>
-		<view @click="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
+		<view @tap.stop="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"
-							@click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)"
+							@tap.stop="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" @click="handlerClick(item)"
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+					: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"
-									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@tap.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"
-									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@tap.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"
-									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@tap.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"
-									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@tap.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" @click="handlerClick(item)"
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+					: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"
-						@click="handlerClick(dataItem)" @tap="handlerClick(dataItem)"
+						@tap.stop="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"
-						@click="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+						@tap.stop="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 + '%' }" @click="redirectTo(item.link)">
+                        :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="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 + '%' }" @click="redirectTo(item.link)">
+                            :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="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 + '%' }" @click="redirectTo(item.link)">
+                    :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="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,6 +251,11 @@
 				<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>
@@ -267,6 +272,7 @@
 import DiyMinx from './minx.js'
 
 export default {
+	name: 'diy-group',
 	props: {
 		diyData: {
 			type: Object
@@ -346,6 +352,12 @@ 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" @click="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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" @click="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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"
-							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@tap.stop="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 + '%'
-			}" @click.stop="$util.diyRedirectTo(mapItem.link)"></view>
+			}" @tap.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="redirectTo(item.link)"></image>
+							:show-menu-by-longpress="true" @tap.stop="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="previewImg(item.imageUrl)"></image>
+							:show-menu-by-longpress="true" @tap.stop="previewImg(item.imageUrl)"></image>
 					</view>
 
 					<!-- 文字部分 -->
@@ -103,17 +103,6 @@ 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,8 +2,7 @@
 	<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" @click="handlerClick(imgAdsValue.list[0].link)"
+				<view class="simple-graph-wrap" :style="imgAdsSwiper" @tap.stop="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>
@@ -16,7 +15,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" @click="handlerClick(item.link)" @tap="handlerClick(item.link)">
+					:key="index" v-if="item.imageUrl" @tap.stop="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"
-							@click="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
+							@tap.stop="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 }"
-						@click="unfoldMenu"></text>
+						@tap.stop="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 }]"
-							@click="changePageIndex(index)">
+							@tap.stop="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" @click="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @tap.stop="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" @click="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @tap.stop="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"
-													@click="toCateGoodsList(item.category_id_2, 2)">
+													@tap.stop="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" @click="toDetail(item)">
+											:key="index" @tap.stop="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 }" @click="previewSqs()">立即添加</span>
+						:style="{ background: item.BtBgColor, color: item.BtColor }" @tap.stop="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" @click="redirectTo(item.link)" class="fui-cell"
+			<view v-for="(item, index) in value.list" @tap.stop="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" @click="handlerClick(liveInfo.roomid)" @tap="handlerClick(liveInfo.roomid)"
+		<view class="live-wrap" @tap.stop="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" @click="handlerClick({ item, index })" @tap="handlerClick({ item, index })">
+				:id="'a' + index" :key="index" @tap.stop="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,11 +3,18 @@
 		<view class="fui-list-group merchgroup" style="margin-top:0" v-for="(item, index) in value.list">
 			<map id="map" style="width: 100%; height:600rpx" scale="12" :markers="markerst" bindupdated="bindupdated"
 				:longitude="item.lng" :latitude="item.lat" show-location>
-				<cover-view
+				<!-- <cover-view
 					style="position:absolute;right:10px;bottom:30rpx;z-index:99999;background:#4390FF;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;"
-					@click="handlerClick(item)" @tap="handlerClick(item)">
+					@tap.stop="handlerClick(item)" @tap="handlerClick(item)">
 					<cover-view style="font-size:24rpx">一键导航</cover-view>
-				</cover-view>
+				</cover-view> -->
+
+				<!-- 使用非原生cover-view, 解决原生cover-view组件渲染机制z-index失效的问题 -->
+				<div
+					style="position:absolute;right:12rpx;bottom:48rpx;z-index:1;background:#4390FF;padding:0rpx 20rpx;border-radius:8rpx;color: #fff;"
+					@tap.stop="handlerClick(item)">
+					<span style="font-size:24rpx;color: #fff;">一键导航</span>
+				</div>			
 			</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" @click="getWxAuth">
+					<view class="headimg" @tap.stop="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" @click="getWxAuth">点击授权头像昵称</text></view>
+							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击授权头像昵称</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text>
+							<text class="name" @tap.stop="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" @click="getWxAuth">点击获取微信头像</text></view>
+							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击获取微信头像</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @click="redirect('/pages_tool/member/info')">{{ memberInfo.nickname
+							<text class="name" @tap.stop="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"
-						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@tap.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
-				<view class="info-wrap" v-else :style="infoStyle" @click="redirect($util.MEMBER_PAGE_URL)">
+				<view class="info-wrap" v-else :style="infoStyle" @tap.stop="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"
-						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@tap.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" @click="redirect('/pages_tool/member/balance')">
+					<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/point_detail')">
+					<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/coupon')">
+					<view class="account-item" @tap.stop="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" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
+							<text class="see" v-else @tap.stop="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" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-else @tap.stop="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" @click="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
-							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-else @tap.stop="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" @click="redirect('/pages_tool/member/balance_detail')">
+						<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/point_detail')">
+						<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/coupon')">
+						<view class="account-item" @tap.stop="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 @click="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
+							<view @tap.stop="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" @click="redirect('/pages_tool/member/balance')">
+				<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/point_detail')">
+				<view class="account-item" @tap.stop="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" @click="redirect('/pages_tool/member/coupon')">
+				<view class="account-item" @tap.stop="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" @click="cancelCompleteInfo"></text>
+						<text class="iconfont icon-close color-tip" @tap.stop="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" @click="saveCompleteInfo" :disabled="isDisabled">保存</button>
+					<button type="default" class="save-btn" @tap.stop="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" @click="redirect('/pages_order/list?status=waitpay')"
+				<view class="item-wrap" @tap.stop="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" @click="redirect('/pages_order/list?status=waitsend')"
+				<view class="item-wrap" @tap.stop="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" @click="redirect('/pages_order/list?status=waitconfirm')"
+				<view class="item-wrap" @tap.stop="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" @click="redirect('/pages_order/list?status=waitrate')"
+				<view class="item-wrap" @tap.stop="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" @click="redirect('/pages_tool/order/activist')">
+				<view class="item-wrap" @tap.stop="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" @click="handlerClick(item)" @tap="handlerClick(item)">
+						:style="itemCss" @tap.stop="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 + '%' }" @click="handlerClick(item)" @tap="handlerClick(item)">
+						:style="{ width: 100 / 4 + '%' }" @tap.stop="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,13 +3,12 @@
 		<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" @click="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}
+				<view class="notes-more" @tap.stop="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" @click="handlerClick(item)"
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @tap.stop="handlerClick(item)" :style="notesItemStyle">
-					@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" @click="closeNoticePopup">
+					<view class="head-wrap" @tap.stop="closeNoticePopup">
 						<text>公告</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">{{ notice }}</view>
-					<button type="primary" @click="closeNoticePopup">我知道了</button>
+					<button type="primary" @tap.stop="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" @click="toLink">
+					<button type="primary" @tap.stop="toLink">
 						<text class="iconfont icon-fukuanma"></text>
 						<text class="action-name">付款码</text>
 					</button>
-					<button type="primary" @click="openPaymentPopup">
+					<button type="primary" @tap.stop="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" @click="closePaymentPopup">
+					<view class="head-wrap" @tap.stop="closePaymentPopup">
 						<text>提示</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">扫码付请退出程序后直接使用微信扫一扫或返回上一页使用付款码进行支付</view>
-					<button type="primary" @click="closePaymentPopup">我知道了</button>
+					<button type="primary" @tap.stop="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" @click="handlerClick(item)" @tap="handlerClick(item)"></image>
+					v-if="item.link.wap_url" @tap.stop="handlerClick(item)"></image>
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else
-					@click="handlerClick(item)" @tap="handlerClick(item)"></image>
+					@tap.stop="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,17 +52,6 @@ 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) {
@@ -77,7 +66,9 @@ export default {
 			await this.__$emitEvent({
 				eventName: 'picture-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-					if (item.link.wap_url) {
+
+					const link = item.link;
+					if (link?.name || link?.wap_url || link?.appid) {
 						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" @click="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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" @click="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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"
-							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@tap.stop="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 }"
-					@click="$util.redirectTo('/pages_promotion/pintuan/list')">
+					@tap.stop="$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" @click="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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" @click="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="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"
-							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@tap.stop="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" @click="handlerClick(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					: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" @click="handlerClick(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-						@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+						: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,8 +75,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"
-							@click="handlerClick(item)" @tap="handlerClick(item)" :class="[value.ornament.type]"
+							@tap.stop="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
-							: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"
-					@click="handlerClick(item)" @tap="handlerClick(item)"
+					@tap.stop="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" @click="handlerClick" @tap="handlerClick"></rich-text>
+		<rich-text :nodes="html" @tap.stop="handlerClick"></rich-text>
 	</view>
 </template>
 

components-diy/diy-rubik-cube.vue

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

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"
-				@click="handlerSearchClick" @tap="handlerSearchClick">
+				@tap.stop="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,32 +14,30 @@
 						<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" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
+						<text class="iconfont icon-sousuo3" @tap.stop="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" @click.stop="handlerSearchClick"
+					<view class="search-content" :style="inputStyle"
-						@tap="handlerSearchClick">
+						@tap.stop="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"
-							@click.stop="handlerSearchClick" @tap="handlerSearchClick"
+							@tap.stop="handlerSearchClick"
 							:placeholderStyle="placeholderStyle" />
-						<text class="search-content-btn" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
+						<text class="search-content-btn" @tap.stop="handlerSearchClick"
 							:style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
 					</view>
 					<view class="img" v-if="value.iconType == 'img'"
-						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap.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' }"
-						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap.stop="handlerRedirectToClick(value.searchLink)"></diy-icon>
-						@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 }"
-					@click="toMore">
+					@tap.stop="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" @click="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="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" @click="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="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" @click="toDetail(item.id)"
+						<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="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"
-								@click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+								@tap.stop="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 }" @click="toStoreList()">
+					<view class="info-box" :style="{ color: value.textColor }" @tap.stop="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" @click="mapRoute" class="address">{{
+						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @tap.stop="mapRoute" class="address">{{
 							globalStoreInfo.show_address }}</text>
 						<text v-else>获取当前位置...</text>
 					</view>
 				</view>
-				<view class="store-image" @click="selectStore()">
+				<view class="store-image" @tap.stop="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" @click="toStoreList()">
+			<view class="store-box store-three" @tap.stop="toStoreList()">
 				<view class="store-info">
-					<view class="store-image" @click="selectStore()">
+					<view class="store-image" @tap.stop="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" @click.stop="search()"><text class="iconfont icon-sousuo3"
+				<view class="store-icon" @tap.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" @click="toStoreList()">
+			<view class="store-box store-four" @tap.stop="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="商品搜索"
-						@click.stop="search()" />
+						@tap.stop="search()" />
-					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+					<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
 				</view>
 			</view>
 		</block>

components-diy/diy-tab.vue

@@ -0,0 +1,834 @@
+<template>
+    <!-- DIY 标签页组件 - 支持多种样式和位置的标签页切换 -->
+    <view data-component-name="diy-tab" class="diy-tab" :class="'tab-position-' + mergedValue.tabPosition"
+        :style="[getCustomStyle('container')]">
+        <!-- 标签导航栏 -->
+        <view class="tab-nav" :style="[tabNavStyle, getCustomStyle('nav')]">
+            <!-- 标签项循环渲染 -->
+            <view v-for="(tab, index) in mergedValue.tabs" :key="tab.id || index"
+                :class="['tab-item', mergedValue.tabStyle, { active: activeTab === index }]" @tap="switchTab(index)"
+                :style="[tabItemStyle(index), getCustomStyle('tabItem'), activeTab === index ? getCustomStyle('tabItemActive') : {}]">
+                <!-- 标签文本 -->
+                <text
+                    :style="[tabTextStyle(index), getCustomStyle('tabText'), activeTab === index ? getCustomStyle('tabTextActive') : {}]">{{
+                        getTabTitle(tab.title) }}</text>
+                <!-- 标签指示器（底部线条） -->
+                <view v-if="mergedValue.showIndicator" class="tab-indicator"
+                    :style="[tabIndicatorStyle(index), getCustomStyle('indicator')]"></view>
+            </view>
+        </view>
+
+        <!-- 标签内容区域 -->
+        <view class="tab-content" :style="[tabContentStyle, getCustomStyle('content')]">
+            <!-- 标签面板循环渲染 -->
+            <view v-for="(tab, index) in mergedValue.tabs" :key="index"
+                :class="['tab-panel', { active: activeTab === index }]"
+                :style="[tabPanelStyle(index), getCustomStyle('panel'), activeTab === index ? getCustomStyle('panelActive') : {}]">
+                <!-- 渲染每个标签下的组件 -->
+                <diy-group v-if="tab.components" :diyData="{ value: tab.components, global: diyGlobal }"
+                    :scrollTop="tab.scrollTop || 0" />
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+// 导入 DIY 混入
+import DiyMinx from './minx.js'
+
+export default {
+    name: 'diy-tab',
+
+    // 组件注册 - 使用懒加载解决循环依赖
+    components: {
+        diyGroup: () => import('./diy-group.vue')
+    },
+
+    // 组件属性定义
+    props: {
+        // 标签页配置对象
+        value: {
+            type: Object,
+            default: () => ({})
+        },
+        // 全局配置对象
+        diyGlobal: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+
+    // 混入
+    mixins: [DiyMinx],
+
+    // 组件数据
+    data() {
+        return {
+            activeTab: this.value?.activeTabIndex ?? 0,  // 设置当前激活的标签索引
+        };
+    },
+
+    // 组件创建钩子
+    created() {
+        console.log(`diy-tab-create`, {
+            value: this.mergedValue,
+            tabs: this.mergedValue.tabs
+        });
+    },
+
+    // 计算属性
+    computed: {
+        // 合并默认值和传入值
+        mergedValue() {
+            // 标签页数据配置
+            const tabsConfig = {
+                /**
+                 * 标签页数据配置
+                 * @type {Array<{title: string|Object, scrollTop: number, components: Array}>}
+                 * @property {string} id 标签唯一标识
+                 * @property {string|Object} title - 标签标题
+                 *   • 字符串: 普通文本或国际化键（如 'tab.home'）
+                 *   • 对象: 多语言映射（如 { 'zh-cn': '首页', 'en-us': 'Home' }）
+                 * @property {number} scrollTop - 标签滚动位置
+                 * @property {Array} components - 标签下的组件列表
+                 */
+                tabs: []
+            };
+
+            // 基础配置
+            const baseConfig = {
+                /**
+                 * 是否显示指示器
+                 * @type {boolean}
+                 * @default true
+                 */
+                showIndicator: true,
+
+                /**
+                 * 激活的标签索引
+                 * @type {number}
+                 * @default 0
+                 */
+                activeTabIndex: 0,
+
+                /**
+                 * 标签样式
+                 * @type {string}
+                 * @default 'default'
+                 * @values 'default', 'underline', 'card'
+                 */
+                tabStyle: 'default',
+
+                /**
+                 * 标签位置
+                 * @type {string}
+                 * @default 'top'
+                 * @values 'top', 'bottom', 'left', 'right'
+                 */
+                tabPosition: 'top'
+            };
+
+            // 导航栏样式
+            const navConfig = {
+                /**
+                 * 标签栏高度
+                 * @type {number|string}
+                 * @default 24
+                 * @unit 像素（当为数字时）
+                 * @range 建议值：20-80
+                 * @format
+                 * • 数字: 像素值（如 24）
+                 * • 字符串: CSS长度值（如 '24px', '3rem', '4em'）
+                 * • CSS变量: 'var(--tab-height)'
+                 * • 百分比: '10%' (相对父元素高度)
+                 */
+                tabHeight: 24,
+
+                /**
+                 * 标签栏背景色
+                 * @type {string}
+                 * @default '#ffffff'
+                 * @format CSS颜色值
+                 */
+                tabBgColor: '#ffffff',
+
+                /**
+                 * 标签栏内边距
+                 * @type {string}
+                 * @default '0'
+                 * @format CSS padding值
+                 * @examples
+                 * • 单个值: '0', '10px', '1rem' (四向相同)
+                 * • 两个值: '10px 20px' (上下 左右)
+                 * • 三个值: '10px 20px 30px' (上 左右 下)
+                 * • 四个值: '10px 20px 30px 40px' (上 右 下 左)
+                 * • CSS变量: 'var(--tab-padding)'
+                 * • 百分比: '5% 10%' (相对父元素宽度)
+                 * @note 卡片样式下会忽略此配置，自动使用基于 tabGap 的内边距
+                 */
+                tabPadding: '0'
+            };
+
+            // 标签项样式
+            const tabItemConfig = {
+                /**
+                 * 标签间距
+                 * @type {number|string}
+                 * @default 10
+                 * @unit 像素（当为数字时）
+                 * @range 建议值：0-30
+                 * @format
+                 * • 数字: 像素值（如 10）
+                 * • 字符串: CSS长度值（如 '10px', '0.5rem', '1em'）
+                 * • CSS变量: 'var(--tab-gap)'
+                 * • 百分比: '5%' (相对父元素宽度)
+                 */
+                tabGap: 10,
+
+                /**
+                 * 字体大小
+                 * @type {number|string}
+                 * @default 14
+                 * @unit 像素（当为数字时）
+                 * @range 建议值：10-20
+                 * @format
+                 * • 数字: 像素值（如 14）
+                 * • 字符串: CSS长度值（如 '14px', '0.875rem', '1.4em'）
+                 * • CSS变量: 'var(--font-size)'
+                 */
+                fontSize: 14,
+
+                /**
+                 * 激活状态颜色
+                 * @type {string}
+                 * @default '#ff4444'
+                 * @format CSS颜色值
+                 */
+                activeColor: '#ff4444',
+
+                /**
+                 * 非激活状态颜色
+                 * @type {string}
+                 * @default '#666666'
+                 * @format CSS颜色值
+                 */
+                inactiveColor: '#666666'
+            };
+
+            // 卡片样式
+            const cardConfig = {
+                /**
+                 * 卡片默认背景色
+                 * @type {string}
+                 * @default '#f5f5f5'
+                 * @format CSS颜色值
+                 */
+                cardBgColor: '#f5f5f5',
+
+                /**
+                 * 卡片激活背景色
+                 * @type {string}
+                 * @default '#ff4444'
+                 * @format CSS颜色值
+                 */
+                cardActiveBgColor: '#ff4444',
+
+                /**
+                 * 卡片默认文字颜色
+                 * @type {string}
+                 * @default '#666666'
+                 * @format CSS颜色值
+                 */
+                cardTextColor: '#666666',
+
+                /**
+                 * 卡片激活文字颜色
+                 * @type {string}
+                 * @default '#ffffff'
+                 * @format CSS颜色值
+                 */
+                cardActiveTextColor: '#ffffff',
+
+                /**
+                 * 卡片圆角大小
+                 * @type {string}
+                 * @default '16px'
+                 * @format CSS长度值
+                 */
+                cardBorderRadius: '16px',
+
+                /**
+                 * 卡片外边距
+                 * @type {string}
+                 * @default '0 5px'
+                 * @format CSS margin值
+                 */
+                cardMargin: '0 5px',
+
+                /**
+                 * 卡片内边距
+                 * @type {string}
+                 * @default '0 10px'
+                 * @format CSS padding值
+                 */
+                cardPadding: '0 10px'
+            };
+
+            // 下划线样式
+            const underlineConfig = {
+                /**
+                 * 下划线颜色
+                 * @type {string}
+                 * @default '#ff4444'
+                 * @format CSS颜色值
+                 */
+                underlineColor: '#ff4444',
+
+                /**
+                 * 下划线高度
+                 * @type {number}
+                 * @default 2
+                 * @unit 像素
+                 */
+                underlineHeight: 2,
+
+                /**
+                 * 下划线圆角大小
+                 * @type {string}
+                 * @default '1px'
+                 * @format CSS长度值
+                 */
+                underlineBorderRadius: '1px',
+
+                /**
+                 * 下划线左右边距
+                 * @type {number}
+                 * @default 10
+                 * @unit 像素
+                 */
+                underlineMargin: 10
+            };
+
+            // 指示器样式
+            const indicatorConfig = {
+                /**
+                 * 指示器颜色
+                 * @type {string}
+                 * @default '#ff4444'
+                 * @format CSS颜色值
+                 */
+                indicatorColor: '#ff4444',
+
+                /**
+                 * 指示器高度
+                 * @type {number}
+                 * @default 2
+                 * @unit 像素
+                 */
+                indicatorHeight: 2
+            };
+
+            // 内容区域样式
+            const contentConfig = {
+                /**
+                 * 内容区内边距
+                 * @type {number|string}
+                 * @default 10
+                 * @unit 像素（当为数字时）
+                 * @range 建议值：0-50
+                 * @format
+                 * • 数字: 像素值（如 10）
+                 * • 字符串: CSS长度值（如 '10px', '1rem', '2em'）
+                 * • CSS变量: 'var(--content-padding)'
+                 * • 百分比: '5%' (相对父元素宽度)
+                 */
+                contentPadding: 10,
+
+                /**
+                 * 内容区背景色
+                 * @type {string}
+                 * @default '#f5f5f5'
+                 * @format CSS颜色值
+                 * @examples
+                 * • 十六进制: '#ffffff', '#f5f5f5'
+                 * • RGB: 'rgb(255, 255, 255)'
+                 * • RGBA: 'rgba(255, 255, 255, 0.5)'
+                 * • HSL: 'hsl(0, 0%, 100%)'
+                 * • CSS变量: 'var(--content-bg-color)'
+                 * • 预定义颜色: 'white', 'black', 'gray'
+                 */
+                contentBgColor: '#f5f5f5',
+
+                /**
+                 * 内容区最小高度
+                 * @type {number|string}
+                 * @default 200
+                 * @unit 像素（当为数字时）
+                 * @range 建议值：50-1000
+                 * @format
+                 * • 数字: 像素值（如 200）
+                 * • 字符串: CSS长度值（如 '200px', '20vh', '5rem'）
+                 * • CSS变量: 'var(--content-min-height)'
+                 * • 百分比: '50%' (相对父元素高度)
+                 */
+                contentMinHeight: 200
+            };
+
+            // 自定义样式配置
+            const customStylesConfig = {
+                /**
+                 * 自定义样式配置
+                 * @type {Object}
+                 * @description 允许外部通过完整的 CSS 样式对象完全覆盖各个部分的样式
+                 * @property {Object} container - 容器样式
+                 *   @example { width: '100%', height: '500px', backgroundColor: '#f0f0f0' }
+                 * @property {Object} nav - 导航栏样式
+                 *   @example { backgroundColor: '#ffffff', borderBottom: '1px solid #e0e0e0' }
+                 * @property {Object} tabItem - 标签项样式（非激活状态）
+                 *   @example { padding: '10px 20px', borderRadius: '4px' }
+                 * @property {Object} tabItemActive - 标签项激活样式
+                 *   @example { backgroundColor: '#ff4444', color: '#ffffff' }
+                 * @property {Object} tabText - 标签文本样式（非激活状态）
+                 *   @example { fontSize: '14px', color: '#666666' }
+                 * @property {Object} tabTextActive - 标签文本激活样式
+                 *   @example { fontSize: '16px', color: '#ffffff', fontWeight: 'bold' }
+                 * @property {Object} indicator - 指示器样式
+                 *   @example { backgroundColor: '#ff4444', height: '3px' }
+                 * @property {Object} content - 内容区域样式
+                 *   @example { padding: '20px', backgroundColor: '#f9f9f9' }
+                 * @property {Object} panel - 标签面板样式（非激活状态）
+                 *   @example { opacity: 0.5, transform: 'translateY(10px)' }
+                 * @property {Object} panelActive - 标签面板激活样式
+                 *   @example { opacity: 1, transform: 'translateY(0)' }
+                 */
+                customStyles: {
+                    container: {},
+                    nav: {},
+                    tabItem: {},
+                    tabItemActive: {},
+                    tabText: {},
+                    tabTextActive: {},
+                    indicator: {},
+                    content: {},
+                    panel: {},
+                    panelActive: {}
+                }
+            };
+
+            // 合并所有配置
+            const defaults = {
+                ...tabsConfig,
+                ...baseConfig,
+                ...navConfig,
+                ...tabItemConfig,
+                ...cardConfig,
+                ...underlineConfig,
+                ...indicatorConfig,
+                ...contentConfig,
+                ...customStylesConfig
+            };
+
+            // 使用展开运算符合并默认值和传入值
+            return { ...defaults, ...this.value };
+        },
+
+        // 判断是否为水平布局（顶部或底部）
+        isHorizontal() {
+            return ['top', 'bottom'].includes(this.mergedValue.tabPosition);
+        },
+
+        // 判断是否为垂直布局（左侧或右侧）
+        isVertical() {
+            return ['left', 'right'].includes(this.mergedValue.tabPosition);
+        },
+
+        // 判断是否为卡片样式
+        isCardStyle() {
+            return this.mergedValue.tabStyle === 'card';
+        },
+
+        // 判断是否为下划线样式
+        isUnderlineStyle() {
+            return this.mergedValue.tabStyle === 'underline';
+        },
+
+        // 计算标签导航栏样式
+        tabNavStyle() {
+            const style = {
+                backgroundColor: this.mergedValue.tabBgColor || '#ffffff'
+            };
+
+            // 根据布局方向设置尺寸
+            if (this.isHorizontal) {
+                // 水平布局：设置高度
+                style.height = this.mergedValue.tabHeight + 'px';
+            } else {
+                // 垂直布局：设置宽度和高度
+                style.width = this.mergedValue.tabHeight + 'px';
+                style.height = '100%';
+                style.flexDirection = 'column';
+            }
+
+            // 设置导航栏内边距
+            if (this.mergedValue.tabPadding) {
+                style.padding = this.mergedValue.tabPadding;
+            }
+
+            // 卡片样式下使用标签间距作为内边距
+            if (this.isCardStyle) {
+                style.padding = this.getPadding(this.mergedValue.tabGap);
+            }
+
+            return style;
+        },
+
+        // 计算标签项样式（返回函数）
+        tabItemStyle() {
+            return (index) => {
+                const style = {};
+
+                if (!this.isCardStyle) {
+                    // 非卡片样式：设置内边距
+                    style.padding = this.getPadding(this.mergedValue.tabGap);
+                } else {
+                    // 卡片样式：设置外边距、内边距、圆角和背景色
+                    style.margin = this.getCardMargin();
+                    style.padding = this.getCardPadding();
+                    style.borderRadius = this.mergedValue.cardBorderRadius || '16px';
+                    // 根据激活状态设置不同的背景色
+                    style.backgroundColor = index === this.activeTab
+                        ? (this.mergedValue.cardActiveBgColor || this.mergedValue.activeColor)
+                        : (this.mergedValue.cardBgColor || '#f5f5f5');
+                }
+
+                return style;
+            };
+        },
+
+        // 计算标签内容区域样式
+        tabContentStyle() {
+            return {
+                padding: this.mergedValue.contentPadding + 'px',
+                backgroundColor: this.mergedValue.contentBgColor || '#f5f5f5',
+                minHeight: (this.mergedValue.contentMinHeight || 200) + 'px'
+            };
+        },
+
+        // 计算标签文本样式（返回函数）
+        tabTextStyle() {
+            return (index) => ({
+                color: this.activeColor(index),
+                fontSize: (this.mergedValue.fontSize || 14) + 'px'
+            });
+        },
+
+        // 计算标签指示器样式（返回函数）
+        tabIndicatorStyle() {
+            return (index) => {
+                const style = {
+                    backgroundColor: this.mergedValue.indicatorColor || this.mergedValue.activeColor,
+                    transform: index === this.activeTab ? 'scaleX(1)' : 'scaleX(0)',
+                    opacity: index === this.activeTab ? 1 : 0
+                };
+
+                // 卡片样式下隐藏指示器
+                if (this.isCardStyle) {
+                    style.display = 'none';
+                } else if (this.isUnderlineStyle) {
+                    // 下划线样式使用下划线颜色
+                    style.backgroundColor = this.mergedValue.underlineColor || this.mergedValue.activeColor;
+                }
+
+                // 根据样式类型选择指示器尺寸
+                const indicatorSize = (this.isUnderlineStyle ? this.mergedValue.underlineHeight : this.mergedValue.indicatorHeight) || 2;
+
+                // 根据布局方向设置指示器样式
+                if (this.isHorizontal) {
+                    // 水平布局：设置高度，使用 scaleX 动画
+                    style.height = indicatorSize + 'px';
+                    style.transform = index === this.activeTab ? 'scaleX(1)' : 'scaleX(0)';
+                } else {
+                    // 垂直布局：设置宽度，使用 scaleY 动画
+                    style.width = indicatorSize + 'px';
+                    style.height = 'auto';
+                    style.transform = index === this.activeTab ? 'scaleY(1)' : 'scaleY(0)';
+                }
+
+                return style;
+            };
+        },
+
+        // 计算标签面板样式（返回函数）
+        tabPanelStyle() {
+            return (index) => {
+                const isActive = index === this.activeTab;
+                const style = {
+                    display: isActive ? 'block' : 'none',
+                    opacity: isActive ? 1 : 0
+                };
+
+                // 根据标签位置定义不同的动画效果
+                const transformMap = {
+                    top: ['translateY(0)', 'translateY(10px)'],      // 顶部：从下往上滑入
+                    bottom: ['translateY(0)', 'translateY(-10px)'],   // 底部：从上往下滑入
+                    left: ['translateX(0)', 'translateX(10px)'],     // 左侧：从右往左滑入
+                    right: ['translateX(0)', 'translateX(-10px)']    // 右侧：从左往右滑入
+                };
+
+                // 获取对应的变换值，默认使用无变换
+                const transforms = transformMap[this.mergedValue.tabPosition] || ['translate(0)', 'translate(0)'];
+                // 根据激活状态应用不同的变换
+                style.transform = isActive ? transforms[0] : transforms[1];
+
+                return style;
+            };
+        }
+    },
+
+    // 组件方法
+    methods: {
+        // 获取自定义样式
+        getCustomStyle(type) {
+            const customStyles = this.mergedValue.customStyles || {};
+            return customStyles[type] || {};
+        },
+
+        // 获取标签文字颜色
+        activeColor(index) {
+            if (this.isCardStyle) {
+                // 卡片样式：使用卡片文字颜色
+                return index === this.activeTab
+                    ? (this.mergedValue.cardActiveTextColor || '#ffffff')
+                    : (this.mergedValue.cardTextColor || this.mergedValue.inactiveColor);
+            }
+            // 其他样式：使用通用文字颜色
+            return index === this.activeTab ? this.mergedValue.activeColor : this.mergedValue.inactiveColor;
+        },
+
+        // 根据布局方向获取内边距
+        getPadding(gap) {
+            return this.isHorizontal ? `0 ${gap}px` : `${gap}px 0`;
+        },
+
+        // 根据布局方向获取外边距
+        getMargin(gap) {
+            return this.isHorizontal ? `0 ${gap}px` : `${gap}px 0`;
+        },
+
+        // 获取卡片外边距
+        getCardMargin() {
+            return this.mergedValue.cardMargin || this.getMargin(this.mergedValue.tabGap / 2);
+        },
+
+        // 获取卡片内边距
+        getCardPadding() {
+            return this.mergedValue.cardPadding || (this.isHorizontal ? '0 10px' : '10px 0');
+        },
+
+        // 切换标签
+        switchTab(index) {
+            this.activeTab = index;
+        },
+
+        // 国际化方法：获取标签标题
+        getTabTitle(title) {
+            const locale = this.$langConfig.getCurrentLocale();
+
+            // 如果 title 是对象，根据当前语言返回对应值
+            if (typeof title === 'object' && title !== null) {
+                return title[locale] || title['zh-cn'] || Object.values(title)[0] || '';
+            }
+
+            // 如果 title 是字符串，保持原有逻辑
+            if (typeof title === 'string' && title.includes('.')) {
+                // 包含点号的标题视为国际化键，使用全局挂载的 $lang 方法翻译
+                return this.$lang ? this.$lang(title) : title;
+            }
+
+            // 不包含点号的标题直接返回
+            return title;
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+// ===== 标签布局 Mixin =====
+// 用于定义不同位置标签的布局方式
+@mixin tab-layout($direction, $nav-order, $content-order) {
+    flex-direction: $direction;
+
+    .tab-nav {
+        order: $nav-order;
+    }
+
+    .tab-content {
+        order: $content-order;
+        flex: 1;
+    }
+}
+
+// ===== 指示器位置 Mixin =====
+// 用于定义不同位置指示器的定位
+@mixin indicator-position($position, $start, $end) {
+    #{$position}: 0;
+    #{$start}: 0;
+    #{$end}: 0;
+    width: 2px;
+    height: auto;
+}
+
+// ===== 主容器样式 =====
+.diy-tab {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+
+    // 默认顶部布局
+    @include tab-layout(column, 1, 2);
+
+    // 底部布局
+    &.tab-position-bottom {
+        @include tab-layout(column, 2, 1);
+    }
+
+    // 左侧布局
+    &.tab-position-left {
+        @include tab-layout(row, 1, 2);
+    }
+
+    // 右侧布局
+    &.tab-position-right {
+        @include tab-layout(row, 2, 1);
+    }
+
+    // ===== 标签导航栏样式 =====
+    .tab-nav {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        overflow-x: auto; // 水平滚动
+        overflow-y: hidden; // 禁止垂直滚动
+        white-space: nowrap; // 不换行
+        position: relative;
+
+        // 隐藏滚动条（Webkit 浏览器）
+        &::-webkit-scrollbar {
+            display: none;
+        }
+
+        // 隐藏滚动条（IE/Edge）
+        -ms-overflow-style: none;
+        // 隐藏滚动条（Firefox）
+        scrollbar-width: none;
+    }
+
+    // ===== 标签项样式 =====
+    .tab-item {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        padding: 0 16px;
+        height: 100%;
+        transition: all 0.3s ease;
+
+        // 激活状态
+        &.active {
+            font-weight: 500;
+        }
+
+        // 减少动画效果（针对偏好减少动画的用户）
+        @media (prefers-reduced-motion: reduce) {
+            transition: none;
+        }
+    }
+
+    // 左右布局下的标签项样式
+    &.tab-position-left .tab-item,
+    &.tab-position-right .tab-item {
+        width: 100%;
+        height: auto;
+        padding: 10px 0;
+        white-space: normal; // 允许换行
+    }
+
+    // ===== 标签文本样式 =====
+    .tab-text {
+        font-size: 14px;
+        transition: color 0.3s ease;
+    }
+
+    // ===== 标签指示器样式 =====
+    .tab-indicator {
+        position: absolute;
+        bottom: 0;
+        left: 16px;
+        right: 16px;
+        transition: all 0.3s ease;
+        transform-origin: center;
+    }
+
+    // 左侧布局的指示器
+    &.tab-position-left .tab-indicator {
+        @include indicator-position(left, top, bottom);
+    }
+
+    // 右侧布局的指示器
+    &.tab-position-right .tab-indicator {
+        @include indicator-position(right, top, bottom);
+    }
+
+    // ===== 标签内容区域样式 =====
+    .tab-content {
+        width: 100%;
+        overflow: hidden;
+        position: relative;
+    }
+
+    // ===== 标签面板样式 =====
+    .tab-panel {
+        width: 100%;
+        min-height: 200px;
+        transition: all 0.3s ease;
+
+        // 减少动画效果
+        @media (prefers-reduced-motion: reduce) {
+            transition: none;
+        }
+    }
+
+    // ===== 默认和下划线样式 =====
+    .tab-item.default,
+    .tab-item.underline {
+        padding: 0 10px;
+        transition: all 0.3s ease;
+
+        &.active {
+            color: #ff4444;
+            font-weight: 500;
+        }
+    }
+
+    // 下划线样式的伪元素
+    .tab-item.underline.active::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 10px;
+        right: 10px;
+        transition: all 0.3s ease;
+    }
+
+    // ===== 卡片样式 =====
+    .tab-item.card {
+        border-radius: 16px;
+        transition: all 0.3s ease;
+
+        &.active {
+            font-weight: 500;
+        }
+    }
+}
+</style>

components-diy/diy-text.vue

@@ -1,6 +1,5 @@
 <template>
-	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)"
+	<view data-component-name="diy-text" class="diy-text" @tap="handlerClick(value.link)" :style="warpCss">
-		@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;">
@@ -100,13 +99,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 }"
-								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
+								@tap.stop="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>
@@ -132,13 +131,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 }"
-								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
+								@tap.stop="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>
@@ -159,7 +158,7 @@
 										value.subTitle.text }}</view>
 								</view>
 								<view class="style11-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-									@click.stop="$util.diyRedirectTo(value.more.link)">
+									@tap.stop="$util.diyRedirectTo(value.more.link)">
 									{{ value.more.text }}
 									<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 								</view>
@@ -183,9 +182,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 }"
-					@click.stop="$util.diyRedirectTo(value.more.link)">
+					@tap.stop="$util.diyRedirectTo(value.more.link)">
 					<text>{{ value.more.text }}</text>
 					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 				</view>
@@ -278,7 +277,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 }"
-					@click.stop="$util.diyRedirectTo(value.more.link)">
+					@tap.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"
-		@click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
+		@tap="handlerClick(value.videoUrl)"></video>
 </template>
 
 <script>

components-diy/minx.js

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

components/hover-nav/hover-nav.vue

@@ -1,43 +1,57 @@
 <template>
-  <!-- 悬浮按钮 -->
+  <view v-if="pageCount == 1 || need" class="fixed-box"
-  <view v-if="pageCount == 1 || need" class="fixed-box" :style="[customContainerStyle, {
+    :style="[customContainerStyle, { 
-    height: fixBtnShow ? '400rpx' : '320rpx',
+      height: containerHeight,
-    backgroundImage: bgUrl ? `url(${bgUrl})` : '',
+      backgroundImage: bgUrl ? `url( $ {bgUrl})` : '',
-    backgroundSize: 'cover'
+      backgroundSize: 'cover'
-  }]">
+    }]">
+
+    <!-- ✅ 统一客服入口（根据后台配置自动适配 AI / 企业微信 / 第三方等） -->
+    <!-- 微信官方客服需要使用 button open-type="contact" -->
+    <button 
+      v-if="fixBtnShow && isWeappOfficialKefu"
+      class="btn-item common-bg"
+      open-type="contact"
+      :style="{ backgroundImage: currentKefuImg ? `url( $ {currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+      <text class="ai-icon" v-if="!currentKefuImg">🤖</text>
+    </button>
+    <!-- 其他类型客服使用普通 view -->
+    <view 
+      v-else-if="fixBtnShow"
+      class="btn-item common-bg"
+      @click="handleUnifiedKefuClick"
+      :style="{ backgroundImage: currentKefuImg ? `url( $ {currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+      <text class="ai-icon" v-if="!currentKefuImg">🤖</text>
+    </view>
+
+    <!-- ✅ 新增：小程序系统客服按钮（当附加设置开启时显示） -->
+    <button 
+      v-if="fixBtnShow && showWeappSystemKefu"
+      class="btn-item common-bg"
+      open-type="contact"
+      :style="{ backgroundImage: currentKefuImg ? `url( $ {currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+      <text class="ai-icon" v-if="!currentKefuImg">💬</text>
+    </button>
 
     <!-- 中英文切换按钮 -->
-    <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>
 
-    <!-- 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>
-
-    <!-- 微信小程序客服按钮 -->
-    <!-- #ifdef MP-WEIXIN -->
-    <button class="btn-item common-bg" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"
-      :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-      <text class="icox icox-kefu" v-if="!kefuimg"></text>
-    </button>
-    <!-- #endif -->
-
-    <!-- 普通客服（仅当未启用 AI 时显示） -->
-    <!-- #ifdef H5 -->
-    <template v-if="fixBtnShow">
-      <button class="btn-item common-bg" hoverClass="none" @click="openCustomerSelectPopup"
-        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-        <text class="icox icox-kefu" v-if="!kefuimg"></text>
-      </button>
-    </template>
-    <!-- #endif -->
-
     <!-- 电话按钮（始终显示） -->
-    <view v-if="fixBtnShow" class="btn-item common-bg" @click="call()"
+    <view 
-      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+      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>
 
@@ -56,16 +70,18 @@ export default {
     return {
       pageCount: 0,
       fixBtnShow: true,
-
       shopInfo: null,
       currentLangIndex: 0,
       langIndexMap: {},
-
+      kefuList: [
-      customerService: null,
+        { id: 'weixin-official', name: '微信官方客服', isOfficial: true, type: 'weapp' },
+        { id: 'custom-kefu', name: '自定义在线客服', isOfficial: false, type: 'custom' },
+        { id: 'qyweixin-kefu', name: '企业微信客服', isOfficial: false, type: 'qyweixin' }
+      ],
+      selectedKefu: null,
     };
   },
   computed: {
-    // 安全读取 shopInfo 中的字段，避免 undefined 报错
     bgUrl() {
       return this.shopInfo?.bgUrl || '';
     },
@@ -73,10 +89,10 @@ export default {
       return this.shopInfo?.aiAgentimg || '';
     },
     kefuimg() {
-      return this.shopInfo?.kefuimg || this.$util.getDefaultImage().kefu;
+      return this.shopInfo?.kefuimg || this. $util.getDefaultImage().kefu;
     },
     phoneimg() {
-      return this.shopInfo?.phoneimg || this.$util.getDefaultImage().phone;
+      return this.shopInfo?.phoneimg || this. $util.getDefaultImage().phone;
     },
     tel() {
       return this.shopInfo?.mobile || '';
@@ -84,9 +100,6 @@ 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';
@@ -96,15 +109,76 @@ export default {
     },
     customButtonStyle() {
       return this.shopInfo?.floatingButton?.button || {};
+    },
+    unreadCount() {
+      return this. $store.state.aiUnreadCount || 0;
+    },
+
+    // ✅ 新增：根据当前客服类型动态返回图标
+    currentKefuImg() {
+      if (!this.shopInfo) return '';
+
+      const customerService = createCustomerService(this);
+      const config = customerService.getPlatformConfig();
+
+      if (config?.type === 'aikefu') {
+        return this.aiAgentimg;
+      } else if (config?.type === 'wxwork' || config?.type === 'qyweixin') {
+        // 企业微信客服专用图标
+        return this.aiAgentimg;
+      }
+      // 默认客服图标
+      return this.kefuimg;
+    },
+    // ✅ 新增：判断是否为微信官方客服
+    isWeappOfficialKefu() {
+      if (!this.shopInfo) return false;
+      const customerService = createCustomerService(this);
+      const config = customerService.getPlatformConfig();
+      return config?.type === 'weapp';
+    },
+    // ✅ 新增：判断是否需要同时显示小程序系统客服
+    showWeappSystemKefu() {
+      if (!this.shopInfo) return false;
+      const customerService = createCustomerService(this);
+      const config = customerService.getPlatformConfig();
+      // 检查附加设置是否开启了同时显示小程序系统客服，且当前客服类型不是小程序系统客服
+      return (config?.show_system_service === true || config?.show_system_service === '1') && config?.type !== 'weapp';
+    },
+    //根据显示的按钮数量动态计算容器高度
+   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，使用默认设置');
       }
     });
   },
@@ -119,7 +193,7 @@ export default {
       for (let i = 0; i < this.langList.length; i++) {
         this.langIndexMap[i] = this.langList[i].value;
       }
-      const savedLang = uni.getStorageSync('lang');
+      const savedLang = this.$langConfig.getCurrentLocale();
       if (savedLang) {
         for (let i = 0; i < this.langList.length; i++) {
           if (this.langList[i].value === savedLang) {
@@ -149,7 +223,7 @@ export default {
       // 调用语言切换逻辑（设置 storage + 清空缓存）
       this.$langConfig.change(targetLang);
     },
-
+    
     /**
      * 打开 AI 智能助手
      */
@@ -162,6 +236,95 @@ export default {
      */
     openCustomerSelectPopup() {
       this.customerService.openCustomerSelectPopupDialog();
+    },    
+
+    // ✅ 核心方法：统一客服入口
+    handleUnifiedKefuClick() {
+      const customerService = createCustomerService(this);
+      const validation = customerService.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 = customerService.getPlatformConfig();
+      console.log('【当前客服配置】', platformConfig);
+
+      // 检查企业微信配置
+      if (platformConfig.type === 'wxwork') {
+        const wxworkConfig = customerService.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 {
+        customerService.handleCustomerClick({
+          sendMessageTitle: '来自悬浮按钮的咨询',
+          sendMessagePath: '/pages/index/index'
+        });
+      } catch (error) {
+        console.error('客服处理失败:', error);
+        uni.showToast({ title: '打开客服失败', icon: 'none' });
+      }
+    },
+
+    // 以下方法保留用于 actionSheet（如仍需手动选择）
+    openKefuSelectPopup() {
+      const kefuNames = this.kefuList.map(item => item.name);
+      uni.showActionSheet({
+        itemList: kefuNames,
+        success: (res) => {
+          this.selectedKefu = this.kefuList[res.tapIndex];
+          const cs = createCustomerService(this, this.selectedKefu);
+          if (this.selectedKefu.isOfficial) {
+            uni.openCustomerServiceConversation({
+              sessionFrom: 'weapp',
+              showMessageCard: true
+            });
+          } else if (this.selectedKefu.id === 'qyweixin-kefu') {
+            // 处理企业微信客服
+            if (uni.getSystemInfoSync().platform === 'wechat') {
+              // 小程序端：跳转到企业微信客服
+              uni.navigateTo({
+                url: '/pages_tool/qyweixin-kefu/index'
+              });
+            } else {
+              // H5端：跳转到企业微信链接
+              const qyweixinUrl = this.shopInfo.qyweixinUrl; // 后端返回的企业微信链接
+              if (qyweixinUrl) {
+                window.location.href = qyweixinUrl;
+              } else {
+                uni.showToast({ title: '企业微信客服未配置', icon: 'none' });
+              }
+            }
+          } else {
+            cs.handleCustomerClick();
+          }
+        }
+      });
     }
   }
 }

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/contact/contact.vue

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

pages_tool/member/index.vue

@@ -86,6 +86,12 @@ export default {
 		nsNewGift
 	},
 	mixins: [diyJs, indexJs],
+	onLoad() {
+		this.$util.hideHomeButton();
+	},	
+	onShow() {
+		this.$util.hideHomeButton();
+	},	
 	methods: {
 
 		tourl(url) {

readme.md

@@ -1,176 +1,147 @@
 # 小程序及快应用前端源码
 
-来源于外包提供的源代码，"0731xcx20微信小程序(1).zip"
+## 1. 📋 项目说明
 
+该项目基于 **uni-app** 开发构建，请使用 [HBuilderX](https://www.dcloud.io/hbuilderx.html) 进行代码开发及构建发布。
 
-## 项目说明
+## 2. 🛠️ 开发说明
 
-该项目基于 uniapp 开发构建，请使用(HBuilderX)[https://www.dcloud.io/hbuilderx.html] 进行代码开发及构建发布。
+- 源码基于 **Vue2** 版本
+- SCSS 采用 **dart-sass** 进行编译输出
 
-## 开发说明
+## 3. 🔧 开发调试说明
 
-1. 源码基于Vue2版本，scss采用node-sass进行编译输出。
+### 3.1 注意事项
 
+- 应用访问等关键参数的配置来源于 `./common/js/config.js`
 
-## 开发调试说明
+### 3.2 本地调试
 
-### 注意点
+`.local.config.js.example` 是本地调试配置示例。
 
-应用访问等关键参数的配置来源于 `./common/js/config.js`
+拷贝 `.local.config.js.example` 为 `.local.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. 修改路径中的客户编号
+   3. 📌 **通用版**保留原有 `/hwappx/common/`
+   
+   💡 **示例**：`/hwappx/2811/`，其中 2811 为定制化版客户编号
+
+3. 选择菜单栏「发行」 → 「自定义发行」 →「H5-xcx.aigc-quickapp.com」，修改以下配置：
+   1. **网站标题**：快应用
+   2. **网站域名**：当前客户域名（示例：xcx.aigc-quickapp.com）
+   3. 确认后点击「发行」等待构建完成
+
+   ⚠️ **注意**：底部控制台弹出“项目 lucky_shop 导出Web成功，路径为：D:\项目文件\项目根目录\unpackage\dist\build\web”后再执行下一步
+   💡 **示例**：`项目 lucky_shop 导出Web成功，路径为：D:\0.项目源码\lucky_shop\unpackage\dist\build\web`
+
+4. 按控制台提示的路径找到 `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://xcx6.aigc-quickapp.com/",//修改域名
+  baseUrl: "https://dev.aigc-quickapp.com/",//修改域名
-  uniacid: 2811,//后台对应uniacid
+  uniacid: 1,//后台对应uniacid
 };

store/index.js

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