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

chore：合并了提交

.gitignore

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

.local.config.js

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

.local.config.js.example

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

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

@@ -431,4 +431,4 @@ export default {
     return null;
     // #endif
   }
-};
+};

common/js/config-external.js

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

common/js/customer-service.js

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

@@ -69,6 +69,10 @@ export default {
 		servicerConfig() {
 			return this.$store.state.servicerConfig;
 		},
+		// 企业微信配置
+		wxworkConfig() {
+			return this.$store.state.wxworkConfig;
+		},
 		diySeckillInterval() {
 			return this.$store.state.diySeckillInterval;
 		},

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,89 @@
+/**
+ * 将常用的Uniapp提供的函数，存放到这里，按需引用
+ */
+
+
+/**
+ * 显示错误信息
+ * @param {Exception} err 
+ */
+const showError = (err) => {
+    uni.showToast({
+        title: err?.message || err?.errMsg || err?.toString(),
+        icon: 'none',
+        duration: 2000
+    });
+}
+
+/**
+ * 打电话
+ * @param {string} mobile 电话号码
+ */
+export const makePhoneCall = (mobile) => {
+    try {
+        uni.makePhoneCall({
+            phoneNumber: `${mobile}`,
+            success(e) {
+                console.log(e);
+            }
+        });
+    } catch (err) {
+        showError(err);
+    }
+}
+
+/**
+ * 拷贝文本
+ * @param {*} text 
+ * @param {*} options
+ */
+export const copyText = (text, { copySuccess = '', copyFailed = '' } = {}) => {
+    try {
+        console.log('copyText');
+        uni.setClipboardData({
+            data: `${text}`,
+            success: () => {
+                console.error('复制成功');
+                try {
+                    uni.showToast({
+                        title: copySuccess,
+                        icon: 'success',
+                        duration: 2000
+                    });
+                } catch (e) {
+                    showError(e);
+                }
+            },
+            fail: (err) => {
+                console.error('复制失败:', err);
+                try {
+                    uni.showToast({
+                        title: err.message || err.errMsg || copyFailed,
+                        icon: 'none',
+                        duration: 2000
+                    });
+                } catch (e) {
+                    showError(e);
+                }
+            }
+        });
+    } catch (err) {
+        showError(err);
+    }
+}
+
+/**
+ * 打开定位
+ * @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,
 
 	/**
 	 * 页面跳转
@@ -128,7 +130,9 @@ export default {
 	 */
 	redirectTo(to, param = {}, mode = 'navigateTo') {
 		let url = to;
-
+ if (to.indexOf('/article/list') !== -1) {
+        mode = 'reLaunch';
+    }
 		// 替换url中的前缀
 		console.log('页面跳转 redirectTo', to, param, mode);
 		url = adaptSubpackageUrl(url);
@@ -606,6 +610,33 @@ export default {
 
 
 
+	/**
+	 * 打开微信企业客服
+	 * @param {Function} fallbackFunc 降级处理函数
+	 */
+	openWxWorkServiceChat(fallbackFunc) {
+		// #ifdef MP-WEIXIN
+		let wxworkConfig = store.state?.wxworkConfig
+		if (wxworkConfig?.enable && wxworkConfig?.contact_url) {
+			// 直接使用活码链接跳转
+			wx.navigateToMiniProgram({
+				appId: 'wxeb490c6f9b154ef9', // 是企业微信官方小程序的AppID（固定值, 由腾讯企业微信团队维护, 不需要修改，用于展示"添加企业微信联系人"的官方页面）
+				path: `pages/contacts/externalContactDetail?url=${encodeURIComponent(wxworkConfig?.contact_url)}`,
+				success: () => {
+					console.log('跳转企业微信成功');
+				},
+				fail: (err) => {
+					console.error('跳转企业微信失败:', err);
+					// 降级处理：使用原有客服方式
+					fallbackFunc && fallbackFunc();
+				}
+			});
+		} else {
+			fallbackFunc && fallbackFunc();
+		}
+		// #endif		
+	},
+
 	/**
 	 * 自定义模板的跳转链接
 	 * @param {Object} link
@@ -628,7 +659,6 @@ export default {
 
 		} else if (link.appid) {
 			// 跳转其他小程序
-
 			uni.navigateToMiniProgram({
 				appId: link.appid,
 				path: link.page
@@ -636,7 +666,6 @@ export default {
 
 		} else if (link.name == 'MOBILE' && !link.wap_url) {
 			// 拨打电话
-
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
 				success: (res) => {
@@ -669,16 +698,19 @@ export default {
 					// #endif
 
 					// #ifdef MP-WEIXIN
-					wx.openCustomerServiceChat({
-						extInfo: {
-							url: config.wxwork_url
-						},
-						corpId: config.corpid,
-						showMessageCard: true,
-						sendMessageTitle: 'this.sendMessageTitle',
-						sendMessagePath: 'this.sendMessagePath',
-						sendMessageImg: 'this.sendMessageImg'
+					this.openWxWorkServiceChat(() => {
+						wx.openCustomerServiceChat({
+							extInfo: {
+								url: config.wxwork_url
+							},
+							corpId: config.corpid,
+							showMessageCard: true,
+							sendMessageTitle: 'this.sendMessageTitle',
+							sendMessagePath: 'this.sendMessagePath',
+							sendMessageImg: 'this.sendMessageImg'
+						});
 					});
+
 					// #endif
 					break;
 				case 'third':
@@ -1172,7 +1204,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) {
@@ -1180,7 +1212,7 @@ export default {
 				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
 				_isQuickApp = ua.indexOf('uniacid=') !== -1;
 			}
-		} catch (e) {}
+		} catch (e) { }
 
 		if (!_isQuickApp) {
 			const systemInfo = this.getDeviceInfo();
@@ -1200,9 +1232,36 @@ export default {
 
 		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
 		const systemInfo = this.getDeviceInfo();
-		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' || 
-		       (typeof qh !== 'undefined' && qh.platform === 'huawei');
+		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' ||
+			(typeof qh !== 'undefined' && qh.platform === 'huawei');
 		// #endif
 		return true;
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名
+	 * @param {string} str 蛇形命名字符串
+	 * @returns {string} 驼峰命名字符串
+	 */
+	snakeToCamel(str) {
+		return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+	},
+
+	/**
+	 * 蛇形命名转驼峰命名（递归处理对象中的所有属性名）
+	 * @param {Object} obj 包含蛇形命名字符串属性的对象
+	 * @returns {Object} 驼峰命名字符串属性的对象
+	 */
+	snakeToCamelForObj(obj) {
+		if (typeof obj !== 'object' || obj === null) return obj;
+		if (Array.isArray(obj)) return obj.map(this.snakeToCamelForObj.bind(this));
+		const newObj = {};
+		for (const key in obj) {
+			if (Object.hasOwnProperty.call(obj, key)) {
+				const newKey = this.snakeToCamel(key);
+				newObj[newKey] = this.snakeToCamelForObj(obj[key]);
+			}
+		}
+		return newObj;
 	}
 }

components-diy/css/common-channel.scss

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

components-diy/diy-article.vue

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

components-diy/diy-bargain.vue

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

components-diy/diy-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'">
-				<!-- 微信视频号 -->
-				<diy-wechat-channel :value="item"></diy-wechat-channel>
-			</template>
-
-			<template v-if="item.componentName == 'WechatChannelList'">
-				<!-- 微信视频号列表 -->
-				<diy-wechat-channel-list :value="item"></diy-wechat-channel-list>
+			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
+				<!-- 视频号列表 -->
+				<diy-channel-list :value="item"></diy-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-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 /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom,
+.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
 }

components-diy/diy-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/ai-chat-message.json

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

components/chat-message/chat-message.vue

@@ -156,11 +156,11 @@
 </script>
 
 <style lang="scss">
-	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background-color: #000;
 	}
 
