fix(diy-map): 替换cover-view为div解决z-index失效问题

移除ns-login组件中不必要的z-index设置

.local.config.js

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

@@ -77,18 +77,16 @@ export default {
      * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
      */
     // 商户ID
-    uniacid: 1, //825
+    uniacid: uniacid, //825
 
     //api请求地址
-    baseUrl: 'https://dev.aigc-quickapp.com/',
+    baseUrl: domain,
-    // baseUrl: 'http://localhost:8010/',
 
     // 图片域名
-    imgDomain: 'https://dev.aigc-quickapp.com/',
+    imgDomain: domain,
-    //imgDomain: 'http://localhost:8010/',
 
     // H5端域名
-    h5Domain: 'https://dev.aigc-quickapp.com/',
+    h5Domain: domain,
 
     // // api请求地址
     // baseUrl: 'https://tsaas.liveplatform.cn/',

common/js/customer-service.js

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

common/js/golbalConfig.js

@@ -65,10 +65,6 @@ export default {
 		componentRefresh() {
 			return this.$store.state.componentRefresh;
 		},
-		// AI客服配置
-		globalAIKefuConfig() {
-			return this.$store.state.globalAIKefuConfig;
-		},
 		// 客服配置
 		servicerConfig() {
 			return this.$store.state.servicerConfig;

common/js/lang.js

@@ -1,161 +1,205 @@
 import { langConfig } from './config-external.js';
 
+
 // 缓存已加载的语言包
 const loadedLangPacks = {};
 
 // 处理页面目录映射
 function processRoutePath(route) {
-    let routeParts = route.split("/");
+	let routeParts = route.split("/");
 
-    // ---- 处理页面目录映射 <begin> 分包造成的，需要根据实际目录结构进行映射----
+	// ---- 处理页面目录映射 <begin> 分包造成的，需要根据实际目录结构进行映射----
-    if (routeParts[0] === 'pages_tool') {
+	// 先处理特殊的分包路径
-        routeParts = [routeParts[1], ...routeParts.slice(2)];
+	if (routeParts[0] === 'pages_tool') {
-    } else if (routeParts[0] === 'pages_goods') {
+		// pages_tool 分包下的页面，直接使用子目录作为语言包路径
-        routeParts[0] = 'goods';
+		routeParts = [routeParts[1], ...routeParts.slice(2)];
-    } else if (routeParts[0] === 'pages_member') {
+	} else if (routeParts[0] === 'pages_goods') {
-        routeParts[0] = 'member';
+		// pages_goods 分包映射到 goods 目录
-    } else if (routeParts[0] === 'pages_order') {
+		routeParts[0] = 'goods';
-        routeParts[0] = 'order';
+	} else if (routeParts[0] === 'pages_member') {
-    } else if (routeParts[0] === 'pages_promotion') {
+		// pages_member 分包映射到 member 目录
-        const promotionModules = ['point', 'fenxiao', 'merch'];
+		routeParts[0] = 'member';
-        if (routeParts[1] && promotionModules.includes(routeParts[1])) {
+	} else if (routeParts[0] === 'pages_order') {
-            routeParts = [routeParts[1], ...routeParts.slice(2)];
+		// pages_order 分包映射到 order 目录
-        }
+		routeParts[0] = 'order';
-    }
+	} else if (routeParts[0] === 'pages_promotion') {
-    // ---- 处理页面目录映射 <end>----
+		// pages_promotion 分包特殊处理
-    
+		const promotionModules = ['point', 'fenxiao', 'merch'];
-    if (routeParts[0] === 'pages') {
+		if (routeParts[1] && promotionModules.includes(routeParts[1])) {
-        routeParts = routeParts.slice(1);
+			routeParts = [routeParts[1], ...routeParts.slice(2)];
-    } 
+		}
-    
+	}
-    return routeParts.join("/");
+	// ---- 处理页面目录映射 <end>----
+	
+	// 去掉pages目录，只保留子目录
+	if (routeParts[0] === 'pages') {
+		routeParts = routeParts.slice(1);
+	} 
+	
+	return routeParts.join("/");
 }
 
 // 加载语言包（同步方式）
 function loadLangPackSync(lang, path) {
-    try {
+	try {
-        if (loadedLangPacks[`${lang}_${path}`]) {
+		if (loadedLangPacks[`${lang}_${path}`]) {
-            return loadedLangPacks[`${lang}_${path}`];
+			return loadedLangPacks[`${lang}_${path}`];
-        }
+		}
-        const langData = require(`@/lang/${lang}/${path}.js`).lang;
+		const langData = require(`@/lang/${lang}/${path}.js`).lang;
-        loadedLangPacks[`${lang}_${path}`] = langData;
+		loadedLangPacks[`${lang}_${path}`] = langData;
-        return langData;
+		return langData;
-    } catch (error) {
+	} catch (error) {
-        console.error(`加载语言包 ${lang}/${path} 失败:`, error);
+		console.error(`加载语言包 ${lang}/${path} 失败:`, error);
-        return {};
+		return {};
-    }
+	}
 }
 
 export default {
-    langList: langConfig.langList,
+	langList: langConfig.langList,
-    /**
+	/**
-     * 解析多语言
+	 * * 解析多语言
-     */
+	 * @param {Object} field
-    lang(field) {
+	 */
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+	lang(field) {
-        if (!_this) return;
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
 
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
-        let value = '';
+		let value = ''; // 存放解析后的语言值
-        let langPath = '';
+		let langPath = ''; // 存放当前页面语言包路径
 
-        try {
+		try {
-            var lang = loadLangPackSync(locale, 'common');
+			//公共语言包（同步加载）
-            
+			var lang = loadLangPackSync(locale, 'common');
-            let route = _this.route;
+			
-            langPath = processRoutePath(route);
+			//当前页面语言包（同步加载）
-            
+			let route = _this.route;
-            let currentPageLang = loadLangPackSync(locale, langPath);
+			langPath = processRoutePath(route);
+			
+			// 加载当前页面语言包
+			let currentPageLang = loadLangPackSync(locale, langPath);
 
-            let mergedLang = { ...lang, ...currentPageLang };
+			// 合并语言包
+			let mergedLang = { ...lang, ...currentPageLang };
 
-            var arr = field.split(".");
+			// 解析字段
-            if (arr.length > 1) {
+			var arr = field.split(".");
-                let temp = mergedLang;
+			if (arr.length > 1) {
-                let found = true;
+				// 处理嵌套属性，如 common.currencySymbol
-                for (let key of arr) {
+				let temp = mergedLang;
-                    if (temp[key] !== undefined) {
+				let found = true;
-                        temp = temp[key];
+				for (let key of arr) {
-                    } else {
+					if (temp[key] !== undefined) {
-                        found = false;
+						temp = temp[key];
-                        break;
+					} else {
-                    }
+						found = false;
-                }
+						break;
-                value = found ? temp : field;
+					}
-            } else {
+				}
-                value = mergedLang[field] !== undefined ? mergedLang[field] : field;
+				value = found ? temp : field;
-            }
+			} else {
-            
+				value = mergedLang[field] !== undefined ? mergedLang[field] : field;
-        } catch (e) {
+			}
-            console.error('解析语言包失败:', e, { langPath, field, locale });
+			
-            value = field;
+		} catch (e) {
-        }
+			console.error('解析语言包失败:', e, { langPath, field, locale });
+			value = field;
+		}
 
-        if (arguments.length > 1) {
+		if (arguments.length > 1) {
-            for (var i = 1; i < arguments.length; i++) {
+			//有参数,需要替换
-                value = value.replace("{" + (i - 1) + "}", arguments[i]);
+			for (var i = 1; i < arguments.length; i++) {
-            }
+				value = value.replace("{" + (i - 1) + "}", arguments[i]);
-        }
+			}
-        if (value == undefined || (value == 'title' && field == 'title')) value = '';
+		}
+		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
-        if (field == value) {
+		// 多语言调试，注释后可以关闭控制台输出
-            console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
+		if (field == value) {
-        }
+			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
+		}
 
-        return value;
+		return value;
-    },
+	},
-    /**
+	/**
-     * 切换语言
+	 * * 切换语言
-     */
+	 * @param {String} value 语言值
-    change(value, url = '/pages_tool/member/index') {
+	 * @param {String} url 切换后跳转的页面url
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+	 */
-        if (!_this) return;
+	change(value, url = '/pages_tool/member/index') {
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
+		if (!_this) return;
 
-        uni.setStorageSync("lang", value);
+		uni.setStorageSync("lang", value);
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
-        // ✅ 关键修复：清空所有语言包缓存（不再保留任何旧缓存）
+		// 清空已加载的语言包缓存
-        for (let key in loadedLangPacks) {
+		for (let key in loadedLangPacks) {
-            delete loadedLangPacks[key];
+			if (!key.startsWith(locale)) {
-        }
+				delete loadedLangPacks[key];
+			}
+		}
 
-        this.refresh();
+		this.refresh();
 
-        if (url) {
+		if (url) {
-            uni.reLaunch({ url: url });
+			uni.reLaunch({ url: url });
-        }
+		}
-    },
+	},
-    //刷新标题、tabbar
+	//刷新标题、tabbar
-    refresh() {
+	refresh() {
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
-        if (!_this) return;
+		if (!_this) return;
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
-    
+	
-        this.title(this.lang("title"));
+		this.title(this.lang("title"));
-    },
+
-    title(str) {
+		//设置tabbar的文字语言
-        if (str) {
+		// uni.setTabBarItem({
-            uni.setNavigationBarTitle({
+		// 	index: 0,
-                title: str
+		// 	text: this.lang("tabBar.home")
-            });
+		// });
-        }
+		// uni.setTabBarItem({
-    },
+		// 	index: 1,
-    // 获取语言包列表
+		// 	text: this.lang("tabBar.category")
-    list() {
+		// });
-        var list = [];
+		// uni.setTabBarItem({
-        try {
+		// 	index: 2,
-            for (var i = 0; i < langConfig.langList.length; i++) {
+		// 	text: this.lang("tabBar.cart")
-                let langType = langConfig.langList[i];
+		// });
-                let item = loadLangPackSync(langType, 'common');
+		// uni.setTabBarItem({
-                list.push({
+		// 	index: 3,
-                    name: item.common ? item.common.name : langType,
+		// 	text: this.lang("tabBar.member")
-                    value: langType
+		// });
-                });
+	},
-            }
+	title(str) {
-        } catch (e) {
+		if (str) {
-            console.error('获取语言包列表失败:', e);
+			uni.setNavigationBarTitle({
-        }
+				title: str,
-        return list;
+				success: function (res) {
-    }
+				},
-}
+				fail: function (err) {
+				}
+			});
+		}
+	},
+	// 获取语言包列表
+	list() {
+		var list = [];
+		try {
+			//公共语言包
+			for (var i = 0; i < langConfig.langList.length; i++) {
+				let langType = langConfig.langList[i];
+				let item = loadLangPackSync(langType, 'common');
+				list.push({
+					name: item.common ? item.common.name : langType,
+					value: langType
+				});
+			}
+		} catch (e) {
+			console.error('获取语言包列表失败:', e);
+		}
+		return list;
+	}
+}

common/js/share.js

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

common/js/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 = [
@@ -94,7 +95,7 @@ export const checkTabBarActive = (linkUrl, currentPageRoute) => {
 	const currentPageRouteParts = currentPageRoute.split('/');
 
 	// console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts});
-		
+
 	try {
 		// 二级页面
 		if (linkUrlParts[2] === currentPageRouteParts[2]) {
@@ -119,6 +120,7 @@ export default {
 	CONTACT_PAGE_URL,
 	INDEX_PAGE_URL,
 	LOGIN_PAGE_URL,
+	AI_CHAT_PAGE_URL,
 
 	/**
 	 * 页面跳转
@@ -655,7 +657,6 @@ export default {
 
 		} else if (link.appid) {
 			// 跳转其他小程序
-
 			uni.navigateToMiniProgram({
 				appId: link.appid,
 				path: link.page
@@ -663,7 +664,6 @@ export default {
 
 		} else if (link.name == 'MOBILE' && !link.wap_url) {
 			// 拨打电话
-
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
 				success: (res) => {
@@ -843,6 +843,15 @@ export default {
 			uni.navigateBack();
 		}
 	},
+	/**
+	 * 隐藏“返回首页/小房子”按钮
+	 * 这个函数，用到页面show, onshow 的生命周期时
+	 */
+	hideHomeButton() {
+		// #ifdef MP-WEIXIN
+		wx.hideHomeButton();
+		// #endif
+	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）
@@ -1202,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) {
@@ -1210,7 +1219,7 @@ export default {
 				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
 				_isQuickApp = ua.indexOf('uniacid=') !== -1;
 			}
-		} catch (e) {}
+		} catch (e) { }
 
 		if (!_isQuickApp) {
 			const systemInfo = this.getDeviceInfo();
@@ -1230,9 +1239,36 @@ export default {
 
 		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
 		const systemInfo = this.getDeviceInfo();
-		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' || 
+		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' ||
-		       (typeof qh !== 'undefined' && qh.platform === 'huawei');
+			(typeof qh !== 'undefined' && qh.platform === 'huawei');
 		// #endif
 		return true;
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名
+	 * @param {string} str 蛇形命名字符串
+	 * @returns {string} 驼峰命名字符串
+	 */
+	snakeToCamel(str) {
+		return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名（递归处理对象中的所有属性名）
+	 * @param {Object} obj 包含蛇形命名字符串属性的对象
+	 * @returns {Object} 驼峰命名字符串属性的对象
+	 */
+	snakeToCamelForObj(obj) {
+		if (typeof obj !== 'object' || obj === null) return obj;
+		if (Array.isArray(obj)) return obj.map(this.snakeToCamelForObj.bind(this));
+		const newObj = {};
+		for (const key in obj) {
+			if (Object.hasOwnProperty.call(obj, key)) {
+				const newKey = this.snakeToCamel(key);
+				newObj[newKey] = this.snakeToCamelForObj(obj[key]);
+			}
+		}
+		return newObj;
 	}
 }

components-diy/css/common-channel.scss

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

components-diy/diy-article.vue

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

components-diy/diy-bargain.vue

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

components-diy/diy-category-item.vue

@@ -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

@@ -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

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

components-diy/diy-channel-video.vue

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

components-diy/diy-coupon.vue

@@ -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-group.vue

@@ -251,14 +251,9 @@
 				<diy-icon :value="item"></diy-icon>
 			</template>
 
-			<template v-if="item.componentName == 'WechatChannel'">
+			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
-				<!-- 微信视频号 -->
+				<!-- 视频号列表 -->
-				<diy-wechat-channel :value="item"></diy-wechat-channel>
+				<diy-channel-list :value="item"></diy-channel-list>
-			</template>
-
-			<template v-if="item.componentName == 'WechatChannelList'">
-				<!-- 微信视频号列表 -->
-				<diy-wechat-channel-list :value="item"></diy-wechat-channel-list>
 			</template>
 
 			<!-- 自定义扩展组件 -->

components-diy/diy-groupbuy.vue

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

components-diy/diy-img-ads.vue

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

components-diy/diy-index-page.vue

@@ -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>

components-diy/diy-map.vue

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

components-diy/diy-member-info.vue

@@ -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 ::v-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 .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
 }

components-diy/diy-pinfan.vue

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

components-diy/diy-pintuan.vue

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

components-diy/diy-presale.vue

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

components-diy/diy-search.vue

@@ -257,7 +257,7 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .uni-input-placeholder {
+::v-deep .uni-input-placeholder {
 	overflow: initial;
 }
 

components-diy/diy-seckill.vue

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

components-diy/diy-store-label.vue

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

components-diy/diy-wechat-channel-list.vue

@@ -1,458 +0,0 @@
-<template>
-	<view :style="componentStyle">
-		<!-- 固定布局模式 -->
-		<view v-if="value.showStyle == 'fixed'" :class="['channel-list', 'row1-of' + value.rowCount]"
-			style="padding:20rpx;">
-			<view v-for="(item, index) in value.list" :key="index" class="channel-item" @tap="playVideo(item)">
-				<view class="channel-img-wrap">
-					<image class="channel-img" style="border-radius:10rpx;" :src="$util.img(item.coverUrl)"
-						mode="aspectFill" @error="imgError(index)"></image>
-					<view class="channel-play-btn">
-						<image class="play-icon" style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')"
-							mode="widthFix"></image>
-					</view>
-					<view class="channel-stats">
-						<text>{{ item.viewCount }}次观看</text>
-					</view>
-				</view>
-				<view class="channel-info-wrap">
-					<view class="channel-name" :style="{
-						'font-size': (value.font.size * 2 + 'rpx') + ';',
-						'font-weight': value.font.weight + ';',
-						'color': value.font.color + ';'
-					}">{{ item.channelName }}</view>
-					<view class="video-title" :style="{
-						'font-size': (value.font.size * 1.8 + 'rpx') + ';',
-						'color': '#666;'
-					}">{{ item.videoTitle }}</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 其他布局模式 -->
-		<scroll-view v-else :class="['channel-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
-			:scroll-x="value.showStyle == 'singleSlide'">
-			<view class="uni-scroll-view-content">
-				<view v-for="(item, index) in value.list" :key="index" :class="['channel-nav-item', value.mode]"
-					:style="{ width: (100 / value.rowCount + '%') + ';' }" @tap="playVideo(item)">
-					<view class="channel-img">
-						<image :style="{
-							'max-width': '100%;',
-							'border-radius': '8rpx;'
-						}" :src="$util.img(item.coverUrl)" mode="aspectFill"
-							:show-menu-by-longpress="true"></image>
-						<view class="channel-play-btn">
-							<image class="play-icon" style="width:30rpx;" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')"
-								mode="widthFix"></image>
-						</view>
-						<view class="channel-stats">
-							<text>{{ item.viewCount }}次观看</text>
-						</view>
-					</view>
-					<view class="channel-text" :style="{
-						'margin-left': '16rpx;',
-						'font-size': (value.font.size * 2 + 'rpx') + ';',
-						'font-weight': value.font.weight + ';',
-						'color': value.font.color + ';'
-					}">{{ item.videoTitle }}</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-
-import DiyMinx from './minx.js'
-export default {
-	name: 'diy-wechat-channel-list',
-	props: {
-		value: {
-			type: Object,
-			default: () => ({})
-		}
-	},
-	mixins: [DiyMinx],
-	data() {
-		return {
-			pageWidth: '',
-			indicatorDots: false,
-			swiperCurrent: 0
-		}
-	},
-	created() {
-		// 组件创建时的逻辑
-	},
-	watch: {
-		componentRefresh(newValue) {
-			// 监听组件刷新
-		}
-	},
-	computed: {
-		componentStyle() {
-			let style = '';
-			style += 'background-color:' + this.value.componentBgColor + ';';
-
-			if (this.value.componentAngle == 'round') {
-				style += 'border-top-left-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
-				style += 'border-top-right-radius:' + (2 * this.value.topAroundRadius) + 'rpx;';
-				style += 'border-bottom-left-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
-				style += 'border-bottom-right-radius:' + (2 * this.value.bottomAroundRadius) + 'rpx;';
-			}
-
-			style += 'box-shadow:' + (this.value.ornament.type == 'shadow' ? '0 0 10rpx ' + this.value.ornament.color : '') + ';';
-			style += 'border:' + (this.value.ornament.type == 'stroke' ? '2rpx solid ' + this.value.ornament.color : '') + ';';
-
-			return style;
-		},
-
-		swiperHeight() {
-			let height = 0;
-
-			if (this.value.mode == 'graphic') {
-				height = (49 + this.value.imageSize) * this.value.pageCount;
-			} else if (this.value.mode == 'img') {
-				height = (22 + this.value.imageSize) * this.value.pageCount;
-			} else if (this.value.mode == 'text') {
-				height = 43 * this.value.pageCount;
-			}
-
-			return 'height:' + (2 * height) + 'rpx';
-		},
-
-		isIndicatorDots() {
-			return this.value.carousel.type != 'hide' &&
-				1 != Math.ceil(this.value.list.length / (this.value.pageCount * this.value.rowCount));
-		}
-	},
-	methods: {
-		// 播放视频
-		async playVideo(item) {
-			await this.__$emitEvent({
-				eventName: 'video-play', data: item, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-					// 检查微信环境
-					if (typeof wx === 'undefined') {
-						console.error('当前环境不是微信小程序');
-						return;
-					}
-					// 检查基础库版本
-					const systemInfo = wx.getSystemInfoSync();
-					const SDKVersion = systemInfo.SDKVersion;
-					const versionCompare = (v1, v2) => {
-						const arr1 = v1.split('.');
-						const arr2 = v2.split('.');
-						for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
-							const num1 = parseInt(arr1[i] || 0);
-							const num2 = parseInt(arr2[i] || 0);
-							if (num1 > num2) return 1;
-							if (num1 < num2) return -1;
-						}
-						return 0;
-					};
-					if (versionCompare(SDKVersion, '2.19.2') < 0) {
-						console.error('当前微信基础库版本过低，需要 2.19.2 或以上版本');
-						return;
-					}
-					// 调用微信视频号播放API
-					if (wx.openChannelsActivity) {
-						wx.openChannelsActivity({
-							feedId: item.feedId,
-							finderUserName: item.finderUserName,
-							success: (res) => {
-								console.log('打开视频号成功', res);
-							},
-							fail: (err) => {
-								console.error('打开视频号失败', err);
-								// 错误码处理
-								switch (err.errCode) {
-									case 40001:
-										console.error('错误：40001，检查主体要求或嵌入式打开的关联关系');
-										break;
-									case 40002:
-										console.error('错误：40002，参数错误，检查 feedId 和 finderUserName');
-										break;
-									default:
-										console.error('错误：' + err.errCode + '，' + (err.errMsg || '未知错误'));
-										break;
-								}
-							}
-						});
-					} else {
-						console.error('当前环境不支持微信视频号');
-					}
-				}
-			})
-		},
-
-		// 图片加载错误处理
-		imgError(index) {
-			// 图片加载失败的处理逻辑
-			console.log('图片加载失败:', index);
-			// 为失败的图片设置默认图片
-			const item = this.value.list[index];
-			if (item) {
-				// 使用默认图片替代加载失败的图片
-				item.coverUrl = 'addon/personnel/shop/view/enterprise/default-video-cover.png';
-			}
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.channel-list {
-	&.row1-of3 {
-		display: flex;
-		flex-wrap: wrap;
-
-		.channel-item {
-			position: relative;
-			display: flex;
-			flex-direction: column;
-			margin-top: 20rpx;
-			width: calc(33.3333333% - 14rpx);
-			box-sizing: border-box;
-
-			&:nth-child(3n + 3) {
-				width: calc(33.33% - 15rpx);
-			}
-
-			&:nth-of-type(1),
-			&:nth-of-type(2),
-			&:nth-of-type(3) {
-				margin-top: 0;
-			}
-
-			&:nth-child(3n) {
-				width: calc(33.3333333% - 15rpx);
-			}
-
-			&:nth-child(3n-1) {
-				margin-left: 20rpx;
-				margin-right: 20rpx;
-			}
-
-			.channel-img-wrap {
-				position: relative;
-				overflow: hidden;
-				height: 220rpx;
-				border-radius: 10rpx;
-			}
-
-			.channel-img {
-				width: 100%;
-				height: 100%;
-			}
-
-			.channel-play-btn {
-				position: absolute;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				width: 60rpx;
-				height: 60rpx;
-				background-color: rgba(0, 0, 0, 0.4);
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.channel-stats {
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				background: linear-gradient(transparent, rgba(0, 0, 0, 0.6));
-				padding: 10rpx;
-				color: #fff;
-				font-size: 20rpx;
-			}
-
-			.channel-info-wrap {
-				display: flex;
-				flex-direction: column;
-				flex: 1;
-				padding: 10rpx 0;
-
-				.channel-name {
-					margin-bottom: 4rpx;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-				}
-
-				.video-title {
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-				}
-			}
-		}
-	}
-
-	&.row1-of2 {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-
-		.channel-item {
-			position: relative;
-			margin-top: 20rpx;
-			width: calc(50% - 10rpx);
-			display: flex;
-			flex-direction: column;
-			box-sizing: border-box;
-
-			&:nth-child(2n) {
-				margin-right: 0 !important;
-			}
-
-			&:nth-of-type(1),
-			&:nth-of-type(2) {
-				margin-top: 0;
-			}
-
-			.channel-img-wrap {
-				position: relative;
-				overflow: hidden;
-				height: 340rpx;
-				border-radius: 10rpx;
-			}
-
-			.channel-img {
-				width: 100%;
-				height: 100%;
-			}
-
-			.channel-play-btn {
-				position: absolute;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				width: 80rpx;
-				height: 80rpx;
-				background-color: rgba(0, 0, 0, 0.4);
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.channel-stats {
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				background: linear-gradient(transparent, rgba(0, 0, 0, 0.6));
-				padding: 10rpx;
-				color: #fff;
-				font-size: 20rpx;
-			}
-
-			.channel-info-wrap {
-				display: flex;
-				flex-direction: column;
-				flex: 1;
-				padding: 10rpx 0;
-
-				.channel-name {
-					margin-bottom: 4rpx;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-				}
-
-				.video-title {
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					overflow: hidden;
-				}
-			}
-		}
-	}
-}
-
-.channel-nav {
-	padding: 16rpx;
-	box-sizing: border-box;
-
-	&.fixed-layout {
-		.uni-scroll-view-content {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-		}
-	}
-
-	&.singleSlide {
-		.uni-scroll-view-content {
-			display: flex;
-		}
-
-		.channel-nav-item {
-			flex-shrink: 0;
-		}
-	}
-
-	.channel-nav-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 14rpx 0;
-		box-sizing: border-box;
-
-		.channel-img {
-			position: relative;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			height: 200rpx;
-			border-radius: 10rpx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-
-			.channel-play-btn {
-				position: absolute;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				width: 60rpx;
-				height: 60rpx;
-				background-color: rgba(0, 0, 0, 0.4);
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.channel-stats {
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				right: 0;
-				background: linear-gradient(transparent, rgba(0, 0, 0, 0.6));
-				padding: 10rpx;
-				color: #fff;
-				font-size: 20rpx;
-			}
-		}
-
-		.channel-text {
-			padding-top: 12rpx;
-			line-height: 1.5;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			width: 100%;
-			text-align: center;
-		}
-	}
-}
-</style>

components-diy/diy-wechat-channel.vue

@@ -1,232 +0,0 @@
-<template>
-    <!-- #ifdef MP-WEIXIN -->
-	<view class="diy-wechat-channel" :style="channelWarpCss">
-		<view class="channel-header" @tap="handlerClick">
-			<image class="channel-avatar" :src="$util.img(value.avatarUrl)" mode="aspectFill"></image>
-			<view class="channel-info">
-				<view class="channel-name">{{ value.channelName }}</view>
-				<view class="channel-follow" v-if="value.showFollow">关注</view>
-			</view>
-			<image class="channel-arrow" :src="$util.img('addon/personnel/shop/view/enterprise/arrow.png')" mode="aspectFill"></image>
-		</view>
-		<!-- 嵌入式视频播放 -->	 
-		<native-component v-if="value.embedMode && typeof wx !== 'undefined' && wx.canIUse('component.channel-video')">
-			<channel-video 
-				:feed-id="value.feedId" 
-				:finder-user-name="value.finderUserName" 
-				:feed-token="value.feedToken" 
-				style="width: 100%; height: 320rpx;">
-			</channel-video>
-		</native-component>	
-		<!-- 跳转式视频播放 -->
-		<view v-else class="channel-video" @tap="playVideo">
-			<image class="video-cover" :src="$util.img(value.coverUrl)" mode="aspectFill"></image>
-			<view class="video-play-btn">
-				<image class="play-icon" :src="$util.img('addon/personnel/shop/view/enterprise/play.png')" mode="aspectFill"></image>
-			</view>
-			<view class="video-info">
-				<view class="video-title">{{ value.videoTitle }}</view>
-				<view class="video-stats">
-					<text>{{ value.viewCount }}次观看</text>
-				</view>
-			</view>
-		</view>
-	</view>
-    <!-- #endif -->    
-</template>
-
-
-<script>
-// 微信视频号组件
-import DiyMinx from './minx.js'
-export default {
-	name: 'diy-wechat-channel',
-	props: {
-		value: {
-			type: Object
-		}
-	},
-	data() {
-		return {};
-	},
-	created() { },
-	mixins: [DiyMinx],
-	watch: {
-		// 组件刷新监听
-		componentRefresh: function (nval) { }
-	},
-	computed: {
-		channelWarpCss: function () {
-			var obj = '';
-			if (this.value.componentAngle == 'round') {
-				obj += 'border-top-left-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
-				obj += 'border-top-right-radius:' + this.value.topAroundRadius * 2 + 'rpx;';
-				obj += 'border-bottom-left-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
-				obj += 'border-bottom-right-radius:' + this.value.bottomAroundRadius * 2 + 'rpx;';
-			}
-			return obj;
-		}
-	},
-	methods: {
-		async handlerClick() {
-			await this.__$emitEvent({
-				eventName: 'channel-tap', data: this.value, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-				}
-			})
-		},
-		async playVideo() {
-			await this.__$emitEvent({
-				eventName: 'video-play', data: this.value, promiseCallback: (event, handler, awaitedResult) => {
-					if (!awaitedResult) return;
-					// 检查微信环境
-					if (typeof wx === 'undefined') {
-						console.error('当前环境不是微信小程序');
-						return;
-					}
-					// 检查基础库版本
-					const systemInfo = wx.getSystemInfoSync();
-					const SDKVersion = systemInfo.SDKVersion;
-					const versionCompare = (v1, v2) => {
-						const arr1 = v1.split('.');
-						const arr2 = v2.split('.');
-						for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
-							const num1 = parseInt(arr1[i] || 0);
-							const num2 = parseInt(arr2[i] || 0);
-							if (num1 > num2) return 1;
-							if (num1 < num2) return -1;
-						}
-						return 0;
-					};
-					if (versionCompare(SDKVersion, '2.19.2') < 0) {
-						console.error('当前微信基础库版本过低，需要 2.19.2 或以上版本');
-						return;
-					}
-					// 调用微信视频号播放API
-					if (wx.openChannelsActivity) {
-						wx.openChannelsActivity({
-							feedId: this.value.feedId,
-							finderUserName: this.value.finderUserName,
-							success: (res) => {
-								console.log('打开视频号成功', res);
-							},
-							fail: (err) => {
-								console.error('打开视频号失败', err);
-								// 错误码处理
-								switch (err.errCode) {
-									case 40001:
-										console.error('错误：40001，检查主体要求或嵌入式打开的关联关系');
-										break;
-									case 40002:
-										console.error('错误：40002，参数错误，检查 feedId 和 finderUserName');
-										break;
-									default:
-										console.error('错误：' + err.errCode + '，' + (err.errMsg || '未知错误'));
-										break;
-								}
-							}
-						});
-					} else {
-						console.error('当前环境不支持微信视频号');
-					}
-				}
-			})
-		}
-	}
-};
-</script>
-
-<style scoped>
-.diy-wechat-channel {
-	width: 100%;
-	background-color: #fff;
-	border-radius: 12rpx;
-	overflow: hidden;
-	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-}
-
-.channel-header {
-	display: flex;
-	align-items: center;
-	padding: 16rpx;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-
-.channel-avatar {
-	width: 60rpx;
-	height: 60rpx;
-	border-radius: 50%;
-	margin-right: 12rpx;
-}
-
-.channel-info {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-}
-
-.channel-name {
-	font-size: 28rpx;
-	font-weight: 500;
-	color: #333;
-	margin-bottom: 4rpx;
-}
-
-.channel-follow {
-	font-size: 24rpx;
-	color: #07c160;
-}
-
-.channel-arrow {
-	width: 24rpx;
-	height: 24rpx;
-	margin-left: 8rpx;
-}
-
-.channel-video {
-	position: relative;
-}
-
-.video-cover {
-	width: 100%;
-	height: 320rpx;
-	object-fit: cover;
-}
-
-.video-play-btn {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	width: 80rpx;
-	height: 80rpx;
-	background-color: rgba(0, 0, 0, 0.4);
-	border-radius: 50%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.play-icon {
-	width: 40rpx;
-	height: 40rpx;
-}
-
-.video-info {
-	padding: 16rpx;
-}
-
-.video-title {
-	font-size: 28rpx;
-	font-weight: 500;
-	color: #333;
-	margin-bottom: 8rpx;
-	line-height: 1.4;
-}
-
-.video-stats {
-	font-size: 24rpx;
-	color: #999;
-}
-</style>

components-diy/js/wechat-channel.js

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

components/ai-chat-message/README.md

@@ -1,271 +0,0 @@
-# AI智能客服组件
-
-一个功能完整的AI智能客服对话组件，支持多种消息类型和交互功能。
-
-## 功能特性
-
-- ✅ 支持对话上下文管理
-- ✅ 支持多种消息类型：文本、Markdown、文件、音频、视频、链接、商品卡片
-- ✅ 支持语音输入和录音
-- ✅ 支持图片、文件、位置等附件发送
-- ✅ 支持消息操作按钮（点赞、踩等）
-- ✅ 支持历史消息加载
-- ✅ 响应式设计，适配多端
-
-## 安装使用
-
-### 1. 引入组件
-
-在 `pages.json` 中注册组件：
-
-```json
-{
-  "usingComponents": {
-    "ai-chat-message": "/components/ai-chat-message/ai-chat-message"
-  }
-}
-```
-
-### 2. 在页面中使用
-
-```vue
-<template>
-  <view class="container">
-    <ai-chat-message 
-      ref="chat"
-      :initial-messages="messages"
-      @message-sent="onMessageSent"
-      @ai-response="onAIResponse"
-      @action-click="onActionClick" />
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      messages: [
-        {
-          id: 1,
-          role: 'ai',
-          type: 'text',
-          content: '您好！我是AI智能客服，有什么可以帮助您的吗？',
-          timestamp: Date.now()
-        }
-      ]
-    }
-  },
-  methods: {
-    onMessageSent(message) {
-      console.log('用户发送消息:', message)
-    },
-    onAIResponse(message) {
-      console.log('AI回复消息:', message)
-    },
-    onActionClick({ action, message }) {
-      console.log('操作点击:', action, message)
-    }
-  }
-}
-</script>
-```
-
-## Props 配置
-
-| 参数 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| initialMessages | Array | [] | 初始消息列表 |
-| userAvatar | String | '/static/images/default-avatar.png' | 用户头像 |
-| aiAvatar | String | '/static/images/ai-avatar.png' | AI头像 |
-| showLoadMore | Boolean | true | 是否显示加载更多 |
-| maxMessages | Number | 100 | 最大消息数量 |
-
-## Events 事件
-
-| 事件名 | 参数 | 说明 |
-|--------|------|------|
-| message-sent | message | 用户发送消息 |
-| ai-response | message | AI回复消息 |
-| action-click | {action, message} | 操作按钮点击 |
-| history-loaded | messages | 历史消息加载完成 |
-| file-preview | message | 文件预览 |
-| audio-play | message | 音频播放 |
-| audio-pause | message | 音频暂停 |
-| video-play | message | 视频播放 |
-| video-pause | message | 视频暂停 |
-| link-open | message | 链接打开 |
-| product-view | message | 商品查看 |
-| input-change | value | 输入内容变化 |
-
-## 消息类型格式
-
-### 文本消息
-```javascript
-{
-  id: 1,
-  role: 'user', // 或 'ai'
-  type: 'text',
-  content: '消息内容',
-  timestamp: Date.now()
-}
-```
-
-### Markdown消息
-```javascript
-{
-  id: 2,
-  role: 'ai',
-  type: 'markdown',
-  content: '# 标题\n**粗体** *斜体* `代码`',
-  timestamp: Date.now()
-}
-```
-
-### 文件消息
-```javascript
-{
-  id: 3,
-  role: 'ai',
-  type: 'file',
-  fileName: '文档.pdf',
-  fileSize: 1024000,
-  url: '文件地址',
-  timestamp: Date.now()
-}
-```
-
-### 音频消息
-```javascript
-{
-  id: 4,
-  role: 'ai',
-  type: 'audio',
-  title: '语音消息',
-  duration: 60, // 秒
-  url: '音频地址',
-  timestamp: Date.now()
-}
-```
-
-### 视频消息
-```javascript
-{
-  id: 5,
-  role: 'ai',
-  type: 'video',
-  title: '产品介绍',
-  duration: 120, // 秒
-  url: '视频地址',
-  cover: '封面图',
-  timestamp: Date.now()
-}
-```
-
-### 链接消息
-```javascript
-{
-  id: 6,
-  role: 'ai',
-  type: 'link',
-  title: '帮助文档',
-  description: '详细的使用说明',
-  url: 'https://example.com',
-  image: '缩略图',
-  timestamp: Date.now()
-}
-```
-
-### 商品卡片
-```javascript
-{
-  id: 7,
-  role: 'ai',
-  type: 'product',
-  title: '商品名称',
-  price: 299,
-  description: '商品描述',
-  image: '商品图片',
-  timestamp: Date.now()
-}
-```
-
-## 方法
-
-通过 ref 调用组件方法：
-
-```javascript
-// 添加消息
-this.$refs.chat.addMessage(message)
-
-// 清空消息
-this.$refs.chat.clearMessages()
-
-// 滚动到底部
-this.$refs.chat.scrollToBottom()
-```
-
-## 样式定制
-
-组件使用 SCSS 编写，可以通过 CSS 变量进行主题定制：
-
-```css
-.ai-chat-container {
-  --primary-color: #ff4544;
-  --bg-color: #f8f8f8;
-  --text-color: #333;
-}
-```
-
-## 方法
-
-通过 ref 调用组件方法：
-
-```javascript
-// 添加消息
-this.$refs.chat.addMessage(message)
-
-// 清空消息
-this.$refs.chat.clearMessages()
-
-// 滚动到底部
-this.$refs.chat.scrollToBottom()
-
-// 开始语音输入
-this.$refs.chat.startVoiceInput()
-
-// 停止语音输入
-this.$refs.chat.stopVoiceInput()
-```
-
-## 样式定制
-
-组件使用 SCSS 编写，可以通过 CSS 变量进行主题定制：
-
-```css
-.ai-chat-container {
-  --primary-color: #ff4544;
-  --bg-color: #f8f8f8;
-  --text-color: #333;
-  --border-color: #eeeeee;
-  --user-bg: #e6f7ff;
-  --ai-bg: #f6f6f6;
-}
-```
-
-## 图标字体
-
-组件使用自定义图标字体，需要在页面中引入：
-
-```html
-<style>
-@import url('/components/ai-chat-message/iconfont.css');
-</style>
-```
-
-## 注意事项
-
-1. 组件已适配项目中已有的 `ns-loading` 组件
-2. 需要配置对应的图标字体文件
-3. 音频播放功能在 H5 和 APP 端支持较好
-4. 文件预览功能依赖平台能力
-5. 语音输入功能需要用户授权麦克风权限

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

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

components/ai-chat-message/demo.vue

@@ -1,288 +0,0 @@
-<template>
-  <view class="demo-container">
-    <view class="demo-header">
-      <text class="demo-title">AI智能客服组件演示</text>
-    </view>
-    
-    <ai-chat-message 
-      ref="chat"
-      :initial-messages="demoMessages"
-      user-avatar="/static/images/demo-user.png"
-      ai-avatar="/static/images/demo-ai.png"
-      @message-sent="onMessageSent"
-      @ai-response="onAIResponse"
-      @action-click="onActionClick"
-      @file-preview="onFilePreview"
-      @audio-play="onAudioPlay"
-      @video-play="onVideoPlay"
-      @link-open="onLinkOpen"
-      @product-view="onProductView" />
-      
-    <view class="demo-controls">
-      <button class="control-btn" @click="addTextMessage">添加文本消息</button>
-      <button class="control-btn" @click="addMarkdownMessage">添加Markdown</button>
-      <button class="control-btn" @click="addFileMessage">添加文件</button>
-      <button class="control-btn" @click="addAudioMessage">添加音频</button>
-      <button class="control-btn" @click="addVideoMessage">添加视频</button>
-      <button class="control-btn" @click="addLinkMessage">添加链接</button>
-      <button class="control-btn" @click="addProductMessage">添加商品</button>
-      <button class="control-btn" @click="clearMessages">清空消息</button>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      demoMessages: [
-        {
-          id: 1,
-          role: 'ai',
-          type: 'text',
-          content: '您好！我是AI智能客服演示程序，我可以展示多种消息类型。请点击下方的按钮体验不同功能！',
-          timestamp: Date.now() - 300000,
-          actions: [
-            { id: 1, text: '开始体验', type: 'like' }
-          ]
-        }
-      ]
-    }
-  },
-  
-  methods: {
-    // 添加文本消息
-    addTextMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'text',
-        content: '这是一个文本消息示例，支持**粗体**、*斜体*和`代码`格式。也可以包含换行符\n这是第二行内容。',
-        timestamp: Date.now(),
-        actions: [
-          { id: 1, text: '有帮助', type: 'like' },
-          { id: 2, text: '没帮助', type: 'dislike' }
-        ]
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加Markdown消息
-    addMarkdownMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'markdown',
-        content: `# Markdown文档示例
-
-## 二级标题
-
-这是一个支持**粗体**、*斜体*和\`代码\`的Markdown消息。
-
-### 功能特性
-- ✅ 支持标题层级
-- ✅ 支持列表展示
-- ✅ 支持代码高亮
-- ✅ 支持链接跳转
-
-[查看详细文档](https://example.com)\n\n**注意：** 这是一个演示内容，实际使用时可以集成真实的文档系统。`,
-        timestamp: Date.now(),
-        actions: [
-          { id: 1, text: '查看文档', type: 'like' }
-        ]
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加文件消息
-    addFileMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'file',
-        fileName: '产品介绍文档.pdf',
-        fileSize: 2048000,
-        url: 'https://example.com/document.pdf',
-        timestamp: Date.now()
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加音频消息
-    addAudioMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'audio',
-        title: '产品功能介绍',
-        duration: 89,
-        url: 'https://example.com/audio.mp3',
-        timestamp: Date.now(),
-        playing: false,
-        currentTime: 0
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加视频消息
-    addVideoMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'video',
-        title: '产品演示视频',
-        duration: 180,
-        url: 'https://example.com/video.mp4',
-        cover: '/static/images/video-cover.jpg',
-        timestamp: Date.now()
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加链接消息
-    addLinkMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'link',
-        title: '帮助中心',
-        description: '详细的产品使用说明和常见问题解答',
-        url: 'https://example.com/help',
-        image: '/static/images/link-thumbnail.jpg',
-        timestamp: Date.now()
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 添加商品消息
-    addProductMessage() {
-      const message = {
-        id: Date.now(),
-        role: 'ai',
-        type: 'product',
-        title: '智能手表 X1',
-        price: 1299,
-        description: '全新一代智能手表，支持心率监测、运动追踪、消息提醒等功能',
-        image: '/static/images/product-demo.jpg',
-        timestamp: Date.now(),
-        actions: [
-          { id: 1, text: '立即购买', type: 'like' },
-          { id: 2, text: '查看详情', type: 'dislike' }
-        ]
-      }
-      this.$refs.chat.messages.push(message)
-    },
-    
-    // 清空消息
-    clearMessages() {
-      this.$refs.chat.messages = [
-        {
-          id: 1,
-          role: 'ai',
-          type: 'text',
-          content: '消息已清空，可以重新开始体验！',
-          timestamp: Date.now()
-        }
-      ]
-    },
-    
-    // 事件处理
-    onMessageSent(message) {
-      console.log('用户发送消息:', message)
-      uni.showToast({
-        title: '消息发送成功',
-        icon: 'success'
-      })
-    },
-    
-    onAIResponse(message) {
-      console.log('AI回复消息:', message)
-    },
-    
-    onActionClick({ action, message }) {
-      console.log('操作点击:', action, message)
-      uni.showToast({
-        title: `点击了: ${action.text}`,
-        icon: 'none'
-      })
-    },
-    
-    onFilePreview(message) {
-      console.log('文件预览:', message)
-      uni.showToast({
-        title: '正在打开文件...',
-        icon: 'none'
-      })
-    },
-    
-    onAudioPlay(message) {
-      console.log('音频播放:', message)
-    },
-    
-    onVideoPlay(message) {
-      console.log('视频播放:', message)
-    },
-    
-    onLinkOpen(message) {
-      console.log('链接打开:', message)
-      uni.showToast({
-        title: '正在打开链接...',
-        icon: 'none'
-      })
-    },
-    
-    onProductView(message) {
-      console.log('商品查看:', message)
-      uni.showToast({
-        title: '正在查看商品...',
-        icon: 'none'
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.demo-container {
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-  background-color: #f5f5f5;
-}
-
-.demo-header {
-  background-color: #ff4544;
-  color: white;
-  padding: 30rpx;
-  text-align: center;
-  
-  .demo-title {
-    font-size: 32rpx;
-    font-weight: bold;
-  }
-}
-
-.demo-controls {
-  background-color: white;
-  padding: 20rpx;
-  border-top: 2rpx solid #eeeeee;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10rpx;
-  
-  .control-btn {
-    flex: 1;
-    min-width: 150rpx;
-    height: 60rpx;
-    background-color: #f8f8f8;
-    border-radius: 30rpx;
-    font-size: 24rpx;
-    color: #333;
-    border: none;
-    
-    &:active {
-      background-color: #eeeeee;
-    }
-  }
-}
-</style>

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%;
 	}

components/hover-nav/hover-nav.vue

@@ -1,64 +1,43 @@
 <template>
-  <view v-if="pageCount == 1 || need" class="fixed-box"
+  <!-- 悬浮按钮 -->
-    :style="[customContainerStyle, { 
+  <view v-if="pageCount == 1 || need" class="fixed-box" :style="[customContainerStyle, {
-      height: fixBtnShow ? '400rpx' : '320rpx',
+    height: fixBtnShow ? '400rpx' : '320rpx',
-      backgroundImage: bgUrl ? `url(${bgUrl})` : '',
+    backgroundImage: bgUrl ? `url(${bgUrl})` : '',
-      backgroundSize: 'cover'
+    backgroundSize: 'cover'
-    }]">
+  }]">
-
-    <!-- AI 智能助手（优先显示） -->
-    <view 
-      v-if="fixBtnShow && enableAIChat"
-      class="btn-item common-bg"
-      @click="openAIChat"
-      :style="{ backgroundImage: aiAgentimg ? `url(${aiAgentimg})` : '', backgroundSize: '100% 100%' }"
-    >
-      <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
-    </view>
-
-    <!-- 普通客服（仅当未启用 AI 时显示） -->
-    <template v-else-if="fixBtnShow">
-      <!-- #ifdef MP-WEIXIN -->
-      <button 
-        class="btn-item common-bg" 
-        hoverClass="none" 
-        openType="contact"
-        sessionFrom="weapp"
-        showMessageCard="true"
-        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]"
-      >
-        <text class="icox icox-kefu" v-if="!kefuimg"></text>
-      </button>
-      <!-- #endif -->
-
-      <!-- #ifndef MP-WEIXIN -->
-      <button 
-        class="btn-item common-bg" 
-        hoverClass="none" 
-        @click="openKefuSelectPopup"
-        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]"
-      >
-        <text class="icox icox-kefu" v-if="!kefuimg"></text>
-      </button>
-      <!-- #endif -->
-    </template>
 
     <!-- 中英文切换按钮 -->
-    <view 
+    <view v-if="isLanguageSwitchEnabled && fixBtnShow" class="btn-item common-bg" @click="toggleLanguage">
-      v-if="isLanguageSwitchEnabled && fixBtnShow"
-      class="btn-item common-bg"
-      @click="toggleLanguage"
-    >
       <text>{{ currentLangDisplayName }}</text>
     </view>
 
+    <!-- AI 智能助手 -->
+    <view v-if="fixBtnShow && enableAIChat" class="btn-item common-bg" @click="openAIChat"
+      :style="{ backgroundImage: aiAgentimg ? `url(${aiAgentimg})` : '', backgroundSize: '100% 100%' }">
+      <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
+    </view>
+
+    <!-- 微信小程序客服按钮 -->
+    <!-- #ifdef MP-WEIXIN -->
+    <button class="btn-item common-bg" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"
+      :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+      <text class="icox icox-kefu" v-if="!kefuimg"></text>
+    </button>
+    <!-- #endif -->
+
+    <!-- 普通客服（仅当未启用 AI 时显示） -->
+    <!-- #ifdef H5 -->
+    <template v-if="fixBtnShow">
+      <button class="btn-item common-bg" hoverClass="none" @click="openCustomerSelectPopup"
+        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
+        <text class="icox icox-kefu" v-if="!kefuimg"></text>
+      </button>
+    </template>
+    <!-- #endif -->
+
     <!-- 电话按钮（始终显示） -->
-    <view 
+    <view v-if="fixBtnShow" class="btn-item common-bg" @click="call()"
-      v-if="fixBtnShow" 
+      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-      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>
 
@@ -77,17 +56,12 @@ export default {
     return {
       pageCount: 0,
       fixBtnShow: true,
+
       shopInfo: null,
       currentLangIndex: 0,
       langIndexMap: {},
-      kefuList: [
+
-        { id: 'weixin-official', name: '微信官方客服', isOfficial: true, type: 'weapp' },
-        { id: 'custom-kefu', name: '自定义在线客服', isOfficial: false, type: 'custom' },
-        { id: 'qyweixin-kefu', name: '企业微信客服', isOfficial: false, type: 'qyweixin' }
-      ],
-      selectedKefu: null,
       customerService: null,
-      buttonConfig: null,
     };
   },
   computed: {
@@ -111,13 +85,8 @@ export default {
       return !!this.shopInfo?.ischina;
     },
     enableAIChat() {
-      const defaultEnable = true;
+      return !!this.shopInfo?.enableAIChat;
-      if (!this.shopInfo) return defaultEnable;
-      return this.shopInfo.hasOwnProperty('enableAIChat')
-        ? !!this.shopInfo.enableAIChat
-        : defaultEnable;
     },
-
     currentLangDisplayName() {
       const lang = this.langIndexMap[this.currentLangIndex];
       return lang === 'zh-cn' ? 'EN' : 'CN';
@@ -127,39 +96,23 @@ export default {
     },
     customButtonStyle() {
       return this.shopInfo?.floatingButton?.button || {};
-    },
-    customTextStyle() {
-      return this.shopInfo?.floatingButton?.text || {};
-    },
-    unreadCount() {
-      return this.$store.state.aiUnreadCount || 0;
-    }
-  },
-  watch: {
-    shopInfo: {
-      handler(newVal) {
-        // 可在此添加额外逻辑（如埋点、通知等），当前无需操作
-      },
-      immediate: true
     }
   },
   created() {
+    this.customerService = createCustomerService(this);
     this.initLanguage();
-    this.pageCount = getCurrentPages().length;
-
     uni.getStorage({
       key: 'shopInfo',
       success: (e) => {
-        console.log('【调试】当前 shopInfo:', e.data);
         this.shopInfo = e.data;
-      },
-      fail: () => {
-        console.warn('未获取到 shopInfo，使用默认设置');
-        // shopInfo 为 null，computed 会自动返回默认值，无需手动赋值
       }
     });
   },
   methods: {
+
+    /**
+     * 初始化多语言配置
+     */
     initLanguage() {
       this.langList = this.$langConfig.list();
       this.langIndexMap = {};
@@ -178,78 +131,43 @@ export default {
         this.currentLangIndex = 0;
       }
     },
+
+    /**
+     * 电话联系客服
+     */
     call() {
-      if (this.tel) {
+      this.customerService.makePhoneCall(this.tel);
-        uni.makePhoneCall({ phoneNumber: this.tel + '' });
-      } else {
-        uni.showToast({ title: '暂无联系电话', icon: 'none' });
-      }
     },
+
     /**
      * 切换中英文语言，并刷新当前页面（保留所有参数）
      */
-   toggleLanguage() {
+    toggleLanguage() {
-     this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
+      this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
-     const targetLang = this.langIndexMap[this.currentLangIndex];
+      const targetLang = this.langIndexMap[this.currentLangIndex];
-   
-     // 调用语言切换逻辑（设置 storage + 清空缓存）
-     this.$langConfig.change(targetLang);
-   
-     // H5 环境需要强制刷新页面才能生效
-     if (uni.getSystemInfoSync().platform === 'browser') {
-       // 延迟 100ms 确保 change() 执行完成
-       setTimeout(() => {
-         window.location.reload();
-       }, 100);
-     }
-   },
-    openKefuSelectPopup() {
-      const kefuNames = this.kefuList.map(item => item.name);
-      uni.showActionSheet({
-        itemList: kefuNames,
-        success: (res) => {
-          this.selectedKefu = this.kefuList[res.tapIndex];
-          this.reinitCustomerService(this.selectedKefu);
-          this.handleSelectedKefu();
-        }
-      });
-    },
-    reinitCustomerService(kefu) {
-      this.customerService = createCustomerService(this, kefu);
-      this.buttonConfig = this.customerService.getButtonConfig();
-    },
-    handleSelectedKefu() {
-      const kefu = this.selectedKefu;
-      if (!kefu) return;
 
-      if (kefu.isOfficial) {
+      // 调用语言切换逻辑（设置 storage + 清空缓存）
-        uni.openCustomerServiceConversation({
+      this.$langConfig.change(targetLang);
-          sessionFrom: 'weapp',
-          showMessageCard: true
-        });
-      } else if (kefu.id === 'custom-kefu') {
-        this.customerService.handleCustomerClick();
-      } else if (kefu.id === 'qyweixin-kefu') {
-        this.customerService.handleQyWeixinKefuClick();
-      }
     },
+
+    /**
+     * 打开 AI 智能助手
+     */
     openAIChat() {
-      uni.navigateTo({
+      this.$util.redirectTo(this.$util.AI_CHAT_PAGE_URL);
-        url: '/pages_tool/ai-chat/index',
+    },
-        success: () => {
+
-          console.log('✅ AI 客服跳转成功');
+    /**
-        },
+     * 打开客服选择对话框
-        fail: (err) => {
+     */
-          console.error('❌ 跳转失败:', err);
+    openCustomerSelectPopup() {
-          uni.showToast({ title: '跳转失败，请重试', icon: 'none' });
+      this.customerService.openCustomerSelectPopupDialog();
-        }
-      });
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .fixed-box {
   position: fixed;
   right: 0rpx;
@@ -287,7 +205,8 @@ export default {
 
 /* 定义共同的背景颜色 */
 .common-bg {
-  background-color: var(--hover-nav-bg-color); /* 使用变量以保持一致性 */
+  background-color: var(--hover-nav-bg-color);
+  /* 使用变量以保持一致性 */
 }
 
 .btn-item text {
@@ -304,7 +223,6 @@ export default {
   justify-content: center;
   align-items: center;
   margin: 14rpx 0;
-  background: #fff;
   border-radius: 50rpx;
   width: 80rpx;
   height: 80rpx;
@@ -318,21 +236,7 @@ export default {
   font-weight: bold;
 }
 
-.unread-badge {
+
-  position: absolute;
-  top: -5rpx;
-  right: -5rpx;
-  background-color: #ff4544;
-  color: white;
-  border-radius: 20rpx;
-  min-width: 30rpx;
-  height: 30rpx;
-  font-size: 20rpx;
-  line-height: 30rpx;
-  text-align: center;
-  padding: 0 8rpx;
-  box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
-}
 
 .ai-icon {
   font-size: 40rpx;

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/ns-video-player-popup/ns-video-player-popup.vue

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

components/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;

components/wxwork-contact/CHANGELOG.md

@@ -1,66 +0,0 @@
-# 企业微信联系客服组件更新日志
-
-## v2.0.0 - 集成全局Store配置
-
-### 新增功能
-- ✅ 企业微信配置集成到全局Store
-- ✅ 从 `/api/config/init` 统一获取配置
-- ✅ 支持props覆盖全局配置
-- ✅ 优化配置获取逻辑
-
-### 变更内容
-1. **Store集成**：
-   - 在 `store/index.js` 中添加 `wxworkConfig` 状态
-   - 添加 `setWxworkConfig` mutation
-   - 在 `init` action 中从 `/api/config/init` 获取企业微信配置
-
-2. **组件优化**：
-   - `wxwork-contact.vue` 组件现在优先从全局Store获取配置
-   - 支持通过props覆盖全局配置
-   - 移除单独的API调用，使用统一配置
-
-3. **页面集成**：
-   - `pages/contact/contact.vue` 页面简化配置获取逻辑
-   - 直接使用全局Store中的企业微信配置
-
-### 配置格式
-后端 `/api/config/init` 需要返回以下格式的企业微信配置：
-
-```json
-{
-  "code": 0,
-  "data": {
-    // ... 其他配置 ...
-    "wxwork": {
-      "corp_id": "企业ID",
-      "agent_id": "应用ID", 
-      "contact_id": "客服ID",
-      "contact_url": "活码链接",
-      "timestamp": "时间戳",
-      "nonceStr": "随机字符串",
-      "signature": "签名",
-      "enabled": true
-    }
-  }
-}
-```
-
-### 使用方式
-```vue
-<!-- 使用全局配置 -->
-<wxwork-contact btn-text="联系企业客服"></wxwork-contact>
-
-<!-- 覆盖全局配置 -->
-<wxwork-contact 
-    :corp-id="customCorpId"
-    :contact-url="customContactUrl"
-    btn-text="自定义客服"></wxwork-contact>
-```
-
-## v1.0.0 - 初始版本
-
-### 功能
-- 企业微信JS-SDK封装
-- 基础联系客服组件
-- 支持小程序和H5环境
-- 活码跳转和SDK两种方式

components/wxwork-contact/README.md

@@ -1,484 +0,0 @@
-# 企业微信联系客服组件
-
-## 功能说明
-
-这个组件实现了在小程序中点击"联系客服"后，自动跳转到企业微信添加对应销售的功能。
-
-## 关键前提条件
-
-### ⚠️ 重要提醒
-微信小程序与企业微信互通有严格的平台限制和权限要求，使用前请确保满足以下所有条件：
-
-### 1. 微信小程序环境要求
-- **平台限制**：功能仅在微信小程序环境中可用
-- **基础库版本**：需要微信小程序基础库 2.3.0 及以上版本
-- **用户环境**：用户需要在微信中打开小程序
-
-### 2. 企业微信配置要求
-- **企业认证**：企业微信账号必须完成企业认证
-- **客户联系功能**：需要开通企业微信"客户联系"功能
-- **应用权限**：企业微信应用需要有客户联系相关权限
-
-### 3. 互通配置要求
-- **关联配置**：小程序必须与企业微信进行关联配置
-- **权限申请**：需要在微信开放平台和企业微信后台分别申请相应权限
-- **域名白名单**：相关域名需要在小程序和企业微信后台都配置白名单
-
-### 4. 跳转权限要求
-- **小程序AppID**：需要在企业微信中配置允许跳转的小程序AppID
-- **企业微信AppID**：需要在微信开放平台配置关联的企业微信AppID
-- **业务域授权**：需要配置业务域授权，允许跨平台跳转
-
-### 5. 开发调试要求
-- **测试环境**：需要在测试环境中验证跳转功能
-- **权限验证**：确保所有必要的API权限已申请并生效
-- **兼容性测试**：在不同微信版本中进行兼容性测试
-
-### 6. 具体配置要求
-
-| 条件 | 说明 |
-|------|------|
-| **小程序与企业微信绑定** | 在企业微信管理后台 → 「应用管理」→「小程序」中关联你的微信小程序AppID |
-| **配置可信域名** | 如果涉及网页跳转或回调，需在企业微信后台配置业务域名 |
-| **使用企业微信服务商 or 自建应用** | 若需高级功能（如获取客户详情），需有企业微信管理员权限或通过服务商代开发 |
-
-## 使用方法
-
-### 1. 基础用法
-
-```vue
-<wxwork-contact 
-    :corp-id="corpId"
-    :agent-id="agentId"
-    :timestamp="timestamp"
-    :nonce-str="nonceStr"
-    :signature="signature"
-    :contact-id="contactId"
-    :contact-url="contactUrl"
-    btn-text="添加企业微信客服">
-</wxwork-contact>
-```
-
-### 组件架构
-
-### 分层设计
-```
-调用方 (页面组件)
-    ↓ 传递配置参数
-wxwork-contact 组件
-    ↓ 调用SDK
-wxwork-jssdk.js
-    ↓ 调用企业微信API
-企业微信服务
-```
-
-### 组件设计原则
-
-- **独立性**：组件不直接依赖全局Store，所有配置通过props传递
-- **职责分离**：组件只负责UI展示和企业微信SDK调用，配置管理由调用方负责
-- **灵活配置**：支持调用者覆盖任何配置参数
-
-## 版本信息
-
-### v3.0.0 - 统一客服服务重构版本
-- 创建 `CustomerService` 统一客服处理服务
-- 重构 `ns-contact.vue` 和 `hover-nav.vue` 消除重复代码
-- 提供统一的客服处理接口和平台适配
-- 完善错误处理和降级机制
-- 支持所有客服类型的统一调用
-
-### v2.0.0 - Store集成版本
-- 企业微信配置集成到全局Store
-- 从 `/api/config/init` 统一获取配置
-- 组件完全独立，通过props接收配置
-- 支持全局配置和局部覆盖
-
-### v1.0.0 - 初始版本
-- 基础企业微信联系功能
-- 支持活码跳转和JS-SDK两种方式
-
-### 2. 属性说明
-
-| 属性 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| btnText | String | '添加企业微信客服' | 按钮文字 |
-| corpId | String | - | 企业ID（必需） |
-| agentId | String | '' | 应用ID |
-| timestamp | String | '' | 时间戳 |
-| nonceStr | String | '' | 随机字符串 |
-| signature | String | '' | 签名 |
-| contactId | String | '' | 客服ID或活码配置ID |
-| contactUrl | String | '' | 活码链接 |
-| showConfirm | Boolean | true | 是否显示确认弹窗 |
-
-### 3. 在联系页面中使用
-
-在 `pages/contact/contact.vue` 中已集成使用示例：
-
-```vue
-<wxwork-contact 
-    v-if="wxworkConfig && wxworkConfig.enabled"
-    :corp-id="wxworkConfig.corpId"
-    :agent-id="wxworkConfig.agentId"
-    :timestamp="wxworkConfig.timestamp"
-    :nonce-str="wxworkConfig.nonceStr"
-    :signature="wxworkConfig.signature"
-    :contact-id="wxworkConfig.contactId"
-    :contact-url="wxworkConfig.contactUrl"
-    btn-text="企业微信客服"
-    :show-confirm="false">
-</wxwork-contact>
-```
-
-## 配置说明
-
-### 后端接口需求
-
-企业微信配置已集成到 `/api/config/init` 接口中，返回以下格式的数据：
-
-```json
-{
-  "code": 0,
-  "data": {
-    // ... 其他配置 ...
-    "wxwork": {
-      "corp_id": "企业ID",
-      "agent_id": "应用ID",
-      "contact_id": "客服ID",
-      "contact_url": "活码链接",
-      "timestamp": "时间戳",
-      "nonceStr": "随机字符串",
-      "signature": "签名",
-      "enabled": true
-    }
-  }
-}
-```
-
-### 全局Store集成
-
-企业微信配置通过以下方式集成到全局状态管理：
-
-1. **Store状态**：在 `store/index.js` 中添加 `wxworkConfig` 状态
-2. **配置获取**：在 `init` action 中从 `/api/config/init` 获取企业微信配置
-3. **状态更新**：使用 `setWxworkConfig` mutation 更新配置
-4. **持久化**：配置自动保存到本地存储
-
-### 企业微信配置步骤
-
-1. **获取企业微信活码**：
-   - 登录企业微信管理后台
-   - 进入"客户联系" -> "配置" -> "联系我" 
-   - 创建活码，获取配置ID或直接获取活码链接
-
-2. **配置参数**：
-   - `corp_id`: 企业ID（在企业微信后台获取）
-   - `agent_id`: 企业微信应用ID
-   - `contact_id`: 客服的用户ID
-   - `contact_url`: 企业微信活码链接（推荐使用活码链接）
-   - `timestamp`: 生成签名的时间戳
-   - `nonceStr`: 生成签名的随机字符串
-   - `signature`: JS-SDK签名
-
-## 典型业务流程示例
-
-### 目标
-用户在小程序中点击"联系客服"，自动添加对应的企业微信销售。
-
-### 步骤
-1. **后端调用企业微信 API** 创建「联系我」二维码（可带场景值，如 user_id=123）。
-2. **前端在小程序中展示该二维码（或生成跳转链接）**。
-3. **用户长按识别 → 打开企业微信 → 添加客服**。
-4. **企业微信收到添加事件 → 通过 API 获取 external_userid → 关联到原小程序用户**。
-
-## 实现原理
-
-### 方案1：企业微信活码跳转（推荐）
-- 使用企业微信活码链接
-- 通过 `uni.navigateToMiniProgram` 跳转到企业微信小程序
-- 直接添加对应的销售为联系人
-
-### 方案2：JS-SDK方式
-- 使用企业微信JS-SDK
-- 调用 `openUserProfile` 接口打开用户资料
-- 用户手动添加联系人
-
-## 注意事项
-
-### 功能限制
-1. **小程序环境**：需要在微信小程序环境中使用
-2. **权限配置**：确保小程序有跳转企业微信的权限
-3. **降级处理**：当企业微信不可用时，会降级到原有客服方式
-4. **用户体验**：建议添加确认弹窗，避免误操作
-
-### 前提条件验证
-5. **权限检查**：使用前需要验证所有必需权限是否生效
-6. **配置完整性**：确保所有配置参数都已正确设置
-7. **网络环境**：确保用户网络环境允许访问企业微信服务
-8. **版本兼容**：检查微信版本和企业微信版本兼容性
-
-### 调试建议
-9. **错误监控**：添加适当的错误日志和用户反馈机制
-10. **性能优化**：避免频繁的SDK初始化和配置获取
-11. **安全考虑**：敏感配置信息应在服务端处理，前端不暴露
-
-## 兼容性
-
-- 微信小程序：✅ 支持
-- H5环境：✅ 支持跳转活码链接
-- 其他平台：降级处理
-
-## 文件结构
-
-```
-components/wxwork-contact/
-├── wxwork-contact.vue    # 主组件
-└── README.md            # 说明文档
-
-components/ns-contact/
-└── ns-contact.vue       # 统一客服组件（重构后）
-
-components/hover-nav/
-└── hover-nav.vue        # 悬浮导航组件（重构后）
-
-common/js/
-├── wxwork-jssdk.js     # 企业微信JS-SDK封装
-└── customer-service.js  # 客服统一处理服务（新增）
-
-store/
-└── index.js            # 全局Store，包含wxworkConfig状态管理
-
-pages/contact/
-└── contact.vue         # 联系页面，集成企业微信功能
-```
-
-## 系统梳理与优化 (v3.1.0)
-
-### 🔧 已修复的问题
-
-#### 1. **App.vue 配置恢复**
-- ✅ 修复了企业微信配置 (`wxworkConfig`) 在应用启动时的恢复
-- ✅ 确保所有配置都能正确从本地存储恢复到Store
-
-#### 2. **客服服务参数传递**
-- ✅ 修复了 `openCustomerServiceChat` 参数传递错误
-- ✅ 正确传递 `sendMessageTitle`、`sendMessagePath`、`sendMessageImg`
-
-#### 3. **组件配置访问**
-- ✅ 在 `ns-contact.vue` 和 `hover-nav.vue` 中添加 computed 属性
-- ✅ 确保能够正确访问 `servicerConfig`
-
-#### 4. **企业微信服务优化**
-- ✅ 改进参数传递，支持自定义消息参数
-- ✅ 统一处理函数调用方式
-
-### 🛡️ 新增功能
-
-#### 1. **配置验证机制**
-```javascript
-const validation = this.customerService.validateConfig();
-if (!validation.isValid) {
-    // 处理配置错误
-}
-```
-
-#### 2. **错误处理增强**
-- ✅ 添加配置错误弹窗
-- ✅ 改进错误日志记录
-- ✅ 警告信息提示
-
-#### 3. **类型安全**
-- ✅ 完善参数类型检查
-- ✅ 空值和异常情况处理
-
-### 📋 当前系统状态
-
-| 组件 | 状态 | 功能完整性 |
-|------|------|-----------|
-| **customer-service.js** | ✅ 完成 | 统一客服处理服务 |
-| **ns-contact.vue** | ✅ 修复 | 支持所有客服类型 |
-| **hover-nav.vue** | ✅ 修复 | 集成统一客服服务 |
-| **App.vue** | ✅ 修复 | 配置完整恢复 |
-| **contact.vue** | ⚠️ 待优化 | 仍使用原始方式 |
-
-### 🔄 待优化项
-
-#### 1. **contact.vue 页面重构**
-- 建议集成统一客服服务
-- 添加企业微信客服按钮
-- 统一UI交互体验
-
-#### 2. **加载状态反馈**
-- 客服功能调用时的loading状态
-- 网络请求的进度指示
-
-#### 3. **用户体验优化**
-- 客服按钮的点击反馈
-- 错误状态的友好提示
-
-### 🧪 测试建议
-
-1. **配置验证测试**：
-   - 测试各种配置缺失情况
-   - 验证错误提示准确性
-
-2. **平台兼容测试**：
-   - 微信小程序客服功能
-   - H5环境跳转
-   - 支付宝小程序客服
-
-3. **企业微信功能测试**：
-   - 活码链接跳转
-   - 降级处理机制
-   - 参数传递正确性
-
-### 📖 使用最佳实践
-
-```javascript
-// 推荐使用方式
-const customerService = createCustomerService(this);
-
-// 带配置验证的调用
-if (customerService.isConfigAvailable()) {
-    customerService.handleCustomerClick({
-        sendMessageTitle: '商品咨询',
-        sendMessagePath: '/pages/goods/detail',
-        sendMessageImg: 'product-image.jpg'
-    });
-}
-```
-
-## 重构说明 (v3.0.0)
-
-### 统一客服处理服务
-
-为了解决代码重复问题，我们创建了 `CustomerService` 类来统一处理所有客服逻辑：
-
-#### 主要改进
-1. **代码复用**：消除 `ns-contact.vue` 和 `hover-nav.vue` 中的重复代码
-2. **统一接口**：提供一致的客服处理API
-3. **平台适配**：自动处理不同平台的客服配置
-4. **类型安全**：完善的错误处理和降级机制
-
-#### 使用方式
-
-**1. 在组件中导入**
-```javascript
-import { createCustomerService } from '@/common/js/customer-service.js';
-```
-
-**2. 初始化服务**
-```javascript
-created() {
-    this.customerService = createCustomerService(this);
-    this.buttonConfig = this.customerService.getButtonConfig();
-}
-```
-
-**3. 处理客服点击**
-```javascript
-methods: {
-    contactServicer() {
-        this.customerService.handleCustomerClick({
-            niushop: this.niushop,
-            sendMessageTitle: this.sendMessageTitle,
-            sendMessagePath: this.sendMessagePath,
-            sendMessageImg: this.sendMessageImg
-        });
-    }
-}
-```
-
-#### 核心方法
-
-| 方法名 | 用途 | 参数 |
-|--------|------|------|
-| `handleCustomerClick(options)` | 统一处理客服点击 | 客服配置选项 |
-| `getButtonConfig()` | 获取按钮配置 | - |
-| `getServiceType()` | 获取客服类型 | - |
-| `openWxworkService()` | 打开企业微信客服 | 是否使用原方式 |
-
-#### 支持的客服类型
-
-- `wxwork` - 企业微信客服
-- `third` - 第三方客服
-- `niushop` - 牛商客服
-- `weapp` - 微信小程序客服
-- `aliapp` - 支付宝小程序客服
-- `none` - 无客服（显示提示）
-
-## 常见问题 (FAQ)
-
-### Q: contact_id 是小程序ID吗？
-A: 不是的。`contact_id` 是**企业微信中客服人员的用户ID**，具体说明如下：
-
-- **定义**：企业微信系统内部分配给客服人员的唯一标识符
-- **获取方式**：通过企业微信管理后台的"客户联系" → "配置" → "联系我"功能创建活码时获得
-- **用途**：用于指定具体客服人员，当用户点击"联系客服"时，系统通过这个ID知道应该添加哪个企业微信客服人员
-
-### Q: contact_id 和小程序ID的区别？
-A: 两者的作用完全不同：
-
-| 字段 | 用途 | 获取方式 |
-|------|------|----------|
-| **contact_id** | 指定具体的企业微信客服人员 | 企业微信管理后台获取 |
-| **小程序AppID** | 识别整个微信小程序应用 | 微信开放平台获取 |
-
-在业务流程中：
-1. 用户在小程序中点击"联系客服"
-2. 系统使用 `contact_id` 打开对应的企业微信客服人员资料
-3. 用户添加该企业微信客服为联系人
-
-所以 `contact_id` 是企业微信客服的ID，不是小程序的ID。
-
-### Q: wxwork_contact_url 从哪里来？
-A: `wxwork_contact_url` 应该来自全局Store中的 `wxworkConfig`，而不是 `servicerConfig`：
-
-**正确的配置来源**：
-- ✅ `this.$store.state.wxworkConfig.contact_url` - 企业微信配置
-- ❌ `this.config.wxwork_contact_url` - 错误的配置路径
-
-**配置获取流程**：
-1. **后端接口**：`/api/config/init` 返回 `wxwork_config` 数据
-2. **Store存储**：`setWxworkConfig` 将配置保存到 `wxworkConfig` 状态
-3. **组件使用**：通过 `this.$store.state.wxworkConfig.contact_url` 访问
-
-**代码修正示例**：
-```javascript
-// 错误 ❌
-if (this.config.wxwork_contact_url) { ... }
-
-// 正确 ✅  
-const wxworkConfig = this.$store.state?.wxworkConfig;
-if (wxworkConfig?.contact_url) { ... }
-```
-
-**字段对应关系**：
-| 后端字段 | Store字段 | 组件使用 |
-|---------|----------|----------|
-| `contact_url` | `contact_url` | `wxworkConfig.contact_url` |
-
-### Q: navigateToMiniProgram 中的企业微信小程序AppID 是指我的业务小程序ID吗？
-A: 不是的！`appId: 'wxeb490c6f9b154ef9'` 是**企业微信官方小程序的AppID**，不是你的业务小程序ID。
-
-**两者的区别**：
-
-| 小程序类型 | AppID示例 | 用途 | 所有者 |
-|-----------|----------|------|--------|
-| **企业微信官方小程序** | `wxeb490c6f9b154ef9` | 展示企业联系人详情页面 | 腾讯企业微信团队 |
-| **你的业务小程序** | 你的AppID | 你的业务功能（电商、服务等） | 你的企业/组织 |
-
-**业务流程**：
-```
-用户小程序 (你的业务) 
-    ↓ 点击"联系客服"
-navigateToMiniProgram 跳转到
-企业微信官方小程序 (wxeb490c6f9b154ef9)
-    ↓ 展示联系人详情
-用户添加客服人员到企业微信
-```
-
-**关键点**：
-- 这个AppID是企业微信官方小程序，通常是固定值
-- 用于跳转到企业微信环境展示联系人详情
-- 不需要替换成你自己的小程序AppID |

docs/WECHAT_CHANNEL_INTEGRATION.md

@@ -102,58 +102,83 @@
 
 ## 3. 组件使用
 
-### 3.1 单个视频号组件 (diy-wechat-channel.vue)
+### 3.1 视频号视频卡片组件 (diy-channel-video.vue)
 
 #### 基本用法
 
 ```vue
-<diy-wechat-channel :value="channelData" />
+<diy-channel-video :value="videoData" @video-play="handlerVideoPlay" />
 ```
 
 #### 属性说明
 
 | 属性名 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
-| channelName | String | "" | 视频号名称 |
+| value | Object | 必填 | 视频数据对象 |
-| avatarUrl | String | "" | 视频号头像URL |
+| listMode | Boolean | false | 是否为列表模式 |
+| videoHeight | Number | 220 | 视频高度（仅适用于嵌入式播放） |
+| titleLineClamp | Number | 1 | 标题显示行数 |
+| showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| coverStyle | Object | {} | 视频封面图样式 |
+| playBtnStyle | Object | {} | 播放按钮样式 |
+| autoPlay | Boolean | false | 是否自动播放（仅适用于嵌入式播放） |
+
+#### value对象属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| feedId | String | "" | 视频 feedId |
+| finderUserName | String | "" | 视频号用户名 |
+| feedToken | String | "" | 视频 token |
+| coverUrl | String | "" | 视频封面图 |
 | videoTitle | String | "" | 视频标题 |
-| coverUrl | String | "" | 视频封面URL |
+| viewCount | Number | 0 | 观看次数 |
-| feedId | String | "" | 视频号内容ID，用于播放视频 |
+| showViewCount | Boolean | false | 是否显示观看次数 |
-| viewCount | Number | 0 | 视频观看次数 |
+| embedMode | Boolean | false | 是否启用嵌入式播放 |
-| showFollow | Boolean | false | 是否显示关注按钮 |
-| componentAngle | String | "" | 组件圆角类型，可选值：round |
-| topAroundRadius | Number | 0 | 顶部圆角半径 |
-| bottomAroundRadius | Number | 0 | 底部圆角半径 |
 
 #### 事件说明
 
 | 事件名 | 说明 | 参数 |
 |--------|------|------|
-| channel-tap | 点击视频号头像或名称时触发 | 视频号数据对象 |
+| video-play | 点击视频播放时触发 | 视频数据对象 |
-| video-play | 点击视频播放时触发 | 视频号数据对象 |
 
-### 3.2 视频号列表组件 (diy-wechat-channel-list.vue)
+### 3.2 视频号列表组件 (diy-channel-list.vue)
 
 #### 基本用法
 
 ```vue
-<diy-wechat-channel-list :value="channelListData" />
+<diy-channel-list :value="channelListData" />
 ```
 
 #### 属性说明
 
 | 属性名 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
-| list | Array | [] | 视频号列表数据 |
+| value | Object | 必填 | 组件配置数据 |
-| rowCount | Number | 2 | 每行显示的视频号数量 |
+| value.list | Array | [] | 视频号列表数据 |
-| showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
+| value.rowCount | Number | 2 | 每行显示的视频号数量 |
-| mode | String | "" | 显示模式 |
+| value.showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
-| font | Object | {} | 字体样式配置 |
+| value.mode | String | "" | 显示模式 |
-| componentBgColor | String | "#fff" | 组件背景颜色 |
+| value.font | Object | {} | 字体样式配置 |
-| componentAngle | String | "" | 组件圆角类型，可选值：round |
+| value.componentBgColor | String | "#fff" | 组件背景颜色 |
-| topAroundRadius | Number | 0 | 顶部圆角半径 |
+| value.componentAngle | String | "" | 组件圆角类型，可选值：round |
-| bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| value.topAroundRadius | Number | 0 | 顶部圆角半径 |
-| ornament | Object | {} | 装饰样式配置 |
+| value.bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| value.ornament | Object | {} | 装饰样式配置 |
+| value.titleLineClamp | Number | 1 | 标题显示行数 |
+| value.showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| value.aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| value.coverStyle | Object | {} | 视频封面图样式 |
+| value.playBtnStyle | Object | {} | 播放按钮样式 |
+| value.imageSize | Number | 0 | 图片尺寸（仅在特定模式下使用） |
+| value.pageCount | Number | 1 | 每页显示的视频数量 |
+| value.carousel | Object | {} | 轮播配置 |
+| value.carousel.type | String | "" | 轮播类型，可选值：default, hide |
+| value.carousel.autoplay | Boolean | false | 是否自动播放 |
+| value.carousel.interval | Number | 3000 | 自动播放间隔，单位毫秒 |
+| value.carousel.duration | Number | 500 | 切换动画时长，单位毫秒 |
+| value.carousel.circular | Boolean | false | 是否循环播放 |
 
 #### list数组项说明
 
@@ -164,6 +189,10 @@
 | videoTitle | String | "" | 视频标题 |
 | feedId | String | "" | 视频号内容ID，用于播放视频 |
 | viewCount | Number | 0 | 视频观看次数 |
+| embedMode | Boolean | false | 是否启用嵌入式播放 |
+| showViewCount | Boolean | false | 是否显示观看次数 |
+| finderUserName | String | "" | 视频号ID，用于嵌入式播放 |
+| feedToken | String | "" | 视频token，用于嵌入式播放 |
 
 ## 4. 视频播放实现
 
@@ -290,7 +319,19 @@ if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
   - 头像：200x200px
   - 封面：640x360px
 
-### 5.4 权限和关联
+### 5.4 播放按钮图标
+
+- 组件支持两种播放按钮图标方式：
+  1. **图片图标**：通过 `playIcon` 属性设置，优先级较高
+  2. **纯 CSS 图标**：当 `playIcon` 不可用时，组件会自动使用纯 CSS 生成的播放图标，确保播放按钮始终可见
+
+- 纯 CSS 图标特点：
+  - 不依赖外部图片资源，加载更快
+  - 支持响应式调整大小
+  - 具有与图片图标相同的悬停效果
+  - 在所有环境中都能正常显示
+
+### 5.5 权限和关联
 
 - 确保在微信小程序后台开通了「打开视频号内容」权限
 - 确保小程序已与视频号成功关联
@@ -331,6 +372,7 @@ if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
 - 可通过组件的 `componentAngle`、`topAroundRadius`、`bottomAroundRadius` 等属性调整组件样式
 - 可通过 `componentBgColor` 属性调整组件背景颜色
 - 可通过 `font` 属性调整字体样式
+- 可通过 `aspectRatio` 属性调整视频比例，支持 '16:9' 和 '3:4' 两种比例
 
 ### 6.6 环境兼容性问题
 
@@ -392,25 +434,66 @@ if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
 
 ## 7. 示例代码
 
-### 7.1 单个视频号示例
+### 7.1 视频号视频卡片组件示例
+
+```javascript
+// 视频卡片数据
+const videoData = {
+    channelName: "示例视频号",
+    coverUrl: "https://example.com/cover.jpg",
+    videoTitle: "这是一个示例视频，标题可能会很长，需要测试多行显示效果",
+    feedId: "v02004g10000c3f7l7j5u87l33n8f160",
+    viewCount: 12345,
+    embedMode: false,
+    showViewCount: true,
+    finderUserName: "example_finder",
+    feedToken: "example_feed_token"
+};
+
+// 视频播放事件处理
+function handlerVideoPlay(data) {
+    console.log("视频播放", data);
+    // 可以在这里处理视频播放逻辑
+}
+```
+
+### 7.2 单个视频号示例
 
 ```javascript
 // 单个视频号数据
 const channelData = {
     channelName: "示例视频号",
     avatarUrl: "https://example.com/avatar.jpg",
-    videoTitle: "这是一个示例视频",
+    videoTitle: "这是一个示例视频，标题可能会很长，需要测试多行显示效果",
     coverUrl: "https://example.com/cover.jpg",
     feedId: "v02004g10000c3f7l7j5u87l33n8f160",
     viewCount: 12345,
     showFollow: true,
     componentAngle: "round",
     topAroundRadius: 10,
-    bottomAroundRadius: 10
+    bottomAroundRadius: 10,
+    embedMode: false,
+    showViewCount: true,
+    finderUserName: "example_finder",
+    feedToken: "example_feed_token",
+    titleLineClamp: 2,
+    showPlayBtn: true,
+    aspectRatio: "16:9",
+    coverStyle: {
+        width: "100%",
+        height: "0",
+        paddingTop: "56.25%" // 16:9 比例
+    },
+    playBtnStyle: {
+        width: "60rpx",
+        height: "60rpx",
+        borderRadius: "30rpx",
+        backgroundColor: "rgba(0, 0, 0, 0.6)"
+    }
 };
 ```
 
-### 7.2 视频号列表示例
+### 7.3 视频号列表示例
 
 ```javascript
 // 视频号列表数据
@@ -419,20 +502,29 @@ const channelListData = {
         {
             channelName: "示例视频号1",
             coverUrl: "https://example.com/cover1.jpg",
-            videoTitle: "这是示例视频1",
+            videoTitle: "这是示例视频1，标题可能会很长，需要测试多行显示效果",
             feedId: "v02004g10000c3f7l7j5u87l33n8f160",
-            viewCount: 12345
+            viewCount: 12345,
+            embedMode: false,
+            showViewCount: true,
+            finderUserName: "example_finder1",
+            feedToken: "example_feed_token1"
         },
         {
             channelName: "示例视频号2",
             coverUrl: "https://example.com/cover2.jpg",
-            videoTitle: "这是示例视频2",
+            videoTitle: "这是示例视频2，标题可能会很长，需要测试多行显示效果",
             feedId: "v02004g10000c3f7m7j5u87l33n8f161",
-            viewCount: 67890
+            viewCount: 67890,
+            embedMode: false,
+            showViewCount: true,
+            finderUserName: "example_finder2",
+            feedToken: "example_feed_token2"
         }
     ],
     rowCount: 2,
     showStyle: "fixed",
+    mode: "",
     font: {
         size: 14,
         weight: "normal",
@@ -441,7 +533,31 @@ const channelListData = {
     componentBgColor: "#fff",
     componentAngle: "round",
     topAroundRadius: 10,
-    bottomAroundRadius: 10
+    bottomAroundRadius: 10,
+    ornament: {},
+    titleLineClamp: 2,
+    showPlayBtn: true,
+    aspectRatio: "16:9",
+    coverStyle: {
+        width: "100%",
+        height: "0",
+        paddingTop: "56.25%" // 16:9 比例
+    },
+    playBtnStyle: {
+        width: "60rpx",
+        height: "60rpx",
+        borderRadius: "30rpx",
+        backgroundColor: "rgba(0, 0, 0, 0.6)"
+    },
+    imageSize: 150,
+    pageCount: 1,
+    carousel: {
+        type: "default",
+        autoplay: true,
+        interval: 3000,
+        duration: 500,
+        circular: true
+    }
 };
 ```
 

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 = {
+export const lang = {
-
+
-	// 底部选项卡
+	// 底部选项卡
-	tabBar: {
+	tabBar: {
-		home: 'index',
+		home: 'index',
-		category: 'category',
+		category: 'category',
-		cart: 'cart',
+		cart: 'cart',
-		member: 'member',
+		member: 'member',
-	},
+	},
-
+
-	//公共
+	//公共
-	common: {
+	common: {
-		//语言包名称
+		//语言包名称
-		name: '英文',
+		name: '英文',
-		mescrollTextInOffset: 'pull to refresh',
+		mescrollTextInOffset: 'pull to refresh',
-		mescrollTextOutOffset: 'Loading...',
+		mescrollTextOutOffset: 'Loading...',
-		mescrollEmpty: "No data available",
+		mescrollEmpty: "No data available",
-		goodsRecommendTitle: 'Guess you like',
+		goodsRecommendTitle: 'Guess you like',
-		currencySymbol: '¥',
+		currencySymbol: '¥',
-		submit: 'Submit',
+		submit: 'Submit',
-		searchTip: 'Please enter search keywords'
+		searchTip: 'Please enter search keywords'
-	},
+	},
-
+
-	login: 'Login/Register',
+	//customer service
-	loginTips: 'Click to login and enjoy more exciting information',
+	customer: {
-	toLogin: 'Go to login',
+		weChatKefu: 'WeChat Customer Service',
-	toGoodsCategoryPage: 'Go shopping',	
+		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" : "wxa8f94045d9c2fc10",
+        "appid" : "wx5e649e2286b29bdf",
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
@@ -66,6 +66,7 @@
             "minified" : true
         },
         "usingComponents" : true,
+        "lazyCodeLoading" : "requiredComponents",
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "为了更好地为您提供服务"
@@ -129,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')
+var jweixin = require('jweixin-module')
-wx.ready(function(){
+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",
+    "version": "1.6.0",
-    "rawSpec": "",
+    "description": "微信JS-SDK",
-    "saveSpec": null,
+    "main": "lib/index.js",
-    "fetchSpec": "latest"
+    "scripts": {},
-  },
+    "repository": {
-  "_requiredBy": [
+        "type": "git",
-    "#USER",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-    "/"
+    },
-  ],
+    "keywords": [
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
+        "wxjssdk",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
+        "weixin",
-  "_spec": "jweixin-module",
+        "jweixin",
-  "_where": "E:\\demo\\niushop_uniapp",
+        "wechat",
-  "author": {
+        "jssdk",
-    "name": "Shengqiang Guo"
+        "wx"
-  },
+    ],
-  "bugs": {
+    "author": "Shengqiang Guo",
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    "license": "ISC",
-  },
+    "bugs": {
-  "bundleDependencies": false,
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  "deprecated": false,
+    },
-  "description": "微信JS-SDK",
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "devDependencies": {
+    "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"
 }

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

@@ -321,6 +321,12 @@
 					 "navigationBarTitleText": "AI 客服"
 					}
 				},
+				{
+					"path": "agreement/contenr",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},				
 				{
 					"path": "vr/index",
 					"style": {
@@ -912,16 +918,22 @@
 				},
 				//******************文件模块******************
 				{
-					"path": "files/list",
+				"path": "files/list",
-					"style": {
+				"style": {
-						// #ifdef APP-PLUS
+					// #ifdef APP-PLUS
-						"navigationStyle": "custom",
+					"navigationStyle": "custom",
-						// #endif
+					// #endif
-						"navigationBarTitleText": "查看文件"
+					"navigationBarTitleText": "查看文件"
-					}
 				}
-			]
+			},
-		}
+			{
+				"path": "file-preview/file-preview",
+				"style": {
+					"navigationBarTitleText": "文件预览"
+				}
+			}
+		]
+	}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/contact/contact.vue

@@ -1,511 +0,0 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
-		<view class="about w100">
-		    <view class="bg border-top"></view>
-		    <view class="list_cotact padding-top">
-		        <view class="container"> 
-					<!-- #ifdef H5 -->
-		            <view class="view_ul view_ul_one clearfix">
-		                <view @click="tapMessage" class="view_li w50_li  text-center" style="background: #1daa39;width: 100%;border-radius: 10rpx;">
-		                    <view class="bl bor" style="box-sizing: border-box;">
-		                        <image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-		                        <view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
-		                    </view>
-		                </view>
-		            </view>
-					<!-- <view @click="test()">Test</view> -->
-					<!-- #endif -->
-					<!-- #ifdef MP-WEIXIN -->
-					<view class="view_ul view_ul_one clearfix">
-					    <view class="view_li w50_li  text-center">
-					        <button class="bl bor" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" style="margin: 0;">
-					            <image mode="heightFix" :src="$util.img('public/static/img/kefu.png')"></image>
-					            <view class="name bl line1">专属客服</view>
-					        </button>
-					    </view>
-					    <view @click="tapMessage" class="view_li w50_li  text-center">
-					        <view class="bl bor" style="box-sizing: border-box;">
-					            <image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-					            <view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
-					        </view>
-					    </view>
-					</view>
-					<!-- #endif -->
-					
-		            <view class="view_ul_100"  v-for="(item,index)  in dataList" style="margin-bottom: 20rpx;">
-						
-		                <view class="bl clearfix bor bg-white" :style="{backgroundImage:' url('+$util.img(personnel_bg)+')',backgroundSize:'100% 100%'}">
-		                    <view class="fr">
-		                       
-		                        <view class="text" style="font-size: 40rpx;font-weight: 600;color:#333">{{item.realname}}</view>
-								 <view class="text">{{item.position}}</view>
-		                     <!--   <view class="text">{{item.mobile_text}}：{{item.mobile}}</view> -->
-		                        <view class="text" style="padding-bottom:20rpx;color:#0054a5">{{item.address}}</view>
-		                        <view class="contact_name" style="padding-top:30rpx;padding-bottom:0rpx;border-top: solid 1px #eee;font-size:28rpx;display: flex;">
-		                            <image mode="widthFix" :src="$util.img('public/static/img/boda.png')" style="margin-top: 8rpx;margin-right: 10rpx;"></image> 
-									<view style="flex: 1;">{{item.mobile}}</view>
-									<view style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)" @click="Tel(item.mobile)"><span style="background: #0054a5;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">一键拨打</span></view>
-								</view>
-								<view class="contact_name" style="padding-top:20rpx;padding-bottom:20rpx;font-size:28rpx;display: flex;">
-								    <image mode="widthFix" :src="$util.img('public/static/img/emall.png')" style="margin-top: 8rpx;margin-right: 10rpx;"></image> 
-									<view style="flex: 1;">{{item.email}}</view>
-									<view style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)" @click="tomap()"><span style="background: #888;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">立即导航</span></view>
-								</view>
-		                    </view>
-		                </view>
-		            </view>
-		         <!--   <view class="view_ul view_ul_two clearfix " v-if="dataList.length > 3" >
-		                <view @click="Tel(item.mobile)" class="view_li w50_li" v-for="(item,index)  in dataList" >
-		                    <view class="bl bor" hoverClass="none" url="" style="box-shadow: 5rpx 5rpx 10rpx #dcdcdc;height: 230rpx;position: relative;">
-		                        <view class="contact_name"  v-if="item.position">{{item.position_text}}：{{item.position}}</view>
-		                        <view class="contact_name">{{item.title_text}}：{{item.realname}}</view>
-		                        <view class="contact_name">{{item.mobile_text}}：{{item.mobile}}</view>
-		                        <view class="contact_name" style="padding-bottom:10rpx;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">{{item.address_text}}：{{item.address}}</view>
-		                        <view class="contact_name" style="padding-top:10rpx;padding-bottom:0rpx;border-top: solid 1px #eee;position: absolute;bottom: 0;display: flex">
-									<image mode="widthFix":src="$util.img('public/static/img/boda.png')"></image>
-									<view style="margin-top: -6rpx;margin-left: 10rpx;font-size: 24rpx;color:rgba(71,71,71,.79)">点击拨打电话</view>
-								</view>
-		                    </view>
-		                </view>
-		            </view> -->
-		          <map
-						v-if="shop.longitude>0 && shop.latitude >0 && ismessage == 0"
-						id="map"
-						style="width: 100%; height:400rpx"
-						scale="12"
-						:markers="markers"
-						bindupdated="bindupdated"
-						:longitude="shop.longitude"
-						:latitude="shop.latitude"
-						show-location>
-						<cover-view style="position:absolute;right:10px;bottom:30rpx;z-index:9;background:#4d83ff;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;" @click="tomap" ><cover-view style="font-size:24rpx">一键导航</cover-view>
-						</cover-view>    
-		            </map>
-		        </view>
-		
-		    </view>
-		
-		  <!--  <view wx:if="landline !=0">
-		        <button bindtap="contact">
-		            <view class="message">
-		                <image mode="widthFix" src="{{contactbg}}"></image>
-		            </view>
-		        </button>
-		    </view> -->
-		</view>
-		<!--留言弹窗--> 
-		<view class="goods-sku">
-			<uni-popup ref="informationPopup" type="bottom" @change="change">
-				<view class="liuyan-popup-layer popup-layer" >
-					<view class="head-wrap" @click="closeinformationPopup()">
-						<text>在线留言</text>
-						<text class="iconfont icon-close"></text>
-					</view>
-					<scroll-view scroll-y class="liuyan-body" >
-						<view style="padding: 0 30rpx;">
-							<view class="fui-cell-group">
-								<view class="fui-cell  ">
-									<view class="fui-cell-label ">姓名</view>
-									<view class="fui-cell-info">
-										<input v-model="Form.realname" class="fui-input" placeholder="请输入您的姓名" value=""></input>
-									</view>
-								</view>
-								<view class="fui-cell ">
-									<view class="fui-cell-label">联系方式</view>
-									<view class="fui-cell-info">
-										<input v-model="Form.mobile" class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" ></input>
-									</view>
-								</view>
-								<view class="fui-cell ">
-									<view class="fui-cell-label" style="position: absolute;top:10px">留言内容</view>
-									<view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
-										<!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
-										<textarea class="textarea" v-model="Form.remark" placeholder="请输入留言内容" style="font-size: 28rpx;padding: 10rpx;"></textarea>
-									</view>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-					<view class="button-box"><button type="primary" @click="save()">提交</button></view>
-				</view>
-			</uni-popup>
-		</view>
-	</view>
-	<hover-nav></hover-nav>
-	<diy-bottom-nav></diy-bottom-nav>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			dataList: [],
-			ismessage:0,
-			Form:{
-				realname:'',
-				mobile:'',
-				remark:''
-				
-			},
-			markers:[
-				{
-					id:1,
-				/*	width:20, //宽度
-					height:20, //高度*/
-				//	iconPath: '../../static/goal_weizhi.png', //目标位置图标路径
-					//这里的经纬度是 目的地 的经纬度
-					latitude:0,
-					longitude:0,
-					callout:{
-					/* 	title:123,
-						content:'123' */
-					}
-				}
-			],
-			landline:0,
-			shop:{
-				latitude:0,
-				longitude:0,
-			},
-			personnel_bg:''
-		};
-	},
-	onLoad(option) {
-		//刷新多语言
-		this.$langConfig.refresh();
-		this.$api.sendRequest({
-			url: '/api/member/personnel',
-			success: res => {
-				if (res.code == 0) {
-					this.dataList = res.data
-					this.shop = res.shop
-					this.personnel_bg = res.set.personnel_bg?res.set.personnel_bg:'public/static/img/diy_view/member_info_bg.png'
-					this.markers = [{
-						id:1,
-						//iconPath:'http://saas.cn//public/static/img/kefu.png',
-						latitude:this.shop.latitude,
-						longitude:this.shop.longitude
-					}]
-				}
-			},
-			fail: res => {
-			}
-		});
-	},
-	methods: {
-		test(){ 
-				//     channelReady(function(bAvailable) {
-				//         alert('是否存在框架服务：' + bAvailable)
-				//       })
-				// window.location.href = 'https://hapjs.org/app//[path][?key=value] hap://app//[path][?key=value] '
-				//参数说明： package: 应用包名，必选 path: 应用内页面的 path，可选，默认为首页 key-value: 希望传给页面的参数，可选，可以有多个
-
-			   // const isQuickAppEnv = navigator.userAgent.includes('HuaweiQuickApp');
-			   // let quickAppBridge;
-			   // console.log(window.quickapp)
-			   // if (isQuickAppEnv) {
-			   //   quickAppBridge = window.quickapp;
-			   // }
-			   // quickAppBridge.invoke('startQuickAppPage', { page: '/NativePage' });
-		   // window.postMessage({ action: 'someAction', data: 'some data' }, '*');
-		   // window.open('https://xcx10.5g-quickapp.com/test.php')
-		},
-		save(){
-			this.$api.sendRequest({
-				url: '/api/member/message',
-				data:this.Form,
-				success: res => {
-					this.$refs.informationPopup.close();
-					this.$util.showToast({
-						title: res.message
-					});
-				},
-				fail: res => {
-				}
-			});
-		},
-		change(e){
-			console.log(e)
-			this.ismessage = e.show?1:0
-		},
-		//留言打开
-		tapMessage(){
-			this.ismessage = 1
-			this.$refs.informationPopup.open();
-		},
-		//留言关闭
-		closeinformationPopup(){
-			this.ismessage = 0
-			this.$refs.informationPopup.close();
-		},
-		Tel(m){
-			uni.makePhoneCall({
-				phoneNumber:m+'',
-				success(e) {
-					console.log(e)
-				}
-			})
-		},
-		copy(text){
-			  uni.setClipboardData({
-			    data: text,
-			    success: function () {
-			      console.log('复制成功');
-			      // 可以添加用户友好的提示，例如使用uni.showToast提示复制成功
-			      uni.showToast({
-			        title: '复制成功',
-			        icon: 'success',
-			        duration: 2000
-			      });
-			    },
-			    fail: function () {
-			      console.log('复制失败');
-			      // 可以添加错误处理或用户友好的提示
-			    }
-			  });
-		},
-		tomap(){
-			  uni.openLocation({
-				latitude: parseFloat(this.shop.latitude),
-				longitude: parseFloat(this.shop.longitude),
-				name:"一键导航",
-			  })
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-// 留言
-.liuyan-popup-layer {
-	height: 660rpx;
-	.free-tip {
-		min-width: 72rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		text-align: center;
-		border: none;
-		padding: 8rpx 8rpx;
-		border-radius: $border-radius;
-		margin-right: 20rpx;
-		font-size: $font-size-activity-tag;
-		display: inline-block;
-		font-weight: bold;
-		color: var(--main-color);
-		background-color: var(--main-color-shallow);
-	}
-	.liuyan-body {
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: 60%;
-		.item {
-			padding: $padding 0;
-			margin: 0 30rpx;
-			border-bottom: 1px solid $color-line;
-			.value {
-				margin-left: 20rpx;
-			}
-			&:last-child {
-				border-bottom: 0;
-			}
-		}
-	}
-}
-.popup-layer {
-	background: #fff;
-	.head-wrap {
-		font-size: $font-size-toolbar;
-		line-height: 100rpx;
-		height: 100rpx;
-		display: block;
-		text-align: center;
-		.iconfont {
-			position: absolute;
-			float: right;
-			right: 44rpx;
-			font-size: $font-size-toolbar;
-		}
-	}
-	.button-box {
-		width: 100%;
-		position: absolute;
-		bottom: 0;
-		z-index: 1;
-		margin-bottom: 30rpx;
-		button {
-			height: 80rpx;
-			background-color: var(--goods-btn-color);
-		}
-	}
-}
-button, image, input, label, navigator, scroll-view, swiper, textarea, view {
-    box-sizing: border-box;
-}
-.w100 {
-    width: 100%;
-	padding-bottom: 60rpx;
-}
-.bg {
-   /* background: #5dc2d0;*/
-}
-.border-top {
-    border-top: 1px solid rgba(78,78,78,.1);
-}
-.padding-top {
-    padding-top: 30rpx;
-}
-.container {
-    align-items: center;
-    box-sizing: border-box;
-    flex-direction: column;
-    height: 100%;
-    justify-content: space-between;
-    padding: 0 30rpx;
-    width: 100%!important;
-}
-.clearfix {
-    zoom: 1;
-    overflow: hidden;
-}
-.text-center {
-    text-align: center;
-}
-.w50_li {
-    float: left;
-    margin-bottom: 20rpx;
-    width: 50%;
-}
-.w50_li:nth-child(odd) {
-    padding-right: 20rpx;
-}
-.bl {
-    display: block;
-}
-.bor {
-    border-radius: 10rpx;
-}
-image {
-    display: inline-block;
-    max-width: 100%;
-    position: relative;
-    z-index: 0;
-}
-image {
-    max-width: 100%;
-}
-.bl {
-    display: block;
-}
-.line1 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/*--当前页面css--*/
-
-.list_cotact .view_ul_one .bor {
-    padding: 40rpx;
-}
-
-.list_cotact .bor image {
-    height: 60rpx;
-}
-
-.list_cotact .bor .name,.view_ul_100 .name {
-    font-size: 32rpx;
-    line-height: 44rpx;
-    margin-top: 20rpx;
-    color:#fff
-}
-
-.list_cotact .view_ul_one .view_li:nth-child(1)>button {
-    background: #0054a5;
-    height: 200rpx;
-    line-height: 20rpx;
-}
-
-.list_cotact .view_ul_one .view_li:nth-child(2) {
-    background: #1daa39;
-    height: 200rpx;
-    line-height: 20rpx;
-	border-radius: 10rpx;
-}
-
-.view_ul_100 .fl {
-    width: 10%;
-}
-
-.view_ul_100 .fr {
-  /*  padding-left: 30rpx;*/
-    width: 100%;
-}
-
-.view_ul_100>view {
-    background: #fff;
-    // box-shadow: 5rpx 5rpx 10rpx #dcdcdc;
-}
-
-.view_ul_100 .text {
-    color: rgba(71,71,71,.79);
-    font-size: 24rpx;
-    margin-top: 10rpx;
-}
-
-.list_cotact .view_ul_100 .name {
-    margin-top: 0;
-}
-
-.list_cotact .view_ul_100>view {
-    padding: 20rpx 30rpx 0rpx 30rpx;
-}
-
-.list_cotact .view_ul_two .view_li>view {
-    background-color: #fff;
-    padding: 20rpx 30rpx 0rpx 30rpx;
-}
-
-.list_cotact .view_ul_two .view_li>view .address {
-    background-color: #5dc2d0;
-    color: #fff;
-    display: inline-block;
-    font-size: 28rpx;
-    line-height: 48rpx;
-    margin-bottom: 30rpx;
-    padding: 0 30rpx;
-    width: auto;
-}
-
-.view_ul_two {
-    margin-top: 20rpx;
-}
-
-.contact_name {
-    color: rgba(71,71,71,.79);
-    font-size: 24rpx;
-    line-height: 36rpx;
-    padding-left: 0rpx;
-}
-
-.contact_name image {
-    opacity: .79;
-    width: 30rpx;
-}
-
-
-
-.message {
-    /* background-color: rgba(0,0,0,.8); */
-    border-radius: 50%;
-    bottom: 50%;
-    height: 90rpx;
-    line-height: 74rpx;
-    position: fixed;
-    right: 30rpx;
-    text-align: center;
-    width: 90rpx;
-    z-index: 9999;
-}
-</style>

pages/dify-chat/dify-chat.vue

@@ -1,20 +0,0 @@
-<template>
-  <view class="container">
-    <web-view src="https://dify.aigc-quickapp.com/chatbot/ILbr8HHEgpBW2ggp"></web-view>
-  </view>
-</template>
-
-<script>
-export default {
-  onLoad() {
-    console.log('Dify 聊天页已加载')
-  }
-}
-</script>
-
-<style>
-.container {
-  width: 100%;
-  height: 100vh;
-}
-</style>

pages/index/index.vue

@@ -1,167 +1,159 @@
 <template>
-    <view :style="themeColor">
+	<view :style="themeColor">
-        <view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
-            class="page-img">
+			class="page-img">
-            <view class="site-info-box"
+			<view class="site-info-box"
-                v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-                <view class="site-info">
+				<view class="site-info">
-                    <view class="img-box" v-if="siteInfo.logo_square">
+					<view class="img-box" v-if="siteInfo.logo_square">
-                        <image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-                    </view>
+					</view>
-                    <view class="info-box" :style="{ color: '#ffffff' }">
+					<view class="info-box" :style="{ color: '#ffffff' }">
-                        <text class="font-size-base">{{ siteInfo.site_name }}</text>
+						<text class="font-size-base">{{ siteInfo.site_name }}</text>
-                        <text>{{ followOfficialAccount.welcomeMsg }}</text>
+						<text>{{ followOfficialAccount.welcomeMsg }}</text>
-                    </view>
+					</view>
-                </view>
+				</view>
-                <view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
+				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
-                    }}</view>
+					}}</view>
-            </view>
+			</view>
 
-            <diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="safeBgUrl"
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-                :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-                <template v-slot:components>
+		</view> -->
-                    <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"
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-                :style="{ backgroundImage: backgroundUrlStyle, paddingTop: paddingTop, marginTop: marginTop }">
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-                <diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+				<template v-slot:components>
-                    :followOfficialAccount="followOfficialAccount" />
+					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-                <ns-copyright v-show="isShowCopyRight" />
+						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
-            </view>
+				</template>
+				<template v-slot:default>
+					<ns-copyright v-show="isShowCopyRight" />
+				</template>
+			</diy-index-page>
 
-            <template v-if="adv.advshow != -1">
+			<view v-else class="bg-index"
-                <view @touchmove.prevent.stop>
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-                    <uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-                        <view class="small-bot">
+					:followOfficialAccount="followOfficialAccount" />
-                            <swiper autoplay="true" :circular="true" indicator-active-color="#fff"
+				<ns-copyright v-show="isShowCopyRight" />
-                                indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+			</view>
-                                <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 class="small-bot-close" @click="closePopupWindow">
-                                <i class="iconfont icon-round-close" style="color:#fff"></i>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-            </template>
 
-            <!-- 底部tabBar -->
+			<template v-if="adv.advshow != -1">
-            <view class="page-bottom" v-if="openBottomNav">
+				<view @touchmove.prevent.stop>
-                <diy-bottom-nav @callback="callback" :name="name" />
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-            </view>
+						<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 @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+			<view class="page-bottom" v-if="openBottomNav">
-                <uni-popup ref="officialAccountsPopup" type="center">
+				<diy-bottom-nav @callback="callback" :name="name" />
-                    <view class="official-accounts-wrap">
+			</view>
-                        <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 @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-                <view v-if="showTip" class="collectPopupWindow"
+				<uni-popup ref="officialAccountsPopup" type="center">
-                    :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<view class="official-accounts-wrap">
-                    <image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-                    <text @click="closeCollectPopupWindow">我知道了</text>
+						<text class="desc">关注了解更多</text>
-                </view>
+						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
-            </uni-popup>
+					</view>
+				</uni-popup>
+			</view>
 
-            <!-- 选择门店弹出框 -->
+			<!-- 收藏 -->
-            <view @touchmove.prevent.stop class="choose-store">
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-                <uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+				<view v-if="showTip" class="collectPopupWindow"
-                    <view class="choose-store-popup">
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-                        <view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-                        <view class="position-wrap">
+					<text @click="closeCollectPopupWindow">我知道了</text>
-                            <text class="iconfont icon-dizhi"></text>
+				</view>
-                            <text class="address">{{ currentPosition }}</text>
+			</uni-popup>
-                            <view class="reposition" @click="reposition"
+
-                                v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-                                <text class="iconfont icon-dingwei"></text>
+			<view @touchmove.prevent.stop class="choose-store">
-                                <text>重新定位</text>
+				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-                            </view>
+					<view class="choose-store-popup">
-                        </view>
+						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-                        <view class="store-wrap" v-if="nearestStore">
+						<view class="position-wrap">
-                            <text class="tag">当前门店</text>
+							<text class="iconfont icon-dizhi"></text>
-                            <view class="store-name">{{ nearestStore.store_name }}</view>
+							<text class="address">{{ currentPosition }}</text>
-                            <view class="address">{{ nearestStore.show_address }}</view>
+							<view class="reposition" @click="reposition"
-                            <view class="distance" v-if="nearestStore.distance">
+								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-                                <text class="iconfont icon-dizhi"></text>
+								<text class="iconfont icon-dingwei"></text>
-                                <text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+								<text>重新定位</text>
-                                    nearestStore.distance *
+							</view>
-                                    1000 +
+						</view>
-                                    'm' }}</text>
+						<view class="store-wrap" v-if="nearestStore">
-                            </view>
+							<text class="tag">当前门店</text>
-                        </view>
+							<view class="store-name">{{ nearestStore.store_name }}</view>
-                        <button type="primary" @click="enterStore">确认进入</button>
+							<view class="address">{{ nearestStore.show_address }}</view>
-                        <view class="other-store" @click="chooseOtherStore"
+							<view class="distance" v-if="nearestStore.distance">
-                            v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+								<text class="iconfont icon-dizhi"></text>
-                            <text>选择其他门店</text>
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
-                            <text class="iconfont icon-right"></text>
+									nearestStore.distance *
-                        </view>
+									1000 +
-                    </view>
+									'm' }}</text>
-                </uni-popup>
+							</view>
-            </view>
+						</view>
-            <hover-nav :need="true"></hover-nav>
+						<button type="primary" @click="enterStore">确认进入</button>
-            <privacy-popup ref="privacyPopup"></privacy-popup>
+						<view class="other-store" @click="chooseOtherStore"
-            <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-            <ns-login ref="login"></ns-login>
+							<text>选择其他门店</text>
-        </view>
+							<text class="iconfont icon-right"></text>
-    </view>
+						</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],
+	mixins: [diyJs, scroll, indexJs]
-
-   data() {
-     return {
-       diyData: { global: {}, value: null },
-       followOfficialAccount: {},
-       wechatQrcode: '',
-       adv: { advshow: -1, list: [] },
-       // ❌ 不要定义 siteInfo、bgUrl，除非你明确知道它们不会冲突
-     };
-   },
-
-    computed: {
-        // ✅ 安全获取 bgUrl（用于 diy-index-page 的 prop）
-        safeBgUrl() {
-            // 优先取全局配置中的 bgUrl，没有则用组件自己的 bgUrl（如有），否则为空
-            return this.diyData?.global?.bgUrl || this.bgUrl || '';
-        },
-
-        // ✅ 安全生成 background-image 样式字符串（用于 fallback 区域）
-        backgroundUrlStyle() {
-            const url = this.diyData?.global?.bgUrl || this.bgUrl || '';
-            return url ? `url(${url})` : 'none';
-        }
-    },
-
-    // 如果你的 mixin 中已经处理了数据加载，这里可以留空
-    // 否则建议在 created/mounted 中初始化默认值或请求数据
-    created() {
-        // 可选：如果 mixin 没有初始化 diyData，这里再兜底一次
-        if (!this.diyData) {
-            this.diyData = { global: {}, value: null };
-        }
-    }
 };
 </script>
 
