chore(build): update vue.config.js

.local.config.js

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

App.vue

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

common/js/config-external.js

@@ -14,7 +14,7 @@ export const langConfig = {
 // 主题配置
 export const themeConfig = {
   // 主题列表
-  themeList: ['default', 'red', 'green', 'blue', 'pink', 'gold', 'purple', 'yellow', 'black'],
+  themeList: ['default', 'red', 'green', 'blue'],
   // 默认主题
   defaultTheme: 'default'
 };
@@ -98,6 +98,28 @@ class ConfigExternal {
     return this.loadPromises[key];
   }
 
+  /**
+   * 加载主题配置（同步方式）
+   * @param {string} theme - 主题名称
+   * @returns {object} - 主题配置
+   */
+  loadThemeSync(theme = themeConfig.defaultTheme) {
+    if (this.loadedConfigs[`theme_${theme}`]) {
+      return this.loadedConfigs[`theme_${theme}`];
+    }
+
+    try {
+      // 动态加载主题配置
+      const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+      console.log('sync themeData => ', themeData);
+      this.loadedConfigs[`theme_${theme}`] = themeData;
+      return themeData;
+    } catch (error) {
+      console.error(`加载主题 ${theme} 失败:`, error);
+      return {};
+    }
+  }
+
   /**
    * 加载主题配置（异步方式）
    * @param {string} theme - 主题名称

common/js/config.js

@@ -43,21 +43,19 @@ let localDevConfig = { uniacid: 0, domain: defaultDomain };
 
 // #ifndef PRODUCTION
 // 尝试动态加载本地配置文件
-if (process?.env?.NODE_ENV === 'development') {
-    try {
-        // 尝试从项目根目录加载本地配置文件
-        // 使用相对路径的方式，确保在不同平台下都能正确解析
-        let customConfig = require('@/.local.config.js').default;
-        if (customConfig) {
-            localDevConfig = customConfig;
-        }
-    } catch (e) {
-        // 如果本地配置文件不存在或加载失败，保持使用默认配置
-        // 只在开发模式下输出提示信息
-        // #ifdef WEB
-        console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
-        // #endif
+try {
+    // 尝试从项目根目录加载本地配置文件
+    // 使用相对路径的方式，确保在不同平台下都能正确解析
+    let customConfig = require('@/.local.config.js').default;
+    if (customConfig) {
+        localDevConfig = customConfig;
     }
+} catch (e) {
+    // 如果本地配置文件不存在或加载失败，保持使用默认配置
+    // 只在开发模式下输出提示信息
+    // #ifdef WEB
+    console.log('本地配置文件 .local.config.js 不存在，使用默认配置');
+    // #endif
 }
 // #endif
 

common/js/diy.js

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

common/js/lang.js

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

common/js/map/openMap.js

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

common/js/navigation.js

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

common/js/style_color.js

@@ -1,12 +1,3 @@
-/**
- * 颜色配置
- * 包含默认颜色和其他颜色
- * 特别注意：
- * 1. 分组不会被计算成Key，分组下的属性会被计算成Key
- * 2. 分组下的属性如果有相同的Key，会被覆盖
- * 3. 例如：hoverNav，hoverNav_bg_color和hoverNav_text_color, 不会生成hoverNav_hoverNav_bg_color和hoverNav_hoverNav_text_color
- * 问题原因：历史遗留
- */
 export default {
 	'default': {
 		//红色
@@ -20,7 +11,7 @@ export default {
 		main_color_shallow: '#FFF4F4',//淡背景
 		price_color: 'rgb(252,82,39)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgb(252,82,39,1)',//价格
 			promotion_tag: '#FF4646',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -31,39 +22,35 @@ export default {
 			goods_btn_color: '#FF4646',//按钮颜色
 			goods_btn_color_shallow: '#F7B500',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC'
-			hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000'
-		},
 	},
 	'green': {
 		name: 'green',
@@ -76,7 +63,7 @@ export default {
 		main_color_shallow: '#F0FFF5',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#19C650',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -87,39 +74,35 @@ export default {
 			goods_btn_color: '#19C650',//按钮颜色
 			goods_btn_color_shallow: '#FA6400',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#19C650',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	},
 	'blue': {
 		name: 'blue',
@@ -132,7 +115,7 @@ export default {
 		main_color_shallow: '#E2F3FF',
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#36ABFF',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -143,39 +126,35 @@ export default {
 			goods_btn_color: '#36ABFF',//按钮颜色
 			goods_btn_color_shallow: '#FA6400',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#36ABFF',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	},
 	'pink': {
 		name: 'pink',
@@ -188,7 +167,7 @@ export default {
 		main_color_shallow: '#FFF5F8',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#FF407E',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -199,39 +178,35 @@ export default {
 			goods_btn_color: '#FF407E',//按钮颜色
 			goods_btn_color_shallow: '#F7B500',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#FF407E',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	},
 	'gold': {
 		name: 'gold',
@@ -244,7 +219,7 @@ export default {
 		main_color_shallow: '#FFFAF1',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#CFAF70',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -255,39 +230,35 @@ export default {
 			goods_btn_color: '#CFAF70',//按钮颜色
 			goods_btn_color_shallow: '#444444',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#CFAF70',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	},
 	'purple': {
 		name: 'purple',
@@ -300,7 +271,7 @@ export default {
 		main_color_shallow: '#F8F3FF',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#A253FF',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -311,39 +282,35 @@ export default {
 			goods_btn_color: '#A253FF',//按钮颜色
 			goods_btn_color_shallow: '#222222',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#A253FF',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	},
 	'yellow': {
 		name: 'yellow',
@@ -356,7 +323,7 @@ export default {
 		main_color_shallow: '#FFFBEF',//淡背景
 		price_color: 'rgba(252,82,39,1)',//价格颜色
 		btn_text_color: '#303133',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(252,82,39,1)',//价格
 			promotion_tag: '#FFD009',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -367,39 +334,35 @@ export default {
 			goods_btn_color: '#FFD009',//按钮颜色
 			goods_btn_color_shallow: '#1D262E',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#7c7878',
 			super_member_end_bg: '#201a18',
 			super_member_start_text_color: '#FFDBA6',
 			super_member_end_text_color: '#FFEBCA',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#FFD009',//背景色
-			hover_nav_text_color: '#303133'
-		},
 	},
 	'black': {
 		name: 'black',
@@ -412,7 +375,7 @@ export default {
 		main_color_shallow: '#efefef',//淡背景
 		price_color: 'rgba(255,0,0,1)',//价格颜色
 		btn_text_color: '#FFFFFF',//按钮文字颜色
-		...{
+		goods_detail: {
 			goods_price: 'rgba(255,0,0,1)',//价格
 			promotion_tag: '#222222',
 			goods_card_bg: '#201A18',//会员卡背景
@@ -423,38 +386,34 @@ export default {
 			goods_btn_color: '#222222',//按钮颜色
 			goods_btn_color_shallow: '#FA8B00',//副按钮颜色
 		},
-		...{
+		pintuan: {
 			pintuan_label_bg: '#F7B500',
 			pintuan_label_color: '#FFFFFF',
 			pintuan_color: '#FA6400',
 			pintuan_promotion_color: '#FA3A1D',//活动背景
 			pintuan_promotion_aux_color: '#FD9A01',//活动背景辅色
 		},
-		...{
+		super_member: {
 			super_member_start_bg: '#fadcb5',
 			super_member_end_bg: '#f6bd74',
 			super_member_start_text_color: '#ab6126',
 			super_member_end_text_color: '#d19336',
 		},
-		...{
+		bargain: {
 			bargain_promotion_color: '#F0353E',//活动背景
 			bargain_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		seckill: {
 			seckill_promotion_color: '#F83530',//活动背景
 			seckill_promotion_aux_color: '#FD9A01',//活动辅色
 		},
-		...{
+		giftcard: {
 			giftcard_promotion_color: '#FF3369',//活动背景
 			giftcard_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
+		groupby: {
 			groupby_promotion_color: '#E64136',//活动背景
 			groupby_promotion_aux_color: '#F7B500',//活动辅色
 		},
-		...{
-			hover_nav_bg_color: '#222222',//背景色
-			hover_nav_text_color: '#FFFFFF'
-		},
 	}
 }

common/js/util.js

@@ -32,28 +32,10 @@ export const adaptSubpackageUrl = (url) => {
 	 */
 	// 定义前缀映射表
 	const urlPrefixMap = {
-		'/pages/promotion/': '/pages_promotion/',
-		'/pages/order/': '/pages_order/',
 		'/pages/goods/': '/pages_goods/',
-
 		'/pages/contact/': '/pages_tool/contact/',
 		'/pages/member/': '/pages_tool/member/',
-		'/pages/login/': '/pages_tool/login/',
-		'/pages/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/',
+		'/pages/vr': '/pages_tool/vr/'
 	};
 
 	// 构建正则表达式
@@ -79,35 +61,6 @@ 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 {
 	/**
 	 * 页面跳转
@@ -138,7 +91,7 @@ export default {
 			const tabBarUrl = systemTabBarList[i];
 			if (url.indexOf(tabBarUrl) == 0) {
 				// 首页特殊处理，采用switchTab, 其他页面采用redirectTo, 不能返回，不能退回
-				(tabBarUrl == INDEX_PAGE_URL ? uni.switchTab : uni.redirectTo)({ url });
+				(tabBarUrl == INDEX_PAGE_URL ? uni.switchTab : uni.redirectTo)({url});
 				return;
 			}
 		}
@@ -177,6 +130,8 @@ export default {
 	 * @param {Object} params 参数，针对商品、相册里面的图片区分大中小，size: big、mid、small
 	 */
 	img(img_path, params) {
+
+
 		var path = "";
 		if (img_path != undefined && img_path != "") {
 			if (img_path.split(',').length > 1) {
@@ -536,7 +491,7 @@ export default {
 	 * 检测苹果X以上的手机
 	 */
 	isIPhoneX() {
-		let res = this.getDeviceInfo();
+		let res = uni.getSystemInfoSync();
 		if (res.model.search('iPhone X') != -1) {
 			return true;
 		}
@@ -544,33 +499,13 @@ export default {
 	},
 	//判断安卓还是iOS
 	isAndroid() {
-		let platform = this.getDeviceInfo().platform;
+		let platform = uni.getSystemInfoSync().platform
 		if (platform == 'ios') {
 			return false;
 		} else if (platform == 'android') {
 			return true;
 		}
 	},
-	/**
-	 * 获取设备信息（包含降级处理）
-	 */
-	getDeviceInfo() {
-		try {
-			return uni.getDeviceInfo();
-		} catch (e) {
-			return uni.getSystemInfoSync();
-		}
-	},
-	/**
-	 * 获取窗口信息（包含降级处理）
-	 */
-	getWindowInfo() {
-		try {
-			return uni.getWindowInfo();
-		} catch (e) {
-			return uni.getSystemInfoSync();
-		}
-	},
 	/**
 	 * 深度拷贝对象
 	 * @param {Object} obj
@@ -715,7 +650,7 @@ export default {
 	 */
 	uniappIsIPhoneX() {
 		let isIphoneX = false;
-		let systemInfo = this.getDeviceInfo();
+		let systemInfo = uni.getSystemInfoSync();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone X') != -1 || systemInfo.model.search('iPhone 11') != -1 || systemInfo.model.search('iPhone 12') != -1 || systemInfo.model.search('iPhone 13') != -1) {
 			isIphoneX = true;
@@ -742,7 +677,7 @@ export default {
 	 */
 	uniappIsIPhone11() {
 		let isIphone11 = false;
-		let systemInfo = this.getDeviceInfo();
+		let systemInfo = uni.getSystemInfoSync();
 		// #ifdef MP
 		if (systemInfo.model.search('iPhone 11') != -1) {
 			isIphone11 = true;
@@ -753,7 +688,7 @@ export default {
 	// #ifdef H5
 	//判断该浏览器是否为safaria浏览器
 	isSafari() {
-		let res = this.getDeviceInfo();
+		let res = uni.getSystemInfoSync();
 		var ua = navigator.userAgent.toLowerCase();
 		if (ua.indexOf('applewebkit') > -1 && ua.indexOf('mobile') > -1 && ua.indexOf('safari') > -1 &&
 			ua.indexOf('linux') === -1 && ua.indexOf('android') === -1 && ua.indexOf('chrome') === -1 &&

components-diy/diy-bottom-nav.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { adaptSubpackageUrl, checkTabBarActive } from '@/common/js/util.js'
+import { adaptSubpackageUrl } from '@/common/js/util.js'
 import DiyMinx from './minx.js'
 // 底部导航栏
 export default {
@@ -149,12 +149,23 @@ export default {
 				return true;
 			}
 
+			// console.log('diy-bottom-nav verify:', { likkUrl: adaptSubpackageUrl(linkUrl), currentPageRoute: currentPageRoute});
+
 			// 精确匹配当前路径
 			if (adaptSubpackageUrl(linkUrl) === currentPageRoute) {
 				return true;
 			}
 
-			return checkTabBarActive(linkUrl, currentPageRoute);
+			// 同属于一个子包的路径，也认为是匹配的
+			try {
+				if (adaptSubpackageUrl(linkUrl).split('/')[1] === currentPageRoute.split('/')[1]) {
+					return true;
+				}
+			} catch (error) {
+				console.error('diy-bottom-nav verify error:', error);
+			}
+
+			return false;
 		}
 	}
 };

components-diy/diy-category-item.vue

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

components-diy/diy-category.vue

@@ -161,11 +161,15 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 
+import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
 import DiyMinx from './minx.js'
 var contentWrapHeight, query, cartPosition;
 
 // 商品分类
 export default {
+	components: {
+		nsGoodsSkuCategory
+	},
 	name: 'diy-category',
 	props: {
 		value: {

components-diy/diy-digit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style="componentStyle" data-component-name="diy-digit">
+	<view :style="componentStyle">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
 			<view class="uni-scroll-view-content">
@@ -38,10 +38,16 @@
 </template>
 
 <script>
+import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
+import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 // 自定义数字展示
 export default {
 	name: 'diy-digit',
+	components: {
+		uvCountTo,
+		nsLogin
+	},
 	props: {
 		value: {
 			type: Object,

components-diy/diy-goods-brand.vue

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

components-diy/diy-goods-list.vue

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

components-diy/diy-image-nav.vue

@@ -38,11 +38,14 @@
 </template>
 
 <script>
-
+import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
+	components: {
+		nsLogin
+	},
 	props: {
 		value: {
 			type: Object,

components-diy/diy-index-page.vue

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

components-diy/diy-listmenu.vue

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

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,6 +259,9 @@ 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;
-					this.$util.diyRedirectTo(link);
+					$util.diyRedirectTo(link);
 				}
 			})
 		}

components-diy/diy-video-list.vue

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

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

@@ -357,10 +357,14 @@
   </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/common-payment/common-payment.vue

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

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

@@ -420,7 +420,12 @@
 
 <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 {
@@ -433,6 +438,13 @@
                 }
             }
         },
+        components: {
+            uniPopup,
+            nsGoodsRecommend,
+            pengpaiFadeinOut,
+            toTop,
+            xiaoStarComponent
+        },
         mixins: [scroll, detail]
     };
 </script>

components/hover-nav/hover-nav.vue

@@ -81,6 +81,7 @@ export default {
 				this.isLanguageSwitchEnabled = e.data.ischina;
 			}
 		})
+
 	},
 	computed: {
 		currentLangDisplayName() {
@@ -181,6 +182,8 @@ 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;
@@ -199,8 +202,8 @@ export default {
 		line-height: 1;
 		margin: 14rpx 0;
 		transition: 0.1s;
-		background: var(--hover-nav-bg-color);
-		color: var(--hover-nav-text-color);
+		background: #c6251b;
+		color: #fff;
 		border-radius: 40rpx;
 		width: 80rpx;
 		height: 80rpx;

components/mescroll/mescroll-uni.vue

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

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

@@ -80,10 +80,14 @@
 </template>
 
 <script>
+	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	// 注册奖励弹出层
 	export default {
 		name: 'ns-birthday-gift',
+		components: {
+			uniPopup
+		},
 		data() {
 			return {
 				birthday: {

components/ns-form/ns-form.vue

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

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

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

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

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

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

@@ -2,233 +2,235 @@
 	<view class="goods-sku">
 		<ns-login ref="login"></ns-login>
 		<!-- sku选择 -->
-		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id"
-			: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>
-// 商品SKU
-export default {
-	name: 'ns-goods-sku-index',
-	data() {
-		return {
-			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);
-			}
+	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
+	// 商品SKU
+	export default {
+		name: 'ns-goods-sku-index',
+		components: {
+			nsGoodsSku
 		},
-		/**
-		 * 单规格
-		 * @param {Object} data 商品项
-		 */
-		singleSpecificationGoods(data, event) {
-			let cart =
-				this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
-					.sku_id
-				] ?
+		data() {
+			return {
+				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);
+				}
+			},
+			/**
+			 * 单规格
+			 * @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) {
-				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
-			} else {
-
-				// 如果商品第一次添加，则初始化数据
-				if (!this.cartList['goods_' + data.goods_id]) {
-					this.cartList['goods_' + data.goods_id] = {};
+				let 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;
 				}
 
-				let discount_price = data.discount_price;
-				if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
-					discount_price = data.member_price;
-				}
+				if (cart) {
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+				} else {
 
-				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
-						});
+					// 如果商品第一次添加，则初始化数据
+					if (!this.cartList['goods_' + data.goods_id]) {
+						this.cartList['goods_' + data.goods_id] = {};
 					}
+
+					let discount_price = data.discount_price;
+					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+						discount_price = data.member_price;
+					}
+
+					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+						cart_id,
+						goods_id: data.goods_id,
+						sku_id: data.sku_id,
+						num: _num,
+						discount_price
+					};
 				}
-			});
-		},
-		/**
-		 * 多规格
-		 * @param {Object} data 商品项
-		 */
-		multiSpecificationGoods(data) {
-			this.$api.sendRequest({
-				url: '/api/goodssku/getInfoForCategory',
-				data: {
-					sku_id: data.sku_id
-				},
-				success: res => {
-					if (res.code >= 0) {
-						let item = res.data;
-						item.unit = item.unit || '件';
 
-						if (item.sku_images) item.sku_images = item.sku_images.split(',');
-						else item.sku_images = [];
+				if (this.isRepeat) return;
+				this.isRepeat = true;
 
-						// 多规格时合并主图
-						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);
+				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
+							});
 						}
+					}
+				});
+			},
+			/**
+			 * 多规格
+			 * @param {Object} data 商品项
+			 */
+			multiSpecificationGoods(data) {
+				this.$api.sendRequest({
+					url: '/api/goodssku/getInfoForCategory',
+					data: {
+						sku_id: data.sku_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							let item = res.data;
+							item.unit = item.unit || '件';
 
-						// 当前商品SKU规格
-						if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+							if (item.sku_images) item.sku_images = item.sku_images.split(',');
+							else item.sku_images = [];
 
-						// 商品SKU格式
-						if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+							// 多规格时合并主图
+							if (item.goods_spec_format && item.goods_image) {
+								item.goods_image = item.goods_image.split(',');
+								item.sku_images = item.goods_image.concat(item.sku_images);
+							}
 
-						// 限时折扣
-						if (item.promotion_type == 1) {
-							item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
-						}
+							// 当前商品SKU规格
+							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
 
-						if (item.promotion_type == 1 && item.discountTimeMachine) {
-							if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
+							// 商品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.discount_price;
+								}
+							} else if (item.member_price > 0) {
 								item.show_price = item.member_price;
 							} else {
-								item.show_price = item.discount_price;
+								item.show_price = item.price;
 							}
-						} else if (item.member_price > 0) {
-							item.show_price = item.member_price;
-						} else {
-							item.show_price = item.price;
-						}
-						this.goodsDetail = item;
+							this.goodsDetail = item;
 
-						this.$nextTick(() => {
-							if (this.$refs.goodsSku) {
-								this.$refs.goodsSku.show("join_cart", (res) => {
+							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] = {};
+										let goods = this.cartList['goods_' + res.goods_id];
+										let cart = null;
+										if (goods && goods['sku_' + res.sku_id]) {
+											cart = goods['sku_' + res.sku_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
-										};
+										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.$store.dispatch('cartCalculate');
-									this.$emit("cartListChange", this.cartList);
+											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
+											};
 
-									// 加入购物车动效
-									setTimeout(() => {
-										this.$store.commit('setCartChange');
-									}, 100);
+										}
 
-								});
-							}
-						});
+										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-sku ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+		<uni-popup ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
 			<view class="sku-info" :style="{ height: skuHeight }">
 				<view class="header">
 					<block v-if="type == 'point' && goodsDetail.type && goodsDetail.type != 1">
@@ -208,15 +208,19 @@
 					<button type="primary" v-else disabled="true">该商品已下架</button>
 				</view>
 			</view>
-		</uni-popup-sku>
+		</uni-popup>
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
+	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
+		components: {
+			uniPopup
+		},
 		props: {
 			goodsId: {
 				type: [Number, String],
@@ -266,7 +270,7 @@
 		},
 		created() {
 			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			this.systemInfo = this.$util.getDeviceInfo();
+			this.systemInfo = uni.getSystemInfoSync();
 			this.isLoad = true;
 			if (this.goodsId && this.goodsDetail.goods_spec_format) {
 				this.skuId = this.goodsDetail.sku_id;

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

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

components/ns-newform/ns-newform.vue

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

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

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

components/payment/payment.vue

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

components/register-reward/register-reward.vue

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

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

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

components/wx-privacy-popup/privacy-popup.vue

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

docs/WECHAT_MINIPROGRAM_PERMISSIONS.md

@@ -1,199 +0,0 @@
-# 微信小程序权限配置文档
-
-## 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,10 +19,5 @@ 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,18 +1,4 @@
 export const lang = {
 	//title为每个页面的标题
-	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'
+	title: 'Electronic Card'
 }

lang/en-us/member/index.js

@@ -40,21 +40,9 @@ export const lang = {
 	myHongbao: 'My Red Envelopes',
 	myBlindBox: 'My Blind Boxes',
 	
-	waitpay: 'Waitpay',
-	waitsend: 'Waitsend',
-	waitconfirm: 'Waitconfirm',
-	activist: 'Activist',
-	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',
+	waitpay:'Waitpay',
+	waitsend:'Waitsend',
+	waitconfirm:'Waitconfirm',
+	activist:'Activist',
+	completed:'Completed',
 }

lang/zh-cn/common.js

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

lang/zh-cn/contact/contact.js

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

lang/zh-cn/goods/category.js

@@ -3,5 +3,5 @@ export const lang = {
 	title: '商品分类',
 	search:'商品搜索',
 	seeMore : '查看更多',
-	Make: "询底价"
+	Make: "询价"
 }

lang/zh-cn/goods/detail.js

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

@@ -6,6 +6,6 @@ export const lang = {
 	Price:'价格',
 	Filter:'筛选',
 	Search:'请输入您要搜索的商品',
-	Make:'立即询底价',
+	Make:'立即询价',
 	
 }

lang/zh-cn/member/index.js

@@ -32,11 +32,11 @@ export const lang = {
 	message: '我的消息',
 	exchangeOrder: '积分兑换',
 	
-	waitpay: '待付款',
-	waitsend: '待发货',
-	waitconfirm: '待收货',
-	activist: '售后',
-	completed: '已完成',
+	waitpay:'待付款',
+	waitsend:'待发货',
+	waitconfirm:'待收货',
+	activist:'售后',
+	completed:'已完成',
 	
 	// 推广中心
 	balance: '余额',
@@ -46,19 +46,9 @@ export const lang = {
 	myPresale: '我的预售',
 	myGiftcard: '我的礼品卡',
 	myDivideticket: '我的瓜分券',
-	myRebate: '拼团返利',
-	myHongbao: '我的红包列表',
-	myBlindBox: '我的盲盒',
+	myRebate:'拼团返利',
+	myHongbao:'我的红包列表',
+	myBlindBox:'我的盲盒',
 	
-	// 账户操作
-	logout: '退出登录',
-	cancellation: '账号注销',
-	logoutTitle: '提示',
-	logoutContent: '确定要退出登录吗',
-	cancellationTitle: '风险提示',
-	cancellationContent: '确定要注销当前账号吗？',
 	
-	// 协议
-	privacyPolicy: '隐私协议',
-	registrationAgreement: '注册协议',
 }

manifest.json

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

package-lock.json

@@ -1,15 +1,11 @@
 {
-  "name": "frontend",
+  "name": "uniappsaas",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "dependencies": {
-        "jweixin-module": "^1.6.0"
-      },
       "devDependencies": {
-        "terser-webpack-plugin": "^5.3.10",
-        "zion-uniapp-mp-load-package": "^1.0.13"
+        "terser-webpack-plugin": "^5.3.10"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -623,25 +619,6 @@
       "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",
@@ -1004,16 +981,6 @@
       "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": {
@@ -1489,17 +1456,6 @@
       "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",
@@ -1725,15 +1681,6 @@
       "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,8 +3,7 @@
     "mp-weixin": "node scripts/mp-weixin.patch.js"
   },
   "devDependencies": {
-    "terser-webpack-plugin": "^5.3.10",
-    "zion-uniapp-mp-load-package": "^1.0.13"
+    "terser-webpack-plugin": "^5.3.10"
   },
   "dependencies": {
     "jweixin-module": "^1.6.0"

pages.json

@@ -953,13 +953,6 @@
 	"easycom": {
 		"autoscan": true,
 		"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/index/index.vue

@@ -136,7 +136,7 @@
 					</view>
 				</uni-popup>
 			</view>
-			<hover-nav :need="true"></hover-nav>
+			<hover-nav></hover-nav>
 			<!-- #ifdef MP-WEIXIN -->
 			<!-- 小程序隐私协议 -->
 			<privacy-popup ref="privacyPopup"></privacy-popup>
@@ -148,13 +148,28 @@
 </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 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,7 @@
 <template>
 	<view :style="themeColor">
 		<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,67 +20,51 @@
 								<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>
-															<image :src="$util.img('public/uniapp/index/VIP.png')" />
+															<text class="unit price-style small">.{{ 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>
-															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0]
-															}}
-															<text class="unit price-style small">.{{
-																parseFloat(item.discount_price).toFixed(2).split('.')[1]
-															}}</text>
-															<image
-																:src="$util.img('public/uniapp/index/discount.png')" />
+															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
+															<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>
@@ -90,25 +73,19 @@
 												<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>
-															<image :src="$util.img('public/uniapp/index/VIP.png')" />
+															<text class="unit price-style small">.{{ 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>
@@ -123,16 +100,14 @@
 											<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>
@@ -149,8 +124,7 @@
 								<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>
@@ -160,32 +134,23 @@
 													<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">
-														<text class="unit price-style small">{{
-															$lang('common.currencySymbol') }}</text>
-														{{ 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 v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														{{ 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>
-														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0]
-														}}
-														<text class="unit price-style small">.{{
-															parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
-														}}</text>
+														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</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>
@@ -199,12 +164,8 @@
 				</block>
 				<block v-else>
 					<view class="cart-empty">
-						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"
-							: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>
-
+						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
+						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
 					</view>
 				</block>
 				<ns-goods-recommend ref="goodrecommend" route="cart"></ns-goods-recommend>
@@ -240,7 +201,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>
 
@@ -252,11 +213,9 @@
 					</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>
@@ -278,30 +237,24 @@
 								</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-else
-									@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" 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>
@@ -309,8 +262,7 @@
 
 		<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' }">
@@ -318,10 +270,8 @@
 					{{ $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="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
-						}}</text>
+						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</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>
@@ -338,20 +288,16 @@
 			</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 v-else>{{
-					$lang('settlement') }}({{
-						totalCount }})</button>
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled
+					v-else>{{ $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>
@@ -361,30 +307,52 @@
 
 		<ns-login ref="login"></ns-login>
 
-		<!-- 隐私弹窗 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-import scroll from '@/common/js/scroll-view.js';
-import cart from './public/js/cart.js';
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+	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 {
-	mixins: [scroll, cart]
-};
+	export default {
+		components: {
+		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 {
-	background: none;
-	max-height: unset !important;
-	overflow-y: hidden !important;
-}
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none;
+		max-height: unset !important;
+		overflow-y: hidden !important;
+	}
 
-/deep/ .uni-popup__wrapper {
-	border-radius: 20rpx 20rpx 0 0;
-}
+	/deep/ .uni-popup__wrapper {
+		border-radius: 20rpx 20rpx 0 0;
+	}
 
-@import './public/css/cart.scss';
+	@import './public/css/cart.scss';
 </style>

pages_goods/category.vue

@@ -12,8 +12,10 @@
 
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- 隐私弹窗 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
 
 		<!-- 底部tabBar -->
 		<view id="tab-bar">
@@ -23,7 +25,19 @@
 </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

@@ -0,0 +1,465 @@
+// 商品详情业务
+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

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

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

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

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

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

@@ -513,17 +513,50 @@
 		<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

@@ -4,40 +4,31 @@
 			<!-- 搜索区域 -->
 			<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('')">
-					<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @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 desc"
-							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
-						</view>
+						<view class="iconfont icon-iconangledown-copy asc" :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>
@@ -48,20 +39,17 @@
 		<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>
@@ -70,18 +58,15 @@
 							<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="unit price-style small">.{{
-										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{ 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">
@@ -94,35 +79,34 @@
 									<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 : '',
-										borderColor: config.theme == 'diy' ? config.textColor : ''
-									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+											color: 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"
 										@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 : '',
-										borderColor: config.theme == 'diy' ? config.textColor : ''
-									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+											color: 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"
 										@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 : '',
-										color: config.theme == 'diy' ? config.textColor : '',
-										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+											color: config.theme == 'diy' ? config.textColor : '',
+											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+										}" 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>
@@ -130,12 +114,11 @@
 
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-										color: config.theme == 'diy' ? config.textColor : ''
-									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+											color: config.theme == 'diy' ? config.textColor : ''
+										}" 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>
@@ -144,35 +127,29 @@
 				</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="unit price-style small">.{{
-										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{ 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">
@@ -183,37 +160,36 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 							</view>
-							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
-										? item.unit : '件' }}</view>
+							<view class="pro-info"  v-if="item.isinformation == 0">
+								<view class="block-wrap" >
+									<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 : '',
-										borderColor: config.theme == 'diy' ? config.textColor : ''
-									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+											color: 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"
 										@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 : '',
-										borderColor: config.theme == 'diy' ? config.textColor : ''
-									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+											color: 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"
 										@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 : '',
-										color: config.theme == 'diy' ? config.textColor : '',
-										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+											color: config.theme == 'diy' ? config.textColor : '',
+											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+										}" 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>
@@ -221,12 +197,11 @@
 						
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-										color: config.theme == 'diy' ? config.textColor : ''
-									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+											color: config.theme == 'diy' ? config.textColor : ''
+										}" 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>
@@ -244,7 +219,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" />
@@ -252,7 +227,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="最低价" />
@@ -262,7 +237,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">
@@ -278,11 +253,8 @@
 						<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">
-							<text
-								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
-									item.category_name }}</text>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :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>
@@ -294,8 +266,10 @@
 		</uni-drawer>
 		<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- 隐私弹窗 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
 
 		<!-- 底部tabBar -->
 		<view id="tab-bar">
@@ -305,25 +279,45 @@
 </template>
 
 <script>
-import list from './public/js/list.js';
+	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
+	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 {
-	data() {
-		return {};
+	export default {
+		components: {
+		uniDrawer,
+		uniTag,
+		nsGoodsSkuIndex,
+		nsEmpty,
+		MescrollUni,
+		loadingCover,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
-	mixins: [list]
-};
+		data() {
+			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 {
-	background-color: #f5f5f5 !important;
-}
+	>>>.uni-tag--primary.uni-tag--inverted {
+		background-color: #f5f5f5 !important;
+	}
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_goods/public/js/cart.js

@@ -1,7 +1,4 @@
-import common from './common.js';
-
 export default {
-	mixins: [common],
 	data() {
 		return {
 			cartData: [], // 购物车
@@ -447,6 +444,9 @@ export default {
 				// });
 			}
 		},
+		toLogin() {
+			this.$refs.login.open();
+		},
 		// 重置编辑状态
 		resetEditStatus() {
 			if (this.cartData.length) {

pages_goods/public/js/common.js

@@ -1,8 +0,0 @@
-export default {
-    methods: {
-        // 跳转至登录页
-		toLogin() {
-			this.$refs.login.open();
-		},
-    }
-}

pages_order/detail.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg"
-			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
 				<image :src="$util.img(action.icon)"></image>
 				<view class="status-name">
@@ -65,9 +64,9 @@
 						</view>
 						<view class="store-info-detail">
 							<view class="store-name" @click="
-								$util.redirectTo('/pages_tool/store/detail', {
-									store_id: orderData.delivery_store_id
-								})
+									$util.redirectTo('/pages_tool/store/detail', {
+										store_id: orderData.delivery_store_id
+									})
 								">
 								<text class="name font-size-base">{{ orderData.delivery_store_name }}</text>
 								<text class="iconfont icon-right font-size-base"></text>
@@ -109,11 +108,8 @@
 						<text class="copy" @click="$util.copy(orderData.delivery_code)">复制</text>
 					</view>
 					<view class="code">
-						<image :src="$util.img(orderData.pickup_barcode)"
-							@click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode"
-							mode="widthFix" />
-						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))"
-							class="qrcode" mode="widthFix" />
+						<image :src="$util.img(orderData.pickup_barcode)" @click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode" mode="widthFix"/>
+						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))" class="qrcode" mode="widthFix"/>
 					</view>
 				</view>
 			</view>
@@ -125,8 +121,7 @@
 				<view v-for="(goodsItem, goodsIndex) in orderData.order_goods" :key="goodsIndex" class="goods-item">
 					<view class="goods-wrap">
 						<view class="goods-img" @click="goDetail(goodsItem)">
-							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
-								@error="imageError(goodsIndex)" mode="aspectFill" />
+							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
 						</view>
 						<view class="goods-info" @click="goDetail(goodsItem)">
 							<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -134,18 +129,16 @@
 								<view class="goods-spec">
 									<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 										{{ x.spec_value_name }}
-										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }} </block>
+										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+									</block>
 								</view>
 							</view>
 							<view class="goods-sub-section">
 								<view>
 									<text class="goods-price ">
 										<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-										<text class="price-style large">{{
-											parseFloat(goodsItem.price).toFixed(2).split('.')[0]
-											}}</text>
-										<text class="unit price-style small">.{{
-											parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+										<text class="price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
 									</text>
 								</view>
 								<view>
@@ -159,10 +152,8 @@
 								次卡抵扣
 								<text class="goods-price ">
 									<text class="unit price-style small">-{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-style large">{{
-										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{
-										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
+									<text class="price-style large">{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
 								</text>
 							</view>
 						</view>
@@ -173,8 +164,7 @@
 							<text class="tit">{{ item.value.title }}：</text>
 							<view class="box img-box" v-if="item.controller == 'Img'">
 								<view class="img" v-for="(img, imgIndex) in item.img_lists" :key="imgIndex">
-									<image :src="$util.img(img)" mode="widthFix"
-										@click="previewMedia($util.img(img))" />
+									<image :src="$util.img(img)" mode="widthFix" @click="previewMedia($util.img(img))"/>
 								</view>
 							</view>
 							<view class="box" v-else>
@@ -186,15 +176,13 @@
 
 					<view class="goods-action">
 						<block v-if="orderData.is_enable_refund">
-							<view @click="goRefund(goodsItem.order_goods_id)"
-								v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
+							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
 								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">
 									{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
 								</view>
 							</view>
 						</block>
-						<view @click="goRefundDetail(goodsItem.order_goods_id)"
-							v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
+						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
 							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
 						</view>
 					</view>
@@ -327,12 +315,11 @@
 			<block v-if="orderData.goods_class == 5">
 				<view class="order-cell">
 					<text class="tit">我的卡包：</text>
-					<view class="box"><text class="color-base-text"
-							@click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
+					<view class="box"><text class="color-base-text" @click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
 				</view>
 			</block>
 			<!-- 联系客服 -->
-			<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
@@ -362,17 +349,14 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
-							}}次/共{{
-								orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
-							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
@@ -381,8 +365,7 @@
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
-						class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -443,17 +426,14 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
-							}}次/共{{
-								orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
-							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
@@ -462,8 +442,7 @@
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
-						class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -595,9 +574,7 @@
 			</view>
 
 			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0">
-				<view class="order-box-btn white"
-					v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1"
-					@click="operation('memberOrderEvaluation')">
+				<view class="order-box-btn white" v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1" @click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
 				</view>
@@ -611,8 +588,7 @@
 				</block>
 			</view>
 
-			<view class="order-action fixed-bottom bottom-safe-area"
-				v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
+			<view class="order-action fixed-bottom bottom-safe-area" v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
 				<view class="order-box-btn white" @click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
@@ -621,8 +597,7 @@
 		</view>
 
 		<!-- 订单 -->
-		<view class="fixed-bottom-box bottom-safe-area"
-			v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
+		<view class="fixed-bottom-box bottom-safe-area" v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
 		</view>
 
 		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
@@ -633,209 +608,216 @@
 </template>
 
 <script>
-import orderMethod from './public/js/orderMethod.js';
-export default {
-	data() {
-		return {
-			isIphoneX: false,
-			orderId: 0,
-			merchantTradeNo: '',
-			orderData: {
-				action: [],
-				virtual_goods: {
-					is_veirfy: 0,
-					verify_record: []
-				}
-			},
-			action: {
-				icon: ''
-			},
-			evaluateConfig: {
-				evaluate_audit: 1,
-				evaluate_show: 0,
-				evaluate_status: 1
-			}
-		};
-	},
-	mixins: [orderMethod],
-	onLoad(option) {
-		if (option.order_id) this.orderId = option.order_id;
-		if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
-	},
-	onShow() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (this.storeToken) {
-			this.getEvaluateConfig();
-			this.getOrderData();
-		} else {
-			this.$util.redirectTo('/pages_tool/login/login', {
-				back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
-			});
-		}
-	},
-	methods: {
-		goDetail(e) {
-			this.$util.redirectTo('/pages_goods/detail', {
-				goods_id: e.goods_id
-			});
-		},
-		goRefund(id) {
-			this.$util.redirectTo('/pages_tool/order/refund', {
-				order_goods_id: id
-			});
-		},
-		goRefundDetail(id) {
-			this.$util.redirectTo('/pages_tool/order/refund_detail', {
-				order_goods_id: id
-			});
-		},
-		getOrderData() {
-			this.$api.sendRequest({
-				url: '/api/order/detail',
-				data: {
-					order_id: this.orderId,
-					merchant_trade_no: this.merchantTradeNo
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import orderMethod from './public/js/orderMethod.js';
+	import nsPayment from '@/components/payment/payment.vue';
+	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	export default {
+		data() {
+			return {
+				isIphoneX: false,
+				orderId: 0,
+				merchantTradeNo: '',
+				orderData: {
+					action: [],
+					virtual_goods: {
+						is_veirfy: 0,
+						verify_record: []
+					}
 				},
-				success: res => {
-					if (res.code >= 0) {
-						if (res.data.order_status == 0) {
-							let date = Date.parse(new Date()) / 1000;
-							res.data.closeTimeMachine = this.$util.countDown(res.data.create_time + res.data.auto_close - date);
-						}
-						let num = 0;
-						this.orderData = res.data;
-						this.orderId = this.orderData.order_id;
-						let refund_order_goods_ids = [];
-						this.orderData.order_goods.forEach(v => {
-							if (v.sku_spec_format) {
-								v.sku_spec_format = JSON.parse(v.sku_spec_format);
+				action: {
+					icon: ''
+				},
+				evaluateConfig: {
+					evaluate_audit: 1,
+					evaluate_show: 0,
+					evaluate_status: 1
+				}
+			};
+		},
+		mixins: [orderMethod],
+		components: {
+			nsGoodsRecommend,
+			nsPayment,
+			nsContact
+		},
+		onLoad(option) {
+			if (option.order_id) this.orderId = option.order_id;
+			if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			if (this.storeToken) {
+				this.getEvaluateConfig();
+				this.getOrderData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
+				});
+			}
+		},
+		methods: {
+			goDetail(e) {
+				this.$util.redirectTo('/pages_goods/detail', {
+					goods_id: e.goods_id
+				});
+			},
+			goRefund(id) {
+				this.$util.redirectTo('/pages_tool/order/refund', {
+					order_goods_id: id
+				});
+			},
+			goRefundDetail(id) {
+				this.$util.redirectTo('/pages_tool/order/refund_detail', {
+					order_goods_id: id
+				});
+			},
+			getOrderData() {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.orderId,
+						merchant_trade_no: this.merchantTradeNo
+					},
+					success: res => {
+						if (res.code >= 0) {
+							if (res.data.order_status == 0) {
+								let date = Date.parse(new Date()) / 1000;
+								res.data.closeTimeMachine = this.$util.countDown(res.data.create_time + res.data.auto_close - date);
+							}
+							let num = 0;
+							this.orderData = res.data;
+							this.orderId = this.orderData.order_id;
+							let refund_order_goods_ids = [];
+							this.orderData.order_goods.forEach(v => {
+								if (v.sku_spec_format) {
+									v.sku_spec_format = JSON.parse(v.sku_spec_format);
+								} else {
+									v.sku_spec_format = [];
+								}
+
+								if (v.refund_status == 0 || v.refund_status == -1) {
+									num += 1;
+									refund_order_goods_ids.push(v.order_goods_id);
+								}
+							});
+							this.action = JSON.parse(res.data.order_status_action);
+
+							//判断在可退款商品数量大于1时出现批量删除按钮
+							if (num > 1) {
+								this.orderData.refund_batch_status = true;
+								this.orderData.refund_order_goods_ids = refund_order_goods_ids;
 							} else {
-								v.sku_spec_format = [];
+								this.orderData.refund_batch_status = false;
 							}
 
-							if (v.refund_status == 0 || v.refund_status == -1) {
-								num += 1;
-								refund_order_goods_ids.push(v.order_goods_id);
-							}
-						});
-						this.action = JSON.parse(res.data.order_status_action);
+							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
 
-						//判断在可退款商品数量大于1时出现批量删除按钮
-						if (num > 1) {
-							this.orderData.refund_batch_status = true;
-							this.orderData.refund_order_goods_ids = refund_order_goods_ids;
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 						} else {
-							this.orderData.refund_batch_status = false;
+							this.$util.showToast({
+								title: '未获取到订单信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_order/list');
+							}, 1500);
 						}
-
-						if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
-
+					},
+					fail: res => {
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: '未获取到订单信息！'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/list');
-						}, 1500);
 					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				});
+			},
+			/**
+			 * 下拉刷新
+			 */
+			onPullDownRefresh() {
+				this.getOrderData();
+			},
+			operation(action) {
+				switch (action) {
+					case 'orderPay': // 支付
+						this.orderPay(this.orderData);
+						break;
+					case 'orderClose': //关闭
+						this.orderClose(this.orderData.order_id, () => {
+							this.getOrderData();
+						});
+						break;
+					case 'memberTakeDelivery': //收货
+						this.orderDelivery(this.orderData, () => {
+							this.getOrderData();
+						});
+						break;
+					case 'trace': //查看物流
+						this.$util.redirectTo('/pages_tool/order/logistics', {
+							order_id: this.orderData.order_id
+						});
+						break;
+					case 'memberOrderEvaluation': //评价
+						this.$util.redirectTo('/pages_tool/order/evaluate', {
+							order_id: this.orderData.order_id
+						});
+						break;
+						//批量退款
+					case 'memberBatchRefund':
+						this.$util.redirectTo('/pages_tool/order/refund_type_select', {
+							order_id: this.orderId
+						});
+						break;
+					case 'memberVirtualTakeDelivery':
+						this.orderVirtualDelivery(this.orderData, () => {
+							this.getOrderData();
+						});
+						break;
 				}
-			});
-		},
-		/**
-		 * 下拉刷新
-		 */
-		onPullDownRefresh() {
-			this.getOrderData();
-		},
-		operation(action) {
-			switch (action) {
-				case 'orderPay': // 支付
-					this.orderPay(this.orderData);
-					break;
-				case 'orderClose': //关闭
-					this.orderClose(this.orderData.order_id, () => {
-						this.getOrderData();
-					});
-					break;
-				case 'memberTakeDelivery': //收货
-					this.orderDelivery(this.orderData, () => {
-						this.getOrderData();
-					});
-					break;
-				case 'trace': //查看物流
-					this.$util.redirectTo('/pages_tool/order/logistics', {
-						order_id: this.orderData.order_id
-					});
-					break;
-				case 'memberOrderEvaluation': //评价
-					this.$util.redirectTo('/pages_tool/order/evaluate', {
-						order_id: this.orderData.order_id
-					});
-					break;
-				//批量退款
-				case 'memberBatchRefund':
-					this.$util.redirectTo('/pages_tool/order/refund_type_select', {
-						order_id: this.orderId
-					});
-					break;
-				case 'memberVirtualTakeDelivery':
-					this.orderVirtualDelivery(this.orderData, () => {
-						this.getOrderData();
-					});
-					break;
+			},
+			imageError(index) {
+				this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			getEvaluateConfig() {
+				this.$api.sendRequest({
+					url: '/api/goodsevaluate/config',
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data;
+							this.evaluateConfig = data;
+						}
+					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment() {
+				this.$refs.choosePaymentPopup.open();
+			},
+			// 预览图片
+			previewMedia(pickup) {
+				var paths = [];
+				paths.push(pickup);
+
+				uni.previewImage({
+					urls: paths
+				});
 			}
 		},
-		imageError(index) {
-			this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		getEvaluateConfig() {
-			this.$api.sendRequest({
-				url: '/api/goodsevaluate/config',
-				success: res => {
-					if (res.code == 0) {
-						var data = res.data;
-						this.evaluateConfig = data;
-					}
-				}
-			});
-		},
-		// 显示选择支付方式弹框
-		openChoosePayment() {
-			this.$refs.choosePaymentPopup.open();
-		},
-		// 预览图片
-		previewMedia(pickup) {
-			var paths = [];
-			paths.push(pickup);
-
-			uni.previewImage({
-				urls: paths
-			});
+		filters: {
+			abs(value) {
+				return Math.abs(parseFloat(value)).toFixed(2);
+			}
 		}
-	},
-	filters: {
-		abs(value) {
-			return Math.abs(parseFloat(value)).toFixed(2);
-		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import './public/css/detail.scss';
+	@import './public/css/detail.scss';
 </style>
 <style scoped>
-.pickup-code-info .code img:nth-child(1) {
-	margin-bottom: 30rpx;
-}
-
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
+	.pickup-code-info .code img:nth-child(1) {
+		margin-bottom: 30rpx;
+	}
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_order/detail_point.vue

@@ -1,18 +1,14 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg"
-			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
-				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')" />
-				<image v-if="orderData.order_status == 1"
-					:src="$util.img('public/uniapp/order/order-icon-received.png')" />
-				<image v-if="orderData.order_status == -1"
-					:src="$util.img('public/uniapp/order/order-icon-close.png')" />
+				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')"/>
+				<image v-if="orderData.order_status == 1" :src="$util.img('public/uniapp/order/order-icon-received.png')"/>
+				<image v-if="orderData.order_status == -1" :src="$util.img('public/uniapp/order/order-icon-close.png')"/>
 				<view class="status-name">
 					<view class="status-name">
-						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' :
-							orderData.order_status == -1 ? '已关闭' : '' }}
+						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' : orderData.order_status == -1 ? '已关闭' : '' }}
 					</view>
 				</view>
 			</view>
@@ -83,7 +79,7 @@
 				</view>
 			</view>
 			<!-- 联系客服 -->
-			<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
@@ -124,8 +120,7 @@
 
 			<view class="order-action" v-if="orderData.order_status == 0 && orderData.type == 1">
 				<view class="order-box-btn" @click="orderClose()">关闭</view>
-				<view class="order-box-btn color-base-bg color-base-border color-text-white"
-					@click="openChoosePayment()">支付</view>
+				<view class="order-box-btn color-base-bg color-base-border color-text-white" @click="openChoosePayment()">支付</view>
 			</view>
 		</view>
 
@@ -138,165 +133,171 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			isIphoneX: false,
-			orderId: 0,
-			orderData: {
-				action: []
-			},
-			action: {
-				icon: ''
-			},
-			storeDetail: {}
-		};
-	},
-	onLoad(option) {
-		if (option.order_id) this.orderId = option.order_id;
-	},
-	onShow() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	export default {
+		components: {
+			nsGoodsRecommend,
+			nsContact
+		},
+		data() {
+			return {
+				isIphoneX: false,
+				orderId: 0,
+				orderData: {
+					action: []
+				},
+				action: {
+					icon: ''
+				},
+				storeDetail: {}
+			};
+		},
+		onLoad(option) {
+			if (option.order_id) this.orderId = option.order_id;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
 
-		if (this.storeToken) {
-			this.getOrderData();
-		} else {
-			this.$util.redirectTo('/pages_tool/login/login', {
-				back: '/pages_order/detail_point?order_id=' + this.orderId
-			});
-		}
-	},
-	methods: {
-		goRefund(id) {
-			this.$util.redirectTo('/pages_tool/order/refund', {
-				order_goods_id: id
-			});
+			if (this.storeToken) {
+				this.getOrderData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_order/detail_point?order_id=' + this.orderId
+				});
+			}
 		},
-		goRefundDetail(id) {
-			this.$util.redirectTo('/pages_tool/order/refund_detail', {
-				order_goods_id: id
-			});
-		},
-		goDetail(id) {
-			this.$util.redirectTo('/pages_promotion/point/detail', {
-				id: id
-			});
-		},
-		navigateBack() {
-			this.$util.goBack();
-		},
-		getOrderData() {
-			this.$api.sendRequest({
-				url: '/pointexchange/api/order/info',
-				data: {
-					order_id: this.orderId
-				},
-				success: res => {
-					uni.stopPullDownRefresh();
-					if (res.code >= 0) {
+		methods: {
+			goRefund(id) {
+				this.$util.redirectTo('/pages_tool/order/refund', {
+					order_goods_id: id
+				});
+			},
+			goRefundDetail(id) {
+				this.$util.redirectTo('/pages_tool/order/refund_detail', {
+					order_goods_id: id
+				});
+			},
+			goDetail(id) {
+				this.$util.redirectTo('/pages_promotion/point/detail', {
+					id: id
+				});
+			},
+			navigateBack() {
+				this.$util.goBack();
+			},
+			getOrderData() {
+				this.$api.sendRequest({
+					url: '/pointexchange/api/order/info',
+					data: {
+						order_id: this.orderId
+					},
+					success: res => {
+						uni.stopPullDownRefresh();
+						if (res.code >= 0) {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							this.orderData = res.data;
+							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info =
+								JSON.parse(this.orderData.delivery_store_info);
+						} else {
+							this.$util.showToast({
+								title: '未获取到订单信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_order/list');
+							}, 1500);
+						}
+					},
+					fail: res => {
+						uni.stopPullDownRefresh();
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						this.orderData = res.data;
-						if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info =
-							JSON.parse(this.orderData.delivery_store_info);
-					} else {
-						this.$util.showToast({
-							title: '未获取到订单信息！'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/list');
-						}, 1500);
 					}
-				},
-				fail: res => {
-					uni.stopPullDownRefresh();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		/**
-		 * 下拉刷新
-		 */
-		onPullDownRefresh() {
-			this.getOrderData();
-		},
-		orderClose() {
-			uni.showModal({
-				title: '提示',
-				content: '确定关闭此次兑换？',
-				success: res => {
-					if (res.confirm) {
-						this.$api.sendRequest({
-							url: '/pointexchange/api/order/close',
-							data: {
-								order_id: this.orderData.order_id
-							},
-							success: res => {
-								if (res.code >= 0) {
-									this.$util.showToast({
-										title: '关闭成功'
-									});
-									this.getOrderData();
+				});
+			},
+			/**
+			 * 下拉刷新
+			 */
+			onPullDownRefresh() {
+				this.getOrderData();
+			},
+			orderClose() {
+				uni.showModal({
+					title: '提示',
+					content: '确定关闭此次兑换？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/pointexchange/api/order/close',
+								data: {
+									order_id: this.orderData.order_id
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.showToast({
+											title: '关闭成功'
+										});
+										this.getOrderData();
+									}
 								}
-							}
-						});
+							});
+						}
 					}
+				});
+			},
+			// 显示选择支付方式弹框
+			openChoosePayment() {
+				this.$refs.choosePaymentPopup.open();
+			},
+			orderPay() {
+				uni.setStorageSync('paySource', 'pointexchange');
+				this.$refs.choosePaymentPopup.getPayInfo(this.orderData.out_trade_no);
+			},
+			exchangeImage(data) {
+				let img = '';
+				switch (data.type) {
+					case 1:
+						img = this.$util.img(data.exchange_image, {
+							size: 'mid'
+						});
+						break;
+					case 2:
+						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+							'public/uniapp/point/coupon.png');
+						break;
+					case 3:
+						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+							'public/uniapp/point/hongbao.png');
+						break;
 				}
-			});
+				return img;
+			},
+			imageError() {
+				switch (this.orderData.type) {
+					case 2:
+						this.orderData.exchange_image = this.$util.img('public/uniapp/point/coupon.png');
+						break;
+					case 3:
+						this.orderData.exchange_image = this.$util.img('public/uniapp/point/hongbao.png');
+						break;
+					default:
+						this.orderData.exchange_image = this.$util.getDefaultImage().goods;
+				}
+				this.$forceUpdate();
+			},
 		},
-		// 显示选择支付方式弹框
-		openChoosePayment() {
-			this.$refs.choosePaymentPopup.open();
-		},
-		orderPay() {
-			uni.setStorageSync('paySource', 'pointexchange');
-			this.$refs.choosePaymentPopup.getPayInfo(this.orderData.out_trade_no);
-		},
-		exchangeImage(data) {
-			let img = '';
-			switch (data.type) {
-				case 1:
-					img = this.$util.img(data.exchange_image, {
-						size: 'mid'
-					});
-					break;
-				case 2:
-					img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
-						'public/uniapp/point/coupon.png');
-					break;
-				case 3:
-					img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
-						'public/uniapp/point/hongbao.png');
-					break;
+		filters: {
+			abs(value) {
+				return Math.abs(parseFloat(value)).toFixed(2);
 			}
-			return img;
-		},
-		imageError() {
-			switch (this.orderData.type) {
-				case 2:
-					this.orderData.exchange_image = this.$util.img('public/uniapp/point/coupon.png');
-					break;
-				case 3:
-					this.orderData.exchange_image = this.$util.img('public/uniapp/point/hongbao.png');
-					break;
-				default:
-					this.orderData.exchange_image = this.$util.getDefaultImage().goods;
-			}
-			this.$forceUpdate();
-		},
-	},
-	filters: {
-		abs(value) {
-			return Math.abs(parseFloat(value)).toFixed(2);
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import './public/css/detail.scss';
+	@import './public/css/detail.scss';
 </style>
 <style scoped>
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_order/list.vue

@@ -166,8 +166,20 @@
 
 <script>
 import orderMethod from './public/js/orderMethod.js';
+import nsPayment from '@/components/payment/payment.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 
 export default {
+	components: {
+		nsPayment,
+		MescrollUni,
+		nsLogin,
+		loadingCover,
+		nsEmpty
+	},
 	data() {
 		return {
 			scrollInto: '',

pages_promotion/fenxiao/apply.vue

@@ -152,8 +152,9 @@
 </template>
 
 <script>
-	import validate from '@/common/js/validate.js';
-	import fenxiaoWords from '@/common/js/fenxiao-words.js';
+	import validate from 'common/js/validate.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import fenxiaoWords from 'common/js/fenxiao-words.js';
 	import htmlParser from '@/common/js/html-parser';
 	export default {
 		data() {
@@ -186,6 +187,9 @@
 				isOpen: false
 			};
 		},
+		components: {
+			uniPopup
+		},
 		mixins: [fenxiaoWords],
 		onLoad(option) {
 			setTimeout( () => {

pages_promotion/fenxiao/bill.vue

@@ -3,8 +3,7 @@
 		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
 			<block slot="list">
 				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">
-					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')"
-						mode="widthFix"></image>
+					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')" mode="widthFix"></image>
 					<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
 					<view class="balances-info">
 						<text>{{ item.type_name }}</text>
@@ -12,8 +11,7 @@
 						<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
 					</view>
 					<view class="balances-num">
-						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money :
-							item.money }}</text>
+						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money : item.money }}</text>
 					</view>
 				</view>
 				<ns-empty v-if="!accountList.length && showEmpty" text="暂无账单信息" :isIndex="false"></ns-empty>
@@ -32,7 +30,7 @@ export default {
 		};
 	},
 	onShow() {
-		setTimeout(() => {
+		setTimeout( () => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -43,7 +41,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		}, 1000);
+		},1000);
 	},
 	methods: {
 		getData(mescroll) {

pages_promotion/fenxiao/child_fenxiao.vue

@@ -2,27 +2,23 @@
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
 			<block slot="list">
-				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0"
-					@click="toFenxiaoOrder(item)">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
 					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
-						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)"
-							mode="aspectFill"></image>
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
 						<image v-else :src="$util.getDefaultImage().head"></image>
 						<view class="member-info">
 							<view class="member-name">
 								<view class="left">
 									<view class="flex-box">
 										<view class="name">{{ item.nickname }}</view>
-										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{
-											item.level_name }}</view>
+										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{ item.level_name }}</view>
 									</view>
-									<view class="color-tip font-size-goods-tag">加入时间：{{
-										$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
 								</view>
 								<view class="consume-info">
 									<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text> 人</view>
 									<view><text>{{ item.order_num }}</text> 单</view>
-									<view><text>{{ item.order_money | moneyFormat }}</text> 元</view>
+									<view><text>{{ item.order_money|moneyFormat }}</text> 元</view>
 								</view>
 							</view>
 						</view>
@@ -51,7 +47,7 @@ export default {
 	},
 	mixins: [fenxiaoWords],
 	onShow() {
-		setTimeout(() => {
+		setTimeout( () => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -62,7 +58,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		}, 1000);
+		},1000);
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -118,7 +114,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
@@ -272,7 +268,6 @@ export default {
 			flex-direction: row-reverse;
 		}
 	}
-
 	.order-box-btn {
 		display: inline-block;
 		line-height: 56rpx;
@@ -286,7 +281,6 @@ export default {
 		border-radius: $border-radius;
 		margin-top: 30rpx;
 	}
-
 	.li-box.active {
 		border: none;
 	}

pages_promotion/fenxiao/goods_list.vue

@@ -2,28 +2,28 @@
 	<view class="content" :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
-				<view class="goods-list"
-					:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
 					<scroll-view class="quick-nav" scroll-x="true">
 						<!-- #ifdef MP -->
 						<view class="uni-scroll-view-content">
 							<!-- #endif -->
-							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }"
-								@click="changeCategory(0)">全部</view>
-							<view class="quick-nav-item" v-for="item in categoryList" :key="item.category_id"
+							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }" @click="changeCategory(0)">全部</view>
+							<view
+								class="quick-nav-item"
+								v-for="item in categoryList"
+								:key="item.category_id"
 								:class="{ selected: categoryId == item.category_id }"
-								@click="changeCategory(item.category_id)">
+								@click="changeCategory(item.category_id)"
+							>
 								{{ item.category_name }}
 							</view>
 							<!-- #ifdef MP -->
 						</view>
 						<!-- #endif -->
 					</scroll-view>
-					<view v-for="(item, index) in goodsList" :key="index" class="goods-item"
-						@click="navToDetailPage(item)">
+					<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
 						<view class="image-wrap">
-							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)"
-								mode="aspectFill" />
+							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" />
 						</view>
 						<view class="goods-content">
 							<view class="goods-name">
@@ -124,8 +124,10 @@
 			</uni-popup>
 		</view>
 
-		<!-- 隐私弹窗 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
 	</view>
 </template>
 
@@ -139,7 +141,7 @@ export default {
 </script>
 
 <style>
-.quick-nav>>>.uni-scroll-view-content {
+.quick-nav >>> .uni-scroll-view-content {
 	display: flex;
 }
 </style>
@@ -147,10 +149,8 @@ export default {
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
-
 .quick-nav {
 	margin-bottom: 20rpx;
-
 	.quick-nav-item {
 		display: flex;
 		align-items: center;
@@ -174,7 +174,6 @@ export default {
 		}
 	}
 }
-
 .content {
 	overflow: hidden;
 	padding: 0 30rpx 160rpx;
@@ -187,14 +186,12 @@ export default {
 		background-size: 100%;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
-
 		.goods-item {
 			margin-bottom: 20rpx;
 			background: #ffffff;
 			padding: $padding;
 			display: flex;
 			border-radius: 10rpx;
-
 			&:last-child {
 				margin-bottom: 0;
 			}
@@ -208,7 +205,6 @@ export default {
 			border-radius: 10rpx;
 			overflow: hidden;
 			flex-shrink: 0;
-
 			image {
 				width: 100%;
 				height: 100%;
@@ -229,7 +225,6 @@ export default {
 			.goods-name {
 				width: 100%;
 				line-height: 1.3;
-
 				.name {
 					line-height: 1.3;
 					word-break: break-all;
@@ -239,12 +234,10 @@ export default {
 					-webkit-line-clamp: 2;
 					-webkit-box-orient: vertical;
 				}
-
 				.label-list {
 					display: flex;
 					align-items: center;
 					margin-top: 6rpx;
-
 					.label-item {
 						padding: 4rpx 10rpx;
 						font-size: $font-size-tag;
@@ -276,7 +269,6 @@ export default {
 					padding: 0 $padding;
 					border-radius: 50rpx;
 					border: 2rpx solid $base-color;
-
 					text {
 						color: $base-color;
 						border-radius: 40rpx;
@@ -291,7 +283,6 @@ export default {
 			}
 		}
 	}
-
 	.active-btn {
 		position: fixed;
 		bottom: 40rpx;
@@ -305,12 +296,10 @@ export default {
 		border-radius: 50rpx;
 		background-color: $base-color;
 		color: #fff;
-
 		.btn {
 			flex: 1;
 			text-align: center;
 		}
-
 		.share-btn {
 			margin: 0;
 			padding: 0;
@@ -350,7 +339,6 @@ export default {
 					border: none;
 					line-height: 1;
 					height: auto;
-
 					text {
 						margin-top: 20rpx;
 						font-size: $font-size-tag;
@@ -363,7 +351,6 @@ export default {
 					font-size: 80rpx;
 					line-height: initial;
 				}
-
 				.icon-fuzhilianjie,
 				.icon-pengyouquan,
 				.icon-haowuquan,
@@ -380,48 +367,39 @@ export default {
 			text-align: center;
 		}
 	}
-
 	.poster-layer {
 		.generate-poster {
 			padding: 40rpx 0;
-
 			.iconfont {
 				font-size: 80rpx;
 				color: #07c160;
 				line-height: initial;
 			}
-
-			>view {
+			> view {
 				text-align: center;
-
 				&:last-child {
 					margin-top: 20rpx;
 				}
 			}
 		}
-
 		.image-wrap {
 			width: 64%;
 			height: 854rpx;
 			margin: 60rpx auto 40rpx auto;
 			box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
-
 			image {
 				width: 480rpx;
 				height: 854rpx;
 			}
 		}
-
 		.msg {
 			padding: 40rpx;
 		}
-
 		.save {
 			text-align: center;
 			height: 80rpx;
 			line-height: 80rpx;
 		}
-
 		.close {
 			position: absolute;
 			top: 0;

pages_promotion/fenxiao/index.vue

@@ -261,8 +261,12 @@
 
 <script>
 import fenxiaoWords from '@/common/js/fenxiao-words.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
 export default {
+	components: {
+		uniPopup
+	},
 	data() {
 		return {
 			info: {

pages_promotion/fenxiao/order.vue

@@ -2,51 +2,40 @@
 	<view :style="themeColor">
 		<view class="withdraw-cate">
 			<block v-for="(item, index) in category" :key="index">
-				<view @click="selectCate(item.id)" class="cate-li"
-					:class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}
-				</view>
+				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
 			</block>
 		</view>
 		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
-						@click="toDetail(orderItem.fenxiao_order_id)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
 						<view class="order-header">
 							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
 							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green"
-								v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
 							<text class="status-name color-text-orange" v-else>待结算</text>
 						</view>
 
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })"
-										@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
 										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
 										<view>
 											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color  price-style small">{{
-												$lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large">{{
-												parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
-											<text class="price-color price-style small">.{{
-												parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
+											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
 										</view>
 									</view>
 									<view class="goods-sub-section">
 										<view class="goods-price">
-											<text class="unit price-style small">{{ $lang('common.currencySymbol')
-											}}</text>
-											<text class="price-color price-style large">{{
-												parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
-											<text class="unit price-style small">.{{
-												parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
 										</view>
 										<view>
 											<text>
@@ -68,24 +57,18 @@
 								<view class="total">
 									<text>合计：</text>
 									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-color font-size-toolbar">{{
-										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
-									<text class="price-color">.{{
-										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
+									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="cart-empty">
-					<ns-empty text="暂无订单" :isIndex="false"
-						v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无待结算订单" :isIndex="false"
-						v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已结算订单" :isIndex="false"
-						v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已退款订单" :isIndex="false"
-						v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
 				</view>
 			</view>
 		</mescroll-uni>
@@ -134,7 +117,7 @@ export default {
 		if (option.type != undefined) this.selectId = option.type;
 	},
 	onShow() {
-		setTimeout(() => {
+		setTimeout( () => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -145,9 +128,9 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		}, 1000);
+		},1000);
 
-		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -205,7 +188,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}

pages_promotion/fenxiao/promote_code.vue

@@ -4,7 +4,7 @@
 			<swiper-item v-for="(item, index) in poster" :key="index">
 				<view class="swiper-item">
 					<view class="poster-wrap">
-						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true" />
+						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
 					</view>
 				</view>
 			</swiper-item>
@@ -25,8 +25,7 @@
 				<view class="action-wrap">
 					<view @click="closeDialog">取消</view>
 					<view>
-						<button type="default" open-type="openSetting" @opensetting="closeDialog"
-							hover-class="none">立即授权</button>
+						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
 					</view>
 				</view>
 			</view>
@@ -35,267 +34,273 @@
 		<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 {
-	Weixin
-} from 'common/js/wx-jssdk.js';
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
-export default {
-	data() {
-		return {
-			poster: [],
-			fenxiaoInfo: {},
-			posterIndex: 0,
-			//海报模板id
-			templateId: ['default'],
-			mpShareData: null //小程序分享数据
-		};
-	},
-	methods: {
-		/**
-		 * 获取分销海报
-		 */
-		getPoster(id) {
-			return new Promise((resolve, reject) => {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/poster',
-					data: {
-						page: '/pages/index/index',
-						qrcode_param: JSON.stringify({}),
-						template_id: id
-					},
+	export default {
+		data() {
+			return {
+				poster: [],
+				fenxiaoInfo: {},
+				posterIndex: 0,
+				//海报模板id
+				templateId: ['default'],
+				mpShareData: null //小程序分享数据
+			};
+		},
+		components: {
+			uniPopup
+		},
+		methods: {
+			/**
+			 * 获取分销海报
+			 */
+			getPoster(id) {
+				return new Promise((resolve, reject) => {
+					this.$api.sendRequest({
+						url: '/fenxiao/api/fenxiao/poster',
+						data: {
+							page: '/pages/index/index',
+							qrcode_param: JSON.stringify({}),
+							template_id: id
+						},
+						success: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							if (res.code >= 0) {
+								resolve(res.data.path);
+							}
+						},
+						fail: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							reject();
+						}
+					});
+				});
+			},
+			getIndex(e) {
+				this.posterIndex = e.detail.current;
+			},
+			save() {
+				// #ifdef MP
+				uni.downloadFile({
+					url: this.$util.img(this.poster[this.posterIndex]),
 					success: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						if (res.code >= 0) {
-							resolve(res.data.path);
+						if (res.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: res.tempFilePath,
+								success: () => {
+									this.$util.showToast({
+										title: '保存成功'
+									});
+								},
+								fail: res => {
+									if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
+										res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
+										this.$refs.popupDialog.open();
+									} else {
+										this.$util.showToast({
+											title: '保存失败，请稍后重试'
+										});
+									}
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: '下载失败'
+							});
 						}
 					},
 					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						reject();
-					}
-				});
-			});
-		},
-		getIndex(e) {
-			this.posterIndex = e.detail.current;
-		},
-		save() {
-			// #ifdef MP
-			uni.downloadFile({
-				url: this.$util.img(this.poster[this.posterIndex]),
-				success: res => {
-					if (res.statusCode === 200) {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: () => {
-								this.$util.showToast({
-									title: '保存成功'
-								});
-							},
-							fail: res => {
-								if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
-									res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
-									this.$refs.popupDialog.open();
-								} else {
-									this.$util.showToast({
-										title: '保存失败，请稍后重试'
-									});
-								}
-							}
-						});
-					} else {
 						this.$util.showToast({
 							title: '下载失败'
 						});
 					}
-				},
-				fail: res => {
+				});
+				// #endif
+			},
+			getFenxiaoDetail() {
+				this.poster = [];
+				try {
+					this.templateId.forEach((item, index) => {
+						this.getPoster(item).then(resolve => {
+							this.poster.push(resolve);
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}).catch(reject => {
+							throw reject;
+						});
+					});
+				} catch {
 					this.$util.showToast({
-						title: '下载失败'
+						title: '海报生成失败'
 					});
 				}
+			},
+
+			closeDialog() {
+				this.$refs.popupDialog.close();
+			}
+		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.fenxiao) {
+					this.$util.showToast({
+						title: '商家未开启分销',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (option.templateId) {
+				this.templateId = option.templateId.split(',');
+			}
+
+			if (this.storeToken) {
+				if(option.poster){
+					this.poster = decodeURIComponent(option.poster).split(',')
+					setTimeout(() => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}, 500)
+				}else{
+					this.getFenxiaoDetail();
+				}
+				
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+				});
+			}
+		},
+		onShow() {
+			//小程序分享
+			// #ifdef MP-WEIXIN
+			this.$util.getMpShare().then(res => {
+				this.mpShareData = res;
 			});
 			// #endif
 		},
-		getFenxiaoDetail() {
-			this.poster = [];
-			try {
-				this.templateId.forEach((item, index) => {
-					this.getPoster(item).then(resolve => {
-						this.poster.push(resolve);
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}).catch(reject => {
-						throw reject;
-					});
-				});
-			} catch {
-				this.$util.showToast({
-					title: '海报生成失败'
-				});
-			}
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
 		},
-
-		closeDialog() {
-			this.$refs.popupDialog.close();
-		}
-	},
-	onLoad(option) {
-		setTimeout(() => {
-			if (!this.addonIsExist.fenxiao) {
-				this.$util.showToast({
-					title: '商家未开启分销',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		}, 1000);
-
-		if (option.templateId) {
-			this.templateId = option.templateId.split(',');
-		}
-
-		if (this.storeToken) {
-			if (option.poster) {
-				this.poster = decodeURIComponent(option.poster).split(',')
-				setTimeout(() => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}, 500)
-			} else {
-				this.getFenxiaoDetail();
-			}
-
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
-			});
-		}
-	},
-	onShow() {
-		//小程序分享
-		// #ifdef MP-WEIXIN
-		this.$util.getMpShare().then(res => {
-			this.mpShareData = res;
-		});
-		// #endif
-	},
-	//分享给好友
-	onShareAppMessage() {
-		return this.mpShareData.appMessage;
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		return this.mpShareData.timeLine;
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.getFenxiaoDetail();
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getFenxiaoDetail();
+				}
 			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.container {
-	width: 100vw;
-	min-height: 100vh;
-	background-color: #f5f5f5;
-}
-
-.poster-wrap {
-	padding: 40rpx 0;
-	width: calc(100vw - 80rpx);
-	margin: 0 40rpx;
-	line-height: 1;
-
-	image {
-		border-radius: 20rpx;
-		overflow: hidden;
-		width: 100%;
+	.container {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #f5f5f5;
 	}
-}
 
-.swiper {
-	height: 1240rpx;
-}
+	.poster-wrap {
+		padding: 40rpx 0;
+		width: calc(100vw - 80rpx);
+		margin: 0 40rpx;
+		line-height: 1;
 
-.btn {
-	margin: 0 80rpx;
-	margin-top: 30rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-	border-radius: $border-radius;
-	color: #fff;
-	text-align: center;
-}
+		image {
+			border-radius: 20rpx;
+			overflow: hidden;
+			width: 100%;
+		}
+	}
 
-.tips {
-	text-align: center;
-	font-size: $font-size-base;
-	color: #999;
-	font-weight: 600;
-	margin-top: 20rpx;
-}
+	.swiper {
+		height: 1240rpx;
+	}
 
-.dialog-popup {
-	width: 580rpx;
-	background: #fff;
-	box-sizing: border-box;
-	border-radius: 10rpx;
-	overflow: hidden;
-	height: initial;
-
-	.title {
-		padding: 30rpx 30rpx 0 30rpx;
+	.btn {
+		margin: 0 80rpx;
+		margin-top: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
 		text-align: center;
-		font-size: 32rpx;
-		font-weight: bold;
 	}
 
-	.message {
-		padding: 0 30rpx;
-		color: #666;
+	.tips {
 		text-align: center;
 		font-size: $font-size-base;
-		line-height: 1.3;
-		margin-top: 30rpx;
+		color: #999;
+		font-weight: 600;
+		margin-top: 20rpx;
 	}
 
-	.action-wrap {
-		margin-top: 50rpx;
-		height: 80rpx;
-		display: flex;
-		border-top: 2rpx solid #eee;
+	.dialog-popup {
+		width: 580rpx;
+		background: #fff;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		overflow: hidden;
+		height: initial;
 
-		&>view {
-			flex: 1;
+		.title {
+			padding: 30rpx 30rpx 0 30rpx;
 			text-align: center;
-			line-height: 80rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
 
-			&:first-child {
-				border-right: 2rpx solid #eee;
-				color: #999;
-			}
+		.message {
+			padding: 0 30rpx;
+			color: #666;
+			text-align: center;
+			font-size: $font-size-base;
+			line-height: 1.3;
+			margin-top: 30rpx;
+		}
 
-			button {
-				border: none;
+		.action-wrap {
+			margin-top: 50rpx;
+			height: 80rpx;
+			display: flex;
+			border-top: 2rpx solid #eee;
+
+			&>view {
+				flex: 1;
+				text-align: center;
 				line-height: 80rpx;
-				padding: 0;
-				margin: 0;
-				width: 100%;
-				height: 100%;
+
+				&:first-child {
+					border-right: 2rpx solid #eee;
+					color: #999;
+				}
+
+				button {
+					border: none;
+					line-height: 80rpx;
+					padding: 0;
+					margin: 0;
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 	}
-}
 </style>

pages_promotion/fenxiao/ranking_list.vue

@@ -3,22 +3,17 @@
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
 			<view slot="list">
 				<block v-if="list.length != 0">
-					<view class="banner"
-						:style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/header_bg.png') + ') no-repeat top left / 100% 100%' }">
+					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
 						<view class="info">
 							<view class="info-pic">
-								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head"
-									@error="info.headimg = $util.getDefaultImage().head" mode="aspectFill" />
+								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
 							</view>
 							<view class="member-info">
 								<view class="rank-info-box">
-									<text class="name">{{ info.nickname }}</text>
+									<text class="name">{{info.nickname}}</text>
 								</view>
-								<view class="withdrawal"
-									@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')"
-									v-if="type == 'profit'">点击提现</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')"
-									v-if="type == 'invited_num'">我的团队</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
 							</view>
 						</view>
 					</view>
@@ -31,7 +26,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">分销佣金</text>
-									<text class="all-money-num">{{ info.today_commission }}元</text>
+									<text class="all-money-num">{{ info.today_commission}}元</text>
 								</view>
 							</view>
 						</view>
@@ -55,7 +50,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">推广人数</text>
-									<text class="all-money-num">{{ info.one_child_num }}人</text>
+									<text class="all-money-num">{{ info.one_child_num}}人</text>
 								</view>
 							</view>
 						</view>
@@ -72,21 +67,20 @@
 						</view>
 					</view>
 
-					<view class="title-rakn-text" v-if="type == 'profit'">佣金排行</view>
-					<view class="title-rakn-text" v-if="type == 'invited_num'">推广排行</view>
+					<view class="title-rakn-text"  v-if="type == 'profit'">佣金排行</view>
+					<view class="title-rakn-text"  v-if="type == 'invited_num'">推广排行</view>
 
 					<view class="ranking-list">
 						<view class="ranking-item" v-for="(item, index) in list" :key="index">
 							<view class="ranking price-font">{{ index + 1 }}</view>
 							<view class="content">
 								<view class="head-img">
-									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
-										@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill" />
+									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
 								</view>
 								<view class="nickname">{{ item.nickname }}</view>
 							</view>
 							<view class="price-font price-style" v-if="type == 'profit'">
-								￥{{ item.total_commission | moneyFormat }}</view>
+								￥{{ item.total_commission|moneyFormat }}</view>
 							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
 							</view>
 						</view>
@@ -103,319 +97,319 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			list: [],
-			emptyShow: false,
-			type: '',
-			ranking: 0,
-			info: {}
-		}
-	},
-	onLoad(data) {
-		this.type = data.type;
-		this.getRanking();
-		this.getFenxiaoDetail();
-	},
-	methods: {
-		getData(mescroll) {
-			this.emptyShow = false;
-			if (mescroll.num == 1) {
-				this.list = [];
+	export default {
+		data() {
+			return {
+				list: [],
+				emptyShow: false,
+				type: '',
+				ranking: 0,
+				info: {}
 			}
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/rankinglist',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-					type: this.type
-				},
-				success: res => {
-					this.emptyShow = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		},
+		onLoad(data) {
+			this.type = data.type;
+			this.getRanking();
+			this.getFenxiaoDetail();
+		},
+		methods: {
+			getData(mescroll) {
+				this.emptyShow = false;
+				if (mescroll.num == 1) {
+					this.list = [];
 				}
-			});
-		},
-		getRanking() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/ranking',
-				data: {
-					type: this.type
-				},
-				success: res => {
-					if (res.code >= 0) {
-						this.ranking = res.data;
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/rankinglist',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						type: this.type
+					},
+					success: res => {
+						this.emptyShow = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-				}
-			})
-		},
-		getFenxiaoDetail() {
-			this.$api.sendRequest({
-				url: '/fenxiao/api/fenxiao/detail',
-				success: res => {
-					if (res.data) {
-						this.info = res.data;
+				});
+			},
+			getRanking() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/ranking',
+					data: {
+						type: this.type
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.ranking = res.data;
+						}
 					}
-				},
-			});
-		},
+				})
+			},
+			getFenxiaoDetail() {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/detail',
+					success: res => {
+						if (res.data) {
+							this.info = res.data;
+						}
+					},
+				});
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss">
-.container {
-	width: 100vw;
-	height: 100vh;
-}
-
-.banner {
-	width: 100%;
-	height: 200rpx;
-	// background: $base-color;
-}
-
-.info {
-	width: 100%;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 50rpx 80rpx 0;
-	box-sizing: border-box;
-
-	.info-pic {
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 50%;
-		border: 4rpx solid #fff;
-		position: relative;
-
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: 50%;
-		}
-
+	.container {
+		width: 100vw;
+		height: 100vh;
 	}
 
-	.member-info {
-		flex: 1;
-		width: 0;
-		margin-left: 32rpx;
-		display: flex;
-
-		view {
-			color: #fff;
-		}
-
-		.rank-info-box {
-			line-height: 1;
-			flex: 1;
-		}
-
-		.name {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #FFFFFF;
-		}
-
-		.withdrawal {
-			border-radius: 4px;
-			line-height: 23px;
-			margin: auto;
-			text-align: center;
-			font-size: 11px;
-		}
-
-	}
-
-}
-
-.fenxiao-team {
-	display: flex;
-	width: 100%;
-	margin-top: 22rpx;
-
-	.fenxiao-index-other {
-		margin: 0 24rpx 20rpx 24rpx;
-		border-radius: 16rpx;
-		background-color: #ffffff;
-		padding: 30rpx 0;
-		flex: 1;
-
-		&:last-child {
-			margin-left: 0;
-		}
-
-		.all-money-item {
-			margin: 0 30rpx;
-			display: flex;
-			font-size: $font-size-tag;
-			align-items: center;
-
-			.img-wrap {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 70rpx;
-				height: 70rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.all-money-tit-wrap {
-				flex: 1;
-				margin-left: 24rpx;
-				display: flex;
-				flex-direction: column;
-				height: 70rpx;
-
-				.all-money-tit {
-					line-height: 1;
-					color: $color-title;
-					font-size: $font-size-base;
-					flex: 1;
-				}
-
-				.all-money-num {
-					color: $color-tip;
-					font-size: 24rpx;
-					line-height: 1;
-				}
-			}
-		}
-	}
-}
-
-.icon-wenxiao {
-	text-align: center;
-	font-size: 50rpx;
-	color: var(--base-color) !important;
-}
-
-.number {
-	font-weight: 600;
-	text-align: center;
-}
-
-.info-text {
-	font-size: 20rpx;
-	text-align: center;
-}
-
-.info-title {
-	font-size: 50rpx;
-	font-weight: 900;
-	color: #f5f5f5;
-	text-align: center;
-}
-
-.info-rank {
-	color: #f5f5f5;
-	margin-top: 10rpx;
-}
-
-.title-rakn-text {
-	text-align: center;
-	font-size: 30rpx;
-	font-weight: 900;
-}
-
-.ranking-list {
-	transform: translateY(-120rpx);
-	margin: 200rpx 24rpx;
-	background: #fff;
-	border-radius: 16rpx;
-	padding: 10rpx 20rpx;
-	margin-top: 140rpx;
-
-	.ranking-item {
+	.banner {
+		width: 100%;
+		height: 200rpx;
+		// background: $base-color;
+	}
+
+	.info {
+		width: 100%;
 		display: flex;
+		justify-content: space-between;
 		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid #f5f5f5;
+		padding: 50rpx 80rpx 0;
+		box-sizing: border-box;
 
-		&:last-child {
-			border-bottom: 0;
-		}
-
-		.ranking {
-			width: 60rpx;
-			height: 60rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			box-sizing: border-box;
-			font-size: 24rpx;
-		}
-
-		&:nth-child(1) .ranking {
-			background: rgb(249, 186, 1);
+		.info-pic {
+			width: 100rpx;
+			height: 100rpx;
 			border-radius: 50%;
-			border: 10rpx solid rgb(254, 220, 92);
+			border: 4rpx solid #fff;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+
 		}
 
-		&:nth-child(2) .ranking {
-			background: rgb(172, 185, 194);
-			border-radius: 50%;
-			border: 10rpx solid rgb(215, 223, 229);
-		}
-
-		&:nth-child(3) .ranking {
-			background: rgb(211, 163, 136);
-			border-radius: 50%;
-			border: 10rpx solid rgb(235, 201, 190);
-		}
-
-		.content {
+		.member-info {
 			flex: 1;
 			width: 0;
-			padding: 0 20rpx;
+			margin-left: 32rpx;
 			display: flex;
-			align-items: center;
 
-			.head-img {
-				width: 90rpx;
-				height: 90rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				border-radius: 50%;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
+			view {
+				color: #fff;
 			}
 
-			.nickname {
-				color: #333;
-				margin: 0 20rpx;
-				font-size: 28rpx;
+			.rank-info-box {
+				line-height: 1;
+				flex: 1;
+			}
+
+			.name {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+			}
+
+			.withdrawal {
+				border-radius: 4px;
+				line-height: 23px;
+				margin: auto;
+				text-align: center;
+				font-size: 11px;
+			}
+
+		}
+
+	}
+
+	.fenxiao-team {
+		display: flex;
+		width: 100%;
+		margin-top: 22rpx;
+
+		.fenxiao-index-other {
+			margin: 0 24rpx 20rpx 24rpx;
+			border-radius: 16rpx;
+			background-color: #ffffff;
+			padding: 30rpx 0;
+			flex: 1;
+
+			&:last-child {
+				margin-left: 0;
+			}
+
+			.all-money-item {
+				margin: 0 30rpx;
+				display: flex;
+				font-size: $font-size-tag;
+				align-items: center;
+
+				.img-wrap {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 70rpx;
+					height: 70rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.all-money-tit-wrap {
+					flex: 1;
+					margin-left: 24rpx;
+					display: flex;
+					flex-direction: column;
+					height: 70rpx;
+
+					.all-money-tit {
+						line-height: 1;
+						color: $color-title;
+						font-size: $font-size-base;
+						flex: 1;
+					}
+
+					.all-money-num {
+						color: $color-tip;
+						font-size: 24rpx;
+						line-height: 1;
+					}
+				}
+			}
+		}
+	}
+
+	.icon-wenxiao {
+		text-align: center;
+		font-size: 50rpx;
+		color: var(--base-color) !important;
+	}
+
+	.number {
+		font-weight: 600;
+		text-align: center;
+	}
+
+	.info-text {
+		font-size: 20rpx;
+		text-align: center;
+	}
+
+	.info-title {
+		font-size: 50rpx;
+		font-weight: 900;
+		color: #f5f5f5;
+		text-align: center;
+	}
+
+	.info-rank {
+		color: #f5f5f5;
+		margin-top: 10rpx;
+	}
+
+	.title-rakn-text {
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.ranking-list {
+		transform: translateY(-120rpx);
+		margin: 200rpx 24rpx;
+		background: #fff;
+		border-radius: 16rpx;
+		padding: 10rpx 20rpx;
+		margin-top: 140rpx;
+
+		.ranking-item {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #f5f5f5;
+
+			&:last-child {
+				border-bottom: 0;
+			}
+
+			.ranking {
+				width: 60rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+				font-size: 24rpx;
+			}
+
+			&:nth-child(1) .ranking {
+				background: rgb(249, 186, 1);
+				border-radius: 50%;
+				border: 10rpx solid rgb(254, 220, 92);
+			}
+
+			&:nth-child(2) .ranking {
+				background: rgb(172, 185, 194);
+				border-radius: 50%;
+				border: 10rpx solid rgb(215, 223, 229);
+			}
+
+			&:nth-child(3) .ranking {
+				background: rgb(211, 163, 136);
+				border-radius: 50%;
+				border: 10rpx solid rgb(235, 201, 190);
+			}
+
+			.content {
+				flex: 1;
+				width: 0;
+				padding: 0 20rpx;
+				display: flex;
+				align-items: center;
+
+				.head-img {
+					width: 90rpx;
+					height: 90rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-radius: 50%;
+					overflow: hidden;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.nickname {
+					color: #333;
+					margin: 0 20rpx;
+					font-size: 28rpx;
+				}
 			}
 		}
 	}
-}
 </style>

pages_promotion/fenxiao/relation.vue

@@ -3,31 +3,26 @@
 		<mescroll-uni ref="mescroll" @getData="getData" top="20" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
-						@click="toDetail(orderItem.fenxiao_order_id)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
 						<view class="order-header">
 							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
 							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green"
-								v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
 							<text class="status-name color-text-orange" v-else>待结算</text>
 						</view>
 
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })"
-										@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
 										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
 										<view>
 											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color font-size-goods-tag">{{
-												$lang('common.currencySymbol') }}</text>
-											<text class="price-color font-size-toolbar">{{ orderItem.commission
-												}}</text>
+											<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
 										</view>
 									</view>
 									<view class="goods-sub-section">
@@ -61,8 +56,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false"
-						v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
+				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false" v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
 			</view>
 		</mescroll-uni>
 
@@ -72,7 +66,7 @@
 </template>
 
 <script>
-		import fenxiaoWords from 'common/js/fenxiao-words.js';
+import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	data() {
@@ -93,7 +87,7 @@ export default {
 		}
 	},
 	onShow() {
-		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
 	},
 	methods: {
 		//获得列表数据
@@ -146,11 +140,9 @@ export default {
 
 <style lang="scss">
 @import './public/css/order.scss';
-
 .goods-wraps {
 	align-items: center;
 }
-
 .goods_list .order-item .order-body .goods-wraps .goods-img,
 .goods_list .order-item .order-body .goods-wraps .goods-info,
 .goods_list .order-item .order-footers {