Merge remote-tracking branch 'remotes/origin/dev/1.0' into custom/2811-xcx6.aigc-quickapp.com

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

App.vue

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

common/css/diy.scss

@@ -123,7 +123,7 @@ image {
 }
 
 .choose-store {
-    ::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/ai-service.js

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

common/js/config-external.js

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

common/js/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 {
-    constructor(vueInstance, externalConfig = {}) {
-        if (!vueInstance.$lang) {
-            throw new Error('CustomerService 必须在 Vue 实例中初始化');
-        }
-
+export class CustomerService {
+    constructor(vueInstance, externalConfig = null) {
         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 外部最新配置
@@ -137,7 +82,7 @@ class CustomerService {
     validateConfig() {
         const config = this.getPlatformConfig();
         const wxworkConfig = this.getWxworkConfig();
-
+        
         const result = {
             isValid: true,
             errors: [],
@@ -177,11 +122,35 @@ class CustomerService {
     }
 
     /**
-     * 跳转到AI客服页面
+     * 跳转到Dify客服页面
      */
-    openAIKeFuService() {
-        const vm = this.vm;
-        vm.$util.redirectTo(vm.$util.AI_CHAT_PAGE_URL);
+    openDifyService() {
+        try {
+            if (this.vm.setAiUnreadCount) {
+                this.vm.setAiUnreadCount(0);
+            }
+            // 强制跳转，忽略框架层的封装
+            uni.redirectTo({
+                url: '/pages_tool/ai-chat/index',
+                fail: (err) => {
+                    // 兜底：使用window.location跳转（H5）
+                    // #ifdef H5
+                    window.location.href = '/pages_tool/ai-chat/index';
+                    // #endif
+                    console.error('跳转Dify客服失败:', err);
+                    uni.showToast({
+                        title: '跳转客服失败',
+                        icon: 'none'
+                    });
+                }
+            });
+        } catch (e) {
+            console.error('跳转Dify客服异常:', e);
+            uni.showToast({
+                title: '跳转客服失败',
+                icon: 'none'
+            });
+        }
     }
 
     /**
@@ -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;
@@ -331,11 +300,11 @@ class CustomerService {
             if (sendMessageTitle) params.push(`title=${encodeURIComponent(sendMessageTitle)}`);
             if (sendMessagePath) params.push(`path=${encodeURIComponent(sendMessagePath)}`);
             if (sendMessageImg) params.push(`img=${encodeURIComponent(sendMessageImg)}`);
-
+            
             if (params.length > 0) {
                 url += (url.includes('?') ? '&' : '?') + params.join('&');
             }
-
+            
             uni.navigateTo({
                 url: url,
                 fail: (err) => {
@@ -359,7 +328,7 @@ class CustomerService {
             // #ifdef H5
             window.open(config.thirdPartyServiceUrl, '_blank');
             // #endif
-
+            
             // #ifdef MP-WEIXIN
             if (config.thirdPartyMiniAppId) {
                 wx.navigateToMiniProgram({
@@ -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,29 +395,26 @@ class CustomerService {
     /**
      * 拨打电话
      */
-    makePhoneCall(mobileNumber) {
-        if (mobileNumber) {
-            return uni.makePhoneCall({
-                phoneNumber: mobileNumber
-            });
-        }
-
-        // 从缓存中获取电话信息
-        uni.getStorage({
-            key: 'shopInfo',
-            success: (res) => {
-                const shopInfo = res.data;
-                const mobile = shopInfo?.mobile ?? '';
-                if (mobile) {
+    makePhoneCall() {
+        this.vm.$api.sendRequest({
+            url: '/api/site/shopcontact',
+            success: res => {
+                if (res.code === 0 && res.data?.mobile) {
                     uni.makePhoneCall({
-                        phoneNumber: mobile
-                    });                    
+                        phoneNumber: res.data.mobile
+                    });
                 } else {
                     uni.showToast({
                         title: '暂无客服电话',
                         icon: 'none'
-                    });                    
+                    });
                 }
+            },
+            fail: () => {
+                uni.showToast({
+                    title: '获取客服电话失败',
+                    icon: 'none'
+                });
             }
         });
     }
@@ -458,8 +424,8 @@ class CustomerService {
      */
     showNoServicePopup() {
         const siteInfo = this.vm.$store.state.siteInfo || {};
-        const message = siteInfo?.site_tel
-            ? `请联系客服，客服电话是${siteInfo.site_tel}`
+        const message = siteInfo?.site_tel 
+            ? `请联系客服，客服电话是${siteInfo.site_tel}` 
             : '抱歉，商家暂无客服，请线下联系';
 
         uni.showModal({
@@ -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/diy.js

@@ -609,10 +609,10 @@ export default {
 	},
 	// 分享给好友
 	onShareAppMessage() {
-		return this.mpShareData?.appMessage;
+		return this.mpShareData.appMessage;
 	},
 	// 分享到朋友圈
 	onShareTimeline() {
-		return this.mpShareData?.timeLine;
+		return this.mpShareData.timeLine;
 	}
 }

common/js/golbalConfig.js

@@ -7,7 +7,7 @@ export default {
 	computed: {
 		// 是否是英文环境
 		isEnEnv() {
-			return this.$langConfig.getCurrentLocale() === 'en-us';
+			return uni.getStorageSync('lang') === 'en-us';
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;
@@ -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/lang.js

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

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/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 = [
@@ -95,7 +94,7 @@ export const checkTabBarActive = (linkUrl, currentPageRoute) => {
 	const currentPageRouteParts = currentPageRoute.split('/');
 
 	// console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts});
-
+		
 	try {
 		// 二级页面
 		if (linkUrlParts[2] === currentPageRouteParts[2]) {
@@ -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({
-							extInfo: {
-								url: config.wxwork_url
-							},
-							corpId: config.corpid,
-							showMessageCard: true,
-							sendMessageTitle: 'this.sendMessageTitle',
-							sendMessagePath: 'this.sendMessagePath',
-							sendMessageImg: 'this.sendMessageImg'
-						});
+					wx.openCustomerServiceChat({
+						extInfo: {
+							url: config.wxwork_url
+						},
+						corpId: config.corpid,
+						showMessageCard: true,
+						sendMessageTitle: 'this.sendMessageTitle',
+						sendMessagePath: 'this.sendMessagePath',
+						sendMessageImg: 'this.sendMessageImg'
 					});
-
 					// #endif
 					break;
 				case 'third':
@@ -843,15 +813,6 @@ export default {
 			uni.navigateBack();
 		}
 	},
-	/**
-	 * 隐藏“返回首页/小房子”按钮
-	 * 这个函数，用到页面show, onshow 的生命周期时
-	 */
-	hideHomeButton() {
-		// #ifdef MP-WEIXIN
-		wx.hideHomeButton();
-		// #endif
-	},
 	/**
 	 *
 	 * @param val 转化时间字符串 （转化时分秒）
@@ -1201,74 +1162,5 @@ export default {
 	verifyMobile(mobile) {
 		var parse = /^\d{11}$/.test(mobile);
 		return parse;
-	},
-	/**
-	 * 判断是否为快应用环境
-	 * @returns {boolean} 是否为快应用
-	 */
-	isQuickApp() {
-		// #ifndef QUICKAPP-WEBVIEW
-		let _isQuickApp = false;
-		try {
-			const ua = navigator?.userAgent?.toLowerCase();
-			// console.log('ua = ', ua);
-			_isQuickApp = ua.indexOf('quickapp') !== -1;
-
-			if (!_isQuickApp) {
-				// 特殊说明由于网站是嵌入到快应用的Webview组件中<web>，UA中不会包含quickapp字符串，
-				// 但是会包含uniacid参数，所以这里通过uniacid参数来判断是否为快应用环境
-				_isQuickApp = ua.indexOf('uniacid=') !== -1;
-			}
-		} catch (e) { }
-
-		if (!_isQuickApp) {
-			const systemInfo = this.getDeviceInfo();
-			_isQuickApp = systemInfo?.platform === 'quickapp' || process?.env?.UNI_PLATFORM === 'quickapp';
-		}
-		return _isQuickApp;
-		// #endif
-
-		return true;
-	},
-	/**
-	 * 判断是否为华为快应用环境
-	 * @returns {boolean} 是否为华为快应用
-	 */
-	isHuaweiQuickApp() {
-		if (!this.isQuickApp()) return false;
-
-		// #ifndef QUICKAPP-WEBVIEW-HUAWEI
-		const systemInfo = this.getDeviceInfo();
-		return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' ||
-			(typeof qh !== 'undefined' && qh.platform === 'huawei');
-		// #endif
-		return true;
-	},
-
-	/**
-	 * 蛇形命名转驼峰命名
-	 * @param {string} str 蛇形命名字符串
-	 * @returns {string} 驼峰命名字符串
-	 */
-	snakeToCamel(str) {
-		return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
-	},
-
-	/**
-	 * 蛇形命名转驼峰命名（递归处理对象中的所有属性名）
-	 * @param {Object} obj 包含蛇形命名字符串属性的对象
-	 * @returns {Object} 驼峰命名字符串属性的对象
-	 */
-	snakeToCamelForObj(obj) {
-		if (typeof obj !== 'object' || obj === null) return obj;
-		if (Array.isArray(obj)) return obj.map(this.snakeToCamelForObj.bind(this));
-		const newObj = {};
-		for (const key in obj) {
-			if (Object.hasOwnProperty.call(obj, key)) {
-				const newKey = this.snakeToCamel(key);
-				newObj[newKey] = this.snakeToCamelForObj(obj[key]);
-			}
-		}
-		return newObj;
 	}
 }

components-diy/css/common-channel.scss

@@ -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,11 +3,11 @@
 		<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">
-					<swiper-item v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)">
+					<swiper-item v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="swiper-item-content">
 							<view :class="['item', value.ornament.type]" :style="itemCss">
 								<view class="article-img">

components-diy/diy-audio.vue

@@ -11,7 +11,7 @@
 			<view class="time" :style="{ color: value.timecolor }">
 				{{ audiotime }}
 			</view>
-			<view @tap.stop="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"
+			<view @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"
 				style="padding-top: 18rpx"></view>
 		</view>
 		<view class="fui-audio style3" :style="{ background: value.background }" v-else>
@@ -30,7 +30,7 @@
 				<!-- {{audios[value.id].audiotime}} -->
 				{{ audiotime }}
 			</view>
-			<view @tap.stop="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"></view>
+			<view @click="play()" class="start" :class="status ? 'iconj icon-07zanting' : 'iconj icon-bofang'"></view>
 		</view>
 	</view>
 </template>

components-diy/diy-bargain.vue

@@ -15,7 +15,7 @@
 					:style="{ color: value.titleStyle.textColor }">低至0元免费拿</view>
 				<view class="head-right"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="$util.redirectTo('/pages_promotion/bargain/list')">
+					@click="$util.redirectTo('/pages_promotion/bargain/list')">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
@@ -23,7 +23,7 @@
 
 			<!-- 商品列表 -->
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -84,7 +84,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -130,7 +130,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -365,7 +365,7 @@ export default {
 </script>
 
 <style lang="scss">
-::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-bottom-nav.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-bottom-nav" v-if="tabBarList && tabBarList.list">
 		<view class="tab-bar" :style="{ backgroundColor: tabBarList.backgroundColor }">
 			<view class="tabbar-border"></view>
-			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @tap.stop="redirectTo(item.link)">
+			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @click="redirectTo(item.link)">
 				<view class="bd">
 					<block v-if="item.link.wap_url == '/pages_goods/cart'">
 						<view class="icon" v-if="tabBarList.type == 1 || tabBarList.type == 2"

components-diy/diy-category-item.vue

@@ -1,7 +1,7 @@
 <template>
 	<view data-component-name="diy-category-item" class="item-wrap" :class="type">
 		<block v-if="type == 'category' && category.child_list && category.child_list.length">
-			<view class="category-adv" v-if="category.image_adv" @tap.stop="diyRedirectTo(category.link_url)">
+			<view class="category-adv" v-if="category.image_adv" @click="diyRedirectTo(category.link_url)">
 				<image :src="$util.img(category.image_adv)" mode="widthFix" />
 			</view>
 
@@ -9,7 +9,7 @@
 				<view class="category-title">{{ category.category_name }}</view>
 				<view class="category-list">
 					<view class="category-item" v-for="(one, oneIndex) in category.child_list" :key="oneIndex"
-						@tap.stop="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
+						@click="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
 						<view class="img-box">
 							<image :src="$util.img(one.image)" mode="widthFix" />
 						</view>
@@ -23,7 +23,7 @@
 					<view class="category-title">{{ one.category_name }}</view>
 					<view class="category-list">
 						<view class="category-item" v-for="(two, twoIndex) in one.child_list" :key="twoIndex"
-							@tap.stop="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
+							@click="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
 							<view class="img-box">
 								<image :src="$util.img(two.image)" mode="widthFix" :lazy-load="true" />
 							</view>
@@ -44,22 +44,22 @@
 							:class="{ 'screen-category-4': value.template == 4 }" :scroll-with-animation="true"
 							:scroll-into-view="scrollIntoView">
 							<view class="item" id="category-2--1" :class="{ selected: categoryId == -1 }"
-								@tap.stop="selectCategory(-1)">全部</view>
+								@click="selectCategory(-1)">全部</view>
 							<view class="item" :id="'category-2-' + oneIndex"
-								:class="{ selected: categoryId == oneIndex }" @tap.stop="selectCategory(oneIndex)"
+								:class="{ selected: categoryId == oneIndex }" @click="selectCategory(oneIndex)"
 								v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 								{{ one.category_name }}
 							</view>
 						</scroll-view>
-						<view class="iconfont icon-unfold" @tap.stop="$refs.screenCategoryPopup.open()"></view>
+						<view class="iconfont icon-unfold" @click="$refs.screenCategoryPopup.open()"></view>
 					</view>
 					<uni-popup type="top" ref="screenCategoryPopup">
-						<view class="screen-category-popup" @tap.stop="$refs.screenCategoryPopup.close()">
+						<view class="screen-category-popup" @click="$refs.screenCategoryPopup.close()">
 							<scroll-view scroll-y="true" class="screen-category"
 								:class="{ 'screen-category-4': value.template == 4 }">
 								<view class="title">全部</view>
 								<view class="item" :class="{ selected: categoryId == oneIndex }"
-									@tap.stop="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
+									@click="selectCategory(oneIndex)" v-for="(one, oneIndex) in category.child_list"
 									:key="oneIndex">
 									{{ one.category_name }}
 								</view>
@@ -81,13 +81,13 @@
 						:data-template="value.template">
 						<block v-if="goodsList.length">
 							<view class="goods-item" v-for="(item, index) in goodsList" :key="index">
-								<view class="goods-img" @tap.stop="toDetail(item)">
+								<view class="goods-img" @click="toDetail(item)">
 									<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)" />
 									<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}
 									</view>
 								</view>
 								<view class="info-wrap">
-									<view class="name-wrap" @tap.stop="toDetail(item)">
+									<view class="name-wrap" @click="toDetail(item)">
 										<view class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
 									</view>
 									<view class="price-wrap">
@@ -122,25 +122,25 @@
 										</view>
 										<!-- <view class="right-wrap" v-if="value.template == 2 || value.template == 4">
 											<block v-if="item.is_virtual">
-												<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+												<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 											</block>
 											<block v-else>
-												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @tap.stop="selectSku(item)">
+												<view v-if="item.goods_spec_format" class="color-base-bg select-sku" @click="selectSku(item)">
 													<text>选规格</text>
 													<text class="num-tag" v-if="item.num">{{ item.num }}</text>
 												</view>
 												<block v-else>
 													<block v-if="cartList['goods_' + item.goods_id]&&cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
-														<view class="num-action reduce" @tap.stop="reduce(item)">
+														<view class="num-action reduce" @click="reduce(item)">
 															<text class="iconfont icon-jian"></text>
 														</view>
 														<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' + item.sku_id].num }}</view>
-														<view class="num-action" :id="'cart-num-' + index" @tap.stop="increase($event, item)">
+														<view class="num-action" :id="'cart-num-' + index" @click="increase($event, item)">
 															<text class="iconfont icon-jia"></text>
 															<view class="click-event"></view>
 														</view>
 													</block>
-													<view class="num-action" v-else :id="'cart-num-' + index" @tap.stop="increase($event, item, 0)">
+													<view class="num-action" v-else :id="'cart-num-' + index" @click="increase($event, item, 0)">
 														<text class="iconfont icon-jia"></text>
 														<view class="click-event"></view>
 													</view>
@@ -148,7 +148,7 @@
 											</block>
 										</view> -->
 										<!-- 	<view class="right-wrap" v-if="value.template == 3">
-											<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+											<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 										</view> -->
 									</view>
 								</view>
@@ -158,7 +158,7 @@
 							<image :src="$util.img('public/uniapp/category/empty.png')" mode="widthFix" />
 						</view>
 						<!-- 		<view class="end-tips" ref="endTips" v-if="last && (categoryId == -1 || !category.child_list || (category.child_list && categoryId == category.child_list.length - 1))">已经到底了~</view>
-						<view class="end-tips" ref="endTips" v-else @tap.stop="switchCategory('next')">
+						<view class="end-tips" ref="endTips" v-else @click="switchCategory('next')">
 							<text class="iconfont icon-xiangshangzhanhang"></text>
 							上滑查看下一分类
 						</view> -->
@@ -173,13 +173,13 @@
 				<view class="goods-list" :class="{ 'double-column': !isList, 'single-column': isList }"
 					:data-template="value.template">
 					<view class="goods-item" v-for="(item, index) in goodsList" :key="index">
-						<view class="goods-img" @tap.stop="toDetail(item)">
+						<view class="goods-img" @click="toDetail(item)">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"
 								:lazy-load="true" />
 							<view class="color-base-bg goods-tag" v-if="item.label_name">{{ item.label_name }}</view>
 						</view>
 						<view class="info-wrap">
-							<view class="name-wrap" @tap.stop="toDetail(item)">
+							<view class="name-wrap" @click="toDetail(item)">
 								<view class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
 							</view>
 							<view class="price-wrap">
@@ -214,30 +214,30 @@
 								</view>
 								<view class="right-wrap" v-if="value.template == 2">
 									<block v-if="item.is_virtual">
-										<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+										<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 									</block>
 									<block v-else>
 										<view v-if="item.goods_spec_format" class="color-base-bg select-sku"
-											@tap.stop="selectSku(item)">
+											@click="selectSku(item)">
 											<text>选规格</text>
 											<text class="num-tag" v-if="item.num">{{ item.num }}</text>
 										</view>
 										<block v-else>
 											<block
 												v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id]['sku_' + item.sku_id]">
-												<view class="num-action reduce" @tap.stop="reduce(item)">
+												<view class="num-action reduce" @click="reduce(item)">
 													<text class="iconfont icon-jian"></text>
 												</view>
 												<view class="num">{{ cartList['goods_' + item.goods_id]['sku_' +
 													item.sku_id].num }}</view>
 												<view class="num-action" :id="'cart-num-' + index"
-													@tap.stop="increase($event, item)">
+													@click="increase($event, item)">
 													<text class="iconfont icon-jia"></text>
 													<view class="click-event"></view>
 												</view>
 											</block>
 											<view class="num-action" v-else :id="'cart-num-' + index"
-												@tap.stop="increase($event, item, 0)">
+												@click="increase($event, item, 0)">
 												<text class="iconfont icon-jia"></text>
 												<view class="click-event"></view>
 											</view>
@@ -245,7 +245,7 @@
 									</block>
 								</view>
 								<view class="right-wrap" v-if="value.template == 3">
-									<view class="color-base-bg select-sku" @tap.stop="toDetail(item)">立即购买</view>
+									<view class="color-base-bg select-sku" @click="toDetail(item)">立即购买</view>
 								</view>
 							</view>
 						</view>
@@ -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

@@ -3,9 +3,9 @@
 		:style="{ height: 'calc(100vh - ' + tabBarHeight + ')' }">
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- <block v-if="value.template == 4">
-			<view class="search-box" v-if="value.search" @tap.stop="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
+			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
 				<view class="search-content">
-					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @tap.stop="onClickSearch()" disabled="true" />
+					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 			</view>
@@ -13,35 +13,35 @@
 		</block> -->
 		<block v-if="value.template != 4">
 			<!-- 			<view :style="navbarInnerStyle">商品分类</view> -->
-			<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()"
+			<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()"
 				:style="wxSearchHeight">
 				<view class="search-content">
 					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')"
-						confirm-type="search" @tap.stop="onClickSearch()"
+						confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()"
 						disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-					@tap.stop.prevent="changeListStyle()"></view>
+					@click.stop.prevent="changeListStyle()"></view>
 			</view>
 		</block>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="search-box" v-if="value.search" @tap.stop="onClickSearch()">
+		<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()">
 			<view class="search-content">
 				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search"
-					@tap.stop="onClickSearch()" disabled="true" />
+					@click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
 			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }"
-				@tap.stop.prevent="changeListStyle()"></view>
+				@click.stop.prevent="changeListStyle()"></view>
 		</view>
 		<!-- #endif -->
 		<view class="template-four wx" v-if="value.template == 4">
 			<scroll-view scroll-x="true" class="template-four-wrap" :scroll-with-animation="true"
 				:scroll-into-view="'category-one-' + oneCategorySelect" enable-flex="true">
 				<view class="category-item" :id="'category-one-' + index" v-for="(item, index) in templateFourData"
-					:key="index" :class="{ select: oneCategorySelect == index }" @tap.stop="templateFourOneFn(index)">
+					:key="index" :class="{ select: oneCategorySelect == index }" @click="templateFourOneFn(index)">
 					<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
 						<image :src="$util.img(item.image)" mode="aspectFill" />
 					</view>
@@ -49,7 +49,7 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view class="category-item-all" @tap.stop="$refs.templateFourPopup.open()">
+			<view class="category-item-all" @click="$refs.templateFourPopup.open()">
 				<view class="category-item-all-wrap">
 					<text class="text">展开</text>
 					<image class="img" :src="$util.img('/public/uniapp/category/unfold.png')" mode="aspectFill"></image>
@@ -59,7 +59,7 @@
 				<view class="template-four-popup">
 					<scroll-view scroll-y="true" class="template-four-scroll" enable-flex="true">
 						<view class="item" :class="{ selected: oneCategorySelect == index }"
-							@tap.stop="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
+							@click="templateFourOneFn(index)" v-for="(item, index) in templateFourData" :key="index">
 							<view class="image-warp" :class="[{ 'color-base-border': oneCategorySelect == index }]">
 								<image :src="$util.img(item.image)" mode="aspectFill"></image>
 							</view>
@@ -67,7 +67,7 @@
 								item.category_name }}</view>
 						</view>
 					</scroll-view>
-					<view class="pack-up" @tap.stop="$refs.templateFourPopup.close()">
+					<view class="pack-up" @click="$refs.templateFourPopup.close()">
 						<text>点击收起</text>
 						<text class="iconfont icon-iconangledown-copy"></text>
 					</view>
@@ -83,7 +83,7 @@
 							{ select: select == index },
 							{ 'border-bottom': value.template == 4 && select + 1 === index },
 							{ 'border-top': value.template == 4 && select - 1 === index }
-						]" @tap.stop="switchOneCategory(index)">
+						]" @click="switchOneCategory(index)">
 							<view class="">{{ item.category_name }}</view>
 						</view>
 					</view>
@@ -130,7 +130,7 @@
 
 		<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
 			<view class="left-wrap">
-				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @tap.stop="$util.redirectTo('/pages_goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -141,7 +141,7 @@
 					<text class="unit font-size-tag price-font">.{{ cartTotalMoney[1] ? cartTotalMoney[1] : '00' }}</text>
 				</view>
 			</view>
-			<view class="right-wrap"><button type="primary" class="settlement-btn" @tap.stop="settlement">去结算</button>
+			<view class="right-wrap"><button type="primary" class="settlement-btn" @click="settlement">去结算</button>
 			</view>
 		</view> -->
 
@@ -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 @tap.stop="playVideo" class="video-container">
-			<view class="video-cover-wrap" :style="[coverStyle]">
-				<image class="video-cover" :src="$util.img(value.coverUrl)" mode="aspectFill"></image>
-				<view class="channel-play-btn" v-if="showPlayBtn" :style="[playBtnStyle]">
-					<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

@@ -16,7 +16,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
@@ -52,7 +52,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
 									v-if="!parseInt(item.discount)">
@@ -87,7 +87,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-num" :style="{ color: value.moneyColor }"
 								v-if="!parseInt(item.discount)">
 								<text class="font-size-tag coupon-sign">￥</text>
@@ -124,7 +124,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-info">
 								<view class="coupon-num" :style="{ color: value.moneyColor }"
 									v-if="!parseInt(item.discount)">
@@ -153,7 +153,7 @@
 					<view class="coupon-all">
 						<view class="coupon-box">
 							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index"
-								@tap.stop="couponAction(item, index)">
+								@click="couponAction(item, index)">
 								<image :src="$util.img('public/uniapp/coupon/style5_bg.png')"></image>
 								<view class="coupon">
 									<view class="coupon-info">
@@ -199,7 +199,7 @@
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-1.png') + ')',
 								marginRight: couponItemHeight + 'px',
 								marginLeft: couponItemHeight + 'px'
-							}" @tap.stop="couponAction(item, index)">
+							}" @click="couponAction(item, index)">
 							<view class="coupon-content">
 								<view class="price-wrap">
 									<text class="price" :style="{ color: value.moneyColor }">{{ (item.discount == '0.00'
@@ -229,7 +229,7 @@
 							<text class="limit" :style="{ color: value.limitColor }" v-else>无门槛使用</text>
 						</view>
 
-						<div v-if="computedCouponList.length <= 2" @tap.stop="$util.redirectTo('/pages_goods/category')"
+						<div v-if="computedCouponList.length <= 2" @click="$util.redirectTo('/pages_goods/category')"
 							class="coupon coupon-null" :style="{
 								color: value.moneyColor,
 								backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-2.png') + ')',
@@ -250,7 +250,7 @@
 				<scroll-view class="coupon-style-seven" scroll-x="true">
 					<view class="wrap">
 						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index"
-							@tap.stop="couponAction(item, index)">
+							@click="couponAction(item, index)">
 							<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
 							<view class="coupon">
 								<view class="coupon-info">
@@ -488,7 +488,7 @@ export default {
 }
 
 // 风格一
-::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-fenxiao-goods-list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length"
 		:class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
-		<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 			:class="[value.ornament.type]" :style="goodsItemCss">
 			<view class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 				<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -32,14 +32,14 @@
 							background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
 							color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
 							borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-						}" @tap.stop="followGoods(item, index)">
+						}" @click.stop="followGoods(item, index)">
 							关注
 						</view>
 						<view class="sale-btn" v-if="value.btnStyle.control && item.is_collect == 1" :style="{
 							background: value.btnStyle.theme == 'diy' ? 'linear-gradient(to right,' + value.btnStyle.bgColorStart + ',' + value.btnStyle.bgColorEnd + ')' : '',
 							color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
 							borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
-						}" @tap.stop="delFollowTip(item, index)">
+						}" @click.stop="delFollowTip(item, index)">
 							取消关注
 						</view>
 					</view>

components-diy/diy-float-btn.vue

@@ -3,7 +3,7 @@
 		:class="{ left_top: value.bottomPosition == 1, right_top: value.bottomPosition == 2, left_bottom: value.bottomPosition == 3, right_bottom: value.bottomPosition == 4 }"
 		:style="style">
 		<block v-for="(item, index) in value.list" :key="index">
-			<view class="button-box" @tap.stop="$util.diyRedirectTo(item.link)"
+			<view class="button-box" @click="$util.diyRedirectTo(item.link)"
 				:style="{ width: value.imageSize + 'px', height: value.imageSize + 'px', fontSize: value.imageSize + 'px' }">
 				<image v-if="!item.iconType || item.iconType == 'img'" :src="$util.img(item.imageUrl)" mode="aspectFit"
 					:show-menu-by-longpress="true" />

components-diy/diy-form.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 		</view>
-		<view @tap.stop="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
+		<view @click="submitform" class="fui-btn btn-danger block mtop">提交信息</view>
 	</view>
 </template>
 

components-diy/diy-goods-brand.vue

@@ -8,7 +8,7 @@
 				<view class="ul-wrap">
 					<view class="li-item" v-for="(item, index) in list" :key="index">
 						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit"
-							@tap.stop="handlerClick(item)" @error="imgError(index)"
+							@click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)"
 							:style="itemCss" />
 					</view>
 				</view>

components-diy/diy-goods-list.vue

@@ -2,8 +2,8 @@
 	<x-skeleton data-component-name="diy-goods-list" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view :class="['goods-list', goodsValue.template, goodsValue.style]" :style="goodsListWarpCss">
 			<template v-if="goodsValue.template != 'horizontal-slide'">
-				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-img-wrap">
 						<image class="goods-img"
 							:src="$util.img(item.goods_image, { size: goodsValue.template == 'large-mode' ? 'big' : 'mid' })"
@@ -70,7 +70,7 @@
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
 									borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 								</view>
 
@@ -79,7 +79,7 @@
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : '',
 									borderColor: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 								</view>
 
@@ -90,7 +90,7 @@
 									fontWeight: goodsValue.btnStyle.theme == 'diy' ? (goodsValue.btnStyle.fontWeight ? 'bold' : 'normal') : '',
 									padding: goodsValue.btnStyle.theme == 'diy' ? '0 ' + goodsValue.btnStyle.padding * 2 + 'rpx' : ''
 								}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									{{ goodsValue.btnStyle.text }}
 									<view class="click-event"></view>
 									<!-- <text class="cart-num" v-if="cartList['goods_' + item.goods_id]">{{ cartList['goods_' + item.goods_id].num }}</text> -->
@@ -100,7 +100,7 @@
 								<view v-else-if="goodsValue.btnStyle.style == 'icon-diy'" :style="{
 									color: goodsValue.btnStyle.theme == 'diy' ? goodsValue.btnStyle.textColor : ''
 								}" class="icon-diy click-wrap" :id="'goods-' + item.id"
-									@tap.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
+									@click.stop="$refs.goodsSkuIndex.addCart(goodsValue.btnStyle.cartEvent, item, $event)">
 									<view class="click-event"></view>
 									<diy-icon :icon="goodsValue.btnStyle.iconDiy.icon"
 										:value="goodsValue.btnStyle.iconDiy.style ? goodsValue.btnStyle.iconDiy.style : null"></diy-icon>
@@ -112,8 +112,8 @@
 			</template>
 			<scroll-view v-if="goodsValue.template == 'horizontal-slide' && goodsValue.slideMode == 'scroll'"
 				class="scroll" :scroll-x="true">
-				<view class="goods-item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[goodsValue.ornament.type]" :style="goodsItemCss">
+				<view class="goods-item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 					<view class="goods-img-wrap">
 						<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)"
@@ -179,7 +179,7 @@
 				<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 					:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 					<view class="goods-item" v-for="(dataItem, dataIndex) in list[pageIndex]" :key="dataIndex"
-						@tap.stop="handlerClick(dataItem)"
+						@click="handlerClick(dataItem)" @tap="handlerClick(dataItem)"
 						:class="[goodsValue.ornament.type]" :style="goodsItemCss">
 						<view class="goods-img-wrap">
 							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"

components-diy/diy-goods-recommend.vue

@@ -13,7 +13,7 @@
 				<swiper-item v-for="(item, index) in page" :key="index"
 					:class="['swiper-item', [list[index].length / 3] >= 1 && 'flex-between']">
 					<view class="goods-item" v-for="(dataItem, dataIndex) in list[index]" :key="dataIndex"
-						@tap.stop="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
+						@click="toDetail(dataItem)" :class="[goodsValue.ornament.type]" :style="goodsItemCss">
 						<div class="goods-img-wrap">
 							<image class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 								:src="$util.img(dataItem.goods_image, { size: 'mid' })" mode="widthFix"

components-diy/diy-graphic-nav.vue

@@ -9,13 +9,13 @@
                     <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
                         :key="index"
                         v-if="index >= [(numItem) * (value.pageCount * value.rowCount)] && index < [(numItem + 1) * (value.pageCount * value.rowCount)]"
-                        :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                        :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                         <!-- #endif -->
                         <!-- #ifdef H5 -->
                         <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
                             :key="index"
                             v-if="index >= [(numItem - 1) * (value.pageCount * value.rowCount)] && index < [numItem * (value.pageCount * value.rowCount)]"
-                            :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                            :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                             <!-- #endif -->
                             <view class="graphic-img" v-if="value.mode != 'text'"
                                 :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
@@ -62,7 +62,7 @@
                 <!-- #endif -->
 
                 <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list" :key="index"
-                    :style="{ width: 100 / value.rowCount + '%' }" @tap.stop="redirectTo(item.link)">
+                    :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
                     <view class="graphic-img" v-if="value.mode != 'text'"
                         :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
                         <image v-if="item.iconType == 'img'"

components-diy/diy-group.vue

@@ -251,14 +251,14 @@
 				<diy-icon :value="item"></diy-icon>
 			</template>
 
-			<template v-if="item.componentName == 'Tab'">
-				<!-- Tab 组件 -->
-				<diy-tab :value="item" :diyGlobal="diyGlobalData"></diy-tab>
+			<template v-if="item.componentName == 'WechatChannel'">
+				<!-- 微信视频号 -->
+				<diy-wechat-channel :value="item"></diy-wechat-channel>
 			</template>
 
-			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
-				<!-- 视频号列表 -->
-				<diy-channel-list :value="item"></diy-channel-list>
+			<template v-if="item.componentName == 'WechatChannelList'">
+				<!-- 微信视频号列表 -->
+				<diy-wechat-channel-list :value="item"></diy-wechat-channel-list>
 			</template>
 
 			<!-- 自定义扩展组件 -->
@@ -272,7 +272,6 @@
 import DiyMinx from './minx.js'
 
 export default {
-	name: 'diy-group',
 	props: {
 		diyData: {
 			type: Object
@@ -352,12 +351,6 @@ export default {
 					}
 				});
 			} else data = this.setPagestyle;
-
-			console.log(`diy-group ['diyDataArray'] = `, {
-				data: data,
-				diyData: this.diyData,
-				diyGlobalData: this.diyGlobalData,
-			})
 			return data;
 		}
 	},

