chore：修改readme.md小程序和快应用发布说明文档

wx.getSystemInfoSync is deprecated.Please use wx.getSystemSetting/wx.getAppAuthorizeSetting/wx.getDeviceInfo/wx.getWindowInfo/wx.getAppBaseInfo instead.

.local.config.js

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

.local.config.js.example

@@ -6,10 +6,30 @@ 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',
@@ -18,6 +38,6 @@ const localDevConfig = ({
         uniacid: 1,
         domain: 'https://test.aigc-quickapp.com',
     },
-})['2285']; // 选择要使用的环境配置
+})['2811']; // 选择要使用的环境配置
 
 export default localDevConfig;

App.vue

@@ -1,19 +1,17 @@
 <script>
 	import auth from 'common/js/auth.js';
-	import { themeConfig } from 'common/js/config-external.js'
 	import configExternal from 'common/js/config-external.js'
+	
 	import {
 		Weixin
 	} from 'common/js/wx-jssdk.js';
 
 	export default {
 		mixins: [auth],
-		onLaunch: function(options) {
+		onLaunch: async function(options) {
 			// 方式：支持快应用，从url中query部分获取uniacid，或useragent中获取uniacid
-			// console.log(options.query.uniacid)
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
-				console.log(uni.getStorageSync('uniacid'))
 			}
 			uni.hideTabBar();
 
@@ -42,7 +40,7 @@
 			// #endif
 
 			// #ifdef H5
-			if (uni.getSystemInfoSync().platform == 'ios') {
+			if (this.$util.getDeviceInfo().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
 			// #endif
@@ -63,7 +61,9 @@
 
 			// 主题风格
 			if (uni.getStorageSync('themeStyle')) {
-				this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
+				const themeData = await configExternal.loadTheme(uni.getStorageSync('themeStyle'));
+				this.$store.commit('setThemeStyle', themeData);
+				this.$store.dispatch('themeColorSet');
 			}
 
 			// 插件是否存在

common/css/mp_html_patch.scss

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

common/js/config-external.js

@@ -14,7 +14,7 @@ export const langConfig = {
 // 主题配置
 export const themeConfig = {
   // 主题列表
-  themeList: ['default', 'red', 'green', 'blue'],
+  themeList: ['default', 'red', 'green', 'blue', 'pink', 'gold', 'purple', 'yellow', 'black'],
   // 默认主题
   defaultTheme: 'default'
 };
@@ -98,27 +98,6 @@ 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`)[theme];
-      this.loadedConfigs[`theme_${theme}`] = themeData;
-      return themeData;
-    } catch (error) {
-      console.error(`加载主题 ${theme} 失败:`, error);
-      return {};
-    }
-  }
-
   /**
    * 加载主题配置（异步方式）
    * @param {string} theme - 主题名称
@@ -136,7 +115,8 @@ class ConfigExternal {
     this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
       try {
         // 动态加载主题配置
-        const themeData = require(`@/common/js/style_color.js`)[theme];
+        const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+        console.log('async themeData => ', themeData);
         this.loadedConfigs[`theme_${theme}`] = themeData;
         resolve(themeData);
       } catch (error) {

common/js/config.js

@@ -43,26 +43,35 @@ let localDevConfig = { uniacid: 0, domain: defaultDomain };
 
 // #ifndef PRODUCTION
 // 尝试动态加载本地配置文件
-try {
+if (process?.env?.NODE_ENV === 'development') {
-    // 尝试从项目根目录加载本地配置文件
+    try {
-    // 使用相对路径的方式，确保在不同平台下都能正确解析
+        // 尝试从项目根目录加载本地配置文件
-    let customConfig = require('@/.local.config.js').default;
+        // 使用相对路径的方式，确保在不同平台下都能正确解析
-    if (customConfig) {
+        let customConfig = require('@/.local.config.js').default;
-        localDevConfig = customConfig;
+        if (customConfig) {
+            localDevConfig = customConfig;
+        }
+    } catch (e) {
+        // 如果本地配置文件不存在或加载失败，保持使用默认配置
+        // 只在开发模式下输出提示信息
+        // #ifdef WEB
+        console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
+        // #endif
     }
-} catch (e) {
-    // 如果本地配置文件不存在或加载失败，保持使用默认配置
-    // 只在开发模式下输出提示信息
-    // #ifdef WEB
-    console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
-    // #endif
 }
 // #endif
 
 const { uniacid = 0, domain = defaultDomain } = localDevConfig ?? { uniacid: 0, domain: defaultDomain }
 
-// 调试版本，配置说明
+export default {
-const devCfg = {
+    /**
+     * 1.开发调试模式
+     * 去掉注释 ...defaultCfg;
+     * 注释掉 ...releaseCfg,
+     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
+     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
+     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
+     */
     // 商户ID
     uniacid: uniacid, //825
 
@@ -92,31 +101,20 @@ const devCfg = {
 
     // // H5端域名
     // h5Domain: 'http://saas.cn/',
-};
 
-var config = {
+    // 发行版本配置
-    /**
+    ...(releaseCfg || {}),
-     * 1.开发调试模式
-     * 去掉注释 ...devCfg;
-     * 注释掉 ...releaseCfg,
-     * 2.发行/发布模式，例如通过`HBuilder>发行>小程序微信`的时候，原理是：
-     * 然后将 `import site from "../site.js";`追加到   `unpackage\dist\build\mp-weixin\common\vendor.js` 文件内容开头部分
-     * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
-     */
-    ...(releaseCfg ?? devCfg),
 
 
     // 腾讯地图key 
     mpKey: 'TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4',
 
-    //客服地址
+    // 客服地址
     webSocket: '{{$webSocket}}',
 
-    //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
+    // 本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
     pingInterval: 1500,
 
     // 版本号 
     version: '1.0'
-};
+};
-
-export default config;

common/js/diy.js

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

@@ -1,21 +1,8 @@
 export default {
-	data() {
-		return {
-			// 页面样式，动态设置主色调
-			themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
-		}
-	},
 	onLoad() { },
 	onShow() {
 		// 刷新多语言
 		this.$langConfig.refresh();
-		let time = setInterval(() => {
-			let theme = this.themeStyle;
-			if (theme && theme.main_color) {
-				this.themeColorSet();
-				clearInterval(time);
-			}
-		}, 50);
 	},
 	computed: {
 		// 是否是英文环境
@@ -24,6 +11,9 @@ export default {
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;
+		},		
+		themeColor() {
+			return this.$store.state.themeColor;
 		},
 		// 插件是否存在
 		addonIsExist() {
@@ -111,25 +101,7 @@ export default {
 		}
 	},
 	methods: {
-		themeColorSet() {
+
-			let theme = this.themeStyle;
-			this.themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
-			if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
-			Object.keys(theme).forEach(key => {
-				let data = theme[key];
-				if (typeof (data) == "object") {
-					Object.keys(data).forEach(k => {
-						this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
-					});
-				} else if (typeof (key) == "string" && key) {
-					this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
-				}
-			});
-			for (let i = 9; i >= 5; i--) {
-				let color = this.$util.colourBlend(theme.main_color, '#ffffff', (i / 10));
-				this.themeColor += `--base-color-light-${i}:${color};`;
-			}
-		},
 		// 颜色变浅（>0）、变深函数（<0）
 		lightenDarkenColor(color, amount) {
 

common/js/http.js

@@ -49,7 +49,7 @@ export default {
 		}
 
 		var method = params.data != undefined ? 'POST' : 'GET', // 请求方式
-			url = Config.baseUrl + params.url, // 请求路径
+			url = (Config.baseUrl + params.url).replace(/(?<!:)\/+/g, '/'), // 请求路径
 			data = {
 				app_type,
 				app_type_name

common/js/lang.js

@@ -1,8 +1,8 @@
 import { langConfig } from './config-external.js';
 
-var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+
 // 缓存已加载的语言包
-var loadedLangPacks = {};
+const loadedLangPacks = {};
 
 // 处理页面目录映射
 function processRoutePath(route) {
@@ -64,6 +64,8 @@ export default {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
 
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+
 		var value = '';
 		try {
 			//公共语言包（同步加载）
@@ -72,6 +74,7 @@ export default {
 			//当前页面语言包（同步加载）
 			let route = _this.route;
 			let langPath = processRoutePath(route);
+			console.log(`当前语言: ${locale}, 当前页面语言包路径: ${langPath}`);
 			
 			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
@@ -112,7 +115,7 @@ export default {
 		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
 		// 多语言调试，注释后可以关闭控制台输出
-		// console.log(`字段: ${field}, 值: ${value}`)
+		console.log(`字段: ${field}, 值: ${value}`)
 		return value;
 	},
 	/**
@@ -125,10 +128,14 @@ export default {
 		if (!_this) return;
 
 		uni.setStorageSync("lang", value);
-		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
 		// 清空已加载的语言包缓存
-		loadedLangPacks = {};
+		for (let key in loadedLangPacks) {
+			if (!key.startsWith(locale)) {
+				delete loadedLangPacks[key];
+			}
+		}
 
 		this.refresh();
 
@@ -140,7 +147,7 @@ export default {
 	refresh() {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
-		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+		const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 	
 		this.title(this.lang("title"));
 

common/js/map/openMap.js

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

common/js/navigation.js

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

common/js/style_color.js

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

@@ -32,10 +32,28 @@ 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/vr': '/pages_tool/vr/'
+		'/pages/login/': '/pages_tool/login/',
+		'/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/',
 	};
 
 	// 构建正则表达式
@@ -61,6 +79,35 @@ 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 {
 	/**
 	 * 页面跳转
@@ -91,7 +138,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;
 			}
 		}
@@ -130,8 +177,6 @@ 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) {
@@ -491,7 +536,7 @@ export default {
 	 * 检测苹果X以上的手机
 	 */
 	isIPhoneX() {
-		let res = uni.getSystemInfoSync();
+		let res = this.getDeviceInfo();
 		if (res.model.search('iPhone X') != -1) {
 			return true;
 		}
@@ -499,13 +544,33 @@ export default {
 	},
 	//判断安卓还是iOS
 	isAndroid() {
-		let platform = uni.getSystemInfoSync().platform
+		let platform = this.getDeviceInfo().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
@@ -650,7 +715,7 @@ export default {
 	 */
 	uniappIsIPhoneX() {
 		let isIphoneX = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let systemInfo = this.getDeviceInfo();
 		// #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;
@@ -677,7 +742,7 @@ export default {
 	 */
 	uniappIsIPhone11() {
 		let isIphone11 = false;
-		let systemInfo = uni.getSystemInfoSync();
+		let systemInfo = this.getDeviceInfo();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone 11') != -1) {
 			isIphone11 = true;
@@ -688,7 +753,7 @@ export default {
 	// #ifdef H5
 	//判断该浏览器是否为safaria浏览器
 	isSafari() {
-		let res = uni.getSystemInfoSync();
+		let res = this.getDeviceInfo();
 		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 &&

components-diy/diy-bottom-nav.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { adaptSubpackageUrl } from '@/common/js/util.js'
+import { adaptSubpackageUrl, checkTabBarActive } from '@/common/js/util.js'
 import DiyMinx from './minx.js'
 // 底部导航栏
 export default {
@@ -154,7 +154,7 @@ export default {
 				return true;
 			}
 
-			return false;
+			return checkTabBarActive(linkUrl, currentPageRoute);
 		}
 	}
 };

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>

components-diy/diy-category.vue

@@ -161,15 +161,11 @@ 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: {
@@ -610,10 +606,10 @@ export default {
 	view {
 		color: #222222;
 		width: 100%;
-		white-space: nowrap;
+		white-space: break-word;
-		text-overflow: ellipsis;
 		overflow: hidden;
 		text-align: center;
+		font-size: 10px;
 	}
 
 	&.border-top {
@@ -630,6 +626,7 @@ export default {
 		view {
 			color: #333;
 			font-weight: bold;
+			font-size: $font-size-base;
 		}
 
 		&::before {

components-diy/diy-digit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="componentStyle">
+	<view :style="componentStyle" data-component-name="diy-digit">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
@@ -38,16 +38,10 @@
 </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,

components-diy/diy-goods-brand.vue

@@ -19,8 +19,6 @@
 
 <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'
 // 自定义商品品牌展示	
@@ -31,10 +29,6 @@ export default {
 			type: Object
 		}
 	},
-	components: {
-		uniGrid,
-		uniGridItem
-	},
 	data() {
 		return {
 			list: [],

components-diy/diy-goods-list.vue

@@ -253,15 +253,12 @@
 </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,
@@ -331,7 +328,7 @@ export default {
 			if (this.goodsValue.ornament.type == 'stroke') {
 				obj += 'border:' + '2rpx solid ' + this.goodsValue.ornament.color + ';';
 			}
-			const screenWidth = uni.getSystemInfoSync().windowWidth;
+			let screenWidth = util.getWindowInfo().windowWidth;
 			if (this.value.template == 'horizontal-slide') {
 				var width = '';
 				if (this.value.slideMode == 'scroll' && this.value.goodsMarginType == 'diy') width = this.rpxUpPx(
@@ -411,7 +408,7 @@ export default {
 			}
 		},
 		rpxUpPx(res) {
-			const screenWidth = uni.getSystemInfoSync().windowWidth;
+			const screenWidth = util.getWindowInfo().windowWidth;
 			var data = (screenWidth * parseInt(res)) / 750;
 			return Math.floor(data);
 		},

components-diy/diy-image-nav.vue

@@ -38,14 +38,11 @@
 </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,

components-diy/diy-index-page.vue

@@ -169,7 +169,6 @@
 </template>
 
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -189,9 +188,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsLoading
-	},
 	data() {
 		return {
 			pageIndex: 0, //当前选中分类id

components-diy/diy-listmenu.vue

@@ -1,5 +1,5 @@
 <template>
-	<view data-component-name="diy-picture" class="diy-picture" :style="style">
+	<view data-component-name="diy-listmenu" class="diy-listmenu" :style="style">
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 

components-diy/diy-member-info.vue

@@ -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,9 +259,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsContact
-	},
 	data() {
 		return {
 			info: null,

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;
-					$util.diyRedirectTo(link);
+					this.$util.diyRedirectTo(link);
 				}
 			})
 		}

components-diy/diy-video-list.vue

@@ -62,13 +62,10 @@
 </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/ai-chat-message/ai-chat-message.vue

@@ -357,14 +357,10 @@
   </view>
 </template>
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue'
 import aiService from '@/common/js/ai-service.js'
 
 export default {
   name: 'ai-chat-message',
-  components: {
-    nsLoading
-  },
   props: {
     // 初始消息列表
     initialMessages: {

components/chat-message/chat-message.vue

@@ -71,11 +71,7 @@
 </template>
 
 <script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
 	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -98,12 +94,6 @@
 				currImg: ''
 			};
 		},
-		components: {
-			nsChatGoods,
-			nsChatOrder,
-			uniPopup,
-			nsChatReceiveGoods
-		},
 		mounted() {
 			this.avatar = this.$util.img(this.siteInfo.logo_square);
 			this.myHeadImg = this.$util.img(this.memberInfo.headimg);

components/common-payment/common-payment.vue

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

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

@@ -420,12 +420,7 @@
 
 <script>
     // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    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';
 
     export default {
@@ -438,13 +433,6 @@
                 }
             }
         },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
         mixins: [scroll, detail]
     };
 </script>

components/hover-nav/hover-nav.vue

@@ -67,7 +67,7 @@ export default {
 		this.kefuimg = this.$util.getDefaultImage().kefu
 		this.phoneimg = this.$util.getDefaultImage().phone
 		this.pageCount = getCurrentPages().length;
-
+		
 		// 从店铺信息中获取相关信息
 		uni.getStorage({
 			key: 'shopInfo',
@@ -80,8 +80,7 @@ export default {
 				// 从店铺信息中获取是否启用语言切换
 				this.isLanguageSwitchEnabled = e.data.ischina;
 			}
-		})
+		})			
-
 	},
 	computed: {
 		currentLangDisplayName() {
@@ -182,8 +181,6 @@ export default {
 	bottom: 320rpx;
 	// #endif
 	z-index: 10;
-	// background: #fff;
-	// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
 	border-radius: 120rpx;
 	padding: 20rpx 0;
 	display: flex;
@@ -202,8 +199,8 @@ export default {
 		line-height: 1;
 		margin: 14rpx 0;
 		transition: 0.1s;
-		background: #c6251b;
+		background: var(--hover-nav-bg-color);
-		color: #fff;
+		color: var(--hover-nav-text-color);
 		border-radius: 40rpx;
 		width: 80rpx;
 		height: 80rpx;

components/mescroll/mescroll-uni.vue

@@ -62,8 +62,6 @@
 	// 引入回到顶部组件
 	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,14 +80,10 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	// 注册奖励弹出层
 	export default {
 		name: 'ns-birthday-gift',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				birthday: {

components/ns-form/ns-form.vue

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

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

@@ -3,16 +3,9 @@
 </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,235 +2,233 @@
 	<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" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
+		<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>
 	</view>
 </template>
 
 <script>
-	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+// 商品SKU
-	// 商品SKU
+export default {
-	export default {
+	name: 'ns-goods-sku-index',
-		name: 'ns-goods-sku-index',
+	data() {
-		components: {
+		return {
-			nsGoodsSku
+			timeout: {},
+			isRepeat: false,
+			goodsDetail: {}
+		};
+	},
+	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);
+			}
 		},
-		data() {
+		/**
-			return {
+		 * 单规格
-				timeout: {},
+		 * @param {Object} data 商品项
-				isRepeat: false,
+		 */
-				goodsDetail: {}
+		singleSpecificationGoods(data, event) {
-			};
+			let cart =
-		},
+				this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
-		created() {},
+					.sku_id
-		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 api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
-				let minBuy = data.min_buy > 0 ? data.min_buy : 1;
-				let num = cartNum >= minBuy ? cartNum : minBuy;
-				let _num = num;
-				if(cart && cart.cart_id){
-					_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
-				}
-				let cart_id = cart ? cart.cart_id : 0;
-				if (_num > parseInt(data.stock)) {
-					this.$util.showToast({
-						title: '商品库存不足'
-					});
-					return;
-				}
-				if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
-					this.$util.showToast({
-						title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
-					});
-					return;
-				}
 
-				if (cart) {
+			let cartNum = cart ? cart.num : 0;
-					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+			let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
-				} else {
+			let minBuy = data.min_buy > 0 ? data.min_buy : 1;
-
+			let num = cartNum >= minBuy ? cartNum : minBuy;
-					// 如果商品第一次添加，则初始化数据
+			let _num = num;
-					if (!this.cartList['goods_' + data.goods_id]) {
+			if (cart && cart.cart_id) {
-						this.cartList['goods_' + data.goods_id] = {};
+				_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
-					}
+			}
-
+			let cart_id = cart ? cart.cart_id : 0;
-					let discount_price = data.discount_price;
+			if (_num > parseInt(data.stock)) {
-					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+				this.$util.showToast({
-						discount_price = data.member_price;
+					title: '商品库存不足'
-					}
-
-					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
-					};
-				}
-
-				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
-							});
-						}
-					}
 				});
-			},
+				return;
-			/**
+			}
-			 * 多规格
+			if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
-			 * @param {Object} data 商品项
+				this.$util.showToast({
-			 */
+					title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
-			multiSpecificationGoods(data) {
+				});
-				this.$api.sendRequest({
+				return;
-					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 (cart) {
-							else item.sku_images = [];
+				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+			} else {
 
-							// 多规格时合并主图
+				// 如果商品第一次添加，则初始化数据
-							if (item.goods_spec_format && item.goods_image) {
+				if (!this.cartList['goods_' + data.goods_id]) {
-								item.goods_image = item.goods_image.split(',');
+					this.cartList['goods_' + data.goods_id] = {};
-								item.sku_images = item.goods_image.concat(item.sku_images);
+				}
-							}
 
-							// 当前商品SKU规格
+				let discount_price = data.discount_price;
-							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+					discount_price = data.member_price;
+				}
 
-							// 商品SKU格式
+				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
-							if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+					cart_id,
+					goods_id: data.goods_id,
+					sku_id: data.sku_id,
+					num: _num,
+					discount_price
+				};
+			}
 
-							// 限时折扣
+			if (this.isRepeat) return;
-							if (item.promotion_type == 1) {
+			this.isRepeat = true;
-								item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
-							}
 
-							if (item.promotion_type == 1 && item.discountTimeMachine) {
+			this.$emit('addCart', event.currentTarget.id);
-								if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+
-									item.show_price = item.member_price;
+			this.$api.sendRequest({
-								} else {
+				url: api,
-									item.show_price = item.discount_price;
+				data: {
-								}
+					cart_id,
-							} else if (item.member_price > 0) {
+					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 || '件';
+
+						if (item.sku_images) item.sku_images = item.sku_images.split(',');
+						else item.sku_images = [];
+
+						// 多规格时合并主图
+						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.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+
+						// 商品SKU格式
+						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.price;
+								item.show_price = item.discount_price;
 							}
-							this.goodsDetail = item;
+						} else if (item.member_price > 0) {
-
+							item.show_price = item.member_price;
-							this.$nextTick(() => {
+						} else {
-								if (this.$refs.goodsSku) {
+							item.show_price = item.price;
-									this.$refs.goodsSku.show("join_cart", (res) => {
-
-										let goods = this.cartList['goods_' + res.goods_id];
-										let cart = null;
-										if (goods && 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] = {
-												cart_id: res.cart_id,
-												goods_id: res.goods_id,
-												sku_id: res.sku_id,
-												num: res.num,
-												discount_price: res.discount_price
-											};
-
-										}
-
-										this.$store.dispatch('cartCalculate');
-										this.$emit("cartListChange", this.cartList);
-
-										// 加入购物车动效
-										setTimeout(() => {
-											this.$store.commit('setCartChange');
-										}, 100);
-
-									});
-								}
-							});
 						}
+						this.goodsDetail = item;
+
+						this.$nextTick(() => {
+							if (this.$refs.goodsSku) {
+								this.$refs.goodsSku.show("join_cart", (res) => {
+
+									let goods = this.cartList['goods_' + res.goods_id];
+									let cart = null;
+									if (goods && 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] = {
+											cart_id: res.cart_id,
+											goods_id: res.goods_id,
+											sku_id: res.sku_id,
+											num: res.num,
+											discount_price: res.discount_price
+										};
+
+									}
+
+									this.$store.dispatch('cartCalculate');
+									this.$emit("cartListChange", this.cartList);
+
+									// 加入购物车动效
+									setTimeout(() => {
+										this.$store.commit('setCartChange');
+									}, 100);
+
+								});
+							}
+						});
 					}
-				});
+				}
-			},
+			});
-			refreshGoodsSkuDetail(data) {
+		},
-				this.goodsDetail = Object.assign({}, this.goodsDetail, data);
+		refreshGoodsSkuDetail(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 ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+		<uni-popup-sku 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,19 +208,15 @@
 					<button type="primary" v-else disabled="true">该商品已下架</button>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup-sku>
 		<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],
@@ -270,7 +266,7 @@
 		},
 		created() {
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			this.systemInfo = uni.getSystemInfoSync();
+			this.systemInfo = this.$util.getDeviceInfo();
 			this.isLoad = true;
 			if (this.goodsId && this.goodsDetail.goods_spec_format) {
 				this.skuId = this.goodsDetail.sku_id;

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

@@ -75,12 +75,8 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	export default {
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				newgift: {

components/ns-newform/ns-newform.vue

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

components/payment/payment.vue

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

components/privacy-popup/privacy-popup.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- #ifdef MP -->
 	<view v-if="showPop">
 		<view class="privacy-mask">
 			<view class="privacy-wrap">
@@ -15,6 +16,10 @@
 			</view>
 		</view>
 	</view>
+	<!-- #endif -->
+	<!-- #ifdef WEB || H5 -->
+	<view v-if="showPop"></view>
+	<!-- #endif -->
 </template>
 
 <script>

components/register-reward/register-reward.vue

@@ -78,14 +78,9 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				reward: null,

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

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

components/yuyue-date/yuyue-date.scss

@@ -1,158 +1,158 @@
-.content {
+.content {
-	text-align: center;
+	text-align: center;
-	height: 100%;
+	height: 100%;
-	.head {
+	.head {
-		position: relative;
+		position: relative;
-		font-weight: bold;
+		font-weight: bold;
-		padding: 32rpx 0 24rpx;
+		padding: 32rpx 0 24rpx;
-		font-size: $font-size-toolbar;
+		font-size: $font-size-toolbar;
-		.iconfont {
+		.iconfont {
-			position: absolute;
+			position: absolute;
-			right: 20rpx;
+			right: 20rpx;
-		}
+		}
-	}
+	}
-
+
-	.container {
+	.container {
-		view,
+		view,
-		text,
+		text,
-		image {
+		image {
-			box-sizing: border-box;
+			box-sizing: border-box;
-		}
+		}
-		.date-list-wrap {
+		.date-list-wrap {
-			display: flex;
+			display: flex;
-			align-items: center;
+			align-items: center;
-			border-bottom: 2rpx solid #e6e6e6;
+			border-bottom: 2rpx solid #e6e6e6;
-			scroll-view {
+			scroll-view {
-				width: 80%;
+				width: 80%;
-				white-space: nowrap;
+				white-space: nowrap;
-				height: 100rpx;
+				height: 100rpx;
-				line-height: 100rpx;
+				line-height: 100rpx;
-				background-color: #fff;
+				background-color: #fff;
-				position: relative;
+				position: relative;
-				.flex-box {
+				.flex-box {
-					display: inline-block;
+					display: inline-block;
-					width: 25%;
+					width: 25%;
-
+
-					&.active {
+					&.active {
-						.date-box {
+						.date-box {
-							border: none;
+							border: none;
-							.days {
+							.days {
-								font-weight: bold;
+								font-weight: bold;
-								color: #818181;
+								color: #818181;
-							}
+							}
-							.date {
+							.date {
-								font-weight: bold;
+								font-weight: bold;
-								color: #818181;
+								color: #818181;
-							}
+							}
-						}
+						}
-					}
+					}
-					.date-box {
+					.date-box {
-						color: #909399;
+						color: #909399;
-						text {
+						text {
-							font-size: $font-size-tag;
+							font-size: $font-size-tag;
-						}
+						}
-					}
+					}
-				}
+				}
-			}
+			}
-			.appointed-day {
+			.appointed-day {
-				flex: 1;
+				flex: 1;
-				border-left: 2rpx solid #e6e6e6;
+				border-left: 2rpx solid #e6e6e6;
-				.day-box,
+				.day-box,
-				.iconfont {
+				.iconfont {
-					font-size: $font-size-tag;
+					font-size: $font-size-tag;
-					color: #909399;
+					color: #909399;
-				}
+				}
-				.iconfont {
+				.iconfont {
-					margin-left: 4rpx;
+					margin-left: 4rpx;
-				}
+				}
-			}
+			}
-		}
+		}
-		.time-box {
+		.time-box {
-			padding: 0 12rpx;
+			padding: 0 12rpx;
-			display: flex;
+			display: flex;
-			flex-wrap: wrap;
+			flex-wrap: wrap;
-			overflow: scroll;
+			overflow: scroll;
-			background-color: #fff;
+			background-color: #fff;
-			height: auto;
+			height: auto;
-			.item {
+			.item {
-				width: 25%;
+				width: 25%;
-				padding: 0 8rpx;
+				padding: 0 8rpx;
-				margin-top: 30rpx;
+				margin-top: 30rpx;
-				&-box {
+				&-box {
-					width: 100%;
+					width: 100%;
-					height: 140rpx;
+					height: 140rpx;
-					padding: 0 40rpx;
+					padding: 0 40rpx;
-					background: #fff;
+					background: #fff;
-					color: #333;
+					color: #333;
-					border: 2rpx solid #eeeeee;
+					border: 2rpx solid #eeeeee;
-					font-size: $font-size-base;
+					font-size: $font-size-base;
-					border-radius: 10rpx;
+					border-radius: 10rpx;
-					display: flex;
+					display: flex;
-					flex-direction: column;
+					flex-direction: column;
-					align-items: center;
+					align-items: center;
-					justify-content: center;
+					justify-content: center;
-					&.disable {
+					&.disable {
-						background: #f1f3f6 !important;
+						background: #f1f3f6 !important;
-						color: #999 !important;
+						color: #999 !important;
-					}
+					}
-					&.active {
+					&.active {
-						background: $base-color;
+						background: $base-color;
-						color:#fff;
+						color:#fff;
-						// background: #0094D7;
+						// background: #0094D7;
-						border: 2rpx solid $base-color;
+						border: 2rpx solid $base-color;
-						font-weight: bold;
+						font-weight: bold;
-					}
+					}
-					.all {
+					.all {
-						font-size: $font-size-tag;
+						font-size: $font-size-tag;
-						padding-top: 10rpx;
+						padding-top: 10rpx;
-					}
+					}
-					//  自定义样式
+					//  自定义样式
-					&.diy{
+					&.diy{
-						height: 60rpx;
+						height: 60rpx;
-						border-radius: 40rpx;
+						border-radius: 40rpx;
-						.all{
+						.all{
-							display: none;
+							display: none;
-						}
+						}
-					}
+					}
-				}
+				}
-			}
+			}
-		}
+		}
-	}
+	}
-
+
-	.bottom {
+	.bottom {
-		display: flex;
+		display: flex;
-		flex-direction: row;
+		flex-direction: row;
-		position: fixed;
+		position: fixed;
-		align-items: center;
+		align-items: center;
-		bottom: 0;
+		bottom: 0;
-		top: auto;
+		top: auto;
-		left: 0;
+		left: 0;
-		width: 100%;
+		width: 100%;
-		background-color: #fff;
+		background-color: #fff;
-		box-shadow: 0 -2rpx 20rpx #bcbcbc;
+		box-shadow: 0 -2rpx 20rpx #bcbcbc;
-
+
-		.show-time {
+		.show-time {
-			width: 66%;
+			width: 66%;
-			height: 100rpx;
+			height: 100rpx;
-			line-height: 100rpx;
+			line-height: 100rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-base;
-			text-align: left;
+			text-align: left;
-			margin-left: 40rpx;
+			margin-left: 40rpx;
-		}
+		}
-
+
-		.submit-btn {
+		.submit-btn {
-			width: 25%;
+			width: 25%;
-			height: 70rpx;
+			height: 70rpx;
-			line-height: 70rpx;
+			line-height: 70rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-base;
-		}
+		}
-	}
+	}
-}
+}
-
+
-.yuyue-date-desc{
+.yuyue-date-desc{
-	padding-top: 2rpx;
+	padding-top: 2rpx;
-	padding-bottom: 4rpx;
+	padding-bottom: 4rpx;
-	font-size: $font-size-tag;
+	font-size: $font-size-tag;
-	color: $color-sub;
+	color: $color-sub;
-	text-align: center;
+	text-align: center;
-}
+}

docs/H5_ROUTER_FIX_README.md

@@ -0,0 +1,32 @@
+# H5路由模式修复说明
+
+## 问题描述
+生产环境下，导航到子页面（如 `/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）后刷新页面，会导致页面空白，显示 `<html><head></head><body></body></html>`。
+
+## 根本原因
+1. 应用使用了H5的`history`路由模式
+2. 生产服务器没有配置路由回退机制
+3. 刷新时，浏览器直接向服务器请求完整URL路径，服务器无法找到对应的资源，返回空HTML
+
+## 解决方案
+将H5路由模式从`history`改为`hash`模式。Hash模式下，所有路由请求都会指向应用根路径，避免服务器配置问题。
+
+## 修改内容
+修改 `manifest.json` 文件中的H5路由配置：
+
+```json
+"h5": {
+    "router": {
+        "mode": "hash",  // 从 "history" 改为 "hash"
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+## 预期效果
+- 子页面刷新后不再空白
+- URL格式变为 `http://domain/hwappx/test/#/pages_tool/form/formdata?id=73&uniacid=2793`
+- 无需修改服务器配置
+
+## 构建部署
+修改后，需要重新构建H5版本并部署到生产环境。可以通过HBuilderX或其他uni-app构建工具进行构建。

docs/HISTORY_MODE_SUB_DIR_DEPLOY.md

@@ -0,0 +1,756 @@
+# H5 History模式子目录部署配置指南
+
+## 场景说明
+您的uni-app H5应用部署在现有网站的子目录 `/hwappx/test/` 下，需要使用`history`路由模式，并解决刷新页面空白的问题。
+
+## 配置步骤
+
+### 1. 应用配置（已完成）
+确保`manifest.json`中的H5路由配置正确设置了`base`路径：
+
+```json
+"h5": {
+    "router": {
+        "mode": "history",
+        "base": "/hwappx/test/"
+    }
+}
+```
+
+### 2. 服务器配置
+服务器需要配置路由回退，将所有指向`/hwappx/test/`下不存在文件的请求重定向到`/hwappx/test/index.html`。
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    # 主网站根目录
+    root /path/to/main/website;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # H5应用子目录的路由回退配置
+    location /hwappx/test/ {
+        # 确保静态文件能被正确访问
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+    
+    # 主网站的其他配置
+    location / {
+        # 主网站的原有配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### .htaccess文件配置（放在`/hwappx/test/`目录下）
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+##### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+    
+    # H5应用子目录配置
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+    
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+在`/hwappx/test/`目录下创建`web.config`文件：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode Sub Directory">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// H5应用静态文件和路由回退
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app')));
+
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+## 配置关键点
+
+1. **base路径一致性**：
+   - `manifest.json`中的`base`配置必须与部署路径一致：`/hwappx/test/`
+   - 服务器配置中的重定向路径必须包含完整的base路径
+
+2. **静态资源处理**：
+   - 确保CSS、JS、图片等静态资源能够被正确访问
+   - 静态资源的URL应该自动包含base路径
+
+3. **路由回退规则**：
+   - 规则必须限定在`/hwappx/test/`路径下
+   - 只重定向不存在的文件和目录请求
+
+## 验证方法
+
+1. 构建H5应用并部署到服务器的`/hwappx/test/`目录
+2. 访问应用首页：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+
+## 常见问题排查
+
+1. **404错误**：
+   - 检查服务器配置中的重定向路径是否正确
+   - 确保`base`路径配置一致
+
+2. **页面样式缺失**：
+   - 检查静态资源URL是否包含了正确的base路径
+   - 确认CSS文件路径是否正确
+
+3. **路由无法跳转**：
+   - 检查`manifest.json`中的路由配置
+   - 确认服务器重定向规则是否生效
+
+## 部署注意事项
+
+1. 配置完成后需要重启服务器
+2. 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的规则
+3. 如果使用CDN，需要确保CDN也配置了相应的路由回退规则
+4. 定期检查服务器日志，确保配置正常工作
+
+## 总结
+通过正确配置应用的`base`路径和服务器的路由回退规则，您的uni-app H5应用可以在子目录`/hwappx/test/`下成功使用`history`路由模式，并且解决刷新页面空白的问题。
+
+---
+
+## 多子目录部署支持
+
+### 场景说明
+如果您需要在同一服务器上部署多个使用`history`模式的uni-app H5应用，例如：
+- `/hwapp/`
+- `/hwappx/test/`
+- `/hwappx/comoon/`
+- `/hwappx/1000/`
+
+您可以按照以下配置方法实现多子目录部署。
+
+### 1. 每个应用的manifest.json配置
+每个应用都需要在`manifest.json`中配置正确的`base`路径：
+
+#### 应用1：部署到 `/hwapp/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwapp/"
+  }
+}
+```
+
+#### 应用2：部署到 `/hwappx/test/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/test/"
+  }
+}
+```
+
+#### 应用3：部署到 `/hwappx/comoon/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/comoon/"
+  }
+}
+```
+
+#### 应用4：部署到 `/hwappx/1000/`
+```json
+"h5": {
+  "router": {
+    "mode": "history",
+    "base": "/hwappx/1000/"
+  }
+}
+```
+
+### 2. 服务器多子目录配置
+
+#### 2.1 Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 应用1: /hwapp/
+    location /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 应用2: /hwappx/test/
+    location /hwappx/test/ {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+
+    # 应用3: /hwappx/comoon/
+    location /hwappx/comoon/ {
+        try_files $uri $uri/ /hwappx/comoon/index.html;
+    }
+
+    # 应用4: /hwappx/1000/
+    location /hwappx/1000/ {
+        try_files $uri $uri/ /hwappx/1000/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2.2 Apache配置
+
+##### 方法1：在每个子目录下创建.htaccess文件
+
+在`/hwapp/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwapp/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwapp/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/test/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/comoon/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/comoon/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/comoon/index.html [L]
+</IfModule>
+```
+
+在`/hwappx/1000/`目录下创建.htaccess：
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/1000/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/1000/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在主配置文件中统一配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    # 应用1: /hwapp/
+    <Directory /path/to/main/website/hwapp>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwapp/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwapp/index.html [L]
+    </Directory>
+
+    # 应用2: /hwappx/test/
+    <Directory /path/to/main/website/hwappx/test>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+
+    # 应用3: /hwappx/comoon/
+    <Directory /path/to/main/website/hwappx/comoon>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/comoon/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/comoon/index.html [L]
+    </Directory>
+
+    # 应用4: /hwappx/1000/
+    <Directory /path/to/main/website/hwappx/1000>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/1000/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/1000/index.html [L]
+    </Directory>
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 2.3 IIS配置
+
+在每个子目录下创建`web.config`文件：
+
+##### 应用1：/hwapp/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwapp">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用2：/hwappx/test/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/test">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用3：/hwappx/comoon/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/comoon">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/comoon/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+##### 应用4：/hwappx/1000/web.config
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="History Mode hwappx/1000">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/1000/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 2.4 Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 应用1: /hwapp/
+app.use('/hwapp', express.static(path.join(__dirname, 'h5-app1')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app1', 'index.html'));
+});
+
+// 应用2: /hwappx/test/
+app.use('/hwappx/test', express.static(path.join(__dirname, 'h5-app2')));
+app.get('/hwappx/test/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app2', 'index.html'));
+});
+
+// 应用3: /hwappx/comoon/
+app.use('/hwappx/comoon', express.static(path.join(__dirname, 'h5-app3')));
+app.get('/hwappx/comoon/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app3', 'index.html'));
+});
+
+// 应用4: /hwappx/1000/
+app.use('/hwappx/1000', express.static(path.join(__dirname, 'h5-app4')));
+app.get('/hwappx/1000/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'h5-app4', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 3. 多子目录部署验证
+
+对于每个应用，执行以下验证步骤：
+
+1. 构建应用并部署到对应的子目录
+2. 访问应用首页，例如：`http://yourdomain.com/hwappx/test/`
+3. 导航到子页面，例如：`http://yourdomain.com/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`
+4. 刷新页面，验证页面是否正常显示
+5. 直接访问子页面URL，验证是否能正常加载
+
+### 4. 多子目录部署注意事项
+
+1. **路径隔离**：每个应用必须部署在独立的子目录下，避免文件和路由冲突
+2. **base一致性**：每个应用的`manifest.json`中的`base`配置必须与部署路径完全一致
+3. **服务器规则**：每个子目录都需要独立的路由回退规则
+4. **静态资源**：确保每个应用的静态资源URL包含了正确的base路径
+5. **缓存设置**：可以为不同应用设置不同的缓存策略
+6. **日志分离**：建议为不同应用配置独立的访问日志，便于问题排查
+
+### 5. 常见问题排查
+
+1. **应用间冲突**：
+   - 确保每个应用使用独立的子目录
+   - 检查`base`路径配置是否唯一
+
+2. **路由混乱**：
+   - 验证服务器配置中的重定向路径是否正确
+   - 检查应用的路由配置是否与其他应用冲突
+
+3. **静态资源404**：
+   - 确认静态资源URL是否包含了正确的base路径
+   - 检查服务器配置是否正确处理了静态资源请求
+
+4. **配置不生效**：
+   - 配置完成后重启服务器
+   - 清除浏览器缓存后重试
+
+通过以上配置，您可以在同一服务器上成功部署多个使用`history`模式的uni-app H5应用，每个应用都能独立运行并支持刷新操作。
+
+---
+
+## 通配符配置方案
+
+### 场景说明
+如果您的子目录有明确的命名规则（如您的`/hwapp/`、`/hwappx/test/`、`/hwappx/comoon/`、`/hwappx/1000/`等），可以使用通配符配置来简化服务器设置，避免为每个子目录手动添加配置。
+
+### 子目录规则分析
+根据您的子目录结构，可以分为两类：
+1. 一级子目录：`/hwapp/`
+2. `/hwappx/`下的所有二级子目录：`/hwappx/*/`
+
+### 服务器通配符配置
+
+#### 1. Nginx配置
+使用正则表达式location来匹配子目录模式：
+
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    root /path/to/main/website;
+    index index.html;
+
+    # 静态文件缓存设置
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+
+    # 匹配 /hwapp/ 一级子目录
+    location = /hwapp/ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    location ~ ^/hwapp/(.*)$ {
+        try_files $uri $uri/ /hwapp/index.html;
+    }
+
+    # 匹配 /hwappx/ 下的所有二级子目录，如 /hwappx/test/、/hwappx/comoon/、/hwappx/1000/ 等
+    location ~ ^/hwappx/([^/]+)/(.*)$ {
+        # 提取子目录名，重定向到对应目录的index.html
+        try_files $uri $uri/ /hwappx/$1/index.html;
+    }
+
+    # 主网站其他配置
+    location / {
+        # 原有主网站配置
+    }
+}
+```
+
+#### 2. Apache配置
+
+##### 方法1：使用RewriteRule的正则表达式
+
+在主网站根目录的`.htaccess`文件中添加：
+
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  
+  # 匹配 /hwapp/ 一级子目录
+  RewriteRule ^hwapp/(.*)$ /hwapp/index.html [L]
+  
+  # 匹配 /hwappx/ 下的所有二级子目录
+  RewriteRule ^hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+</IfModule>
+```
+
+##### 方法2：在虚拟主机配置中使用
+
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/main/website
+
+    RewriteEngine On
+    
+    # 匹配 /hwapp/ 一级子目录
+    RewriteRule ^/hwapp/(.*)$ /hwapp/index.html [L]
+    
+    # 匹配 /hwappx/ 下的所有二级子目录
+    RewriteRule ^/hwappx/([^/]+)/(.*)$ /hwappx/$1/index.html [L]
+
+    # 主网站目录配置
+    <Directory /path/to/main/website>
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+```
+
+#### 3. IIS配置
+
+在主网站根目录的`web.config`文件中添加：
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <!-- 匹配 /hwapp/ 一级子目录 -->
+        <rule name="History Mode hwapp Wildcard" stopProcessing="true">
+          <match url="^hwapp/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwapp/index.html" />
+        </rule>
+        
+        <!-- 匹配 /hwappx/ 下的所有二级子目录 -->
+        <rule name="History Mode hwappx Wildcard" stopProcessing="true">
+          <match url="^hwappx/([^/]+)/.*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/{R:1}/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
+```
+
+#### 4. Express.js配置
+
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 主网站静态文件
+app.use(express.static(path.join(__dirname, 'main-website')));
+
+// 匹配 /hwapp/ 一级子目录
+app.use('/hwapp', express.static(path.join(__dirname, 'hwapp')));
+app.get('/hwapp/*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'hwapp', 'index.html'));
+});
+
+// 匹配 /hwappx/ 下的所有二级子目录
+// 使用路由参数来捕获子目录名
+app.get('/hwappx/:subdir/*', (req, res) => {
+    const subdir = req.params.subdir;
+    const appPath = path.join(__dirname, `hwappx/${subdir}`);
+    
+    // 检查应用目录是否存在
+    const fs = require('fs');
+    if (fs.existsSync(appPath)) {
+        res.sendFile(path.join(appPath, 'index.html'));
+    } else {
+        res.status(404).send('Application not found');
+    }
+});
+
+// 为 /hwappx/ 下的每个子目录提供静态文件服务
+app.use('/hwappx', express.static(path.join(__dirname, 'hwappx')));
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 通配符配置优势
+
+1. **减少配置量**：无需为每个新子目录手动添加配置
+2. **自动适应**：新添加的符合规则的子目录会自动应用路由回退
+3. **统一管理**：所有同类应用的配置集中管理，便于维护
+4. **规则灵活**：可以根据实际需要调整正则表达式匹配规则
+
+### 通配符配置注意事项
+
+1. **规则顺序**：确保更具体的规则优先于通配符规则
+2. **性能考虑**：过于复杂的正则表达式可能影响服务器性能
+3. **目录验证**：在Express.js等代码级配置中，建议添加目录存在性检查
+4. **冲突避免**：确保通配符规则不会与主网站或其他应用的路由冲突
+5. **测试充分**：配置后要充分测试各种子目录的访问情况
+
+### 验证方法
+
+1. 部署一个符合规则的新子目录应用，如 `/hwappx/newapp/`
+2. 访问应用首页：`http://yourdomain.com/hwappx/newapp/`
+3. 导航到子页面并刷新，验证是否正常显示
+4. 直接访问子页面URL，验证是否能正常加载
+
+通过以上通配符配置，您可以轻松管理大量符合规则的子目录应用，避免重复配置工作。

