Merge branch 'Branch_release/v1.4.1'

This reverts commit 19a53ef414.

.gitignore

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

.local.config.js

@@ -38,6 +38,16 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-})['2811']; // 选择要使用的环境配置
-
+    'local-2': { // 测试平台
+        uniacid: 2,
+        domain: 'http://localhost:8050/',
+	'47': { // 修改弹窗
+	       uniacid: 47,
+	       domain: 'https://5g.aigc-quickapp.com/',
+	   },   
+	   '2075': { // 
+	       uniacid: 2075,
+	       domain: 'https://xcx.aigc-quickapp.com/',
+	   },   
+})['47']; // 选择要使用的环境配置
 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;

App.vue

@@ -314,7 +314,7 @@
 	@import './common/css/iconfont.css';
 	@import './common/css/icondiy.css'; // 自定义图标库
 	@import './common/css/icon/extend.css'; // 扩展图标库
-	page{
+	page {
 		background: #f4f6fa;
 	}
 </style>

common/css/diy.scss

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

common/css/goods_detail.scss

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

common/css/main.scss

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

common/css/mp_html_patch.scss

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

common/css/order_parment.scss

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

common/js/ai-service.js

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

common/js/config-external.js

@@ -116,7 +116,7 @@ class ConfigExternal {
       try {
         // 动态加载主题配置
         const themeData = require(`@/common/js/style_color.js`)['default'][theme];
-        console.log('async themeData => ', themeData);
+        // console.log('async themeData => ', themeData);
         this.loadedConfigs[`theme_${theme}`] = themeData;
         resolve(themeData);
       } catch (error) {

common/js/customer-service.js

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

common/js/lang.js

@@ -30,12 +30,12 @@ function processRoutePath(route) {
 		}
 	}
 	// ---- 处理页面目录映射 <end>----
-	
+
 	// 去掉pages目录，只保留子目录
 	if (routeParts[0] === 'pages') {
 		routeParts = routeParts.slice(1);
-	} 
-	
+	}
+
 	return routeParts.join("/");
 }
 
@@ -54,17 +54,32 @@ function loadLangPackSync(lang, path) {
 	}
 }
 
+/**
+ * 获得当前本地语言
+ * @returns 
+ */
+function getCurrentLocale() {
+	return uni.getStorageSync('lang') || "zh-cn";
+}
+
 export default {
 	langList: langConfig.langList,
+
+	/**
+	 * 获得当前本地语言
+	 * @returns 
+	 */
+	getCurrentLocale,
+
 	/**
 	 * * 解析多语言
 	 * @param {Object} field
 	 */
 	lang(field) {
-		let _this = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_this) return;
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_page) return;
 
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = getCurrentLocale(); // 获得当前本地语言
 
 		let value = ''; // 存放解析后的语言值
 		let langPath = ''; // 存放当前页面语言包路径