-	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 		max-width: 100%;
 		width: 100%;
 	}

components/hover-nav/hover-nav.vue

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

components/ns-contact/ns-contact.vue

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

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

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

components/ns-login/ns-login.vue

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

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;

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 | "" | 视频号名称 |
-| avatarUrl | String | "" | 视频号头像URL |
+| value | Object | 必填 | 视频数据对象 |
+| listMode | Boolean | false | 是否为列表模式 |
+| videoHeight | Number | 220 | 视频高度（仅适用于嵌入式播放） |
+| titleLineClamp | Number | 1 | 标题显示行数 |
+| showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| coverStyle | Object | {} | 视频封面图样式 |
+| playBtnStyle | Object | {} | 播放按钮样式 |
+| autoPlay | Boolean | false | 是否自动播放（仅适用于嵌入式播放） |
+
+#### value对象属性说明
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|--------|------|--------|------|
+| feedId | String | "" | 视频 feedId |
+| finderUserName | String | "" | 视频号用户名 |
+| feedToken | String | "" | 视频 token |
+| coverUrl | String | "" | 视频封面图 |
 | videoTitle | String | "" | 视频标题 |
-| coverUrl | String | "" | 视频封面URL |
-| feedId | String | "" | 视频号内容ID，用于播放视频 |
-| viewCount | Number | 0 | 视频观看次数 |
-| showFollow | Boolean | false | 是否显示关注按钮 |
-| componentAngle | String | "" | 组件圆角类型，可选值：round |
-| topAroundRadius | Number | 0 | 顶部圆角半径 |
-| bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| viewCount | Number | 0 | 观看次数 |
+| showViewCount | Boolean | false | 是否显示观看次数 |
+| embedMode | Boolean | false | 是否启用嵌入式播放 |
 
 #### 事件说明
 
 | 事件名 | 说明 | 参数 |
 |--------|------|------|
