Merge branch 'dev/1.0' into custom/common

.gitignore

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

.local.config.js

@@ -38,10 +38,6 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-    'local-2': { // 测试平台
-        uniacid: 2,
-        domain: 'http://localhost:8050/',
-    },    
 })['2811']; // 选择要使用的环境配置
 
 export default localDevConfig;

.local.config.js.example

@@ -18,10 +18,6 @@ const localDevConfig = ({
         uniacid: 2811,
         domain: 'https://xcx6.aigc-quickapp.com/',
     },  
-    '2812': { // IVD数商模式
-        uniacid: 2812,
-        domain: 'https://xcx6.aigc-quickapp.com/',
-    },    
     '2724': { // 生物菌肥
         uniacid: 2724,
         domain: 'https://xcx.aigc-quickapp.com/',
@@ -42,14 +38,6 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-    'local-2': { // 测试平台
+})['2811']; // 选择要使用的环境配置
-        uniacid: 2,
-        domain: 'http://localhost:8050/',
-    },    
-    'local-2-dev': { // 本地开发测试平台
-        uniacid: 2,
-        domain: 'http://localhost:8050/',
-    },     
-})['2812']; // 选择要使用的环境配置
 
 export default localDevConfig;

App.vue

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

common/css/diy.scss

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

common/css/goods_detail.scss