@@ -170,86 +162,85 @@ export default {
 @import './public/css/index.scss';
 
 .small-bot {
-    width: 100%;
+	width: 100%;
-    height: 100%;
+	height: 100%;
-    position: fixed;
+	position: fixed;
-    top: 0;
+	top: 0;
-    bottom: 0;
+	bottom: 0;
-    left: 0;
+	left: 0;
-    right: 0;
+	right: 0;
-    z-index: 122;
+	z-index: 122;
 }
 
 .small-bot swiper {
-    width: 560rpx;
+	width: 560rpx;
-    height: 784rpx;
+	height: 784rpx;
-    margin: 120rpx auto 0;
+	margin: 120rpx auto 0;
-    border-radius: 10rpx;
+	border-radius: 10rpx;
-    overflow: hidden;
+	overflow: hidden;
 }
 
 .small-bot swiper .slide-image {
-    width: 100%;
+	width: 100%;
-    height: 100%;
+	height: 100%;
 }
 
 .small-bot-close {
-    width: 66rpx;
+	width: 66rpx;
-    height: 66rpx;
+	height: 66rpx;
-    border-radius: 50%;
+	border-radius: 50%;
-    text-align: center;
+	text-align: center;
-    line-height: 64rpx;
+	line-height: 64rpx;
-    font-size: 64rpx;
+	font-size: 64rpx;
-    color: #fff;
+	color: #fff;
-    margin: 30rpx auto 0;
+	margin: 30rpx auto 0;
 }
 
 .small-bot-close i {
-    font-size: 60rpx;
+	font-size: 60rpx;
 }
 </style>
-
 <style scoped>
-.swiper /deep/ .uni-swiper-dots-horizontal {
+.swiper ::v-deep .uni-swiper-dots-horizontal {
-    left: 40%;
+	left: 40%;
-    bottom: 40px
+	bottom: 40px
 }
 
 .wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-    background: none !important;
+	background: none !important;
 }
 
 .choose-store>>>.goodslist-uni-popup-box {
-    width: 80%;
+	width: 80%;
 }
 
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+::v-deep .diy-index-page .uni-popup .uni-popup__wrapper-box {
-    border-radius: 0;
+	border-radius: 0;
 }
 
-/deep/ .placeholder {
+::v-deep .placeholder {
-    height: 0;
+	height: 0;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
-    width: 0;
+	width: 0;
-    height: 0;
+	height: 0;
-    background-color: transparent;
+	background-color: transparent;
-    display: none;
+	display: none;
 }
 
-/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;
+	max-height: unset !important;
 }
 
-/deep/ .mescroll-totop {
+::v-deep .mescroll-totop {
-    /* #ifdef H5 */
+	/* #ifdef H5 */
-    right: 28rpx !important;
+	right: 28rpx !important;
-    bottom: 200rpx !important;
+	bottom: 200rpx !important;
-    /* #endif */
+	/* #endif */
-    /* #ifdef MP-WEIXIN */
+	/* #ifdef MP-WEIXIN */
-    right: 27rpx !important;
+	right: 27rpx !important;
-    bottom: 180rpx !important;
+	bottom: 180rpx !important;
-    /* #endif */
+	/* #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_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 class="swiper" @change="swiperChange" :interval="swiperInterval"
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
+                            :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 == 'video' }" @click="switchMedia = 'video'">{{
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
+                            $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()" -->
+                    <!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
+                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0">
-                        <view class="label">{{$lang('send')}}</view>
+                        <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>
+                                    <text
-								<!-- 	{{ item.name }} -->
+                                        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>
+                                        <text class="iconfont icon-dui"
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <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>
+                                        <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">
+                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
+                    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
+                    <slot name="skuspec"></slot>
-				</view>
+                </view>
-			
+
-				 
+
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
+                <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="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
+                                <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
+                                    <view>{{ goodsSkuDetail.merchinfo.merch_name }}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
+                                    <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </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" :class="{ 'empty-desc': !item.desc }"
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
+                                    v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                    <view class="item-icon" :class="{ 'empty-desc': !item.desc }">
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                        <text class="iconfont icon-dui color-base-text"
-                                        <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>
+                                            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.img(item.store_image)" v-if="item.store_image" />
-                                                <image :src="$util.getDefaultImage().store" v-else/>
+                                                <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-if="item.member_headimg" :src="$util.img(item.member_headimg)"
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
+                                            @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">
+                                        <text class="evaluator-name using-hidden"
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
+                                            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> -->
+                                <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
+                                <!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
+                                <mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
+                                <!-- :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 scroll from '@/common/js/scroll-view.js';
-    import detail from './detail.js';
+import detail from './detail.js';
 
-    export default {
+import pengpaiFadeinOut from '../pengpai-fadein-out/pengpai-fadein-out.vue';
-        name: 'goods-detail-view',
+
-        props: {
+export default {
-            goodsSkuDetail: {
+    name: 'goods-detail-view',
-                type: Object,
+    props: {
-                default: () => {
+        goodsSkuDetail: {
-                    return {};
+            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>

pages_order/detail_point.vue

@@ -296,7 +296,7 @@ export default {
 @import './public/css/detail.scss';
 </style>
 <style scoped>
-/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_order/list.vue

@@ -460,11 +460,11 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-/deep/ .uni-page {
+::v-deep .uni-page {
 	overflow: hidden;
 }
 
-/deep/ .mescroll-upwarp {
+::v-deep .mescroll-upwarp {
 	padding-bottom: 100rpx;
 }
 </style>

pages_order/payment.vue

@@ -5,7 +5,12 @@
 </template>
 
 <script>
+import commonPayment from './_components/common-payment/common-payment.vue';
+
 export default {
+	components: {
+		commonPayment
+	},
 	data() {
 		return {
 			api: {
@@ -90,15 +95,15 @@ export default {
 </script>
 
 <style scoped 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;
 }
-/deep/ .uni-popup {
+::v-deep .uni-popup {
 	z-index: 8;
 }
 </style>

pages_order/public/css/detail.scss

@@ -104,7 +104,7 @@ view {
 	}
 }
 
-/deep/ #action-date .uni-countdown .uni-countdown__number {
+::v-deep #action-date .uni-countdown .uni-countdown__number {
 	border: none !important;
 	padding: 0 !important;
 	margin: 0 !important;

pages_order/public/css/list.scss

@@ -353,7 +353,7 @@ $margin-both: 24rpx;
 	}
 }
 
-/deep/ #action-date .uni-countdown .uni-countdown__number {
+::v-deep #action-date .uni-countdown .uni-countdown__number {
 	border: none !important;
 	padding: 0 !important;
 	margin: 0 !important;

pages_promotion/fenxiao/apply.vue

@@ -421,11 +421,11 @@
 		width: 100%;
 	}
 
-	/deep/.uni-scroll-view {
+	::v-deep .uni-scroll-view {
 		background-color: #fff;
 	}
 
-	/deep/.uni-scroll-view::-webkit-scrollbar {
+	::v-deep .uni-scroll-view::-webkit-scrollbar {
 		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 		display: none;
 	}
@@ -802,7 +802,7 @@
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper-box {
 		border-radius: 20rpx;
 	}
 </style>

pages_promotion/fenxiao/bill.vue

@@ -84,11 +84,11 @@ export default {
 </script>
 
 <style lang="scss">
-/deep/ .empty {
+::v-deep .empty {
 	margin-top: 0 !important;
 }
 
-/deep/ .member-point .mescroll-uni-content {
+::v-deep .member-point .mescroll-uni-content {
 	overflow: hidden;
 }
 

pages_promotion/fenxiao/goods_list.vue

@@ -144,7 +144,7 @@ export default {
 }
 </style>
 <style lang="scss">
-/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;
 }
 

pages_promotion/fenxiao/index.vue

@@ -583,18 +583,18 @@ export default {
 @import './public/css/index.scss';
 </style>
 <style scoped lang="scss">
-/deep/ .uni-popup__wrapper {
+::v-deep .uni-popup__wrapper {
 	height: auto;
 }
 
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
+::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
 .uni-popup__wrapper.uni-custom.bottom .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;
 }
 </style>

pages_promotion/fenxiao/level.vue

@@ -299,21 +299,21 @@
 	@import './public/css/level.scss';
 </style>
 <style scoped 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;
 	}
 
-	/deep/ .uni-popup {
+	::v-deep .uni-popup {
 		z-index: 8;
 	}
 
-	/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_promotion/fenxiao/public/css/order.scss

@@ -1,8 +1,8 @@
-/deep/ .fixed {
+::v-deep .fixed {
 	position: relative;
 	top: 0;
 }
-/deep/ .empty {
+::v-deep .empty {
 	margin-top: 0 !important;
 }
 .cart-empty {

pages_promotion/merch/detail.vue

@@ -308,7 +308,7 @@
 		</uni-drawer>
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- 隐私弹窗 -->
+		<!-- 隐私弹窗 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
 	</view>
 </template>
@@ -333,7 +333,7 @@ export default {
 	background-color: #f5f5f5 !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 {
 	max-height: unset !important;
 }
 </style>

pages_promotion/merch/merchcategory.vue

@@ -228,38 +228,38 @@
 <style lang="scss">
 	@import './public/category.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_promotion/merch/public/category.scss

@@ -261,7 +261,7 @@
 				z-index: 2;
 			}
 	
-			/deep/ .template-four {
+			::v-deep .template-four {
 				position: relative;
 				z-index: 1;
 	
@@ -702,7 +702,7 @@
 						.right-wrap {
 							display: flex;
 							align-items: center;
-							justify-content: end;
+							justify-content: flex-end;
 		
 							.num {
 								width: auto;
@@ -856,7 +856,7 @@
 				}
 			}
 		
-			/deep/ .uni-popup__wrapper-box {
+			::v-deep .uni-popup__wrapper-box {
 				border-radius: 0;
 			}
 		
@@ -890,7 +890,7 @@
 				justify-content: center;
 			}
 		
-			/deep/ .loading-layer {
+			::v-deep .loading-layer {
 				background: #fff !important;
 			}
 		

pages_promotion/point/detail.vue

@@ -220,7 +220,7 @@
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 
 
-		<!-- 隐私弹窗 -->
+		<!-- 隐私弹窗 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
 	</view>
 </template>
@@ -523,7 +523,7 @@ export default {
 }
 </style>
 <style scoped>
-/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;
 }
 </style>

pages_promotion/point/order_list.vue

@@ -252,12 +252,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .fixed {
+::v-deep .fixed {
 	position: relative;
 	top: 0;
 }
 
-/deep/ .empty {
+::v-deep .empty {
 	padding-top: 0 !important;
 }
 

pages_promotion/point/payment.vue

@@ -324,17 +324,17 @@ export default {
 @import "@/common/css/order_parment.scss";
 </style>
 <style lang="scss" scoped>
-/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;
 }
 
-/deep/ .uni-popup {
+::v-deep .uni-popup {
 	z-index: 8;
 }
 </style>