-| 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 | [] | 视频号列表数据 |
-| rowCount | Number | 2 | 每行显示的视频号数量 |
-| showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
-| mode | String | "" | 显示模式 |
-| font | Object | {} | 字体样式配置 |
-| componentBgColor | String | "#fff" | 组件背景颜色 |
-| componentAngle | String | "" | 组件圆角类型，可选值：round |
-| topAroundRadius | Number | 0 | 顶部圆角半径 |
-| bottomAroundRadius | Number | 0 | 底部圆角半径 |
-| ornament | Object | {} | 装饰样式配置 |
+| value | Object | 必填 | 组件配置数据 |
+| value.list | Array | [] | 视频号列表数据 |
+| value.rowCount | Number | 2 | 每行显示的视频号数量 |
+| value.showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
+| value.mode | String | "" | 显示模式 |
+| value.font | Object | {} | 字体样式配置 |
+| value.componentBgColor | String | "#fff" | 组件背景颜色 |
+| value.componentAngle | String | "" | 组件圆角类型，可选值：round |
+| value.topAroundRadius | Number | 0 | 顶部圆角半径 |
+| value.bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| value.ornament | Object | {} | 装饰样式配置 |
+| value.titleLineClamp | Number | 1 | 标题显示行数 |
+| value.showPlayBtn | Boolean | true | 是否显示播放按钮 |
+| value.aspectRatio | String | '16:9' | 视频比例，可选值：'16:9', '3:4' |
+| value.coverStyle | Object | {} | 视频封面图样式 |
+| value.playBtnStyle | Object | {} | 播放按钮样式 |
+| value.imageSize | Number | 0 | 图片尺寸（仅在特定模式下使用） |
+| value.pageCount | Number | 1 | 每页显示的视频数量 |
+| value.carousel | Object | {} | 轮播配置 |
+| value.carousel.type | String | "" | 轮播类型，可选值：default, hide |
+| value.carousel.autoplay | Boolean | false | 是否自动播放 |
+| value.carousel.interval | Number | 3000 | 自动播放间隔，单位毫秒 |
+| value.carousel.duration | Number | 500 | 切换动画时长，单位毫秒 |
+| value.carousel.circular | Boolean | false | 是否循环播放 |
 
 #### list数组项说明
 
@@ -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 = {
-
-	// 底部选项卡
-	tabBar: {
-		home: 'index',
-		category: 'category',
-		cart: 'cart',
-		member: 'member',
-	},
-
-	//公共
-	common: {
-		//语言包名称
-		name: '英文',
-		mescrollTextInOffset: 'pull to refresh',
-		mescrollTextOutOffset: 'Loading...',
-		mescrollEmpty: "No data available",
-		goodsRecommendTitle: 'Guess you like',
-		currencySymbol: '¥',
-		submit: 'Submit',
-		searchTip: 'Please enter search keywords'
-	},
-
-	login: 'Login/Register',
-	loginTips: 'Click to login and enjoy more exciting information',
-	toLogin: 'Go to login',
-	toGoodsCategoryPage: 'Go shopping',	
-}
+export const lang = {
+
+	// 底部选项卡
+	tabBar: {
+		home: 'index',
+		category: 'category',
+		cart: 'cart',
+		member: 'member',
+	},
+
+	//公共
+	common: {
+		//语言包名称
+		name: '英文',
+		mescrollTextInOffset: 'pull to refresh',
+		mescrollTextOutOffset: 'Loading...',
+		mescrollEmpty: "No data available",
+		goodsRecommendTitle: 'Guess you like',
+		currencySymbol: '¥',
+		submit: 'Submit',
+		searchTip: 'Please enter search keywords'
+	},
+
+	//customer service
+	customer: {
+		weChatKefu: 'WeChat Customer Service',
+		systemKefu: 'System Customer Service',
+		weChatWorkKefu: 'WeChat Work Customer Service',
+	},
+
+	login: 'Login/Register',
+	loginTips: 'Click to login and enjoy more exciting information',
+	toLogin: 'Go to login',
+	toGoodsCategoryPage: 'Go shopping',
+}