components-diy/diy-groupbuy.vue

@@ -2,7 +2,7 @@
 	<x-skeleton data-component-name="diy-groupbuy" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-groupbuy" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -39,7 +39,7 @@
 			</template>
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -81,7 +81,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -274,7 +274,7 @@ export default {
 </script>
 
 <style lang="scss">
-::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-hot-area.vue

@@ -9,7 +9,7 @@
 				height: mapItem.height + '%',
 				left: mapItem.left + '%',
 				top: mapItem.top + '%'
-			}" @tap.stop="$util.diyRedirectTo(mapItem.link)"></view>
+			}" @click.stop="$util.diyRedirectTo(mapItem.link)"></view>
 		</view>
 	</view>
 </template>

components-diy/diy-image-nav.vue

@@ -15,12 +15,12 @@
 							'width': (item.imgWidth / 2 + 'rpx') + ';',
 							'height': (item.imgHeight / 2 + 'rpx') + ';'
 						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true" @tap.stop="redirectTo(item.link)"></image>
+							:show-menu-by-longpress="true" @tap="redirectTo(item.link)"></image>
 						<image v-else :style="{
 							'width': (item.imgWidth / 2 + 'rpx') + ';',
 							'height': (item.imgHeight / 2 + 'rpx') + ';'
 						}" :src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
