chore(build): update vue.config.js

.gitignore

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

.local.config.js

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

.local.config.js.example

@@ -6,30 +6,10 @@ const localDevConfig = ({
         uniacid: 460,
         domain: 'https://xcx30.5g-quickapp.com/',
     },
-    '576-xcx30.5g': { // 活性石灰装备
-        uniacid: 576,
-        domain: 'https://xcx30.5g-quickapp.com/',
-    },    
     '2285': { // 数码喷墨墨水
         uniacid: 2285,
         domain: 'https://xcx.aigc-quickapp.com/',
     },
-    '2811': { // POCT检测分析平台
-        uniacid: 2811,
-        domain: 'https://xcx6.aigc-quickapp.com/',
-    },  
-    '2724': { // 生物菌肥
-        uniacid: 2724,
-        domain: 'https://xcx.aigc-quickapp.com/',
-    },     
-    '2505': { // 煤矿钻机
-        uniacid: 2505,
-        domain: 'https://xcx.aigc-quickapp.com/',
-    },   
-    '2777': { // 养老服务
-        uniacid: 2777,
-        domain: 'https://xcx.aigc-quickapp.com/',
-    },         
     '1': { // 开发平台
         uniacid: 1,
         domain: 'https://dev.aigc-quickapp.com',
@@ -38,10 +18,6 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-    'local-2': { // 测试平台
+})['2285']; // 选择要使用的环境配置
-        uniacid: 2,
-        domain: 'http://localhost:8050/',
-    },    
-})['2811']; // 选择要使用的环境配置
 
 export default localDevConfig;

App.vue