lang/zh-cn/article/detail.js

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

lang/zh-cn/article/list.js

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

lang/zh-cn/common.js

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

manifest.json

@@ -58,7 +58,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx29215aa1bd97bbd6",
+        "appid" : "wx5e649e2286b29bdf",
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
@@ -66,6 +66,7 @@
             "minified" : true
         },
         "usingComponents" : true,
+        "lazyCodeLoading" : "requiredComponents",
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "为了更好地为您提供服务"
@@ -103,7 +104,7 @@
         },
         "router" : {
             "mode" : "history",
-            "base" : "/hwappx/2811/"
+            "base" : "/hwappx/common/"
         },
         "title" : "",
         "devServer" : {
@@ -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')
-wx.ready(function(){
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
     // TODO
 });
 ```

node_modules/jweixin-module/package.json

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

package.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/index/index.vue

@@ -1,246 +1,246 @@
-<template>
-	<view :style="themeColor">
-		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
-			class="page-img">
-			<view class="site-info-box"
-				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-				<view class="site-info">
-					<view class="img-box" v-if="siteInfo.logo_square">
-						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-					</view>
-					<view class="info-box" :style="{ color: '#ffffff' }">
-						<text class="font-size-base">{{ siteInfo.site_name }}</text>
-						<text>{{ followOfficialAccount.welcomeMsg }}</text>
-					</view>
-				</view>
-				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
-					}}</view>
-			</view>
-
-			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-		</view> -->
-
-			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-				<template v-slot:components>
-					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
-				</template>
-				<template v-slot:default>
-					<ns-copyright v-show="isShowCopyRight" />
-				</template>
-			</diy-index-page>
-
-			<view v-else class="bg-index"
-				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-					:followOfficialAccount="followOfficialAccount" />
-				<ns-copyright v-show="isShowCopyRight" />
-			</view>
-
-			<template v-if="adv.advshow != -1">
-				<view @touchmove.prevent.stop>
-					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-						<view class="small-bot">
-							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
-							<view bindtap="adverclose">跳过</view>
-							<view class="time">{{clock}}s</view>
-						</view>
-						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
-							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
-						</view> -->
-							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
-								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-								<swiper-item v-for="(item, index) in adv.list" :key="index">
-									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
-										:src="$util.img(item.imageUrl)" width="100%"></image>
-									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-								</swiper-item>
-							</swiper>
-							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-								<i class="iconfont icon-round-close" style="color:#fff"></i>
-							</view>
-						</view>
-						<!-- 	<view class="image-wrap">
-						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
-							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
-								<view class="item">
-									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
-					</uni-popup>
-				</view>
-			</template>
-
-			<!-- 底部tabBar -->
-			<view class="page-bottom" v-if="openBottomNav">
-				<diy-bottom-nav @callback="callback" :name="name" />
-			</view>
-
-			<!-- 关注公众号弹窗 -->
-			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-				<uni-popup ref="officialAccountsPopup" type="center">
-					<view class="official-accounts-wrap">
-						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-						<text class="desc">关注了解更多</text>
-						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
-					</view>
-				</uni-popup>
-			</view>
-
-			<!-- 收藏 -->
-			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-				<view v-if="showTip" class="collectPopupWindow"
-					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-					<text @click="closeCollectPopupWindow">我知道了</text>
-				</view>
-			</uni-popup>
-
-			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-			<view @touchmove.prevent.stop class="choose-store">
-				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-					<view class="choose-store-popup">
-						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-						<view class="position-wrap">
-							<text class="iconfont icon-dizhi"></text>
-							<text class="address">{{ currentPosition }}</text>
-							<view class="reposition" @click="reposition"
-								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-								<text class="iconfont icon-dingwei"></text>
-								<text>重新定位</text>
-							</view>
-						</view>
-						<view class="store-wrap" v-if="nearestStore">
-							<text class="tag">当前门店</text>
-							<view class="store-name">{{ nearestStore.store_name }}</view>
-							<view class="address">{{ nearestStore.show_address }}</view>
-							<view class="distance" v-if="nearestStore.distance">
-								<text class="iconfont icon-dizhi"></text>
-								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
-									nearestStore.distance *
-									1000 +
-									'm' }}</text>
-							</view>
-						</view>
-						<button type="primary" @click="enterStore">确认进入</button>
-						<view class="other-store" @click="chooseOtherStore"
-							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text>选择其他门店</text>
-							<text class="iconfont icon-right"></text>
-						</view>
-					</view>
-				</uni-popup>
-			</view>
-			<hover-nav :need="true"></hover-nav>
-			<!-- 隐私协议 -->
-			<privacy-popup ref="privacyPopup"></privacy-popup>
-			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-			<ns-login ref="login"></ns-login>
-		</view>
-	</view>
-</template>
-
-<script>
-
-
-import diyJs from '@/common/js/diy.js';
-import scroll from '@/common/js/scroll-view.js';
-import indexJs from './public/js/index.js';
-
-export default {
-	mixins: [diyJs, scroll, indexJs]
-};
-</script>
-
-<style lang="scss">
-@import '@/common/css/diy.scss';
-@import './public/css/index.scss';
-
-.small-bot {
-	width: 100%;
-	height: 100%;
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 122;
-}
-
-.small-bot swiper {
-	width: 560rpx;
-	height: 784rpx;
-	margin: 120rpx auto 0;
-	border-radius: 10rpx;
-	overflow: hidden;
-}
-
-.small-bot swiper .slide-image {
-	width: 100%;
-	height: 100%;
-}
-
-.small-bot-close {
-	width: 66rpx;
-	height: 66rpx;
-	border-radius: 50%;
-	text-align: center;
-	line-height: 64rpx;
-	font-size: 64rpx;
-	color: #fff;
-	margin: 30rpx auto 0;
-}
-
-.small-bot-close i {
-	font-size: 60rpx;
-}
-</style>
-<style scoped>
-.swiper /deep/ .uni-swiper-dots-horizontal {
-	left: 40%;
-	bottom: 40px
-}
-
-.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	background: none !important;
-}
-
-.choose-store>>>.goodslist-uni-popup-box {
-	width: 80%;
-}
-
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-	border-radius: 0;
-}
-
-/deep/ .placeholder {
-	height: 0;
-}
-
-/deep/::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	background-color: transparent;
-	display: none;
-}
-
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-
-/deep/ .mescroll-totop {
-	/* #ifdef H5 */
-	right: 28rpx !important;
-	bottom: 200rpx !important;
-	/* #endif */
-	/* #ifdef MP-WEIXIN */
-	right: 27rpx !important;
-	bottom: 180rpx !important;
-	/* #endif */
-}
+<template>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="site-info-box"
+				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+				<view class="site-info">
+					<view class="img-box" v-if="siteInfo.logo_square">
+						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+					</view>
+					<view class="info-box" :style="{ color: '#ffffff' }">
+						<text class="font-size-base">{{ siteInfo.site_name }}</text>
+						<text>{{ followOfficialAccount.welcomeMsg }}</text>
+					</view>
+				</view>
+				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
+					}}</view>
+			</view>
+
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view> -->
+
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<template v-slot:components>
+					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
+				</template>
+				<template v-slot:default>
+					<ns-copyright v-show="isShowCopyRight" />
+				</template>
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:followOfficialAccount="followOfficialAccount" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</view>
+
+			<template v-if="adv.advshow != -1">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="small-bot">
+							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
+							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
+								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+								<swiper-item v-for="(item, index) in adv.list" :key="index">
+									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
+										:src="$util.img(item.imageUrl)" width="100%"></image>
+									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+								</swiper-item>
+							</swiper>
+							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+								<i class="iconfont icon-round-close" style="color:#fff"></i>
+							</view>
+						</view>
+						<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 关注公众号弹窗 -->
+			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+				<uni-popup ref="officialAccountsPopup" type="center">
+					<view class="official-accounts-wrap">
+						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+						<text class="desc">关注了解更多</text>
+						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+					</view>
+				</uni-popup>
+			</view>
+
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+			<view @touchmove.prevent.stop class="choose-store">
+				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+					<view class="choose-store-popup">
+						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+						<view class="position-wrap">
+							<text class="iconfont icon-dizhi"></text>
+							<text class="address">{{ currentPosition }}</text>
+							<view class="reposition" @click="reposition"
+								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+								<text class="iconfont icon-dingwei"></text>
+								<text>重新定位</text>
+							</view>
+						</view>
+						<view class="store-wrap" v-if="nearestStore">
+							<text class="tag">当前门店</text>
+							<view class="store-name">{{ nearestStore.store_name }}</view>
+							<view class="address">{{ nearestStore.show_address }}</view>
+							<view class="distance" v-if="nearestStore.distance">
+								<text class="iconfont icon-dizhi"></text>
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+									nearestStore.distance *
+									1000 +
+									'm' }}</text>
+							</view>
+						</view>
+						<button type="primary" @click="enterStore">确认进入</button>
+						<view class="other-store" @click="chooseOtherStore"
+							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text>选择其他门店</text>
+							<text class="iconfont icon-right"></text>
+						</view>
+					</view>
+				</uni-popup>
+			</view>
+			<hover-nav :need="true"></hover-nav>
+			<!-- 隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+			<ns-login ref="login"></ns-login>
+		</view>
+	</view>
+</template>
+
+<script>
+
+
+import diyJs from '@/common/js/diy.js';
+import scroll from '@/common/js/scroll-view.js';
+import indexJs from './public/js/index.js';
+
+export default {
+	mixins: [diyJs, scroll, indexJs]
+};
+</script>
+
+<style lang="scss">
+@import '@/common/css/diy.scss';
+@import './public/css/index.scss';
+
+.small-bot {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 122;
+}
+
+.small-bot swiper {
+	width: 560rpx;
+	height: 784rpx;
+	margin: 120rpx auto 0;
+	border-radius: 10rpx;
+	overflow: hidden;
+}
+
+.small-bot swiper .slide-image {
+	width: 100%;
+	height: 100%;
+}
+
+.small-bot-close {
+	width: 66rpx;
+	height: 66rpx;
+	border-radius: 50%;
+	text-align: center;
+	line-height: 64rpx;
+	font-size: 64rpx;
+	color: #fff;
+	margin: 30rpx auto 0;
+}
+
+.small-bot-close i {
+	font-size: 60rpx;
+}
+</style>
+<style scoped>
+.swiper ::v-deep .uni-swiper-dots-horizontal {
+	left: 40%;
+	bottom: 40px
+}
+
+.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none !important;
+}
+
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
+
+::v-deep .diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
+
+::v-deep .placeholder {
+	height: 0;
+}
+
+::v-deep ::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
+
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+
+::v-deep .mescroll-totop {
+	/* #ifdef H5 */
+	right: 28rpx !important;
+	bottom: 200rpx !important;
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	right: 27rpx !important;
+	bottom: 180rpx !important;
+	/* #endif */
+}
 </style>

pages/index/public/css/index.scss

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

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

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

pages_goods/cart.vue

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

pages_goods/category.vue

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

pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue

@@ -161,7 +161,7 @@
 	};
 </script>
 <style scoped>
-	.register-box /deep/ .uni-scroll-view {
+	.register-box ::v-deep .uni-scroll-view {
 		background: unset !important;
 	}
 
@@ -171,11 +171,11 @@
 		/* margin-top:350rpx; */
 	}
 
-	/deep/ .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper-box {
 		background-color: transparent !important;
 	}
 
-	/deep/ .birthday-title-hint uni-image {
+	::v-deep .birthday-title-hint uni-image {
 		width: 113rpx !important;
 		height: 24rpx !important;
 	}

pages_tool/_components/ns-new-gift/ns-new-gift.vue

@@ -168,17 +168,17 @@
 </script>
 
 <style scoped>
-	/deep/ .newgift-content uni-image {
+	::v-deep .newgift-content uni-image {
 		width: 113rpx !important;
 		height: 24rpx !important;
 	}
 
-	/deep/ .reward-popup .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	::v-deep .reward-popup .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 		max-height: unset !important;
 		overflow-y: unset;
 	}
 
-	.register-box /deep/ .uni-scroll-view {
+	.register-box ::v-deep .uni-scroll-view {
 		background: unset !important;
 	}