@@ -72,11 +87,11 @@ export default {
 		try {
 			//公共语言包（同步加载）
 			var lang = loadLangPackSync(locale, 'common');
-			
+
 			//当前页面语言包（同步加载）
-			let route = _this.route;
+			let route = _page.route;
 			langPath = processRoutePath(route);
-			
+
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
 
@@ -101,7 +116,7 @@ export default {
 			} else {
 				value = mergedLang[field] !== undefined ? mergedLang[field] : field;
 			}
-			
+
 		} catch (e) {
 			console.error('解析语言包失败:', e, { langPath, field, locale });
 			value = field;
@@ -117,7 +132,7 @@ export default {
 
 		// 多语言调试，注释后可以关闭控制台输出
 		if (field == value) {
-			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
+			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);
 		}
 
 		return value;
@@ -128,11 +143,11 @@ export default {
 	 * @param {String} url 切换后跳转的页面url
 	 */
 	change(value, url = '/pages_tool/member/index') {
-		let _this = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_this) return;
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_page) return;
 
 		uni.setStorageSync("lang", value);
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = getCurrentLocale();
 
 		// 清空已加载的语言包缓存
 		for (let key in loadedLangPacks) {
@@ -149,10 +164,11 @@ export default {
 	},
 	//刷新标题、tabbar
 	refresh() {
-		let _this = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_this) return;
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
-	
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_page) return;
+
+		const locale = getCurrentLocale();
+
 		this.title(this.lang("title"));
 
 		//设置tabbar的文字语言

common/js/uniapp.utils.js

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

common/js/util.js

@@ -13,6 +13,7 @@ export const CATEGORY_PAGE_URL = '/pages_goods/category';
 export const CONTACT_PAGE_URL = '/pages_tool/contact/contact';
 export const MEMBER_PAGE_URL = '/pages_tool/member/index';
 export const LOGIN_PAGE_URL = '/pages_tool/login/login';
+export const AI_CHAT_PAGE_URL = '/pages_tool/ai-chat/index';
 
 // 当前最新的tabBar.list (参见pages.json 中的tabBar.list 配置)
 export const systemTabBarList = [
@@ -119,6 +120,7 @@ export default {
 	CONTACT_PAGE_URL,
 	INDEX_PAGE_URL,
 	LOGIN_PAGE_URL,
+	AI_CHAT_PAGE_URL,
 
 	/**
 	 * 页面跳转
@@ -606,6 +608,33 @@ export default {
 
 
 
+	/**
+	 * 打开微信企业客服
+	 * @param {Function} fallbackFunc 降级处理函数
+	 */
+	openWxWorkServiceChat(fallbackFunc) {
+		// #ifdef MP-WEIXIN
+		let wxworkConfig = store.state?.wxworkConfig
+		if (wxworkConfig?.enable && wxworkConfig?.contact_url) {
+			// 直接使用活码链接跳转
+			wx.navigateToMiniProgram({
+				appId: 'wxeb490c6f9b154ef9', // 是企业微信官方小程序的AppID（固定值, 由腾讯企业微信团队维护, 不需要修改，用于展示"添加企业微信联系人"的官方页面）
+				path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(wxworkConfig?.contact_url)}`,
+				success: () => {
+					console.log('跳转企业微信成功');
+				},
+				fail: (err) => {
+					console.error('跳转企业微信失败:', err);
+					// 降级处理：使用原有客服方式
+					fallbackFunc && fallbackFunc();
+				}
+			});
+		} else {
+			fallbackFunc && fallbackFunc();
+		}
+		// #endif		
+	},
+
 	/**
 	 * 自定义模板的跳转链接
 	 * @param {Object} link
@@ -667,16 +696,19 @@ export default {
 					// #endif
 
 					// #ifdef MP-WEIXIN
-					wx.openCustomerServiceChat({
-						extInfo: {
-							url: config.wxwork_url
-						},
-						corpId: config.corpid,
-						showMessageCard: true,
-						sendMessageTitle: 'this.sendMessageTitle',
-						sendMessagePath: 'this.sendMessagePath',
-						sendMessageImg: 'this.sendMessageImg'
+					this.openWxWorkServiceChat(() => {
+						wx.openCustomerServiceChat({
+							extInfo: {
+								url: config.wxwork_url
+							},
+							corpId: config.corpid,
+							showMessageCard: true,
+							sendMessageTitle: 'this.sendMessageTitle',
+							sendMessagePath: 'this.sendMessagePath',
+							sendMessageImg: 'this.sendMessageImg'
+						});
 					});
+
 					// #endif
 					break;
 				case 'third':
@@ -811,6 +843,15 @@ export default {
 			uni.navigateBack();
 		}
 	},
+	/**
+	 * 隐藏“返回首页/小房子”按钮
+	 * 这个函数，用到页面show, onshow 的生命周期时
+	 */
+	hideHomeButton() {
+		// #ifdef MP-WEIXIN
+		wx.hideHomeButton();
+		// #endif
+	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）
@@ -1170,7 +1211,7 @@ export default {
 		let _isQuickApp = false;
 		try {
 			const ua = navigator?.userAgent?.toLowerCase();
-			console.log('ua = ', ua);
+			// console.log('ua = ', ua);
 			_isQuickApp = ua.indexOf('quickapp') !== -1;
 
 			if (!_isQuickApp) {

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

components-diy/diy-bottom-nav.vue

@@ -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>
@@ -1160,7 +1160,7 @@ export default {
 				.right-wrap {
 					display: flex;
 					align-items: center;
-					justify-content: end;
+					justify-content: flex-end;
 
 					.num {
 						width: auto;
@@ -1314,7 +1314,7 @@ export default {
 	}
 }
 
-/deep/ .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
@@ -1348,7 +1348,7 @@ export default {
 	justify-content: center;
 }
 
-/deep/ .loading-layer {
+::v-deep .loading-layer {
 	background: #fff !important;
 }
 

components-diy/diy-category.vue

@@ -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> -->
 
@@ -548,7 +548,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .category-page-wrap {
 	width: 100vw;
 	// height: calc(100vh - var(--tab-bar-height, 0));
@@ -818,7 +818,7 @@ export default {
 		z-index: 2;
 	}
 
-	/deep/ .template-four {
+	::v-deep .template-four {
 		position: relative;
 		z-index: 1;
 

components-diy/diy-channel-list.vue

@@ -617,13 +617,13 @@ export default {
 // // 3:4 比例的视频卡片样式
 // .channel-video.ratio-3-4 {
 // 	// 调整视频卡片的整体高度
-// 	/deep/ .video-cover-wrap {
+// 	::v-deep .video-cover-wrap {
 // 		padding-top: 133.33%; // 3:4 比例
 // 	}
 
 // 	// 列表模式下的3:4比例调整
 // 	&.list-mode {
-// 		/deep/ .video-cover-wrap {
+// 		::v-deep .video-cover-wrap {
 // 			padding-top: 133.33%; // 3:4 比例
 // 		}
 // 	}
@@ -632,13 +632,13 @@ export default {
 // // 16:9 比例的视频卡片样式（默认）
 // .channel-video.ratio-16-9 {
 // 	// 保持默认的16:9比例
-// 	/deep/ .video-cover-wrap {
+// 	::v-deep .video-cover-wrap {
 // 		padding-top: 56.25%; // 16:9 比例
 // 	}
 
 // 	// 列表模式下的16:9比例保持默认
 // 	&.list-mode {
-// 		/deep/ .video-cover-wrap {
+// 		::v-deep .video-cover-wrap {
 // 			padding-top: 56.25%; // 16:9 比例
 // 		}
 // 	}

components-diy/diy-channel-video.vue

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

components-diy/diy-coupon.vue

@@ -16,7 +16,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @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">
@@ -488,7 +488,7 @@ export default {
 }
 
 // 风格一
-/deep/.coupon-style-one {
+::v-deep .coupon-style-one {
 	height: 110rpx;
 
 	.coupon-item-box {
@@ -534,7 +534,7 @@ export default {
 }
 
 // 风格二
-/deep/.coupon-style-two {
+::v-deep .coupon-style-two {
 	height: 96rpx;
 
 	.coupon-item-box {
@@ -591,7 +591,7 @@ export default {
 	background-size: 100% 100%;
 }
 
-/deep/.coupon-style-three {
+::v-deep .coupon-style-three {
 	height: 284rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
@@ -638,7 +638,7 @@ export default {
 }
 
 // 风格四
-/deep/.coupon-style-four {
+::v-deep .coupon-style-four {
 	height: 108rpx;
 
 	.coupon-item-box {
@@ -997,7 +997,7 @@ export default {
 }
 
 //风格七
-/deep/ .coupon-style-seven {
+::v-deep .coupon-style-seven {
 	.wrap {
 		display: flex;
 	}
@@ -1075,7 +1075,7 @@ export default {
 	}
 }
 
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -1084,7 +1084,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-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)"
-					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
+					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-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)"
-					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
+					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-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
@@ -311,7 +317,12 @@ export default {
 			this.diyGlobalData.value.forEach((item, index) => {
 				item.pageStyle = '';
 				// 给每个组件增加位置属性，用于定位，搜索、分类导航等定位
-				item.moduleIndex = index + 1;
+				// 如果是Tab组件内部的子组件，添加tabIndex前缀避免moduleIndex冲突
+				if (this.diyData.tabIndex !== undefined) {
+					item.moduleIndex = `${this.diyData.tabIndex}-${index + 1}`;
+				} else {
+					item.moduleIndex = index + 1;
+				}
 
 				// 特殊处理搜索框 当显示位置为滚动至顶部固定时，只设置背景颜色
 				if (item.componentName == 'Search' && item.positionWay == 'fixed') {
@@ -346,6 +357,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"
@@ -274,7 +274,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -283,7 +283,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-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)"
-					@tap="handlerClick(imgAdsValue.list[0].link)">
+				<view class="simple-graph-wrap" :style="imgAdsSwiper" @tap.stop="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" />
@@ -280,39 +279,39 @@ export default {
 }
 
 /* 隐藏滚动条，但依旧具备可以滚动的功能 */
-/deep/.uni-scroll-view::-webkit-scrollbar {
+::v-deep .uni-scroll-view::-webkit-scrollbar {
 	display: none;
 }
 
-.swiper /deep/ .uni-swiper-dots-horizontal {
+.swiper ::v-deep .uni-swiper-dots-horizontal {
 	bottom: 25rpx;
 }
 
-.swiper-left /deep/ .uni-swiper-dots-horizontal {
+.swiper-left ::v-deep .uni-swiper-dots-horizontal {
 	left: 40rpx;
 	transform: translate(0);
 }
 
-.swiper-right /deep/ .uni-swiper-dots-horizontal {
+.swiper-right ::v-deep .uni-swiper-dots-horizontal {
 	right: 40rpx;
 	display: flex;
 	justify-content: flex-end;
 	transform: translate(0);
 }
 
-.carousel-angle /deep/ .uni-swiper-dots-horizontal .uni-swiper-dot {
+.carousel-angle ::v-deep .uni-swiper-dots-horizontal .uni-swiper-dot {
 	width: 24rpx;
 	border-radius: 0;
 	height: 8rpx;
 }
 
-.swiper.ns-indicator-dots /deep/ .uni-swiper-dot {
+.swiper.ns-indicator-dots ::v-deep .uni-swiper-dot {
 	width: 18rpx;
 	height: 6rpx;
 	border-radius: 4rpx;
 }
 
-.swiper.ns-indicator-dots /deep/ .uni-swiper-dot-active {
+.swiper.ns-indicator-dots ::v-deep .uni-swiper-dot-active {
 	width: 36rpx;
 }
 </style>

components-diy/diy-index-page.vue

@@ -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)" />
@@ -732,7 +732,7 @@ export default {
 	margin-top: 100rpx;
 }
 
-/deep/.uni-scroll-view::-webkit-scrollbar {
+::v-deep .uni-scroll-view::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 }

components-diy/diy-kefu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-kefu" class="diy-kefu" :style="style">
-		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list">
+		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list" :key="index">
 			<view class="fui-list jump" v-if="index == 0">
 				<view class="fui-list-media">
 					<image class="round" :src="$util.img(item.imageUrl)" style="border-radius:6rpx"></image>
@@ -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-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
 							<text class="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-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</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-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
+							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</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>
@@ -1380,11 +1380,11 @@ export default {
 	}
 }
 
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none !important;
 }
 
-/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: #fff !important;
 }
 
@@ -1484,8 +1484,8 @@ export default {
 }
 </style>
 <style scoped>
-.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom,
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
 }

components-diy/diy-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)"
-					@tap="handlerClick(item)" :style="notesItemStyle">
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @tap.stop="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"
@@ -319,7 +319,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -328,7 +328,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-pintuan.vue

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

components-diy/diy-presale.vue

@@ -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)"
-					@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
+					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -40,8 +40,8 @@
 			</template>
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
-						@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
+						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 								:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -75,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]"
-							:style="goodsItemCss">
+							@tap.stop="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -276,7 +275,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/.uni-scroll-view ::-webkit-scrollbar {
+::v-deep .uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -285,7 +284,7 @@ export default {
 	background: transparent;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

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)"
-						@tap="handlerClick(value.list[0].link)"
-						:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }">
+					<view :class="['item', value.mode]" @tap.stop="handlerClick(value.list[0].link, value.list[0].imageUrl)"
+					:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }">
 						<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)"
-								@tap="handlerClick(item.link)"
-								:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
+							<view :key="index" :class="['item', value.mode]" @tap.stop="handlerClick(item.link, item.imageUrl)"
+							:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
 								<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' }"
-						@click="handlerClick(value.list[0].link)" @tap="handlerClick(value.list[0].link)">
+					:style="{ marginRight: value.imageGap * 2 + 'rpx', width: list[0].imgWidth, height: list[0].imgHeight + 'px' }"
+					@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' }"
-						@click="handlerClick(value.list[1].link)" @tap="handlerClick(value.list[1].link)">
+					:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: list[1].imgWidth, height: list[1].imgHeight + 'px' }"
+					@tap.stop="handlerClick(value.list[1].link, value.list[1].imageUrl)">
 						<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)"
-									@tap="handlerClick(item.link)" :style="{
-										marginRight: value.imageGap * 2 + 'rpx',
-										width: item.imgWidth,
-										height: item.imgHeight + 'px'
-									}">
+								<view :key="index" :class="['item', value.mode]" @tap.stop="handlerClick(item.link, item.imageUrl)" :style="{
+								marginRight: value.imageGap * 2 + 'rpx',
+								width: item.imgWidth,
+								height: item.imgHeight + 'px'
+							}">
 									<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)"
-					:style="{ marginRight: value.imageGap * 2 + 'rpx', marginBottom: value.imageGap * 2 + 'rpx', width: item.widthStyle, height: item.imgHeight + 'px' }">
+				@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' }">
 					<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"
-						@tap="handlerSearchClick">
+					<view class="search-content" :style="inputStyle"
+						@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="handlerRedirectToClick(value.searchLink)">
+						@tap.stop="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="handlerRedirectToClick(value.searchLink)"></diy-icon>
+						@tap.stop="handlerRedirectToClick(value.searchLink)"></diy-icon>
 				</block>
 			</view>
 		</view>
@@ -257,7 +255,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .uni-input-placeholder {
+::v-deep .uni-input-placeholder {
 	overflow: initial;
 }
 

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

components-diy/diy-store-label.vue

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

components-diy/diy-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()" />
-					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+						@tap.stop="search()" />
+					<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
 				</view>
 			</view>
 		</block>

components-diy/diy-text.vue

@@ -1,6 +1,5 @@
 <template>
-	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)"
-		@tap="handlerClick(value.link)" :style="warpCss">
+	<view data-component-name="diy-text" class="diy-text" @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/ai-chat-message/ai-chat-message.json

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

components/chat-message/chat-message.vue

@@ -156,11 +156,11 @@
 </script>
 
 <style lang="scss">
-	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background-color: #000;
 	}
 
-	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 		max-width: 100%;
 		width: 100%;
 	}
@@ -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,243 +1,315 @@
 <template>
-	<!-- 悬浮按钮 -->
-	<view v-if="pageCount == 1 || need" class="fixed-box" 
-		:style="[{ height: fixBtnShow ? '400rpx' : '320rpx' }, customContainerStyle]">
-		<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
-		<!-- 切换语言按钮 -->
-		<button class="btn-item" v-if="fixBtnShow && isLanguageSwitchEnabled" @click="toggleLanguage()"
-			:style="[{ backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text :style="customTextStyle">{{ currentLangDisplayName }}</text>
-		</button>
-		<!-- 客服按钮 -->
-		<!-- #ifdef MP-WEIXIN -->
-		<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp"
-			showMessageCard="true"
-			:style="[{ backgroundImage: 'url(' + (kefuimg ? kefuimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text class="icox icox-kefu" v-if="!kefuimg"></text>
-			<!-- 	<view>首页</view> -->
-		</button>
-		<!-- #endif -->
-		<view class="btn-item" v-if="fixBtnShow" @click="call()"
-			:style="[{ backgroundImage: 'url(' + (phoneimg ? phoneimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
-			<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
-			<!-- <view>我的</view> -->
-		</view>
+  <view v-if="pageCount === 1 || need" class="fixed-box"
+    :style="[customContainerStyle, { 
+      height: containerHeight,
+      backgroundImage: bgUrl ? `url(${bgUrl})` : '',
+      backgroundSize: 'cover'
+    }]">
+    <!-- 中英文切换按钮 -->
+    <view 
+      v-if="isLanguageSwitchEnabled && fixBtnShow"
+      class="btn-item common-bg"
+      @click="toggleLanguage"
+    >
+      <text>{{ currentLangDisplayName }}</text>
+    </view>
+    <!-- 微信官方客服按钮-->
+    <button 
+      v-if="fixBtnShow && hasValidKefuConfig && isWeappOfficialKefu"
+      class="btn-item common-bg"
+      open-type="contact"
+      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+          <text class="icox icox-kefu" v-if="!kefuimg"></text>
+    </button>
 
-		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-			<text class="iconfont icon-unfold"></text>
-		</view>
-		<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
-			@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-			<view class="">快捷</view>
-			<view>导航</view>
-		</view> -->
-	</view>
+    <!-- 其他类型客服按钮（智能客服、企业微信等）-->
+    <view 
+      v-if="fixBtnShow && hasValidKefuConfig && !isWeappOfficialKefu && !showWeappSystemKefu"
+      class="btn-item common-bg"
+      @click="handleUnifiedKefuClick"
+      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+      <text class="ai-icon" v-if="isAIKefu && !currentKefuImg">🤖</text>
+      <text class="ai-icon" v-if="isWxworkKefu && !currentKefuImg">💬</text>
+      <text class="ai-icon" v-if="!isAIKefu && !isWxworkKefu && !currentKefuImg">👤</text>
+    </view>
+
+    <!-- 智能客服按钮（当同时显示小程序系统客服时）-->
+    <view 
+      v-if="fixBtnShow && hasValidKefuConfig && !isWeappOfficialKefu && showWeappSystemKefu"
+      class="btn-item common-bg"
+      @click="handleUnifiedKefuClick"
+      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+      <text class="ai-icon" v-if="isAIKefu && !currentKefuImg">🤖</text>
+      <text class="ai-icon" v-if="isWxworkKefu && !currentKefuImg">💬</text>
+      <text class="ai-icon" v-if="!isAIKefu && !isWxworkKefu && !currentKefuImg">👤</text>
+    </view>
+
+    <!-- 小程序系统客服按钮 -->
+    <button 
+      v-if="fixBtnShow && hasValidKefuConfig && showWeappSystemKefu"
+      class="btn-item common-bg"
+      open-type="contact"
+      :style="{ backgroundImage: currentKefuImg ? `url(${currentKefuImg})` : '', backgroundSize: '100% 100%' }"
+    >
+          <text class="icox icox-kefu" v-if="!kefuimg"></text>
+    </button>
+
+    
+
+    <!-- 电话按钮 -->
+    <view 
+      v-if="fixBtnShow" 
+      class="btn-item common-bg"
+      @click="call"
+      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]"
+    >
+      <text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+    </view>
+
+  </view>
 </template>
 
 <script>
+import { createCustomerService } from '@/common/js/customer-service.js';
+
 export default {
-	name: 'hover-nav',
-	props: {
-		need: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			pageCount: 0,
-			fixBtnShow: true,
-			tel: '',
-			kefuimg: '',
-			phoneimg: '',
-			shopInfo: null, // 店铺信息对象
+  name: 'hover-nav',
+  props: {
+    need: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      pageCount: 0,
+      fixBtnShow: true,
+      shopInfo: null,
+      currentLangIndex: 0,
+      langIndexMap: {},
+      customerService: null, 
+    };
+  },
+  computed: {
+    bgUrl() {
+      return this.shopInfo?.bgUrl || '';
+    },
+    aiAgentimg() {
+      return this.shopInfo?.aiAgentimg || '';
+    },
+    kefuimg() {
+      return this.shopInfo?.kefuimg || this.$util.getDefaultImage().kefu;
+    },
+    phoneimg() {
+      return this.shopInfo?.phoneimg || this.$util.getDefaultImage().phone;
+    },
+    tel() {
+      return this.shopInfo?.mobile || '';
+    },
+    isLanguageSwitchEnabled() {
+      return !!this.shopInfo?.ischina;
+    },
+    currentLangDisplayName() {
+      const lang = this.langIndexMap[this.currentLangIndex];
+      return lang === 'zh-cn' ? 'EN' : 'CN';
+    },
+    customContainerStyle() {
+      return this.shopInfo?.floatingButton?.container || {};
+    },
+    customButtonStyle() {
+      return this.shopInfo?.floatingButton?.button || {};
+    },
+    unreadCount() {
+      const customerService = createCustomerService(this);
+      return customerService.getUnreadCount();
+    },
+    currentKefuImg() {
+      const customerService = createCustomerService(this);
+      return customerService.getKefuButtonIcon();
+    },
+    isWeappOfficialKefu() {
+      const customerService = createCustomerService(this);
+      return customerService.isWeappOfficialKefu();
+    },
+    isAIKefu() {
+      const customerService = createCustomerService(this);
+      return customerService.isAIKefu();
+    },
+    isWxworkKefu() {
+      const customerService = createCustomerService(this);
+      return customerService.isWxworkKefu();
+    },
+    isThirdKefu() {
+      const customerService = createCustomerService(this);
+      return customerService.isThirdKefu();
+    },
+    showWeappSystemKefu() {
+      const customerService = createCustomerService(this);
+      return customerService.shouldShowExtraWeappSystemKefu();
+    },
+    hasValidKefuConfig() {
+      const customerService = createCustomerService(this);
+      return customerService.hasValidKefuConfig();
+    },
+	//根据显示的按钮数量动态计算容器高度
+	   containerHeight() {
+	     if (!this.fixBtnShow) return '320rpx';
+	   
+	     let buttonCount = 1;
+	     if (this.isLanguageSwitchEnabled) buttonCount++;
+	     if (this.showWeappSystemKefu) buttonCount++;
+	     buttonCount++; 
+	     const totalRpx = 94 * buttonCount - 14;
+	     const pxValue = Math.round(totalRpx * 0.5);
+	   
+	     return ` $ {pxValue}px`;
+	   }
+	  },
+  watch: {
+    shopInfo: {
+      handler(newVal) {
+      },
+      immediate: true
+    }
+  },
+  created() {
+    this.initLanguage();
+    this.pageCount = getCurrentPages().length;
+    uni.getStorage({
+      key: 'shopInfo',
+      success: (e) => {
+        console.log('【调试】当前 shopInfo:', e.data);
+        this.shopInfo = e.data;
+      },
+      fail: () => {
+        console.warn('未获取到 shopInfo，使用默认设置');
+      }
+    });
+    // 初始化 customerService 实例
+    this.customerService = createCustomerService(this);
+  },
+  methods: {
+    initLanguage() {
+      this.langList = this.$langConfig.list();
+      this.langIndexMap = {};
+      for (let i = 0; i < this.langList.length; i++) {
+        this.langIndexMap[i] = this.langList[i].value;
+      }
+      const savedLang = this.$langConfig.getCurrentLocale();
+      if (savedLang) {
+        for (let i = 0; i < this.langList.length; i++) {
+          if (this.langList[i].value === savedLang) {
+            this.currentLangIndex = i;
+            break;
+          }
+        }
+      } else {
+        this.currentLangIndex = 0;
+      }
+    },
 
-			// --- 语言切换相关 ---
-			currentLangIndex: 0,  // 当前选中的语言索引
-			langIndexMap: {},     // 语言索引到语言值的映射
-			isLanguageSwitchEnabled: false,  // 是否启用语言切换
+    call() {
+      this.customerService.makePhoneCallByNumber(this.tel);
+    },
 
-			// --- 其他 ---
-		};
-	},
-	created() {
-		// 初始化语言设置
-		this.initLanguage();
+    toggleLanguage() {
+      this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
+      const targetLang = this.langIndexMap[this.currentLangIndex];
 
-		this.kefuimg = this.$util.getDefaultImage().kefu
-		this.phoneimg = this.$util.getDefaultImage().phone
-		this.pageCount = getCurrentPages().length;
-		
-		// 从店铺信息中获取相关信息
-		uni.getStorage({
-			key: 'shopInfo',
-			success: (e) => {
-				console.log(`获取到的shopInfo:${JSON.stringify(e.data)}`)
-				this.shopInfo = e.data;
+      uni.setStorageSync("lang", targetLang);
 
-				// 从店铺信息中获取手机号
-				this.tel = e.data.mobile
-				// 从店铺信息中获取是否启用语言切换
-				this.isLanguageSwitchEnabled = e.data.ischina;
-			}
-		})			
-	},
-	computed: {
-		currentLangDisplayName() {
-			// 语言切换按钮显示名称，当前语言为中文时显示EN，否则显示CN
-			// 根据 langIndexMap 获取当前语言值
-			const lang = this.langIndexMap[this.currentLangIndex];
-			return lang == 'zh-cn' ? 'EN' : 'CN';
-		},
+      const pages = getCurrentPages();
+      const currentPage = pages[pages.length - 1];
+      const currentRoute = currentPage.route;
 
-		// 获取容器的自定义样式
-		customContainerStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.container || {};
-		},
+      uni.reLaunch({
+        url: '/' + currentRoute
+      });
+    },
 
-		// 获取按钮的自定义样式
-		customButtonStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.button || {};
-		},
-
-		// 获取文本的自定义样式
-		customTextStyle() {
-			// 只返回非空的样式属性，确保不覆盖原有的默认样式
-			return this.shopInfo?.floatingButton?.text || {};
-		}
-	},
-	methods: {
-		initLanguage() {
-			// 初始化语言列表
-			this.langList = this.$langConfig.list();
-
-			// 初始化语言索引映射
-			for (let i = 0; i < this.langList.length; i++) {
-				this.langIndexMap[i] = this.langList[i].value;
-			}
-
-			// 获取存储的语言设置
-			const savedLang = uni.getStorageSync('lang');
-			if (savedLang) {
-				for (let i = 0; i < this.langList.length; i++) {
-					if (this.langList[i].value == savedLang) {
-						this.currentLangIndex = i;
-						break;
-					}
-				}
-			} else {
-				this.currentLangIndex = 0;
-			}
-		},
-		//拨打电话
-		call() {
-			uni.makePhoneCall({
-				phoneNumber: this.tel + ''
-			})
-		},
-		toggleLanguage() {
-			// 切换语言索引
-			this.currentLangIndex = this.currentLangIndex == 0 ? 1 : 0;
-			const targetLang = this.langIndexMap[this.currentLangIndex];
-
-			// 获取当前页面路由
-			let currentRoute = this.$util.getCurrentRoute().path;
-			// 切换语言并重新加载当前页面
-			this.$langConfig.change(targetLang, currentRoute);
-
-		}
-	}
-};
+    handleUnifiedKefuClick() {
+      this.customerService.handleUnifiedKefuClick({
+        sendMessageTitle: '来自悬浮按钮的咨询',
+        sendMessagePath: '/pages/index/index'
+      });
+    }
+  }
+}
 </script>
 
-<style lang="scss">
-.container-box {
-	width: 100%;
-
-	.item-wrap {
-		border-radius: 10rpx;
-
-		.image-box {
-			border-radius: 10rpx;
-		}
-
-		image {
-			width: 100%;
-			height: auto;
-			border-radius: 10rpx;
-			will-change: transform;
-		}
-	}
+<style lang="scss" scoped>
+.fixed-box {
+  position: fixed;
+  right: 0rpx;
+  bottom: 240rpx;
+  /* #ifdef H5 */
+  bottom: 320rpx;
+  /* #endif */
+  z-index: 10;
+  border-radius: 120rpx;
+  padding: 20rpx 0;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  width: 100rpx;
+  box-sizing: border-box;
+  transition: 0.3s;
+  overflow: hidden;
 }
 
-//悬浮按钮
-.fixed-box {
-	position: fixed;
-	right: 0rpx;
-	bottom: 240rpx;
-	// #ifdef H5
-	bottom: 320rpx;
-	// #endif
-	z-index: 10;
-	border-radius: 120rpx;
-	padding: 20rpx 0;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	width: 100rpx;
-	box-sizing: border-box;
-	transition: 0.3s;
-	overflow: hidden;
+.btn-item {
+  display: flex;
+  justify-content: center;
+  text-align: center;
+  flex-direction: column;
+  line-height: 1;
+  margin: 14rpx 0;
+  transition: 0.1s;
+  color: var(--hover-nav-text-color);
+  border-radius: 50%;
+  width: 80rpx;
+  height: 80rpx;
+  padding: 0;
+  overflow: hidden;
+}
 
-	.btn-item {
-		display: flex;
-		justify-content: center;
-		text-align: center;
-		flex-direction: column;
-		line-height: 1;
-		margin: 14rpx 0;
-		transition: 0.1s;
-		background: var(--hover-nav-bg-color);
-		color: var(--hover-nav-text-color);
-		border-radius: 40rpx;
-		width: 80rpx;
-		height: 80rpx;
-		padding: 0;
-		overflow: hidden;
+.common-bg {
+  background-color: var(--hover-nav-bg-color); 
+}
 
-		text {
-			font-size: 28rpx;
-		}
-		.iconfont,
-		.icox {
-			font-size: 36rpx;
-			font-weight: bold;
-			width: 100%;
-			height: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 40rpx;
-			/* 确保图标本身也是圆形 */
-		}
+.btn-item text {
+  font-size: 28rpx;
+}
 
-		view {
-			font-size: 26rpx;
-			font-weight: bold;
-		}
+.iconfont,
+.icox {
+  font-size: 36rpx;
+  font-weight: bold;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 14rpx 0;
+  border-radius: 50rpx;
+  width: 80rpx;
+  height: 80rpx;
+  padding: 0;
+  position: relative;
+}
 
-		&.show {
-			transform: rotate(180deg);
-		}
+.iconfont text,
+.icox text {
+  font-size: 36rpx;
+  font-weight: bold;
+}
 
-		&.switch {}
-
-		&.icon-xiala {
-			margin: 0;
-			margin-top: 0.1rpx;
-		}
-	}
+.ai-icon {
+  font-size: 40rpx;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 </style>

components/ns-contact/ns-contact.vue

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

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

@@ -843,15 +843,15 @@ export default {
 	z-index: 5;
 }
 
-/deep/ .uni-popup__wrapper {
+::v-deep .uni-popup__wrapper {
 	background: transparent !important;
 }
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
 }
 
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
 }
 </style>

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

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

components/privacy-popup/privacy-popup.vue

@@ -158,22 +158,48 @@ export default {
 					success: (res) => {
 						// console.log(res)
 						if (res.needAuthorization) {
-							this.popUp()
-							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-							this.closeOtherPagePopUp(this.disPopUp)
+							// 检查本地存储中是否已经同意过隐私政策
+							const privacyAgreed = uni.getStorageSync('privacyAgreed');
+							if (!privacyAgreed) {
+								this.popUp()
+								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+								this.closeOtherPagePopUp(this.disPopUp)
+							} else {
+								this.$emit('agree')
+							}
 						} else {
 							this.$emit('agree')
 						}
 					},
 				});
 			} else {
-				this.$emit('agree')
+				// 检查本地存储中是否已经同意过隐私政策
+				const privacyAgreed = uni.getStorageSync('privacyAgreed');
+				if (privacyAgreed) {
+					this.$emit('agree');
+				} else {
+					this.popUp()
+					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+					this.closeOtherPagePopUp(this.disPopUp)
+				}
 			}
 			// #endif
 
 			// #ifdef QUICKAPP-WEBVIEW
 			this.getPrivacySettingByQuickApp();
 			// #endif
+
+			// #ifdef H5 || WEB
+			// 检查本地存储中是否已经同意过隐私政策
+			const privacyAgreed = uni.getStorageSync('privacyAgreed');
+			if (privacyAgreed) {
+				this.$emit('agree');
+			} else {
+				this.popUp()
+				// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+				this.closeOtherPagePopUp(this.disPopUp)
+			}
+			// #endif
 		},
 		//初始化监听程序
 		curPageShow() {
@@ -261,6 +287,8 @@ export default {
 			this.privacyResolves.clear()
 			//关闭弹窗
 			this.disPopUp()
+			// 保存用户授权状态到本地存储，无论同意还是不同意，都不再重复弹出
+			uni.setStorageSync('privacyAgreed', true);
 			//退出小程序
 			uni.showModal({
 				content: '未同意隐私协议，无法使用相关功能',
@@ -281,10 +309,8 @@ export default {
 			//关闭弹窗
 			this.disPopUp()
 
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			// 保存用户授权状态到本地存储，用于快应用Webview组件中的H5方式处理
+			// 保存用户授权状态到本地存储，用于所有环境
 			uni.setStorageSync('privacyAgreed', true);		
-			// #endif	
 			this.$emit('agree')
 		},
 		//打开弹窗

components/register-reward/register-reward.vue

@@ -146,7 +146,7 @@
 	};
 </script>
 <style scoped>
-	.register-box /deep/ .uni-scroll-view {
+	.register-box ::v-deep .uni-scroll-view {
 		background: unset !important;
 	}
 
@@ -155,11 +155,11 @@
 		overflow-y: scroll;
 	}
 
-	.register-box /deep/.uni-popup__wrapper-box {
+	.register-box ::v-deep .uni-popup__wrapper-box {
 		overflow: unset !important;
 	}
 
-	.reward-popup /deep/.uni-popup__wrapper {
+	.reward-popup ::v-deep .uni-popup__wrapper {
 		background: none;
 	}
 </style>

components/to-top/to-top.vue

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

docs/components_usage_documentation.md

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

lang/en-us/common.js

@@ -1,28 +1,35 @@
-export const lang = {
-
-	// 底部选项卡
-	tabBar: {
-		home: 'index',
-		category: 'category',
-		cart: 'cart',
-		member: 'member',
-	},
-
-	//公共
-	common: {
-		//语言包名称
-		name: '英文',
-		mescrollTextInOffset: 'pull to refresh',
-		mescrollTextOutOffset: 'Loading...',
-		mescrollEmpty: "No data available",
-		goodsRecommendTitle: 'Guess you like',
-		currencySymbol: '¥',
-		submit: 'Submit',
-		searchTip: 'Please enter search keywords'
-	},
-
-	login: 'Login/Register',
-	loginTips: 'Click to login and enjoy more exciting information',
-	toLogin: 'Go to login',
-	toGoodsCategoryPage: 'Go shopping',	
-}
+export const lang = {
+
+	// 底部选项卡
+	tabBar: {
+		home: 'index',
+		category: 'category',
+		cart: 'cart',
+		member: 'member',
+	},
+
+	//公共
+	common: {
+		//语言包名称
+		name: '英文',
+		mescrollTextInOffset: 'pull to refresh',
+		mescrollTextOutOffset: 'Loading...',
+		mescrollEmpty: "No data available",
+		goodsRecommendTitle: 'Guess you like',
+		currencySymbol: '¥',
+		submit: 'Submit',
+		searchTip: 'Please enter search keywords'
+	},
+
+	//customer service
+	customer: {
+		weChatKefu: 'WeChat Customer Service',
+		systemKefu: 'System Customer Service',
+		weChatWorkKefu: 'WeChat Work Customer Service',
+	},
+
+	login: 'Login/Register',
+	loginTips: 'Click to login and enjoy more exciting information',
+	toLogin: 'Go to login',
+	toGoodsCategoryPage: 'Go shopping',
+}

lang/zh-cn/common.js

@@ -21,6 +21,13 @@ export const lang = {
 		searchTip: '请输入搜索关键词'
 	},
 
+	//客服
+	customer: {
+		weChatKefu: '微信客服',
+		systemKefu: '专属客服',
+		weChatWorkKefu: '企业微信客服',
+	},
+
 	login: '登录/注册',
 	loginTpis: '点击登录 享受更多精彩信息',
 	toLogin: '去登录',

manifest.json

@@ -58,7 +58,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx29215aa1bd97bbd6",
+        "appid" : "wx5e649e2286b29bdf",
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
@@ -66,7 +66,7 @@
             "minified" : true
         },
         "usingComponents" : true,
-        "lazyCodeLoading": "requiredComponents",
+        "lazyCodeLoading" : "requiredComponents",
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "为了更好地为您提供服务"
@@ -130,5 +130,5 @@
     "uniStatistics" : {
         "version" : "2"
     },
-    "sassImplementationName" : "node-sass"
+    "sassImplementationName" : "dart-sass"
 }

node_modules/jweixin-module/README.md

@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用
 
 ```js
-var wx = require('jweixin-module')
-wx.ready(function(){
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
     // TODO
 });
 ```

node_modules/jweixin-module/package.json

@@ -1,60 +1,26 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
-  "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
-  "_location": "/jweixin-module",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "jweixin-module",
     "name": "jweixin-module",
-    "escapedName": "jweixin-module",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-  "_spec": "jweixin-module",
-  "_where": "E:\\demo\\niushop_uniapp",
-  "author": {
-    "name": "Shengqiang Guo"
-  },
-  "bugs": {
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "微信JS-SDK",
-  "devDependencies": {
-    "textfile": "^1.2.0",
-    "uglify-js": "^3.4.9"
-  },
-  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "keywords": [
-    "wxjssdk",
-    "weixin",
-    "jweixin",
-    "wechat",
-    "jssdk",
-    "wx"
-  ],
-  "license": "ISC",
-  "main": "out/index.js",
-  "name": "jweixin-module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-  },
-  "scripts": {
-    "build": "node build",
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
+    "version": "1.6.0",
+    "description": "微信JS-SDK",
+    "main": "lib/index.js",
+    "scripts": {},
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+    },
+    "keywords": [
+        "wxjssdk",
+        "weixin",
+        "jweixin",
+        "wechat",
+        "jssdk",
+        "wx"
+    ],
+    "author": "Shengqiang Guo",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    },
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+    "devDependencies": {}
 }

package-lock.json

@@ -8,6 +8,7 @@
         "jweixin-module": "^1.6.0"
       },
       "devDependencies": {
+        "dart-sass": "^1.25.0",
         "terser-webpack-plugin": "^5.3.10",
         "zion-uniapp-mp-load-package": "^1.0.13"
       }
@@ -368,6 +369,59 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.23.3",
       "resolved": "https://repo.huaweicloud.com/repository/npm/browserslist/-/browserslist-4.23.3.tgz",
@@ -449,6 +503,74 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/dart-sass": {
+      "version": "1.25.0",
+      "resolved": "https://registry.npmmirror.com/dart-sass/-/dart-sass-1.25.0.tgz",
+      "integrity": "sha512-syNOAstJXAmvD3RifcDk3fiPMyYE2fY8so6w9gf2/wNlKpG0zyH+oiXubEYVOy1WAWkzOc72pbAxwx+3OU4JJA==",
+      "deprecated": "This package has been renamed to 'sass'.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": ">=2.0.0 <4.0.0"
+      },
+      "bin": {
+        "dart-sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/dart-sass/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/dart-sass/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/dart-sass/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
@@ -567,6 +689,47 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
@@ -593,6 +756,52 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -701,6 +910,16 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.0.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
@@ -881,6 +1100,19 @@
         }
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "6.13.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-6.13.0.tgz",
@@ -1318,6 +1550,39 @@
       "dev": true,
       "requires": {}
     },
+    "anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "dependencies": {
+        "picomatch": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+          "dev": true
+        }
+      }
+    },
+    "binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true
+    },
+    "braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.1.1"
+      }
+    },
     "browserslist": {
       "version": "4.23.3",
       "resolved": "https://repo.huaweicloud.com/repository/npm/browserslist/-/browserslist-4.23.3.tgz",
@@ -1357,6 +1622,48 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "dart-sass": {
+      "version": "1.25.0",
+      "resolved": "https://registry.npmmirror.com/dart-sass/-/dart-sass-1.25.0.tgz",
+      "integrity": "sha512-syNOAstJXAmvD3RifcDk3fiPMyYE2fY8so6w9gf2/wNlKpG0zyH+oiXubEYVOy1WAWkzOc72pbAxwx+3OU4JJA==",
+      "dev": true,
+      "requires": {
+        "chokidar": ">=2.0.0 <4.0.0"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+          "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
+          }
+        },
+        "picomatch": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        }
+      }
+    },
     "electron-to-chromium": {
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
@@ -1445,6 +1752,31 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "optional": true
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
@@ -1465,6 +1797,36 @@
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "jest-worker": {
       "version": "27.5.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -1544,6 +1906,12 @@
       "dev": true,
       "peer": true
     },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
     "picocolors": {
       "version": "1.0.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.0.1.tgz",
@@ -1649,6 +2017,15 @@
         "terser": "^5.26.0"
       }
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "undici-types": {
       "version": "6.13.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-6.13.0.tgz",

package.json

@@ -1,8 +1,12 @@
 {
   "scripts": {
-    "mp-weixin": "node scripts/mp-weixin.patch.js"
+    "mp-weixin": "node scripts/mp-weixin.patch.js",
+    "mp-weixin:patch": "node scripts/mp-weixin.patch.js --no-zip",
+    "mp-weixin:dev": "node scripts/mp-weixin.patch.js --mode development",
+    "mp-weixin:dev:patch": "node scripts/mp-weixin.patch.js --mode development --no-zip"
   },
   "devDependencies": {
+    "dart-sass": "^1.25.0",
     "terser-webpack-plugin": "^5.3.10",
     "zion-uniapp-mp-load-package": "^1.0.13"
   },
@@ -31,7 +35,7 @@
           "H5_PRODUCTION": true,
           "PRODUCTION": true
         }
-      },      
+      },
       "h5-xcx.aigc-quickapp.com": {
         "title": "H5-xcx.aigc-quickapp.com",
         "env": {

pages.json

@@ -315,12 +315,18 @@
 			//*****************其他模块（26）******************
 			"root": "pages_tool",
 			"pages": [
+				{
+					"path": "ai-chat/index",
+					 "style": {
+					 "navigationBarTitleText": "AI 客服"
+					}
+				},
 				{
 					"path": "agreement/contenr",
 					"style": {
 						"navigationBarTitleText": ""
 					}
-				},
+				},				
 				{
 					"path": "vr/index",
 					"style": {

pages/index/index.vue

@@ -1,246 +1,429 @@
-<template>
-	<view :style="themeColor">
-		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
-			class="page-img">
-			<view class="site-info-box"
-				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-				<view class="site-info">
-					<view class="img-box" v-if="siteInfo.logo_square">
-						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-					</view>
-					<view class="info-box" :style="{ color: '#ffffff' }">
-						<text class="font-size-base">{{ siteInfo.site_name }}</text>
-						<text>{{ followOfficialAccount.welcomeMsg }}</text>
-					</view>
-				</view>
-				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
-					}}</view>
-			</view>
-
-			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-		</view> -->
-
-			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-				<template v-slot:components>
-					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
-				</template>
-				<template v-slot:default>
-					<ns-copyright v-show="isShowCopyRight" />
-				</template>
-			</diy-index-page>
-
-			<view v-else class="bg-index"
-				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-					:followOfficialAccount="followOfficialAccount" />
-				<ns-copyright v-show="isShowCopyRight" />
-			</view>
-
-			<template v-if="adv.advshow != -1">
-				<view @touchmove.prevent.stop>
-					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-						<view class="small-bot">
-							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
-							<view bindtap="adverclose">跳过</view>
-							<view class="time">{{clock}}s</view>
-						</view>
-						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
-							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
-						</view> -->
-							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
-								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-								<swiper-item v-for="(item, index) in adv.list" :key="index">
-									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
-										:src="$util.img(item.imageUrl)" width="100%"></image>
-									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-								</swiper-item>
-							</swiper>
-							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-								<i class="iconfont icon-round-close" style="color:#fff"></i>
-							</view>
-						</view>
-						<!-- 	<view class="image-wrap">
-						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
-							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
-								<view class="item">
-									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
-					</uni-popup>
-				</view>
-			</template>
-
-			<!-- 底部tabBar -->
-			<view class="page-bottom" v-if="openBottomNav">
-				<diy-bottom-nav @callback="callback" :name="name" />
-			</view>
-
-			<!-- 关注公众号弹窗 -->
-			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-				<uni-popup ref="officialAccountsPopup" type="center">
-					<view class="official-accounts-wrap">
-						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-						<text class="desc">关注了解更多</text>
-						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
-					</view>
-				</uni-popup>
-			</view>
-
-			<!-- 收藏 -->
-			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-				<view v-if="showTip" class="collectPopupWindow"
-					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-					<text @click="closeCollectPopupWindow">我知道了</text>
-				</view>
-			</uni-popup>
-
-			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-			<view @touchmove.prevent.stop class="choose-store">
-				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-					<view class="choose-store-popup">
-						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-						<view class="position-wrap">
-							<text class="iconfont icon-dizhi"></text>
-							<text class="address">{{ currentPosition }}</text>
-							<view class="reposition" @click="reposition"
-								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-								<text class="iconfont icon-dingwei"></text>
-								<text>重新定位</text>
-							</view>
-						</view>
-						<view class="store-wrap" v-if="nearestStore">
-							<text class="tag">当前门店</text>
-							<view class="store-name">{{ nearestStore.store_name }}</view>
-							<view class="address">{{ nearestStore.show_address }}</view>
-							<view class="distance" v-if="nearestStore.distance">
-								<text class="iconfont icon-dizhi"></text>
-								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
-									nearestStore.distance *
-									1000 +
-									'm' }}</text>
-							</view>
-						</view>
-						<button type="primary" @click="enterStore">确认进入</button>
-						<view class="other-store" @click="chooseOtherStore"
-							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text>选择其他门店</text>
-							<text class="iconfont icon-right"></text>
-						</view>
-					</view>
-				</uni-popup>
-			</view>
-			<hover-nav :need="true"></hover-nav>
-			<!-- 隐私协议 -->
-			<privacy-popup ref="privacyPopup"></privacy-popup>
-			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-			<ns-login ref="login"></ns-login>
-		</view>
-	</view>
-</template>
-
-<script>
-
-
-import diyJs from '@/common/js/diy.js';
-import scroll from '@/common/js/scroll-view.js';
-import indexJs from './public/js/index.js';
-
-export default {
-	mixins: [diyJs, scroll, indexJs]
-};
-</script>
-
-<style lang="scss">
-@import '@/common/css/diy.scss';
-@import './public/css/index.scss';
-
-.small-bot {
-	width: 100%;
-	height: 100%;
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 122;
-}
-
-.small-bot swiper {
-	width: 560rpx;
-	height: 784rpx;
-	margin: 120rpx auto 0;
-	border-radius: 10rpx;
-	overflow: hidden;
-}
-
-.small-bot swiper .slide-image {
-	width: 100%;
-	height: 100%;
-}
-
-.small-bot-close {
-	width: 66rpx;
-	height: 66rpx;
-	border-radius: 50%;
-	text-align: center;
-	line-height: 64rpx;
-	font-size: 64rpx;
-	color: #fff;
-	margin: 30rpx auto 0;
-}
-
-.small-bot-close i {
-	font-size: 60rpx;
-}
-</style>
-<style scoped>
-.swiper /deep/ .uni-swiper-dots-horizontal {
-	left: 40%;
-	bottom: 40px
-}
-
-.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	background: none !important;
-}
-
-.choose-store>>>.goodslist-uni-popup-box {
-	width: 80%;
-}
-
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-	border-radius: 0;
-}
-
-/deep/ .placeholder {
-	height: 0;
-}
-
-/deep/::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	background-color: transparent;
-	display: none;
-}
-
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-
-/deep/ .mescroll-totop {
-	/* #ifdef H5 */
-	right: 28rpx !important;
-	bottom: 200rpx !important;
-	/* #endif */
-	/* #ifdef MP-WEIXIN */
-	right: 27rpx !important;
-	bottom: 180rpx !important;
-	/* #endif */
-}
+<template>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="site-info-box"
+				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+				<view class="site-info">
+					<view class="img-box" v-if="siteInfo.logo_square">
+						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+					</view>
+					<view class="info-box" :style="{ color: '#ffffff' }">
+						<text class="font-size-base">{{ siteInfo.site_name }}</text>
+						<text>{{ followOfficialAccount.welcomeMsg }}</text>
+					</view>
+				</view>
+				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
+					}}</view>
+			</view>
+
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<template v-slot:components>
+					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
+				</template>
+				<template v-slot:default>
+					<ns-copyright v-show="isShowCopyRight" />
+				</template>
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:followOfficialAccount="followOfficialAccount" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</view>
+
+			<template v-if="adv.advshow != -1">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="small-bot">
+							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
+								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+								<swiper-item v-for="(item, index) in adv.list" :key="index">
+									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
+										:src="$util.img(item.imageUrl)" width="100%"></image>
+								</swiper-item>
+							</swiper>
+							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+								<i class="iconfont icon-round-close" style="color:#fff"></i>
+							</view>
+						</view>
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 关注公众号弹窗 -->
+			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+				<uni-popup ref="officialAccountsPopup" type="center">
+					<view class="official-accounts-wrap">
+						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+						<text class="desc">关注了解更多</text>
+						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+					</view>
+				</uni-popup>
+			</view>
+
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<!-- 选择门店弹出框 -->
+			<view @touchmove.prevent.stop class="choose-store">
+				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+					<view class="choose-store-popup">
+						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+						<view class="position-wrap">
+							<text class="iconfont icon-dizhi"></text>
+							<text class="address">{{ currentPosition }}</text>
+							<view class="reposition" @click="reposition"
+								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+								<text class="iconfont icon-dingwei"></text>
+								<text>重新定位</text>
+							</view>
+						</view>
+						<view class="store-wrap" v-if="nearestStore">
+							<text class="tag">当前门店</text>
+							<view class="store-name">{{ nearestStore.store_name }}</view>
+							<view class="address">{{ nearestStore.show_address }}</view>
+							<view class="distance" v-if="nearestStore.distance">
+								<text class="iconfont icon-dizhi"></text>
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+									nearestStore.distance *
+									1000 +
+									'm' }}</text>
+							</view>
+						</view>
+						<button type="primary" @click="enterStore">确认进入</button>
+						<view class="other-store" @click="chooseOtherStore"
+							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text>选择其他门店</text>
+							<text class="iconfont icon-right"></text>
+						</view>
+					</view>
+				</uni-popup>
+			</view>
+
+			<hover-nav :need="true"></hover-nav>
+			
+			<!-- 隐私协议弹窗 UI (新增) -->
+			<view v-if="showPrivacyModal" class="privacy-modal-mask" @touchmove.prevent>
+				<view class="privacy-modal-container">
+					<view class="modal-header">用户隐私保护提示</view>
+					<view class="modal-body">
+						<text>感谢您使用本应用，在使用前您应当阅读并同意</text>
+						<text class="link" @click="viewPrivacy('privacy')">《隐私条款》</text>
+						<text class="link" @click="viewPrivacy('agreement')">《用户服务协议》</text>
+						<text>，当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用相关功能。</text>
+					</view>
+					<view class="modal-footer">
+						<view class="btn btn-disagree" @click="handleDisagree">不同意</view>
+						<view class="btn btn-agree" @click="handleAgree">同意并继续</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 隐私协议组件 (原有) -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+			<ns-login ref="login"></ns-login>
+		</view>
+	</view>
+</template>
+
+<script>
+import diyJs from '@/common/js/diy.js';
+import scroll from '@/common/js/scroll-view.js';
+import indexJs from './public/js/index.js';
+
+export default {
+	mixins: [diyJs, scroll, indexJs],
+	data() {
+		return {
+			minScrollTop: 100,
+			wechatQrcode: '',
+			diyRoute: '/pages/index/index',
+			showPrivacyModal: false // 新增：控制隐私弹窗显示
+		};
+	},
+	onLoad(option) {
+		// #ifdef H5
+		if (option.module && option.module == 'locationPicker') {
+			option.name = '';
+		}
+		// #endif
+		this.name = option.name || 'DIY_VIEW_INDEX';
+	},
+	onShow() {
+		this.getFollowQrcode();
+		// 页面显示时检查隐私设置
+		this.checkPrivacySetting();
+	},
+	mounted() {
+		this.unsubscribe = this.$eventBus?.onMany([
+			'rubik-cube-tap',
+			'picture-tap',
+			'text-tap',
+			'goods-list-tap',
+			'presale-tap',
+			'notes-tap',
+			'merch-list-tap',
+			'map-tap',
+			'img-ads-tap',
+			'many-goods-list-tap',
+			'search-tap',
+		], this._handleDiyGroupInteractionEvent);
+	},
+	beforeDestroy() {
+		if (this.unsubscribe) this.unsubscribe();
+	},
+	methods: {
+		// 检查隐私弹窗逻辑
+		checkPrivacySetting() {
+			// 模拟检查本地存储，看用户是否已经同意过
+			// 实际项目中请替换为你真实的存储逻辑
+			const hasAgreed = uni.getStorageSync('HAS_AGREED_PRIVACY');
+			if (!hasAgreed) {
+				// 延迟显示，防止遮挡页面渲染
+				setTimeout(() => {
+					this.showPrivacyModal = true;
+				}, 500);
+			}
+		},
+		
+		// 用户点击同意
+		handleAgree() {
+			// 保存同意状态
+			uni.setStorageSync('HAS_AGREED_PRIVACY', true);
+			this.showPrivacyModal = false;
+		},
+
+		// 用户点击不同意
+		handleDisagree() {
+			// 微信小程序环境下，不同意通常退出小程序
+			// #ifdef MP-WEIXIN
+			uni.exitMiniProgram();
+			// #endif
+			// H5 或 App 下可以提示或直接不显示内容
+			// #ifndef MP-WEIXIN
+			uni.showToast({
+				title: '您已拒绝协议，无法使用',
+				icon: 'none',
+				duration: 2000
+			});
+			// 这里可以选择关闭页面或保持弹窗
+			// this.showPrivacyModal = false; 
+			// #endif
+		},
+
+		// 查看具体条款（可选功能）
+		viewPrivacy(type) {
+			// 这里可以跳转到具体的条款页面，或者使用你现有的 privacy-popup 组件
+			// 假设你有现成的组件逻辑：
+			if (this.$refs.privacyPopup) {
+				// 假设 privacy-popup 组件有一个 show 方法
+				// this.$refs.privacyPopup.show(type);
+			}
+			uni.showToast({
+				title: '请在此处实现查看条款逻辑',
+				icon: 'none'
+			});
+		},
+
+		getFollowQrcode() {
+			if (!this.$util.isWeiXin()) return;
+			this.$api.sendRequest({
+				url: '/wechat/api/wechat/followqrcode',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.wechatQrcode = res.data.qrcode;
+					}
+				}
+			});
+		},
+		officialAccountsOpen() {
+			this.$refs.officialAccountsPopup.open();
+		},
+		officialAccountsClose() {
+			this.$refs.officialAccountsPopup.close();
+		},
+		_handleDiyGroupInteractionEvent(payload) {
+			// #ifdef H5
+			return true;
+			// #endif
+			if (this.storeToken) {
+				return true;
+			}
+			this.$refs.login?.open();
+			return false;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import '@/common/css/diy.scss';
+@import './public/css/index.scss';
+
+.small-bot {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 122;
+}
+
+.small-bot swiper {
+	width: 560rpx;
+	height: 784rpx;
+	margin: 120rpx auto 0;
+	border-radius: 10rpx;
+	overflow: hidden;
+}
+
+.small-bot swiper .slide-image {
+	width: 100%;
+	height: 100%;
+}
+
+.small-bot-close {
+	width: 66rpx;
+	height: 66rpx;
+	border-radius: 50%;
+	text-align: center;
+	line-height: 64rpx;
+	font-size: 64rpx;
+	color: #fff;
+	margin: 30rpx auto 0;
+}
+
+.small-bot-close i {
+	font-size: 60rpx;
+}
+
+/* 新增：隐私弹窗样式 */
+.privacy-modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.6); // 半透明背景
+	z-index: 9999; // 确保层级最高
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.privacy-modal-container {
+	width: 80%;
+	background-color: #ffffff;
+	border-radius: 12rpx;
+	padding: 40rpx 30rpx;
+	text-align: center;
+}
+
+.modal-header {
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 20rpx;
+}
+
+.modal-body {
+	font-size: 28rpx;
+	color: #666;
+	line-height: 1.6;
+	text-align: left;
+	margin-bottom: 30rpx;
+}
+
+.link {
+	color: #007aff; // 蓝色链接
+	margin: 0 4rpx;
+}
+
+.modal-footer {
+	display: flex;
+	justify-content: space-between;
+	padding: 0 20rpx;
+}
+
+.btn {
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	text-align: center;
+	margin: 0 15rpx;
+}
+
+.btn-disagree {
+	background-color: #f5f5f5;
+	color: #333;
+}
+
+.btn-agree {
+	background-color: #07c160; // 微信绿
+	color: #fff;
+}
+</style>
+<style scoped>
+.swiper ::v-deep .uni-swiper-dots-horizontal {
+	left: 40%;
+	bottom: 40px
+}
+
+.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none !important;
+}
+
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
+
+::v-deep .diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
+
+::v-deep .placeholder {
+	height: 0;
+}
+
+::v-deep ::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
+
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+
+::v-deep .mescroll-totop {
+	/* #ifdef H5 */
+	right: 28rpx !important;
+	bottom: 200rpx !important;
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	right: 27rpx !important;
+	bottom: 180rpx !important;
+	/* #endif */
+}
 </style>

pages/index/public/css/index.scss

@@ -59,7 +59,7 @@
 	}
 }
 
-.official-accounts-inner /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+.official-accounts-inner ::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 	overflow: inherit;
 }
 .official-accounts-wrap {

pages/index/public/js/index.js

@@ -1,82 +1,95 @@
 export default {
-	data() {
-		return {
-			minScrollTop: 100, // 设置回到顶端按钮显示要求，最小页面滚动距离
-			wechatQrcode: '', // 公众号二维码
-			diyRoute: '/pages/index/index'
-		};
-	},
-	onLoad(option) {
-		// #ifdef H5
-		// H5地图选择位置回调数据
-		if (option.module && option.module == 'locationPicker') {
-			option.name = ''; // 清空地址
-		}
-		// #endif
-		this.name = option.name || 'DIY_VIEW_INDEX'; // 根据店铺运营模式，打开平台（shop）或者连锁门店（stroe）页面，接口会自行判断
+  data() {
+    return {
+      minScrollTop: 100, // 设置回到顶端按钮显示要求，最小页面滚动距离
+      wechatQrcode: "", // 公众号二维码
+      diyRoute: "/pages/index/index",
+    };
+  },
+  onLoad(option) {
+    // #ifdef H5
+    // H5地图选择位置回调数据
+    if (option.module && option.module == "locationPicker") {
+      option.name = ""; // 清空地址
+    }
+    // #endif
+    this.name = option.name || "DIY_VIEW_INDEX"; // 根据店铺运营模式，打开平台（shop）或者连锁门店（stroe）页面，接口会自行判断
+  },
+  onShow() {
+    // 获取关注公众号二维码
+    this.getFollowQrcode();
+    // 检查隐私设置并显示弹窗
+    this.checkPrivacySetting();
+  },
+  mounted() {
+    // 监听图片、文字、商品列表等组件的点击事件
+    this.unsubscribe = this.$eventBus?.onMany(
+      [
+        "rubik-cube-tap",
+        "picture-tap",
+        "text-tap",
+        "goods-list-tap",
+        "presale-tap",
+        "notes-tap",
+        "merch-list-tap",
+        "map-tap",
+        "img-ads-tap",
+        "many-goods-list-tap",
+        "search-tap",
+      ],
+      this._handleDiyGroupInteractionEvent,
+    );
+  },
+  beforeDestroy() {
+    // 移除图片点击事件监听
+    if (this.unsubscribe) this.unsubscribe();
+  },
+  methods: {
+    // 检查隐私设置
+    checkPrivacySetting() {
+      // 延迟执行，确保组件已经挂载
+      setTimeout(() => {
+        if (this.$refs.privacyPopup) {
+          this.$refs.privacyPopup.proactive();
+        }
+      }, 100);
+    },
+    // 关注公众号
+    getFollowQrcode() {
+      if (!this.$util.isWeiXin()) return;
+      this.$api.sendRequest({
+        url: "/wechat/api/wechat/followqrcode",
+        success: (res) => {
+          if (res.code >= 0 && res.data) {
+            this.wechatQrcode = res.data.qrcode;
+          }
+        },
+      });
+    },
+    officialAccountsOpen() {
+      this.$refs.officialAccountsPopup.open();
+    },
+    officialAccountsClose() {
+      this.$refs.officialAccountsPopup.close();
+    },
+    // 统一处理点击及触摸事件
+    _handleDiyGroupInteractionEvent(payload) {
+      // #ifdef H5
+      // 如果是 H5 环境，直接返回 true 继续传播
+      return true;
+      // #endif
 
-	},
-	onShow() {
-		// 获取关注公众号二维码
-		this.getFollowQrcode();
-	},
-	mounted() {
-		// 监听图片、文字、商品列表等组件的点击事件
-		this.unsubscribe = this.$eventBus?.onMany([
-			'rubik-cube-tap',
-			'picture-tap', 
-			'text-tap',
-			'goods-list-tap',
-			'presale-tap',
-			'notes-tap',
-			'merch-list-tap',
-			'map-tap',
-			'img-ads-tap',
-			'many-goods-list-tap',
-			'search-tap',
-		], this._handleDiyGroupInteractionEvent);
-	},
-	beforeDestroy() {
-		// 移除图片点击事件监听
-		if (this.unsubscribe) this.unsubscribe();
-	},
-	methods: {
-		// 关注公众号
-		getFollowQrcode() {
-			if (!this.$util.isWeiXin()) return;
-			this.$api.sendRequest({
-				url: '/wechat/api/wechat/followqrcode',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.wechatQrcode = res.data.qrcode;
-					}
-				}
-			});
-		},
-		officialAccountsOpen() {
-			this.$refs.officialAccountsPopup.open();
-		},
-		officialAccountsClose() {
-			this.$refs.officialAccountsPopup.close();
-		},
-		// 统一处理点击及触摸事件
-		_handleDiyGroupInteractionEvent(payload) {
-			// #ifdef H5
-			// 如果是 H5 环境，直接返回 true 继续传播
-			return true;
-			// #endif
+      // 如果已登录，直接返回 true 继续传播
+      if (this.storeToken) {
+        return true;
+      }
 
-			// 如果已登录，直接返回 true 继续传播
-			if (this.storeToken) {
-				return true;
-			}
+      // 打开登录弹窗
+      // console.log('==> _handleDiyGroupInteractionEvent, 未登录，打开登录弹窗', { payload })
+      this.$refs.login?.open();
 
-			// 打开登录弹窗
-			// console.log('==> _handleDiyGroupInteractionEvent, 未登录，打开登录弹窗', { payload })
-			this.$refs.login?.open();
-
-			// 阻止事件继续传播
-			return false;
-		}
-	}
-}
+      // 阻止事件继续传播
+      return false;
+    },
+  },
+};

pages_goods/_components/goods-detail-view/goods-detail-view.vue

@@ -3,16 +3,21 @@
         <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
             <view class="goods-container">
                 <!-- 弹幕 -->
-                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
+                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai"
+                    :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true"
+                    :info="goodsSkuDetail.barrageData" />
 
                 <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
+                <view class="goods-media" :style="{ height: goodsSkuDetail.swiperHeight }">
                     <!-- 商品图片 -->
                     <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
+                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval"
+                            :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
+                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index"
+                                :item-id="'goods_id_' + index">
                                 <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
+                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)"
+                                        mode="aspectFit" />
                                 </view>
                             </swiper-item>
                         </swiper>
@@ -24,13 +29,16 @@
 
                     <!-- 商品视频 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
+                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
+                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
                     </view>
 
                     <!-- 切换视频、图片 -->
                     <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{
+                            $lang('video') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'img' }"
+                            @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
                     </view>
                 </view>
 
@@ -40,19 +48,20 @@
                 </view>
 
                 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
+
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
 
                     <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
+                    <!-- 	@click="$refs.deliveryType.open()" -->
+                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0">
+                        <view class="label">{{ $lang('send') }}</view>
                         <block v-if="deliveryType">
                             <view class="box">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
+                                    <text
+                                        v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ $lang('express') }}</text>
+                                    <!-- 	{{ item.name }} -->
                                 </block>
                             </view>
                             <text class="iconfont icon-right"></text>
@@ -63,7 +72,7 @@
                     </view>
 
                     <!-- 门店 -->
-               <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
+                    <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
                         <view class="label">门店</view>
                         <view class="list-wrap">
                             <view class="name-wrap">
@@ -80,15 +89,21 @@
                         <text class="iconfont icon-right"></text>
                     </view> -->
 
-                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
+                    <view class="item service" @click="openMerchantsServicePopup()"
+                        v-if="goodsSkuDetail.goods_service.length">
                         <view class="label">服务</view>
                         <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
+                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index"
+                                v-if="index < 3">
                                 <view class="item-wrap-box">
                                     <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                        <text class="iconfont icon-dui"
+                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
+                                            :src="$util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'"
+                                            :icon="item.icon.icon"
+                                            :value="item.icon.style ? item.icon.style : null"></diy-icon>
                                     </view>
                                     <text>{{ item.service_name }}</text>
                                 </view>
@@ -96,30 +111,32 @@
                         </view>
                         <text class="iconfont icon-right"></text>
                     </view>
-		
+
                 </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
+
+                <!--多规格区域-->
+                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.sku_spec_format">
+                    <!-- 入口区域 -->
+                    <slot name="skuspec"></slot>
+                </view>
+
+
+                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
                     <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
+                    <view class="item store-wrap"
+                        @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
                         <view class="list-wrap" style="display: flex;">
                             <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
+                                <image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix"
+                                    style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
                             </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
+                            <view class="other-wrap">
+                                <view class="address" style="margin-left: 30rpx;">
+                                    <view>{{ goodsSkuDetail.merchinfo.merch_name }}</view>
+                                    <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
+                                </view>
                             </view>
                         </view>
                         <text class="iconfont icon-right"></text>
@@ -136,7 +153,8 @@
                             </view>
                             <scroll-view scroll-y class="type-body">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
+                                    <view class="type-item"
+                                        :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
                                         <text class="iconfont" :class="item.icon"></text>
                                         <view class="content">
                                             <view class="title">{{ item.name }}</view>
@@ -158,11 +176,16 @@
                                 <text class="iconfont icon-close"></text>
                             </view>
                             <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                <view class="item" :class="{ 'empty-desc': !item.desc }"
+                                    v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
+                                    <view class="item-icon" :class="{ 'empty-desc': !item.desc }">
+                                        <text class="iconfont icon-dui color-base-text"
+                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
+                                            :src="$util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'"
+                                            :icon="item.icon.icon"
+                                            :value="item.icon.style ? item.icon.style : null"></diy-icon>
                                     </view>
                                     <view class="info-wrap">
                                         <text class="title">{{ item.service_name }}</text>
@@ -187,17 +210,19 @@
                             </view>
                             <scroll-view scroll-y>
                                 <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
+                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index"
+                                        @click="selectStore(item)">
                                         <view class="item-box">
                                             <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else/>
+                                                <image :src="$util.img(item.store_image)" v-if="item.store_image" />
+                                                <image :src="$util.getDefaultImage().store" v-else />
                                             </view>
                                             <view class="item-info">
                                                 <view class="item-title">
                                                     <text class="title">{{ item.store_name }}</text>
                                                     <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
+                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance *
+                                                        1000 + 'm' }}
                                                     </text>
                                                 </view>
                                                 <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
@@ -228,7 +253,7 @@
                 </view>
 
                 <!-- 促销 -->
-            <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
+                <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
                     <view class="community-model-content" @click.stop>
                         <view class="community-model-content-radius">
                             <view>添加社群</view>
@@ -247,7 +272,8 @@
                 <slot name="articipation"></slot>
 
                 <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
+                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0"
+                    style="display: none;">
                     <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
                         <view class="tit">
                             <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
@@ -268,12 +294,18 @@
                             <view class="evaluator">
                                 <view class="evaluator-info">
                                     <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
+                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)"
+                                            @error="item.member_headimg = $util.getDefaultImage().head"
+                                            mode="aspectFill" />
+                                        <image v-else :src="$util.getDefaultImage().head"
+                                            @error="item.member_headimg = $util.getDefaultImage().head"
+                                            mode="aspectFill" />
                                     </view>
                                     <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
+                                        <text class="evaluator-name using-hidden"
+                                            v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1]
+                                            }}
                                         </text>
                                         <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
                                         <view v-if="item.scores" class="evaluator-xing">
@@ -286,7 +318,8 @@
                             <view class="cont margin-top">{{ item.content }}</view>
                             <scroll-view scroll-x="true">
                                 <view class="evaluate-img" v-if="item.images">
-                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
+                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index"
+                                        @click="previewEvaluate(index, img_index, 'images')">
                                         <image :src="$util.img(img)" mode="aspectFill" />
                                     </view>
                                 </view>
@@ -294,8 +327,9 @@
                         </view>
                     </view>
                 </view>
-				
-                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
+
+                <view class="goods-attr"
+                    v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
                     <view class="title">规格属性</view>
                     <view class="attr-wrap">
                         <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
@@ -304,7 +338,8 @@
                                 <text class="value-name">{{ item.attr_value_name }}</text>
                             </view>
                         </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
+                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4"
+                            @click="switchGoodsAttr">
                             <block v-if="!goodsAttrShow">
                                 展开<text class="iconfont icon-iconangledown"></text>
                             </block>
@@ -315,24 +350,25 @@
                     </view>
                 </view>
 
-				
+
 
                 <!-- 详情 -->
                 <view class="goods-detail-tab">
                     <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
+                        <view class="tab-item">{{ $lang('details') }}</view>
                     </view>
                     <view class="detail-content active">
                         <view class="detail-content-item">
                             <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
+                                <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
+                                <!-- 		 {{goodsSkuDetail.goods_content}} -->
+                                <mp-html :content="goodsSkuDetail.goods_content" />
+                                <!-- :loading="loading" @preview="preview" @navigate="navigate" -->
                             </view>
                             <view class="goods-details active" v-else></view>
                             <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
+                                <rich-text :nodes="service.content" @click="showImg($event)"
+                                    :data-nodes="service.content"></rich-text>
                             </view>
                         </view>
                     </view>
@@ -419,25 +455,30 @@
 </template>
 
 <script>
-    // 商品详情视图
-    import scroll from '@/common/js/scroll-view.js';
-    import detail from './detail.js';
+// 商品详情视图
+import scroll from '@/common/js/scroll-view.js';
+import detail from './detail.js';
 
-    export default {
-        name: 'goods-detail-view',
-        props: {
-            goodsSkuDetail: {
-                type: Object,
-                default: () => {
-                    return {};
-                }
+import pengpaiFadeinOut from '../pengpai-fadein-out/pengpai-fadein-out.vue';
+
+export default {
+    name: 'goods-detail-view',
+    props: {
+        goodsSkuDetail: {
+            type: Object,
+            default: () => {
+                return {};
             }
-        },
-        mixins: [scroll, detail]
-    };
+        }
+    },
+    components: {
+        pengpaiFadeinOut
+    },
+    mixins: [scroll, detail]
+};
 </script>
 
 <style lang="scss">
-    @import '@/common/css/goods_detail.scss';
+@import '@/common/css/goods_detail.scss';
 </style>
 <style scoped></style>

pages_goods/cart.vue

@@ -376,13 +376,13 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
 }
 
-/deep/ .uni-popup__wrapper {
+::v-deep .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
 }
 

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() {
@@ -74,38 +74,38 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .uni-popup__wrapper.uni-center {
+::v-deep .uni-popup__wrapper.uni-center {
 	background: rgba(0, 0, 0, 0.6);
 }
 
-/deep/ .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper-box {
 	border-radius: 0 !important;
 }
 
-/deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 	overflow-y: visible;
 }
 
-/deep/ .loading-layer {
+::v-deep .loading-layer {
 	background: #fff !important;
 }
 
 // 分类四一级展开
-/deep/ .category-template-4 .template-four .uni-popup__wrapper-box {
+::v-deep .category-template-4 .template-four .uni-popup__wrapper-box {
 	border-radius: 0px 0px 14px 14px !important;
 	overflow: hidden;
 }
 
-/deep/ .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
+::v-deep .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
 	margin-top: 30rpx;
 }
 
-/deep/ .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
+::v-deep .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
 	width: 46rpx;
 	height: 46rpx;
 }
 
-/deep/ .uni-page-refresh-inner .uni-page-refresh__path {
+::v-deep .uni-page-refresh-inner .uni-page-refresh__path {
 	stroke: rgb(1, 1, 1) !important;
 }
 </style>

pages_goods/detail.vue

@@ -519,12 +519,19 @@
 </template>
 
 <script>
-import detail from './public/js/detail.js';
 import scroll from '@/common/js/scroll-view.js';
-import goodsDetailBase from '@/common/js/goods_detail_base.js';
+import base from '@/common/js/goods_detail_base.js';
+import detail from './public/js/detail.js';
+
+import goodsDetailView from './_components/goods-detail-view/goods-detail-view.vue';
+import nsGoodsPromotion from './_components/ns-goods-promotion/ns-goods-promotion.vue';
 
 export default {
-	mixins: [goodsDetailBase, detail, scroll]
+	components: {
+		goodsDetailView,
+		nsGoodsPromotion
+	},
+	mixins: [base, detail, scroll]
 };
 </script>
 <style lang="scss">
@@ -540,18 +547,18 @@ export default {
 
 </style>
 <style scoped>
-/deep/ .action-icon-wrap .iconfont.icon-shouye1 {
+::v-deep .action-icon-wrap .iconfont.icon-shouye1 {
 	font-size: 40rpx;
 }
-/deep/ .uni-video-cover {
+::v-deep .uni-video-cover {
 	background: none;
 }
 
-/deep/ .uni-video-cover-duration {
+::v-deep .uni-video-cover-duration {
 	display: none;
 }
 
-/deep/ .uni-video-cover-play-button {
+::v-deep .uni-video-cover-play-button {
 	border-radius: 50%;
 	border: 4rpx solid #fff;
 	width: 120rpx;
@@ -563,7 +570,7 @@ export default {
 	max-height: initial !important;
 }
 
-/deep/ .sku-layer .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper-box {
 	overflow-y: initial !important;
 }
 
@@ -590,46 +597,46 @@ export default {
 	width: initial;
 }
 
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
 
-/deep/ .goods-action-button.active1 {
+::v-deep .goods-action-button.active1 {
 	padding-left: 10px;
 }
 
-/deep/ .goods-action-button.active2 {
+::v-deep .goods-action-button.active2 {
 	padding-right: 10px;
 }
 
-/deep/ .goods-action-button.active3 {
+::v-deep .goods-action-button.active3 {
 	padding: 0 10px;
 }
 
-/deep/ .goods-action-button.active4 {
+::v-deep .goods-action-button.active4 {
 	padding: 0 10px;
 }
-/deep/ .uni-popup__wrapper.bottom {
+::v-deep .uni-popup__wrapper.bottom {
 	border-radius: 24rpx 24rpx 0 0;
 }
 
-/deep/ .goods-action-button.active1 .action-buttom-wrap {
+::v-deep .goods-action-button.active1 .action-buttom-wrap {
 	height: 72rpx;
 	line-height: 72rpx;
 }
 
-/deep/ .goods-action-button.active2 .action-buttom-wrap {
+::v-deep .goods-action-button.active2 .action-buttom-wrap {
 	height: 72rpx;
 	line-height: 72rpx;
 }
 
-/deep/ .goods-action-button.active3 .action-buttom-wrap {
+::v-deep .goods-action-button.active3 .action-buttom-wrap {
 	height: 72rpx;
 	line-height: 72rpx;
 	margin: 20rpx 0;
 }
 
-/deep/ .goods-action-button.active4 .action-buttom-wrap {
+::v-deep .goods-action-button.active4 .action-buttom-wrap {
 	height: 72rpx;
 	line-height: 72rpx;
 }

pages_goods/list.vue

@@ -324,7 +324,7 @@ export default {
 	
 }
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
 </style>

pages_goods/public/css/cart.scss

@@ -177,18 +177,18 @@
 						}
 					}
 
-					/deep/ .decrease {
+					::v-deep .decrease {
 						width: 52rpx;
 						height: 52rpx;
 						line-height: 48rpx;
 						font-size: 40rpx;
 						border-radius: 10rpx 0px 0px 10rpx;
 					}
-					/deep/ input {
+					::v-deep input {
 						height: 52rpx;
 						line-height: 52rpx;
 					}
-					/deep/ .increase {
+					::v-deep .increase {
 						width: 52rpx;
 						height: 52rpx;
 						line-height: 48rpx;

pages_order/_components/common-payment/common-payment.vue

@@ -635,9 +635,6 @@
 
 <script>
 	import payment from './payment.js';
-
-
-
 	export default {
 		name: 'common-payment',
 		data() {

pages_order/detail.vue

@@ -835,7 +835,7 @@ export default {
 	margin-bottom: 30rpx;
 }
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
 </style>