-							:show-menu-by-longpress="true" @tap.stop="previewImg(item.imageUrl)"></image>
+							:show-menu-by-longpress="true" @tap="previewImg(item.imageUrl)"></image>
 					</view>
 
 					<!-- 文字部分 -->
@@ -103,6 +103,17 @@ export default {
 		}
 	},
 	methods: {
+		// 预览图片
+		previewImg(imageUrl) {
+			uni.previewImage({
+				current: 0,
+				urls: [this.$util.img(imageUrl)],
+				success: (res) => { },
+				fail: (res) => { },
+				complete: (res) => { }
+			});
+		},
+
 		// 页面跳转
 		redirectTo(link) {
 			if (!link.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {

components-diy/diy-img-ads.vue

@@ -2,7 +2,8 @@
 	<view data-component-name="diy-img-ads" class="single-graph">
 		<view :style="imgAdsMarginWarp" class="swiper-box">
 			<block v-if="imgAdsValue.list.length == 1">
-				<view class="simple-graph-wrap" :style="imgAdsSwiper" @tap.stop="handlerClick(imgAdsValue.list[0].link)">
+				<view class="simple-graph-wrap" :style="imgAdsSwiper" @click="handlerClick(imgAdsValue.list[0].link)"
+					@tap="handlerClick(imgAdsValue.list[0].link)">
 					<image :style="{ height: imgAdsValue.list[0].imgHeight }"
 						:src="$util.img(imgAdsValue.list[0].imageUrl)" mode="widthFix" :show-menu-by-longpress="true" />
 				</view>
@@ -15,7 +16,7 @@
 				indicator-color="rgba(130, 130, 130, .5)" :indicator-active-color="imgAdsValue.indicatorColor"
 				@change="swiperChange">
 				<swiper-item class="swiper-item" :style="imgAdsSwiper" v-for="(item, index) in imgAdsValue.list"
-					:key="index" v-if="item.imageUrl" @tap.stop="handlerClick(item.link)">
+					:key="index" v-if="item.imageUrl" @click="handlerClick(item.link)" @tap="handlerClick(item.link)">
 					<view class="item" :style="imgAdsSwiper + 'height: ' + item.imgHeight">
 						<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 							:show-menu-by-longpress="true" />
@@ -279,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

@@ -8,7 +8,7 @@
 						:style="{ background: value.backgroundColor ? value.backgroundColor : '', width: 'calc(100% - 48rpx)' }"
 						@touchmove.stop>
 						<view class="item" :id="'a' + index" v-for="(item, index) in cateList" :key="index"
-							@tap.stop="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
+							@click="changePageIndex(index)" :class="{ fill: value.styleType == 'fill' }"
 							:style="{ background: index == pageIndex && value.styleType == 'fill' ? value.selectColor : '' }">
 							<view class="text-con" :class="index == pageIndex ? 'active' : ''" :style="{
 								color: index == pageIndex ? '' : value.noColor
@@ -25,13 +25,13 @@
 						</view>
 					</scroll-view>
 					<text class="iconfont icon-unfold unfold-arrows" :style="{ color: value.moreColor }"
-						@tap.stop="unfoldMenu"></text>
+						@click="unfoldMenu"></text>
 				</view>
 				<uni-popup ref="navTopCategoryPop" type="top" :top="uniPopTop">
 					<view class="nav-topcategory-pop">
 						<text v-for="(item, index) in cateList" :key="index"
 							:class="['category-item', { 'color-base-text color-base-border active': pageIndex == index }]"
-							@tap.stop="changePageIndex(index)">
+							@click="changePageIndex(index)">
 							{{ item.short_name ? item.short_name : item.category_name }}
 						</text>
 					</view>
@@ -55,7 +55,7 @@
 										<view class="twoCategory min" v-if="twoCategorylist.length <= 5">
 											<view class="twoCategory-page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
-													:key="index" @tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="$util.img(item.image)" v-if="item.image"
 															mode="aspectFill" />
@@ -70,7 +70,7 @@
 											v-if="twoCategorylist.length > 5 && twoCategorylist.length <= 10">
 											<view class="twoCategory-page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
-													:key="index" @tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													:key="index" @click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="$util.img(item.image)" v-if="item.image"
 															mode="aspectFill" />
@@ -86,7 +86,7 @@
 											<swiper-item class="twoCategory-page" v-for="page in maxPage" :key="page">
 												<view class="swiper-item" v-for="(item, index) in twoCategorylist"
 													:key="index" v-if="index >= (page - 1) * 10 && index < page * 10"
-													@tap.stop="toCateGoodsList(item.category_id_2, 2)">
+													@click="toCateGoodsList(item.category_id_2, 2)">
 													<view class="item-box">
 														<image :src="item.image" mode="aspectFill" />
 														<view>{{ item.category_name }}</view>
@@ -108,7 +108,7 @@
 
 									<view class="goods-list double-column" v-if="goodsList[pageIndex].list.length">
 										<view class="goods-item" v-for="(item, index) in goodsList[pageIndex].list"
-											:key="index" @tap.stop="toDetail(item)">
+											:key="index" @click="toDetail(item)">
 											<view class="goods-img">
 												<image :src="goodsImg(item.goods_image)" mode="widthFix"
 													@error="imgError(index)" />
@@ -732,7 +732,7 @@ export default {
 	margin-top: 100rpx;
 }
 
-::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>
@@ -14,7 +14,7 @@
 				</view>
 				<view class="fui-remark jump" style="padding-right: 20rpx; text-align: center; line-height: 140rpx;">
 					<span style="font-size:24rpx;padding: 14rpx 18rpx;border-radius:8rpx"
-						:style="{ background: item.BtBgColor, color: item.BtColor }" @tap.stop="previewSqs()">立即添加</span>
+						:style="{ background: item.BtBgColor, color: item.BtColor }" @click="previewSqs()">立即添加</span>
 				</view>
 			</view>
 		</view>

components-diy/diy-listmenu.vue

@@ -3,7 +3,7 @@
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
-			<view v-for="(item, index) in value.list" @tap.stop="redirectTo(item.link)" class="fui-cell"
+			<view v-for="(item, index) in value.list" @click="redirectTo(item.link)" class="fui-cell"
 				:class="item.iconType == 'img' ? 'img-cell' : ''">
 				<view class="fui-cell-icon" :style="{ 'color': item.style ? item.style.iconColor : '#333' }">
 					<diy-icon v-if="item.iconType == 'icon'" :icon="item.icon" :value="item.style ? item.style : null"

components-diy/diy-live.vue

@@ -1,6 +1,6 @@
 <template>
 	<x-skeleton data-component-name="diy-live" type="banner" :loading="loading" :configs="skeletonConfig">
-		<view class="live-wrap" @tap.stop="handlerClick(liveInfo.roomid)"
+		<view class="live-wrap" @click="handlerClick(liveInfo.roomid)" @tap="handlerClick(liveInfo.roomid)"
 			v-if="liveInfo">
 			<view class="banner-wrap">
 				<image

components-diy/diy-many-goods-list.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-x="true" class="many-goods-list-head" :scroll-into-view="'a' + cateIndex"
 			:style="manyWrapCss">
 			<view v-for="(item, index) in value.list" class="scroll-item" :class="{ active: index == cateIndex }"
-				:id="'a' + index" :key="index" @tap.stop="handlerClick({ item, index })">
+				:id="'a' + index" :key="index" @click="handlerClick({ item, index })" @tap="handlerClick({ item, index })">
 				<view class="split-line" v-if="index > 0"></view>
 				<view class="cate">
 					<view class="name" :style="{ color: value.headStyle.titleColor }">{{ item.title }}</view>

components-diy/diy-map.vue

@@ -3,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;"
-					@tap.stop="handlerClick(item)" @tap="handlerClick(item)">
+					@click="handlerClick(item)" @tap="handlerClick(item)">
 					<cover-view style="font-size:24rpx">一键导航</cover-view>
-				</cover-view> -->
-
-				<!-- 使用非原生cover-view, 解决原生cover-view组件渲染机制z-index失效的问题 -->
-				<div
-					style="position:absolute;right:12rpx;bottom:48rpx;z-index:1;background:#4390FF;padding:0rpx 20rpx;border-radius:8rpx;color: #fff;"
-					@tap.stop="handlerClick(item)">
-					<span style="font-size:24rpx;color: #fff;">一键导航</span>
-				</div>			
+				</cover-view>
 			</map>
 		</view>
 

components-diy/diy-member-info.vue

@@ -4,7 +4,7 @@
 		<view class="common-wrap info-wrap" :class="[`data-style-${value.style}`]">
 			<view class="member-info" :style="memberInfoStyle">
 				<view class="info-wrap" :style="infoStyle" v-if="memberInfo">
-					<view class="headimg" @tap.stop="getWxAuth">
+					<view class="headimg" @click="getWxAuth">
 						<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head"
 							mode="widthFix" @error="memberInfo.headimg = $util.getDefaultImage().head" />
 					</view>
@@ -12,10 +12,10 @@
 						<!-- #ifdef MP -->
 						<block
 							v-if="(memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile">
-							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击授权头像昵称</text></view>
+							<view class="nickname"><text class="name" @click="getWxAuth">点击授权头像昵称</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @tap.stop="getWxAuth">{{ memberInfo.nickname }}</text>
+							<text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text>
 							<view class="member-level"
 								v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level">
 								<!-- 	<text class="icondiy icon-system-huangguan"></text> -->
@@ -36,10 +36,10 @@
 						<!-- #ifdef H5 -->
 						<block
 							v-if="$util.isWeiXin() && ((memberInfo.nickname.indexOf('u_') != -1 && memberInfo.nickname == memberInfo.username) || memberInfo.nickname == memberInfo.mobile)">
-							<view class="nickname"><text class="name" @tap.stop="getWxAuth">点击获取微信头像</text></view>
+							<view class="nickname"><text class="name" @click="getWxAuth">点击获取微信头像</text></view>
 						</block>
 						<view class="nickname" v-else>
-							<text class="name" @tap.stop="redirect('/pages_tool/member/info')">{{ memberInfo.nickname
+							<text class="name" @click="redirect('/pages_tool/member/info')">{{ memberInfo.nickname
 							}}</text>
 							<view class="member-level"
 								v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level">
@@ -61,10 +61,10 @@
 					</view>
 					<view v-if="ischina == 1"
 						style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000"
-						@tap.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
-				<view class="info-wrap" v-else :style="infoStyle" @tap.stop="redirect($util.MEMBER_PAGE_URL)">
+				<view class="info-wrap" v-else :style="infoStyle" @click="redirect($util.MEMBER_PAGE_URL)">
 					<view class="headimg">
 						<image :src="$util.getDefaultImage().head" mode="widthFix"></image>
 					</view>
@@ -75,12 +75,12 @@
 
 					<view v-if="ischina == 1"
 						style="background: #fff;height: 60rpx;width: 60rpx;border-radius: 50rpx;line-height:65rpx;text-align: center;color:#000"
-						@tap.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
+						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
 				<view class="account-info" v-show="value.style == 1"
 					:style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance')">
+					<view class="account-item" @click="redirect('/pages_tool/member/balance')">
 						<view class="value price-font">
 							{{ memberInfo ? (parseFloat(memberInfo.balance) +
 								parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
@@ -88,12 +88,12 @@
 						<view class="title">{{ $lang('balance') }}</view>
 					</view>
 					<view class="solid"></view>
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+					<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 						<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
 						<view class="title">{{ $lang('point') }}</view>
 					</view>
 					<view class="solid"></view>
-					<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+					<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 						<view class="value price-font">
 							{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 						</view>
@@ -110,8 +110,8 @@
 							<text>超级会员</text>
 						</view>
 						<view class="super-text">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">会员可享更多权益</text>
 							<text class="iconfont icon-right"></text>
 						</view>
 					</block>
@@ -121,8 +121,8 @@
 							<view class="desc">开通可享更多权益</view>
 						</view>
 						<view class="super-text">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看特权</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</view>
 					</block>
 				</view>
@@ -134,25 +134,25 @@
 							<view class="desc">开通可享更多权益</view>
 						</view>
 						<view class="super-text" :class="{ 'more' : memberInfo && memberInfo.member_level_type }">
-							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @tap.stop="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
-							<text class="see" v-else @tap.stop="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
+							<text class="see" v-if="memberInfo && memberInfo.member_level_type" @click="redirectBeforeAuth('/pages_tool/member/card')">查看更多权益</text>
+							<text class="see" v-else @click="redirectBeforeAuth('/pages_tool/member/card_buy')">立即开通</text>
 						</view>
 					</view>
 					<view class="account-info" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance_detail')">
+						<view class="account-item" @click="redirect('/pages_tool/member/balance_detail')">
 							<view class="value price-font">
 								{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}
 							</view>
 							<view class="title">余额</view>
 						</view>
 						<view class="solid"></view>
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+						<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 							<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}
 							</view>
 							<view class="title">积分</view>
 						</view>
 						<view class="solid"></view>
-						<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+						<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 							<view class="value price-font">
 								{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 							</view>
@@ -161,7 +161,7 @@
 					</view>
 					<view class="style4-other">
 						<view class="style4-btn-wrap">
-							<view @tap.stop="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
+							<view @click="redirect('/pages_tool/recharge/list')" class="recharge-btn">余额充值</view>
 						</view>
 					</view>
 				</view> -->
@@ -169,18 +169,18 @@
 
 			<view class="account-info" v-show="value.style == 2"
 				:style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/balance')">
+				<view class="account-item" @click="redirect('/pages_tool/member/balance')">
 					<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) +
 						parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
 					<view class="title">{{ $lang('balance') }}</view>
 				</view>
 				<view class="solid"></view>
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/point_detail')">
+				<view class="account-item" @click="redirect('/pages_tool/member/point_detail')">
 					<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
 					<view class="title">{{ $lang('point') }}</view>
 				</view>
 				<view class="solid"></view>
-				<view class="account-item" @tap.stop="redirect('/pages_tool/member/coupon')">
+				<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
 					<view class="value price-font">
 						{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}
 					</view>
@@ -196,7 +196,7 @@
 					<view class="head">
 						<text class="title">获取您的昵称、头像</text>
 						<text class="color-tip tips">获取用户头像、昵称完善个人资料，主要用于向用户提供具有辨识度的用户中心界面</text>
-						<text class="iconfont icon-close color-tip" @tap.stop="cancelCompleteInfo"></text>
+						<text class="iconfont icon-close color-tip" @click="cancelCompleteInfo"></text>
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="item-wrap">
@@ -227,7 +227,7 @@
 						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" />
 					</view>
 					<!-- #endif -->
-					<button type="default" class="save-btn" @tap.stop="saveCompleteInfo" :disabled="isDisabled">保存</button>
+					<button type="default" class="save-btn" @click="saveCompleteInfo" :disabled="isDisabled">保存</button>
 				</view>
 			</uni-popup>
 		</view>
@@ -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 ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
+.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-member-my-order.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-member-my-order" class="common-wrap" :style="warpCss">
 		<view class="order-wrap">
 			<view class="status-wrap">
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitpay')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitpay')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -21,7 +21,7 @@
 					</view>
 					<view class="title">{{ $lang('waitpay') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitsend')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitsend')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -40,7 +40,7 @@
 					</view>
 					<view class="title">{{ $lang('waitsend') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitconfirm')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitconfirm')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -59,7 +59,7 @@
 					</view>
 					<view class="title">{{ $lang('waitconfirm') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_order/list?status=waitrate')"
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitrate')"
 					style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
@@ -76,7 +76,7 @@
 					</view>
 					<view class="title">{{ $lang('completed') }}</view>
 				</view>
-				<view class="item-wrap" @tap.stop="redirect('/pages_tool/order/activist')">
+				<view class="item-wrap" @click="redirect('/pages_tool/order/activist')">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/refunding.png')" mode="widthFix" />

components-diy/diy-merch-list.vue

@@ -4,7 +4,7 @@
 			<view class="merch-wrap" :style="warpCss">
 				<view :class="['list-wrap', value.style]" :style="warpCss">
 					<view :class="['item', value.ornament.type]" v-for="(item, index) in list" :key="index"
-						:style="itemCss" @tap.stop="handlerClick(item)">
+						:style="itemCss" @click="handlerClick(item)" @tap="handlerClick(item)">
 						<view class="merch-img">
 							<image class="cover-img" :src="$util.img(item.merch_image)" mode="widthFix"
 								@error="imgError(index)" />
@@ -25,7 +25,7 @@
 					<!-- #endif -->
 
 					<view class="merch-nav-item graphic" v-for="(item, index) in list" :key="index"
-						:style="{ width: 100 / 4 + '%' }" @tap.stop="handlerClick(item)">
+						:style="{ width: 100 / 4 + '%' }" @click="handlerClick(item)" @tap="handlerClick(item)">
 						<view class="graphic-img" v-if="value.mode != 'text'"
 							:style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
 							<image

components-diy/diy-notes.vue

@@ -3,12 +3,13 @@
 		<view class="diy-notes" :style="{ backgroundColor: value.componentBgColor }">
 			<view class="diy-notes-top">
 				<view class="notes-title" :style="{ color: value.titleTextColor }">{{ value.title }}</view>
-				<view class="notes-more" @tap.stop="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}
+				<view class="notes-more" @click="toMore()" :style="{ color: value.moreTextColor }">{{ value.more }}
 				</view>
 			</view>
 
 			<scroll-view class="diy-notes-box" scroll-x="true" show-scrollbar="true">
-				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @tap.stop="handlerClick(item)" :style="notesItemStyle">
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :style="notesItemStyle">
 					<view class="notes-item" v-if="item.status == 1">
 						<view class="notes-item-con">
 							<view class="notes-title">{{ item.note_title }}</view>

components-diy/diy-notice.vue

@@ -41,12 +41,12 @@
 		<view @touchmove.prevent.stop>
 			<uni-popup ref="noticePopup" type="center">
 				<view class="notice-popup">
-					<view class="head-wrap" @tap.stop="closeNoticePopup">
+					<view class="head-wrap" @click="closeNoticePopup">
 						<text>公告</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">{{ notice }}</view>
-					<button type="primary" @tap.stop="closeNoticePopup">我知道了</button>
+					<button type="primary" @click="closeNoticePopup">我知道了</button>
 				</view>
 			</uni-popup>
 		</view>

components-diy/diy-payment-qrcode.vue

@@ -7,11 +7,11 @@
 					<!-- <text class="iconfont icon-shuaxin"></text> -->
 				</view>
 				<view class="qrocde-action">
-					<button type="primary" @tap.stop="toLink">
+					<button type="primary" @click="toLink">
 						<text class="iconfont icon-fukuanma"></text>
 						<text class="action-name">付款码</text>
 					</button>
-					<button type="primary" @tap.stop="openPaymentPopup">
+					<button type="primary" @click="openPaymentPopup">
 						<text class="iconfont icon-saomafu"></text>
 						<text class="action-name">扫码付</text>
 					</button>
@@ -26,12 +26,12 @@
 		<view @touchmove.prevent.stop>
 			<uni-popup ref="paymentPopup" type="center">
 				<view class="payment-popup">
-					<view class="head-wrap" @tap.stop="closePaymentPopup">
+					<view class="head-wrap" @click="closePaymentPopup">
 						<text>提示</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="content-wrap">扫码付请退出程序后直接使用微信扫一扫或返回上一页使用付款码进行支付</view>
-					<button type="primary" @tap.stop="closePaymentPopup">我知道了</button>
+					<button type="primary" @click="closePaymentPopup">我知道了</button>
 				</view>
 			</uni-popup>
 		</view>

components-diy/diy-picture.vue

@@ -3,9 +3,9 @@
 		<view class="fui-picture">
 			<view v-for="(item, index) in value.list" style="line-height: 0;">
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)"
-					v-if="item.link.wap_url" @tap.stop="handlerClick(item)"></image>
+					v-if="item.link.wap_url" @click="handlerClick(item)" @tap="handlerClick(item)"></image>
 				<image mode="widthFix" style="width: 100%;height:auto" :src="$util.img(item.imageUrl)" v-else
-					@tap.stop="handlerClick(item)"></image>
+					@click="handlerClick(item)" @tap="handlerClick(item)"></image>
 			</view>
 			<!--   <view wx:if="{{!childitem.linkurl}}" bindtap="previewImg" data-src="{{childitem.imgurl}}" style="padding:{{diyitem.style.paddingtop==0?0:diyitem.style.paddingtop+'rpx'}} {{diyitem.style.paddingleft==0?0:diyitem.style.paddingleft+'rpx'}}" wx:for="{{diyitem.data}}" wx:for-index="childid" wx:for-item="childitem" wx:key="{{childid}}">
 		        <image mode="widthFix" src="{{childitem.imgurl}}" style="{{bannerheight?'height:'+bannerheight+'px':'height:auto'}}"></image>
@@ -52,6 +52,17 @@ export default {
 		}
 	},
 	methods: {
+		previewImg(img) {
+			// #ifdef MP-WEIXIN
+			uni.previewImage({
+				current: 0,
+				urls: [this.$util.img(img)],
+				success: function (res) { },
+				fail: function (res) { },
+				complete: function (res) { },
+			})
+			// #endif
+		},
 		redirectTo(link) {
 			if (link.wap_url) {
 				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
@@ -66,9 +77,7 @@ export default {
 			await this.__$emitEvent({
 				eventName: 'picture-tap', data: item, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-
-					const link = item.link;
-					if (link?.name || link?.wap_url || link?.appid) {
+					if (item.link.wap_url) {
 						this.redirectTo(item.link);
 					} else {
 						this.previewImg(item.imageUrl);

components-diy/diy-pinfan.vue

@@ -2,7 +2,7 @@
 	<x-skeleton data-component-name="diy-pinfan" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-pinfan" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -61,7 +61,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -113,7 +113,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -319,7 +319,7 @@ export default {
 </script>
 
 <style lang="scss">
-::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

@@ -31,14 +31,14 @@
 				</view>
 				<view class="head-right"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="$util.redirectTo('/pages_promotion/pintuan/list')">
+					@click="$util.redirectTo('/pages_promotion/pintuan/list')">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
 			</view>
 
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 					:class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -100,7 +100,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="toDetail(item)"
+					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -161,7 +161,7 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -391,7 +391,7 @@ export default {
 </script>
 
 <style lang="scss">
-::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

@@ -2,8 +2,8 @@
 	<x-skeleton data-component-name="diy-presale" :type="skeletonType" :loading="loading" :configs="skeletonConfig">
 		<view class="diy-presale" v-if="list.length" :class="[value.template, value.style]" :style="warpCss">
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-					:class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+					@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 							:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -40,8 +40,8 @@
 			</template>
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @tap.stop="handlerClick(item)"
-						:class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="handlerClick(item)"
+						@tap="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 								:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -75,7 +75,8 @@
 					<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 						:class="['swiper-item', (list.length && [list[pageIndex].length / 3] >= 1) && 'flex-between']">
 						<view class="item" v-for="(item, dataIndex) in list[pageIndex]" :key="dataIndex"
-							@tap.stop="handlerClick(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+							@click="handlerClick(item)" @tap="handlerClick(item)" :class="[value.ornament.type]"
+							:style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 									:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -275,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;
@@ -284,7 +285,7 @@ export default {
 	background: transparent;
 }
 
-::v-deep ::-webkit-scrollbar {
+/deep/::-webkit-scrollbar {
 	display: none;
 	width: 0;
 	height: 0;

components-diy/diy-quick-nav.vue

@@ -5,7 +5,7 @@
 			<view class="uni-scroll-view-content">
 				<!-- #endif -->
 				<view class="quick-nav-item" v-for="(item, index) in value.list" :key="index"
-					@tap.stop="handlerClick(item)"
+					@click="handlerClick(item)" @tap="handlerClick(item)"
 					:style="{ background: 'linear-gradient(to right,' + item.bgColorStart ? item.bgColorStart : '' + ',' + item.bgColorEnd ? item.bgColorEnd : '' + ')' }">
 					<view class="quick-img" v-if="item.imageUrl || item.icon">
 						<image v-if="item.iconType == 'img'"

components-diy/diy-rich-text.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-rich-text" class="rich-text-box" :style="richTextWarpCss">
-		<rich-text :nodes="html" @tap.stop="handlerClick"></rich-text>
+		<rich-text :nodes="html" @click="handlerClick" @tap="handlerClick"></rich-text>
 	</view>
 </template>
 

components-diy/diy-rubik-cube.vue

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

components-diy/diy-search.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-search" class="diy-search">
 		<view class="diy-search-wrap" :class="value.positionWay" :style="fixedCss">
 			<view :class="['search-box', 'search-box-' + value.searchStyle]" :style="searchWrapCss"
-				@tap.stop="handlerSearchClick">
+				@click="handlerSearchClick" @tap="handlerSearchClick">
 				<block v-if="[1, 2].includes(value.searchStyle)">
 					<view class="img" v-if="value.searchStyle == 2 && value.iconType == 'img'">
 						<image :src="$util.img(value.imageUrl)" mode="heightFix" />
@@ -14,30 +14,32 @@
 						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title"
 							v-model="searchText" @confirm="handlerSearchClick" disabled="true"
 							:placeholderStyle="placeholderStyle" />
-						<text class="iconfont icon-sousuo3" @tap.stop="handlerSearchClick"
+						<text class="iconfont icon-sousuo3" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
 					</view>
 				</block>
 				<block v-if="value.searchStyle == 3">
-					<view class="search-content" :style="inputStyle"
-						@tap.stop="handlerSearchClick">
+					<view class="search-content" :style="inputStyle" @click.stop="handlerSearchClick"
+						@tap="handlerSearchClick">
 						<text class="iconfont icon-sousuo3"
 							:style="{ color: value.textColor ? value.textColor : 'rgba(0,0,0,0)' }"></text>
 						<input type="text" class="uni-input ns-font-size-base" maxlength="50" :placeholder="value.title"
 							v-model="searchText" @confirm="handlerSearchClick" disabled="true"
-							@tap.stop="handlerSearchClick"
+							@click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:placeholderStyle="placeholderStyle" />
-						<text class="search-content-btn" @tap.stop="handlerSearchClick"
+						<text class="search-content-btn" @click.stop="handlerSearchClick" @tap="handlerSearchClick"
 							:style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">搜索</text>
 					</view>
 					<view class="img" v-if="value.iconType == 'img'"
-						@tap.stop="handlerRedirectToClick(value.searchLink)">
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(value.searchLink)">
 						<image :src="$util.img(value.imageUrl)" mode="heightFix" />
 					</view>
 					<diy-icon class="icon" v-if="value.iconType == 'icon'" :icon="value.icon"
 						:value="value.style ? value.style : 'null'"
 						:style="{ maxWidth: 30 * 2 + 'rpx', maxHeight: 30 * 2 + 'rpx' }"
-						@tap.stop="handlerRedirectToClick(value.searchLink)"></diy-icon>
+						@click.stop="handlerRedirectToClick(value.searchLink)"
+						@tap="handlerRedirectToClick(value.searchLink)"></diy-icon>
 				</block>
 			</view>
 		</view>
@@ -255,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

@@ -27,7 +27,7 @@
 				</view>
 				<view class="marketimg-box-title-right" v-if="value.titleStyle.moreSupport"
 					:style="{ fontSize: value.titleStyle.moreFontSize * 2 + 'rpx', color: value.titleStyle.moreColor }"
-					@tap.stop="toMore">
+					@click="toMore">
 					<text>{{ value.titleStyle.more }}</text>
 					<text class="iconfont icon-right"></text>
 				</view>
@@ -35,7 +35,7 @@
 
 			<view class="content-wrap">
 				<template v-if="value.template == 'row1-of1'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -105,7 +105,7 @@
 				</template>
 
 				<template v-if="value.template == 'row1-of2'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 						:class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -150,7 +150,7 @@
 				<template v-if="value.template == 'horizontal-slide'">
 					<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true"
 						:show-scrollbar="false">
-						<view class="item" v-for="(item, index) in dataList" :key="index" @tap.stop="toDetail(item.id)"
+						<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)"
 							:class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
@@ -190,7 +190,7 @@
 						<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex"
 							:class="['swiper-item', dataList[pageIndex] && [dataList[pageIndex].length / 3].length >= 1 && 'flex-between']">
 							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="dataIndex"
-								@tap.stop="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+								@click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 								<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 									<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }"
 										:src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix"
@@ -536,7 +536,7 @@ scroll-view ::-webkit-scrollbar {
 	touch-action: none;
 }
 
-::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-store.vue

@@ -3,7 +3,7 @@
 		<block v-if="value.style == 1">
 			<view class="store-box store-one">
 				<view class="store-info">
-					<view class="info-box" :style="{ color: value.textColor }" @tap.stop="toStoreList()">
+					<view class="info-box" :style="{ color: value.textColor }" @click="toStoreList()">
 						<block v-if="globalStoreInfo && globalStoreInfo.store_id">
 							<text class="title">{{ globalStoreInfo.store_name }}</text>
 							<text>
@@ -15,12 +15,12 @@
 					</view>
 					<view class="address-wrap" :style="{ color: value.textColor }">
 						<text class="iconfont icon-dizhi"></text>
-						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @tap.stop="mapRoute" class="address">{{
+						<text v-if="globalStoreInfo && globalStoreInfo.store_id" @click="mapRoute" class="address">{{
 							globalStoreInfo.show_address }}</text>
 						<text v-else>获取当前位置...</text>
 					</view>
 				</view>
-				<view class="store-image" @tap.stop="selectStore()">
+				<view class="store-image" @click="selectStore()">
 					<image :src="$util.img(globalStoreInfo.store_image)"
 						v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
 					<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
@@ -29,9 +29,9 @@
 		</block>
 
 		<block v-if="value.style == 2">
-			<view class="store-box store-three" @tap.stop="toStoreList()">
+			<view class="store-box store-three" @click="toStoreList()">
 				<view class="store-info">
-					<view class="store-image" @tap.stop="selectStore()">
+					<view class="store-image" @click="selectStore()">
 						<image :src="$util.img(globalStoreInfo.store_image)"
 							v-if="globalStoreInfo && globalStoreInfo.store_image" mode="aspectFill"></image>
 						<image :src="$util.getDefaultImage().store" v-else mode="aspectFill"></image>
@@ -47,13 +47,13 @@
 						<text class="title" v-else>定位中...</text>
 					</view>
 				</view>
-				<view class="store-icon" @tap.stop="search()"><text class="iconfont icon-sousuo3"
+				<view class="store-icon" @click.stop="search()"><text class="iconfont icon-sousuo3"
 						:style="{ color: value.textColor }"></text></view>
 			</view>
 		</block>
 
 		<block v-if="value.style == 3">
-			<view class="store-box store-four" @tap.stop="toStoreList()">
+			<view class="store-box store-four" @click="toStoreList()">
 				<view class="store-left-wrap">
 					<block v-if="globalStoreInfo && globalStoreInfo.store_id">
 						<text class="iconfont icon-weizhi" :style="{ color: value.textColor }"></text>
@@ -64,8 +64,8 @@
 				</view>
 				<view class="store-right-search">
 					<input type="text" class="uni-input font-size-tag" disabled placeholder="商品搜索"
-						@tap.stop="search()" />
-					<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
+						@click.stop="search()" />
+					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
 			</view>
 		</block>

components-diy/diy-tab.vue

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

components-diy/diy-text.vue

@@ -1,5 +1,6 @@
 <template>
-	<view data-component-name="diy-text" class="diy-text" @tap="handlerClick(value.link)" :style="warpCss">
+	<view data-component-name="diy-text" class="diy-text" @click="handlerClick(value.link)"
+		@tap="handlerClick(value.link)" :style="warpCss">
 		<view :class="value.style == 'style-8' ? 'title2' : 'title'"
 			:style="{ fontSize: value.fontSize * 2 + 'rpx', color: value.textColor }">
 			<block v-if="value.style == 'style-0'" style="height: 40rpx; line-height: 40rpx;">
@@ -99,13 +100,13 @@
 								<image :src="$util.img('public/uniapp/diy/style9-2.png')" />
 							</view>
 							<view class="style9-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-								@tap.stop="handlerClick(value.more.link)">
+								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
 								{{ value.more.text }}
 								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 							</view>
 						</view>
 						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-						}}</text>
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -131,13 +132,13 @@
 								<image :src="$util.img('public/uniapp/diy/style10-2.png')"></image>
 							</view>
 							<view class="style10-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-								@tap.stop="handlerClick(value.more.link)">
+								@click.stop="handlerClick(value.more.link)" @tap="handlerClick(value.more.link)">
 								{{ value.more.text }}
 								<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 							</view>
 						</view>
 						<text class="sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-						}}</text>
+							}}</text>
 					</view>
 				</view>
 			</block>
@@ -158,7 +159,7 @@
 										value.subTitle.text }}</view>
 								</view>
 								<view class="style11-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-									@tap.stop="$util.diyRedirectTo(value.more.link)">
+									@click.stop="$util.diyRedirectTo(value.more.link)">
 									{{ value.more.text }}
 									<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 								</view>
@@ -182,9 +183,9 @@
 					{{ value.text }}
 				</view>
 				<text class="style12-sub-title" :style="{ color: value.subTitle.color }">{{ value.subTitle.text
-				}}</text>
+					}}</text>
 				<view class="style12-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-					@tap.stop="$util.diyRedirectTo(value.more.link)">
+					@click.stop="$util.diyRedirectTo(value.more.link)">
 					<text>{{ value.more.text }}</text>
 					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 				</view>
@@ -277,7 +278,7 @@
 					<text :style="{ fontWeight: value.subTitle.fontWeight }">{{ value.subTitle.text }}</text>
 				</view>
 				<view class="style16-more" v-if="value.more.isShow" :style="{ color: value.more.color }"
-					@tap.stop="$util.diyRedirectTo(value.more.link)">
+					@click.stop="$util.diyRedirectTo(value.more.link)">
 					<text>{{ value.more.text }}</text>
 					<view class="iconfont icon-right" :style="{ color: value.more.color }"></view>
 				</view>

components-diy/diy-video.vue

@@ -1,7 +1,7 @@
 <template>
 	<video data-component-name="diy-video" class="diy-video" :src="$util.img(value.videoUrl)"
 		:poster="$util.img(value.imageUrl)" :style="videoWarpCss" objectFit="cover"
-		@tap="handlerClick(value.videoUrl)"></video>
+		@click="handlerClick(value.videoUrl)" @tap="handlerClick(value.videoUrl)"></video>
 </template>
 
 <script>

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,231 @@
+<template>
+	<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>
+		<!-- 嵌入式视频播放 -->
+		<!-- #ifdef MP-WEIXIN -->		 
+		<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>
+		<!-- #endif -->		
+		<!-- 跳转式视频播放 -->
+		<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>
+</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-diy/minx.js

@@ -5,18 +5,5 @@ export default {
             // console.log('__$emitEvent', payload)
             await this.$eventBus.emit(payload.eventName, payload.data, payload.promiseCallback)
         },
-
-        // 预览图片
-		previewImg(img) {
-			// #ifdef MP-WEIXIN
-			uni.previewImage({
-				current: 0,
-				urls: [this.$util.img(img)],
-				success: function (res) { },
-				fail: function (res) { },
-				complete: function (res) { },
-			})
-			// #endif
-		},        
     }
 }

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

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

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"
-                    :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true"
-                    :info="goodsSkuDetail.barrageData" />
+                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
 
                 <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{ height: goodsSkuDetail.swiperHeight }">
+                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
                     <!-- 商品图片 -->
                     <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval"
-                            :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index"
-                                :item-id="'goods_id_' + index">
+                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
+                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
                                 <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)"
-                                        mode="aspectFit" />
+                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
                                 </view>
                             </swiper-item>
                         </swiper>
@@ -29,16 +24,13 @@
 
                     <!-- 商品视频 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
-                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
+                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
                     </view>
 
                     <!-- 切换视频、图片 -->
                     <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{
-                            $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }"
-                            @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
+                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
                     </view>
                 </view>
 
@@ -48,20 +40,19 @@
                 </view>
 
                 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-
+					
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
 
                     <!-- 配送 -->
-                    <!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0">
-                        <view class="label">{{ $lang('send') }}</view>
+				<!-- 	@click="$refs.deliveryType.open()" -->
+                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
+                        <view class="label">{{$lang('send')}}</view>
                         <block v-if="deliveryType">
                             <view class="box">
                                 <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text
-                                        v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ $lang('express') }}</text>
-                                    <!-- 	{{ item.name }} -->
+                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
+								<!-- 	{{ item.name }} -->
                                 </block>
                             </view>
                             <text class="iconfont icon-right"></text>
@@ -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()"
-                        v-if="goodsSkuDetail.goods_service.length">
+                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
                         <view class="label">服务</view>
                         <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index"
-                                v-if="index < 3">
+                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
                                 <view class="item-wrap-box">
                                     <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui"
-                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
-                                            :src="$util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'"
-                                            :icon="item.icon.icon"
-                                            :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
                                     </view>
                                     <text>{{ item.service_name }}</text>
                                 </view>
@@ -111,32 +96,30 @@
                         </view>
                         <text class="iconfont icon-right"></text>
                     </view>
-
+		
                 </view>
-
-                <!--多规格区域-->
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.sku_spec_format">
-                    <!-- 入口区域 -->
-                    <slot name="skuspec"></slot>
-                </view>
-
-
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
+				
+				<!--多规格区域-->
+				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
+				    <!-- 入口区域 -->
+				  	<slot name="skuspec"></slot>
+				</view>
+			
+				 
+				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
                     <!-- 入口区域 -->
                     <slot name="entrance"></slot>
                     <!-- 商家 -->
-                    <view class="item store-wrap"
-                        @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
+                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
                         <view class="list-wrap" style="display: flex;">
                             <view class="name-wrap">
-                                <image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix"
-                                    style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
+								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
                             </view>
-                            <view class="other-wrap">
-                                <view class="address" style="margin-left: 30rpx;">
-                                    <view>{{ goodsSkuDetail.merchinfo.merch_name }}</view>
-                                    <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-                                </view>
+                           <view class="other-wrap">
+                               <view class="address" style="margin-left: 30rpx;">
+								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
+								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
+							   </view>
                             </view>
                         </view>
                         <text class="iconfont icon-right"></text>
@@ -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"
-                                        :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
+                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
                                         <text class="iconfont" :class="item.icon"></text>
                                         <view class="content">
                                             <view class="title">{{ item.name }}</view>
@@ -176,16 +158,11 @@
                                 <text class="iconfont icon-close"></text>
                             </view>
                             <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }"
-                                    v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{ 'empty-desc': !item.desc }">
-                                        <text class="iconfont icon-dui color-base-text"
-                                            v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'"
-                                            :src="$util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'"
-                                            :icon="item.icon.icon"
-                                            :value="item.icon.style ? item.icon.style : null"></diy-icon>
+                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
+                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
+                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
+                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
+                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
                                     </view>
                                     <view class="info-wrap">
                                         <text class="title">{{ item.service_name }}</text>
@@ -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"
-                                        @click="selectStore(item)">
+                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
                                         <view class="item-box">
                                             <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image" />
-                                                <image :src="$util.getDefaultImage().store" v-else />
+                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
+                                                <image :src="$util.getDefaultImage().store" v-else/>
                                             </view>
                                             <view class="item-info">
                                                 <view class="item-title">
                                                     <text class="title">{{ item.store_name }}</text>
                                                     <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance *
-                                                        1000 + 'm' }}
+                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
                                                     </text>
                                                 </view>
                                                 <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
@@ -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"
-                    style="display: none;">
+                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
                     <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
                         <view class="tit">
                             <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
@@ -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)"
-                                            @error="item.member_headimg = $util.getDefaultImage().head"
-                                            mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head"
-                                            @error="item.member_headimg = $util.getDefaultImage().head"
-                                            mode="aspectFill" />
+                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
+                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
                                     </view>
                                     <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden"
-                                            v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1]
-                                            }}
+                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
                                         </text>
                                         <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
                                         <view v-if="item.scores" class="evaluator-xing">
@@ -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"
-                                        @click="previewEvaluate(index, img_index, 'images')">
+                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
                                         <image :src="$util.img(img)" mode="aspectFill" />
                                     </view>
                                 </view>
@@ -327,9 +294,8 @@
                         </view>
                     </view>
                 </view>
-
-                <view class="goods-attr"
-                    v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
+				
+                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
                     <view class="title">规格属性</view>
                     <view class="attr-wrap">
                         <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
@@ -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"
-                            @click="switchGoodsAttr">
+                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
                             <block v-if="!goodsAttrShow">
                                 展开<text class="iconfont icon-iconangledown"></text>
                             </block>
@@ -350,25 +315,24 @@
                     </view>
                 </view>
 
-
+				
 
                 <!-- 详情 -->
                 <view class="goods-detail-tab">
                     <view class="detail-tab">
-                        <view class="tab-item">{{ $lang('details') }}</view>
+                        <view class="tab-item">{{$lang('details')}}</view>
                     </view>
                     <view class="detail-content active">
                         <view class="detail-content-item">
                             <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                                <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-                                <!-- 		 {{goodsSkuDetail.goods_content}} -->
-                                <mp-html :content="goodsSkuDetail.goods_content" />
-                                <!-- :loading="loading" @preview="preview" @navigate="navigate" -->
+                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
+			<!-- 		 {{goodsSkuDetail.goods_content}} -->
+									<mp-html :content="goodsSkuDetail.goods_content" />
+									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
                             </view>
                             <view class="goods-details active" v-else></view>
                             <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)"
-                                    :data-nodes="service.content"></rich-text>
+                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
                             </view>
                         </view>
                     </view>
@@ -455,30 +419,25 @@
 </template>
 
 <script>
-// 商品详情视图
-import scroll from '@/common/js/scroll-view.js';
-import detail from './detail.js';
+    // 商品详情视图
+    import scroll from '@/common/js/scroll-view.js';
+    import detail from './detail.js';
 
-import pengpaiFadeinOut from '../pengpai-fadein-out/pengpai-fadein-out.vue';
-
-export default {
-    name: 'goods-detail-view',
-    props: {
-        goodsSkuDetail: {
-            type: Object,
-            default: () => {
-                return {};
+    export default {
+        name: 'goods-detail-view',
+        props: {
+            goodsSkuDetail: {
+                type: Object,
+                default: () => {
+                    return {};
+                }
             }
-        }
-    },
-    components: {
-        pengpaiFadeinOut
-    },
-    mixins: [scroll, detail]
-};
+        },
+        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, {
-    height: fixBtnShow ? '400rpx' : '320rpx',
-    backgroundImage: bgUrl ? `url(${bgUrl})` : '',
-    backgroundSize: 'cover'
-  }]">
+	<!-- 悬浮按钮 -->
+	<view v-if="pageCount == 1 || need" class="fixed-box" 
+		:style="[{ height: fixBtnShow ? '400rpx' : '320rpx' }, customContainerStyle]">
+		<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
+		<!-- 切换语言按钮 -->
+		<button class="btn-item" v-if="fixBtnShow && isLanguageSwitchEnabled" @click="toggleLanguage()"
+			:style="[{ backgroundSize: '100% 100%' }, customButtonStyle]">
+			<text :style="customTextStyle">{{ currentLangDisplayName }}</text>
+		</button>
+		<!-- 客服按钮 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp"
+			showMessageCard="true"
+			:style="[{ backgroundImage: 'url(' + (kefuimg ? kefuimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
+			<text class="icox icox-kefu" v-if="!kefuimg"></text>
+			<!-- 	<view>首页</view> -->
+		</button>
+		<!-- #endif -->
+		<view class="btn-item" v-if="fixBtnShow" @click="call()"
+			:style="[{ backgroundImage: 'url(' + (phoneimg ? phoneimg : '') + ')', backgroundSize: '100% 100%' }, customButtonStyle]">
+			<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+			<!-- <view>我的</view> -->
+		</view>
 
-    <!-- 中英文切换按钮 -->
-    <view v-if="isLanguageSwitchEnabled && fixBtnShow" class="btn-item common-bg" @click="toggleLanguage">
-      <text>{{ currentLangDisplayName }}</text>
-    </view>
-
-    <!-- AI 智能助手 -->
-    <view v-if="fixBtnShow && enableAIChat" class="btn-item common-bg" @click="openAIChat"
-      :style="{ backgroundImage: aiAgentimg ? `url(${aiAgentimg})` : '', backgroundSize: '100% 100%' }">
-      <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
-    </view>
-
-    <!-- 微信小程序客服按钮 -->
-    <!-- #ifdef MP-WEIXIN -->
-    <button class="btn-item common-bg" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"
-      :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-      <text class="icox icox-kefu" v-if="!kefuimg"></text>
-    </button>
-    <!-- #endif -->
-
-    <!-- 普通客服（仅当未启用 AI 时显示） -->
-    <!-- #ifdef H5 -->
-    <template v-if="fixBtnShow">
-      <button class="btn-item common-bg" hoverClass="none" @click="openCustomerSelectPopup"
-        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-        <text class="icox icox-kefu" v-if="!kefuimg"></text>
-      </button>
-    </template>
-    <!-- #endif -->
-
-    <!-- 电话按钮（始终显示） -->
-    <view v-if="fixBtnShow" class="btn-item common-bg" @click="call()"
-      :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-      <text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
-    </view>
-
-  </view>
+		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+			<text class="iconfont icon-unfold"></text>
+		</view>
+		<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
+			@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+			<view class="">快捷</view>
+			<view>导航</view>
+		</view> -->
+	</view>
 </template>
 
 <script>
-import { createCustomerService } from '@/common/js/customer-service.js';
-
 export default {
-  name: 'hover-nav',
-  props: {
-    need: { type: Boolean, default: false }
-  },
-  data() {
-    return {
-      pageCount: 0,
-      fixBtnShow: true,
+	name: 'hover-nav',
+	props: {
+		need: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			pageCount: 0,
+			fixBtnShow: true,
+			tel: '',
+			kefuimg: '',
+			phoneimg: '',
+			shopInfo: null, // 店铺信息对象
 
-      shopInfo: null,
-      currentLangIndex: 0,
-      langIndexMap: {},
+			// --- 语言切换相关 ---
+			currentLangIndex: 0,  // 当前选中的语言索引
+			langIndexMap: {},     // 语言索引到语言值的映射
+			isLanguageSwitchEnabled: false,  // 是否启用语言切换
 
-      customerService: null,
-    };
-  },
-  computed: {
-    // 安全读取 shopInfo 中的字段，避免 undefined 报错
-    bgUrl() {
-      return this.shopInfo?.bgUrl || '';
-    },
-    aiAgentimg() {
-      return this.shopInfo?.aiAgentimg || '';
-    },
-    kefuimg() {
-      return this.shopInfo?.kefuimg || this.$util.getDefaultImage().kefu;
-    },
-    phoneimg() {
-      return this.shopInfo?.phoneimg || this.$util.getDefaultImage().phone;
-    },
-    tel() {
-      return this.shopInfo?.mobile || '';
-    },
-    isLanguageSwitchEnabled() {
-      return !!this.shopInfo?.ischina;
-    },
-    enableAIChat() {
-      return !!this.shopInfo?.enableAIChat;
-    },
-    currentLangDisplayName() {
-      const lang = this.langIndexMap[this.currentLangIndex];
-      return lang === 'zh-cn' ? 'EN' : 'CN';
-    },
-    customContainerStyle() {
-      return this.shopInfo?.floatingButton?.container || {};
-    },
-    customButtonStyle() {
-      return this.shopInfo?.floatingButton?.button || {};
-    }
-  },
-  created() {
-    this.customerService = createCustomerService(this);
-    this.initLanguage();
-    uni.getStorage({
-      key: 'shopInfo',
-      success: (e) => {
-        this.shopInfo = e.data;
-      }
-    });
-  },
-  methods: {
+			// --- 其他 ---
+		};
+	},
+	created() {
+		// 初始化语言设置
+		this.initLanguage();
 
-    /**
-     * 初始化多语言配置
-     */
-    initLanguage() {
-      this.langList = this.$langConfig.list();
-      this.langIndexMap = {};
-      for (let i = 0; i < this.langList.length; i++) {
-        this.langIndexMap[i] = this.langList[i].value;
-      }
-      const savedLang = this.$langConfig.getCurrentLocale();
-      if (savedLang) {
-        for (let i = 0; i < this.langList.length; i++) {
-          if (this.langList[i].value === savedLang) {
-            this.currentLangIndex = i;
-            break;
-          }
-        }
-      } else {
-        this.currentLangIndex = 0;
-      }
-    },
+		this.kefuimg = this.$util.getDefaultImage().kefu
+		this.phoneimg = this.$util.getDefaultImage().phone
+		this.pageCount = getCurrentPages().length;
+		
+		// 从店铺信息中获取相关信息
+		uni.getStorage({
+			key: 'shopInfo',
+			success: (e) => {
+				console.log(`获取到的shopInfo:${JSON.stringify(e.data)}`)
+				this.shopInfo = e.data;
 
-    /**
-     * 电话联系客服
-     */
-    call() {
-      this.customerService.makePhoneCall(this.tel);
-    },
+				// 从店铺信息中获取手机号
+				this.tel = e.data.mobile
+				// 从店铺信息中获取是否启用语言切换
+				this.isLanguageSwitchEnabled = e.data.ischina;
+			}
+		})			
+	},
+	computed: {
+		currentLangDisplayName() {
+			// 语言切换按钮显示名称，当前语言为中文时显示EN，否则显示CN
+			// 根据 langIndexMap 获取当前语言值
+			const lang = this.langIndexMap[this.currentLangIndex];
+			return lang == 'zh-cn' ? 'EN' : 'CN';
+		},
 
-    /**
-     * 切换中英文语言，并刷新当前页面（保留所有参数）
-     */
-    toggleLanguage() {
-      this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
-      const targetLang = this.langIndexMap[this.currentLangIndex];
+		// 获取容器的自定义样式
+		customContainerStyle() {
+			// 只返回非空的样式属性，确保不覆盖原有的默认样式
+			return this.shopInfo?.floatingButton?.container || {};
+		},
 
-      // 调用语言切换逻辑（设置 storage + 清空缓存）
-      this.$langConfig.change(targetLang);
-    },
+		// 获取按钮的自定义样式
+		customButtonStyle() {
+			// 只返回非空的样式属性，确保不覆盖原有的默认样式
+			return this.shopInfo?.floatingButton?.button || {};
+		},
 
-    /**
-     * 打开 AI 智能助手
-     */
-    openAIChat() {
-      this.$util.redirectTo(this.$util.AI_CHAT_PAGE_URL);
-    },
+		// 获取文本的自定义样式
+		customTextStyle() {
+			// 只返回非空的样式属性，确保不覆盖原有的默认样式
+			return this.shopInfo?.floatingButton?.text || {};
+		}
+	},
+	methods: {
+		initLanguage() {
+			// 初始化语言列表
+			this.langList = this.$langConfig.list();
 
-    /**
-     * 打开客服选择对话框
-     */
-    openCustomerSelectPopup() {
-      this.customerService.openCustomerSelectPopupDialog();
-    }
-  }
-}
+			// 初始化语言索引映射
+			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;
-  right: 0rpx;
-  bottom: 240rpx;
-  /* #ifdef H5 */
-  bottom: 320rpx;
-  /* #endif */
-  z-index: 10;
-  border-radius: 120rpx;
-  padding: 20rpx 0;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  width: 100rpx;
-  box-sizing: border-box;
-  transition: 0.3s;
-  overflow: hidden;
-}
+	position: fixed;
+	right: 0rpx;
+	bottom: 240rpx;
+	// #ifdef H5
+	bottom: 320rpx;
+	// #endif
+	z-index: 10;
+	border-radius: 120rpx;
+	padding: 20rpx 0;
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	width: 100rpx;
+	box-sizing: border-box;
+	transition: 0.3s;
+	overflow: hidden;
 
-.btn-item {
-  display: flex;
-  justify-content: center;
-  text-align: center;
-  flex-direction: column;
-  line-height: 1;
-  margin: 14rpx 0;
-  transition: 0.1s;
-  color: var(--hover-nav-text-color);
-  border-radius: 40rpx;
-  width: 80rpx;
-  height: 80rpx;
-  padding: 0;
-  overflow: hidden;
-}
+	.btn-item {
+		display: flex;
+		justify-content: center;
+		text-align: center;
+		flex-direction: column;
+		line-height: 1;
+		margin: 14rpx 0;
+		transition: 0.1s;
+		background: var(--hover-nav-bg-color);
+		color: var(--hover-nav-text-color);
+		border-radius: 40rpx;
+		width: 80rpx;
+		height: 80rpx;
+		padding: 0;
+		overflow: hidden;
 
-/* 定义共同的背景颜色 */
-.common-bg {
-  background-color: var(--hover-nav-bg-color);
-  /* 使用变量以保持一致性 */
-}
+		text {
+			font-size: 28rpx;
+		}
+		.iconfont,
+		.icox {
+			font-size: 36rpx;
+			font-weight: bold;
+			width: 100%;
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 40rpx;
+			/* 确保图标本身也是圆形 */
+		}
 
-.btn-item text {
-  font-size: 28rpx;
-}
+		view {
+			font-size: 26rpx;
+			font-weight: bold;
+		}
 
-.iconfont,
-.icox {
-  font-size: 36rpx;
-  font-weight: bold;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 14rpx 0;
-  border-radius: 50rpx;
-  width: 80rpx;
-  height: 80rpx;
-  padding: 0;
-  position: relative;
-}
+		&.show {
+			transform: rotate(180deg);
+		}
 
-.iconfont text,
-.icox text {
-  font-size: 36rpx;
-  font-weight: bold;
-}
+		&.switch {}
 
-
-
-.ai-icon {
-  font-size: 40rpx;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+		&.icon-xiala {
+			margin: 0;
+			margin-top: 0.1rpx;
+		}
+	}
 }
 </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

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

@@ -1,385 +1,237 @@
 <template>
-	<view>
-		<view class="privacy-mask" v-if="showPop">
+	<!-- #ifdef MP -->
+	<view v-if="showPop">
+		<view class="privacy-mask">
 			<view class="privacy-wrap">
 				<view class="privacy-title">用户隐私保护提示</view>
 				<view class="privacy-desc">
-					感谢您使用{{ appName }}，在使用前您应当阅读并同意
-					<text class="privacy-link" @tap="openPrivacyContract">{{ privacyContractName }}</text>
-					<!-- #ifdef QUICKAPP-WEBVIEW || H5 -->
-					<text class="privacy-link" @tap="openPrivacyService">{{ privacyServiceName }}</text>
-					<!-- #endif -->
-					,当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用{{ appName }}相关功能。
+					感谢您使用本小程序，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
+					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
 				</view>
 				<view class="privacy-button-flex">
 					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
-					<!-- #ifdef QUICKAPP-WEBVIEW || MP-WEIXIN -->
-					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization"
-						@agreeprivacyauthorization="handleAgree">同意并继续</button>
-					<!-- #endif -->
-					<!-- #ifdef WEB || H5 -->
-					<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree" @click="handleAgree">同意并继续</button>
-					<!-- #endif -->
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
 				</view>
 			</view>
 		</view>
 	</view>
+	<!-- #endif -->
+	<!-- #ifdef WEB || H5 -->
+	<view v-if="showPop"></view>
+	<!-- #endif -->
 </template>
 
 <script>
-// #ifdef QUICKAPP-WEBVIEW
-import has from '@system.has'
-// #endif
-
-const closeOtherPagePopUpHooks = new Set();
-const privacyContractPage = '/pages_tool/agreement/contenr?type=0';
-const privacyServicePage = '/pages_tool/agreement/contenr?type=1';
-
-export default {
-	name: 'PrivacyPopup',
-	data() {
-		return {
-			agree: false,
-			showPop: false,
-			privacyAuthorization: null,
-			privacyResolves: new Set(),
-			privacyContractName: '用户隐私保护指引',
-			appName: '本小程序',
-			// #ifdef WEB || H5
-			appName: '本应用',
-			privacyContractName: '《隐私条款》',
-			privacyServiceName: '《用户服务协议》',
-			// #endif
-		}
-	},
-	mounted() {
-		this.listenPrivacySettingChange()
-		this.curPageShow()
-	},
-	created() {
-		try {
-			// #ifdef MP-WEIXIN
+	export default {
+		data() {
+			return {
+				agree: false,
+				showPop: false,
+				privacyAuthorization: null,
+				privacyResolves: new Set(),
+				closeOtherPagePopUpHooks: new Set(),
+				privacyContractName: '用户隐私保护指引'
+			}
+		},
+		mounted() {
+			this.init()
+			this.curPageShow()
+		},
+		created() {
+			let that = this
 			//查询微信侧记录的用户是否有待同意的隐私政策信息
-			wx.getPrivacySetting({
-				success: (res) => {
-					// console.log('隐私政策信息', res);
-					// console.log(res.privacyContractName);
-					this.privacyContractName = res.privacyContractName
-				}
-			});
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.getPrivacySetting) {
-					has.getPrivacySetting({
-						success: (res) => {
-							if (res.privacyContractName) {
-								this.privacyContractName = res.privacyContractName
-							}
-						},
+			try {
+				wx.getPrivacySetting({
+					success(res) {
+						// console.log('隐私政策信息', res);
+						// console.log(res.privacyContractName);
+						that.privacyContractName = res.privacyContractName
+					}
+				});
+			} catch (e) {
+				// console.log("=========低版本基础库==========")
+			}
+		},
+		methods: {
+			// 监听何时需要提示用户阅读隐私政策
+			init() {
+				let that = this;
+				if (wx.onNeedPrivacyAuthorization) {
+					wx.onNeedPrivacyAuthorization((resolve) => {
+						if (typeof that.privacyAuthorization === 'function') {
+							that.privacyAuthorization(resolve)
+						}
 					})
 				}
-			}
-			// #endif
-		} catch (e) {
-			console.error("=========低版本基础库==========", e)
-		}
-	},
-	methods: {
-		getPrivacySettingByQuickApp() {
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.getPrivacySetting) {
-					has.getPrivacySetting({
+			},
+			proactive() {
+				let that = this
+				if (wx.getPrivacySetting) {
+					wx.getPrivacySetting({
 						success: (res) => {
 							// console.log(res)
 							if (res.needAuthorization) {
-								this.popUp()
+								that.popUp()
 								// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
 								this.closeOtherPagePopUp(this.disPopUp)
 							} else {
 								this.$emit('agree')
 							}
 						},
-					})
+					});
 				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理，判断是否已经授权
-					if (uni.getStorageSync('privacyAgreed')) {
-						this.$emit('agree')
-					} else {
-						this.popUp()
-						// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-						this.closeOtherPagePopUp(this.disPopUp)
-					}
+					this.$emit('agree')
 				}
-			}
-			// #endif
-		},
-
-		listenPrivacySettingChange() {
-			// #ifdef MP-WEIXIN
-			// 监听微信侧隐私政策授权变化事件
-			if (wx.onNeedPrivacyAuthorization) {
-				wx.onNeedPrivacyAuthorization((resolve) => {
-					if (typeof this.privacyAuthorization === 'function') {
-						this.privacyAuthorization(resolve)
+			},
+			//初始化监听程序
+			curPageShow() {
+				this.privacyAuthorization = resolve => {
+					this.privacyResolves.add(resolve)
+					//打开弹窗
+					this.popUp()
+					// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+					this.closeOtherPagePopUp(this.disPopUp)
+				}
+				this.closeOtherPagePopUpHooks.add(this.disPopUp)
+			},
+			// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+			closeOtherPagePopUp(closePopUp) {
+				this.closeOtherPagePopUpHooks.forEach(hook => {
+					if (closePopUp !== hook) {
+						hook()
 					}
 				})
-			}
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				// 监听快速应用侧隐私政策授权变化事件
-				if (typeof has != 'undefined' && has?.onPrivacySettingChange) {
-					has.onPrivacySettingChange((res) => {
-						// console.log(res)
-						if (res.needAuthorization) {
-							this.popUp()
-							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-							this.closeOtherPagePopUp(this.disPopUp)
-						} else {
-							this.$emit('agree')
-						}
-					})
-				}
-			}
-			// #endif
-
-			// 主动查询用户隐私政策授权状态，针对快速应用
-			this.getPrivacySettingByQuickApp();
-		},
-		// 主动查询用户隐私政策授权状态
-		proactive() {
-			// #ifdef MP-WEIXIN
-			if (wx.getPrivacySetting) {
-				wx.getPrivacySetting({
-					success: (res) => {
-						// console.log(res)
-						if (res.needAuthorization) {
-							this.popUp()
-							// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-							this.closeOtherPagePopUp(this.disPopUp)
-						} else {
-							this.$emit('agree')
-						}
+			},
+			//打开隐私协议
+			openPrivacyContract() {
+				wx.openPrivacyContract({
+					success(res) {
+						// console.log('打开隐私协议', res);
 					},
+					fail(err) {
+						// console.error('打开隐私协议失败', err)
+					}
 				});
-			} else {
+			},
+			// 不同意
+			handleDisagree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'disagree',
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
+				//退出小程序
+				uni.showModal({
+					content: '未同意隐私协议，无法使用相关功能',
+					success: () => {
+						this.$emit('disagree')
+					}
+				})
+			},
+			// 同意并继续
+			handleAgree() {
+				this.privacyResolves.forEach(resolve => {
+					resolve({
+						event: 'agree',
+						buttonId: 'agree-btn'
+					})
+				})
+				this.privacyResolves.clear()
+				//关闭弹窗
+				this.disPopUp()
 				this.$emit('agree')
-			}
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW
-			this.getPrivacySettingByQuickApp();
-			// #endif
-		},
-		//初始化监听程序
-		curPageShow() {
-			closeOtherPagePopUpHooks.add(this.disPopUp)
-			this.privacyAuthorization = resolve => {
-				this.privacyResolves.add(resolve)
-				//打开弹窗
-				this.popUp()
-				// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-				this.closeOtherPagePopUp(this.disPopUp)
-			}
-		},
-		// 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
-		closeOtherPagePopUp(closePopUp) {
-			closeOtherPagePopUpHooks.forEach(hook => {
-				if (closePopUp !== hook) {
-					hook()
+			},
+			//打开弹窗
+			popUp() {
+				if (this.showPop === false) {
+					this.showPop = true
 				}
-			})
-		},
-		//打开隐私协议
-		openPrivacyContract() {
-			// #ifdef MP-WEIXIN
-			wx.openPrivacyContract({
-				success(res) {
-					// console.log('打开隐私协议', res);
-				},
-				fail(err) {
-					// console.error('打开隐私协议失败', err)
-				}
-			});
-			// #endif
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.openPrivacySetting) {
-					has.openPrivacySetting({
-						success: (res) => {
-							// console.log('打开隐私协议', res);
-						},
-						fail: (err) => {
-							// console.error('打开隐私协议失败', err)
-						}
-					});
-				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
-					this.$util.redirectTo(privacyContractPage);
-				}
-			} else {
-				// H5 环境下的处理逻辑
-				this.$util.redirectTo(privacyContractPage);
-			}
-			// #endif
-		},
-		//打开用户服务协议
-		openPrivacyService() {
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			if (this.$util.isQuickApp()) {
-				if (typeof has != 'undefined' && has?.openPrivacySetting) {
-					has.openPrivacySetting({
-						success: (res) => {
-							// console.log('打开用户服务协议', res);
-						},
-						fail: (err) => {
-							// console.error('打开用户服务协议失败', err)
-						}
-					});
-				} else {
-					// 属于嵌入到快应用Webview组件中的情况，按照H5的方式来处理
-					this.$util.redirectTo(privacyServicePage);
-				}
-			} else {
-				// H5 环境下的处理逻辑
-				this.$util.redirectTo(privacyServicePage);
-			}
-			// #endif
-		},
-		// 不同意
-		handleDisagree() {
-			this.privacyResolves.forEach(resolve => {
-				resolve({
-					event: 'disagree',
-				})
-			})
-			this.privacyResolves.clear()
+			},
 			//关闭弹窗
-			this.disPopUp()
-			//退出小程序
-			uni.showModal({
-				content: '未同意隐私协议，无法使用相关功能',
-				success: () => {
-					this.$emit('disagree')
+			disPopUp() {
+				if (this.showPop === true) {
+					this.showPop = false
 				}
-			})
-		},
-		// 同意并继续
-		handleAgree() {
-			this.privacyResolves.forEach(resolve => {
-				resolve({
-					event: 'agree',
-					buttonId: 'agree-btn'
-				})
-			})
-			this.privacyResolves.clear()
-			//关闭弹窗
-			this.disPopUp()
-
-			// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-			// 保存用户授权状态到本地存储，用于快应用Webview组件中的H5方式处理
-			uni.setStorageSync('privacyAgreed', true);		
-			// #endif	
-			this.$emit('agree')
-		},
-		//打开弹窗
-		popUp() {
-			this.showPop = true;
-		},
-		//关闭弹窗
-		disPopUp() {
-			this.showPop = false;
-		},
-	},
-	beforeDestroy() {
-		// 清理事件监听器和集合
-		this.privacyResolves.clear()
-		closeOtherPagePopUpHooks.delete(this.disPopUp)
-		// 注意：这里需要根据实际情况清理微信和快速应用的事件监听器
-		// 由于微信的 wx.onNeedPrivacyAuthorization 没有对应的 off 方法，这里可能需要其他方式处理
-	},
-}
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.privacy-mask {
-	position: fixed;
-	z-index: 5000;
-	top: 0;
-	right: 0;
-	left: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.2);
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.privacy-mask {
+		position: fixed;
+		z-index: 5000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.privacy-wrap {
-	width: 632rpx;
-	padding: 48rpx 30rpx;
-	box-sizing: border-box;
-	background: #fff;
-	border-radius: 16rpx;
-}
+	.privacy-wrap {
+		width: 632rpx;
+		padding: 48rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		border-radius: 16rpx;
+	}
 
-.privacy-title {
-	padding: 0rpx 30rpx 40rpx 30rpx;
-	font-weight: 700;
-	font-size: 36rpx;
-	text-align: center;
-}
+	.privacy-title {
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		font-weight: 700;
+		font-size: 36rpx;
+		text-align: center;
+	}
 
-.privacy-desc {
-	font-size: 30rpx;
-	color: #555;
-	line-height: 2;
-	text-align: left;
-	padding: 0 40rpx;
-}
+	.privacy-desc {
+		font-size: 30rpx;
+		color: #555;
+		line-height: 2;
+		text-align: left;
+		padding: 0 40rpx;
+	}
 
-.privacy-link {
-	color: #2f80ed;
-}
+	.privacy-link {
+		color: #2f80ed;
+	}
 
-.privacy-button-flex {
-	display: flex;
-	padding: 20rpx 40rpx;
-}
+	.privacy-button-flex {
+		display: flex;
+		padding: 20rpx 40rpx;
+	}
 
-.privacy-button-btn {
-	color: #FFF;
-	font-size: 30rpx;
-	// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
-	font-size: 28rpx;
-	// #endif
-	font-weight: 500;
-	line-height: 100rpx;
-	text-align: center;
-	height: 100rpx;
-	border-radius: 20rpx;
-	border: none;
-	background: #07c160;
-	flex: 1;
-	margin-right: 30rpx;
-	justify-content: center;
-}
+	.privacy-button-btn {
+		color: #FFF;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 100rpx;
+		text-align: center;
+		height: 100rpx;
+		border-radius: 20rpx;
+		border: none;
+		background: #07c160;
+		flex: 1;
+		margin-right: 30rpx;
+		justify-content: center;
+	}
 
-.privacy-button-btn::after {
-	border: none;
-}
+	.privacy-button-btn::after {
+		border: none;
+	}
 
-.bg-disagree {
-	color: #07c160;
-	background: #f2f2f2;
-}
+	.bg-disagree {
+		color: #07c160;
+		background: #f2f2f2;
+	}
 
-.bg-agree {
-	margin-right: 0rpx;
-}
+	.bg-agree {
+		margin-right: 0rpx;
+	}
 </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-family: "iconfont";
-  src: url('./fonts/iconfont.eot?t=1574760464482'); /* IE9 */
-  src: url('./fonts/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
+@font-face {font-family: "iconfont";
+  src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
+  src: url('~@/components/sx-rate/sx-rate/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('./fonts/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.woff?t=1574760464482') format('woff'),
+  url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
 }
 
 .iconfont {