docs/SERVER_ROUTER_FALLBACK_CONFIG.md

@@ -0,0 +1,140 @@
+# H5 History模式服务器路由回退配置指南
+
+## 配置原理
+当使用H5的`history`路由模式时，所有直接访问的URL（如刷新页面）都会发送到服务器。服务器需要配置路由回退，将所有匹配不到实际文件的请求重定向到应用的`index.html`，让客户端路由处理URL。
+
+## 服务器配置示例
+
+### 1. Nginx配置
+```nginx
+server {
+    listen 80;
+    server_name yourdomain.com;
+    
+    root /path/to/your/h5/dist;
+    index index.html;
+    
+    # 静态文件直接返回
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|ttf|woff|woff2)$ {
+        expires 7d;
+        add_header Cache-Control "public, no-transform";
+    }
+    
+    # 所有其他请求重定向到index.html
+    location / {
+        try_files $uri $uri/ /hwappx/test/index.html;
+    }
+}
+```
+
+### 2. Apache配置
+需要确保启用了`mod_rewrite`模块
+
+#### .htaccess文件配置
+```apache
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteBase /hwappx/test/
+  RewriteRule ^index\.html$ - [L]
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule . /hwappx/test/index.html [L]
+</IfModule>
+```
+
+#### 虚拟主机配置
+```apache
+<VirtualHost *:80>
+    ServerName yourdomain.com
+    DocumentRoot /path/to/your/h5/dist
+    
+    <Directory /path/to/your/h5/dist>
+        AllowOverride All
+        Require all granted
+        
+        RewriteEngine On
+        RewriteBase /hwappx/test/
+        RewriteRule ^index\.html$ - [L]
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteRule . /hwappx/test/index.html [L]
+    </Directory>
+</VirtualHost>
+```
+
+### 3. Express.js配置
+```javascript
+const express = require('express');
+const path = require('path');
+const app = express();
+
+// 静态文件服务
+app.use('/hwappx/test/', express.static(path.join(__dirname, 'dist')));
+
+// 路由回退
+app.get('*', (req, res) => {
+    res.sendFile(path.join(__dirname, 'dist', 'index.html'));
+});
+
+app.listen(3000, () => {
+    console.log('Server is running on port 3000');
+});
+```
+
+### 4. IIS配置
+需要安装URL重写模块（URL Rewrite Module）
+
+#### web.config文件配置
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Handle History Mode and custom 404/500" stopProcessing="true">
+          <match url=".*" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/hwappx/test/index.html" />
+        </rule>
+      </rules>
+    </rewrite>
+    <staticContent>
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+      <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+    </staticContent>
+  </system.webServer>
+</configuration>
+```
+
+## 配置要点
+
+1. **base路径设置**：确保服务器配置中的路径与`manifest.json`中的`base`配置一致
+   ```json
+   "h5": {
+       "router": {
+           "mode": "history",
+           "base": "/hwappx/test/"
+       }
+   }
+   ```
+
+2. **静态资源处理**：确保图片、CSS、JS等静态文件能够被正确访问
+
+3. **缓存策略**：为静态文件设置合理的缓存过期时间
+
+## 验证配置
+
+1. 部署配置后的应用到服务器
+2. 访问应用首页
+3. 导航到子页面（如`/hwappx/test/pages_tool/form/formdata?id=73&uniacid=2793`）
+4. 刷新页面，验证页面是否正常显示
+
+## 注意事项
+
+- 配置完成后需要重启服务器生效
+- 确保服务器有权限读取配置文件
+- 对于HTTPS站点，需要在对应的HTTPS配置中添加相同的路由回退规则
+- 如果使用CDN，需要确保CDN也配置了相应的路由回退规则

docs/WECHAT_MINIPROGRAM_PERMISSIONS.md

@@ -0,0 +1,199 @@
+# 微信小程序权限配置文档
+
+## 1. 权限体系概述
+
+微信小程序权限体系是微信为保护用户隐私和数据安全而设计的一套权限管理机制。小程序在使用某些功能时，需要向用户申请相应的权限，用户可以选择授权或拒绝。
+
+## 2. 权限分类
+
+微信小程序权限分为两大类：
+
+### 2.1 需要单独申请的权限
+
+这类权限需要通过 `wx.requestAuthorization` 或相关 API 向用户主动申请，用户会看到授权弹窗，必须明确同意后才能使用。
+
+### 2.2 不需要单独申请的权限
+
+这类权限不需要通过 API 主动申请，小程序在使用相关功能时会自动触发系统授权提示，或在某些场景下默认授权。
+
+## 3. 详细权限列表
+
+### 3.1 需要单独申请的权限
+
+| 权限名称 | 权限标识 | 描述 | 使用场景 |
+|---------|---------|------|----------|
+| 地理位置 | `scope.userLocation` | 获取用户地理位置 | 地图定位、附近商家等 |
+| 后台定位 | `scope.userLocationBackground` | 后台持续获取地理位置 | 外卖配送、打车等需要后台定位的场景 |
+| 录音 | `scope.record` | 录制音频 | 语音消息、语音识别等 |
+| 摄像头 | `scope.camera` | 使用摄像头 | 扫码、拍照、视频通话等 |
+| 通讯地址 | `scope.address` | 获取用户通讯地址 | 填写收货地址等 |
+| 发票抬头 | `scope.invoiceTitle` | 获取用户发票抬头 | 填写发票信息等 |
+| 微信运动步数 | `scope.werun` | 获取微信运动步数 | 步数统计、运动排名等 |
+| 保存到相册 | `scope.writePhotosAlbum` | 保存图片到相册 | 保存分享图片、截图等 |
+| 添加到日历 | `scope.addPhoneCalendar` | 添加事件到日历 | 预约提醒、活动安排等 |
+| 读取日历 | `scope.readPhoneCalendar` | 读取日历事件 | 日程管理、智能提醒等 |
+
+### 3.2 不需要单独申请的权限
+
+| 权限名称 | 权限标识 | 描述 | 使用场景 |
+|---------|---------|------|----------|
+| 剪贴板 | `scope.userClipboard` | 读写剪贴板 | 复制链接、粘贴内容等 |
+| 选择地址 | `scope.chooseAddress` | 选择收货地址 | 下单时选择地址 |
+| 选择发票 | `scope.chooseInvoice` | 选择发票 | 填写发票信息时选择 |
+| 选择发票抬头 | `scope.chooseInvoiceTitle` | 选择发票抬头 | 填写发票信息时选择 |
+| 获取网络状态 | - | 获取网络状态 | 网络请求、状态检测等 |
+| 获取设备信息 | - | 获取设备型号、操作系统等 | 适配不同设备、统计分析等 |
+| 获取窗口信息 | - | 获取窗口尺寸等 | 布局适配、响应式设计等 |
+
+## 4. 权限申请流程
+
+### 4.1 需要单独申请的权限
+
+1. 在 `manifest.json` 中配置权限描述
+2. 在代码中调用相关 API 前，先检查是否已授权
+3. 未授权时，调用 `wx.requestAuthorization` 申请权限
+4. 根据用户授权结果执行相应操作
+
+### 4.2 不需要单独申请的权限
+
+1. 在 `manifest.json` 中配置权限描述
+2. 直接调用相关 API，系统会自动处理授权逻辑
+
+## 5. 权限配置示例
+
+### 5.1 manifest.json 配置示例
+
+```json
+"mp-weixin": {
+  "appid": "wx29215aa1bd97bbd6",
+  "permission": {
+    "scope.userLocation": {
+      "desc": "为了更好地为您提供服务"
+    },
+    "scope.writePhotosAlbum": {
+      "desc": "为了更好地为您提供服务"
+    },
+    "scope.userClipboard": {
+      "desc": "为了方便您复制信息"
+    },
+    "scope.record": {
+      "desc": "用于语音录制功能"
+    },
+    "scope.camera": {
+      "desc": "用于拍摄照片或视频"
+    },
+    "scope.address": {
+      "desc": "用于获取您的通讯地址"
+    },
+    "scope.chooseAddress": {
+      "desc": "用于选择收货地址"
+    },
+    "scope.chooseInvoice": {
+      "desc": "用于选择发票"
+    },
+    "scope.chooseInvoiceTitle": {
+      "desc": "用于选择发票抬头"
+    }
+  },
+  "requiredPrivateInfos": ["chooseLocation", "getLocation", "chooseAddress"]
+}
+```
+
+### 5.2 权限申请代码示例
+
+```javascript
+// 申请地理位置权限
+wx.getSetting({
+  success: (res) => {
+    if (!res.authSetting['scope.userLocation']) {
+      wx.requestAuthorization({
+        scope: 'scope.userLocation',
+        success: (authRes) => {
+          if (authRes.authSetting['scope.userLocation']) {
+            // 用户授权成功，可以使用地理位置相关功能
+            wx.getLocation({
+              type: 'wgs84',
+              success: (locationRes) => {
+                console.log('获取位置成功', locationRes);
+              }
+            });
+          }
+        },
+        fail: (err) => {
+          console.log('授权失败', err);
+        }
+      });
+    } else {
+      // 已经授权，可以直接使用
+      wx.getLocation({
+        type: 'wgs84',
+        success: (locationRes) => {
+          console.log('获取位置成功', locationRes);
+        }
+      });
+    }
+  }
+});
+```
+
+## 6. 注意事项和最佳实践
+
+### 6.1 注意事项
+
+1. **权限申请时机**：在真正需要使用权限时再申请，不要在小程序启动时就申请所有权限
+2. **权限描述**：在 `manifest.json` 中为每个权限提供清晰、准确的描述，说明为什么需要该权限
+3. **用户体验**：在申请权限前，先向用户解释为什么需要该权限，提高授权成功率
+4. **权限拒绝处理**：当用户拒绝授权时，提供合理的降级方案，不要直接阻断用户操作
+5. **隐私政策**：在小程序中提供隐私政策，说明如何使用用户数据
+
+### 6.2 最佳实践
+
+1. **按需申请**：只申请小程序真正需要的权限
+2. **逐步申请**：根据用户使用流程，逐步申请所需权限
+3. **合理降级**：当权限被拒绝时，提供替代方案
+4. **定期检查**：定期检查权限使用情况，移除不再需要的权限
+5. **权限管理**：在小程序设置中提供权限管理入口，方便用户查看和修改授权状态
+
+## 7. 相关 API
+
+### 7.1 权限相关 API
+
+- `wx.getSetting`：获取用户当前的授权状态
+- `wx.requestAuthorization`：请求用户授权
+- `wx.openSetting`：打开设置页面，引导用户修改授权状态
+
+### 7.2 常用功能 API
+
+- `wx.getLocation`：获取用户地理位置
+- `wx.chooseAddress`：选择收货地址
+- `wx.chooseInvoice`：选择发票
+- `wx.chooseInvoiceTitle`：选择发票抬头
+- `wx.getRecorderManager`：获取录音管理器
+- `wx.createCameraContext`：创建摄像头上下文
+
+## 8. 常见问题
+
+### 8.1 权限申请失败
+
+- **原因**：用户拒绝授权、系统限制、权限配置错误
+- **解决方法**：检查权限配置、提供合理的权限说明、引导用户在设置中开启权限
+
+### 8.2 权限被禁用
+
+- **原因**：用户在设置中关闭了权限
+- **解决方法**：使用 `wx.openSetting` 引导用户重新开启权限
+
+### 8.3 权限申请弹窗不显示
+
+- **原因**：用户之前拒绝过授权且选择了"不再询问"
+- **解决方法**：引导用户在设置中开启权限
+
+## 9. 总结
+
+合理配置和使用微信小程序权限，不仅可以保护用户隐私和数据安全，还能提升用户体验和小程序的可信度。开发者应该根据小程序的实际功能需求，按需申请权限，并为用户提供清晰、透明的权限使用说明。
+
+---
+
+**更新时间**：2026-01-06
+**适用微信版本**：最新版本
+**参考文档**：[微信小程序官方权限文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/authorize.html)

lang/en-us/common.js

@@ -19,5 +19,10 @@ export const lang = {
 		currencySymbol: '¥',
 		submit: 'Submit',
 		searchTip: 'Please enter search keywords'
-	}
+	},
+
+	login: 'Login/Register',
+	loginTips: 'Click to login and enjoy more exciting information',
+	toLogin: 'Go to login',
+	toGoodsCategoryPage: 'Go shopping',	
 }

lang/en-us/contact/contact.js

@@ -1,4 +1,18 @@
 export const lang = {
 	//title为每个页面的标题
-	title: 'Electronic Card'
+	title: 'Electronic Card',
+	onlineMessage: 'Online Message',
+	call: 'One-click Call',
+	copy: 'Copy',
+	copyFailed: 'Copy Failed',
+	copySuccess: 'Copy Success',
+	oneClickNavigation: 'One-click Navigation',
+	name: 'Name',
+	contactInfo: 'Contact Info',
+	messageContent: 'Message Content',
+	pleaseEnterName: 'Please enter your name',
+	pleaseEnterMobile: 'Please enter your phone number',
+	pleaseEnterMessage: 'Please enter your message',
+	submit: 'Submit',
+	exclusiveCustomerService: 'Exclusive Customer Service'
 }

lang/en-us/member/index.js

@@ -39,10 +39,22 @@ export const lang = {
 	myRebate: 'Group Rebate',
 	myHongbao: 'My Red Envelopes',
 	myBlindBox: 'My Blind Boxes',
-	
+
-	waitpay:'Waitpay',
+	waitpay: 'Waitpay',
-	waitsend:'Waitsend',
+	waitsend: 'Waitsend',
-	waitconfirm:'Waitconfirm',
+	waitconfirm: 'Waitconfirm',
-	activist:'Activist',
+	activist: 'Activist',
-	completed:'Completed',
+	completed: 'Completed',
+
+	// 账户操作
+	logout: 'Logout',
+	cancellation: 'Account Cancellation',
+	logoutTitle: 'Tips',
+	logoutContent: 'Are you sure you want to log out',
+	cancellationTitle: 'Risk Warning',
+	cancellationContent: 'Are you sure you want to cancel your current account?',
+
+	// 协议
+	privacyPolicy: 'Privacy Policy',
+	registrationAgreement: 'Registration Agreement',
 }

lang/zh-cn/agreement/contenr.js

@@ -0,0 +1 @@
+export const lang = {}

lang/zh-cn/common.js

@@ -19,5 +19,16 @@ export const lang = {
 		currencySymbol: '¥',
 		submit: '提交',
 		searchTip: '请输入搜索关键词'
-	}
+	},
+
+	login: '登录/注册',
+	loginTpis: '点击登录 享受更多精彩信息',
+	toLogin: '去登录',
+	toGoodsCategoryPage: '去逛逛',
+
+	waitpay: '待付款',
+	waitsend: '待发货',
+	waitconfirm: '待收货',
+	activist: '售后',
+	completed: '已完成',
 }

lang/zh-cn/contact/contact.js

@@ -1,4 +1,18 @@
 export const lang = {
 	//title为每个页面的标题
-	title: '电子名片'
+	title: '电子名片',
+	onlineMessage: '在线留言',
+	call: '一键拨打',
+	copy: '复制',
+	copyFailed: '复制失败',
+	copySuccess: '复制成功',
+	oneClickNavigation: '一键导航',
+	name: '姓名',
+	contactInfo: '联系方式',
+	messageContent: '留言内容',
+	pleaseEnterName: '请输入您的姓名',
+	pleaseEnterMobile: '请输入您的手机号',
+	pleaseEnterMessage: '请输入留言内容',
+	submit: '提交',
+	exclusiveCustomerService: '专属客服'
 }

lang/zh-cn/goods/category.js

@@ -1,6 +1,7 @@
-export const lang = {
+export const lang = {
-	//title为每个页面的标题
+	//title为每个页面的标题
-	title: '商品分类',
+	title: '商品分类',
-	search:'商品搜索',
+	search:'商品搜索',
-	seeMore : '查看更多'
+	seeMore : '查看更多',
-}
+	Make: "询底价"
+}

lang/zh-cn/goods/detail.js

@@ -2,7 +2,7 @@ export const lang = {
 	//title为每个页面的标题
 	title: '',
 	select: '选择',
-	details:'商品详情',
+	details:'资源详情',
 	params: '参数',
 	service: '商品服务',
 	allGoods: '全部商品',
@@ -11,7 +11,7 @@ export const lang = {
 	home:'首页',
 	cart:'购物车',
 	leave:'立即留言',
-	make:'立即咨询',
+	make:'联系我们',
 	
 	send:'配送',
 	express:'快递发货',
@@ -22,7 +22,7 @@ export const lang = {
 	status:'该商品已下架',
 	sellout:'库存不足',
 	max:'已达最大限购数量',
-	makebtn:'咨询',
+	makebtn:'价格电议',
 	sales:'销量',
 	stock:'库存',
 	kefu:'客服',

lang/zh-cn/goods/list.js

@@ -1,11 +1,11 @@
-export const lang = {
+export const lang = {
-	//title为每个页面的标题
+	//title为每个页面的标题
-	title: '商品列表',
+	title: '商品列表',
-	Random:'综合',
+	Random:'综合',
-	Sales:'销量',
+	Sales:'销量',
-	Price:'价格',
+	Price:'价格',
-	Filter:'筛选',
+	Filter:'筛选',
-	Search:'请输入您要搜索的商品',
+	Search:'请输入您要搜索的商品',
-	Make:'咨询',
+	Make:'立即询底价',
-	
+	
-}
+}

lang/zh-cn/member/index.js

@@ -11,6 +11,9 @@ export const lang = {
 	readyDelivery: '待发货',
 	waitDelivery: '待收货',
 	refunding: '退款',
+	getDynacode: '获取动态验证码',
+
+
 	// 会员中心入口
 	sign: '签到',
 	personInfo: '个人资料',
@@ -28,13 +31,13 @@ export const lang = {
 	verification: '核销台',
 	message: '我的消息',
 	exchangeOrder: '积分兑换',
-	
+
-	waitpay:'待付款',
+	waitpay: '待付款',
-	waitsend:'待发货',
+	waitsend: '待发货',
-	waitconfirm:'待收货',
+	waitconfirm: '待收货',
-	activist:'售后',
+	activist: '售后',
-	completed:'已完成',
+	completed: '已完成',
-	
+
 	// 推广中心
 	balance: '余额',
 	point: '积分',
@@ -43,9 +46,19 @@ export const lang = {
 	myPresale: '我的预售',
 	myGiftcard: '我的礼品卡',
 	myDivideticket: '我的瓜分券',
-	myRebate:'拼团返利',
+	myRebate: '拼团返利',
-	myHongbao:'我的红包列表',
+	myHongbao: '我的红包列表',
-	myBlindBox:'我的盲盒',
+	myBlindBox: '我的盲盒',
-	
+
-	
+	// 账户操作
+	logout: '退出登录',
+	cancellation: '账号注销',
+	logoutTitle: '提示',
+	logoutContent: '确定要退出登录吗',
+	cancellationTitle: '风险提示',
+	cancellationContent: '确定要注销当前账号吗？',
+
+	// 协议
+	privacyPolicy: '隐私协议',
+	registrationAgreement: '注册协议',
 }

manifest.json

@@ -72,6 +72,9 @@
             },
             "scope.writePhotosAlbum" : {
                 "desc" : "为了更好地为您提供服务"
+            },
+            "scope.userClipboard" : {
+                "desc" : "为了方便您复制信息"
             }
         },
         "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
@@ -100,9 +103,9 @@
         },
         "router" : {
             "mode" : "history",
-            "base" : "/hwapp/"
+            "base" : "/hwappx/2811/"
         },
-        "title" : " ",
+        "title" : "",
         "devServer" : {
             "https" : false
         },

package-lock.json

@@ -1,11 +1,15 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "dependencies": {
+        "jweixin-module": "^1.6.0"
+      },
       "devDependencies": {
-        "terser-webpack-plugin": "^5.3.10"
+        "terser-webpack-plugin": "^5.3.10",
+        "zion-uniapp-mp-load-package": "^1.0.13"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -619,6 +623,25 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -981,6 +1004,16 @@
       "engines": {
         "node": ">=10.13.0"
       }
+    },
+    "node_modules/zion-uniapp-mp-load-package": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmmirror.com/zion-uniapp-mp-load-package/-/zion-uniapp-mp-load-package-1.0.13.tgz",
+      "integrity": "sha512-QKJ6azXsJh9dVpjVS/48bGQELSI3FFtQ3QZic/Gs5z6v77BVjY7uGCXKxGuCwNwijtJnm8FRzlFGTVcQYU+wXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json5": "^2.2.3"
+      }
     }
   },
   "dependencies": {
@@ -1456,6 +1489,17 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -1681,6 +1725,15 @@
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
       "peer": true
+    },
+    "zion-uniapp-mp-load-package": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmmirror.com/zion-uniapp-mp-load-package/-/zion-uniapp-mp-load-package-1.0.13.tgz",
+      "integrity": "sha512-QKJ6azXsJh9dVpjVS/48bGQELSI3FFtQ3QZic/Gs5z6v77BVjY7uGCXKxGuCwNwijtJnm8FRzlFGTVcQYU+wXA==",
+      "dev": true,
+      "requires": {
+        "json5": "^2.2.3"
+      }
     }
   }
 }

package.json

@@ -3,7 +3,8 @@
     "mp-weixin": "node scripts/mp-weixin.patch.js"
   },
   "devDependencies": {
-    "terser-webpack-plugin": "^5.3.10"
+    "terser-webpack-plugin": "^5.3.10",
+    "zion-uniapp-mp-load-package": "^1.0.13"
   },
   "dependencies": {
     "jweixin-module": "^1.6.0"
@@ -41,7 +42,7 @@
           "H5_PRODUCTION": true,
           "PRODUCTION": true
         }
-      },      
+      },
       "h5-test.aigc-quickapp.com": {
         "title": "H5-test.aigc-quickapp.com",
         "env": {
@@ -55,4 +56,4 @@
       }
     }
   }
-}
+}

pages.json

@@ -43,7 +43,7 @@
 				{
 					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "商品详情"
+						"navigationBarTitleText": "资源详情"
 					}
 				},
 				{
@@ -855,6 +855,14 @@
 						// #endif
 					}
 				},
+				{
+					"path": "form/formdata",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},				
 				{
 					"path": "weapp/order_shipping",
 					"style": {
@@ -944,7 +952,14 @@
 	},
 	"easycom": {
 		"autoscan": true,
-		"custom": {
+		"custom": {		
+			"x-skeleton": "@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue",
+			"mp-html": "@/uni_modules/mp-html/components/mp-html/mp-html.vue",			
+			"uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue",
+
+			"mescroll-uni": "@/components/mescroll/my-list-mescroll.vue",
+			"ns-goods-sku-*(\\W.*)": "@/components/ns-goods-sku/ns-goods-sku$1.vue",	
+
 			"diy-*(\\W.*)": "@/components-diy/diy$1.vue"
 		}
 	},

pages/empty/index.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="empty" :style="themeColor">
-	<view class="empty">
 	</view>
 </template>
 

pages/index/index.vue

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

pages_goods/cart.vue

@@ -1,8 +1,8 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view>
 		<view class="container">
-			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
+			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true"
+				:refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
 				<block v-if="hasData">
 					<view class="cart-header" v-if="cartData.length">
 						<view class="num-wrap">共{{ cartData[0].cartList.length }}种商品</view>
@@ -21,51 +21,67 @@
 								<text class="iconfont icon-right"></text>
 							</view>
 						</view>
-						<view class="store-wrap" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
+						<view class="store-wrap"
+							v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
 							<text class="iconfont icon-dianpu"></text>
-							<text class="name">{{globalStoreInfo.store_name}}</text>
+							<text class="name">{{ globalStoreInfo.store_name }}</text>
 						</view>
 						<block v-for="(item, cartIndex) in siteItem.cartList" :key="cartIndex">
 							<view class="cart-goods" @touchstart="touchS($event)" @touchend="touchE($event, item)">
 								<view class="goods-wrap" :class="{ edit: item.edit }">
-									<view class="iconfont" :class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'" @click="singleElection(siteIndex, cartIndex)"></view>
+									<view class="iconfont"
+										:class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"
+										@click="singleElection(siteIndex, cartIndex)"></view>
 									<view @click="toGoodsDetail(item)" class="goods-img">
-										<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(siteIndex, cartIndex)" mode="aspectFill"/>
+										<image :src="$util.img(item.sku_image, { size: 'mid' })"
+											@error="imageError(siteIndex, cartIndex)" mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view>
-											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ?
+												item.en_goods_name : item.goods_name }}</view>
 											<view class="sku-wrap">
 												<view class="sku">
-													<view class="goods-spec" v-if="item.sku_spec_format.length" @click="selectSku(item)">
+													<view class="goods-spec" v-if="item.sku_spec_format.length"
+														@click="selectSku(item)">
 														<block v-for="(x, i) in item.sku_spec_format" :key="i">
 															{{ x.spec_name }}:{{ x.spec_value_name }}
 															{{ i < item.sku_spec_format.length - 1 ? ';' : '' }}
-														</block>
+																</block>
 													</view>
-													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+													<text class="iconfont icon-unfold"
+														v-if="item.sku_spec_format.length"></text>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<block v-if="item.promotion_type == 1">
-												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+												<block
+													v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+															}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
-															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
+																$lang('common.currencySymbol') }}</text>
-															<text class="unit price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0]
-															<image :src="$util.img('public/uniapp/index/discount.png')"/>
+															}}
+															<text class="unit price-style small">.{{
+																parseFloat(item.discount_price).toFixed(2).split('.')[1]
+															}}</text>
+															<image
+																:src="$util.img('public/uniapp/index/discount.png')" />
 														</view>
 													</view>
 												</block>
@@ -74,19 +90,25 @@
 												<block v-if="Number(item.member_price) > 0">
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+															}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
+																parseFloat(item.price).toFixed(2).split('.')[1]
+															}}</text>
 														</view>
 													</view>
 												</block>
@@ -101,14 +123,16 @@
 											<text class="discount-tag">满减</text>
 											<scroll-view scroll-x="true" class="scroll-view">
 												<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
-													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{ mitem.discount_money }}</text>
+													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{
+														mitem.discount_money }}</text>
 													<text class="interval" v-if="mitem.discount_money"></text>
 												</block>
 											</scroll-view>
 										</view>
 									</view>
 								</view>
-								<view class="item-del color-base-bg" :class="{ show: item.edit }" @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
+								<view class="item-del color-base-bg" :class="{ show: item.edit }"
+									@click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
 							</view>
 						</block>
 					</view>
@@ -125,7 +149,8 @@
 								<view class="goods-wrap">
 									<view class="iconfont icon-yuan_checked color-tip"></view>
 									<view class="goods-img">
-										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" mode="aspectFill"/>
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+											mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -135,23 +160,32 @@
 													<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 														{{ x.spec_name }}:{{ x.spec_value_name }}
 														{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-													</block>
+															</block>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<view class="goods-price">
 												<text class="bottom-price price-style large">
-													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+													<template
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
-														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0] }}
+														<text class="unit price-style small">{{
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] }}</text>
+															$lang('common.currencySymbol') }}</text>
-														<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.member_price).toFixed(2).split('.')[1]
+														}}</text>
+														<image :src="$util.img('public/uniapp/index/VIP.png')" />
 													</template>
 													<template v-else>
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														<text class="unit price-style small">{{
-														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0] }}
+															$lang('common.currencySymbol') }}</text>
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1] }}</text>
+														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
+														}}</text>
 													</template>
 												</text>
 											</view>
@@ -165,8 +199,12 @@
 				</block>
 				<block v-else>
 					<view class="cart-empty">
-						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
+						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"
-						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
+							:emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
+						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">{{
+							$lang('toLogin')
+							}}</button>
+
 					</view>
 				</block>
 				<ns-goods-recommend ref="goodrecommend" route="cart"></ns-goods-recommend>
@@ -202,7 +240,7 @@
 							<view class="money price-font ">￥{{ discount.order_money | moneyFormat }}</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 				</view>
 			</uni-popup>
 
@@ -214,9 +252,11 @@
 					</view>
 					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
 						<view class="coupon-item">
-							<view class="coupon-info" :style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+							<view class="coupon-info"
+								:style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 								<view class="info-wrap">
-									<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+									<image class="coupon-line" mode="heightFix"
+										:src="$util.img('public/uniapp/coupon/coupon_line.png')" />
 									<view class="coupon-money">
 										<template v-if="discount.coupon_info.type == 'reward'">
 											<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -238,24 +278,30 @@
 								</view>
 								<view class="desc-wrap">
 									<view class="coupon-name">{{ discount.coupon_info.coupon_name }}</view>
-									<view v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0" class="limit">
+									<view
+										v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0"
+										class="limit">
 										最多可抵￥{{ discount.coupon_info.discount_limit }}
 									</view>
-									<view class="time font-size-goods-tag" v-if="discount.coupon_info.validity_type == 0">
+									<view class="time font-size-goods-tag"
+										v-if="discount.coupon_info.validity_type == 0">
 										有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
 									</view>
-									<view class="time font-size-goods-tag" v-else-if="discount.coupon_info.validity_type == 1">
+									<view class="time font-size-goods-tag"
+										v-else-if="discount.coupon_info.validity_type == 1">
 										有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
 									</view>
 									<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
 								</view>
 
-								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" disabled>已领取</button>
+								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'"
-								<button type="primary" v-else @click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+									disabled>已领取</button>
+								<button type="primary" v-else
+									@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
 							</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 					<view class="cart-bottom-block"></view>
 				</view>
 			</uni-popup>
@@ -263,7 +309,8 @@
 
 		<view class="cart-bottom" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }" v-if="hasData">
 			<view class="all-election" @click="allElection">
-				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+				</view>
 				<text>{{ $lang('allElection') }}</text>
 			</view>
 			<view class="settlement-info" :style="{ visibility: isAction ? 'hidden' : 'visible' }">
@@ -271,8 +318,10 @@
 					{{ $lang('total') }}：
 					<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 					<block v-if="Object.keys(discount).length">
-						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</text>
+						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0]
-						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] }}</text>
+						}}</text>
+						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
+						}}</text>
 					</block>
 					<block v-else>
 						<text class="value price-font">{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}</text>
@@ -289,16 +338,20 @@
 			</view>
 			<view class="action-btn" v-else>
 				<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
-					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{ totalCount }})
+					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{
+						totalCount }})
 				</button>
-				<button type="primary" size="mini" class="mini" @click="settlement" disabled
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled v-else>{{
-					v-else>{{ $lang('settlement') }}({{ totalCount }})</button>
+					$lang('settlement') }}({{
+						totalCount }})</button>
 			</view>
 		</view>
 
 		<diy-bottom-nav></diy-bottom-nav>
 
-		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail" :goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy" @refresh="refreshSkuDetail"></ns-goods-sku>
+		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail"
+			:goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy"
+			@refresh="refreshSkuDetail"></ns-goods-sku>
 
 		<!-- 加载动画 -->
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -308,52 +361,30 @@
 
 		<ns-login ref="login"></ns-login>
 
-		<!-- #ifdef MP-WEIXIN -->
+		<!-- 隐私弹窗 -->
-		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+import scroll from '@/common/js/scroll-view.js';
-	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+import cart from './public/js/cart.js';
-	import toTop from '@/components/toTop/toTop.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import scroll from '@/common/js/scroll-view.js';
-	import cart from './public/js/cart.js';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
-	export default {
+export default {
-		components: {
+	mixins: [scroll, cart]
-		nsGoodsRecommend,
+};
-		uniNumberBox,
-		toTop,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
-		mixins: [scroll, cart]
-	};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none;
+	background: none;
-		max-height: unset !important;
+	max-height: unset !important;
-		overflow-y: hidden !important;
+	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
-		border-radius: 20rpx 20rpx 0 0;
+	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 
-	@import './public/css/cart.scss';
+@import './public/css/cart.scss';
 </style>

pages_goods/category.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view>
 		<block v-if="diyData">
 			<block v-for="(item, index) in diyData.value" :key="index">
 				<view v-if="item.componentName == 'GoodsCategory'">
@@ -13,10 +12,8 @@
 
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- #ifdef MP-WEIXIN -->
+		<!-- 隐私弹窗 -->
-		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
 
 		<!-- 底部tabBar -->
 		<view id="tab-bar">
@@ -26,19 +23,7 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 export default {
-	components: {
-		nsLogin,
-		loadingCover,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			diyData: null

pages_goods/components/goods-detail-view/detail.js

@@ -1,465 +0,0 @@
-// 商品详情业务
-import {
-	Weixin
-} from '@/common/js/wx-jssdk.js';
-
-export default {
-	data() {
-		return {
-			skuId: 0,
-			goodsId: 0,
-			isIphoneX: false, //判断手机是否是iphoneX以上
-			whetherCollection: 0,
-
-			//是否开启预览，0：不开启，1：开启
-			preview: 0,
-			videoContext: '',
-
-			// 媒体,图片,视频
-
-			// 解决每个商品SKU图片数量不同时，无法切换到第一个，导致轮播图显示不出来
-			swiperInterval: 1,
-			swiperAutoplay: false,
-			swiperCurrent: 1,
-			switchMedia: 'img',
-
-			//评价
-			goodsEvaluate: [{
-				member_headimg: '',
-				member_name: '',
-				content: '',
-				images: [],
-				create_time: 0,
-				sku_name: ''
-			}],
-			evaluateConfig: {
-				evaluate_audit: 1,
-				evaluate_show: 0,
-				evaluate_status: 1
-			},
-
-			// 是否可分享到好物圈
-			goodsCircle: false,
-			service: null,
-			shareUrl: '', // 分享链接
-			source_member: 0, //分享人的id
-			isCommunity: false, //社群弹窗
-
-			poster: "-1", //海报
-			posterMsg: "", //海报错误信息
-			posterHeight: 0,
-			posterParams: {}, //海报所需参数
-			goodsRoute: '',
-			posterApi: '',
-			goodsAttrShow: false, // 商品属性是否展开
-
-			//门店列表
-			storeList: {
-				data: [],
-				page: 1,
-				page_size: 10
-			},
-			isShowStore: false,
-			latitude: null, // 纬度
-			longitude: null, // 经度
-			evaluateCount: 0, // 商品评论数量
-			deliveryType: null, // 配送方式
-			isVirtual: 0 //是否为虚拟商品
-		}
-	},
-	created() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (this.location) {
-			this.latitude = this.location.latitude;
-			this.longitude = this.location.longitude;
-		} else {
-			this.$util.getLocation();
-		}
-		this.getStoreData();
-	},
-	watch: {
-		location: function (nVal) {
-			if (nVal) {
-				this.latitude = nVal.latitude;
-				this.longitude = nVal.longitude;
-				this.getStoreData();
-			}
-		}
-	},
-	methods: {
-		init(params) {
-			this.skuId = params.sku_id;
-			this.goodsId = params.goods_id;
-			this.preview = params.preview;
-			this.source_member = params.source_member;
-			this.whetherCollection = params.whetherCollection;
-			this.posterParams = params.posterParams;
-
-			this.shareUrl = params.shareUrl;
-			this.goodsRoute = params.goodsRoute;
-			this.posterApi = params.posterApi;
-			this.isVirtual = params.isVirtual;
-			this.deliveryType = params.deliveryType;
-			this.evaluateConfig = params.evaluateConfig;
-
-			if (this.evaluateConfig.evaluate_show == 1) {
-				//商品评论
-				this.getGoodsEvaluate(params.evaluateList);
-				this.evaluateCount = params.evaluateCount;
-			}
-
-			for (let k in this.deliveryType) {
-				if (k == 'store') {
-					this.isShowStore = true;
-				}
-			}
-
-			this.getService();
-
-			this.videoContext = uni.createVideoContext('goodsVideo');
-
-			// #ifdef MP-WEIXIN
-			this.goodsSyncToGoodsCircle();
-			// #endif
-
-		},
-		swiperChange(e) {
-			this.swiperCurrent = e.detail.current + 1;
-		},
-
-		//-------------------------------------服务-------------------------------------
-
-		openMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.open();
-		},
-		closeMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.close();
-		},
-
-		//-------------------------------------门店列表-------------------------------------
-		openStoreListPopup() {
-			this.$refs.storeListPopup.open();
-		},
-		closeStoreListPopup() {
-			this.$refs.storeListPopup.close();
-		},
-		getStoreData() {
-			//门店列表
-			let data = {
-				page: this.storeList.page,
-				page_size: this.storeList.page_size
-			};
-			if (this.latitude && this.longitude) {
-				data.latitude = this.latitude;
-				data.longitude = this.longitude;
-			}
-			this.$api.sendRequest({
-				url: '/api/store/page',
-				data: data,
-				success: res => {
-					if (this.storeList.page == 1) this.storeList.data == [];
-					if (res.code >= 0 && res.data) {
-						this.storeList.data = this.storeList.data.concat(res.data.list);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		selectStore(item) {
-			this.$util.redirectTo('/pages_tool/store/detail', {
-				store_id: item.store_id
-			});
-			this.closeStoreListPopup();
-		},
-		//-------------------------------------属性-------------------------------------
-
-		switchGoodsAttr() {
-			this.goodsAttrShow = !this.goodsAttrShow;
-		},
-		//-------------------------------------评价-------------------------------------
-		//商品评论列表
-		getGoodsEvaluate(list) {
-			if (list) {
-				this.goodsEvaluate = list;
-				this.goodsEvaluate.forEach((item, index) => {
-					if (this.goodsEvaluate[index].images) this.goodsEvaluate[index].images = this.goodsEvaluate[index].images.split(",");
-					if (this.goodsEvaluate[index].is_anonymous == 1) this.goodsEvaluate[index].member_name = this.goodsEvaluate[index].member_name.replace(this.goodsEvaluate[index].member_name.substring(1, this.goodsEvaluate[index].member_name.length - 1), '***')
-				})
-				// if (this.goodsEvaluate.images) this.goodsEvaluate.images = this.goodsEvaluate.images.split(",");
-				// if (this.goodsEvaluate.is_anonymous == 1) this.goodsEvaluate.member_name = this.goodsEvaluate.member_name.replace(
-				// this.goodsEvaluate.member_name.substring(1, this.goodsEvaluate.member_name.length - 1), '***')
-			}
-		},
-		// 预览评价图片
-		previewEvaluate(index, img_index, field) {
-			var paths = [];
-			for (let i = 0; i < this.goodsEvaluate[index][field].length; i++) {
-				paths.push(this.$util.img(this.goodsEvaluate[index][field][i]));
-			}
-			uni.previewImage({
-				current: img_index,
-				urls: paths
-			});
-		},
-		//-------------------------------------关注-------------------------------------
-		async collection() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-
-			if (this.storeToken) {
-
-				//未关注添加关注
-				if (this.whetherCollection == 0) {
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/add",
-						data: {
-							sku_id: this.skuId,
-							goods_id: this.goodsSkuDetail.goods_id,
-							sku_name: this.goodsSkuDetail.sku_name,
-							sku_price: this.goodsSkuDetail.show_price,
-							sku_image: this.goodsSkuDetail.sku_image
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 1;
-					}
-				} else {
-					//已关注取消关注
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/delete",
-						data: {
-							goods_id: this.goodsSkuDetail.goods_id
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 0;
-					}
-				}
-				return this.whetherCollection;
-			} else {
-				if (this.source_member) {
-					this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
-				} else {
-					this.$refs.login.open(this.shareUrl);
-				}
-			}
-		},
-		//-------------------------------------分享-------------------------------------
-		// 打开分享弹出层
-		openSharePopup() {
-			this.$refs.sharePopup.open();
-		},
-		// 关闭分享弹出层
-		closeSharePopup() {
-			this.$refs.sharePopup.close();
-		},
-		copyUrl() {
-			let text = this.$config.h5Domain + this.shareUrl;
-			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
-			this.$util.copy(text, () => {
-				this.closeSharePopup();
-			});
-		},
-
-		//-------------------------------------海报-------------------------------------
-		// 打开海报弹出层
-		openPosterPopup() {
-			this.getGoodsPoster();
-			this.$refs.sharePopup.close();
-		},
-		// 关闭海报弹出层
-		closePosterPopup() {
-			this.$refs.posterPopup.close();
-			this.poster = ''
-		},
-		//生成海报
-		getGoodsPoster() {
-			uni.showLoading({
-				'title': '海报生成中...'
-			})
-			//活动海报信息
-			if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
-
-			this.$api.sendRequest({
-				url: this.posterApi,
-				data: {
-					page: this.goodsRoute,
-					qrcode_param: JSON.stringify(this.posterParams)
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.$refs.posterPopup.open();
-						this.poster = res.data.path + "?time=" + new Date().getTime();
-					} else {
-						this.posterMsg = res.message;
-						this.$util.showToast({
-							title: res.message
-						})
-					}
-					uni.hideLoading();
-				},
-				fail: err => {
-					uni.hideLoading();
-				}
-			});
-		},
-		// 预览图片
-		previewMedia(index) {
-			var paths = [];
-			for (let i = 0; i < this.goodsSkuDetail.sku_images.length; i++) {
-				paths.push(this.$util.img(this.goodsSkuDetail.sku_images[i], {
-					size: 'big'
-				}));
-			}
-			uni.previewImage({
-				current: index,
-				urls: paths,
-				// longPressActions: {
-				// 	itemList: ['发送给朋友', '保存图片', '关注'],
-				// 	success: function(data) {
-				// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-				// 	},
-				// 	fail: function(err) {
-				// 		console.log(err.errMsg);
-				// 	}
-				// }
-			});
-		},
-		swiperImageError(index) {
-			this.goodsSkuDetail.sku_images[index] = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		// #ifdef MP || APP-PLUS
-		//小程序中保存海报
-		saveGoodsPoster() {
-			let url = this.$util.img(this.poster);
-			uni.downloadFile({
-				url: url,
-				success: (res) => {
-					if (res.errMsg == "downloadFile:ok") {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: () => {
-								this.$util.showToast({
-									title: "保存成功"
-								});
-							},
-							fail: (err) => {
-								this.$util.showToast({
-									title: "保存失败，请稍后重试"
-								});
-							}
-						});
-					}
-				},
-				fail: (err) => {
-					this.$util.showToast({
-						title: "保存失败，请稍后重试"
-					});
-				}
-			});
-		},
-		// #endif
-		//售后保障查询
-		getService() {
-			this.$api.sendRequest({
-				url: '/api/goods/aftersale',
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.service = res.data;
-					}
-				}
-			});
-		},
-
-		// #ifdef MP-WEIXIN
-		/**
-		 *    将商品同步到微信圈子
-		 */
-		goodsSyncToGoodsCircle() {
-			this.$api.sendRequest({
-				url: '/goodscircle/api/goods/sync',
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.goodsCircle = true;
-					}
-				}
-			})
-		},
-		/**
-		 * 将商品推荐到微信圈子
-		 */
-		openBusinessView() {
-			if (wx.openBusinessView) {
-				wx.openBusinessView({
-					businessType: 'friendGoodsRecommend',
-					extraData: {
-						product: {
-							item_code: this.goodsSkuDetail.goods_id,
-							title: this.goodsSkuDetail.sku_name,
-							image_list: this.goodsSkuDetail.sku_images.map((ele) => {
-								return this.$util.img(ele);
-							})
-						}
-					},
-					success: function (res) {
-						console.log('success', res);
-					},
-					fail: function (res) {
-						console.log('fail', res);
-					}
-				})
-			}
-		},
-		// #endif
-		toEvaluateDetail(id) {
-			this.$util.redirectTo('/pages_tool/goods/evaluate', {
-				goods_id: id
-			});
-		},
-		showImg(e) {
-			//拿到图片的路径里面的内容放在我们数组中
-			let contentimg = e.target.dataset.nodes;
-			let arrImg = [];
-			for (var i = 0; i < contentimg.length; i++) {
-				var img = contentimg[i].children;
-				if (Array.isArray(img)) {
-					for (var j = 0; j < img.length; j++) {
-						if (img[j].attrs && img[j].name == "img") {
-							if (img[j].attrs.src) {
-								arrImg.push(img[j].attrs.src)
-							}
-						}
-					}
-				}
-			}
-			//最后一步就是把我们的所有图片放在预览的api中就可以了
-			uni.previewImage({
-				current: arrImg,
-				urls: arrImg,
-			})
-		},
-
-		//-------------------------------------社群-------------------------------------
-
-		//添加福利群
-		onCommunity() {
-			this.isCommunity = true
-		},
-		onCloseCommunity() {
-			this.isCommunity = false
-		},
-
-	}
-
-}

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

@@ -1,455 +0,0 @@
-<template>
-    <view>
-        <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
-            <view class="goods-container">
-                <!-- 弹幕 -->
-                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
-
-                <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
-                    <!-- 商品图片 -->
-                    <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
-                                <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
-                                </view>
-                            </swiper-item>
-                        </swiper>
-                        <view class="img-indicator-dots">
-                            <text>{{ swiperCurrent }}</text>
-                            <text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
-                        </view>
-                    </view>
-
-                    <!-- 商品视频 -->
-                    <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
-                    </view>
-
-                    <!-- 切换视频、图片 -->
-                    <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
-                    </view>
-                </view>
-
-                <!-- 价格区域 -->
-                <view class="goods-gression">
-                    <slot name="price"></slot>
-                </view>
-
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-
-                    <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
-                        <block v-if="deliveryType">
-                            <view class="box">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
-                                </block>
-                            </view>
-                            <text class="iconfont icon-right"></text>
-                        </block>
-                        <block v-else>
-                            <view class="box">未配置</view>
-                        </block>
-                    </view>
-
-                    <!-- 门店 -->
-               <!--     <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">
-                                <text class="icondiy icon-system-shop"></text>
-                                <text class="name">{{globalStoreInfo.store_name}}</text>
-                            </view>
-                            <view class="other-wrap">
-                                <text class="distance" v-if="parseFloat(globalStoreInfo.distance)">距离{{ globalStoreInfo.distance > 1 ? globalStoreInfo.distance + 'km' : globalStoreInfo.distance * 1000 + 'm' }}</text>
-                                <text class="decorate" v-if="parseFloat(globalStoreInfo.distance)">.</text>
-                                <view class="address">{{ globalStoreInfo.full_address + globalStoreInfo.address }}
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view> -->
-
-                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
-                        <view class="label">服务</view>
-                        <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
-                                <view class="item-wrap-box">
-                                    <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <text>{{ item.service_name }}</text>
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-		
-                </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-                    <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        <view class="list-wrap" style="display: flex;">
-                            <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                            </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-                </view>
-
-                <!-- 配送方式 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="deliveryType" type="bottom">
-                        <view class="deliverytype-popup-layer popup-layer">
-                            <view class="head-wrap" @click="$refs.deliveryType.close()">
-                                <text>配送</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y class="type-body">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
-                                        <text class="iconfont" :class="item.icon"></text>
-                                        <view class="content">
-                                            <view class="title">{{ item.name }}</view>
-                                            <view class="desc">{{ item.desc }}</view>
-                                        </view>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 商品服务 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="merchantsServicePopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer">
-                            <view class="head-wrap" @click="closeMerchantsServicePopup()">
-                                <text>商品服务</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <view class="info-wrap">
-                                        <text class="title">{{ item.service_name }}</text>
-                                        <text class="describe" v-if="item.desc">{{ item.desc }}</text>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                            <view class="button-box">
-                                <button type="primary" @click="closeMerchantsServicePopup()">确定</button>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 门店列表 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="storeListPopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
-                            <view class="head-wrap" @click="closeStoreListPopup()">
-                                <text>门店列表</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
-                                        <view class="item-box">
-                                            <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else/>
-                                            </view>
-                                            <view class="item-info">
-                                                <view class="item-title">
-                                                    <text class="title">{{ item.store_name }}</text>
-                                                    <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
-                                                    </text>
-                                                </view>
-                                                <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
-                                                </view>
-                                                <view class="item-address">{{ item.full_address + item.address }}</view>
-                                            </view>
-                                            <view class="item-right"><text class="iconfont icon-right"></text></view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 业务区域 -->
-                <slot name="business"></slot>
-
-                <view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
-                    <view class="community-box">
-                        <image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
-                        <view class="community-content">
-                            <view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
-                            <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
-                        </view>
-                    </view>
-                    <view class="community-btn" @click="onCommunity()">添加</view>
-                </view>
-
-                <!-- 促销 -->
-            <!--    <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>
-                        </view>
-                        <view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
-                            <image :src="goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1 ? $util.img(goodsSkuDetail.qr_data.qr_img) : $util.img('public/uniapp/goods/detail_erweiImage.png') " mode="aspectFill" show-menu-by-longpress="true"/>
-                        </view>
-                        <view class="community-model-content-text">长按识别二维码，添加社群</view>
-                    </view>
-                    <view class="community-model-close" @click.stop="onCloseCommunity()">
-                        <text class="iconfont icon-close"></text>
-                    </view>
-                </view> -->
-
-                <!-- 参与流程 -->
-                <slot name="articipation"></slot>
-
-                <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
-                    <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
-                        <view class="tit">
-                            <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
-                            <view>
-                                <text class="color-title font-size-base">
-                                    评价
-                                    <text class="font-size-base">({{ evaluateCount }})</text>
-                                </text>
-                                <text class="evaluate-item-empty" v-if="!evaluateCount">暂无评价</text>
-                                <view class="evaluate-item-empty" v-else>
-                                    <text class="font-size-tag">查看全部</text>
-                                    <text class="iconfont icon-right font-size-tag"></text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index"
-                            v-if="item.content">
-                            <view class="evaluator">
-                                <view class="evaluator-info">
-                                    <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                    </view>
-                                    <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
-                                        </text>
-                                        <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-                                        <view v-if="item.scores" class="evaluator-xing">
-                                            <xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
-                                        </view>
-                                    </view>
-                                </view>
-                                <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
-                            </view>
-                            <view class="cont margin-top">{{ item.content }}</view>
-                            <scroll-view scroll-x="true">
-                                <view class="evaluate-img" v-if="item.images">
-                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-                                        <image :src="$util.img(img)" mode="aspectFill" />
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </view>
-                </view>
-				
-                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
-                    <view class="title">规格属性</view>
-                    <view class="attr-wrap">
-                        <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
-                            <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
-                                <text class="attr-name">{{ item.attr_name }}</text>
-                                <text class="value-name">{{ item.attr_value_name }}</text>
-                            </view>
-                        </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
-                            <block v-if="!goodsAttrShow">
-                                展开<text class="iconfont icon-iconangledown"></text>
-                            </block>
-                            <block v-else>
-                                收起<text class="iconfont icon-iconangledown-copy"></text>
-                            </block>
-                        </view>
-                    </view>
-                </view>
-
-				
-
-                <!-- 详情 -->
-                <view class="goods-detail-tab">
-                    <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
-                    </view>
-                    <view class="detail-content active">
-                        <view class="detail-content-item">
-                            <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
-                            </view>
-                            <view class="goods-details active" v-else></view>
-                            <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 商品推荐 -->
-                <ns-goods-recommend ref="goodrecommend" route="goods_detail"></ns-goods-recommend>
-
-                <ns-copyright></ns-copyright>
-
-                <!-- 海报 -->
-                <view @touchmove.prevent.stop class="poster-layer">
-                    <uni-popup ref="posterPopup" type="center">
-                        <template v-if="poster != '-1'">
-                            <view class="poster-wrap">
-                                <view class="image-wrap">
-                                    <image :src="$util.img(poster)" :show-menu-by-longpress="true" mode="widthFix" />
-                                    <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
-                                </view>
-                                <!-- #ifdef MP || APP-PLUS  -->
-                                <view class="save-btn" @click="saveGoodsPoster()">保存图片</view>
-                                <!-- #endif -->
-                                <!-- #ifdef H5 -->
-                                <view class="save-btn">长按图片进行保存</view>
-                                <!-- #endif -->
-                            </view>
-                        </template>
-                    </uni-popup>
-                </view>
-
-                <!-- 分享弹窗 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="sharePopup" type="bottom" class="share-popup">
-                        <view>
-                            <view class="share-title">分享</view>
-                            <view class="share-content">
-                                <!-- #ifdef MP -->
-                                <view class="share-box">
-                                    <button class="share-btn" :plain="true" open-type="share">
-                                        <view class="iconfont icon-share-friend"></view>
-                                        <text>分享给好友</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <!-- #ifdef MP-WEIXIN -->
-                                <view class="share-box" v-if="goodsCircle">
-                                    <button class="share-btn" :plain="true" @click="openBusinessView">
-                                        <view class="iconfont icon-haowuquan"></view>
-                                        <text>分享到好物圈</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <view class="share-box" @click="openPosterPopup">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-pengyouquan"></view>
-                                        <text>生成分享海报</text>
-                                    </button>
-                                </view>
-                                <!-- #ifdef H5 -->
-                                <view class="share-box" @click="copyUrl">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-fuzhilianjie"></view>
-                                        <text>复制链接</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-                            </view>
-                            <view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <slot name="fixedbtn"></slot>
-            </view>
-        </view>
-
-        <!-- 操作区域 -->
-        <slot name="action"></slot>
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-        <ns-login ref="login"></ns-login>
-    </view>
-</template>
-
-<script>
-    // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    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';
-
-    export default {
-        name: 'goods-detail-view',
-        props: {
-            goodsSkuDetail: {
-                type: Object,
-                default: () => {
-                    return {};
-                }
-            }
-        },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
-        mixins: [scroll, detail]
-    };
-</script>
-
-<style lang="scss">
-    @import '@/common/css/goods_detail.scss';
-</style>
-<style scoped></style>

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

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

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

@@ -1,146 +0,0 @@
-<template>
-	<view>
-		<block v-if="text == '客服' || text == 'Contact'">
-		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
-				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
-					<view class="iconfont color-title" :class="icon"></view>
-					<text>{{ text }}</text>
-					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
-				</button>
-			<!-- </ns-contact> -->
-		</block>
-		<block v-else>
-			<view class="action-icon-wrap" @click="clickEvent">
-				<view class="iconfont " :class="icon"></view>
-				<text>{{ text }}</text>
-				<view class="corner-mark color-base-bg" :class="{'max' : parseInt(cornerMark)>99}" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark > 99 ? '99+' : cornerMark }}</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
-export default {
-	name: 'ns-goods-action-icon',
-	props: {
-		// 商品底部icon导航icon图标
-		icon: {
-			type: String,
-			default: ''
-		},
-		// 商品底部icon导航文字
-		text: {
-			type: String,
-			default: ''
-		},
-		// 角标文字
-		cornerMark: {
-			type: String,
-			default: ''
-		},
-		// 角标背景色
-		cornerMarkBg: {
-			type: String,
-			default: ''
-		},
-		// 角标文字颜色
-		cornerMarkColor: {
-			type: String,
-			default: '#fff'
-		},
-		// 开放能力
-		openType: {
-			type: String,
-			default: ''
-		},
-		// 发送内容 openType="contact"时有效
-		sendData: {
-			type: Object,
-			default: function() {
-				return {
-					title: '',
-					path: '',
-					img: ''
-				};
-			}
-		},
-		chatParam: {
-			type: Object,
-			default: function(){
-				return {}
-			}
-		}
-	},
-	components:{
-		nsContact
-	},
-	methods: {
-		clickEvent() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.action-icon-wrap {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100rpx;
-	min-width: 90rpx;
-	text-align: center;
-	position: relative;
-	margin-right: 6rpx;
-}
-.action-icon-wrap button {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	border: none;
-	z-index: 1;
-	padding: 0;
-	margin: 0;
-	background: none;
-	top: 0;
-	left: 0;
-	opacity: 0;
-}
-
-.action-icon-wrap button::after {
-	border: none !important;
-}
-
-.action-icon-wrap .iconfont {
-	margin: 0 auto 10rpx;
-	line-height: 1;
-	font-size: 40rpx;
-}
-
-.action-icon-wrap .corner-mark {
-	position: absolute;
-	z-index: 99;
-	font-size: $font-size-activity-tag;
-	top: 4rpx;
-	right: 12rpx;
-	color: #fff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 24rpx;
-	height: 24rpx;
-	padding: 6rpx;
-	border-radius: 50%;
-	&.max{
-		right:-4rpx;
-		width: 40rpx;
-		border-radius: 24rpx;
-	}
-}
-
-.action-icon-wrap text {
-	font-size: $font-size-tag;
-	line-height: 1;
-}
-</style>

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

@@ -1,33 +0,0 @@
-<template>
-	<view class="ns-goods-action bottom-safe-area" :class="{ 'bottom-safe-area': safeArea }"><slot></slot></view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-action',
-	props: {
-		safeArea: {
-			type: Boolean,
-			default: false
-		}
-	}
-};
-</script>
-
-<style>
-.ns-goods-action {
-	position: fixed;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	z-index: 9;
-}
-.ns-goods-action.bottom-safe-area {
-	padding-bottom: 0;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-}
-</style>

pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue

@@ -1,125 +0,0 @@
-<template>
-	<!-- 当前商品参与的营销活动入口 -->
-	<view class="ns-goods-promotion" v-if="goodsPromotion.length">
-		<view v-for="(item, index) in goodsPromotion" v-if="promotion != item.promotion_type" :key="index">
-			<view v-if="item.promotion_type == 'discount'" class="item" @click="redirectTo('/pages_goods/detail', { goods_id: item.goods_id })">
-				<text class="promotion-mark ">限时折扣</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { groupbuy_id: item.groupbuy_id })">
-				<!-- <view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { id: item.groupbuy_id })"> -->
-				<text class="promotion-mark ">团购</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pintuan'" class="item" @click="redirectTo('/pages_promotion/pintuan/detail', { pintuan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'seckill'" class="item" @click="redirectTo('/pages_promotion/seckill/detail', { seckill_id: item.id })">
-				<text class="promotion-mark ">秒杀</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'topic'" class="item" @click="redirectTo('/pages_promotion/topics/goods_detail', { id: item.id })">
-				<text class="promotion-mark ">专题活动</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'bargain'" class="item" @click="redirectTo('/pages_promotion/bargain/detail', { b_id: item.bargain_id })">
-				<text class="promotion-mark ">砍价</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pinfan'" class="item" @click="redirectTo('/pages_promotion/pinfan/detail', { pinfan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团返利</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-promotion',
-	props: {
-		promotion: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			goodsPromotion: {
-				type: Array
-			}
-		};
-	},
-	created() {},
-	methods: {
-		refresh(goodsPromotion) {
-			this.goodsPromotion = goodsPromotion;
-		},
-		redirectTo(path, param) {
-			this.$util.redirectTo(path, param);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.ns-goods-promotion {
-	background-color: #fff;
-	& > view {
-	}
-	.item {
-		display: flex;
-		font-size: $font-size-base;
-		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid $color-line;
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.promotion-mark {
-			padding: 12rpx 14rpx;
-			margin-right: 16rpx;
-			line-height: 1;
-			color: var(--main-color);
-			border-radius: 6rpx;
-			font-size: $font-size-tag;
-			font-weight: bold;
-			background-color: var(--main-color-shallow);
-		}
-
-		.title {
-			flex: 1;
-			line-height: 1;
-		}
-
-		.iconfont {
-			color: $color-tip;
-			font-size: $font-size-base;
-		}
-
-		.img-wrap {
-			width: 38rpx;
-			height: 38rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-</style>

pages_goods/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="themeColor">
-	<view>
 		<!-- #ifndef H5 -->
 	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
 			<ns-navbar :data="navbarData" :isBack="true"></ns-navbar>
@@ -514,50 +513,17 @@
 		<ns-login ref="login"></ns-login>
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- #ifdef MP-WEIXIN -->
+		<!-- 隐私弹窗 -->
-		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-import nsGoodsAction from '@/pages_goods/components/ns-goods-action/ns-goods-action.vue';
-	import nsGoodsActionIcon from '@/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue';
-	import nsGoodsActionButton from '@/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
 import detail from './public/js/detail.js';
 import scroll from '@/common/js/scroll-view.js';
-import toTop from '@/components/toTop/toTop.vue';
-import nsGoodsPromotion from '@/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue';
 import goodsDetailBase from '@/common/js/goods_detail_base.js';
-import goodsDetailView from '@/pages_goods/components/goods-detail-view/goods-detail-view.vue';
-// 按需引入全局组件
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 
 export default {
-	components: {
-			nsGoodsAction,
-			nsGoodsActionIcon,
-			nsGoodsActionButton,
-			uniPopup,
-			nsGoodsSku,
-			uniCountDown,
-			nsGoodsPromotion,
-			goodsDetailView,
-			toTop,
-			nsLogin,
-			loadingCover,
-			// #ifdef MP-WEIXIN
-			privacyPopup,
-			// #endif
-		},
 	mixins: [goodsDetailBase, detail, scroll]
 };
 </script>

pages_goods/list.vue

@@ -1,35 +1,43 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
+	<view class="content" :style="themeColor">
-	<view class="content"> 
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap">
-					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
+						:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
+					@click="changeListStyle()"></view>
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
-					<text :class="{ 'color-base-text': orderType === '' }">{{langstatus?$lang('Random'):'综合'}}</text>
+					@click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
 				</view>
 
-				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">{{langstatus?$lang('Sales'):'销量'}}
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">
+					{{ langstatus ? $lang('Sales') : '销量' }}
 				</view>
 
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
-					<text :class="{ 'color-base-text': orderType === 'discount_price' }">{{langstatus?$lang('Price'):'价格'}}</text>
+					<text
+						:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : '价格' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
 				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">{{langstatus?$lang('Filter'):'筛选'}}</text>
+					<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : '筛选' }}</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
@@ -40,18 +48,21 @@
 		<mescroll-uni top="180" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.goods_stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+								<view class="goods-name"
-									
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -59,15 +70,18 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								
+
-								
+
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -80,34 +94,35 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
+										borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
+										borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
@@ -115,11 +130,12 @@
 
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
+										color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -128,29 +144,35 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
-						
+
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -161,48 +183,50 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 							</view>
-							<view class="pro-info"  v-if="item.isinformation == 0">
+							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap" >
+								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
+										borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
+										borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
+										color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -220,7 +244,7 @@
 			<view class="title color-tip">筛选</view>
 			<scroll-view scroll-y>
 				<!-- 包邮 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>是否包邮</text></view>
 					<view class="list">
 						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
@@ -228,7 +252,7 @@
 				</view> -->
 
 				<!-- 价格筛选项 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>价格区间(元)</text></view>
 					<view class="price-wrap">
 						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
@@ -238,7 +262,7 @@
 				</view> -->
 
 				<!-- 品牌筛选项 -->
-		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+				<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
 					<view class="label"><text>品牌</text></view>
 					<view class="list">
 						<view v-for="(item, index) in brandList" :key="index">
@@ -254,8 +278,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -267,53 +294,36 @@
 		</uni-drawer>
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- #ifdef MP-WEIXIN -->
+		<!-- 隐私弹窗 -->
-		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar">
+			<diy-bottom-nav></diy-bottom-nav>
+		</view>
 	</view>
 </template>
 
 <script>
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
+import list from './public/js/list.js';
-	import uniTag from '@/components/uni-tag/uni-tag.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
-	import list from './public/js/list.js';
 
-	export default {
+export default {
-		components: {
+	data() {
-		uniDrawer,
+		return {};
-		uniTag,
-		nsGoodsSkuIndex,
-		nsEmpty,
-		MescrollUni,
-		loadingCover,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
 	},
-		data() {
+	mixins: [list]
-			return {};
+};
-		},
-		mixins: [list]
-	};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+>>>.uni-tag--primary.uni-tag--inverted {
-		background-color: #f5f5f5 !important;
+	background-color: #f5f5f5 !important;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
+	max-height: unset !important;
-	}
+}
 </style>