@@ -870,13 +870,13 @@
 // 海报
 // .uni-popup__wrapper-box
 .poster-layer {
-    ::v-deep .uni-popup__wrapper.center {
+    /deep/ .uni-popup__wrapper.center {
         width: 100vw!important;
         height: 100vh!important;
         background: none!important;
     }
     
-    ::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+    /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;
 }
 
-::v-deep ::-webkit-scrollbar {
+/deep/::-webkit-scrollbar {
 	width: 0;
 	height: 0;
 	background-color: transparent;
@@ -609,7 +609,7 @@ scroll-view ::-webkit-scrollbar {
 	font-weight: 500!important;
 }
 
-::v-deep .reward-popup .uni-popup__wrapper-box {
+/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
 // 下拉加载动画【页面】
-::v-deep body uni-page-refresh div{
+/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;
 }
-::v-deep body uni-page-refresh div::after{
+/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;
 }
-::v-deep body uni-page-refresh div::before{
+/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;
 }
-::v-deep body uni-page-refresh > div > div{
+/deep/ body uni-page-refresh > div > div{
 	display: none !important;
 }
 
 // 下拉加载动画【scroll-view】
-::v-deep body .uni-scroll-view-refresher{
+/deep/ body .uni-scroll-view-refresher{
 	background-color: transparent !important;
 }
-::v-deep body .uni-scroll-view-refresher div{
+/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;
 }
-::v-deep body .uni-scroll-view-refresher div::after{
+/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;
 }
-::v-deep body .uni-scroll-view-refresher div::before{
+/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;
 }
-::v-deep body .uni-scroll-view-refresher > div > div{
+/deep/ body .uni-scroll-view-refresher > div > div{
 	display: none !important;
 }
 @keyframes backgroundChange {

common/css/mp_html_patch.scss

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

common/css/order_parment.scss

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

common/js/config-external.js

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

common/js/config.js

@@ -20,10 +20,6 @@ try {
 // 默认域名, 自定义发行时可以修改
 let defaultDomain = ''; 
 
-// #ifdef H5_XCX_5G_QUICKAPP_COM
-defaultDomain = 'https://xcx20.5g-quickapp.com';
-// #endif
-
 // #ifdef H5_XCX_AIGC_QUICKAPP_COM
 defaultDomain = 'https://xcx.aigc-quickapp.com/';
 // #endif

common/js/customer-service.js

@@ -2,68 +2,13 @@
  * 客服统一处理服务
  * 整合各种客服方式，提供统一的调用接口
  */
-class CustomerService {
+export class CustomerService {
-    constructor(vueInstance, externalConfig = {}) {
+    constructor(vueInstance, externalConfig = null) {
-        if (!vueInstance.$lang) {
-            throw new Error('CustomerService 必须在 Vue 实例中初始化');
-        }
-
         this.vm = vueInstance;
         this.externalConfig = externalConfig; // 外部传入的最新配置（优先级最高）
         this.latestPlatformConfig = null;
     }
 
-    getSupoortKeFuList() {
-        if (!this.vm) return [];
-
-        const vm = this.vm;
-
-        return [
-            {
-                id: 'weixin-official',
-                name: vm.$lang('customer.weChatKefu'),
-                isOfficial: true,
-                type: 'weapp'
-            },
-            {
-                id: 'custom-kefu',
-                name: vm.$lang('customer.systemKefu'),
-                isOfficial: false
-            },
-            {
-                id: 'qyweixin-kefu',
-                name: vm.$lang('customer.weChatWorkKefu'),
-                isOfficial: false
-            },
-        ]
-    }
-
-    /**
-     * 打开客服选择弹窗
-     */
-    openCustomerSelectPopupDialog() {
-        const kefu_list = this.getSupoortKeFuList();
-        const kefuNames = kefu_list.map(item => item.name);
-
-        uni.showActionSheet({
-            itemList: kefuNames,
-            success: (res) => {
-                const kefu = kefu_list[res.tapIndex];
-                this.externalConfig = kefu ?? this.externalConfig ?? {};
-                if (kefu.isOfficial) {
-                    uni.openCustomerServiceConversation({
-                        sessionFrom: 'weapp',
-                        showMessageCard: true
-                    });
-                } else if (kefu.id === 'custom-kefu') {
-                    this.handleCustomerClick();
-                } else if (kefu.id === 'qyweixin-kefu') {
-                    this.handleQyWeixinKefuClick();
-                }
-            }
-        });
-    }
-
     /**
      * 强制刷新配置（支持传入外部配置）
      * @param {Object} externalConfig 外部最新配置
@@ -177,11 +122,35 @@ class CustomerService {
     }
 
     /**
-     * 跳转到AI客服页面
+     * 跳转到Dify客服页面
      */
-    openAIKeFuService() {
+    openDifyService() {
-        const vm = this.vm;
+        try {
-        vm.$util.redirectTo(vm.$util.AI_CHAT_PAGE_URL);
+            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'
+            });
+        }
     }
 
     /**
@@ -201,7 +170,7 @@ class CustomerService {
         }
 
         const config = this.getPlatformConfig();
-        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options || {};
+        const { niushop = {}, sendMessageTitle = '', sendMessagePath = '', sendMessageImg = '' } = options;
 
         if (config.type === 'none') {
             this.showNoServicePopup();
@@ -211,7 +180,7 @@ class CustomerService {
         // 核心分支：根据最新的type处理
         switch (config.type) {
             case 'aikefu':
-                this.openAIKeFuService();
+                this.openDifyService();
                 break;
             case 'wxwork':
                 this.openWxworkService(false, config, options);
@@ -242,7 +211,7 @@ 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) {
@@ -323,7 +292,7 @@ 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;
@@ -412,7 +381,7 @@ class CustomerService {
         console.log('支付宝小程序客服', config);
         switch (config.type) {
             case 'aikefu':
-                this.openAIKeFuService();
+                this.openDifyService();
                 break;
             case 'third':
                 this.openThirdService(config);
@@ -426,22 +395,13 @@ class CustomerService {
     /**
      * 拨打电话
      */
-    makePhoneCall(mobileNumber) {
+    makePhoneCall() {
-        if (mobileNumber) {
+        this.vm.$api.sendRequest({
-            return uni.makePhoneCall({
+            url: '/api/site/shopcontact',
-                phoneNumber: mobileNumber
+            success: res => {
-            });
+                if (res.code === 0 && res.data?.mobile) {
-        }
-
-        // 从缓存中获取电话信息
-        uni.getStorage({
-            key: 'shopInfo',
-            success: (res) => {
-                const shopInfo = res.data;
-                const mobile = shopInfo?.mobile ?? '';
-                if (mobile) {
                     uni.makePhoneCall({
-                        phoneNumber: mobile
+                        phoneNumber: res.data.mobile
                     });
                 } else {
                     uni.showToast({
@@ -449,6 +409,12 @@ class CustomerService {
                         icon: 'none'
                     });
                 }
+            },
+            fail: () => {
+                uni.showToast({
+                    title: '获取客服电话失败',
+                    icon: 'none'
+                });
             }
         });
     }
@@ -540,6 +506,6 @@ class CustomerService {
  * @param {Object} externalConfig 外部最新配置
  * @returns {CustomerService} 客服服务实例
  */
-export function createCustomerService(vueInstance, externalConfig = {}) {
+export function createCustomerService(vueInstance, externalConfig = null) {
     return new CustomerService(vueInstance, externalConfig);
 }

common/js/golbalConfig.js

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

common/js/share.js

@@ -1,100 +0,0 @@
-// 文件分享工具函数
-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/style_color.js

@@ -61,8 +61,8 @@ export default {
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
 		...{
-			hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC'
+			hover_nav_bg_color: '#c6251b', //背景色: 红色 '#c6251b', 白色： '#FFFC'
-			hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
+			hover_nav_text_color: '#FFFFFF' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
 		},
 	},
 	'green': {

common/js/uniapp.utils.js

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

common/js/util.js

@@ -13,7 +13,6 @@ 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 = [
@@ -120,7 +119,6 @@ export default {
 	CONTACT_PAGE_URL,
 	INDEX_PAGE_URL,
 	LOGIN_PAGE_URL,
-	AI_CHAT_PAGE_URL,
 
 	/**
 	 * 页面跳转
@@ -608,33 +606,6 @@ 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
@@ -657,6 +628,7 @@ export default {
 
 		} else if (link.appid) {
 			// 跳转其他小程序
+
 			uni.navigateToMiniProgram({
 				appId: link.appid,
 				path: link.page
@@ -664,6 +636,7 @@ export default {
 
 		} else if (link.name == 'MOBILE' && !link.wap_url) {
 			// 拨打电话
+
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
 				success: (res) => {
@@ -696,19 +669,16 @@ export default {
 					// #endif
 
 					// #ifdef MP-WEIXIN
-					this.openWxWorkServiceChat(() => {
+					wx.openCustomerServiceChat({
-						wx.openCustomerServiceChat({
+						extInfo: {
-							extInfo: {
+							url: config.wxwork_url
-								url: config.wxwork_url
+						},
-							},
+						corpId: config.corpid,
-							corpId: config.corpid,
+						showMessageCard: true,
-							showMessageCard: true,
+						sendMessageTitle: 'this.sendMessageTitle',
-							sendMessageTitle: 'this.sendMessageTitle',
+						sendMessagePath: 'this.sendMessagePath',
-							sendMessagePath: 'this.sendMessagePath',
+						sendMessageImg: 'this.sendMessageImg'
-							sendMessageImg: 'this.sendMessageImg'
-						});
 					});
-
 					// #endif
 					break;
 				case 'third':
@@ -843,15 +813,6 @@ export default {
 			uni.navigateBack();
 		}
 	},
-	/**
-	 * 隐藏“返回首页/小房子”按钮
-	 * 这个函数，用到页面show, onshow 的生命周期时
-	 */
-	hideHomeButton() {
-		// #ifdef MP-WEIXIN
-		wx.hideHomeButton();
-		// #endif
-	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）
@@ -1211,7 +1172,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) {
@@ -1219,7 +1180,7 @@ export default {
 				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
 				_isQuickApp = ua.indexOf('uniacid=') !== -1;
 			}
-		} catch (e) { }
+		} catch (e) {}
 
 		if (!_isQuickApp) {
 			const systemInfo = this.getDeviceInfo();
@@ -1240,35 +1201,8 @@ export default {
 		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
 		const systemInfo = this.getDeviceInfo();
 		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' || 
-			(typeof qh !== 'undefined' && qh.platform === 'huawei');
+		       (typeof qh !== 'undefined' && qh.platform === 'huawei');
 		// #endif
 		return true;
-	},
-
-	/**
-	 * 蛇形命名转驼峰命名
-	 * @param {string} str 蛇形命名字符串
-	 * @returns {string} 驼峰命名字符串
-	 */
-	snakeToCamel(str) {
-		return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
-	},
-
-	/**
-	 * 蛇形命名转驼峰命名（递归处理对象中的所有属性名）
-	 * @param {Object} obj 包含蛇形命名字符串属性的对象
-	 * @returns {Object} 驼峰命名字符串属性的对象
-	 */
-	snakeToCamelForObj(obj) {
-		if (typeof obj !== 'object' || obj === null) return obj;
-		if (Array.isArray(obj)) return obj.map(this.snakeToCamelForObj.bind(this));
-		const newObj = {};
-		for (const key in obj) {
-			if (Object.hasOwnProperty.call(obj, key)) {
-				const newKey = this.snakeToCamel(key);
-				newObj[newKey] = this.snakeToCamelForObj(obj[key]);
-			}
-		}
-		return newObj;
 	}
 }

components-diy/css/common-channel.scss

@@ -1,143 +0,0 @@
-// 公共微信视频号样式
-
-// 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">
-::v-deep .uni-scroll-view ::-webkit-scrollbar {
+/deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -374,7 +374,7 @@ export default {
 	background: transparent;
 }
 
-::v-deep ::-webkit-scrollbar {
+/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: flex-end;
+					justify-content: end;
 
 					.num {
 						width: auto;
@@ -1314,7 +1314,7 @@ export default {
 	}
 }
 
-::v-deep .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
@@ -1348,7 +1348,7 @@ export default {
 	justify-content: center;
 }
 
-::v-deep .loading-layer {
+/deep/ .loading-layer {
 	background: #fff !important;
 }
 

components-diy/diy-category.vue

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

components-diy/diy-channel-list.vue

@@ -1,645 +0,0 @@
-<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

@@ -1,489 +0,0 @@
-<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 {
 }
 
 // 风格一
-::v-deep .coupon-style-one {
+/deep/.coupon-style-one {
 	height: 110rpx;
 
 	.coupon-item-box {
@@ -534,7 +534,7 @@ export default {
 }
 
 // 风格二
-::v-deep .coupon-style-two {
+/deep/.coupon-style-two {
 	height: 96rpx;
 
 	.coupon-item-box {
@@ -591,7 +591,7 @@ export default {
 	background-size: 100% 100%;
 }
 
-::v-deep .coupon-style-three {
+/deep/.coupon-style-three {
 	height: 284rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
@@ -638,7 +638,7 @@ export default {
 }
 
 // 风格四
-::v-deep .coupon-style-four {
+/deep/.coupon-style-four {
 	height: 108rpx;
 
 	.coupon-item-box {
@@ -997,7 +997,7 @@ export default {
 }
 
 //风格七
-::v-deep .coupon-style-seven {
+/deep/ .coupon-style-seven {
 	.wrap {
 		display: flex;
 	}
@@ -1075,7 +1075,7 @@ export default {
 	}
 }
 
-::v-deep .uni-scroll-view ::-webkit-scrollbar {
+/deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -1084,7 +1084,7 @@ export default {
 	background: transparent;
 }
 
-::v-deep ::-webkit-scrollbar {
+/deep/::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-group.vue

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

components-diy/diy-groupbuy.vue

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

components-diy/diy-img-ads.vue

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

components-diy/diy-index-page.vue

@@ -732,7 +732,7 @@ export default {
 	margin-top: 100rpx;
 }
 
-::v-deep .uni-scroll-view::-webkit-scrollbar {
+/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" :key="index">
+		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list">
 			<view class="fui-list jump" v-if="index == 0">
 				<view class="fui-list-media">
 					<image class="round" :src="$util.img(item.imageUrl)" style="border-radius:6rpx"></image>

components-diy/diy-map.vue

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

components-diy/diy-member-info.vue

@@ -1380,11 +1380,11 @@ export default {
 	}
 }
 
-::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none !important;
 }
 
-::v-deep .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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 ::v-deep .uni-popup__wrapper.bottom,
+.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup /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">
-::v-deep .uni-scroll-view ::-webkit-scrollbar {
+/deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -328,7 +328,7 @@ export default {
 	background: transparent;
 }
 
-::v-deep ::-webkit-scrollbar {
+/deep/::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-pintuan.vue

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

components-diy/diy-presale.vue

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

components-diy/diy-search.vue

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

components-diy/diy-seckill.vue

@@ -536,7 +536,7 @@ scroll-view ::-webkit-scrollbar {
 	touch-action: none;
 }
 
-::v-deep .uni-scroll-view ::-webkit-scrollbar {
+/deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 	width: 0;
@@ -545,7 +545,7 @@ scroll-view ::-webkit-scrollbar {
 	background: transparent;
 }
 
-::v-deep ::-webkit-scrollbar {
+/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;
 
-		::v-deep .uni-scroll-view-content {
+		/deep/ .uni-scroll-view-content {
 			display: flex;
 			align-items: center;
 		}
@@ -148,7 +148,7 @@ export default {
 		&.between {
 			justify-content: space-between;
 
-			::v-deep .uni-scroll-view-content {
+			/deep/.uni-scroll-view-content {
 				justify-content: space-between;
 			}
 		}

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

@@ -0,0 +1,458 @@
+<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

@@ -0,0 +1,232 @@
+<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

@@ -1,188 +0,0 @@
-// 微信视频号组件配置
-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

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

components/ai-chat-message/ai-chat-message.vue

@@ -1,7 +1,11 @@
 <template>
   <view class="ai-chat-container">
     <!-- 聊天消息列表 -->
-    <scroll-view class="chat-messages" scroll-y :scroll-top="scrollTop" @scroll="onScroll"
+    <scroll-view 
+      class="chat-messages" 
+      scroll-y 
+      :scroll-top="scrollTop"
+       @scroll="onScroll"
       :scroll-with-animation="false">
       
       <!-- 加载更多历史消息 -->
@@ -10,7 +14,11 @@
       </view>
       
       <!-- 消息列表 -->
-      <view v-for="item in messagesWithKey" :key="item.__renderKey" class="message-item" :class="[item.role, { 'first-message': item.__index === 0 }]">
+      <view 
+        v-for="(message, index) in messages" 
+        :key="`msg-${message.id || message.timestamp}-${index}`"  
+        class="message-item"
+        :class="[message.role, { 'first-message': index === 0 }]">
         
         <!-- 用户消息 -->
         <view v-if="message.role === 'user'" class="user-message">
@@ -24,7 +32,7 @@
             <view class="message-bubble">
               <text class="message-text">{{ message.content }}</text>
             </view>
-          </view>
+                      </view>
         </view>
         
         <!-- AI消息 -->
@@ -77,12 +85,21 @@
                     <text class="audio-duration">{{ formatDuration(message.duration) }}</text>
                   </view>
                   <view class="audio-controls">
-                    <button class="play-btn" :class="{ playing: message.playing }" @click="toggleAudio(message)">
+                    <button 
+                      class="play-btn" 
+                      :class="{ playing: message.playing }"
+                      @click="toggleAudio(message)">
                       <text class="iconfont" :class="message.playing ? 'icon-pause' : 'icon-play'"></text>
                     </button>
-                    <slider class="audio-slider" :value="message.currentTime || 0" :max="message.duration || 0"
+                    <slider 
-                      @changing="onAudioSliderChange" @change="onAudioSliderChangeEnd" activeColor="#8a9fb8"
+                      class="audio-slider" 
-                      backgroundColor="#e8edf3" block-size="12" />
+                      :value="message.currentTime || 0" 
+                      :max="message.duration || 0"
+                      @changing="onAudioSliderChange"
+                      @change="onAudioSliderChangeEnd"
+                      activeColor="#8a9fb8"
+                      backgroundColor="#e8edf3"
+                      block-size="12" />
                   </view>
                 </view>
               </view>
@@ -90,8 +107,14 @@
               <!-- 视频消息 -->
               <view v-else-if="message.type === 'video'" class="video-content">
                 <view class="video-player">
-                  <video :src="message.url" :poster="message.cover" :controls="true" :autoplay="false"
+                  <video 
-                    class="video-element" @play="onVideoPlay(message)" @pause="onVideoPause(message)">
+                    :src="message.url" 
+                    :poster="message.cover"
+                    :controls="true"
+                    :autoplay="false"
+                    class="video-element"
+                    @play="onVideoPlay(message)"
+                    @pause="onVideoPause(message)">
                   </video>
                   <view class="video-info">
                     <text class="video-title">{{ message.title || '视频消息' }}</text>
@@ -140,8 +163,12 @@
               
               <!-- 操作按钮 -->
               <view class="message-actions" v-if="message.actions && message.actions.length > 0">
-                <button v-for="action in message.actions" :key="action.id" class="action-btn"
+                <button 
-                  :class="[`iconfont`, action.icon, action.type]" @click="handleAction(action, message)">
+                  v-for="action in message.actions" 
+                  :key="action.id"
+                  class="action-btn"
+                  :class="[`iconfont`, action.icon, action.type]"
+                  @click="handleAction(action, message)">
                   {{ action.text }}
                 </button>
               </view>
@@ -172,11 +199,21 @@
       </view>
       
       <view class="input-container">
-        <textarea v-model="inputText" class="message-input" placeholder="请输入您的问题..." :maxlength="500"
+        <textarea 
-          :auto-height="true" :show-confirm-bar="false" @confirm="sendMessage" @input="onInput" />
+          v-model="inputText" 
+          class="message-input"
+          placeholder="请输入您的问题..."
+          :maxlength="500"
+          :auto-height="true"
+          :show-confirm-bar="false"
+          @confirm="sendMessage"
+          @input="onInput" />
         
         <!-- 发送按钮 -->
-        <button class="send-btn" :class="{ disabled: !inputText.trim() }" @click="sendMessage"
+        <button 
+          class="send-btn" 
+          :class="{ disabled: !inputText.trim() }"
+          @click="sendMessage"
           :disabled="!inputText.trim()">
           <text>发送</text>
         </button>
@@ -234,7 +271,11 @@
         </view>
         <view class="voice-content">
           <view class="voice-wave" :class="{ recording: voiceInputing }">
-            <view v-for="i in 8" :key="i" class="wave-bar" :style="{ animationDelay: (i * 0.1) + 's' }"></view>
+            <view 
+              v-for="i in 8" 
+              :key="i" 
+              class="wave-bar"
+              :style="{ animationDelay: (i * 0.1) + 's' }"></view>
           </view>
           <text class="voice-tip">{{ voiceInputing ? '正在录音，松开结束' : '点击开始录音' }}</text>
         </view>
@@ -290,15 +331,23 @@
         </view>
         <view class="nickname-editor-content">
           <view class="nickname-input-container">
-            <input v-model="tempNickname" class="nickname-input" placeholder="请输入您的新昵称" :maxlength="12" type="text" />
+            <input 
+              v-model="tempNickname" 
+              class="nickname-input"
+              placeholder="请输入您的新昵称"
+              :maxlength="12"
+              type="text" />
           </view>
           <view class="nickname-tip">昵称长度限制1-12个字符，仅自己可见</view>
           <view class="nickname-editor-actions">
             <button class="nickname-action-btn cancel" @click="closeNicknameEditor">
               <text>取消</text>
             </button>
-            <button class="nickname-action-btn confirm" :class="{ disabled: !tempNickname.trim() }"
+            <button 
-              :disabled="!tempNickname.trim()" @click="saveNickname">
+              class="nickname-action-btn confirm" 
+              :class="{ disabled: !tempNickname.trim() }"
+              :disabled="!tempNickname.trim()"
+              @click="saveNickname">
               <text>保存</text>
             </button>
           </view>
@@ -349,7 +398,7 @@ export default {
       default: 20
     }
   },
-  data() {
+  data(){
     return {
       messages: [],
       inputText: '',
@@ -383,47 +432,34 @@ export default {
       currentConversationId: null,
       isAIServiceAvailable: true,
       aiServiceError: null,
-      isLoadingHistory: false, // 新增：标记历史加载状态
+	  isLoadingHistory: false, // 新增：标记历史加载状态
       shouldScrollToBottom: false,
-      scrollTimer: null,
+	   scrollTimer: null,
-      lastScrollTop: 0,
+	  lastScrollTop: 0,
-      historyOffset: 0,
+	  historyOffset: 0,
-      isFetchingHistory: false
+	   isFetchingHistory: false
-    }
-  },
-  computed: {
-    // 为每条消息生成兼容小程序的唯一 key
-    messagesWithKey() {
-      return this.messages.map((msg, idx) => {
-        const uniqueId = msg.id || msg.timestamp || idx;
-        return {
-          ...msg,
-          __renderKey: `msg_${uniqueId}_${idx}`,
-          __index: idx  // 保留原始索引，用于判断 first-message 等
-        };
-      });
     }
   },
   onShow() {
-    // 优先读取本地缓存的会话 ID
+           // 优先读取本地缓存的会话 ID
-    const localConvId = this.getConversationIdFromLocal();
+           const localConvId = this.getConversationIdFromLocal();
-    if (localConvId) {
+           if (localConvId) {
-      this.currentConversationId = localConvId;
+             this.currentConversationId = localConvId;
-      aiService.setConversationId(localConvId);
+             aiService.setConversationId(localConvId);
-    } else {
+           } else {
-      this.currentConversationId = aiService.getConversationId();
+             this.currentConversationId = aiService.getConversationId();
-    }
+           }
-    // 加载初始历史后，同步historyOffset
+           // 加载初始历史后，同步historyOffset
-    this.loadChatHistoryIfExist().then(() => {
+               this.loadChatHistoryIfExist().then(() => {
-      // 初始历史条数作为偏移量
+                 // 初始历史条数作为偏移量
-      this.historyOffset = this.messages.length;
+                 this.historyOffset = this.messages.length;
-    });
+               });
-    // 移除：this.historyOffset = 0;（避免覆盖初始历史的偏移量）
+               // 移除：this.historyOffset = 0;（避免覆盖初始历史的偏移量）
-  },
+             },
-  // 新增：组件销毁时清除防抖定时器
+             // 新增：组件销毁时清除防抖定时器
-  beforeDestroy() {
+             beforeDestroy() {
-    if (this.scrollTimer) clearTimeout(this.scrollTimer);
+               if (this.scrollTimer) clearTimeout(this.scrollTimer);
-  },
+             },
   created() {
     this.messages = [...this.initialMessages]
     this.messageId = this.messages.length
@@ -432,42 +468,42 @@ export default {
     this.initUserAvatarData()
     // 初始化用户昵称（缓存优先）
     this.initUserNicknameData()
-    this.currentConversationId = aiService.getConversationId();
+	this.currentConversationId = aiService.getConversationId();
-  },
-  mounted() {
-    // 初始加载时滚底（仅一次）
-    this.$nextTick(() => {
-      this.scrollToBottom()
-    })
   },
+   mounted() {
+      // 初始加载时滚底（仅一次）
+      this.$nextTick(() => {
+        this.scrollToBottom()
+      })
+    },
   watch: {
-    messages: {
+      messages: {
-      handler() {
+        handler() {
-        this.$nextTick(() => {
+          this.$nextTick(() => {
-          // 仅当不是加载历史、且需要滚底时，才执行滚底
+            // 仅当不是加载历史、且需要滚底时，才执行滚底
-          if (!this.isLoadingHistory && this.shouldScrollToBottom) {
+            if (!this.isLoadingHistory && this.shouldScrollToBottom) {
-            this.scrollToBottom()
+              this.scrollToBottom()
-            // 滚底后重置状态，避免重复触发
+              // 滚底后重置状态，避免重复触发
-            this.shouldScrollToBottom = false
+              this.shouldScrollToBottom = false
-          }
+            }
-        })
+          })
-      },
+        },
       deep: true
     }
   },
   methods: {
-    // 【新增：会话 ID 本地缓存方法】
+	  // 【新增：会话 ID 本地缓存方法】
-    saveConversationIdToLocal(convId) {
+	   saveConversationIdToLocal(convId) {
-      if (convId) {
+	      if (convId) {
-        uni.setStorageSync('dify_conversation_id', convId);
+	        uni.setStorageSync('dify_conversation_id', convId);
-      }
+	      }
-    },
+	    },
-    getConversationIdFromLocal() {
+	    getConversationIdFromLocal() {
-      return uni.getStorageSync('dify_conversation_id') || null;
+	      return uni.getStorageSync('dify_conversation_id') || null;
-    },
+	    },
-    clearConversationIdFromLocal() {
+	    clearConversationIdFromLocal() {
-      uni.removeStorageSync('dify_conversation_id');
+	      uni.removeStorageSync('dify_conversation_id');
-    },
+	    },
     // 初始化音频上下文
     initAudioContext() {
       // #ifdef H5
@@ -476,18 +512,18 @@ export default {
       }
       // #endif
     },
-    onScroll(e) {
+        onScroll(e) {
-      const currentScrollTop = e.detail.scrollTop;
+          const currentScrollTop = e.detail.scrollTop;
-      this.lastScrollTop = currentScrollTop;
+          this.lastScrollTop = currentScrollTop;
-      // 防抖处理：50ms内只执行一次，避免频繁触发
+          // 防抖处理：50ms内只执行一次，避免频繁触发
-      if (this.scrollTimer) clearTimeout(this.scrollTimer);
+          if (this.scrollTimer) clearTimeout(this.scrollTimer);
-      this.scrollTimer = setTimeout(() => {
+          this.scrollTimer = setTimeout(() => {
-        // 滚动到顶部附近（<20px）、不在加载中、显示加载更多时，触发加载
+            // 滚动到顶部附近（<20px）、不在加载中、显示加载更多时，触发加载
-        if (currentScrollTop < 20 && !this.isLoadingHistory && this.showLoadMore) {
+            if (currentScrollTop < 20 && !this.isLoadingHistory && this.showLoadMore) {
-          this.loadMoreHistory();
+              this.loadMoreHistory();
-        }
+            }
-      }, 50);
+          }, 50);
-    },
+        },
     // 初始化用户头像（支持缓存持久化）
     initUserAvatarData() {
       // 1. 优先读取本地缓存的头像
@@ -508,42 +544,42 @@ export default {
       }
     },
     // 👇 新增：加载历史记录
-    async loadChatHistoryIfExist() {
+   async loadChatHistoryIfExist() {
-      const convId = aiService.getConversationId();
+     const convId = aiService.getConversationId();
-      if (convId) {
+     if (convId) {
-        try {
+       try {
-          const history = await aiService.getChatHistory();
+         const history = await aiService.getChatHistory();
-          if (!history || !Array.isArray(history.messages)) {
+         if (!history || !Array.isArray(history.messages)) {
-            console.warn('历史记录为空或格式无效');
+           console.warn('历史记录为空或格式无效');
-            return;
+           return;
-          }
+         }
    
-          this.messages = history.messages.map(msg => {
+         this.messages = history.messages.map(msg => {
-            let content = '';
+           let content = '';
-            if (msg.role === 'user') {
+           if (msg.role === 'user') {
-              content = msg.query || (typeof msg.inputs === 'string' ? msg.inputs : JSON.stringify(msg.inputs || '')) || '';
+             content = msg.query || (typeof msg.inputs === 'string' ? msg.inputs : JSON.stringify(msg.inputs || '')) || '';
-            } else {
+           } else {
-              content = msg.answer || '';
+             content = msg.answer || '';
-            }
+           }
-            return {
+           return {
-              id: msg.message_id || (Date.now() + Math.random() * 10000),
+             id: msg.message_id || (Date.now() + Math.random() * 10000),
-              role: msg.role === 'user' ? 'user' : 'assistant',
+             role: msg.role === 'user' ? 'user' : 'assistant',
-              content: content,
+             content: content,
-              timestamp: msg.created_at,
+             timestamp: msg.created_at,
-              actions: msg.role !== 'user' ? [
+             actions: msg.role !== 'user' ? [
-                { id: 1, text: '有帮助', type: 'like' },
+               { id: 1, text: '有帮助', type: 'like' },
-                { id: 2, text: '没帮助', type: 'dislike' }
+               { id: 2, text: '没帮助', type: 'dislike' }
-              ] : []
+             ] : []
-            };
+           };
-          });
+         });
-        } catch (error) {
+       } catch (error) {
-          console.error('加载历史记录失败:', error);
+         console.error('加载历史记录失败:', error);
-          aiService.clearConversationId();
+         aiService.clearConversationId();
-          this.clearConversationIdFromLocal();
+         this.clearConversationIdFromLocal();
-          this.currentConversationId = null;
+         this.currentConversationId = null;
-        }
+       }
-      }
+     }
-    },
+   },
     // 新增：初始化用户昵称（支持缓存持久化）
     initUserNicknameData() {
       // 1. 优先读取本地缓存的昵称
@@ -681,7 +717,7 @@ export default {
         content: this.inputText.trim(),
         timestamp: Date.now()
       }
-      this.shouldScrollToBottom = true
+       this.shouldScrollToBottom = true
       this.messages.push(userMessage)
       this.inputText = ''
       
@@ -751,8 +787,8 @@ export default {
       // 更新会话ID
       if (response.conversationId) {
         this.currentConversationId = response.conversationId;
-        aiService.setConversationId(response.conversationId);
+		aiService.setConversationId(response.conversationId);
-        this.saveConversationIdToLocal(response.conversationId);
+		  this.saveConversationIdToLocal(response.conversationId);
       }
       
       const aiMessage = {
@@ -787,52 +823,52 @@ export default {
       
       // 移除加载状态，添加流式消息
       this.messages = this.messages.filter(msg => msg.type !== 'loading')
-      this.shouldScrollToBottom = true
+	  this.shouldScrollToBottom = true
       this.messages.push(streamMessage)
       
-      // 开始流式响应
+     // 开始流式响应
-      await aiService.sendStreamMessage(
+     await aiService.sendStreamMessage(
-        userMessage,
+       userMessage,
-        // 流式数据回调
+       // 流式数据回调
-        (chunk) => {
+       (chunk) => {
-          streamMessage.content += chunk
+         streamMessage.content += chunk
-          this.$forceUpdate() // 或 this.$nextTick()
+         this.$forceUpdate() // 或 this.$nextTick()
-        },
+       },
-        // 完成回调：处理对象或字符串
+       // 完成回调：处理对象或字符串
-        (completeResult) => {
+       (completeResult) => {
-          let finalContent = '';
+         let finalContent = '';
-          let convId = '';
+         let convId = '';
      
-          // 判断是对象还是字符串
+         // 判断是对象还是字符串
-          if (typeof completeResult === 'string') {
+         if (typeof completeResult === 'string') {
-            finalContent = completeResult;
+           finalContent = completeResult;
-          } else {
+         } else {
-            finalContent = completeResult.content || '';
+           finalContent = completeResult.content || '';
-            convId = completeResult.conversation_id || ''; // 👈 关键：提取 conversation_id
+           convId = completeResult.conversation_id || ''; // 👈 关键：提取 conversation_id
-          }
+         }
      
-          // 更新消息状态
+         // 更新消息状态
-          streamMessage.isStreaming = false;
+         streamMessage.isStreaming = false;
-          streamMessage.content = finalContent;
+         streamMessage.content = finalContent;
      
-          // 添加操作按钮
+         // 添加操作按钮
-          streamMessage.actions = [
+         streamMessage.actions = [
-            { id: 1, text: '有帮助', type: 'like' },
+           { id: 1, text: '有帮助', type: 'like' },
-            { id: 2, text: '没帮助', type: 'dislike' }
+           { id: 2, text: '没帮助', type: 'dislike' }
-          ];
+         ];
      
-          //  保存 conversation_id 到本地
+         //  保存 conversation_id 到本地
-          if (convId) {
+         if (convId) {
-            aiService.setConversationId(convId);
+           aiService.setConversationId(convId);
-          }
+         }
      
-          // 触发事件
+         // 触发事件
-          this.$emit('ai-response', streamMessage);
+         this.$emit('ai-response', streamMessage);
-          this.saveConversationIdToLocal(convId);
+		 this.saveConversationIdToLocal(convId);
-          this.currentConversationId = convId;
+		 this.currentConversationId = convId;
-        }
+       }
-      );
+     );
-    },
+	 },
     generateAIResponse(userMessage) {
       const responses = {
         '你好': '您好！我是AI智能客服，很高兴为您服务！有什么可以帮助您的吗？',
@@ -879,8 +915,8 @@ export default {
         return Math.floor(diff / 3600000) + '小时前'
       } else {
         return date.getMonth() + 1 + '月' + date.getDate() + '日 ' + 
-          date.getHours().toString().padStart(2, '0') + ':' +
+               date.getHours().toString().padStart(2, '0') + ':' + 
-          date.getMinutes().toString().padStart(2, '0')
+               date.getMinutes().toString().padStart(2, '0')
       }
     },
     
@@ -909,76 +945,76 @@ export default {
     },
     
     // 加载更多历史消息
-    async loadMoreHistory() {
+ async loadMoreHistory() {
-      if (!this.currentConversationId) {
+       if (!this.currentConversationId) {
-        this.currentConversationId = this.getConversationIdFromLocal();
+         this.currentConversationId = this.getConversationIdFromLocal();
-        aiService.setConversationId(this.currentConversationId);
+         aiService.setConversationId(this.currentConversationId);
-      }
+       }
-      // 防止重复加载
+       // 防止重复加载
-      if (!this.showLoadMore || !this.currentConversationId || this.isLoadingHistory) {
+       if (!this.showLoadMore || !this.currentConversationId || this.isLoadingHistory) {
-        return;
+         return;
-      }
+       }
-      this.isFetchingHistory = true;
+       this.isFetchingHistory = true;
-      this.isLoadingHistory = true;
+       this.isLoadingHistory = true;
-      this.loadingText = '加载历史消息中...';
+       this.loadingText = '加载历史消息中...';
-      this.hasMoreHistory = true;
+       this.hasMoreHistory = true;
  
-      try {
+       try {
-        // 关键修改：用独立的historyOffset作为偏移量，不再依赖messages.length
+         // 关键修改：用独立的historyOffset作为偏移量，不再依赖messages.length
-        const response = await aiService.getConversationHistory({
+         const response = await aiService.getConversationHistory({
-          conversation_id: this.currentConversationId,
+           conversation_id: this.currentConversationId,
-          limit: 20,
+           limit: 20,
-          offset: this.historyOffset // 改用独立偏移量
+           offset: this.historyOffset // 改用独立偏移量
-        });
+         });
  
-        if (response.success && Array.isArray(response.messages) && response.messages.length > 0) {
+         if (response.success && Array.isArray(response.messages) && response.messages.length > 0) {
-          const historyMessages = response.messages.map(msg => ({
+           const historyMessages = response.messages.map(msg => ({
-            id: msg.id || `history-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+             id: msg.id || `history-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-            role: msg.role === 'user' ? 'user' : 'ai',
+             role: msg.role === 'user' ? 'user' : 'ai',
-            type: 'text',
+             type: 'text',
-            content: msg.content,
+             content: msg.content,
-            timestamp: msg.create_time * 1000
+             timestamp: msg.create_time * 1000
-          }));
+           }));
  
-          // 1. 记录新增消息数量
+           // 1. 记录新增消息数量
-          const newMsgCount = historyMessages.length;
+           const newMsgCount = historyMessages.length;
-          // 2. 添加到消息列表开头
+           // 2. 添加到消息列表开头
-          this.messages = [...historyMessages, ...this.messages];
+           this.messages = [...historyMessages, ...this.messages];
-          // 3. 更新历史偏移量（累加，不是覆盖）
+           // 3. 更新历史偏移量（累加，不是覆盖）
-          this.historyOffset += newMsgCount;
+           this.historyOffset += newMsgCount;
  
-          // 4. 等待DOM渲染后，精准计算滚动位置
+           // 4. 等待DOM渲染后，精准计算滚动位置
-          await this.$nextTick();
+           await this.$nextTick();
-          // 获取新增消息的实际DOM高度
+           // 获取新增消息的实际DOM高度
-          const query = uni.createSelectorQuery().in(this);
+           const query = uni.createSelectorQuery().in(this);
-          const heightPromises = [];
+           const heightPromises = [];
-          for (let i = 0; i < newMsgCount; i++) {
+           for (let i = 0; i < newMsgCount; i++) {
-            heightPromises.push(new Promise(resolve => {
+             heightPromises.push(new Promise(resolve => {
-              query.select(`.message-item:nth-child(${i + 1})`).boundingClientRect(rect => {
+               query.select(`.message-item:nth-child(${i + 1})`).boundingClientRect(rect => {
-                resolve(rect ? rect.height + 32 : 0); // 加上消息间距（32rpx）
+                 resolve(rect ? rect.height + 32 : 0); // 加上消息间距（32rpx）
-              }).exec();
+               }).exec();
-            }));
+             }));
-          }
+           }
-          // 计算总高度
+           // 计算总高度
-          const heights = await Promise.all(heightPromises);
+           const heights = await Promise.all(heightPromises);
-          const totalNewHeight = heights.reduce((sum, h) => sum + h, 0);
+           const totalNewHeight = heights.reduce((sum, h) => sum + h, 0);
-          // 5. 设置scrollTop，保持滚动条在顶部附近
+           // 5. 设置scrollTop，保持滚动条在顶部附近
-          this.scrollTop = totalNewHeight;
+           this.scrollTop = totalNewHeight;
-        } else {
+         } else {
-          // 无更多历史
+           // 无更多历史
-          this.showLoadMore = false;
+           this.showLoadMore = false;
-        }
+         }
-      } catch (error) {
+       } catch (error) {
-        console.error('加载历史失败:', error);
+         console.error('加载历史失败:', error);
-        uni.showToast({ title: '加载历史失败', icon: 'none' });
+         uni.showToast({ title: '加载历史失败', icon: 'none' });
-        this.showLoadMore = false;
+         this.showLoadMore = false;
-      } finally {
+       } finally {
-        this.isLoadingHistory = false;
+         this.isLoadingHistory = false;
-        this.isFetchingHistory = false;
+		  this.isFetchingHistory = false;
-        this.hasMoreHistory = false;
+         this.hasMoreHistory = false;
-        this.loadingText = '加载更多历史消息';
+         this.loadingText = '加载更多历史消息';
-      }
+       }
-    },
+     },
     // 显示更多工具
     showMoreTools() {
       this.showToolsPanel = true
@@ -1366,8 +1402,7 @@ $radius-lg: 36rpx;
     padding: 24rpx 32rpx;
     overflow-y: auto;
     box-sizing: border-box;
-    min-height: 0;
+    min-height: 0; /* 重要：防止flex元素溢出 */
-    /* 重要：防止flex元素溢出 */
 
     .load-more {
       text-align: center;
@@ -1382,8 +1417,7 @@ $radius-lg: 36rpx;
         margin-top: 24rpx;
       }
 
-      .user-message,
+      .user-message, .ai-message {
-      .ai-message {
         display: flex;
         align-items: flex-start;
 
@@ -1414,24 +1448,25 @@ $radius-lg: 36rpx;
           margin-left: 24rpx;
           max-width: calc(100% - 112rpx);
           min-width: 0;
-          width: 0;
+          width: 0; /* 添加这个属性防止flex元素溢出 */
-          /* 添加这个属性防止flex元素溢出 */
 
           .message-nickname {
             font-size: 24rpx;
             color: $color-text-light;
             margin-bottom: 8rpx;
             letter-spacing: 0.5rpx;
-            text-align: right;
+            // 用户昵称右对齐，AI昵称左对齐
-          }
+            &:not(.ai-message .message-nickname) {
-
+              text-align: right;
-          // AI昵称专属样式 - 左移到气泡上方
+            }
-          .ai-nickname {
+            // AI昵称专属样式 - 左移到气泡上方
-            text-align: left;
+            &.ai-nickname {
-            margin-left: 0;
+              text-align: left;
-            padding-left: 0;
+              margin-left: 0;
-            align-self: flex-start;
+              padding-left: 0;
-            margin-bottom: 4rpx;
+              align-self: flex-start;
+              margin-bottom: 4rpx;
+            }
           }
 
           .message-bubble {
@@ -1863,27 +1898,20 @@ $radius-lg: 36rpx;
           text-align: right;
           
           .message-bubble {
-            background: linear-gradient(135deg, #ffadd2, #f783ac) !important;
+           background: linear-gradient(135deg, #ffadd2, #f783ac) !important; /* 粉色渐变 */
-            /* 粉色渐变 */
+             color: white !important;
-            color: white !important;
+             border-radius: 16rpx 16rpx 4rpx 16rpx; /* 右对齐气泡尖角适配 */
-            border-radius: 16rpx 16rpx 4rpx 16rpx;
+             box-shadow: 0 8rpx 20rpx rgba(247, 131, 172, 0.3) !important;
-            /* 右对齐气泡尖角适配 */
+             border: none !important;
-            box-shadow: 0 8rpx 20rpx rgba(247, 131, 172, 0.3) !important;
+			  /* ✅ 关键：允许内容撑开高度 */
-            border: none !important;
+			   min-height: auto;
-            /* ✅ 关键：允许内容撑开高度 */
+			   height: auto;
-            min-height: auto;
+			   padding: 24rpx 32rpx; /* 保留内边距 */
-            height: auto;
+			   display: inline-block; /* 让宽度也随内容收缩（可选） */
-            padding: 24rpx 32rpx;
+			   max-width: 80%; /* 防止过宽 */
-            /* 保留内边距 */
+			   word-break: break-word;
-            display: inline-block;
+			   white-space: pre-wrap; /* 保留用户输入的换行符 */
-            /* 让宽度也随内容收缩（可选） */
+			   line-height: 1.6;
-            max-width: 80%;
-            /* 防止过宽 */
-            word-break: break-word;
-            white-space: pre-wrap;
-            /* 保留用户输入的换行符 */
-            line-height: 1.6;
-
             &::before {
               content: '';
               position: absolute;
@@ -1891,8 +1919,7 @@ $radius-lg: 36rpx;
               right: -14rpx;
               width: 24rpx;
               height: 24rpx;
-              background: #ffffff !important;
+              background: #ffffff !important; /* 菱形改为白色 */
-              /* 菱形改为白色 */
               border-radius: 6rpx;
               transform: rotate(45deg);
               box-shadow: 4rpx -4rpx 4rpx rgba(0, 0, 0, 0.05);
@@ -1905,9 +1932,11 @@ $radius-lg: 36rpx;
               left: -100%;
               width: 50%;
               height: 100%;
-              background: linear-gradient(to right,
+              background: linear-gradient(
-                  rgba(255, 255, 255, 0) 0%,
+                to right,
-                  rgba(255, 255, 255, 0.15) 100%);
+                rgba(255, 255, 255, 0) 0%,
+                rgba(255, 255, 255, 0.15) 100%
+              );
               animation: shine 4s infinite linear;
             }
           }
@@ -1923,22 +1952,19 @@ $radius-lg: 36rpx;
           align-items: flex-start;
           
           .message-bubble {
-            background: linear-gradient(135deg, #dbeafe, #bfdbfe) !important;
+            background: linear-gradient(135deg, #dbeafe, #bfdbfe) !important; /* 蓝色浅渐变 */
-            /* 蓝色浅渐变 */
+              color: #2c3e50 !important;
-            color: #2c3e50 !important;
+              border-radius: 16rpx 16rpx 16rpx 4rpx; /* 左对齐气泡尖角适配 */
-            border-radius: 16rpx 16rpx 16rpx 4rpx;
+              box-shadow: 0 8rpx 20rpx rgba(191, 219, 254, 0.4) !important;
-            /* 左对齐气泡尖角适配 */
+              border: 1rpx solid #dbeafe !important;
-            box-shadow: 0 8rpx 20rpx rgba(191, 219, 254, 0.4) !important;
-            border: 1rpx solid #dbeafe !important;
             min-height: auto;
-            height: auto;
+              height: auto;
-            padding: 24rpx 32rpx;
+              padding: 24rpx 32rpx;
-            display: inline-block;
+              display: inline-block;
-            max-width: 80%;
+              max-width: 80%;
-            word-break: break-word;
+              word-break: break-word;
-            white-space: pre-wrap;
+              white-space: pre-wrap;
-            line-height: 1.6;
+              line-height: 1.6;
-
             &::before {
               content: '';
               position: absolute;
@@ -1946,8 +1972,7 @@ $radius-lg: 36rpx;
               left: -14rpx;
               width: 24rpx;
               height: 24rpx;
-              background: #ffffff !important;
+              background: #ffffff !important; /* 菱形改为白色 */
-              /* 菱形改为白色 */
               border-radius: 6rpx;
               transform: rotate(45deg);
               box-shadow: -4rpx 4rpx 4rpx rgba(0, 0, 0, 0.05);
@@ -2047,13 +2072,10 @@ $radius-lg: 36rpx;
         font-size: 28rpx;
         font-weight: 500;
         border: none;
-        text-align: center;
+         text-align: center;     /* 兼容多端文字居中 */
-        /* 兼容多端文字居中 */
+          white-space: nowrap;    /* 强制文字单行横向显示 */
-        white-space: nowrap;
+          line-height: 1;         /* 重置行高，避免文字垂直偏移 */
-        /* 强制文字单行横向显示 */
+          top:-10px;
-        line-height: 1;
-        /* 重置行高，避免文字垂直偏移 */
-        top: -10px;
         
         &.disabled {
           background-color: $color-primary-light;
@@ -2076,21 +2098,19 @@ $radius-lg: 36rpx;
     left: 0;
     right: 0;
     bottom: 0;
-    pointer-events: none;
+    pointer-events: none; /* 让鼠标事件穿透容器，不影响主内容交互 */
-    /* 让鼠标事件穿透容器，不影响主内容交互 */
+    z-index: 999; /* 基础弹窗层级 */
-    z-index: 999;
-    /* 基础弹窗层级 */
     
     /* 子弹窗需要开启 pointer-events，否则点击无效 */
-    >.tools-popup,
+    > .tools-popup,
-    >.voice-popup,
+    > .voice-popup,
-    >.avatar-selector-popup,
+    > .avatar-selector-popup,
-    >.nickname-editor-popup {
+    > .nickname-editor-popup {
       pointer-events: auto;
     }
     
     /* 昵称编辑弹窗层级最高，避免被其他弹窗遮挡 */
-    >.nickname-editor-popup {
+    > .nickname-editor-popup {
       z-index: 1001;
     }
   }
@@ -2450,45 +2470,14 @@ $radius-lg: 36rpx;
             border-radius: 4rpx;
             animation: none;
 
-            &:nth-child(1) {
+            &:nth-child(1) { height: 60rpx; animation-delay: 0s; }
-              height: 60rpx;
+            &:nth-child(2) { height: 90rpx; animation-delay: 0.1s; }
-              animation-delay: 0s;
+            &:nth-child(3) { height: 50rpx; animation-delay: 0.2s; }
-            }
+            &:nth-child(4) { height: 120rpx; animation-delay: 0.3s; }
-
+            &:nth-child(5) { height: 70rpx; animation-delay: 0.4s; }
-            &:nth-child(2) {
+            &:nth-child(6) { height: 100rpx; animation-delay: 0.5s; }
-              height: 90rpx;
+            &:nth-child(7) { height: 80rpx; animation-delay: 0.6s; }
-              animation-delay: 0.1s;
+            &:nth-child(8) { height: 40rpx; animation-delay: 0.7s; }
-            }
-
-            &:nth-child(3) {
-              height: 50rpx;
-              animation-delay: 0.2s;
-            }
-
-            &:nth-child(4) {
-              height: 120rpx;
-              animation-delay: 0.3s;
-            }
-
-            &:nth-child(5) {
-              height: 70rpx;
-              animation-delay: 0.4s;
-            }
-
-            &:nth-child(6) {
-              height: 100rpx;
-              animation-delay: 0.5s;
-            }
-
-            &:nth-child(7) {
-              height: 80rpx;
-              animation-delay: 0.6s;
-            }
-
-            &:nth-child(8) {
-              height: 40rpx;
-              animation-delay: 0.7s;
-            }
           }
         }
 
@@ -2656,13 +2645,10 @@ $radius-lg: 36rpx;
 
 /* 动画定义 */
 @keyframes dotPulse {
-
+  0%, 100% {
-  0%,
-  100% {
     opacity: 0.4;
     transform: scale(0.8);
   }
-
   50% {
     opacity: 1;
     transform: scale(1.2);
@@ -2670,13 +2656,10 @@ $radius-lg: 36rpx;
 }
 
 @keyframes wave {
-
+  0%, 100% {
-  0%,
-  100% {
     transform: scaleY(0.5);
     opacity: 0.7;
   }
-
   50% {
     transform: scaleY(1);
     opacity: 1;
@@ -2687,7 +2670,6 @@ $radius-lg: 36rpx;
   0% {
     left: -100%;
   }
-
   100% {
     left: 200%;
   }
@@ -2697,11 +2679,9 @@ $radius-lg: 36rpx;
   0% {
     background-position: 0% 50%;
   }
-
   50% {
     background-position: 100% 50%;
   }
-
   100% {
     background-position: 0% 50%;
   }
@@ -2738,8 +2718,7 @@ $radius-lg: 36rpx;
       .message-item {
         margin-bottom: 24rpx;
         
-        .user-message,
+        .user-message, .ai-message {
-        .ai-message {
           .avatar {
             width: 72rpx;
             height: 72rpx;

components/chat-message/chat-message.vue

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

components/common-payment/common-payment.vue

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

components/goods-detail-view/goods-detail-view.vue

@@ -3,21 +3,16 @@
         <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"
+                <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"/>
-                    :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"
+                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            :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-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)"
+                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
-                                        mode="aspectFit" />
                                 </view>
                             </swiper-item>
                         </swiper>
@@ -29,16 +24,13 @@
 
                     <!-- 商品视频 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
+                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
-                            :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'">{{
+                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                            $lang('video') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }"
-                            @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
                     </view>
                 </view>
 
@@ -53,15 +45,14 @@
                     <slot name="entrance"></slot>
 
                     <!-- 配送 -->
-                    <!-- 	@click="$refs.deliveryType.open()" -->
+				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0">
+                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{ $lang('send') }}</view>
+                        <view class="label">{{$lang('send')}}</view>
                         <block v-if="deliveryType">
                             <view class="box">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text
+                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-                                        v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ $lang('express') }}</text>
+								<!-- 	{{ item.name }} -->
-                                    <!-- 	{{ item.name }} -->
                                 </block>
                             </view>
                             <text class="iconfont icon-right"></text>
@@ -72,7 +63,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">
@@ -89,21 +80,15 @@
                         <text class="iconfont icon-right"></text>
                     </view> -->
 
-                    <view class="item service" @click="openMerchantsServicePopup()"
+                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
-                        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"
+                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
-                                v-if="index < 3">
                                 <view class="item-wrap-box">
                                     <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui"
+                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></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)" />
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
+                                        <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>
-                                            :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>
@@ -114,29 +99,27 @@
 		
                 </view>
 				
-                <!--多规格区域-->
+				<!--多规格区域-->
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.sku_spec_format">
+				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-                    <!-- 入口区域 -->
+				    <!-- 入口区域 -->
-                    <slot name="skuspec"></slot>
+				  	<slot name="skuspec"></slot>
-                </view>
+				</view>
 			
 				 
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
+				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
                     <!-- 商家 -->
-                    <view class="item store-wrap"
+                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        @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"
+								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                                    style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
                             </view>
-                            <view class="other-wrap">
+                           <view class="other-wrap">
-                                <view class="address" style="margin-left: 30rpx;">
+                               <view class="address" style="margin-left: 30rpx;">
-                                    <view>{{ goodsSkuDetail.merchinfo.merch_name }}</view>
+								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-                                    <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
+								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-                                </view>
+							   </view>
                             </view>
                         </view>
                         <text class="iconfont icon-right"></text>
@@ -153,8 +136,7 @@
                             </view>
                             <scroll-view scroll-y class="type-body">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item"
+                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
-                                        :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>
@@ -176,16 +158,11 @@
                                 <text class="iconfont icon-close"></text>
                             </view>
                             <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }"
+                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
+                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                    <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>
-                                        <text class="iconfont icon-dui color-base-text"
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
-                                            :src="$util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'"
-                                            :icon="item.icon.icon"
-                                            :value="item.icon.style ? item.icon.style : null"></diy-icon>
                                     </view>
                                     <view class="info-wrap">
                                         <text class="title">{{ item.service_name }}</text>
@@ -210,19 +187,17 @@
                             </view>
                             <scroll-view scroll-y>
                                 <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index"
+                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
-                                        @click="selectStore(item)">
                                         <view class="item-box">
                                             <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image" />
+                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else />
+                                                <image :src="$util.getDefaultImage().store" v-else/>
                                             </view>
                                             <view class="item-info">
                                                 <view class="item-title">
                                                     <text class="title">{{ item.store_name }}</text>
                                                     <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance *
+                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
-                                                        1000 + 'm' }}
                                                     </text>
                                                 </view>
                                                 <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
@@ -253,7 +228,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>
@@ -272,8 +247,7 @@
                 <slot name="articipation"></slot>
 
                 <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0"
+                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
-                    style="display: none;">
                     <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
                         <view class="tit">
                             <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
@@ -294,18 +268,12 @@
                             <view class="evaluator">
                                 <view class="evaluator-info">
                                     <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)"
+                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                            @error="item.member_headimg = $util.getDefaultImage().head"
+                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                            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"
+                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 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">
@@ -318,8 +286,7 @@
                             <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"
+                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-                                        @click="previewEvaluate(index, img_index, 'images')">
                                         <image :src="$util.img(img)" mode="aspectFill" />
                                     </view>
                                 </view>
@@ -328,8 +295,7 @@
                     </view>
                 </view>
 				
-                <view class="goods-attr"
+                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
-                    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">
@@ -338,8 +304,7 @@
                                 <text class="value-name">{{ item.attr_value_name }}</text>
                             </view>
                         </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4"
+                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
-                            @click="switchGoodsAttr">
                             <block v-if="!goodsAttrShow">
                                 展开<text class="iconfont icon-iconangledown"></text>
                             </block>
@@ -355,20 +320,19 @@
                 <!-- 详情 -->
                 <view class="goods-detail-tab">
                     <view class="detail-tab">
-                        <view class="tab-item">{{ $lang('details') }}</view>
+                        <view class="tab-item">{{$lang('details')}}</view>
                     </view>
                     <view class="detail-content active">
                         <view class="detail-content-item">
                             <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                                <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
+                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-                                <!-- 		 {{goodsSkuDetail.goods_content}} -->
+			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-                                <mp-html :content="goodsSkuDetail.goods_content" />
+									<mp-html :content="goodsSkuDetail.goods_content" />
-                                <!-- :loading="loading" @preview="preview" @navigate="navigate" -->
+									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
                             </view>
                             <view class="goods-details active" v-else></view>
                             <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)"
+                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
-                                    :data-nodes="service.content"></rich-text>
                             </view>
                         </view>
                     </view>
@@ -455,30 +419,25 @@
 </template>
 
 <script>
-// 商品详情视图
+    // 商品详情视图
-import scroll from '@/common/js/scroll-view.js';
+    import scroll from '@/common/js/scroll-view.js';
-import detail from './detail.js';
+    import detail from './detail.js';
 
-import pengpaiFadeinOut from '../pengpai-fadein-out/pengpai-fadein-out.vue';
+    export default {
-
+        name: 'goods-detail-view',
-export default {
+        props: {
-    name: 'goods-detail-view',
+            goodsSkuDetail: {
-    props: {
+                type: Object,
-        goodsSkuDetail: {
+                default: () => {
-            type: Object,
+                    return {};
-            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>

components/hover-nav/hover-nav.vue

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

components/ns-birthday-gift/ns-birthday-gift.vue

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

components/ns-contact/ns-contact.vue

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

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

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

components/ns-new-gift/ns-new-gift.vue

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

components/ns-video-player-popup/ns-video-player-popup.vue

@@ -1,145 +0,0 @@
-<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 ::v-deep .uni-scroll-view {
+	.register-box /deep/ .uni-scroll-view {
 		background: unset !important;
 	}
 
@@ -155,11 +155,11 @@
 		overflow-y: scroll;
 	}
 
-	.register-box ::v-deep .uni-popup__wrapper-box {
+	.register-box /deep/.uni-popup__wrapper-box {
 		overflow: unset !important;
 	}
 
-	.reward-popup ::v-deep .uni-popup__wrapper {
+	.reward-popup /deep/.uni-popup__wrapper {
 		background: none;
 	}
 </style>

components/sx-rate/sx-rate.vue

@@ -188,10 +188,10 @@ export default {
 </script>
 
 <style scoped>
-@import './iconfont.css';
+@import './sx-rate/iconfont.css';
 </style>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .rate-box {
 	min-height: 1.4em;
 	display: flex;

components/sx-rate/sx-rate/iconfont.css

@@ -1,11 +1,10 @@
-@font-face {
+@font-face {font-family: "iconfont";
-  font-family: "iconfont";
+  src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
-  src: url('./fonts/iconfont.eot?t=1574760464482'); /* IE9 */
+  src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  src: url('./fonts/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
   url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
-  url('./fonts/iconfont.woff?t=1574760464482') format('woff'),
+  url('~@/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
-  url('./fonts/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('./fonts/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
+  url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
 }
 
 .iconfont {

components/to-top/to-top.vue

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

docs/WECHAT_CHANNEL_INTEGRATION.md

@@ -102,83 +102,58 @@
 
 ## 3. 组件使用
 
-### 3.1 视频号视频卡片组件 (diy-channel-video.vue)
+### 3.1 单个视频号组件 (diy-wechat-channel.vue)
 
 #### 基本用法
 
 ```vue
-<diy-channel-video :value="videoData" @video-play="handlerVideoPlay" />
+<diy-wechat-channel :value="channelData" />
 ```
 
 #### 属性说明
 
 | 属性名 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
-| value | Object | 必填 | 视频数据对象 |
+| channelName | String | "" | 视频号名称 |
-| listMode | Boolean | false | 是否为列表模式 |
+| avatarUrl | String | "" | 视频号头像URL |
-| 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 | "" | 视频标题 |
-| viewCount | Number | 0 | 观看次数 |
+| coverUrl | String | "" | 视频封面URL |
-| showViewCount | Boolean | false | 是否显示观看次数 |
+| feedId | String | "" | 视频号内容ID，用于播放视频 |
-| embedMode | Boolean | false | 是否启用嵌入式播放 |
+| viewCount | Number | 0 | 视频观看次数 |
+| showFollow | Boolean | false | 是否显示关注按钮 |
+| componentAngle | String | "" | 组件圆角类型，可选值：round |
+| topAroundRadius | Number | 0 | 顶部圆角半径 |
+| bottomAroundRadius | Number | 0 | 底部圆角半径 |
 
 #### 事件说明
 
 | 事件名 | 说明 | 参数 |
 |--------|------|------|
-| video-play | 点击视频播放时触发 | 视频数据对象 |
+| channel-tap | 点击视频号头像或名称时触发 | 视频号数据对象 |
+| video-play | 点击视频播放时触发 | 视频号数据对象 |
 
-### 3.2 视频号列表组件 (diy-channel-list.vue)
+### 3.2 视频号列表组件 (diy-wechat-channel-list.vue)
 
 #### 基本用法
 
 ```vue
-<diy-channel-list :value="channelListData" />
+<diy-wechat-channel-list :value="channelListData" />
 ```
 
 #### 属性说明
 
 | 属性名 | 类型 | 默认值 | 说明 |
 |--------|------|--------|------|
-| value | Object | 必填 | 组件配置数据 |
+| list | Array | [] | 视频号列表数据 |
-| value.list | Array | [] | 视频号列表数据 |
+| rowCount | Number | 2 | 每行显示的视频号数量 |
-| value.rowCount | Number | 2 | 每行显示的视频号数量 |
+| showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
-| value.showStyle | String | "fixed" | 显示样式，可选值：fixed, singleSlide |
+| mode | String | "" | 显示模式 |
-| value.mode | String | "" | 显示模式 |
+| font | Object | {} | 字体样式配置 |
-| value.font | Object | {} | 字体样式配置 |
+| componentBgColor | String | "#fff" | 组件背景颜色 |
-| value.componentBgColor | String | "#fff" | 组件背景颜色 |
+| componentAngle | String | "" | 组件圆角类型，可选值：round |
-| value.componentAngle | String | "" | 组件圆角类型，可选值：round |
+| topAroundRadius | Number | 0 | 顶部圆角半径 |
-| value.topAroundRadius | Number | 0 | 顶部圆角半径 |
+| bottomAroundRadius | Number | 0 | 底部圆角半径 |
-| value.bottomAroundRadius | Number | 0 | 底部圆角半径 |
+| ornament | Object | {} | 装饰样式配置 |
-| 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数组项说明
 
@@ -189,10 +164,6 @@
 | videoTitle | String | "" | 视频标题 |
 | feedId | String | "" | 视频号内容ID，用于播放视频 |
 | viewCount | Number | 0 | 视频观看次数 |
-| embedMode | Boolean | false | 是否启用嵌入式播放 |
-| showViewCount | Boolean | false | 是否显示观看次数 |
-| finderUserName | String | "" | 视频号ID，用于嵌入式播放 |
-| feedToken | String | "" | 视频token，用于嵌入式播放 |
 
 ## 4. 视频播放实现
 
@@ -319,19 +290,7 @@ if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
   - 头像：200x200px
   - 封面：640x360px
 
-### 5.4 播放按钮图标
+### 5.4 权限和关联
-
-- 组件支持两种播放按钮图标方式：
-  1. **图片图标**：通过 `playIcon` 属性设置，优先级较高
-  2. **纯 CSS 图标**：当 `playIcon` 不可用时，组件会自动使用纯 CSS 生成的播放图标，确保播放按钮始终可见
-
-- 纯 CSS 图标特点：
-  - 不依赖外部图片资源，加载更快
-  - 支持响应式调整大小
-  - 具有与图片图标相同的悬停效果
-  - 在所有环境中都能正常显示
-
-### 5.5 权限和关联
 
 - 确保在微信小程序后台开通了「打开视频号内容」权限
 - 确保小程序已与视频号成功关联
@@ -372,7 +331,6 @@ if (typeof wx !== 'undefined' && wx.openChannelsActivity) {
 - 可通过组件的 `componentAngle`、`topAroundRadius`、`bottomAroundRadius` 等属性调整组件样式
 - 可通过 `componentBgColor` 属性调整组件背景颜色
 - 可通过 `font` 属性调整字体样式
-- 可通过 `aspectRatio` 属性调整视频比例，支持 '16:9' 和 '3:4' 两种比例
 
 ### 6.6 环境兼容性问题
 
@@ -434,66 +392,25 @@ 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.3 视频号列表示例
+### 7.2 视频号列表示例
 
 ```javascript
 // 视频号列表数据
@@ -502,29 +419,20 @@ 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",
@@ -533,31 +441,7 @@ 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

@@ -1,834 +0,0 @@
-# 组件使用情况文档
-
-提示词：请重新帮我分析 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

@@ -21,13 +21,6 @@ export const lang = {
 		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',

lang/zh-cn/common.js

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

manifest.json

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

node_modules/jweixin-module/README.md

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

node_modules/jweixin-module/package.json

@@ -1,26 +1,60 @@
 {
+  "_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",
-    "version": "1.6.0",
+    "escapedName": "jweixin-module",
-    "description": "微信JS-SDK",
+    "rawSpec": "",
-    "main": "lib/index.js",
+    "saveSpec": null,
-    "scripts": {},
+    "fetchSpec": "latest"
-    "repository": {
+  },
-        "type": "git",
+  "_requiredBy": [
-        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+    "#USER",
-    },
+    "/"
-    "keywords": [
+  ],
-        "wxjssdk",
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-        "weixin",
+  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-        "jweixin",
+  "_spec": "jweixin-module",
-        "wechat",
+  "_where": "E:\\demo\\niushop_uniapp",
-        "jssdk",
+  "author": {
-        "wx"
+    "name": "Shengqiang Guo"
-    ],
+  },
-    "author": "Shengqiang Guo",
+  "bugs": {
-    "license": "ISC",
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-    "bugs": {
+  },
-        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  "bundleDependencies": false,
-    },
+  "deprecated": false,
-    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "description": "微信JS-SDK",
-    "devDependencies": {}
+  "devDependencies": {
+    "textfile": "^1.2.0",
+    "uglify-js": "^3.4.9"
+  },
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "out/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {
+    "build": "node build",
+    "prepublish": "npm run build"
+  },
+  "version": "1.4.1"
 }

package-lock.json

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

package.json

@@ -1,12 +1,8 @@
 {
   "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"
   },
@@ -25,17 +21,6 @@
           "PRODUCTION": true
         }
       },
-      "h5-xcx20.5g-quickapp.com": {
-        "title": "H5-xcx20.5g-quickapp.com",
-        "env": {
-          "UNI_PLATFORM": "h5"
-        },
-        "define": {
-          "H5_XCX_5G_QUICKAPP_COM": true,
-          "H5_PRODUCTION": true,
-          "PRODUCTION": true
-        }
-      },
       "h5-xcx.aigc-quickapp.com": {
         "title": "H5-xcx.aigc-quickapp.com",
         "env": {

pages.json

@@ -315,12 +315,6 @@
 			//*****************其他模块（26）******************
 			"root": "pages_tool",
 			"pages": [
-				{
-					"path": "ai-chat/index",
-					 "style": {
-					 "navigationBarTitleText": "AI 客服"
-					}
-				},
 				{
 					"path": "agreement/contenr",
 					"style": {
@@ -918,22 +912,16 @@
 				},
 				//******************文件模块******************
 				{
-				"path": "files/list",
+					"path": "files/list",
-				"style": {
+					"style": {
-					// #ifdef APP-PLUS
+						// #ifdef APP-PLUS
-					"navigationStyle": "custom",
+						"navigationStyle": "custom",
-					// #endif
+						// #endif
-					"navigationBarTitleText": "查看文件"
+						"navigationBarTitleText": "查看文件"
+					}
 				}
-			},
+			]
-			{
+		}
-				"path": "file-preview/file-preview",
-				"style": {
-					"navigationBarTitleText": "文件预览"
-				}
-			}
-		]
-	}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/index/index.vue

@@ -201,7 +201,7 @@ export default {
 }
 </style>
 <style scoped>
-.swiper ::v-deep .uni-swiper-dots-horizontal {
+.swiper /deep/ .uni-swiper-dots-horizontal {
 	left: 40%;
 	bottom: 40px
 }
@@ -214,26 +214,26 @@ export default {
 	width: 80%;
 }
 
-::v-deep .diy-index-page .uni-popup .uni-popup__wrapper-box {
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
-::v-deep .placeholder {
+/deep/ .placeholder {
 	height: 0;
 }
 
-::v-deep ::-webkit-scrollbar {
+/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 {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
 
-::v-deep .mescroll-totop {
+/deep/ .mescroll-totop {
 	/* #ifdef H5 */
 	right: 28rpx !important;
 	bottom: 200rpx !important;

pages/index/public/css/index.scss

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

pages_goods/cart.vue

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

pages_goods/category.vue

@@ -30,13 +30,13 @@ export default {
 		};
 	},
 	onLoad() {
-		this.$util.hideHomeButton();
 		//刷新多语言
 		this.$langConfig.refresh();
+
+		uni.hideTabBar();
 		this.getDiyInfo();
 	},
 	onShow() {
-		this.$util.hideHomeButton();
 		if (this.$refs.category) this.$refs.category[0].pageShow();
 	},
 	onUnload() {
@@ -74,38 +74,38 @@ export default {
 </script>
 
 <style lang="scss">
-::v-deep .uni-popup__wrapper.uni-center {
+/deep/ .uni-popup__wrapper.uni-center {
 	background: rgba(0, 0, 0, 0.6);
 }
 
-::v-deep .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper-box {
 	border-radius: 0 !important;
 }
 
-::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 	overflow-y: visible;
 }
 
-::v-deep .loading-layer {
+/deep/ .loading-layer {
 	background: #fff !important;
 }
 
 // 分类四一级展开
-::v-deep .category-template-4 .template-four .uni-popup__wrapper-box {
+/deep/ .category-template-4 .template-four .uni-popup__wrapper-box {
 	border-radius: 0px 0px 14px 14px !important;
 	overflow: hidden;
 }
 
-::v-deep .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
+/deep/ .category-template-4 .content-wrap .categoty-goods-wrap .goods-list {
 	margin-top: 30rpx;
 }
 
-::v-deep .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
+/deep/ .category-template-4 .content-wrap .goods-list .goods-item .footer-wrap .right-wrap .num-action {
 	width: 46rpx;
 	height: 46rpx;
 }
 
-::v-deep .uni-page-refresh-inner .uni-page-refresh__path {
+/deep/ .uni-page-refresh-inner .uni-page-refresh__path {
 	stroke: rgb(1, 1, 1) !important;
 }
 </style>

pages_goods/detail.vue

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

pages_goods/list.vue

@@ -321,10 +321,9 @@ export default {
 <style scoped>
 >>>.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
-	
 }
 
-::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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 @@
 						}
 					}
 
-					::v-deep .decrease {
+					/deep/ .decrease {
 						width: 52rpx;
 						height: 52rpx;
 						line-height: 48rpx;
 						font-size: 40rpx;
 						border-radius: 10rpx 0px 0px 10rpx;
 					}
-					::v-deep input {
+					/deep/ input {
 						height: 52rpx;
 						line-height: 52rpx;
 					}
-					::v-deep .increase {
+					/deep/ .increase {
 						width: 52rpx;
 						height: 52rpx;
 						line-height: 48rpx;

pages_order/detail.vue

@@ -835,7 +835,7 @@ export default {
 	margin-bottom: 30rpx;
 }
 
-::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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>
-::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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>
-::v-deep .uni-page {
+/deep/ .uni-page {
 	overflow: hidden;
 }
 
-::v-deep .mescroll-upwarp {
+/deep/ .mescroll-upwarp {
 	padding-bottom: 100rpx;
 }
 </style>

pages_order/payment.vue

@@ -5,12 +5,7 @@
 </template>
 
 <script>
-import commonPayment from './_components/common-payment/common-payment.vue';
-
 export default {
-	components: {
-		commonPayment
-	},
 	data() {
 		return {
 			api: {
@@ -95,15 +90,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
 }
-::v-deep .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
 }
-::v-deep .uni-popup {
+/deep/ .uni-popup {
 	z-index: 8;
 }
 </style>

pages_order/public/css/detail.scss

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

pages_promotion/fenxiao/bill.vue

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

pages_promotion/fenxiao/goods_list.vue

@@ -144,7 +144,7 @@ export default {
 }
 </style>
 <style lang="scss">
-::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/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">
-::v-deep .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	height: auto;
 }
 
-::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
+/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;
 }
 
-::v-deep .uni-popup__wrapper {
+/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">
-	::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none;
 		max-height: unset !important;
 		overflow-y: hidden !important;
 	}
 
-	::v-deep .uni-popup__wrapper {
+	/deep/ .uni-popup__wrapper {
 		border-radius: 20rpx 20rpx 0 0;
 	}
 
-	::v-deep .uni-popup {
+	/deep/ .uni-popup {
 		z-index: 8;
 	}
 
-	::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	/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 @@
-::v-deep .fixed {
+/deep/ .fixed {
 	position: relative;
 	top: 0;
 }
-::v-deep .empty {
+/deep/ .empty {
 	margin-top: 0 !important;
 }
 .cart-empty {