@@ -8,7 +8,7 @@
 
 	export default {
 		mixins: [auth],
-		onLaunch: async function(options) {
+		onLaunch: function(options) {
 			// 方式：支持快应用，从url中query部分获取uniacid，或useragent中获取uniacid
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
@@ -40,7 +40,7 @@
 			// #endif
 
 			// #ifdef H5
-			if (this.$util.getDeviceInfo().platform == 'ios') {
+			if (uni.getSystemInfoSync().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
 			// #endif
@@ -61,8 +61,7 @@
 
 			// 主题风格
 			if (uni.getStorageSync('themeStyle')) {
-				const themeData = await configExternal.loadTheme(uni.getStorageSync('themeStyle'));
+				this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
-				this.$store.commit('setThemeStyle', themeData);
 				this.$store.dispatch('themeColorSet');
 			}
 
@@ -314,7 +313,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

@@ -14,7 +14,7 @@ export const langConfig = {
 // 主题配置
 export const themeConfig = {
   // 主题列表
-  themeList: ['default', 'red', 'green', 'blue', 'pink', 'gold', 'purple', 'yellow', 'black'],
+  themeList: ['default', 'red', 'green', 'blue'],
   // 默认主题
   defaultTheme: 'default'
 };
@@ -98,6 +98,28 @@ class ConfigExternal {
     return this.loadPromises[key];
   }
 
+  /**
+   * 加载主题配置（同步方式）
+   * @param {string} theme - 主题名称
+   * @returns {object} - 主题配置
+   */
+  loadThemeSync(theme = themeConfig.defaultTheme) {
+    if (this.loadedConfigs[`theme_${theme}`]) {
+      return this.loadedConfigs[`theme_${theme}`];
+    }
+
+    try {
+      // 动态加载主题配置
+      const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+      console.log('sync themeData => ', themeData);
+      this.loadedConfigs[`theme_${theme}`] = themeData;
+      return themeData;
+    } catch (error) {
+      console.error(`加载主题 ${theme} 失败:`, error);
+      return {};
+    }
+  }
+
   /**
    * 加载主题配置（异步方式）
    * @param {string} theme - 主题名称
@@ -116,7 +138,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
@@ -47,21 +43,19 @@ let localDevConfig = { uniacid: 0, domain: defaultDomain };
 
 // #ifndef PRODUCTION
 // 尝试动态加载本地配置文件
-if (process?.env?.NODE_ENV === 'development') {
+try {
-    try {
+    // 尝试从项目根目录加载本地配置文件
-        // 尝试从项目根目录加载本地配置文件
+    // 使用相对路径的方式，确保在不同平台下都能正确解析
-        // 使用相对路径的方式，确保在不同平台下都能正确解析
+    let customConfig = require('@/.local.config.js').default;
-        let customConfig = require('@/.local.config.js').default;
+    if (customConfig) {
-        if (customConfig) {
+        localDevConfig = customConfig;
-            localDevConfig = customConfig;
-        }
-    } catch (e) {
-        // 如果本地配置文件不存在或加载失败，保持使用默认配置
-        // 只在开发模式下输出提示信息
-        // #ifdef WEB
-        console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
-        // #endif
     }
+} catch (e) {
+    // 如果本地配置文件不存在或加载失败，保持使用默认配置
+    // 只在开发模式下输出提示信息
+    // #ifdef WEB
+    console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
+    // #endif
 }
 // #endif
 

common/js/customer-service.js

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

@@ -1,9 +1,7 @@
 import WxMap from 'common/js/map-wx-jssdk.js';
 import Config from '@/common/js/config.js';
-import util from '@/common/js/util.js';
-
-let systemInfo = util.getDeviceInfo();
 
+let systemInfo = uni.getSystemInfoSync();
 export default {
 	data() {
 		return {

common/js/golbalConfig.js

@@ -69,10 +69,6 @@ export default {
 		servicerConfig() {
 			return this.$store.state.servicerConfig;
 		},
-		// 企业微信配置
-		wxworkConfig() {
-			return this.$store.state.wxworkConfig;
-		},
 		diySeckillInterval() {
 			return this.$store.state.diySeckillInterval;
 		},
@@ -149,7 +145,7 @@ export default {
 			if (isJump && route != 'pages/index/index') {
 				uni.setStorageSync('manual_change_store', true); // 手动切换门店
 				this.$store.dispatch('getCartNumber'); //重新获取购物车数据
-				this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+				this.$util.redirectTo('/pages/index/index');
 			}
 		}
 	},

common/js/goods_detail_base.js

@@ -240,7 +240,7 @@ export default {
 		},
 		goHome() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+			this.$util.redirectTo('/pages/index/index');
 		},
 		goCart() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转

common/js/lang.js

@@ -1,8 +1,8 @@
 import { langConfig } from './config-external.js';
 
-
+var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 // 缓存已加载的语言包
-const loadedLangPacks = {};
+var loadedLangPacks = {};
 
 // 处理页面目录映射
 function processRoutePath(route) {
@@ -64,18 +64,15 @@ export default {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
 
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		var value = '';
-
-		let value = ''; // 存放解析后的语言值
-		let langPath = ''; // 存放当前页面语言包路径
-
 		try {
 			//公共语言包（同步加载）
 			var lang = loadLangPackSync(locale, 'common');
 			
 			//当前页面语言包（同步加载）
 			let route = _this.route;
-			langPath = processRoutePath(route);
+			let langPath = processRoutePath(route);
+			// console.log(`当前页面语言包路径: ${langPath}`);
 			
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
@@ -103,7 +100,7 @@ export default {
 			}
 			
 		} catch (e) {
-			console.error('解析语言包失败:', e, { langPath, field, locale });
+			console.error('解析语言包失败:', e);
 			value = field;
 		}
 
@@ -116,10 +113,7 @@ export default {
 		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
 		// 多语言调试，注释后可以关闭控制台输出
-		if (field == value) {
+		// console.log(`字段: ${field}, 值: ${value}`)
-			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
-		}
-
 		return value;
 	},
 	/**
@@ -132,14 +126,10 @@ export default {
 		if (!_this) return;
 
 		uni.setStorageSync("lang", value);
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
 		// 清空已加载的语言包缓存
-		for (let key in loadedLangPacks) {
+		loadedLangPacks = {};
-			if (!key.startsWith(locale)) {
-				delete loadedLangPacks[key];
-			}
-		}
 
 		this.refresh();
 
@@ -151,7 +141,7 @@ export default {
 	refresh() {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
-		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 	
 		this.title(this.lang("title"));
 

common/js/map/openMap.js

@@ -1,4 +1,3 @@
-import util from '@/common/js/util.js'
 import TransformCoordinate from './transformCoordinate.js'
 
 function openMapByDefault(latitude, longitude, name) {
@@ -86,8 +85,7 @@ export default {
 	openMap(latitude, longitude, name, coord_type = 'gcj02') {
 		let arr = getCoordByType(longitude, latitude, coord_type)
 		// #ifdef APP-PLUS
-		let platform = util.getDeviceInfo().platform;
+		switch (uni.getSystemInfoSync().platform) {
-		switch (platform) {
 			case 'android':
 				console.log('运行Android上')
 				openMapByAndroid(arr[1], arr[0], name)

common/js/navigation.js

@@ -1,5 +1,4 @@
-import { EventSafety } from '@/common/js/event-safety.js'
+import { EventSafety } from './event-safety'
-import util from '@/common/js/util.js'
 
 export class NavigationHelper {
   constructor() {
@@ -60,7 +59,7 @@ export class NavigationHelper {
       // 微信小程序精确计算
       try {
         const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
-        let systemInfo = util.getDeviceInfo();
+        const systemInfo = uni.getSystemInfoSync()
         
         const height = menuButtonInfo.bottom + 
                       (menuButtonInfo.top - systemInfo.statusBarHeight)
@@ -120,7 +119,7 @@ export class NavigationHelper {
   // 获取状态栏高度
   getStatusBarHeight() {
     // #ifdef MP-WEIXIN
-    let systemInfo = util.getDeviceInfo();
+    const systemInfo = uni.getSystemInfoSync()
     return systemInfo.statusBarHeight || 20
     // #endif
     // #ifdef H5
@@ -139,7 +138,7 @@ export class NavigationHelper {
   // 获取安全区域
   getSafeAreaInsets() {
     try {
-      let systemInfo = util.getDeviceInfo();
+      const systemInfo = uni.getSystemInfoSync()
       return systemInfo.safeArea || {
         top: 0,
         bottom: 0,

common/js/share.js

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

common/js/style_color.js

@@ -1,460 +1,419 @@
-/**
+export default {
- * 颜色配置
+	'default': {
- * 包含默认颜色和其他颜色
+		//红色
- * 特别注意：
+		name: 'default',
- * 1. 分组不会被计算成Key，分组下的属性会被计算成Key
+		main_color: '#F4391c',
- * 2. 分组下的属性如果有相同的Key，会被覆盖
+		aux_color: '#F7B500',
- * 3. 例如：hoverNav，hoverNav_bg_color和hoverNav_text_color, 不会生成hoverNav_hoverNav_bg_color和hoverNav_hoverNav_text_color
+		bg_color: '#FF4646',//主题背景
- * 问题原因：历史遗留
+		bg_color_shallow: '#FF4646',//主题背景渐变浅色
- */
+		promotion_color: '#FF4646',//活动背景
-export default {
+		promotion_aux_color: '#F7B500',//活动背景辅色
-	'default': {
+		main_color_shallow: '#FFF4F4',//淡背景
-		//红色
+		price_color: 'rgb(252,82,39)',//价格颜色
-		name: 'default',
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		main_color: '#F4391c',
+		goods_detail: {
-		aux_color: '#F7B500',
+			goods_price: 'rgb(252,82,39,1)',//价格
-		bg_color: '#FF4646',//主题背景
+			promotion_tag: '#FF4646',
-		bg_color_shallow: '#FF4646',//主题背景渐变浅色
+			goods_card_bg: '#201A18',//会员卡背景
-		promotion_color: '#FF4646',//活动背景
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		promotion_aux_color: '#F7B500',//活动背景辅色
+			goods_card_color: '#FFD792',
-		main_color_shallow: '#FFF4F4',//淡背景
+			goods_coupon: '#FC5227',
-		price_color: 'rgb(252,82,39)',//价格颜色
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+			goods_btn_color: '#FF4646',//按钮颜色
-		...{
+			goods_btn_color_shallow: '#F7B500',//副按钮颜色
-			goods_price: 'rgb(252,82,39,1)',//价格
+		},
-			promotion_tag: '#FF4646',
+		pintuan: {
-			goods_card_bg: '#201A18',//会员卡背景
+			pintuan_label_bg: '#F7B500',
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			pintuan_label_color: '#FFFFFF',
-			goods_card_color: '#FFD792',
+			pintuan_color: '#FA6400',
-			goods_coupon: '#FC5227',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-			goods_btn_color: '#FF4646',//按钮颜色
+		},
-			goods_btn_color_shallow: '#F7B500',//副按钮颜色
+		super_member: {
-		},
+			super_member_start_bg: '#7c7878',
-		...{
+			super_member_end_bg: '#201a18',
-			pintuan_label_bg: '#F7B500',
+			super_member_start_text_color: '#FFDBA6',
-			pintuan_label_color: '#FFFFFF',
+			super_member_end_text_color: '#FFEBCA',
-			pintuan_color: '#FA6400',
+		},
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		bargain: {
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+			bargain_promotion_color: '#F0353E',//活动背景
-		},
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		...{
+		},
-			super_member_start_bg: '#7c7878',
+		seckill: {
-			super_member_end_bg: '#201a18',
+			seckill_promotion_color: '#F83530',//活动背景
-			super_member_start_text_color: '#FFDBA6',
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-			super_member_end_text_color: '#FFEBCA',
+		},
-		},
+		giftcard: {
-		...{
+			giftcard_promotion_color: '#FF3369',//活动背景
-			bargain_promotion_color: '#F0353E',//活动背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
-		},
+		groupby: {
-		...{
+			groupby_promotion_color: '#E64136',//活动背景
-			seckill_promotion_color: '#F83530',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		},
-		},
+	},
-		...{
+	'green': {
-			giftcard_promotion_color: '#FF3369',//活动背景
+		name: 'green',
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		main_color: '#19C650',
-		},
+		aux_color: '#FA6400',
-		...{
+		bg_color: '#19C650',
-			groupby_promotion_color: '#E64136',//活动背景
+		bg_color_shallow: '#19C650',
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		promotion_color: '#19C650',
-		},
+		promotion_aux_color: '#FA6400',
-		...{
+		main_color_shallow: '#F0FFF5',//淡背景
-			hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC'
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		},
+		goods_detail: {
-	},
+			goods_price: 'rgba(252,82,39,1)',//价格
-	'green': {
+			promotion_tag: '#19C650',
-		name: 'green',
+			goods_card_bg: '#201A18',//会员卡背景
-		main_color: '#19C650',
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		aux_color: '#FA6400',
+			goods_card_color: '#FFD792',
-		bg_color: '#19C650',
+			goods_coupon: '#FC5227',
-		bg_color_shallow: '#19C650',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		promotion_color: '#19C650',
+			goods_btn_color: '#19C650',//按钮颜色
-		promotion_aux_color: '#FA6400',
+			goods_btn_color_shallow: '#FA6400',//副按钮颜色
-		main_color_shallow: '#F0FFF5',//淡背景
+		},
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+		pintuan: {
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+			pintuan_label_bg: '#F7B500',
-		...{
+			pintuan_label_color: '#FFFFFF',
-			goods_price: 'rgba(252,82,39,1)',//价格
+			pintuan_color: '#FA6400',
-			promotion_tag: '#19C650',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-			goods_card_bg: '#201A18',//会员卡背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+		},
-			goods_card_color: '#FFD792',
+		super_member: {
-			goods_coupon: '#FC5227',
+			super_member_start_bg: '#7c7878',
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+			super_member_end_bg: '#201a18',
-			goods_btn_color: '#19C650',//按钮颜色
+			super_member_start_text_color: '#FFDBA6',
-			goods_btn_color_shallow: '#FA6400',//副按钮颜色
+			super_member_end_text_color: '#FFEBCA',
-		},
+		},
-		...{
+		bargain: {
-			pintuan_label_bg: '#F7B500',
+			bargain_promotion_color: '#F0353E',//活动背景
-			pintuan_label_color: '#FFFFFF',
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-			pintuan_color: '#FA6400',
+		},
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		seckill: {
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+			seckill_promotion_color: '#F83530',//活动背景
-		},
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-		...{
+		},
-			super_member_start_bg: '#7c7878',
+		giftcard: {
-			super_member_end_bg: '#201a18',
+			giftcard_promotion_color: '#FF3369',//活动背景
-			super_member_start_text_color: '#FFDBA6',
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-			super_member_end_text_color: '#FFEBCA',
+		},
-		},
+		groupby: {
-		...{
+			groupby_promotion_color: '#E64136',//活动背景
-			bargain_promotion_color: '#F0353E',//活动背景
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		},
-		},
+	},
-		...{
+	'blue': {
-			seckill_promotion_color: '#F83530',//活动背景
+		name: 'blue',
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		main_color: '#36ABFF',
-		},
+		aux_color: '#FA6400',
-		...{
+		bg_color: '#36ABFF',
-			giftcard_promotion_color: '#FF3369',//活动背景
+		bg_color_shallow: '#36ABFF',
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		promotion_color: '#36ABFF ',
-		},
+		promotion_aux_color: '#FA6400',
-		...{
+		main_color_shallow: '#E2F3FF',
-			groupby_promotion_color: '#E64136',//活动背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		},
+		goods_detail: {
-		...{
+			goods_price: 'rgba(252,82,39,1)',//价格
-			hover_nav_bg_color: '#19C650',//背景色
+			promotion_tag: '#36ABFF',
-			hover_nav_text_color: '#FFFFFF'
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-	},
+			goods_card_color: '#FFD792',
-	'blue': {
+			goods_coupon: '#FC5227',
-		name: 'blue',
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		main_color: '#36ABFF',
+			goods_btn_color: '#36ABFF',//按钮颜色
-		aux_color: '#FA6400',
+			goods_btn_color_shallow: '#FA6400',//副按钮颜色
-		bg_color: '#36ABFF',
+		},
-		bg_color_shallow: '#36ABFF',
+		pintuan: {
-		promotion_color: '#36ABFF ',
+			pintuan_label_bg: '#F7B500',
-		promotion_aux_color: '#FA6400',
+			pintuan_label_color: '#FFFFFF',
-		main_color_shallow: '#E2F3FF',
+			pintuan_color: '#FA6400',
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		...{
+		},
-			goods_price: 'rgba(252,82,39,1)',//价格
+		super_member: {
-			promotion_tag: '#36ABFF',
+			super_member_start_bg: '#7c7878',
-			goods_card_bg: '#201A18',//会员卡背景
+			super_member_end_bg: '#201a18',
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			super_member_start_text_color: '#FFDBA6',
-			goods_card_color: '#FFD792',
+			super_member_end_text_color: '#FFEBCA',
-			goods_coupon: '#FC5227',
+		},
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+		bargain: {
-			goods_btn_color: '#36ABFF',//按钮颜色
+			bargain_promotion_color: '#F0353E',//活动背景
-			goods_btn_color_shallow: '#FA6400',//副按钮颜色
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		},
+		},
-		...{
+		seckill: {
-			pintuan_label_bg: '#F7B500',
+			seckill_promotion_color: '#F83530',//活动背景
-			pintuan_label_color: '#FFFFFF',
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-			pintuan_color: '#FA6400',
+		},
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		giftcard: {
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+			giftcard_promotion_color: '#FF3369',//活动背景
-		},
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-		...{
+		},
-			super_member_start_bg: '#7c7878',
+		groupby: {
-			super_member_end_bg: '#201a18',
+			groupby_promotion_color: '#E64136',//活动背景
-			super_member_start_text_color: '#FFDBA6',
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			super_member_end_text_color: '#FFEBCA',
+		},
-		},
+	},
-		...{
+	'pink': {
-			bargain_promotion_color: '#F0353E',//活动背景
+		name: 'pink',
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		main_color: '#FF407E',
-		},
+		aux_color: '#F7B500',
-		...{
+		bg_color: '#FF407E',//主题背景
-			seckill_promotion_color: '#F83530',//活动背景
+		bg_color_shallow: '#FF407E',//主题背景渐变浅色
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		promotion_color: '#FF407E',//活动背景
-		},
+		promotion_aux_color: '#F7B500',//活动背景辅色
-		...{
+		main_color_shallow: '#FFF5F8',//淡背景
-			giftcard_promotion_color: '#FF3369',//活动背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		},
+		goods_detail: {
-		...{
+			goods_price: 'rgba(252,82,39,1)',//价格
-			groupby_promotion_color: '#E64136',//活动背景
+			promotion_tag: '#FF407E',
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		...{
+			goods_card_color: '#FFD792',
-			hover_nav_bg_color: '#36ABFF',//背景色
+			goods_coupon: '#FC5227',
-			hover_nav_text_color: '#FFFFFF'
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		},
+			goods_btn_color: '#FF407E',//按钮颜色
-	},
+			goods_btn_color_shallow: '#F7B500',//副按钮颜色
-	'pink': {
+		},
-		name: 'pink',
+		pintuan: {
-		main_color: '#FF407E',
+			pintuan_label_bg: '#F7B500',
-		aux_color: '#F7B500',
+			pintuan_label_color: '#FFFFFF',
-		bg_color: '#FF407E',//主题背景
+			pintuan_color: '#FA6400',
-		bg_color_shallow: '#FF407E',//主题背景渐变浅色
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		promotion_color: '#FF407E',//活动背景
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		promotion_aux_color: '#F7B500',//活动背景辅色
+		},
-		main_color_shallow: '#FFF5F8',//淡背景
+		super_member: {
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+			super_member_start_bg: '#7c7878',
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+			super_member_end_bg: '#201a18',
-		...{
+			super_member_start_text_color: '#FFDBA6',
-			goods_price: 'rgba(252,82,39,1)',//价格
+			super_member_end_text_color: '#FFEBCA',
-			promotion_tag: '#FF407E',
+		},
-			goods_card_bg: '#201A18',//会员卡背景
+		bargain: {
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			bargain_promotion_color: '#F0353E',//活动背景
-			goods_card_color: '#FFD792',
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-			goods_coupon: '#FC5227',
+		},
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+		seckill: {
-			goods_btn_color: '#FF407E',//按钮颜色
+			seckill_promotion_color: '#F83530',//活动背景
-			goods_btn_color_shallow: '#F7B500',//副按钮颜色
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-		},
+		},
-		...{
+		giftcard: {
-			pintuan_label_bg: '#F7B500',
+			giftcard_promotion_color: '#FF3369',//活动背景
-			pintuan_label_color: '#FFFFFF',
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-			pintuan_color: '#FA6400',
+		},
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		groupby: {
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+			groupby_promotion_color: '#E64136',//活动背景
-		},
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-		...{
+		},
-			super_member_start_bg: '#7c7878',
+	},
-			super_member_end_bg: '#201a18',
+	'gold': {
-			super_member_start_text_color: '#FFDBA6',
+		name: 'gold',
-			super_member_end_text_color: '#FFEBCA',
+		main_color: '#CFAF70',
-		},
+		aux_color: '#444444',
-		...{
+		bg_color: '#CFAF70',//主题背景
-			bargain_promotion_color: '#F0353E',//活动背景
+		bg_color_shallow: '#CFAF70',//主题背景渐变浅色
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		promotion_color: '#CFAF70',//活动背景
-		},
+		promotion_aux_color: '#444444',//活动背景辅色
-		...{
+		main_color_shallow: '#FFFAF1',//淡背景
-			seckill_promotion_color: '#F83530',//活动背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		},
+		goods_detail: {
-		...{
+			goods_price: 'rgba(252,82,39,1)',//价格
-			giftcard_promotion_color: '#FF3369',//活动背景
+			promotion_tag: '#CFAF70',
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		...{
+			goods_card_color: '#FFD792',
-			groupby_promotion_color: '#E64136',//活动背景
+			goods_coupon: '#FC5227',
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		},
+			goods_btn_color: '#CFAF70',//按钮颜色
-		...{
+			goods_btn_color_shallow: '#444444',//副按钮颜色
-			hover_nav_bg_color: '#FF407E',//背景色
+		},
-			hover_nav_text_color: '#FFFFFF'
+		pintuan: {
-		},
+			pintuan_label_bg: '#F7B500',
-	},
+			pintuan_label_color: '#FFFFFF',
-	'gold': {
+			pintuan_color: '#FA6400',
-		name: 'gold',
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		main_color: '#CFAF70',
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		aux_color: '#444444',
+		},
-		bg_color: '#CFAF70',//主题背景
+		super_member: {
-		bg_color_shallow: '#CFAF70',//主题背景渐变浅色
+			super_member_start_bg: '#7c7878',
-		promotion_color: '#CFAF70',//活动背景
+			super_member_end_bg: '#201a18',
-		promotion_aux_color: '#444444',//活动背景辅色
+			super_member_start_text_color: '#FFDBA6',
-		main_color_shallow: '#FFFAF1',//淡背景
+			super_member_end_text_color: '#FFEBCA',
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+		},
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+		bargain: {
-		...{
+			bargain_promotion_color: '#F0353E',//活动背景
-			goods_price: 'rgba(252,82,39,1)',//价格
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-			promotion_tag: '#CFAF70',
+		},
-			goods_card_bg: '#201A18',//会员卡背景
+		seckill: {
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			seckill_promotion_color: '#F83530',//活动背景
-			goods_card_color: '#FFD792',
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-			goods_coupon: '#FC5227',
+		},
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+		giftcard: {
-			goods_btn_color: '#CFAF70',//按钮颜色
+			giftcard_promotion_color: '#FF3369',//活动背景
-			goods_btn_color_shallow: '#444444',//副按钮颜色
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-		},
+		},
-		...{
+		groupby: {
-			pintuan_label_bg: '#F7B500',
+			groupby_promotion_color: '#E64136',//活动背景
-			pintuan_label_color: '#FFFFFF',
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			pintuan_color: '#FA6400',
+		},
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+	},
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+	'purple': {
-		},
+		name: 'purple',
-		...{
+		main_color: '#A253FF',
-			super_member_start_bg: '#7c7878',
+		aux_color: '#222222',
-			super_member_end_bg: '#201a18',
+		bg_color: '#A253FF',//主题背景
-			super_member_start_text_color: '#FFDBA6',
+		bg_color_shallow: '#A253FF',//主题背景渐变浅色
-			super_member_end_text_color: '#FFEBCA',
+		promotion_color: '#A253FF',//活动背景
-		},
+		promotion_aux_color: '#222222',//活动背景辅色
-		...{
+		main_color_shallow: '#F8F3FF',//淡背景
-			bargain_promotion_color: '#F0353E',//活动背景
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-		},
+		goods_detail: {
-		...{
+			goods_price: 'rgba(252,82,39,1)',//价格
-			seckill_promotion_color: '#F83530',//活动背景
+			promotion_tag: '#A253FF',
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		...{
+			goods_card_color: '#FFD792',
-			giftcard_promotion_color: '#FF3369',//活动背景
+			goods_coupon: '#FC5227',
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		},
+			goods_btn_color: '#A253FF',//按钮颜色
-		...{
+			goods_btn_color_shallow: '#222222',//副按钮颜色
-			groupby_promotion_color: '#E64136',//活动背景
+		},
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+		pintuan: {
-		},
+			pintuan_label_bg: '#F7B500',
-		...{
+			pintuan_label_color: '#FFFFFF',
-			hover_nav_bg_color: '#CFAF70',//背景色
+			pintuan_color: '#FA6400',
-			hover_nav_text_color: '#FFFFFF'
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		},
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-	},
+		},
-	'purple': {
+		super_member: {
-		name: 'purple',
+			super_member_start_bg: '#7c7878',
-		main_color: '#A253FF',
+			super_member_end_bg: '#201a18',
-		aux_color: '#222222',
+			super_member_start_text_color: '#FFDBA6',
-		bg_color: '#A253FF',//主题背景
+			super_member_end_text_color: '#FFEBCA',
-		bg_color_shallow: '#A253FF',//主题背景渐变浅色
+		},
-		promotion_color: '#A253FF',//活动背景
+		bargain: {
-		promotion_aux_color: '#222222',//活动背景辅色
+			bargain_promotion_color: '#F0353E',//活动背景
-		main_color_shallow: '#F8F3FF',//淡背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+		},
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+		seckill: {
-		...{
+			seckill_promotion_color: '#F83530',//活动背景
-			goods_price: 'rgba(252,82,39,1)',//价格
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-			promotion_tag: '#A253FF',
+		},
-			goods_card_bg: '#201A18',//会员卡背景
+		giftcard: {
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			giftcard_promotion_color: '#FF3369',//活动背景
-			goods_card_color: '#FFD792',
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-			goods_coupon: '#FC5227',
+		},
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+		groupby: {
-			goods_btn_color: '#A253FF',//按钮颜色
+			groupby_promotion_color: '#E64136',//活动背景
-			goods_btn_color_shallow: '#222222',//副按钮颜色
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-		},
+		},
-		...{
+	},
-			pintuan_label_bg: '#F7B500',
+	'yellow': {
-			pintuan_label_color: '#FFFFFF',
+		name: 'yellow',
-			pintuan_color: '#FA6400',
+		main_color: '#FFD009',
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		aux_color: '#1D262E',
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		bg_color: '#FFD009',//主题背景
-		},
+		bg_color_shallow: '#FFD009',//主题背景渐变浅色
-		...{
+		promotion_color: '#FFD009',//活动背景
-			super_member_start_bg: '#7c7878',
+		promotion_aux_color: '#1D262E',//活动背景辅色
-			super_member_end_bg: '#201a18',
+		main_color_shallow: '#FFFBEF',//淡背景
-			super_member_start_text_color: '#FFDBA6',
+		price_color: 'rgba(252,82,39,1)',//价格颜色
-			super_member_end_text_color: '#FFEBCA',
+		btn_text_color: '#303133',//按钮文字颜色
-		},
+		goods_detail: {
-		...{
+			goods_price: 'rgba(252,82,39,1)',//价格
-			bargain_promotion_color: '#F0353E',//活动背景
+			promotion_tag: '#FFD009',
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		...{
+			goods_card_color: '#FFD792',
-			seckill_promotion_color: '#F83530',//活动背景
+			goods_coupon: '#FC5227',
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+			goods_cart_num_corner: '#FC5227',//购物车数量角标
-		},
+			goods_btn_color: '#FFD009',//按钮颜色
-		...{
+			goods_btn_color_shallow: '#1D262E',//副按钮颜色
-			giftcard_promotion_color: '#FF3369',//活动背景
+		},
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+		pintuan: {
-		},
+			pintuan_label_bg: '#F7B500',
-		...{
+			pintuan_label_color: '#FFFFFF',
-			groupby_promotion_color: '#E64136',//活动背景
+			pintuan_color: '#FA6400',
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		},
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		...{
+		},
-			hover_nav_bg_color: '#A253FF',//背景色
+		super_member: {
-			hover_nav_text_color: '#FFFFFF'
+			super_member_start_bg: '#7c7878',
-		},
+			super_member_end_bg: '#201a18',
-	},
+			super_member_start_text_color: '#FFDBA6',
-	'yellow': {
+			super_member_end_text_color: '#FFEBCA',
-		name: 'yellow',
+		},
-		main_color: '#FFD009',
+		bargain: {
-		aux_color: '#1D262E',
+			bargain_promotion_color: '#F0353E',//活动背景
-		bg_color: '#FFD009',//主题背景
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		bg_color_shallow: '#FFD009',//主题背景渐变浅色
+		},
-		promotion_color: '#FFD009',//活动背景
+		seckill: {
-		promotion_aux_color: '#1D262E',//活动背景辅色
+			seckill_promotion_color: '#F83530',//活动背景
-		main_color_shallow: '#FFFBEF',//淡背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-		price_color: 'rgba(252,82,39,1)',//价格颜色
+		},
-		btn_text_color: '#303133',//按钮文字颜色
+		giftcard: {
-		...{
+			giftcard_promotion_color: '#FF3369',//活动背景
-			goods_price: 'rgba(252,82,39,1)',//价格
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-			promotion_tag: '#FFD009',
+		},
-			goods_card_bg: '#201A18',//会员卡背景
+		groupby: {
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+			groupby_promotion_color: '#E64136',//活动背景
-			goods_card_color: '#FFD792',
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			goods_coupon: '#FC5227',
+		},
-			goods_cart_num_corner: '#FC5227',//购物车数量角标
+	},
-			goods_btn_color: '#FFD009',//按钮颜色
+	'black': {
-			goods_btn_color_shallow: '#1D262E',//副按钮颜色
+		name: 'black',
-		},
+		main_color: '#222222',
-		...{
+		aux_color: '#FFFFFF',
-			pintuan_label_bg: '#F7B500',
+		bg_color: '#222222',//主题背景
-			pintuan_label_color: '#FFFFFF',
+		bg_color_shallow: '#333333',//主题背景渐变浅色
-			pintuan_color: '#FA6400',
+		promotion_color: '#222222',//活动背景
-			pintuan_promotion_color: '#FA3A1D',//活动背景
+		promotion_aux_color: '#FA8B00',//活动背景辅色
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
+		main_color_shallow: '#efefef',//淡背景
-		},
+		price_color: 'rgba(255,0,0,1)',//价格颜色
-		...{
+		btn_text_color: '#FFFFFF',//按钮文字颜色
-			super_member_start_bg: '#7c7878',
+		goods_detail: {
-			super_member_end_bg: '#201a18',
+			goods_price: 'rgba(255,0,0,1)',//价格
-			super_member_start_text_color: '#FFDBA6',
+			promotion_tag: '#222222',
-			super_member_end_text_color: '#FFEBCA',
+			goods_card_bg: '#201A18',//会员卡背景
-		},
+			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
-		...{
+			goods_card_color: '#FFD792',
-			bargain_promotion_color: '#F0353E',//活动背景
+			goods_coupon: '#222222',
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
+			goods_cart_num_corner: '#FF0000',//购物车数量角标
-		},
+			goods_btn_color: '#222222',//按钮颜色
-		...{
+			goods_btn_color_shallow: '#FA8B00',//副按钮颜色
-			seckill_promotion_color: '#F83530',//活动背景
+		},
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
+		pintuan: {
-		},
+			pintuan_label_bg: '#F7B500',
-		...{
+			pintuan_label_color: '#FFFFFF',
-			giftcard_promotion_color: '#FF3369',//活动背景
+			pintuan_color: '#FA6400',
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
+			pintuan_promotion_color: '#FA3A1D',//活动背景
-		},
+			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		...{
+		},
-			groupby_promotion_color: '#E64136',//活动背景
+		super_member: {
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
+			super_member_start_bg: '#fadcb5',
-		},
+			super_member_end_bg: '#f6bd74',
-		...{
+			super_member_start_text_color: '#ab6126',
-			hover_nav_bg_color: '#FFD009',//背景色
+			super_member_end_text_color: '#d19336',
-			hover_nav_text_color: '#303133'
+		},
-		},
+		bargain: {
-	},
+			bargain_promotion_color: '#F0353E',//活动背景
-	'black': {
+			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		name: 'black',
+		},
-		main_color: '#222222',
+		seckill: {
-		aux_color: '#FFFFFF',
+			seckill_promotion_color: '#F83530',//活动背景
-		bg_color: '#222222',//主题背景
+			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-		bg_color_shallow: '#333333',//主题背景渐变浅色
+		},
-		promotion_color: '#222222',//活动背景
+		giftcard: {
-		promotion_aux_color: '#FA8B00',//活动背景辅色
+			giftcard_promotion_color: '#FF3369',//活动背景
-		main_color_shallow: '#efefef',//淡背景
+			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-		price_color: 'rgba(255,0,0,1)',//价格颜色
+		},
-		btn_text_color: '#FFFFFF',//按钮文字颜色
+		groupby: {
-		...{
+			groupby_promotion_color: '#E64136',//活动背景
-			goods_price: 'rgba(255,0,0,1)',//价格
+			groupby_promotion_aux_color: '#F7B500',//活动辅色
-			promotion_tag: '#222222',
+		},
-			goods_card_bg: '#201A18',//会员卡背景
+	}
-			goods_card_bg_shallow: '#7C7878',//会员卡背景浅色
+}
-			goods_card_color: '#FFD792',
-			goods_coupon: '#222222',
-			goods_cart_num_corner: '#FF0000',//购物车数量角标
-			goods_btn_color: '#222222',//按钮颜色
-			goods_btn_color_shallow: '#FA8B00',//副按钮颜色
-		},
-		...{
-			pintuan_label_bg: '#F7B500',
-			pintuan_label_color: '#FFFFFF',
-			pintuan_color: '#FA6400',
-			pintuan_promotion_color: '#FA3A1D',//活动背景
-			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
-		},
-		...{
-			super_member_start_bg: '#fadcb5',
-			super_member_end_bg: '#f6bd74',
-			super_member_start_text_color: '#ab6126',
-			super_member_end_text_color: '#d19336',
-		},
-		...{
-			bargain_promotion_color: '#F0353E',//活动背景
-			bargain_promotion_aux_color: '#FD9A01',//活动辅色
-		},
-		...{
-			seckill_promotion_color: '#F83530',//活动背景
-			seckill_promotion_aux_color: '#FD9A01',//活动辅色
-		},
-		...{
-			giftcard_promotion_color: '#FF3369',//活动背景
-			giftcard_promotion_aux_color: '#F7B500',//活动辅色
-		},
-		...{
-			groupby_promotion_color: '#E64136',//活动背景
-			groupby_promotion_aux_color: '#F7B500',//活动辅色
-		},
-		...{
-			hover_nav_bg_color: '#222222',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
-	}
-}

common/js/uniapp.utils.js

@@ -1,89 +0,0 @@
-/**
- * 将常用的Uniapp提供的函数，存放到这里，按需引用
- */
-
-
-/**
- * 显示错误信息
- * @param {Exception} err 
- */
-const showError = (err) => {
-    uni.showToast({
-        title: err?.message || err?.errMsg || err?.toString(),
-        icon: 'none',
-        duration: 2000
-    });
-}
-
-/**
- * 打电话
- * @param {string} mobile 电话号码
- */
-export const makePhoneCall = (mobile) => {
-    try {
-        uni.makePhoneCall({
-            phoneNumber: `${mobile}`,
-            success(e) {
-                console.log(e);
-            }
-        });
-    } catch (err) {
-        showError(err);
-    }
-}
-
-/**
- * 拷贝文本
- * @param {*} text 
- * @param {*} options
- */
-export const copyText = (text, { copySuccess = '', copyFailed = '' } = {}) => {
-    try {
-        console.log('copyText');
-        uni.setClipboardData({
-            data: `${text}`,
-            success: () => {
-                console.error('复制成功');
-                try {
-                    uni.showToast({
-                        title: copySuccess,
-                        icon: 'success',
-                        duration: 2000
-                    });
-                } catch (e) {
-                    showError(e);
-                }
-            },
-            fail: (err) => {
-                console.error('复制失败:', err);
-                try {
-                    uni.showToast({
-                        title: err.message || err.errMsg || copyFailed,
-                        icon: 'none',
-                        duration: 2000
-                    });
-                } catch (e) {
-                    showError(e);
-                }
-            }
-        });
-    } catch (err) {
-        showError(err);
-    }
-}
-
-/**
- * 打开定位
- * @param {Object} options 
- */
-export const openLocation = ({ latitude, longitude, name } = {}) => {
-    try {
-        uni.openLocation({
-            latitude,
-            longitude,
-            name,
-        });
-    } catch (err) {
-        showError(err);
-    }
-}

common/js/util.js

@@ -7,20 +7,15 @@ import {
 
 
 
-// 关于页面路径，使用常量导出
+// 首页路径
 export const INDEX_PAGE_URL = '/pages/index/index';
-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 = [
 	INDEX_PAGE_URL,
-	CATEGORY_PAGE_URL,
+	'/pages_goods/category',
-	CONTACT_PAGE_URL,
+	'/pages_tool/contact/contact',
-	MEMBER_PAGE_URL
+	'/pages_tool/member/index'
 ];
 
 /**
@@ -37,28 +32,10 @@ export const adaptSubpackageUrl = (url) => {
 	 */
 	// 定义前缀映射表
 	const urlPrefixMap = {
-		'/pages/promotion/': '/pages_promotion/',
-		'/pages/order/': '/pages_order/',
 		'/pages/goods/': '/pages_goods/',
-
 		'/pages/contact/': '/pages_tool/contact/',
 		'/pages/member/': '/pages_tool/member/',
-		'/pages/login/': '/pages_tool/login/',
+		'/pages/vr': '/pages_tool/vr/'
-		'/pages/agreement/': '/pages_tool/agreement/',
-		'/pages/article/': '/pages_tool/article/',
-		'/pages/cases/': '/pages_tool/cases/',
-		'/pages/contact/': '/pages_tool/contact/',
-		'/pages/files/': '/pages_tool/files/',
-		'/pages/form/': '/pages_tool/form/',
-		'/pages/help/': '/pages_tool/help/',
-		'/pages/notice/': '/pages_tool/notice/',
-		'/pages/pay/': '/pages_tool/pay/',
-		'/pages/recharge/': '/pages_tool/recharge/',
-		'/pages/seal/': '/pages_tool/seal/',
-		'/pages/storeclose/': '/pages_tool/storeclose/',
-		'/pages/vr/': '/pages_tool/vr/',
-		'/pages/weapp/': '/pages_tool/weapp/',
-		'/pages/webview/': '/pages_tool/webview/',
 	};
 
 	// 构建正则表达式
@@ -84,57 +61,18 @@ export const adaptSubpackageUrl = (url) => {
 	return replacePrefix(url);
 }
 
-/**
- * 检查tabBar是否激活
- * @param {string} linkUrl 链接路径 /pages/goods/category
- * @param {string} currentPageRoute 当前页面路径 /pages_goods/category
- * @returns {boolean} 是否激活
- */
-export const checkTabBarActive = (linkUrl, currentPageRoute) => {
-	const linkUrlParts = adaptSubpackageUrl(linkUrl).split('/');
-	const currentPageRouteParts = currentPageRoute.split('/');
-
-	// console.log('diy-bottom-nav verify:', { linkUrlParts, currentPageRouteParts});
-
-	try {
-		// 二级页面
-		if (linkUrlParts[2] === currentPageRouteParts[2]) {
-			return true;
-		}
-
-		// 一级页面，限定只能是goods相关
-		if (linkUrlParts[1] === currentPageRouteParts[1] && linkUrlParts[1] === 'pages_goods') {
-			return true;
-		}
-	} catch (error) {
-		console.error('diy-bottom-nav verify error:', error);
-	}
-
-	return false;
-}
-
 export default {
-	/** 导出页面URL常量 */
-	MEMBER_PAGE_URL,
-	CATEGORY_PAGE_URL,
-	CONTACT_PAGE_URL,
-	INDEX_PAGE_URL,
-	LOGIN_PAGE_URL,
-	AI_CHAT_PAGE_URL,
-
 	/**
 	 * 页面跳转
 	 * @param {string} to 跳转链接 /pages/idnex/index
-	 * @param {Object} param 参数 {key : value, ...}, 默认{}
+	 * @param {Object} param 参数 {key : value, ...}
-	 * @param {string} mode 模式 navigateTo、redirectTo、reLaunch、tabbar, 默认navigateTo
+	 * @param {string} mode 模式
 	 */
-	redirectTo(to, param = {}, mode = 'navigateTo') {
+	redirectTo(to, param, mode) {
 		let url = to;
- if (to.indexOf('/article/list') !== -1) {
+
-        mode = 'reLaunch';
-    }
 		// 替换url中的前缀
-		console.log('页面跳转 redirectTo', to, param, mode);
+		console.log('redirectTo', to, param, mode);
 		url = adaptSubpackageUrl(url);
 		console.log('adaptSubpackageUrl', url);
 
@@ -153,7 +91,7 @@ export default {
 			const tabBarUrl = systemTabBarList[i];
 			if (url.indexOf(tabBarUrl) == 0) {
 				// 首页特殊处理，采用switchTab, 其他页面采用redirectTo, 不能返回，不能退回
-				(tabBarUrl == INDEX_PAGE_URL ? uni.switchTab : uni.redirectTo)({ url });
+				(tabBarUrl == INDEX_PAGE_URL ? uni.switchTab : uni.redirectTo)({url});
 				return;
 			}
 		}
@@ -161,26 +99,26 @@ export default {
 		// 如果url不包含tabBarList中的路径，根据mode判断跳转方式
 		switch (mode) {
 			case 'tabbar':
-				// 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。重置页面栈，仅保留 tabBar 页面
+				// 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
 				uni.switchTab({
 					url
 				});
 				break;
 			case 'redirectTo':
-				// 关闭当前页面，跳转到应用内的某个页面。替换栈顶页面，长度不变（上限10层）
+				// 关闭当前页面，跳转到应用内的某个页面。
 				uni.redirectTo({
 					url
 				});
 				break;
 			case 'reLaunch':
-				// 关闭所有页面，打开到应用内的某个页面。清空栈后打开新页面，长度=1
+				// 关闭所有页面，打开到应用内的某个页面。
 				uni.reLaunch({
 					url
 				});
 				break;
 			default:
-				// 保留当前页面，跳转到应用内的某个页面，新增页面到栈顶，长度+1（上限10层）
+				// 保留当前页面，跳转到应用内的某个页面
-				console.log('保留当前页面，navigateTo跳转到应用内的某个页面', url);
+				console.log('保留当前页面，跳转到应用内的某个页面', url);
 				uni.navigateTo({
 					url
 				});
@@ -192,6 +130,8 @@ export default {
 	 * @param {Object} params 参数，针对商品、相册里面的图片区分大中小，size: big、mid、small
 	 */
 	img(img_path, params) {
+
+
 		var path = "";
 		if (img_path != undefined && img_path != "") {
 			if (img_path.split(',').length > 1) {
@@ -551,7 +491,7 @@ export default {
 	 * 检测苹果X以上的手机
 	 */
 	isIPhoneX() {
-		let res = this.getDeviceInfo();
+		let res = uni.getSystemInfoSync();
 		if (res.model.search('iPhone X') != -1) {
 			return true;
 		}
@@ -559,33 +499,13 @@ export default {
 	},
 	//判断安卓还是iOS
 	isAndroid() {
-		let platform = this.getDeviceInfo().platform;
+		let platform = uni.getSystemInfoSync().platform
 		if (platform == 'ios') {
 			return false;
 		} else if (platform == 'android') {
 			return true;
 		}
 	},
-	/**
-	 * 获取设备信息（包含降级处理）
-	 */
-	getDeviceInfo() {
-		try {
-			return uni.getDeviceInfo();
-		} catch (e) {
-			return uni.getSystemInfoSync();
-		}
-	},
-	/**
-	 * 获取窗口信息（包含降级处理）
-	 */
-	getWindowInfo() {
-		try {
-			return uni.getWindowInfo();
-		} catch (e) {
-			return uni.getSystemInfoSync();
-		}
-	},
 	/**
 	 * 深度拷贝对象
 	 * @param {Object} obj
@@ -607,36 +527,6 @@ export default {
 		}
 		return cloneObj
 	},
-
-
-
-	/**
-	 * 打开微信企业客服
-	 * @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
@@ -659,6 +549,7 @@ export default {
 
 		} else if (link.appid) {
 			// 跳转其他小程序
+
 			uni.navigateToMiniProgram({
 				appId: link.appid,
 				path: link.page
@@ -666,6 +557,7 @@ export default {
 
 		} else if (link.name == 'MOBILE' && !link.wap_url) {
 			// 拨打电话
+
 			uni.makePhoneCall({
 				phoneNumber: link.mobile,
 				success: (res) => {
@@ -698,19 +590,16 @@ export default {
 					// #endif
 
 					// #ifdef MP-WEIXIN
-					this.openWxWorkServiceChat(() => {
+					wx.openCustomerServiceChat({
-						wx.openCustomerServiceChat({
+						extInfo: {
-							extInfo: {
+							url: config.wxwork_url
-								url: config.wxwork_url
+						},
-							},
+						corpId: config.corpid,
-							corpId: config.corpid,
+						showMessageCard: true,
-							showMessageCard: true,
+						sendMessageTitle: 'this.sendMessageTitle',
-							sendMessageTitle: 'this.sendMessageTitle',
+						sendMessagePath: 'this.sendMessagePath',
-							sendMessagePath: 'this.sendMessagePath',
+						sendMessageImg: 'this.sendMessageImg'
-							sendMessageImg: 'this.sendMessageImg'
-						});
 					});
-
 					// #endif
 					break;
 				case 'third':
@@ -761,7 +650,7 @@ export default {
 	 */
 	uniappIsIPhoneX() {
 		let isIphoneX = false;
-		let systemInfo = this.getDeviceInfo();
+		let systemInfo = uni.getSystemInfoSync();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone X') != -1 || systemInfo.model.search('iPhone 11') != -1 || systemInfo.model.search('iPhone 12') != -1 || systemInfo.model.search('iPhone 13') != -1) {
 			isIphoneX = true;
@@ -788,7 +677,7 @@ export default {
 	 */
 	uniappIsIPhone11() {
 		let isIphone11 = false;
-		let systemInfo = this.getDeviceInfo();
+		let systemInfo = uni.getSystemInfoSync();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone 11') != -1) {
 			isIphone11 = true;
@@ -799,7 +688,7 @@ export default {
 	// #ifdef H5
 	//判断该浏览器是否为safaria浏览器
 	isSafari() {
-		let res = this.getDeviceInfo();
+		let res = uni.getSystemInfoSync();
 		var ua = navigator.userAgent.toLowerCase();
 		if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
 			ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&
@@ -838,7 +727,7 @@ export default {
 		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 		return routes.length ? routes[routes.length - 1].route : '';
 	},
-	goBack(backUrl = INDEX_PAGE_URL) {
+	goBack(backUrl = '/pages/index/index') {
 		if (getCurrentPages().length == 1) {
 			this.redirectTo(backUrl);
 		} else {
@@ -1194,74 +1083,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,7 +3,7 @@
 		<view class="article-wrap" :style="warpCss">
 			<view :class="['list-wrap', value.style]" :style="warpCss">
 				<!-- 自动垂直滚动 -->
-				<swiper class="auto-scroll-swiper" :style="[swiperStyle]" :vertical="swiperConfig.vertical !== false"
+				<swiper class="auto-scroll-swiper" :style="swiperStyle" :vertical="swiperConfig.vertical !== false"
 					:autoplay="swiperConfig.autoplay !== false" :circular="swiperConfig.circular !== false"
 					:interval="swiperConfig.interval || 3000" :duration="swiperConfig.duration || 500"
 					:display-multiple-items="safeDisplayMultipleItems">

components-diy/diy-bargain.vue

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

components-diy/diy-bottom-nav.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { adaptSubpackageUrl, checkTabBarActive } from '@/common/js/util.js'
+import { adaptSubpackageUrl } from '@/common/js/util.js'
 import DiyMinx from './minx.js'
 // 底部导航栏
 export default {
@@ -145,16 +145,27 @@ export default {
 			let linkUrl = link.wap_url;
 
 			// 首页特殊处理
-			if (linkUrl === this.$util.INDEX_PAGE_URL && this.name === 'DIY_VIEW_INDEX') {
+			if (linkUrl === '/pages/index/index' && this.name === 'DIY_VIEW_INDEX') {
 				return true;
 			}
 
+			// console.log('diy-bottom-nav verify:', { likkUrl: adaptSubpackageUrl(linkUrl), currentPageRoute: currentPageRoute});
+
 			// 精确匹配当前路径
 			if (adaptSubpackageUrl(linkUrl) === currentPageRoute) {
 				return true;
 			}
 
-			return checkTabBarActive(linkUrl, currentPageRoute);
+			// 同属于一个子包的路径，也认为是匹配的
+			try {
+				if (adaptSubpackageUrl(linkUrl).split('/')[1] === currentPageRoute.split('/')[1]) {
+					return true;
+				}
+			} catch (error) {
+				console.error('diy-bottom-nav verify error:', error);
+			}
+
+			return false;
 		}
 	}
 };

components-diy/diy-category-item.vue

@@ -100,7 +100,7 @@
 													parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 											</block>
 											<block v-else>
-												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+												<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 											</block>
 										</view>
 										<view class="member-price-tag"
@@ -192,7 +192,7 @@
 											parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 									</block>
 									<block v-else>
-										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+										<text class="unit  price-style small">{{ $lang('Make') ? $lang('Make') : '询价' }}</text>
 									</block>
 
 								</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

@@ -161,11 +161,15 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 
+import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
 import DiyMinx from './minx.js'
 var contentWrapHeight, query, cartPosition;
 
 // 商品分类
 export default {
+	components: {
+		nsGoodsSkuCategory
+	},
 	name: 'diy-category',
 	props: {
 		value: {
@@ -548,7 +552,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 +822,7 @@ export default {
 		z-index: 2;
 	}
 
-	::v-deep .template-four {
+	/deep/ .template-four {
 		position: relative;
 		z-index: 1;
 

components-diy/diy-channel-list.vue

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

components-diy/diy-channel-video.vue

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

components-diy/diy-coupon.vue

@@ -454,7 +454,7 @@ export default {
 					}
 				});
 			} else {
-				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
+				this.$refs.login.open('/pages/index/index');
 				this.couponBtnSwitch = false;
 			}
 		},
@@ -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-digit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="componentStyle" data-component-name="diy-digit">
+	<view :style="componentStyle">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
@@ -38,10 +38,16 @@
 </template>
 
 <script>
+import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
+import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 // 自定义数字展示
 export default {
 	name: 'diy-digit',
+	components: {
+		uvCountTo,
+		nsLogin
+	},
 	props: {
 		value: {
 			type: Object,
@@ -90,7 +96,7 @@ export default {
 
 		// 页面跳转
 		redirectTo(item) {
-			if (!item.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {
+			if (!item.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
 				console.log(item);
 				this.$util.diyRedirectTo(item);
 			} else {

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

@@ -75,7 +75,7 @@ export default {
 		this.currentRoute = '/' + currentPage.route;
 		if (!this.storeToken) {
 			this.$util.redirectTo(
-				this.$util.LOGIN_PAGE_URL,
+				'/pages_tool/login/login',
 				{
 					back: this.currentRoute
 				},

components-diy/diy-goods-brand.vue

@@ -19,6 +19,8 @@
 
 <script>
 // 商品品牌
+import uniGrid from '@/components/uni-grid/uni-grid.vue';
+import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 
 import DiyMinx from './minx.js'
 // 自定义商品品牌展示	
@@ -29,6 +31,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniGrid,
+		uniGridItem
+	},
 	data() {
 		return {
 			list: [],

components-diy/diy-goods-list.vue

@@ -253,12 +253,15 @@
 </template>
 
 <script>
+import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
 import DiyMinx from './minx.js'
-import util from '@/common/js/util.js'
 
 // 自定义商品列表展示
 export default {
 	name: 'diy-goods-list',
+	components: {
+		nsGoodsSkuIndex
+	},
 	props: {
 		value: {
 			type: Object,
@@ -328,7 +331,7 @@ export default {
 			if (this.goodsValue.ornament.type == 'stroke') {
 				obj += 'border:' + '2rpx solid ' + this.goodsValue.ornament.color + ';';
 			}
-			let screenWidth = util.getWindowInfo().windowWidth;
+			const screenWidth = uni.getSystemInfoSync().windowWidth;
 			if (this.value.template == 'horizontal-slide') {
 				var width = '';
 				if (this.value.slideMode == 'scroll' && this.value.goodsMarginType == 'diy') width = this.rpxUpPx(
@@ -408,7 +411,7 @@ export default {
 			}
 		},
 		rpxUpPx(res) {
-			const screenWidth = util.getWindowInfo().windowWidth;
+			const screenWidth = uni.getSystemInfoSync().windowWidth;
 			var data = (screenWidth * parseInt(res)) / 750;
 			return Math.floor(data);
 		},

components-diy/diy-graphic-nav.vue

@@ -159,7 +159,7 @@ export default {
         redirectTo(link) {
 
             if (link.wap_url) {
-                if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+                if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
                     this.$refs.login.open(link.wap_url);
                     return;
                 }

components-diy/diy-group.vue

@@ -251,11 +251,6 @@
 				<diy-icon :value="item"></diy-icon>
 			</template>
 
-			<template v-if="['ChannelList', 'WechatChannel'].includes(item.componentName)">
-				<!-- 视频号列表 -->
-				<diy-channel-list :value="item"></diy-channel-list>
-			</template>
-
 			<!-- 自定义扩展组件 -->
 			<diy-comp-extend :value="item"></diy-comp-extend>
 		</view>
@@ -265,8 +260,8 @@
 <script>
 // 组件组展示
 import DiyMinx from './minx.js'
-
 export default {
+	components: {},
 	props: {
 		diyData: {
 			type: Object

components-diy/diy-groupbuy.vue

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

components-diy/diy-image-nav.vue

@@ -38,11 +38,14 @@
 </template>
 
 <script>
-
+import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
+	components: {
+		nsLogin
+	},
 	props: {
 		value: {
 			type: Object,
@@ -116,7 +119,7 @@ export default {
 
 		// 页面跳转
 		redirectTo(link) {
-			if (!link.wap_url || this.$util.getCurrRoute() != this.$util.MEMBER_PAGE_URL || this.storeToken) {
+			if (!link.wap_url || this.$util.getCurrRoute() != 'pages/member/index' || this.storeToken) {
 				this.$util.diyRedirectTo(link);
 			} else {
 				this.$refs.login.open(link.wap_url);

components-diy/diy-img-ads.vue

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

components-diy/diy-index-page.vue

@@ -169,6 +169,7 @@
 </template>
 
 <script>
+import nsLoading from '@/components/ns-loading/ns-loading.vue';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -188,6 +189,9 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
+	components: {
+		nsLoading
+	},
 	data() {
 		return {
 			pageIndex: 0, //当前选中分类id
@@ -732,7 +736,7 @@ export default {
 	margin-top: 100rpx;
 }
 
-::v-deep .uni-scroll-view::-webkit-scrollbar {
+/deep/.uni-scroll-view::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
 }

components-diy/diy-kefu.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-kefu" class="diy-kefu" :style="style">
-		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list" :key="index">
+		<view class="fui-list-group merchgroup" v-for="(item, index) in value.list">
 			<view class="fui-list jump" v-if="index == 0">
 				<view class="fui-list-media">
 					<image class="round" :src="$util.img(item.imageUrl)" style="border-radius:6rpx"></image>

components-diy/diy-listmenu.vue

@@ -1,5 +1,5 @@
 <template>
-	<view data-component-name="diy-listmenu" class="diy-listmenu" :style="style">
+	<view data-component-name="diy-picture" class="diy-picture" :style="style">
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
@@ -62,8 +62,8 @@ export default {
 	methods: {
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
-					this.$refs?.login?.open(link.wap_url);
+					this.$refs.login.open(link.wap_url);
 					return;
 				}
 			}

components-diy/diy-member-info.vue

@@ -64,7 +64,7 @@
 						@click.stop="modifyInfo()">{{ langIndex == 0 ? 'CN' : 'EN' }}</view>
 				</view>
 
-				<view class="info-wrap" v-else :style="infoStyle" @click="redirect($util.MEMBER_PAGE_URL)">
+				<view class="info-wrap" v-else :style="infoStyle" @click="redirect('/pages/member/index')">
 					<view class="headimg">
 						<image :src="$util.getDefaultImage().head" mode="widthFix"></image>
 					</view>
@@ -243,7 +243,7 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 // 自定义会员中心——会员信息展示
-
+import nsContact from '@/components/ns-contact/ns-contact.vue';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-member-info',
@@ -259,6 +259,9 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
+	components: {
+		nsContact
+	},
 	data() {
 		return {
 			info: null,
@@ -545,7 +548,7 @@ export default {
 		 */
 		redirectBeforeAuth(url) {
 			if (!this.storeToken) {
-				this.$refs.login.open(this.$util.MEMBER_PAGE_URL);
+				this.$refs.login.open('/pages/member/index');
 				return;
 			}
 
@@ -583,7 +586,7 @@ export default {
 					url: '/wechat/api/wechat/authcode',
 					data: {
 						scopes: 'snsapi_userinfo',
-						redirect_url: this.$config.h5Domain + this.$util.MEMBER_PAGE_URL
+						redirect_url: this.$config.h5Domain + '/pages/member/index'
 					},
 					success: res => {
 						if (res.code >= 0) {
@@ -1380,11 +1383,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 +1487,8 @@ export default {
 }
 </style>
 <style scoped>
-.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom,
+.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-.member-complete-info-popup ::v-deep .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
 }

components-diy/diy-notes.vue

@@ -157,7 +157,7 @@ export default {
 		/* 点赞 */
 		giveLike(noteId, index) {
 			if (!this.storeToken) {
-				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
+				this.$refs.login.open('/pages/index/index');
 				return;
 			}
 

components-diy/diy-picture.vue

@@ -65,7 +65,7 @@ export default {
 		},
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}

components-diy/diy-pinfan.vue

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

components-diy/diy-pintuan.vue

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

components-diy/diy-presale.vue

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

components-diy/diy-quick-nav.vue

@@ -61,7 +61,7 @@ export default {
 	methods: {
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}

components-diy/diy-search.vue

@@ -198,7 +198,7 @@ export default {
 		},
 		redirectTo(link) {
 			if (link.wap_url) {
-				if (this.$util.getCurrRoute() == this.$util.MEMBER_PAGE_URL && !this.storeToken) {
+				if (this.$util.getCurrRoute() == 'pages/member/index' && !this.storeToken) {
 					this.$refs.login.open(link.wap_url);
 					return;
 				}
@@ -257,7 +257,7 @@ export default {
 </script>
 
 <style lang="scss">
-::v-deep .uni-input-placeholder {
+/deep/ .uni-input-placeholder {
 	overflow: initial;
 }
 

components-diy/diy-seckill.vue

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

components-diy/diy-store-label.vue

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

components-diy/diy-text.vue

@@ -324,7 +324,7 @@ export default {
 			await this.__$emitEvent({
 				eventName: 'text-tap', data: link, promiseCallback: (event, handler, awaitedResult) => {
 					if (!awaitedResult) return;
-					this.$util.diyRedirectTo(link);
+					$util.diyRedirectTo(link);
 				}
 			})
 		}

components-diy/diy-video-list.vue

@@ -62,10 +62,13 @@
 </template>
 
 <script>
-
+import uniPopup from '@/components/uni-popup/uni-popup.vue'
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
+	components: {
+		uniPopup
+	},
 	props: {
 		value: {
 			type: Object,

components-diy/js/wechat-channel.js

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

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

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

components/common-payment/common-payment.vue

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

components/common-payment/payment.js

@@ -270,7 +270,7 @@ export default {
 						});
 
 						setTimeout(() => {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}, 1000)
 					}
 				}

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

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

components/mescroll/mescroll-uni.vue

@@ -62,6 +62,8 @@
 	// 引入回到顶部组件
 	import MescrollTop from './components/mescroll-top.vue';
 
+	import nsLoading from '@/components/ns-loading/ns-loading.vue';
+
 	export default {
 		name: 'mescroll-uni',
 		components: {

components/ns-adv/ns-adv.vue

@@ -1,120 +1,120 @@
-<template>
+<template>
-	<view v-if="advList.length" :class="['container-box',className]">
+	<view v-if="advList.length" :class="['container-box',className]">
-		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
+		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
-			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
+			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
-				<view class="image-box">
+				<view class="image-box">
-					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
+					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
-				</view>
+				</view>
-			</swiper-item>
+			</swiper-item>
-		</swiper>
+		</swiper>
-		<view v-else class="container-box item-wrap">
+		<view v-else class="container-box item-wrap">
-			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
+			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
-		</view>
+		</view>
-	</view>
+	</view>
-</template>
+</template>
-
+
-<script>
+<script>
-	export default {
+	export default {
-		name: 'ns-advert',
+		name: 'ns-advert',
-		props: {
+		props: {
-			keyword: {
+			keyword: {
-				type: String
+				type: String
-			},
+			},
-			className: {
+			className: {
-				type: String
+				type: String
-			}
+			}
-		},
+		},
-		data() {
+		data() {
-			return {
+			return {
-				advList: [],
+				advList: [],
-				isImage: false,
+				isImage: false,
-				//滑块的高度(单位px)
+				//滑块的高度(单位px)
-				swiperHeight: 150,
+				swiperHeight: 150,
-				//当前索引
+				//当前索引
-				currentIndex: 0,
+				currentIndex: 0,
-			};
+			};
-		},
+		},
-		created() {
+		created() {
-			this.getAdvList();
+			this.getAdvList();
-		},
+		},
-		methods: {
+		methods: {
-			//获取广告位
+			//获取广告位
-			getAdvList() {
+			getAdvList() {
-				var item = {
+				var item = {
-					adv_image: '',
+					adv_image: '',
-					adv_url: ''
+					adv_url: ''
-				};
+				};
-				this.$api.sendRequest({
+				this.$api.sendRequest({
-					url: '/api/adv/detail',
+					url: '/api/adv/detail',
-					data: {
+					data: {
-						keyword: this.keyword
+						keyword: this.keyword
-					},
+					},
-					success: res => {
+					success: res => {
-						if (res.code == 0) {
+						if (res.code == 0) {
-							var data = res.data.adv_list;
+							var data = res.data.adv_list;
-							for (var index in data) {
+							for (var index in data) {
-								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
+								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
-							}
+							}
-							this.advList = res.data.adv_list;
+							this.advList = res.data.adv_list;
-
+
-							//动态设置swiper的高度
+							//动态设置swiper的高度
-							this.$nextTick(() => {
+							this.$nextTick(() => {
-								this.setSwiperHeight();
+								this.setSwiperHeight();
-							});
+							});
-						}
+						}
-					}
+					}
-				});
+				});
-			},
+			},
-			jumppage(e) {
+			jumppage(e) {
-				this.$util.diyRedirectTo(e);
+				this.$util.diyRedirectTo(e);
-			},
+			},
-			imageLoad(data) {
+			imageLoad(data) {
-				this.isImage = true;
+				this.isImage = true;
-			},
+			},
-			//手动切换题目
+			//手动切换题目
-			changeSwiper(e) {
+			changeSwiper(e) {
-				this.currentIndex = e.detail.current;
+				this.currentIndex = e.detail.current;
-				//动态设置swiper的高度，使用nextTick延时设置
+				//动态设置swiper的高度，使用nextTick延时设置
-				this.$nextTick(() => {
+				this.$nextTick(() => {
-					this.setSwiperHeight();
+					this.setSwiperHeight();
-				});
+				});
-			},
+			},
-			//动态设置swiper的高度
+			//动态设置swiper的高度
-			setSwiperHeight() {
+			setSwiperHeight() {
-				if (this.advList.length > 1) {
+				if (this.advList.length > 1) {
-					setTimeout(() => {
+					setTimeout(() => {
-						let element = "#content-wrap" + this.currentIndex;
+						let element = "#content-wrap" + this.currentIndex;
-						let query = uni.createSelectorQuery().in(this);
+						let query = uni.createSelectorQuery().in(this);
-						query.select(element).boundingClientRect();
+						query.select(element).boundingClientRect();
-						query.exec((res) => {
+						query.exec((res) => {
-							if (res && res[0]) {
+							if (res && res[0]) {
-								this.swiperHeight = res[0].height;
+								this.swiperHeight = res[0].height;
-							}
+							}
-						});
+						});
-					}, 10);
+					}, 10);
-				}
+				}
-			},
+			},
-		}
+		}
-	};
+	};
-</script>
+</script>
-
+
-<style lang="scss">
+<style lang="scss">
-	.container-box {
+	.container-box {
-		width: 100%;
+		width: 100%;
-
+
-		.item-wrap {
+		.item-wrap {
-			border-radius: 10rpx;
+			border-radius: 10rpx;
-
+
-			.image-box {
+			.image-box {
-				border-radius: 10rpx;
+				border-radius: 10rpx;
-			}
+			}
-
+
-			image {
+			image {
-				width: 100%;
+				width: 100%;
-				height: auto;
+				height: auto;
-				border-radius: 10rpx;
+				border-radius: 10rpx;
-				will-change: transform;
+				will-change: transform;
-			}
+			}
-		}
+		}
-	}
+	}
 </style>

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

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

components/ns-empty/ns-empty.vue

@@ -45,7 +45,7 @@ export default {
 			if (this.emptyBtn.url) {
 				this.$util.redirectTo(this.emptyBtn.url, {}, 'redirectTo');
 			} else {
-				this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+				this.$util.redirectTo('/pages/index/index');
 			}
 		},
 		re(text) {

components/ns-form/ns-form.vue

@@ -200,8 +200,12 @@
 </template>
 
 <script>
+    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     export default {
         name: 'ns-form',
+        components: {
+            pickRegions
+        },
         props: {
             data: {
                 type: Array,

components/ns-goods-action-button/ns-goods-action-button.vue

@@ -1,96 +1,96 @@
-<template>
+<template>
-    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
+    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
-    <view class="action-buttom-wrap"
+    <view class="action-buttom-wrap"
-        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
+        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
-        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
+        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
-        @click="clickEvent">
+        @click="clickEvent">
-        <text class="price-font">{{ textPrice }}</text>
+        <text class="price-font">{{ textPrice }}</text>
-        <text>{{ text }}</text>
+        <text>{{ text }}</text>
-    </view>
+    </view>
-</template>
+</template>
-
+
-<script>
+<script>
-    export default {
+    export default {
-        name: 'ns-goods-action-button',
+        name: 'ns-goods-action-button',
-        props: {
+        props: {
-            // 商品底部按钮文字
+            // 商品底部按钮文字
-            text: {
+            text: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 商品底部按钮价格文字
+            // 商品底部按钮价格文字
-            textPrice: {
+            textPrice: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 背景色
+            // 背景色
-            background: {
+            background: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 背景色样式
+            // 背景色样式
-            backgroundClass: {
+            backgroundClass: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 
+            // 
-            backgroundColor: {
+            backgroundColor: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 是否禁用
+            // 是否禁用
-            disabled: {
+            disabled: {
-                type: Boolean,
+                type: Boolean,
-                default: false
+                default: false
-            },
+            },
-            // 禁用文字提示
+            // 禁用文字提示
-            disabledText: {
+            disabledText: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-            // 文字颜色
+            // 文字颜色
-            textColor: {
+            textColor: {
-                type: String,
+                type: String,
-                default: ''
+                default: ''
-            },
+            },
-        },
+        },
-        computed: {},
+        computed: {},
-        methods: {
+        methods: {
-            clickEvent() {
+            clickEvent() {
-                this.$emit('click');
+                this.$emit('click');
-            }
+            }
-        }
+        }
-    };
+    };
-</script>
+</script>
-
+
-<style lang="scss">
+<style lang="scss">
-    .action-buttom-wrap {
+    .action-buttom-wrap {
-        flex: 1;
+        flex: 1;
-        height: 70rpx;
+        height: 70rpx;
-        font-weight: 600;
+        font-weight: 600;
-        font-size: 30rpx;
+        font-size: 30rpx;
-        line-height: 70rpx;
+        line-height: 70rpx;
-        border: none;
+        border: none;
-        color: #fff;
+        color: #fff;
-        text-align: center;
+        text-align: center;
-        border-radius: 10rpx;
+        border-radius: 10rpx;
-        margin-right: 20rpx;
+        margin-right: 20rpx;
-    }
+    }
-
+
-    .action-buttom-wrap.has-second {
+    .action-buttom-wrap.has-second {
-        line-height: 50rpx;
+        line-height: 50rpx;
-    }
+    }
-
+
-    .action-buttom-wrap.has-second text {
+    .action-buttom-wrap.has-second text {
-        display: block;
+        display: block;
-        line-height: 1.2;
+        line-height: 1.2;
-    }
+    }
-
+
-    .action-buttom-wrap:active {
+    .action-buttom-wrap:active {
-        opacity: 0.8;
+        opacity: 0.8;
-    }
+    }
-
+
-    .action-buttom-wrap.disabled {
+    .action-buttom-wrap.disabled {
-        background: $color-disabled;
+        background: $color-disabled;
-    }
+    }
 </style>

components/ns-goods-action-icon/ns-goods-action-icon.vue

@@ -20,6 +20,7 @@
 </template>
 
 <script>
+import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
@@ -71,6 +72,9 @@ export default {
 			}
 		}
 	},
+	components:{
+		nsContact
+	},
 	methods: {
 		clickEvent() {
 			this.$emit('click');

components/ns-goods-recommend/ns-goods-recommend.vue

@@ -3,9 +3,16 @@
 </template>
 
 <script>
+	import nsLoading from '@/components/ns-loading/ns-loading.vue';
+	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
+
 	// 商品推荐
 	export default {
 		name: 'ns-goods-recommend',
+		components: {
+			nsLoading,
+			nsGoodsSkuIndex
+		},
 		data() {
 			return {
 				list: [],

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

@@ -2,233 +2,235 @@
 	<view class="goods-sku">
 		<ns-login ref="login"></ns-login>
 		<!-- sku选择 -->
-		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id"
+		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
-			:goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy"
-			@refresh="refreshGoodsSkuDetail"></ns-goods-sku>
 	</view>
 </template>
 
 <script>
-// 商品SKU
+	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-export default {
+	// 商品SKU
-	name: 'ns-goods-sku-index',
+	export default {
-	data() {
+		name: 'ns-goods-sku-index',
-		return {
+		components: {
-			timeout: {},
+			nsGoodsSku
-			isRepeat: false,
-			goodsDetail: {}
-		};
-	},
-	created() { },
-	methods: {
-		/**
-		 * 添加购物车
-		 * @param {Object} config 购物车事件（detail-详情，cart-加入购物车）
-		 * @param {Object} data 商品项
-		 */
-		addCart(config, data, event) {
-			if (!this.storeToken) {
-				this.$refs.login.open(this.$util.INDEX_PAGE_URL);
-				return;
-			}
-			if (config == "detail" || data.is_virtual) {
-				this.$util.redirectTo('/pages_goods/detail', {
-					goods_id: data.goods_id
-				});
-				return false;
-			}
-			// 多规格
-			if (data.goods_spec_format) {
-				this.multiSpecificationGoods(data);
-			} else {
-				this.singleSpecificationGoods(data, event);
-			}
 		},
-		/**
+		data() {
-		 * 单规格
+			return {
-		 * @param {Object} data 商品项
+				timeout: {},
-		 */
+				isRepeat: false,
-		singleSpecificationGoods(data, event) {
+				goodsDetail: {}
-			let cart =
+			};
-				this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
+		},
-					.sku_id
+		created() {},
-				] ?
+		methods: {
+			/**
+			 * 添加购物车
+			 * @param {Object} config 购物车事件（detail-详情，cart-加入购物车）
+			 * @param {Object} data 商品项
+			 */
+			addCart(config, data, event) {
+				if (!this.storeToken) {
+					this.$refs.login.open('/pages/index/index')
+					return;
+				}
+				if (config == "detail" || data.is_virtual) {
+					this.$util.redirectTo('/pages_goods/detail', {
+						goods_id: data.goods_id
+					});
+					return false;
+				}
+				// 多规格
+				if (data.goods_spec_format) {
+					this.multiSpecificationGoods(data);
+				} else {
+					this.singleSpecificationGoods(data, event);
+				}
+			},
+			/**
+			 * 单规格
+			 * @param {Object} data 商品项
+			 */
+			singleSpecificationGoods(data, event) {
+				let cart =
+					this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
+						.sku_id
+					] ?
 					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] :
 					null;
-
+				
-			let cartNum = cart ? cart.num : 0;
+				let cartNum = cart ? cart.num : 0;
-			let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
+				let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
-			let minBuy = data.min_buy > 0 ? data.min_buy : 1;
+				let minBuy = data.min_buy > 0 ? data.min_buy : 1;
-			let num = cartNum >= minBuy ? cartNum : minBuy;
+				let num = cartNum >= minBuy ? cartNum : minBuy;
-			let _num = num;
+				let _num = num;
-			if (cart && cart.cart_id) {
+				if(cart && cart.cart_id){
-				_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
+					_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
-			}
+				}
-			let cart_id = cart ? cart.cart_id : 0;
+				let cart_id = cart ? cart.cart_id : 0;
-			if (_num > parseInt(data.stock)) {
+				if (_num > parseInt(data.stock)) {
-				this.$util.showToast({
+					this.$util.showToast({
-					title: '商品库存不足'
+						title: '商品库存不足'
-				});
+					});
-				return;
+					return;
-			}
+				}
-			if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
+				if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
-				this.$util.showToast({
+					this.$util.showToast({
-					title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
+						title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
-				});
+					});
-				return;
+					return;
-			}
-
-			if (cart) {
-				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
-			} else {
-
-				// 如果商品第一次添加，则初始化数据
-				if (!this.cartList['goods_' + data.goods_id]) {
-					this.cartList['goods_' + data.goods_id] = {};
 				}
 
-				let discount_price = data.discount_price;
+				if (cart) {
-				if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
-					discount_price = data.member_price;
+				} else {
-				}
 
-				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+					// 如果商品第一次添加，则初始化数据
-					cart_id,
+					if (!this.cartList['goods_' + data.goods_id]) {
-					goods_id: data.goods_id,
+						this.cartList['goods_' + data.goods_id] = {};
-					sku_id: data.sku_id,
-					num: _num,
-					discount_price
-				};
-			}
-
-			if (this.isRepeat) return;
-			this.isRepeat = true;
-
-			this.$emit('addCart', event.currentTarget.id);
-
-			this.$api.sendRequest({
-				url: api,
-				data: {
-					cart_id,
-					sku_id: data.sku_id,
-					num: _num
-				},
-				success: res => {
-					this.isRepeat = false;
-					if (res.code == 0) {
-						if (cart_id == 0) {
-							this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id =
-								res.data;
-						}
-						this.$util.showToast({
-							title: "商品添加购物车成功"
-						});
-						this.$store.commit('setCartChange');
-						this.$store.dispatch('cartCalculate');
-						this.$emit("cartListChange", this.cartList);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
 					}
+
+					let discount_price = data.discount_price;
+					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+						discount_price = data.member_price;
+					}
+
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+						cart_id,
+						goods_id: data.goods_id,
+						sku_id: data.sku_id,
+						num: _num,
+						discount_price
+					};
 				}
-			});
-		},
-		/**
-		 * 多规格
-		 * @param {Object} data 商品项
-		 */
-		multiSpecificationGoods(data) {
-			this.$api.sendRequest({
-				url: '/api/goodssku/getInfoForCategory',
-				data: {
-					sku_id: data.sku_id
-				},
-				success: res => {
-					if (res.code >= 0) {
-						let item = res.data;
-						item.unit = item.unit || '件';
 
-						if (item.sku_images) item.sku_images = item.sku_images.split(',');
+				if (this.isRepeat) return;
-						else item.sku_images = [];
+				this.isRepeat = true;
 
-						// 多规格时合并主图
+				this.$emit('addCart', event.currentTarget.id);
-						if (item.goods_spec_format && item.goods_image) {
+
-							item.goods_image = item.goods_image.split(',');
+				this.$api.sendRequest({
-							item.sku_images = item.goods_image.concat(item.sku_images);
+					url: api,
+					data: {
+						cart_id,
+						sku_id: data.sku_id,
+						num: _num
+					},
+					success: res => {
+						this.isRepeat = false;
+						if (res.code == 0) {
+							if (cart_id == 0) {
+								this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id =
+									res.data;
+							}
+							this.$util.showToast({
+								title: "商品添加购物车成功"
+							});
+							this.$store.commit('setCartChange');
+							this.$store.dispatch('cartCalculate');
+							this.$emit("cartListChange", this.cartList);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
 						}
+					}
+				});
+			},
+			/**
+			 * 多规格
+			 * @param {Object} data 商品项
+			 */
+			multiSpecificationGoods(data) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/getInfoForCategory',
+					data: {
+						sku_id: data.sku_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let item = res.data;
+							item.unit = item.unit || '件';
 
-						// 当前商品SKU规格
+							if (item.sku_images) item.sku_images = item.sku_images.split(',');
-						if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+							else item.sku_images = [];
 
-						// 商品SKU格式
+							// 多规格时合并主图
-						if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+							if (item.goods_spec_format && item.goods_image) {
+								item.goods_image = item.goods_image.split(',');
+								item.sku_images = item.goods_image.concat(item.sku_images);
+							}
 
-						// 限时折扣
+							// 当前商品SKU规格
-						if (item.promotion_type == 1) {
+							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
-							item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
-						}
 
-						if (item.promotion_type == 1 && item.discountTimeMachine) {
+							// 商品SKU格式
-							if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+							if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+							// 限时折扣
+							if (item.promotion_type == 1) {
+								item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+							}
+
+							if (item.promotion_type == 1 && item.discountTimeMachine) {
+								if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+									item.show_price = item.member_price;
+								} else {
+									item.show_price = item.discount_price;
+								}
+							} else if (item.member_price > 0) {
 								item.show_price = item.member_price;
 							} else {
-								item.show_price = item.discount_price;
+								item.show_price = item.price;
 							}
-						} else if (item.member_price > 0) {
+							this.goodsDetail = item;
-							item.show_price = item.member_price;
-						} else {
-							item.show_price = item.price;
-						}
-						this.goodsDetail = item;
 
-						this.$nextTick(() => {
+							this.$nextTick(() => {
-							if (this.$refs.goodsSku) {
+								if (this.$refs.goodsSku) {
-								this.$refs.goodsSku.show("join_cart", (res) => {
+									this.$refs.goodsSku.show("join_cart", (res) => {
 
-									let goods = this.cartList['goods_' + res.goods_id];
+										let goods = this.cartList['goods_' + res.goods_id];
-									let cart = null;
+										let cart = null;
-									if (goods && goods['sku_' + res.sku_id]) {
+										if (goods && goods['sku_' + res.sku_id]) {
-										cart = goods['sku_' + res.sku_id];
+											cart = goods['sku_' + res.sku_id];
-									}
-
-									if (cart) {
-										this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id].num = res.num;
-									} else {
-
-										// 如果商品第一次添加，则初始化数据
-										if (!this.cartList['goods_' + res.goods_id]) {
-											this.cartList['goods_' + res.goods_id] = {};
 										}
 
-										this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id] = {
+										if (cart) {
-											cart_id: res.cart_id,
+											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id].num = res.num;
-											goods_id: res.goods_id,
+										} else {
-											sku_id: res.sku_id,
-											num: res.num,
-											discount_price: res.discount_price
-										};
 
-									}
+											// 如果商品第一次添加，则初始化数据
+											if (!this.cartList['goods_' + res.goods_id]) {
+												this.cartList['goods_' + res.goods_id] = {};
+											}
 
-									this.$store.dispatch('cartCalculate');
+											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id] = {
-									this.$emit("cartListChange", this.cartList);
+												cart_id: res.cart_id,
+												goods_id: res.goods_id,
+												sku_id: res.sku_id,
+												num: res.num,
+												discount_price: res.discount_price
+											};
 
-									// 加入购物车动效
+										}
-									setTimeout(() => {
-										this.$store.commit('setCartChange');
-									}, 100);
 
-								});
+										this.$store.dispatch('cartCalculate');
-							}
+										this.$emit("cartListChange", this.cartList);
-						});
+
+										// 加入购物车动效
+										setTimeout(() => {
+											this.$store.commit('setCartChange');
+										}, 100);
+
+									});
+								}
+							});
+						}
 					}
-				}
+				});
-			});
+			},
-		},
+			refreshGoodsSkuDetail(data) {
-		refreshGoodsSkuDetail(data) {
+				this.goodsDetail = Object.assign({}, this.goodsDetail, data);
-			this.goodsDetail = Object.assign({}, this.goodsDetail, data);
+			}
 		}
-	}
+	};
-};
 </script>

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

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-sku" @touchmove.prevent.stop>
-		<uni-popup-sku ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+		<uni-popup ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
 			<view class="sku-info" :style="{ height: skuHeight }">
 				<view class="header">
 					<block v-if="type == 'point' && goodsDetail.type && goodsDetail.type != 1">
@@ -208,15 +208,19 @@
 					<button type="primary" v-else disabled="true">该商品已下架</button>
 				</view>
 			</view>
-		</uni-popup-sku>
+		</uni-popup>
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
+	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
+		components: {
+			uniPopup
+		},
 		props: {
 			goodsId: {
 				type: [Number, String],
@@ -266,7 +270,7 @@
 		},
 		created() {
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			this.systemInfo = this.$util.getDeviceInfo();
+			this.systemInfo = uni.getSystemInfoSync();
 			this.isLoad = true;
 			if (this.goodsId && this.goodsDetail.goods_spec_format) {
 				this.skuId = this.goodsDetail.sku_id;
@@ -413,7 +417,7 @@
 							this.isLoad = false;
 							if (callback) callback();
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -441,7 +445,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -467,7 +471,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -500,7 +504,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -527,7 +531,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -553,7 +557,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -579,7 +583,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -606,7 +610,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});
@@ -630,7 +634,7 @@
 							this.skuId = res.data[0].sku_id;
 							this.goodsSkuInfo = obj;
 						} else {
-							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
 				});

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

@@ -75,8 +75,12 @@
 </template>
 
 <script>
+	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	export default {
+		components: {
+			uniPopup
+		},
 		data() {
 			return {
 				newgift: {
@@ -168,17 +172,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-newform/ns-newform.vue

@@ -278,8 +278,13 @@
 </template>
 
 <script>
+import pickRegions from '@/components/pick-regions/pick-regions.vue'
+
 export default {
 	name: 'ns-form',
+	components: {
+		pickRegions
+	},
 	props: {
 		data: {
 			type: Array,

components/ns-select-time/ns-select-time.vue

@@ -30,8 +30,12 @@
 </template>
 
 <script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	name: "nsSelectTime",
+	components: {
+		uniPopup
+	},
 	data() {
 		return {
 			//选中日期的键值

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/payment/payment.vue

@@ -43,6 +43,9 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
+    import uniPopup from '@/components/uni-popup/uni-popup.vue';
+    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
+
     // #ifdef H5
     import {
         Weixin
@@ -51,6 +54,10 @@
 
     export default {
         name: 'payment',
+        components: {
+            uniPopup,
+            nsSwitch
+        },
         props: {
             // 是否可用余额支付
             balanceUsable: {

components/privacy-popup/privacy-popup.vue

@@ -1,385 +0,0 @@
-<template>
-	<view>
-		<view class="privacy-mask" v-if="showPop">
-			<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 }}相关功能。
-				</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 -->
-				</view>
-			</view>
-		</view>
-	</view>
-</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
-			//查询微信侧记录的用户是否有待同意的隐私政策信息
-			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
-							}
-						},
-					})
-				}
-			}
-			// #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({
-						success: (res) => {
-							// console.log(res)
-							if (res.needAuthorization) {
-								this.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)
-					}
-				}
-			}
-			// #endif
-		},
-
-		listenPrivacySettingChange() {
-			// #ifdef MP-WEIXIN
-			// 监听微信侧隐私政策授权变化事件
-			if (wx.onNeedPrivacyAuthorization) {
-				wx.onNeedPrivacyAuthorization((resolve) => {
-					if (typeof this.privacyAuthorization === 'function') {
-						this.privacyAuthorization(resolve)
-					}
-				})
-			}
-			// #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')
-						}
-					},
-				});
-			} else {
-				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()
-				}
-			})
-		},
-		//打开隐私协议
-		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')
-				}
-			})
-		},
-		// 同意并继续
-		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-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-desc {
-	font-size: 30rpx;
-	color: #555;
-	line-height: 2;
-	text-align: left;
-	padding: 0 40rpx;
-}
-
-.privacy-link {
-	color: #2f80ed;
-}
-
-.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::after {
-	border: none;
-}
-
-.bg-disagree {
-	color: #07c160;
-	background: #f2f2f2;
-}
-
-.bg-agree {
-	margin-right: 0rpx;
-}
-</style>

components/register-reward/register-reward.vue

@@ -78,9 +78,14 @@
 </template>
 
 <script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
+		components: {
+			uniPopup
+		},
 		data() {
 			return {
 				reward: null,
@@ -138,7 +143,7 @@
 						break;
 					default:
 						if (this.back) this.$util.redirectTo(decodeURIComponent(this.back), {}, 'redirectTo');
-						else this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
+						else this.$util.redirectTo('/pages/index/index');
 						break;
 				}
 			}
@@ -146,7 +151,7 @@
 	};
 </script>
 <style scoped>
-	.register-box ::v-deep .uni-scroll-view {
+	.register-box /deep/ .uni-scroll-view {
 		background: unset !important;
 	}
 
@@ -155,11 +160,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/toTop/toTop.vue

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

components/uni-count-down/uni-count-down.vue

@@ -1,252 +1,252 @@
-<template>
+<template>
-	<view class="uni-countdown">
+	<view class="uni-countdown">
-		<view
+		<view
-			v-if="showDay && d > 0"
+			v-if="showDay && d > 0"
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
+			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
+		>
-			{{ d }}
+			{{ d }}
-		</view>
+		</view>
-		<view v-if="showDay && d > 0" :style="{ color: splitorColor }" class="uni-countdown__splitor day" :class="splitorColorClass">{{ showColon ? '天' : '天' }}</view>
+		<view v-if="showDay && d > 0" :style="{ color: splitorColor }" class="uni-countdown__splitor day" :class="splitorColorClass">{{ showColon ? '天' : '天' }}</view>
-		<view
+		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
+			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
+		>
-			{{ h }}
+			{{ h }}
-		</view>
+		</view>
-		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '时' }}</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '时' }}</view>
-		<view
+		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
+			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
+		>
-			{{ i }}
+			{{ i }}
-		</view>
+		</view>
-		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '分' }}</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '分' }}</view>
-		<view
+		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
+			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
+		>
-			{{ s }}
+			{{ s }}
-		</view>
+		</view>
-		<view v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">秒</view>
+		<view v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">秒</view>
-	</view>
+	</view>
-</template>
+</template>
-<script>
+<script>
-export default {
+export default {
-	name: 'UniCountDown',
+	name: 'UniCountDown',
-	props: {
+	props: {
-		showDay: {
+		showDay: {
-			type: Boolean,
+			type: Boolean,
-			default: true
+			default: true
-		},
+		},
-		showColon: {
+		showColon: {
-			type: Boolean,
+			type: Boolean,
-			default: true
+			default: true
-		},
+		},
-		backgroundColor: {
+		backgroundColor: {
-			type: String,
+			type: String,
-			default: '#FFFFFF'
+			default: '#FFFFFF'
-		},
+		},
-		backgroundColorClass: {
+		backgroundColorClass: {
-			type: String,
+			type: String,
-			default: ''
+			default: ''
-		},
+		},
-		borderColor: {
+		borderColor: {
-			type: String,
+			type: String,
-			default: '#000000'
+			default: '#000000'
-		},
+		},
-		borderColorClass: {
+		borderColorClass: {
-			type: String,
+			type: String,
-			default: ''
+			default: ''
-		},
+		},
-		color: {
+		color: {
-			type: String,
+			type: String,
-			default: '#000000'
+			default: '#000000'
-		},
+		},
-		colorClass: {
+		colorClass: {
-			type: String,
+			type: String,
-			default: ''
+			default: ''
-		},
+		},
-		splitorColor: {
+		splitorColor: {
-			type: String,
+			type: String,
-			default: '#000000'
+			default: '#000000'
-		},
+		},
-		splitorColorClass: {
+		splitorColorClass: {
-			type: String,
+			type: String,
-			default: ''
+			default: ''
-		},
+		},
-		day: {
+		day: {
-			type: [Number, String],
+			type: [Number, String],
-			default: 0
+			default: 0
-		},
+		},
-		hour: {
+		hour: {
-			type: [Number, String],
+			type: [Number, String],
-			default: 0
+			default: 0
-		},
+		},
-		minute: {
+		minute: {
-			type: [Number, String],
+			type: [Number, String],
-			default: 0
+			default: 0
-		},
+		},
-		second: {
+		second: {
-			type: [Number, String],
+			type: [Number, String],
-			default: 0
+			default: 0
-		}
+		}
-	},
+	},
-	data() {
+	data() {
-		return {
+		return {
-			timer: null,
+			timer: null,
-			d: '00',
+			d: '00',
-			h: '00',
+			h: '00',
-			i: '00',
+			i: '00',
-			s: '00',
+			s: '00',
-			leftTime: 0,
+			leftTime: 0,
-			seconds: 0
+			seconds: 0
-		};
+		};
-	},
+	},
-	mounted: function(e) {
+	mounted: function(e) {
-		this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+		this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-		this.countDown();
+		this.countDown();
-		this.timer = setInterval(() => {
+		this.timer = setInterval(() => {
-			this.seconds--;
+			this.seconds--;
-			if (this.seconds < 0) {
+			if (this.seconds < 0) {
-				this.timeUp();
+				this.timeUp();
-				return;
+				return;
-			}
+			}
-			this.countDown();
+			this.countDown();
-		}, 1000);
+		}, 1000);
-	},
+	},
-	watch: {
+	watch: {
-		day: function(newVal) {
+		day: function(newVal) {
-			this.timeUp();
+			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
+			this.countDown();
-			this.timer = setInterval(() => {
+			this.timer = setInterval(() => {
-				this.seconds--;
+				this.seconds--;
-				if (this.seconds < 0) {
+				if (this.seconds < 0) {
-					this.timeUp();
+					this.timeUp();
-					return;
+					return;
-				}
+				}
-				this.countDown();
+				this.countDown();
-			}, 1000);
+			}, 1000);
-		},
+		},
-		hour: function(newVal) {
+		hour: function(newVal) {
-			this.timeUp();
+			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
+			this.countDown();
-			this.timer = setInterval(() => {
+			this.timer = setInterval(() => {
-				this.seconds--;
+				this.seconds--;
-				if (this.seconds < 0) {
+				if (this.seconds < 0) {
-					this.timeUp();
+					this.timeUp();
-					return;
+					return;
-				}
+				}
-				this.countDown();
+				this.countDown();
-			}, 1000);
+			}, 1000);
-		},
+		},
-		minute: function(newVal) {
+		minute: function(newVal) {
-			this.timeUp();
+			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
+			this.countDown();
-			this.timer = setInterval(() => {
+			this.timer = setInterval(() => {
-				this.seconds--;
+				this.seconds--;
-				if (this.seconds < 0) {
+				if (this.seconds < 0) {
-					this.timeUp();
+					this.timeUp();
-					return;
+					return;
-				}
+				}
-				this.countDown();
+				this.countDown();
-			}, 1000);
+			}, 1000);
-		},
+		},
-		second: function(newVal) {
+		second: function(newVal) {
-			this.timeUp();
+			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
+			this.countDown();
-			this.timer = setInterval(() => {
+			this.timer = setInterval(() => {
-				this.seconds--;
+				this.seconds--;
-				if (this.seconds < 0) {
+				if (this.seconds < 0) {
-					this.timeUp();
+					this.timeUp();
-					return;
+					return;
-				}
+				}
-				this.countDown();
+				this.countDown();
-			}, 1000);
+			}, 1000);
-		}
+		}
-	},
+	},
-
+
-	beforeDestroy() {
+	beforeDestroy() {
-		clearInterval(this.timer);
+		clearInterval(this.timer);
-	},
+	},
-	methods: {
+	methods: {
-		toSeconds(day, hours, minutes, seconds) {
+		toSeconds(day, hours, minutes, seconds) {
-			day = Number(day);
+			day = Number(day);
-			hours = Number(hours);
+			hours = Number(hours);
-			minutes = Number(minutes);
+			minutes = Number(minutes);
-			seconds = Number(seconds);
+			seconds = Number(seconds);
-			return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds;
+			return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds;
-		},
+		},
-		timeUp() {
+		timeUp() {
-			clearInterval(this.timer);
+			clearInterval(this.timer);
-			this.$emit('timeup');
+			this.$emit('timeup');
-		},
+		},
-		countDown() {
+		countDown() {
-			let seconds = this.seconds;
+			let seconds = this.seconds;
-			let [day, hour, minute, second] = [0, 0, 0, 0];
+			let [day, hour, minute, second] = [0, 0, 0, 0];
-			if (seconds > 0) {
+			if (seconds > 0) {
-				day = Math.floor(seconds / (60 * 60 * 24));
+				day = Math.floor(seconds / (60 * 60 * 24));
-				hour = Math.floor(seconds / (60 * 60)) - day * 24;
+				hour = Math.floor(seconds / (60 * 60)) - day * 24;
-				minute = Math.floor(seconds / 60) - day * 24 * 60 - hour * 60;
+				minute = Math.floor(seconds / 60) - day * 24 * 60 - hour * 60;
-				second = Math.floor(seconds) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
+				second = Math.floor(seconds) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
-			} else {
+			} else {
-				this.timeUp();
+				this.timeUp();
-			}
+			}
-			if (day < 10) {
+			if (day < 10) {
-				day = '0' + day;
+				day = '0' + day;
-			}
+			}
-			if (hour < 10) {
+			if (hour < 10) {
-				hour = '0' + hour;
+				hour = '0' + hour;
-			}
+			}
-			if (minute < 10) {
+			if (minute < 10) {
-				minute = '0' + minute;
+				minute = '0' + minute;
-			}
+			}
-			if (second < 10) {
+			if (second < 10) {
-				second = '0' + second;
+				second = '0' + second;
-			}
+			}
-			this.d = day;
+			this.d = day;
-			this.h = hour;
+			this.h = hour;
-			this.i = minute;
+			this.i = minute;
-			this.s = second;
+			this.s = second;
-		}
+		}
-	}
+	}
-};
+};
-</script>
+</script>
-<style lang="scss">
+<style lang="scss">
-
+
-.uni-countdown {
+.uni-countdown {
-	padding: 2rpx 0;
+	padding: 2rpx 0;
-	display: inline-flex;
+	display: inline-flex;
-	flex-wrap: nowrap;
+	flex-wrap: nowrap;
-	justify-content: center;
+	justify-content: center;
-}
+}
-
+
-.uni-countdown__splitor {
+.uni-countdown__splitor {
-	justify-content: center;
+	justify-content: center;
-	line-height: 44rpx;
+	line-height: 44rpx;
-	padding: 0 5rpx;
+	padding: 0 5rpx;
-	font-size: 24rpx;
+	font-size: 24rpx;
-}
+}
-.uni-countdown__splitor.day {
+.uni-countdown__splitor.day {
-	line-height: 50rpx;
+	line-height: 50rpx;
-}
+}
-
+
-.uni-countdown__number {
+.uni-countdown__number {
-	line-height: 44rpx;
+	line-height: 44rpx;
-	justify-content: center;
+	justify-content: center;
-	height: 44rpx;
+	height: 44rpx;
-	border-radius: 6rpx;
+	border-radius: 6rpx;
-	margin: 0 5rpx;
+	margin: 0 5rpx;
-	border: 2rpx solid #000;
+	border: 2rpx solid #000;
-	font-size: 24rpx;
+	font-size: 24rpx;
-	padding: 0 10rpx;
+	padding: 0 10rpx;
-}
+}
-</style>
+</style>

components/uni-grid-item/uni-grid-item.vue

@@ -19,8 +19,12 @@
 </template>
 
 <script>
+import uniBadge from '@/components/uni-badge/uni-badge.vue';
 export default {
 	name: 'UniGridItem',
+	components: {
+		uniBadge
+	},
 	props: {
 		// 类型：可选值，dot：圆点；badge：角标；image：图片
 		marker: {

components/uni-icons/icons.js

@@ -1,96 +1,96 @@
-export default {
+export default {
-	'contact': '\ue100',
+	'contact': '\ue100',
-	'person': '\ue101',
+	'person': '\ue101',
-	'personadd': '\ue102',
+	'personadd': '\ue102',
-	'contact-filled': '\ue130',
+	'contact-filled': '\ue130',
-	'person-filled': '\ue131',
+	'person-filled': '\ue131',
-	'personadd-filled': '\ue132',
+	'personadd-filled': '\ue132',
-	'phone': '\ue200',
+	'phone': '\ue200',
-	'email': '\ue201',
+	'email': '\ue201',
-	'chatbubble': '\ue202',
+	'chatbubble': '\ue202',
-	'chatboxes': '\ue203',
+	'chatboxes': '\ue203',
-	'phone-filled': '\ue230',
+	'phone-filled': '\ue230',
-	'email-filled': '\ue231',
+	'email-filled': '\ue231',
-	'chatbubble-filled': '\ue232',
+	'chatbubble-filled': '\ue232',
-	'chatboxes-filled': '\ue233',
+	'chatboxes-filled': '\ue233',
-	'weibo': '\ue260',
+	'weibo': '\ue260',
-	'weixin': '\ue261',
+	'weixin': '\ue261',
-	'pengyouquan': '\ue262',
+	'pengyouquan': '\ue262',
-	'chat': '\ue263',
+	'chat': '\ue263',
-	'qq': '\ue264',
+	'qq': '\ue264',
-	'videocam': '\ue300',
+	'videocam': '\ue300',
-	'camera': '\ue301',
+	'camera': '\ue301',
-	'mic': '\ue302',
+	'mic': '\ue302',
-	'location': '\ue303',
+	'location': '\ue303',
-	'mic-filled': '\ue332',
+	'mic-filled': '\ue332',
-	'speech': '\ue332',
+	'speech': '\ue332',
-	'location-filled': '\ue333',
+	'location-filled': '\ue333',
-	'micoff': '\ue360',
+	'micoff': '\ue360',
-	'image': '\ue363',
+	'image': '\ue363',
-	'map': '\ue364',
+	'map': '\ue364',
-	'compose': '\ue400',
+	'compose': '\ue400',
-	'trash': '\ue401',
+	'trash': '\ue401',
-	'upload': '\ue402',
+	'upload': '\ue402',
-	'download': '\ue403',
+	'download': '\ue403',
-	'close': '\ue404',
+	'close': '\ue404',
-	'redo': '\ue405',
+	'redo': '\ue405',
-	'undo': '\ue406',
+	'undo': '\ue406',
-	'refresh': '\ue407',
+	'refresh': '\ue407',
-	'star': '\ue408',
+	'star': '\ue408',
-	'plus': '\ue409',
+	'plus': '\ue409',
-	'minus': '\ue410',
+	'minus': '\ue410',
-	'circle': '\ue411',
+	'circle': '\ue411',
-	'checkbox': '\ue411',
+	'checkbox': '\ue411',
-	'close-filled': '\ue434',
+	'close-filled': '\ue434',
-	'clear': '\ue434',
+	'clear': '\ue434',
-	'refresh-filled': '\ue437',
+	'refresh-filled': '\ue437',
-	'star-filled': '\ue438',
+	'star-filled': '\ue438',
-	'plus-filled': '\ue439',
+	'plus-filled': '\ue439',
-	'minus-filled': '\ue440',
+	'minus-filled': '\ue440',
-	'circle-filled': '\ue441',
+	'circle-filled': '\ue441',
-	'checkbox-filled': '\ue442',
+	'checkbox-filled': '\ue442',
-	'closeempty': '\ue460',
+	'closeempty': '\ue460',
-	'refreshempty': '\ue461',
+	'refreshempty': '\ue461',
-	'reload': '\ue462',
+	'reload': '\ue462',
-	'starhalf': '\ue463',
+	'starhalf': '\ue463',
-	'spinner': '\ue464',
+	'spinner': '\ue464',
-	'spinner-cycle': '\ue465',
+	'spinner-cycle': '\ue465',
-	'search': '\ue466',
+	'search': '\ue466',
-	'plusempty': '\ue468',
+	'plusempty': '\ue468',
-	'forward': '\ue470',
+	'forward': '\ue470',
-	'back': '\ue471',
+	'back': '\ue471',
-	'left-nav': '\ue471',
+	'left-nav': '\ue471',
-	'checkmarkempty': '\ue472',
+	'checkmarkempty': '\ue472',
-	'home': '\ue500',
+	'home': '\ue500',
-	'navigate': '\ue501',
+	'navigate': '\ue501',
-	'gear': '\ue502',
+	'gear': '\ue502',
-	'paperplane': '\ue503',
+	'paperplane': '\ue503',
-	'info': '\ue504',
+	'info': '\ue504',
-	'help': '\ue505',
+	'help': '\ue505',
-	'locked': '\ue506',
+	'locked': '\ue506',
-	'more': '\ue507',
+	'more': '\ue507',
-	'flag': '\ue508',
+	'flag': '\ue508',
-	'home-filled': '\ue530',
+	'home-filled': '\ue530',
-	'gear-filled': '\ue532',
+	'gear-filled': '\ue532',
-	'info-filled': '\ue534',
+	'info-filled': '\ue534',
-	'help-filled': '\ue535',
+	'help-filled': '\ue535',
-	'more-filled': '\ue537',
+	'more-filled': '\ue537',
-	'settings': '\ue560',
+	'settings': '\ue560',
-	'list': '\ue562',
+	'list': '\ue562',
-	'bars': '\ue563',
+	'bars': '\ue563',
-	'loop': '\ue565',
+	'loop': '\ue565',
-	'paperclip': '\ue567',
+	'paperclip': '\ue567',
-	'eye': '\ue568',
+	'eye': '\ue568',
-	'arrowup': '\ue580',
+	'arrowup': '\ue580',
-	'arrowdown': '\ue581',
+	'arrowdown': '\ue581',
-	'arrowleft': '\ue582',
+	'arrowleft': '\ue582',
-	'arrowright': '\ue583',
+	'arrowright': '\ue583',
-	'arrowthinup': '\ue584',
+	'arrowthinup': '\ue584',
-	'arrowthindown': '\ue585',
+	'arrowthindown': '\ue585',
-	'arrowthinleft': '\ue586',
+	'arrowthinleft': '\ue586',
-	'arrowthinright': '\ue587',
+	'arrowthinright': '\ue587',
-	'pulldown': '\ue588',
+	'pulldown': '\ue588',
-	'closefill': '\ue589',
+	'closefill': '\ue589',
-	'sound': '\ue590',
+	'sound': '\ue590',
-	'scan': '\ue612'
+	'scan': '\ue612'
 }

components/uni-popup/uni-popup.vue

@@ -1,5 +1,5 @@
 <template>
-    <view v-if="showPopup" class="uni-popup" :class="customClass" :style="[{'top': top}]">
+    <view v-if="showPopup" class="uni-popup" :class="customClass" :style="{'top': top}">
         <view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @click="close(true)" ></view>
         <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper goodslist-uni-popup safe-area" @click="close(true)" v-if="isIphoneX">
             <view class="uni-popup__wrapper-box goodslist-uni-popup-box" @click.stop="clear">