diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js
index 2fe192a..c04b212 100644
--- a/common/js/goods_detail_base.js
+++ b/common/js/goods_detail_base.js
@@ -1,5 +1,5 @@
 // 商品详情业务
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 
 export default {
 	data() {
diff --git a/components-diy/diy-bargain.vue b/components-diy/diy-bargain.vue
index 373dd8a..2939daf 100644
--- a/components-diy/diy-bargain.vue
+++ b/components-diy/diy-bargain.vue
@@ -186,6 +186,9 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue
index f907f50..c5d392b 100644
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -161,14 +161,13 @@ 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
+		nsGoodsSkuCategory: () => import('@/components/ns-goods-sku/ns-goods-sku-category.vue'),
 	},
 	name: 'diy-category',
 	props: {
diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue
index 52d0b86..b3bf43f 100644
--- a/components-diy/diy-coupon.vue
+++ b/components-diy/diy-coupon.vue
@@ -303,6 +303,10 @@ export default {
 			}
 		}
 	},
+	components: {
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-digit.vue b/components-diy/diy-digit.vue
index 4a51a91..91eacc7 100644
--- a/components-diy/diy-digit.vue
+++ b/components-diy/diy-digit.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<view :style="componentStyle" data-component-name="diy-digit">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
@@ -38,15 +38,13 @@
 </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
+		uvCountTo: () => import('@/components/uv-count-to/uv-count-to.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 	},
 	props: {
 		value: {
diff --git a/components-diy/diy-goods-brand.vue b/components-diy/diy-goods-brand.vue
index 21ea2b2..15949c3 100644
--- a/components-diy/diy-goods-brand.vue
+++ b/components-diy/diy-goods-brand.vue
@@ -19,9 +19,6 @@
 
 <script>
 // 商品品牌
-import uniGrid from '@/components/uni-grid/uni-grid.vue';
-import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
-
 import DiyMinx from './minx.js'
 // 自定义商品品牌展示	
 export default {
@@ -32,8 +29,9 @@ export default {
 		}
 	},
 	components: {
-		uniGrid,
-		uniGridItem
+		uniGrid: () => import('@/components/uni-grid/uni-grid.vue'),
+		uniGridItem: () => import('@/components/uni-grid-item/uni-grid-item.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
 	},
 	data() {
 		return {
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index 5d41156..2cc5d56 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -253,14 +253,14 @@
 </template>
 
 <script>
-import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
 import DiyMinx from './minx.js'
 
 // 自定义商品列表展示
 export default {
 	name: 'diy-goods-list',
 	components: {
-		nsGoodsSkuIndex
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
 	},
 	props: {
 		value: {
diff --git a/components-diy/diy-goods-recommend.vue b/components-diy/diy-goods-recommend.vue
index c179408..ad03f7b 100644
--- a/components-diy/diy-goods-recommend.vue
+++ b/components-diy/diy-goods-recommend.vue
@@ -78,6 +78,9 @@ export default {
 			}
 		}
 	},
+	components: {
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-graphic-nav.vue b/components-diy/diy-graphic-nav.vue
index d645bb3..af1e0ec 100644
--- a/components-diy/diy-graphic-nav.vue
+++ b/components-diy/diy-graphic-nav.vue
@@ -103,6 +103,10 @@ export default {
             type: Object
         }
     },
+    components: {
+        XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+        nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+    },
     mixins: [DiyMinx],
     data() {
         return {
diff --git a/components-diy/diy-groupbuy.vue b/components-diy/diy-groupbuy.vue
index 9583cec..db207fd 100644
--- a/components-diy/diy-groupbuy.vue
+++ b/components-diy/diy-groupbuy.vue
@@ -131,6 +131,9 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-image-nav.vue b/components-diy/diy-image-nav.vue
index 08ef3fd..92fb158 100644
--- a/components-diy/diy-image-nav.vue
+++ b/components-diy/diy-image-nav.vue
@@ -38,13 +38,12 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
 	components: {
-		nsLogin
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 	},
 	props: {
 		value: {
diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue
index 466d481..21ee1a3 100644
--- a/components-diy/diy-index-page.vue
+++ b/components-diy/diy-index-page.vue
@@ -169,8 +169,6 @@
 </template>
 
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue';
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -191,8 +189,9 @@ export default {
 	},
 	mixins: [DiyMinx],
 	components: {
-		nsLoading,
-		MescrollUni
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 	},
 	data() {
 		return {
diff --git a/components-diy/diy-live.vue b/components-diy/diy-live.vue
index 568b58a..9f98473 100644
--- a/components-diy/diy-live.vue
+++ b/components-diy/diy-live.vue
@@ -51,6 +51,9 @@ export default {
 			}
 		}
 	},
+	components: {
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	data() {
 		return {
 			loading: true,
diff --git a/components-diy/diy-map.vue b/components-diy/diy-map.vue
index a0e1fb5..f6660e1 100644
--- a/components-diy/diy-map.vue
+++ b/components-diy/diy-map.vue
@@ -32,6 +32,7 @@ export default {
 	},
 	created() {
 	},
+	
 	mixins: [DiyMinx],
 	watch: {
 		// 组件刷新监听
diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue
index 68c088e..34ff2d2 100644
--- a/components-diy/diy-member-info.vue
+++ b/components-diy/diy-member-info.vue
@@ -242,8 +242,7 @@ let menuButtonInfo = {};
 // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
-// 自定义会员中心——会员信息展示
-import nsContact from '@/components/ns-contact/ns-contact.vue';
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-member-info',
@@ -260,7 +259,9 @@ export default {
 	},
 	mixins: [DiyMinx],
 	components: {
-		nsContact
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
 	},
 	data() {
 		return {
diff --git a/components-diy/diy-member-my-order.vue b/components-diy/diy-member-my-order.vue
index 7c96434..e4c2dd5 100644
--- a/components-diy/diy-member-my-order.vue
+++ b/components-diy/diy-member-my-order.vue
@@ -110,6 +110,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-merch-list.vue b/components-diy/diy-merch-list.vue
index 292eaf2..61cf70e 100644
--- a/components-diy/diy-merch-list.vue
+++ b/components-diy/diy-merch-list.vue
@@ -57,6 +57,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	data() {
 		return {
 			list: [
diff --git a/components-diy/diy-notes.vue b/components-diy/diy-notes.vue
index 317f05e..38ff3bb 100644
--- a/components-diy/diy-notes.vue
+++ b/components-diy/diy-notes.vue
@@ -63,6 +63,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	data() {
 		return {
 			loading: true,
diff --git a/components-diy/diy-notice.vue b/components-diy/diy-notice.vue
index 34c0e20..b2086a6 100644
--- a/components-diy/diy-notice.vue
+++ b/components-diy/diy-notice.vue
@@ -62,6 +62,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-payment-qrcode.vue b/components-diy/diy-payment-qrcode.vue
index 5cd7cae..59144c9 100644
--- a/components-diy/diy-payment-qrcode.vue
+++ b/components-diy/diy-payment-qrcode.vue
@@ -48,6 +48,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {};
diff --git a/components-diy/diy-pinfan.vue b/components-diy/diy-pinfan.vue
index 86486c1..78e1437 100644
--- a/components-diy/diy-pinfan.vue
+++ b/components-diy/diy-pinfan.vue
@@ -175,6 +175,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-pintuan.vue b/components-diy/diy-pintuan.vue
index 2a1f7e7..6b3040a 100644
--- a/components-diy/diy-pintuan.vue
+++ b/components-diy/diy-pintuan.vue
@@ -211,6 +211,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-presale.vue b/components-diy/diy-presale.vue
index 395775e..7d2c734 100644
--- a/components-diy/diy-presale.vue
+++ b/components-diy/diy-presale.vue
@@ -119,6 +119,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	data() {
 		return {
 			loading: true,
diff --git a/components-diy/diy-quick-nav.vue b/components-diy/diy-quick-nav.vue
index 401efb7..ed97bab 100644
--- a/components-diy/diy-quick-nav.vue
+++ b/components-diy/diy-quick-nav.vue
@@ -34,6 +34,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	data() {
 		return {};
 	},
diff --git a/components-diy/diy-rich-text.vue b/components-diy/diy-rich-text.vue
index 05847d2..391ec06 100644
--- a/components-diy/diy-rich-text.vue
+++ b/components-diy/diy-rich-text.vue
@@ -6,7 +6,7 @@
 
 <script>
 // 富文本
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-rich-text',
@@ -15,6 +15,10 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	data() {
 		return {
 			html: ''
diff --git a/components-diy/diy-rubik-cube.vue b/components-diy/diy-rubik-cube.vue
index d69f916..1f0f1c3 100644
--- a/components-diy/diy-rubik-cube.vue
+++ b/components-diy/diy-rubik-cube.vue
@@ -80,7 +80,7 @@
 
 <script>
 // 魔方、橱窗
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-rubik-cube',
diff --git a/components-diy/diy-search.vue b/components-diy/diy-search.vue
index a74830b..0479d91 100644
--- a/components-diy/diy-search.vue
+++ b/components-diy/diy-search.vue
@@ -85,6 +85,10 @@ export default {
 			type: Object
 		},
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
 	data() {
 		return {
 			searchText: '',
diff --git a/components-diy/diy-seckill.vue b/components-diy/diy-seckill.vue
index 860a685..4baf128 100644
--- a/components-diy/diy-seckill.vue
+++ b/components-diy/diy-seckill.vue
@@ -242,6 +242,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-store-label.vue b/components-diy/diy-store-label.vue
index df15f82..5aa713e 100644
--- a/components-diy/diy-store-label.vue
+++ b/components-diy/diy-store-label.vue
@@ -38,6 +38,11 @@ export default {
 			type: Object
 		}
 	},
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
+	},
 	mixins: [DiyMinx],
 	data() {
 		return {
diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index 2717333..27f9d0f 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -62,12 +62,11 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
 	components: {
-		uniPopup
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
 	},
 	props: {
 		value: {
diff --git a/components/ai-chat-message/ai-chat-message.vue b/components/ai-chat-message/ai-chat-message.vue
index 528f729..25b1e39 100644
--- a/components/ai-chat-message/ai-chat-message.vue
+++ b/components/ai-chat-message/ai-chat-message.vue
@@ -357,13 +357,12 @@
   </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
+    nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
   },
   props: {
     // 初始消息列表
diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index 81960cb..40f780c 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -636,28 +636,19 @@
 <script>
 	import payment from './payment.js';
 
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif	
-
 	export default {
 		name: 'common-payment',
 		data() {
 			return {};
 		},
 		components: {
-			nsSelectTime,
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
+			nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+			MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+			nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 			// #ifdef MP-WEIXIN
-			privacyPopup
+			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 			// #endif
 		},
 		props: {
diff --git a/components/common-payment/payment.js b/components/common-payment/payment.js
index 03b039d..2fcfeb6 100644
--- a/components/common-payment/payment.js
+++ b/components/common-payment/payment.js
@@ -1,4 +1,4 @@
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 
 export default {
 	options: {
diff --git a/components/goods-detail-view/goods-detail-view.vue b/components/goods-detail-view/goods-detail-view.vue
index 7590573..26db86a 100644
--- a/components/goods-detail-view/goods-detail-view.vue
+++ b/components/goods-detail-view/goods-detail-view.vue
@@ -420,12 +420,7 @@
 
 <script>
     // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
     import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
     import detail from './detail.js';
 
     export default {
@@ -439,11 +434,11 @@
             }
         },
         components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+            nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+            pengpaiFadeinOut: () => import('@/components/pengpai-fadein-out/pengpai-fadein-out.vue'),
+            toTop: () => import('@/components/toTop/toTop.vue'),
+            xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue'),
         },
         mixins: [scroll, detail]
     };
diff --git a/components/mescroll/mescroll-body.vue b/components/mescroll/mescroll-body.vue
index a570979..2b129e1 100644
--- a/components/mescroll/mescroll-body.vue
+++ b/components/mescroll/mescroll-body.vue
@@ -46,15 +46,11 @@
 import MeScroll from './mescroll-uni.js';
 // 引入全局配置
 import GlobalOption from './mescroll-uni-option.js';
-// 引入空布局组件
-import MescrollEmpty from './components/mescroll-empty.vue';
-// 引入回到顶部组件
-import MescrollTop from './components/mescroll-top.vue';
 
 export default {
 	components: {
-		MescrollEmpty,
-		MescrollTop
+		MescrollEmpty: () => import('./components/mescroll-empty.vue'),
+		MescrollTop: () => import('./components/mescroll-top.vue'),
 	},
 	data() {
 		return {
diff --git a/components/mescroll/mescroll-uni.vue b/components/mescroll/mescroll-uni.vue
index ccc425a..ec7d2a0 100644
--- a/components/mescroll/mescroll-uni.vue
+++ b/components/mescroll/mescroll-uni.vue
@@ -57,18 +57,13 @@
 	import MeScroll from './mescroll-uni.js';
 	// 引入全局配置
 	import GlobalOption from './mescroll-uni-option.js';
-	// 引入空布局组件
-	import MescrollEmpty from './components/mescroll-empty.vue';
-	// 引入回到顶部组件
-	import MescrollTop from './components/mescroll-top.vue';
-
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
 
 	export default {
 		name: 'mescroll-uni',
 		components: {
-			MescrollEmpty,
-			MescrollTop
+			MescrollEmpty: () => import('./components/mescroll-empty.vue'),
+			MescrollTop: () => import('./components/mescroll-top.vue'),
+			nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
 		},
 		props: {
 			down: Object, // 下拉刷新的参数配置
diff --git a/components/mescroll/my-list-mescroll.vue b/components/mescroll/my-list-mescroll.vue
index 834a950..1257356 100644
--- a/components/mescroll/my-list-mescroll.vue
+++ b/components/mescroll/my-list-mescroll.vue
@@ -1,113 +1,112 @@
-<template>
-	<!-- top="xxx"下拉布局往下偏移,防止被悬浮菜单遮住 -->
-	<mescroll
-		v-if="isInit"
-		:top="top"
-		:down="downOption"
-		:fixed="fixed"
-		:topbar="topbar"
-		:background="background"
-		:paddingBoth="paddingBoth"
-		@down="downCallback"
-		:up="upOption"
-		@up="upCallback"
-		@emptyclick="emptyClick"
-		@init="mescrollInit"
-	>
-		<!-- 数据列表 -->
-		<slot name="list"></slot>
-	</mescroll>
-</template>
-
-<script>
-import Mescroll from './mescroll-uni.vue';
-export default {
-	components: {
-		Mescroll
-	},
-	data() {
-		return {
-			mescroll: null, //mescroll实例对象
-			downOption: {
-				auto: false // 不自动加载
-			},
-			upOption: {
-				auto: false, // 不自动加载
-				page: {
-					num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
-					size: 10 // 每页数据的数量
-				},
-				noMoreSize: 2, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
-				empty: {
-					tip: '~ 空空如也 ~', // 提示
-					btnText: '去看看'
-				},
-				onScroll: true
-			},
-			scrollY: 0,
-			isInit: false
-		};
-	},
-	props: {
-		top: [String, Number],
-		size: [String, Number],
-		fixed: {
-			// 是否通过fixed固定mescroll的高度, 默认true
-			type: Boolean,
-			default() {
-				return true;
-			}
-		},
-		background: String,
-		topbar: Boolean,
-		paddingBoth: {
-			type: [String, Number],
-			default() {
-				return 0;
-			}
-		}
-	},
-	created() {
-		if (this.size) this.upOption.page.size = this.size;
-		this.isInit = true;
-	},
-	mounted() {
-		this.mescroll.resetUpScroll();
-		this.listenRefresh();
-	},
-	methods: {
-		// mescroll组件初始化的回调,可获取到mescroll对象
-		mescrollInit(mescroll) {
-			this.mescroll = mescroll;
-		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
-			// loadSwiper();
-			// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 mescroll.num=1, 再触发upCallback方法 )
-			this.mescroll.resetUpScroll();
-			this.listenRefresh();
-		},
-		/*上拉加载的回调: mescroll携带page的参数, 其中num:当前页 从1开始, size:每页数据条数,默认10 */
-		upCallback() {
-			//联网加载数据
-			this.$emit('getData', this.mescroll);
-		},
-		//点击空布局按钮的回调
-		emptyClick() {
-			this.$emit('emptytap', this.mescroll);
-		},
-		//刷新
-		refresh() {
-			this.mescroll.resetUpScroll();
-			this.listenRefresh();
-		},
-		myScrollTo(y, t) {
-			this.mescroll.myScrollTo(y, t);
-		},
-		listenRefresh() {
-			this.$emit('listenRefresh', true);
-		}
-	}
-};
-</script>
+<template>
+	<!-- top="xxx"下拉布局往下偏移,防止被悬浮菜单遮住 -->
+	<mescroll
+		v-if="isInit"
+		:top="top"
+		:down="downOption"
+		:fixed="fixed"
+		:topbar="topbar"
+		:background="background"
+		:paddingBoth="paddingBoth"
+		@down="downCallback"
+		:up="upOption"
+		@up="upCallback"
+		@emptyclick="emptyClick"
+		@init="mescrollInit"
+	>
+		<!-- 数据列表 -->
+		<slot name="list"></slot>
+	</mescroll>
+</template>
+
+<script>
+export default {
+	components: {
+		Mescroll: () => import('./mescroll-uni.vue'),
+	},
+	data() {
+		return {
+			mescroll: null, //mescroll实例对象
+			downOption: {
+				auto: false // 不自动加载
+			},
+			upOption: {
+				auto: false, // 不自动加载
+				page: {
+					num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+					size: 10 // 每页数据的数量
+				},
+				noMoreSize: 2, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5
+				empty: {
+					tip: '~ 空空如也 ~', // 提示
+					btnText: '去看看'
+				},
+				onScroll: true
+			},
+			scrollY: 0,
+			isInit: false
+		};
+	},
+	props: {
+		top: [String, Number],
+		size: [String, Number],
+		fixed: {
+			// 是否通过fixed固定mescroll的高度, 默认true
+			type: Boolean,
+			default() {
+				return true;
+			}
+		},
+		background: String,
+		topbar: Boolean,
+		paddingBoth: {
+			type: [String, Number],
+			default() {
+				return 0;
+			}
+		}
+	},
+	created() {
+		if (this.size) this.upOption.page.size = this.size;
+		this.isInit = true;
+	},
+	mounted() {
+		this.mescroll.resetUpScroll();
+		this.listenRefresh();
+	},
+	methods: {
+		// mescroll组件初始化的回调,可获取到mescroll对象
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+		},
+		/*下拉刷新的回调 */
+		downCallback() {
+			// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
+			// loadSwiper();
+			// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 mescroll.num=1, 再触发upCallback方法 )
+			this.mescroll.resetUpScroll();
+			this.listenRefresh();
+		},
+		/*上拉加载的回调: mescroll携带page的参数, 其中num:当前页 从1开始, size:每页数据条数,默认10 */
+		upCallback() {
+			//联网加载数据
+			this.$emit('getData', this.mescroll);
+		},
+		//点击空布局按钮的回调
+		emptyClick() {
+			this.$emit('emptytap', this.mescroll);
+		},
+		//刷新
+		refresh() {
+			this.mescroll.resetUpScroll();
+			this.listenRefresh();
+		},
+		myScrollTo(y, t) {
+			this.mescroll.myScrollTo(y, t);
+		},
+		listenRefresh() {
+			this.$emit('listenRefresh', true);
+		}
+	}
+};
+</script>
diff --git a/components/ns-adv/ns-adv.vue b/components/ns-adv/ns-adv.vue
index 0d44df7..978f3bd 100644
--- a/components/ns-adv/ns-adv.vue
+++ b/components/ns-adv/ns-adv.vue
@@ -1,120 +1,120 @@
-<template>
-	<view v-if="advList.length" :class="['container-box',className]">
-		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
-			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
-				<view class="image-box">
-					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
-				</view>
-			</swiper-item>
-		</swiper>
-		<view v-else class="container-box item-wrap">
-			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'ns-advert',
-		props: {
-			keyword: {
-				type: String
-			},
-			className: {
-				type: String
-			}
-		},
-		data() {
-			return {
-				advList: [],
-				isImage: false,
-				//滑块的高度(单位px)
-				swiperHeight: 150,
-				//当前索引
-				currentIndex: 0,
-			};
-		},
-		created() {
-			this.getAdvList();
-		},
-		methods: {
-			//获取广告位
-			getAdvList() {
-				var item = {
-					adv_image: '',
-					adv_url: ''
-				};
-				this.$api.sendRequest({
-					url: '/api/adv/detail',
-					data: {
-						keyword: this.keyword
-					},
-					success: res => {
-						if (res.code == 0) {
-							var data = res.data.adv_list;
-							for (var index in data) {
-								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
-							}
-							this.advList = res.data.adv_list;
-
-							//动态设置swiper的高度
-							this.$nextTick(() => {
-								this.setSwiperHeight();
-							});
-						}
-					}
-				});
-			},
-			jumppage(e) {
-				this.$util.diyRedirectTo(e);
-			},
-			imageLoad(data) {
-				this.isImage = true;
-			},
-			//手动切换题目
-			changeSwiper(e) {
-				this.currentIndex = e.detail.current;
-				//动态设置swiper的高度，使用nextTick延时设置
-				this.$nextTick(() => {
-					this.setSwiperHeight();
-				});
-			},
-			//动态设置swiper的高度
-			setSwiperHeight() {
-				if (this.advList.length > 1) {
-					setTimeout(() => {
-						let element = "#content-wrap" + this.currentIndex;
-						let query = uni.createSelectorQuery().in(this);
-						query.select(element).boundingClientRect();
-						query.exec((res) => {
-							if (res && res[0]) {
-								this.swiperHeight = res[0].height;
-							}
-						});
-					}, 10);
-				}
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container-box {
-		width: 100%;
-
-		.item-wrap {
-			border-radius: 10rpx;
-
-			.image-box {
-				border-radius: 10rpx;
-			}
-
-			image {
-				width: 100%;
-				height: auto;
-				border-radius: 10rpx;
-				will-change: transform;
-			}
-		}
-	}
+<template>
+	<view v-if="advList.length" :class="['container-box',className]">
+		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
+			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
+				<view class="image-box">
+					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view v-else class="container-box item-wrap">
+			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-advert',
+		props: {
+			keyword: {
+				type: String
+			},
+			className: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				advList: [],
+				isImage: false,
+				//滑块的高度(单位px)
+				swiperHeight: 150,
+				//当前索引
+				currentIndex: 0,
+			};
+		},
+		created() {
+			this.getAdvList();
+		},
+		methods: {
+			//获取广告位
+			getAdvList() {
+				var item = {
+					adv_image: '',
+					adv_url: ''
+				};
+				this.$api.sendRequest({
+					url: '/api/adv/detail',
+					data: {
+						keyword: this.keyword
+					},
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data.adv_list;
+							for (var index in data) {
+								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
+							}
+							this.advList = res.data.adv_list;
+
+							//动态设置swiper的高度
+							this.$nextTick(() => {
+								this.setSwiperHeight();
+							});
+						}
+					}
+				});
+			},
+			jumppage(e) {
+				this.$util.diyRedirectTo(e);
+			},
+			imageLoad(data) {
+				this.isImage = true;
+			},
+			//手动切换题目
+			changeSwiper(e) {
+				this.currentIndex = e.detail.current;
+				//动态设置swiper的高度，使用nextTick延时设置
+				this.$nextTick(() => {
+					this.setSwiperHeight();
+				});
+			},
+			//动态设置swiper的高度
+			setSwiperHeight() {
+				if (this.advList.length > 1) {
+					setTimeout(() => {
+						let element = "#content-wrap" + this.currentIndex;
+						let query = uni.createSelectorQuery().in(this);
+						query.select(element).boundingClientRect();
+						query.exec((res) => {
+							if (res && res[0]) {
+								this.swiperHeight = res[0].height;
+							}
+						});
+					}, 10);
+				}
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
index e34abb7..e3cd63b 100644
--- a/components/ns-birthday-gift/ns-birthday-gift.vue
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -80,13 +80,12 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'ns-birthday-gift',
 		components: {
-			uniPopup
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+			nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
 		},
 		data() {
 			return {
@@ -164,7 +163,7 @@
 		}
 	};
 </script>
-<style scoped>
+<style lang="scss" scoped>
 	.register-box /deep/ .uni-scroll-view {
 		background: unset !important;
 	}
diff --git a/components/ns-contact/ns-contact.vue b/components/ns-contact/ns-contact.vue
index b69bca8..11ddcb1 100644
--- a/components/ns-contact/ns-contact.vue
+++ b/components/ns-contact/ns-contact.vue
@@ -54,6 +54,9 @@
                 default: ''
             }
         },
+        components: {
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+        },
         data() {
             return {
                 config: null,
diff --git a/components/ns-form/ns-form.vue b/components/ns-form/ns-form.vue
index 452c8df..4ff72b0 100644
--- a/components/ns-form/ns-form.vue
+++ b/components/ns-form/ns-form.vue
@@ -200,11 +200,10 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     export default {
         name: 'ns-form',
         components: {
-            pickRegions
+            pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
         },
         props: {
             data: {
diff --git a/components/ns-goods-action-button/ns-goods-action-button.vue b/components/ns-goods-action-button/ns-goods-action-button.vue
index 1210943..cd61fb8 100644
--- a/components/ns-goods-action-button/ns-goods-action-button.vue
+++ b/components/ns-goods-action-button/ns-goods-action-button.vue
@@ -1,96 +1,98 @@
-<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;
-    }
+<template>
+    <view>
+        <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>
+    </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>
\ No newline at end of file
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.vue b/components/ns-goods-action-icon/ns-goods-action-icon.vue
index f958edd..c4ea7d3 100644
--- a/components/ns-goods-action-icon/ns-goods-action-icon.vue
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
@@ -73,7 +72,7 @@ export default {
 		}
 	},
 	components:{
-		nsContact
+		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
 	},
 	methods: {
 		clickEvent() {
diff --git a/components/ns-goods-recommend/ns-goods-recommend.vue b/components/ns-goods-recommend/ns-goods-recommend.vue
index 10a7d57..242c167 100644
--- a/components/ns-goods-recommend/ns-goods-recommend.vue
+++ b/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -3,15 +3,12 @@
 </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
+			nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
+			nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
 		},
 		data() {
 			return {
diff --git a/components/ns-goods-sku/ns-goods-sku-category.vue b/components/ns-goods-sku/ns-goods-sku-category.vue
index a220d93..07d5b81 100644
--- a/components/ns-goods-sku/ns-goods-sku-category.vue
+++ b/components/ns-goods-sku/ns-goods-sku-category.vue
@@ -82,12 +82,12 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku-new.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku-category',
 		components: {
-			uniPopup
+			uniPopup: () => import('@/components/uni-popup/uni-popup-sku-new.vue'),
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 		},
 		props: {
 			disabled: {
diff --git a/components/ns-goods-sku/ns-goods-sku-index.vue b/components/ns-goods-sku/ns-goods-sku-index.vue
index 4e632ca..8f2e7ab 100644
--- a/components/ns-goods-sku/ns-goods-sku-index.vue
+++ b/components/ns-goods-sku/ns-goods-sku-index.vue
@@ -7,12 +7,12 @@
 </template>
 
 <script>
-	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku-index',
 		components: {
-			nsGoodsSku
+			nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 		},
 		data() {
 			return {
diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue
index a7441d7..dff91b0 100644
--- a/components/ns-goods-sku/ns-goods-sku.vue
+++ b/components/ns-goods-sku/ns-goods-sku.vue
@@ -214,12 +214,12 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
 		components: {
-			uniPopup
+			uniPopup: () => import('@/components/uni-popup/uni-popup-sku.vue'),
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 		},
 		props: {
 			goodsId: {
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index 9bb8391..0274e96 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -97,13 +97,6 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import registerReward from '@/components/register-reward/register-reward.vue';
-
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
-
 	import auth from '@/common/js/auth.js';
 	import validate from '@/common/js/validate.js';
 
@@ -111,10 +104,10 @@
 		mixins: [auth],
 		name: 'ns-login',
 		components: {
-			uniPopup,
-			registerReward,
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+			registerReward: () => import('@/components/register-reward/register-reward.vue'),
 			// #ifdef MP-WEIXIN
-			privacyPopup
+			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 			// #endif
 		},
 		data() {
@@ -781,7 +774,7 @@
 		}
 	}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	/deep/ .reward-popup .uni-popup__wrapper-box {
 		background: none !important;
 		max-width: unset !important;
diff --git a/components/ns-mp-html/ns-mp-html.vue b/components/ns-mp-html/ns-mp-html.vue
index c60d07f..bba3560 100644
--- a/components/ns-mp-html/ns-mp-html.vue
+++ b/components/ns-mp-html/ns-mp-html.vue
@@ -15,7 +15,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.mp-html{
 		/deep/ img{
 			width:100% !important;
diff --git a/components/ns-new-gift/ns-new-gift.vue b/components/ns-new-gift/ns-new-gift.vue
index a6553c9..546426e 100644
--- a/components/ns-new-gift/ns-new-gift.vue
+++ b/components/ns-new-gift/ns-new-gift.vue
@@ -75,11 +75,9 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
-
 	export default {
 		components: {
-			uniPopup
+			uniPopup: () => import('../uni-popup/uni-popup.vue'),
 		},
 		data() {
 			return {
@@ -171,7 +169,7 @@
 	};
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	/deep/ .newgift-content uni-image {
 		width: 113rpx !important;
 		height: 24rpx !important;
@@ -193,7 +191,7 @@
 	}
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.reward-wrap {
 		width: 85vw;
 		height: auto;
diff --git a/components/ns-newform/ns-newform.vue b/components/ns-newform/ns-newform.vue
index b341175..ec37a65 100644
--- a/components/ns-newform/ns-newform.vue
+++ b/components/ns-newform/ns-newform.vue
@@ -278,12 +278,10 @@
 </template>
 
 <script>
-import pickRegions from '@/components/pick-regions/pick-regions.vue'
-
 export default {
 	name: 'ns-form',
 	components: {
-		pickRegions
+		pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
 	},
 	props: {
 		data: {
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
index ba31411..eb3479a 100644
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -43,9 +43,6 @@
 
 <!-- 旧版支付组件 订单表不为order表 的订单支付时使用该组件  -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
     // #ifdef H5
     import { Weixin } from 'common/js/wx-jssdk.js';
     // #endif
@@ -53,8 +50,8 @@
     export default {
         name: 'ns-payment',
         components: {
-            uniPopup,
-            nsSwitch
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+            nsSwitch: () => import('@/components/ns-switch/ns-switch.vue'),
         },
         props: {
             balanceDeduct: {
@@ -112,11 +109,12 @@
             };
         },
         created(e) {
+            let url = '';
             // #ifdef H5
-            let url = window.location.href
+            url = window.location.href
             // #endif
             // #ifndef H5
-            let url = getCurrentPages()[getCurrentPages().length - 1].route
+            url = getCurrentPages()[getCurrentPages().length - 1].route
             // #endif
             let list = url.match('presale/order_list/order_list')
             let detail = url.match('presale/order_detail/order_detail')
diff --git a/components/ns-select-time/ns-select-time.vue b/components/ns-select-time/ns-select-time.vue
index 15a5553..1e6bfc6 100644
--- a/components/ns-select-time/ns-select-time.vue
+++ b/components/ns-select-time/ns-select-time.vue
@@ -10,7 +10,8 @@
 				<view class="body">
 					<!-- 左侧日期选择 -->
 					<scroll-view :scroll-y="true" class="left">
-						<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData" :key="index" @click="selectTime('days', index, 'yes')">
+						<view class="item" :class="index == keyJudge ? 'itemDay' : ''" v-for="(item, index) in dayData"
+							:key="index" @click="selectTime('days', index, 'yes')">
 							<block v-if="item.title">{{ item.title }}</block>
 							<block v-else>{{ item.month }}</block>
 							<text class="itemtext">{{ item.Day }}</text>
@@ -18,9 +19,11 @@
 					</scroll-view>
 					<!-- 右侧时间选择 -->
 					<scroll-view :scroll-y="true" class="right">
-						<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''" v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
+						<view class="item" :class="key == keyJudge && index == keys ? 'itemTime' : ''"
+							v-for="(item, index) in timeData" :key="index" @click="selectTime('time', index, 'yes')">
 							{{ item }}
-							<text v-if="key == keyJudge && index == keys" class="iconfont icon-yuan_checked color-base-text"></text>
+							<text v-if="key == keyJudge && index == keys"
+								class="iconfont icon-yuan_checked color-base-text"></text>
 						</view>
 					</scroll-view>
 				</view>
@@ -30,11 +33,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	name: "nsSelectTime",
 	components: {
-		uniPopup
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
 	},
 	data() {
 		return {
@@ -57,7 +59,7 @@ export default {
 		};
 	},
 	methods: {
-		refresh(){
+		refresh() {
 			this.key = 0;
 			this.keys = 0;
 			this.keyJudge = 0;
@@ -90,7 +92,7 @@ export default {
 				this.key = this.keyJudge;
 				let obj = this.dayData[this.key];
 				obj.time = this.timeData[this.keys];
-				let time = obj.time.replace('立即配送（','').replace('）','');
+				let time = obj.time.replace('立即配送（', '').replace('）', '');
 
 				var dateTime = new Date();
 				var format = time.split('-');
@@ -102,13 +104,13 @@ export default {
 				let date = timeData[1].split('日')[0];
 
 				// 开始时间戳
-				dateTime.setHours(startHours[0],startHours[1],0,0);
-				obj.start_time = dateTime.getTime()/1000;
+				dateTime.setHours(startHours[0], startHours[1], 0, 0);
+				obj.start_time = dateTime.getTime() / 1000;
 				obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
 
 				// 结束时间戳
-				dateTime.setHours(endHours[0],endHours[1],0,0);
-				obj.end_time = dateTime.getTime()/1000;
+				dateTime.setHours(endHours[0], endHours[1], 0, 0);
+				obj.end_time = dateTime.getTime() / 1000;
 				obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
 
 				this.$emit('selectTime', { data: obj, type: judge });
@@ -157,16 +159,16 @@ export default {
 
 			for (let i = 0; i < mostDay; i++) {
 				let objects = {};
-				let dayStr = week[ nowDay ];
+				let dayStr = week[nowDay];
 				// 判断最大可预约时间
-				if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400) ) ) {
+				if (this.obj.dataTime.most_day > 0 && ((startTime + num * 86400) > (startTime + this.obj.dataTime.most_day * 86400))) {
 					this.judge = true;
 					break;
 				}
 				//判断当天是否能够配送、自提
 				if (type == 0 || judge || obj.indexOf(nowDay.toString()) != -1) {
-					let endTime = this.obj.dataTime.delivery_time[ (this.obj.dataTime.delivery_time.length - 1) ].end_time;
-						endTime -= this.obj.dataTime.time_interval * 60;
+					let endTime = this.obj.dataTime.delivery_time[(this.obj.dataTime.delivery_time.length - 1)].end_time;
+					endTime -= this.obj.dataTime.time_interval * 60;
 					switch (num) {
 						case 1:
 							if (i == 0) {
@@ -222,7 +224,7 @@ export default {
 					nowDay = 0;
 				}
 				num += 1;
-				
+
 				if (this.obj.dataTime.most_day == 0 && i == 0) {
 					this.judge = true;
 				}
@@ -242,25 +244,25 @@ export default {
 			}
 
 			let timeData = [];
-			
+
 			if (!this.obj.dataTime.delivery_time) {
-				this.obj.dataTime.delivery_time = [ {start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time} ]
+				this.obj.dataTime.delivery_time = [{ start_time: this.obj.dataTime.start_time, end_time: this.obj.dataTime.end_time }]
 			}
-			
+
 			//判断选中是否为当天
 			let remainder = 0;
 			//当天配送自提的话，向后推迟30分钟
 			let newDayTime = JSON.parse(JSON.stringify(this.dayTime));
 			// newDayTime = Math.ceil(this.dayTime / 600) * 600 + 1800;
-			
+
 			//判断选中是否为当天
 			let timeJudage = false;
 			if (this.dayData[this.keyJudge] && this.dayData[this.keyJudge].type && newDayTime > this.obj.dataTime.start_time) timeJudage = true;
-			
+
 			let timeInterval = this.obj.dataTime.time_interval ? this.obj.dataTime.time_interval * 60 : 1200;
-			
+
 			this.obj.dataTime.delivery_time.forEach(item => {
-				item.end_time = item.end_time ? item.end_time : 86400; 
+				item.end_time = item.end_time ? item.end_time : 86400;
 				let num = parseInt((parseInt(item.end_time) - parseInt(item.start_time)) / timeInterval);
 				let time = timeJudage ? parseInt(newDayTime) : parseInt(item.start_time);
 				for (let i = 0; i < num; i++) {
@@ -271,12 +273,12 @@ export default {
 								if (time <= item.end_time) {
 									let text = '';
 									if (this.obj.delivery.delivery_type == 'local' && i == 0) {
-										text = '立即配送（'+ this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
+										text = '立即配送（' + this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval) + '）';
 									} else {
 										text = this.$util.getTimeStr(time) + '-' + this.$util.getTimeStr(time + timeInterval);
 									}
 									timeData.push(text);
-								} 
+								}
 							} else {
 								timeData.push(this.$util.getTimeStr(time));
 							}
@@ -301,6 +303,7 @@ export default {
 <style lang="scss" scoped>
 .box {
 	height: 728rpx;
+
 	.title {
 		padding: 0 30rpx;
 		box-sizing: border-box;
@@ -311,6 +314,7 @@ export default {
 		height: 90rpx;
 		line-height: 90rpx;
 		border-bottom: 1rpx solid #f7f4f4;
+
 		.icon-close {
 			font-size: 26rpx;
 			color: #909399;
@@ -320,15 +324,18 @@ export default {
 			transform: translateY(-50%);
 		}
 	}
+
 	.body {
 		width: 100%;
 		height: calc(100% - 90rpx);
 		display: flex;
 		align-items: center;
+
 		.left {
 			width: 230rpx;
 			background: #f8f8f8;
 			height: 100%;
+
 			.item {
 				width: 100%;
 				padding: 16rpx 30rpx;
@@ -338,15 +345,18 @@ export default {
 				display: flex;
 				align-items: center;
 			}
+
 			.itemDay {
 				background: #ffffff;
 			}
 		}
+
 		.right {
 			width: calc(100% - 230rpx);
 			height: 100%;
 			padding: 0 30rpx;
 			box-sizing: border-box;
+
 			.item {
 				width: 100%;
 				font-size: 24rpx;
@@ -355,11 +365,13 @@ export default {
 				align-items: center;
 				justify-content: space-between;
 				height: 72rpx;
+
 				.icon-yuan_checked {
 					font-size: 38rpx;
 					margin-right: 30rpx;
 				}
 			}
+
 			.itemTime {
 				color: var(--main-color);
 			}
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 4147770..b6dfb0d 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -43,9 +43,6 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
     // #ifdef H5
     import {
         Weixin
@@ -55,8 +52,8 @@
     export default {
         name: 'payment',
         components: {
-            uniPopup,
-            nsSwitch
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+            nsSwitch: () => import('@/components/ns-switch/ns-switch.vue'),
         },
         props: {
             // 是否可用余额支付
diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue
index 4260088..fe6e384 100644
--- a/components/pick-regions/pick-regions.vue
+++ b/components/pick-regions/pick-regions.vue
@@ -44,6 +44,9 @@
                 type: String
             }
         },
+        components: {
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+        },
         data() {
             return {
                 pickerValueArray: [],
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
index b567b1f..96e3437 100644
--- a/components/register-reward/register-reward.vue
+++ b/components/register-reward/register-reward.vue
@@ -78,13 +78,11 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
 		components: {
-			uniPopup
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
 		},
 		data() {
 			return {
diff --git a/components/uni-grid-item/uni-grid-item.vue b/components/uni-grid-item/uni-grid-item.vue
index e7fb018..e47833e 100644
--- a/components/uni-grid-item/uni-grid-item.vue
+++ b/components/uni-grid-item/uni-grid-item.vue
@@ -19,11 +19,10 @@
 </template>
 
 <script>
-import uniBadge from '@/components/uni-badge/uni-badge.vue';
 export default {
 	name: 'UniGridItem',
 	components: {
-		uniBadge
+		uniBadge: () => import('@/components/uni-badge/uni-badge.vue'),
 	},
 	props: {
 		// 类型：可选值，dot：圆点；badge：角标；image：图片
diff --git a/components/wxwork-contact/wxwork-contact.vue b/components/wxwork-contact/wxwork-contact.vue
index 65701bf..47a0f98 100644
--- a/components/wxwork-contact/wxwork-contact.vue
+++ b/components/wxwork-contact/wxwork-contact.vue
@@ -79,6 +79,9 @@
                 default: true
             }
         },
+        components: {
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+        },
         data() {
             return {
                 wxWorkSDK: null
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6e69e86..0e5471c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -148,26 +148,20 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
-import diyJs from '@/common/js/diy.js';
-import toTop from '@/components/toTop/toTop.vue';
-import scroll from '@/common/js/scroll-view.js';
 
+
+import diyJs from '@/common/js/diy.js';
+import scroll from '@/common/js/scroll-view.js';
 import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		uniPopup,
-		nsNavbar,
-		toTop,
-		nsLogin,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	mixins: [diyJs, scroll, indexJs]
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index 07cdbbe..6deb2a4 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -1,7 +1,8 @@
 <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>
@@ -20,51 +21,67 @@
 								<text class="iconfont icon-right"></text>
 							</view>
 						</view>
-						<view class="store-wrap" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
+						<view class="store-wrap"
+							v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
 							<text class="iconfont icon-dianpu"></text>
-							<text class="name">{{globalStoreInfo.store_name}}</text>
+							<text class="name">{{ globalStoreInfo.store_name }}</text>
 						</view>
 						<block v-for="(item, cartIndex) in siteItem.cartList" :key="cartIndex">
 							<view class="cart-goods" @touchstart="touchS($event)" @touchend="touchE($event, item)">
 								<view class="goods-wrap" :class="{ edit: item.edit }">
-									<view class="iconfont" :class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'" @click="singleElection(siteIndex, cartIndex)"></view>
+									<view class="iconfont"
+										:class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"
+										@click="singleElection(siteIndex, cartIndex)"></view>
 									<view @click="toGoodsDetail(item)" class="goods-img">
-										<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(siteIndex, cartIndex)" mode="aspectFill"/>
+										<image :src="$util.img(item.sku_image, { size: 'mid' })"
+											@error="imageError(siteIndex, cartIndex)" mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view>
-											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ?
+												item.en_goods_name : item.goods_name }}</view>
 											<view class="sku-wrap">
 												<view class="sku">
-													<view class="goods-spec" v-if="item.sku_spec_format.length" @click="selectSku(item)">
+													<view class="goods-spec" v-if="item.sku_spec_format.length"
+														@click="selectSku(item)">
 														<block v-for="(x, i) in item.sku_spec_format" :key="i">
 															{{ x.spec_name }}:{{ x.spec_value_name }}
 															{{ i < item.sku_spec_format.length - 1 ? ';' : '' }}
-														</block>
+																</block>
 													</view>
-													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+													<text class="iconfont icon-unfold"
+														v-if="item.sku_spec_format.length"></text>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<block v-if="item.promotion_type == 1">
-												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+												<block
+													v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<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>
@@ -73,19 +90,25 @@
 												<block v-if="Number(item.member_price) > 0">
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<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>
@@ -100,14 +123,16 @@
 											<text class="discount-tag">满减</text>
 											<scroll-view scroll-x="true" class="scroll-view">
 												<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
-													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{ mitem.discount_money }}</text>
+													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{
+														mitem.discount_money }}</text>
 													<text class="interval" v-if="mitem.discount_money"></text>
 												</block>
 											</scroll-view>
 										</view>
 									</view>
 								</view>
-								<view class="item-del color-base-bg" :class="{ show: item.edit }" @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
+								<view class="item-del color-base-bg" :class="{ show: item.edit }"
+									@click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
 							</view>
 						</block>
 					</view>
@@ -124,7 +149,8 @@
 								<view class="goods-wrap">
 									<view class="iconfont icon-yuan_checked color-tip"></view>
 									<view class="goods-img">
-										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" mode="aspectFill"/>
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+											mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -134,23 +160,32 @@
 													<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 														{{ x.spec_name }}:{{ x.spec_value_name }}
 														{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-													</block>
+															</block>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<view class="goods-price">
 												<text class="bottom-price price-style large">
-													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
-														<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>
@@ -165,7 +200,8 @@
 				<block v-else>
 					<view class="cart-empty">
 						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
-						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
+						<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>
@@ -201,7 +237,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>
 
@@ -213,9 +249,11 @@
 					</view>
 					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
 						<view class="coupon-item">
-							<view class="coupon-info" :style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+							<view class="coupon-info"
+								:style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 								<view class="info-wrap">
-									<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+									<image class="coupon-line" mode="heightFix"
+										:src="$util.img('public/uniapp/coupon/coupon_line.png')" />
 									<view class="coupon-money">
 										<template v-if="discount.coupon_info.type == 'reward'">
 											<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -237,24 +275,30 @@
 								</view>
 								<view class="desc-wrap">
 									<view class="coupon-name">{{ discount.coupon_info.coupon_name }}</view>
-									<view v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0" class="limit">
+									<view
+										v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0"
+										class="limit">
 										最多可抵￥{{ discount.coupon_info.discount_limit }}
 									</view>
-									<view class="time font-size-goods-tag" v-if="discount.coupon_info.validity_type == 0">
+									<view class="time font-size-goods-tag"
+										v-if="discount.coupon_info.validity_type == 0">
 										有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
 									</view>
-									<view class="time font-size-goods-tag" v-else-if="discount.coupon_info.validity_type == 1">
+									<view class="time font-size-goods-tag"
+										v-else-if="discount.coupon_info.validity_type == 1">
 										有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
 									</view>
 									<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
 								</view>
 
-								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" disabled>已领取</button>
-								<button type="primary" v-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>
@@ -262,7 +306,8 @@
 
 		<view class="cart-bottom" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }" v-if="hasData">
 			<view class="all-election" @click="allElection">
-				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+				</view>
 				<text>{{ $lang('allElection') }}</text>
 			</view>
 			<view class="settlement-info" :style="{ visibility: isAction ? 'hidden' : 'visible' }">
@@ -270,8 +315,10 @@
 					{{ $lang('total') }}：
 					<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 					<block v-if="Object.keys(discount).length">
-						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</text>
-						<text class="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>
@@ -288,16 +335,20 @@
 			</view>
 			<view class="action-btn" v-else>
 				<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
-					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{ totalCount }})
+					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{
+						totalCount }})
 				</button>
-				<button type="primary" size="mini" class="mini" @click="settlement" disabled
-					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>
@@ -315,44 +366,36 @@
 </template>
 
 <script>
-	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 {
-		components: {
-		nsGoodsRecommend,
-		uniNumberBox,
-		toTop,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
+import scroll from '@/common/js/scroll-view.js';
+import cart from './public/js/cart.js';
+
+export default {
+	components: {
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
-		mixins: [scroll, cart]
-	};
+	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>
\ No newline at end of file
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index 57902b4..98a0413 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -25,17 +25,13 @@
 </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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_goods/components/goods-detail-view/goods-detail-view.vue b/pages_goods/components/goods-detail-view/goods-detail-view.vue
index 7590573..c248227 100644
--- a/pages_goods/components/goods-detail-view/goods-detail-view.vue
+++ b/pages_goods/components/goods-detail-view/goods-detail-view.vue
@@ -420,12 +420,7 @@
 
 <script>
     // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
     import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
     import detail from './detail.js';
 
     export default {
@@ -439,11 +434,11 @@
             }
         },
         components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+            nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+            pengpaiFadeinOut: () => import('@/components/pengpai-fadein-out/pengpai-fadein-out.vue'),
+            toTop: () => import('@/components/toTop/toTop.vue'),
+            xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue')
         },
         mixins: [scroll, detail]
     };
diff --git a/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue b/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue
index d102e84..f6dbd85 100644
--- a/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue
+++ b/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue
@@ -2,44 +2,51 @@
 	<!-- 当前商品参与的营销活动入口 -->
 	<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 })">
+			<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', { 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 })">
+			<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 })">
+			<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 })">
+			<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 })">
+			<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 })">
+			<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>
@@ -64,7 +71,7 @@ export default {
 			}
 		};
 	},
-	created() {},
+	created() { },
 	methods: {
 		refresh(goodsPromotion) {
 			this.goodsPromotion = goodsPromotion;
@@ -79,14 +86,16 @@ export default {
 <style lang="scss">
 .ns-goods-promotion {
 	background-color: #fff;
-	& > view {
-	}
+
+	&>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;
 		}
@@ -115,6 +124,7 @@ export default {
 		.img-wrap {
 			width: 38rpx;
 			height: 38rpx;
+
 			image {
 				width: 100%;
 				height: 100%;
diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue
index 875d0e2..c4ea58f 100644
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="themeColor">
 		<!-- #ifndef H5 -->
-	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
+		<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
 			<ns-navbar :data="navbarData" :isBack="true"></ns-navbar>
 		</view> -->
 		<!-- #endif -->
@@ -15,21 +15,19 @@
 						<view class="icon-box"><text class="iconfont icon-tutechan"></text></view>
 						<view class="price-box">
 							<view class="promotion-text">限时折扣</view>
-							<view class="sale-num" v-if="goodsSkuDetail.sale_show">已售{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }}</view>
+							<view class="sale-num" v-if="goodsSkuDetail.sale_show">已售{{ goodsSkuDetail.sale_num }}{{
+								goodsSkuDetail.unit }}</view>
 						</view>
 					</view>
 
 					<view class="countdown">
 						<view class="txt">距结束仅剩</view>
 						<view class="clockrun">
-							<uni-count-down
-								:day="goodsSkuDetail.discountTimeMachine.d"
+							<uni-count-down :day="goodsSkuDetail.discountTimeMachine.d"
 								:hour="goodsSkuDetail.discountTimeMachine.h"
 								:minute="goodsSkuDetail.discountTimeMachine.i"
-								:second="goodsSkuDetail.discountTimeMachine.s"
-								splitorColor="#ffffff"
-								backgroundColor="#ffffff"
-							/>
+								:second="goodsSkuDetail.discountTimeMachine.s" splitorColor="#ffffff"
+								backgroundColor="#ffffff" />
 						</view>
 					</view>
 				</view>
@@ -40,16 +38,21 @@
 						<block v-if="goodsSkuDetail.isinformation == 0">
 							<template v-if="showDiscount">
 								<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
-								<text class="price price-font">{{ parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[0] }}</text>
-								<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[1] }}</text>
+								<text class="price price-font">{{
+									parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[0] }}</text>
+								<text class="price-symbol price-font">.{{
+									parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[1] }}</text>
 							</template>
 							<template v-else>
 								<template v-if="goodsSkuDetail.member_price > 0">
 									<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-font">{{ parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[0] }}</text>
-									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-font">{{
+										parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[0] }}</text>
+									<text class="price-symbol price-font">.{{
+										parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[1] }}</text>
 									<view class="member-vip-wrap">
-										<image :src="$util.img('public/uniapp/goods/member_vip.png')" mode="aspectFit"/>
+										<image :src="$util.img('public/uniapp/goods/member_vip.png')"
+											mode="aspectFit" />
 									</view>
 									<view class="member-price-wrap" v-if="!goodsSkuDetail.market_price_show">
 										<text class="unit price-font">原价</text>
@@ -59,43 +62,54 @@
 								</template>
 								<template v-else>
 									<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-font">{{ parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[0] }}</text>
-									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-font">{{
+										parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[0] }}</text>
+									<text class="price-symbol price-font">.{{
+										parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[1] }}</text>
 								</template>
 							</template>
 							<view class="market-price-wrap" v-if="goodsSkuDetail.market_price_show">
-								<text class="unit price-font" v-if="(showDiscount && goodsSkuDetail.price > 0) || goodsSkuDetail.market_price > 0">
+								<text class="unit price-font"
+									v-if="(showDiscount && goodsSkuDetail.price > 0) || goodsSkuDetail.market_price > 0">
 									{{ $lang('common.currencySymbol') }}
 								</text>
-								<text class="money price-font" v-if="showDiscount && goodsSkuDetail.price > 0">{{ goodsSkuDetail.price }}</text>
-								<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{ goodsSkuDetail.market_price }}</text>
+								<text class="money price-font" v-if="showDiscount && goodsSkuDetail.price > 0">{{
+									goodsSkuDetail.price }}</text>
+								<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{
+									goodsSkuDetail.market_price }}</text>
 							</view>
 							<view class="follow-and-share">
 								<text class="follow iconfont icon-share" @click="openSharePopup()"></text>
-								<text class="share iconfont" @click="editCollection()" :class="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"></text>
+								<text class="share iconfont" @click="editCollection()"
+									:class="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"></text>
 							</view>
 						</block>
 						<block v-else>
 							<template>
-								<text class="price price-font" style="font-weight: 600;">{{$lang('makebtn')}}</text>
+								<text class="price price-font" style="font-weight: 600;">{{ $lang('makebtn') }}</text>
 							</template>
 						</block>
 					</view>
-					
+
 					<view class="goods-module-wrap info">
-						<text class="sku-name-wrap">{{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}</text>
-						<text class="introduction" v-if="goodsSkuDetail.introduction" :style="{ color: goodsSkuDetail.config ? goodsSkuDetail.config.introduction_color : '' }">
+						<text class="sku-name-wrap">{{ isEnEnv ? goodsSkuDetail.en_goods_name :
+							goodsSkuDetail.goods_name }}</text>
+						<text class="introduction" v-if="goodsSkuDetail.introduction"
+							:style="{ color: goodsSkuDetail.config ? goodsSkuDetail.config.introduction_color : '' }">
 							{{ goodsSkuDetail.introduction }}
 						</text>
 						<view class="goods-tag-list" v-if="goodsSkuDetail.label_name">
 							<text class="tag-item">{{ goodsSkuDetail.label_name }}</text>
 						</view>
 						<view class="logistics-wrap">
-							<text v-if="goodsSkuDetail.stock_show">{{$lang('stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}}</text>
-							<text v-if="goodsSkuDetail.sale_show">{{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }}</text>
+							<text v-if="goodsSkuDetail.stock_show">{{ $lang('stock') }}: {{ goodsSkuDetail.stock
+								+ goodsSkuDetail.unit }}</text>
+							<text v-if="goodsSkuDetail.sale_show">{{ $lang('sales') }}: {{
+								goodsSkuDetail.sale_num + goodsSkuDetail.unit
+							}}</text>
 						</view>
 						<!-- 会员卡 -->
-					<!-- 	<view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
+						<!-- 	<view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
 							<text class="iconfont icon-huiyuan"></text>
 							<view class="info">开通{{ membercard.level_name }}仅需{{ membercard.member_price }}元</view>
 							<text class="btn">立即开通</text>
@@ -104,29 +118,33 @@
 				</view>
 
 				<!-- 当前商品参与的营销活动入口 -->
-				<view class="group-wrap"><ns-goods-promotion ref="goodsPromotion" promotion="discount"></ns-goods-promotion></view>
+				<view class="group-wrap"><ns-goods-promotion ref="goodsPromotion"
+						promotion="discount"></ns-goods-promotion></view>
 
-				<view class="group-wrap fenxiao-detail"
-					v-if="
-						goodsSkuDetail.fenxiao_detail &&
-							goodsSkuDetail.fenxiao_detail.words_account &&
-							goodsSkuDetail.fenxiao_detail.commission_money > 0 &&
-							goodsSkuDetail.fenxiao_detail.is_commission_money == 1
-					">
-					<view class="title color-base-text">{{$lang('commission')}}</view>
+				<view class="group-wrap fenxiao-detail" v-if="
+					goodsSkuDetail.fenxiao_detail &&
+					goodsSkuDetail.fenxiao_detail.words_account &&
+					goodsSkuDetail.fenxiao_detail.commission_money > 0 &&
+					goodsSkuDetail.fenxiao_detail.is_commission_money == 1
+				">
+					<view class="title color-base-text">{{ $lang('commission') }}</view>
 					<view class="commission-ratio">
 						<view class="item">
-							<view>One {{$lang('commissiontext')}}</view>
+							<view>One {{ $lang('commissiontext') }}</view>
 							<view class="price-color">
 								<text class="unit">￥</text>
-								<text class="money">{{ parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[0] }}</text>
-								<text class="unit">.{{ parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[1] }}</text>
+								<text class="money">{{
+									parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[0]
+								}}</text>
+								<text class="unit">.{{
+									parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[1]
+								}}</text>
 							</view>
 						</view>
 					</view>
 				</view>
 
-			<!-- 	<view class="group-wrap card-info" v-if="goodsSkuDetail.goods_class == 5 && goodsSkuDetail.card_info && goodsSkuDetail.card_info.relation_goods.length">
+				<!-- 	<view class="group-wrap card-info" v-if="goodsSkuDetail.goods_class == 5 && goodsSkuDetail.card_info && goodsSkuDetail.card_info.relation_goods.length">
 					<view class="card-title">- 套餐包含以下的服务及商品 -</view>
 					<view class="card-desc" v-if="goodsSkuDetail.card_info.card_type == 'timecard' || goodsSkuDetail.card_info.card_type == 'commoncard'">
 						{{ goodsSkuDetail.card_info.card_type == 'commoncard' ? '卡项内项目/商品总的可用次数为' + goodsSkuDetail.card_info.common_num + ' ,' : '' }}
@@ -158,15 +176,16 @@
 			<!--多规格-->
 			<template v-slot:skuspec>
 				<view class="item selected-sku-spec" @click="buyNow()">
-					<view class="label">{{$lang('spec')}}</view>
+					<view class="label">{{ $lang('spec') }}</view>
 					<view class="box">
-						<text v-for="(item, index) in goodsSkuDetail.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+						<text v-for="(item, index) in goodsSkuDetail.sku_spec_format" :key="index">{{ item.spec_name
+						}}/{{ item.spec_value_name }}</text>
 					</view>
 					<text class="iconfont iconright"></text>
 				</view>
 			</template>
 			<!-- 入口区域 -->
-		<!-- 	<template v-slot:entrance>
+			<!-- 	<template v-slot:entrance>
 				<view class="item coupon" v-if="couponList.length && couponList[0]['useState'] != 2" @click="openCouponPopup()">
 					<view class="label">领券</view>
 					<view class="coupon-list">
@@ -202,16 +221,9 @@
 			<!-- 业务区域 -->
 			<template v-slot:business>
 				<!-- SKU选择 -->
-				<ns-goods-sku
-					v-if="goodsSkuDetail.goods_id"
-					ref="goodsSku"
-					@refresh="refreshGoodsSkuDetail"
-					:goods-id="goodsSkuDetail.goods_id"
-					:goods-detail="goodsSkuDetail"
-					:max-buy="goodsSkuDetail.max_buy"
-					:min-buy="goodsSkuDetail.min_buy"
-					@getSkuId="setSkuId"
-				></ns-goods-sku>
+				<ns-goods-sku v-if="goodsSkuDetail.goods_id" ref="goodsSku" @refresh="refreshGoodsSkuDetail"
+					:goods-id="goodsSkuDetail.goods_id" :goods-detail="goodsSkuDetail" :max-buy="goodsSkuDetail.max_buy"
+					:min-buy="goodsSkuDetail.min_buy" @getSkuId="setSkuId"></ns-goods-sku>
 
 				<!-- 组合套餐 -->
 				<view v-if="bundling.length && bundling[0].bl_name && addonIsExist.bundling">
@@ -228,21 +240,25 @@
 							<view class="goods-wrap">
 								<view class="goods-item" @click="toGoodsDetail(skuId)" v-if="bundlingType == true">
 									<view class="combo-img">
-										<image :src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })" @error="imageError()" />
+										<image :src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })"
+											@error="imageError()" />
 										<view class="price-wrap">
 											<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 											<text class="price price-font">{{ goodsSkuDetail.price }}</text>
 										</view>
 									</view>
-									<text class="name">{{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}</text>
+									<text class="name">{{ isEnEnv ? goodsSkuDetail.en_goods_name :
+										goodsSkuDetail.goods_name }}</text>
 								</view>
 								<block v-for="(item, index) in bundling[0].bundling_goods" :key="index">
 									<template v-if="index < 3">
 										<view class="goods-item" @click="toGoodsDetail(item.sku_id)">
 											<view class="combo-img">
-												<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="bundlingImageError(0, index)" />
+												<image :src="$util.img(item.sku_image, { size: 'mid' })"
+													@error="bundlingImageError(0, index)" />
 												<view class="price-wrap">
-													<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
+													<text class="unit price-font">{{ $lang('common.currencySymbol')
+													}}</text>
 													<text class="price price-font">{{ item.price }}</text>
 												</view>
 											</view>
@@ -273,22 +289,35 @@
 													<view class="goods-wrap">
 														<view class="goods-item" @click="toGoodsDetail(skuId)">
 															<view class="combo-img">
-																<image :src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })" @error="imageError()" />
+																<image
+																	:src="$util.img(goodsSkuDetail.sku_image, { size: 'mid' })"
+																	@error="imageError()" />
 																<view class="price-wrap">
-																	<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-																	<text class="price price-font">{{ goodsSkuDetail.price }}</text>
+																	<text class="unit price-font">{{
+																		$lang('common.currencySymbol')
+																	}}</text>
+																	<text class="price price-font">{{
+																		goodsSkuDetail.price }}</text>
 																</view>
 															</view>
-															<text class="name">{{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}</text>
+															<text class="name">{{ isEnEnv ? goodsSkuDetail.en_goods_name
+																:
+																goodsSkuDetail.goods_name }}</text>
 														</view>
-														<block v-for="(goods, goods_index) in item.bundling_goods" :key="goods_index">
+														<block v-for="(goods, goods_index) in item.bundling_goods"
+															:key="goods_index">
 															<template v-if="goods_index < 3">
-																<view class="goods-item" @click="toGoodsDetail(goods.sku_id)">
+																<view class="goods-item"
+																	@click="toGoodsDetail(goods.sku_id)">
 																	<view class="combo-img">
-																		<image :src="$util.img(goods.sku_image, { size: 'mid' })" @error="bundlingImageError(index, goods_index)" />
+																		<image
+																			:src="$util.img(goods.sku_image, { size: 'mid' })"
+																			@error="bundlingImageError(index, goods_index)" />
 																		<view class="price-wrap">
-																			<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
-																			<text class="price price-font">{{ goods.price }}</text>
+																			<text class="unit price-font">{{
+																				$lang('common.currencySymbol') }}</text>
+																			<text class="price price-font">{{
+																				goods.price }}</text>
 																		</view>
 																	</view>
 																	<text class="name">{{ goods.sku_name }}</text>
@@ -299,9 +328,11 @@
 												</scroll-view>
 												<view class="bundling-price-wrap">
 													<text class="label">套餐价</text>
-													<text class="unit price-color">{{ $lang('common.currencySymbol') }}</text>
+													<text class="unit price-color">{{ $lang('common.currencySymbol')
+													}}</text>
 													<text class="price price-color">{{ item.bl_price }}</text>
-													<button type="primary" size="mini" class="mini" @click="toComoDetail(item.bl_id)">立即购买</button>
+													<button type="primary" size="mini" class="mini"
+														@click="toComoDetail(item.bl_id)">立即购买</button>
 												</view>
 											</view>
 										</block>
@@ -321,10 +352,13 @@
 								<text class="iconfont icon-close"></text>
 							</view>
 							<scroll-view class="coupon-body" scroll-y>
-								<view class="coupon-item ns-gradient-diy-goods-list" v-for="(item, index) in couponList" :key="index" v-if="hackReset">
-									<view class="coupon-info" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+								<view class="coupon-item ns-gradient-diy-goods-list" v-for="(item, index) in couponList"
+									:key="index" v-if="hackReset">
+									<view class="coupon-info"
+										:style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 										<view class="info-wrap" :class="{ disabled: item.useState == 2 }">
-											<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+											<image class="coupon-line" mode="heightFix"
+												:src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
 											<view class="coupon-money">
 												<template v-if="item.type == 'reward'">
 													<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -346,9 +380,14 @@
 										</view>
 										<view class="desc-wrap">
 											<view class="coupon-name">{{ item.coupon_name }}</view>
-											<view v-if="item.type == 'discount' && item.discount_limit > 0" class="limit">最多可抵￥{{ item.discount_limit }}</view>
-											<view class="time font-size-goods-tag" v-if="item.validity_type == 0">有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
-											<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">有效期：领取之日起{{ item.fixed_term }}天内有效</view>
+											<view v-if="item.type == 'discount' && item.discount_limit > 0"
+												class="limit">最多可抵￥{{
+													item.discount_limit }}</view>
+											<view class="time font-size-goods-tag" v-if="item.validity_type == 0">有效期：{{
+												$util.timeStampTurnTime(item.end_time) }}</view>
+											<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">
+												有效期：领取之日起{{
+													item.fixed_term }}天内有效</view>
 											<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
 										</view>
 
@@ -358,7 +397,8 @@
 									</view>
 								</view>
 							</scroll-view>
-							<view class="button-box"><button type="primary" @click="closeCouponPopup()">确定</button></view>
+							<view class="button-box"><button type="primary" @click="closeCouponPopup()">确定</button>
+							</view>
 						</view>
 					</uni-popup>
 				</view>
@@ -385,7 +425,8 @@
 									<text class="font-size-base">{{ manjian.free_shipping }}</text>
 								</view>
 							</scroll-view>
-							<view class="button-box"><button type="primary" @click="closeManjianPopup()">确定</button></view>
+							<view class="button-box"><button type="primary" @click="closeManjianPopup()">确定</button>
+							</view>
 						</view>
 					</uni-popup>
 				</view>
@@ -397,8 +438,8 @@
 								<text>商品留言</text>
 								<text class="iconfont icon-close"></text>
 							</view>
-							<scroll-view scroll-y class="manjian-body" >
-							<!-- 	<view class="item" v-if="manjian.manjian != undefined" style="display: flex;">
+							<scroll-view scroll-y class="manjian-body">
+								<!-- 	<view class="item" v-if="manjian.manjian != undefined" style="display: flex;">
 									<view class="free-tip color-base-text color-base-border">满减</view>
 									<text class="font-size-base">{{ manjian.manjian }}</text>
 								</view>
@@ -412,10 +453,11 @@
 								</view> -->
 								<!-- v-if="goodsSkuDetail.goodsForm" -->
 								<view style="padding: 0 30rpx;">
-									<ns-form :data="informationform"  ref="form"></ns-form>
+									<ns-form :data="informationform" ref="form"></ns-form>
 								</view>
 							</scroll-view>
-							<view class="button-box"><button type="primary" @click="saveubfirnation()">确定</button></view>
+							<view class="button-box"><button type="primary" @click="saveubfirnation()">确定</button>
+							</view>
 						</view>
 					</uni-popup>
 					<!-- <uni-popup ref="informationPopup" type="bottom" class="sku-layer" @change="popclose">
@@ -435,77 +477,74 @@
 			<template v-slot:action>
 				<!-- 商品底部导航 -->
 				<ns-goods-action :safeArea="isIphoneX">
-					
+
 					<template v-if="goodsSkuDetail.goods_state == 1">
-						
-							<ns-goods-action-button
-								class="goods-action-button active3"
-								:disabled-text="$lang('status')"
-								:disabled="true"
-								v-if="goodsSkuDetail.store_goods_status != undefined && goodsSkuDetail.store_goods_status != 1"
-							/>
+
+						<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('status')"
+							:disabled="true"
+							v-if="goodsSkuDetail.store_goods_status != undefined && goodsSkuDetail.store_goods_status != 1" />
+						<block v-else>
+							<ns-goods-action-icon :text="$lang('home')" icon="icon-shouye1" @click="goHome" />
+
+							<!-- #ifdef MP-WEIXIN -->
+							<ns-goods-action-icon :text="$lang('cart')"
+								:cornerMarkBg="themeStyle.goods_detail.goods_cart_num_corner" icon="icon-gouwuche2"
+								:corner-mark="cartNumber > 0 ? cartNumber + '' : ''" @click="goCart" />
+							<ns-goods-action-icon :text="$lang('kefu')" icon="icox icox-kefu" :send-data="contactData"
+								:chatParam="chatRoomParams" />
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<ns-goods-action-icon :text="$lang('follow')"
+								:icon="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"
+								@click="editCollection" />
+							<!-- #endif -->
+							<block v-if="goodsSkuDetail.isinformation >= 1">
+
+								<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 1"
+									class="goods-action-button active3" disabled-text="" backgroundColor="#54c952"
+									@click="phoneClick(goodsSkuDetail.goods_mobile)" :text="$lang('make')"
+									:disabled="false" />
+								<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2"
+									class="goods-action-button active3" disabled-text="" backgroundColor="#54c952"
+									@click="showinformation" :text="$lang('leave')" :disabled="false" />
+								<!-- 		<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="buyNow" text="商品留言" :disabled="false" /> -->
+
+							</block>
 							<block v-else>
-								<ns-goods-action-icon :text="$lang('home')" icon="icon-shouye1" @click="goHome" />
-								
-								<!-- #ifdef MP-WEIXIN -->
-								<ns-goods-action-icon
-									:text="$lang('cart')"
-									:cornerMarkBg="themeStyle.goods_detail.goods_cart_num_corner"
-									icon="icon-gouwuche2"
-									:corner-mark="cartNumber > 0 ? cartNumber + '' : ''"
-									@click="goCart"
-								/>
-								<ns-goods-action-icon :text="$lang('kefu')" icon="icox icox-kefu" :send-data="contactData" :chatParam="chatRoomParams" />
-								<!-- #endif -->
-								<!-- #ifdef H5 -->
-								<ns-goods-action-icon :text="$lang('follow')" :icon="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"  @click="editCollection" />
-								<!-- #endif -->
-								<block v-if="goodsSkuDetail.isinformation >= 1">
-								
-									<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 1" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="phoneClick(goodsSkuDetail.goods_mobile)" :text="$lang('make')" :disabled="false" />
-									<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="showinformation" :text="$lang('leave')" :disabled="false" />
-							<!-- 		<ns-goods-action-button v-if="goodsSkuDetail.isinformation == 2" class="goods-action-button active3" disabled-text="" backgroundColor="#54c952" @click="buyNow" text="商品留言" :disabled="false" /> -->
-							
+								<block v-if="goodsSkuDetail.stock == 0 && !goodsSkuDetail.sku_spec_format">
+									<ns-goods-action-button class="goods-action-button active3"
+										:disabled-text="$lang('sellout')" :disabled="true" />
+								</block>
+								<block v-else-if="
+									goodsSkuDetail.is_limit == 1 &&
+									goodsSkuDetail.limit_type == 2 &&
+									goodsSkuDetail.max_buy != 0 &&
+									goodsSkuDetail.purchased_num >= goodsSkuDetail.max_buy
+								">
+									<ns-goods-action-button class="goods-action-button active3"
+										:disabled-text="$lang('max')" :disabled="true" />
 								</block>
 								<block v-else>
-									<block v-if="goodsSkuDetail.stock == 0 && !goodsSkuDetail.sku_spec_format">
-										<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('sellout')" :disabled="true" />
-									</block>
-									<block v-else-if="
-											goodsSkuDetail.is_limit == 1 &&
-												goodsSkuDetail.limit_type == 2 &&
-												goodsSkuDetail.max_buy != 0 &&
-												goodsSkuDetail.purchased_num >= goodsSkuDetail.max_buy
-										">
-										<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('max')" :disabled="true" />
-									</block>
-									<block v-else>
-										<ns-goods-action-button
-											class="goods-action-button"
-											:text="$lang('addcart')"
-											:backgroundColor="themeStyle.goods_detail.goods_btn_color_shallow"
-											@click="joinCart"
-											v-if="goodsSkuDetail.is_virtual == 0"
-										/>
-										<ns-goods-action-button
-											class="goods-action-button"
-											:backgroundColor="themeStyle.goods_detail.goods_btn_color"
-											:textColor="themeStyle.btn_text_color"
-											:text="$lang('buynow')"
-											@click="buyNow"
-										/>
-								</block>
-								
+									<ns-goods-action-button class="goods-action-button" :text="$lang('addcart')"
+										:backgroundColor="themeStyle.goods_detail.goods_btn_color_shallow"
+										@click="joinCart" v-if="goodsSkuDetail.is_virtual == 0" />
+									<ns-goods-action-button class="goods-action-button"
+										:backgroundColor="themeStyle.goods_detail.goods_btn_color"
+										:textColor="themeStyle.btn_text_color" :text="$lang('buynow')"
+										@click="buyNow" />
 								</block>
+
 							</block>
-						
+						</block>
+
 					</template>
 					<template v-else>
-						<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('status')" :disabled="true" />
+						<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('status')"
+							:disabled="true" />
 					</template>
-					
-					
-					
+
+
+
 				</ns-goods-action>
 			</template>
 		</goods-detail-view>
@@ -521,42 +560,27 @@
 </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
-		},
+		nsGoodsAction: () => import('@/pages_goods/components/ns-goods-action/ns-goods-action.vue'),
+		nsGoodsActionIcon: () => import('@/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue'),
+		nsGoodsActionButton: () => import('@/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
+		uniCountDown: () => import('@/components/uni-count-down/uni-count-down.vue'),
+		nsGoodsPromotion: () => import('@/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue'),
+		goodsDetailView: () => import('@/pages_goods/components/goods-detail-view/goods-detail-view.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
 	mixins: [goodsDetailBase, detail, scroll]
 };
 </script>
@@ -570,12 +594,12 @@ export default {
 	position: relative;
 	z-index: 999;
 }
-
 </style>
 <style scoped>
 /deep/ .action-icon-wrap .iconfont.icon-shouye1 {
 	font-size: 40rpx;
 }
+
 /deep/ .uni-video-cover {
 	background: none;
 }
@@ -592,7 +616,7 @@ export default {
 	background-size: 30%;
 }
 
-.poster-layer >>> .uni-popup__wrapper-box {
+.poster-layer>>>.uni-popup__wrapper-box {
 	max-height: initial !important;
 }
 
@@ -600,7 +624,7 @@ export default {
 	overflow-y: initial !important;
 }
 
-.goods-promotion .countdown .clockrun >>> .uni-countdown__number {
+.goods-promotion .countdown .clockrun>>>.uni-countdown__number {
 	min-width: 32rpx;
 	height: 32rpx;
 	text-align: center;
@@ -612,14 +636,14 @@ export default {
 	border: none;
 }
 
-.goods-promotion .countdown .clockrun >>> .uni-countdown__splitor {
+.goods-promotion .countdown .clockrun>>>.uni-countdown__splitor {
 	width: 10rpx;
 	height: 32rpx;
 	line-height: 36rpx;
 	text-align: center;
 }
 
-.goods-promotion .countdown .clockrun >>> .uni-countdown__splitor.day {
+.goods-promotion .countdown .clockrun>>>.uni-countdown__splitor.day {
 	width: initial;
 }
 
@@ -642,6 +666,7 @@ export default {
 /deep/ .goods-action-button.active4 {
 	padding: 0 10px;
 }
+
 /deep/ .uni-popup__wrapper.bottom {
 	border-radius: 24rpx 24rpx 0 0;
 }
diff --git a/pages_goods/list.vue b/pages_goods/list.vue
index 8d9c4d8..f38cdfd 100644
--- a/pages_goods/list.vue
+++ b/pages_goods/list.vue
@@ -1,34 +1,43 @@
 <template>
-	<view class="content" :style="themeColor"> 
+	<view class="content" :style="themeColor">
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap">
-					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
+						:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
+					@click="changeListStyle()"></view>
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
-					<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>
@@ -39,18 +48,21 @@
 		<mescroll-uni top="180" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.goods_stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
-									
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -58,15 +70,18 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="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">
@@ -79,34 +94,35 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											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>
@@ -114,11 +130,12 @@
 
 									<!--自定义图标 -->
 									<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>
@@ -127,29 +144,35 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
-						
+
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="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">
@@ -160,48 +183,50 @@
 									<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>
 									</view>
-						
+
 									<!--自定义图标 -->
 									<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>
@@ -219,7 +244,7 @@
 			<view class="title color-tip">筛选</view>
 			<scroll-view scroll-y>
 				<!-- 包邮 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>是否包邮</text></view>
 					<view class="list">
 						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
@@ -227,7 +252,7 @@
 				</view> -->
 
 				<!-- 价格筛选项 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>价格区间(元)</text></view>
 					<view class="price-wrap">
 						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
@@ -237,7 +262,7 @@
 				</view> -->
 
 				<!-- 品牌筛选项 -->
-		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+				<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
 					<view class="label"><text>品牌</text></view>
 					<view class="list">
 						<view v-for="(item, index) in brandList" :key="index">
@@ -253,8 +278,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<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>
@@ -274,50 +302,42 @@
 		<!-- 底部tabBar -->
 		<view id="tab-bar">
 			<diy-bottom-nav></diy-bottom-nav>
-		</view>		
+		</view>
 	</view>
 </template>
 
 <script>
-	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 {
-		components: {
-		uniDrawer,
-		uniTag,
-		nsGoodsSkuIndex,
-		nsEmpty,
-		MescrollUni,
-		loadingCover,
+import list from './public/js/list.js';
+
+export default {
+	components: {
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
+		uniTag: () => import('@/components/uni-tag/uni-tag.vue'),
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
-		data() {
-			return {};
-		},
-		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;
-	}
+<style lang="scss" scoped>
+/deep/ .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>
\ No newline at end of file
diff --git a/pages_order/detail.vue b/pages_order/detail.vue
index 659d78b..3fe333e 100644
--- a/pages_order/detail.vue
+++ b/pages_order/detail.vue
@@ -1,7 +1,8 @@
 <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">
@@ -64,9 +65,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>
@@ -108,8 +109,11 @@
 						<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>
@@ -121,7 +125,8 @@
 				<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>
@@ -129,16 +134,18 @@
 								<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>
@@ -152,8 +159,10 @@
 								次卡抵扣
 								<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>
@@ -164,7 +173,8 @@
 							<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>
@@ -176,13 +186,15 @@
 
 					<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>
@@ -315,11 +327,12 @@
 			<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>
@@ -349,23 +362,27 @@
 					<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>
 			</view>
- 
+
 			<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">
@@ -426,14 +443,17 @@
 					<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>
@@ -442,7 +462,8 @@
 			<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">
@@ -574,7 +595,9 @@
 			</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>
@@ -588,7 +611,8 @@
 				</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>
@@ -597,7 +621,8 @@
 		</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>
@@ -608,216 +633,218 @@
 </template>
 
 <script>
-	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: []
-					}
-				},
-				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();
+import orderMethod from './public/js/orderMethod.js';
 
-			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 {
-								this.orderData.refund_batch_status = false;
-							}
-
-							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
-
-							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;
+export default {
+	components: {
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
+	data() {
+		return {
+			isIphoneX: false,
+			orderId: 0,
+			merchantTradeNo: '',
+			orderData: {
+				action: [],
+				virtual_goods: {
+					is_veirfy: 0,
+					verify_record: []
 				}
 			},
-			imageError(index) {
-				this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
+			action: {
+				icon: ''
 			},
-			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);
+			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();
 
-				uni.previewImage({
-					urls: paths
-				});
-			}
-		},
-		filters: {
-			abs(value) {
-				return Math.abs(parseFloat(value)).toFixed(2);
-			}
+		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 {
+							this.orderData.refund_batch_status = false;
+						}
+
+						if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
+
+						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;
+			}
+		},
+		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);
+		}
+	}
+};
 </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>
\ No newline at end of file
diff --git a/pages_order/detail_local_delivery.vue b/pages_order/detail_local_delivery.vue
index ff0c6d3..506fb93 100644
--- a/pages_order/detail_local_delivery.vue
+++ b/pages_order/detail_local_delivery.vue
@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {};
 	},
diff --git a/pages_order/detail_pickup.vue b/pages_order/detail_pickup.vue
index ff0c6d3..506fb93 100644
--- a/pages_order/detail_pickup.vue
+++ b/pages_order/detail_pickup.vue
@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {};
 	},
diff --git a/pages_order/detail_point.vue b/pages_order/detail_point.vue
index a62cc38..ee93f6c 100644
--- a/pages_order/detail_point.vue
+++ b/pages_order/detail_point.vue
@@ -1,14 +1,18 @@
 <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>
@@ -79,7 +83,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>
@@ -120,7 +124,8 @@
 
 			<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>
 
@@ -133,171 +138,173 @@
 </template>
 
 <script>
-	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();
+export default {
+	components: {
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
+	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
-				});
-			},
-			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();
-					}
-				});
-			},
-			/**
-			 * 下拉刷新
-			 */
-			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();
-			},
-		},
-		filters: {
-			abs(value) {
-				return Math.abs(parseFloat(value)).toFixed(2);
-			}
+		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
+			});
+		},
+		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();
+				}
+			});
+		},
+		/**
+		 * 下拉刷新
+		 */
+		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();
+		},
+	},
+	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>
\ No newline at end of file
diff --git a/pages_order/list.vue b/pages_order/list.vue
index 0d45196..67112f4 100644
--- a/pages_order/list.vue
+++ b/pages_order/list.vue
@@ -166,19 +166,14 @@
 
 <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
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 	},
 	data() {
 		return {
diff --git a/pages_order/payment.vue b/pages_order/payment.vue
index be4f9c6..fde463b 100644
--- a/pages_order/payment.vue
+++ b/pages_order/payment.vue
@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		commonPayment: () => import('@/components/common-payment/common-payment.vue'),
+	},
 	data() {
 		return {
 			api: {
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.vue b/pages_promotion/components/yuyue-date/yuyue-date.vue
index a43125e..3cfd509 100644
--- a/pages_promotion/components/yuyue-date/yuyue-date.vue
+++ b/pages_promotion/components/yuyue-date/yuyue-date.vue
@@ -12,7 +12,8 @@
 					<scroll-view scroll-x>
 						<block v-for="(item, index) in dateArr" :key="index">
 							<div class="flex-box" @click="selectDateEvent(index, item)">
-								<view class="date-box" :style="{ color: index == dateActive ? selectedTabColor : '#909399' }">
+								<view class="date-box"
+									:style="{ color: index == dateActive ? selectedTabColor : '#909399' }">
 									<text>{{ item.week }} {{ item.date }}</text>
 								</view>
 							</div>
@@ -30,7 +31,9 @@
 				<view class="time-box" v-if="!isSection">
 					<block v-for="(item, _index) in timeArr" :key="_index">
 						<view class="item">
-							<view class="item-box diy" :class="{ disable: item.disable, active: isMultiple ? item.isActive : _index == timeActive }" @click="selectTimeEvent(_index, item)">
+							<view class="item-box diy"
+								:class="{ disable: item.disable, active: isMultiple ? item.isActive : _index == timeActive }"
+								@click="selectTimeEvent(_index, item)">
 								<!-- :style="{ color: isMultiple ? (item.isActive ? selectedItemColor : '#333') : _index == timeActive ? selectedItemColor : '#333' }" -->
 								<text>{{ item.time }}</text>
 								<!-- <text class="all">{{ item.disable ? disableText : undisableText }}</text> -->
@@ -43,7 +46,9 @@
 				<view class="time-box" v-else>
 					<block v-for="(item, _index) in timeArr" :key="_index">
 						<view class="item">
-							<view class="item-box" :class="{ disable: item.disable || item.isInclude, active: item.time == timeQuanBegin || item.time == timeQuanEnd }" @click="handleSelectQuantum(_index, item)">
+							<view class="item-box"
+								:class="{ disable: item.disable || item.isInclude, active: item.time == timeQuanBegin || item.time == timeQuanEnd }"
+								@click="handleSelectQuantum(_index, item)">
 								<!-- :style="{ color: item.time == timeQuanBegin || item.time == timeQuanEnd ? selectedItemColor : '#333' }" -->
 								<text>{{ item.time }}</text>
 								<text class="all">{{ item.disable ? disableText : undisableText }}</text>
@@ -66,349 +71,349 @@
 </template>
 
 <script>
-	// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
-	import {
-		initData,
-		initTime,
-		timeStamp,
-		currentTime,
-		strFormat,
-		weekDate
-	} from './yuyue-date.js';
-	export default {
-		name: 'times',
-		model: {
-			prop: 'showPop',
-			event: 'change'
+// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
+import {
+	initData,
+	initTime,
+	timeStamp,
+	currentTime,
+	strFormat,
+	weekDate
+} from './yuyue-date.js';
+export default {
+	name: 'times',
+	model: {
+		prop: 'showPop',
+		event: 'change'
+	},
+	props: {
+		isMultiple: {
+			//是否多选
+			type: Boolean,
+			default: false
 		},
-		props: {
-			isMultiple: {
-				//是否多选
-				type: Boolean,
-				default: false
-			},
-			isSection: {
-				//预约时间段
-				type: Boolean,
-				default: false
-			},
-			advanceTime: {
-				//提前预约时间
-				type: [String, Number],
-				default: "0"
-			},
-			disableText: {
-				//禁用显示的文本
-				type: String,
-				default: '已约满'
-			},
-			undisableText: {
-				//未禁用显示的文本
-				type: String,
-				default: '可预约'
-			},
-			timeInterval: {
-				// 时间间隔，小时为单位
-				type: String,
-				default: "1"
-			},
-			selectedTabColor: {
-				// 日期栏选中的颜色
-				type: String,
-				default: '#303133'
-			},
-			selectedItemColor: {
-				// 时间选中的颜色
-				type: String,
-				default: '#D50AEF'
-			},
-			beginTime: {
-				type: String,
-				default: '09:00'
-			},
-			endTime: {
-				type: String,
-				default: '19:00'
-			},
-			appointTime: {
-				// 预约的时间
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			disableTimeSlot: {
-				// 预约开始和结束时间，来禁用时间段
-				type: Object,
-				default () {
-					return {};
-				}
-			},
-			disableWeek: {
-				// 限制周几不可以预约
-				type: Array,
-				default () {
-					return [];
+		isSection: {
+			//预约时间段
+			type: Boolean,
+			default: false
+		},
+		advanceTime: {
+			//提前预约时间
+			type: [String, Number],
+			default: "0"
+		},
+		disableText: {
+			//禁用显示的文本
+			type: String,
+			default: '已约满'
+		},
+		undisableText: {
+			//未禁用显示的文本
+			type: String,
+			default: '可预约'
+		},
+		timeInterval: {
+			// 时间间隔，小时为单位
+			type: String,
+			default: "1"
+		},
+		selectedTabColor: {
+			// 日期栏选中的颜色
+			type: String,
+			default: '#303133'
+		},
+		selectedItemColor: {
+			// 时间选中的颜色
+			type: String,
+			default: '#D50AEF'
+		},
+		beginTime: {
+			type: String,
+			default: '09:00'
+		},
+		endTime: {
+			type: String,
+			default: '19:00'
+		},
+		appointTime: {
+			// 预约的时间
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		disableTimeSlot: {
+			// 预约开始和结束时间，来禁用时间段
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		disableWeek: {
+			// 限制周几不可以预约
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	watch: {
+		appointTime: {
+			handler(val) {
+				if (val && val.length) {
+					this.initOnload();
 				}
 			}
 		},
-		watch: {
-			appointTime: {
-				handler(val) {
-					if (val && val.length) {
-						this.initOnload();
-					}
-				}
-			},
-			beginTime: function(nVal, oVal) {
-				this.initOnload();
-				this.handleSubmit();
-			},
-			endTime: function(nVal, oVal) {
-				this.initOnload();
-				this.handleSubmit();
-			},
-		},
-		data() {
-			return {
-				pickerStartDay: '', // 指定开始日期
-				pickerEndDay: '', // 指定结束日期
-				orderDateTime: '暂无选择', // 选中时间
-				orderTimeArr: {}, //多选的时间
-				dateArr: [], //日期数据
-				timeArr: [], //时间数据
-				nowDate: '', // 当前日期
-				dateActive: 0, //选中的日期索引
-				timeActive: 0, //选中的时间索引
-				timeQuanBeginIndex: 0, //时间段开始的下标
-				selectDate: '', //选择的日期
-				selectTime: '', //选择的时间
-				timeQuanBegin: '', //时间段开始时间
-				timeQuanEnd: '' //时间段结束时间
-			};
-		},
-		created(props) {
-			this.selectDate = this.nowDate = currentTime().date;
-			this.pickerStartDay = currentTime().year + '-' + currentTime().date;
-			const now = new Date(this.pickerStartDay).getTime(); //获取当前日期的时间戳
-			let timeStr = 3600 * 24 * 1000; //一天的时间戳
-			let day = 90; // 未来3个月
-			this.pickerEndDay = timeStamp(now + timeStr * day).allDate;
+		beginTime: function (nVal, oVal) {
 			this.initOnload();
-			this.dateArr = initData(); // 日期栏初始化
+			this.handleSubmit();
 		},
-		methods: {
-			open() {
-				this.$refs.timePopup.open();
-			},
-			close() {
-				this.$refs.timePopup.close();
-			},
-			// 指定时间
-			change(e) {
-				let date = e.split("-");
-				date = date[1] + "-" + date[2];
-				if (this.disableWeek.length && date >= weekDate()[0] && date <= weekDate()[1]) {
+		endTime: function (nVal, oVal) {
+			this.initOnload();
+			this.handleSubmit();
+		},
+	},
+	data() {
+		return {
+			pickerStartDay: '', // 指定开始日期
+			pickerEndDay: '', // 指定结束日期
+			orderDateTime: '暂无选择', // 选中时间
+			orderTimeArr: {}, //多选的时间
+			dateArr: [], //日期数据
+			timeArr: [], //时间数据
+			nowDate: '', // 当前日期
+			dateActive: 0, //选中的日期索引
+			timeActive: 0, //选中的时间索引
+			timeQuanBeginIndex: 0, //时间段开始的下标
+			selectDate: '', //选择的日期
+			selectTime: '', //选择的时间
+			timeQuanBegin: '', //时间段开始时间
+			timeQuanEnd: '' //时间段结束时间
+		};
+	},
+	created(props) {
+		this.selectDate = this.nowDate = currentTime().date;
+		this.pickerStartDay = currentTime().year + '-' + currentTime().date;
+		const now = new Date(this.pickerStartDay).getTime(); //获取当前日期的时间戳
+		let timeStr = 3600 * 24 * 1000; //一天的时间戳
+		let day = 90; // 未来3个月
+		this.pickerEndDay = timeStamp(now + timeStr * day).allDate;
+		this.initOnload();
+		this.dateArr = initData(); // 日期栏初始化
+	},
+	methods: {
+		open() {
+			this.$refs.timePopup.open();
+		},
+		close() {
+			this.$refs.timePopup.close();
+		},
+		// 指定时间
+		change(e) {
+			let date = e.split("-");
+			date = date[1] + "-" + date[2];
+			if (this.disableWeek.length && date >= weekDate()[0] && date <= weekDate()[1]) {
+				let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+				let index = new Date(e).getDay();
+				if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+					uni.showToast({
+						title: weekBox[index] + '不可以预约',
+						icon: 'none'
+					})
+					return false;
+				}
+			}
+			this.initOnload(e);
+			this.dateArr = initData(e); // 日期栏初始化
+			this.selectDateEvent(0, this.dateArr[0]);
+		},
+		initOnload(appointedDay) {
+			this.timeArr = initTime(this.beginTime, this.endTime, parseFloat(this.timeInterval)); //时间选项初始化
+			this.timeQuanBegin = this.timeQuanEnd = '';
+			let isFullTime = true;
+			this.timeArr.forEach((item, index) => {
+				// 判断默认是不能选择的周，则都禁止选中
+				if (this.disableWeek.length && this.selectDate >= weekDate()[0] && this.selectDate <=
+					weekDate()[1]) {
 					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-					let index = new Date(e).getDay();
+					let date = currentTime().year + '-' + this.selectDate;
+					let index = new Date(date).getDay();
 					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-						uni.showToast({
-							title: weekBox[index] + '不可以预约',
-							icon: 'none'
-						})
-						return false;
+						item.disable = true;
 					}
 				}
-				this.initOnload(e);
-				this.dateArr = initData(e); // 日期栏初始化
-				this.selectDateEvent(0, this.dateArr[0]);
-			},
-			initOnload(appointedDay) {
-				this.timeArr = initTime(this.beginTime, this.endTime, parseFloat(this.timeInterval)); //时间选项初始化
-				this.timeQuanBegin = this.timeQuanEnd = '';
-				let isFullTime = true;
-				this.timeArr.forEach((item, index) => {
-					// 判断默认是不能选择的周，则都禁止选中
-					if (this.disableWeek.length && this.selectDate >= weekDate()[0] && this.selectDate <=
-						weekDate()[1]) {
-						let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-						let date = currentTime().year + '-' + this.selectDate;
-						let index = new Date(date).getDay();
-						if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-							item.disable = true;
-						}
-					}
 
-					//判断是当前这一天，选中时间小于当前时间则禁用
-					if (this.selectDate == this.nowDate && currentTime().time > item.time) {
+				//判断是当前这一天，选中时间小于当前时间则禁用
+				if (this.selectDate == this.nowDate && currentTime().time > item.time) {
+					item.disable = true;
+				}
+
+				// 将提前预约的时间禁用 advanceTime
+				var advTime = new Date(new Date().setMinutes(new Date().getMinutes() + parseInt(this.advanceTime) * 60));
+				var advTimeStr = strFormat(advTime.getHours()) + ":" + strFormat(advTime.getMinutes()) + ":" + strFormat(advTime.getSeconds());
+				var advTimeStr1 = strFormat(advTime.getMonth() + 1) + "-" + strFormat(advTime.getDate());
+				if (this.selectDate == advTimeStr1 && advTimeStr > item.time || advTimeStr1 > this.selectDate) {
+					item.disable = true;
+				}
+
+				// 将预约的时间禁用
+				this.appointTime.forEach(t => {
+					let [date, time] = t.split(' ');
+					time = time.slice(0, -3);
+
+					if (date == currentTime().year + '-' + this.selectDate && item.time == time ||
+						date == currentTime().year + '-' + advTimeStr1 && item.time == time) {
 						item.disable = true;
 					}
-
-					// 将提前预约的时间禁用 advanceTime
-					var advTime = new Date(new Date().setMinutes(new Date().getMinutes() + parseInt(this.advanceTime) * 60));
-					var advTimeStr = strFormat(advTime.getHours()) + ":" + strFormat(advTime.getMinutes()) + ":" + strFormat(advTime.getSeconds());
-					var advTimeStr1 = strFormat(advTime.getMonth() + 1) + "-" + strFormat(advTime.getDate());
-					if (this.selectDate == advTimeStr1 && advTimeStr > item.time || advTimeStr1 > this.selectDate) {
-						item.disable = true;
-					}
-
-					// 将预约的时间禁用
-					this.appointTime.forEach(t => {
-						let [date, time] = t.split(' ');
-						time = time.slice(0, -3);
-
-						if (date == currentTime().year + '-' + this.selectDate && item.time == time ||
-							date == currentTime().year + '-' + advTimeStr1 && item.time == time) {
-							item.disable = true;
-						}
-					});
-
-					// 禁用时间段
-					const cur_time = `${this.selectDate} ${item.time}`;
-					const {
-						begin_time,
-						end_time
-					} = this.disableTimeSlot;
-					if (begin_time && end_time && (begin_time <= cur_time && cur_time <= end_time)) {
-						item.disable = true;
-					}
-
-					// 判断是否当前日期时间都被预约
-					if (!item.disable) {
-						isFullTime = false;
-					}
-					this.isSection && (item.isInclude = false);
 				});
 
-				this.orderDateTime = isFullTime ? '暂无选择' : this.selectDate;
-				this.timeActive = -1;
-				for (let i = 0, len = this.timeArr.length; i < len; i++) {
-					if (!this.timeArr[i].disable) {
-						this.orderDateTime = {
-							data: `${this.selectDate}`,
-							time: `${this.timeArr[i].time}`
-						};
-						this.timeActive = i;
+				// 禁用时间段
+				const cur_time = `${this.selectDate} ${item.time}`;
+				const {
+					begin_time,
+					end_time
+				} = this.disableTimeSlot;
+				if (begin_time && end_time && (begin_time <= cur_time && cur_time <= end_time)) {
+					item.disable = true;
+				}
+
+				// 判断是否当前日期时间都被预约
+				if (!item.disable) {
+					isFullTime = false;
+				}
+				this.isSection && (item.isInclude = false);
+			});
+
+			this.orderDateTime = isFullTime ? '暂无选择' : this.selectDate;
+			this.timeActive = -1;
+			for (let i = 0, len = this.timeArr.length; i < len; i++) {
+				if (!this.timeArr[i].disable) {
+					this.orderDateTime = {
+						data: `${this.selectDate}`,
+						time: `${this.timeArr[i].time}`
+					};
+					this.timeActive = i;
+					return;
+				}
+			}
+		},
+
+		// 日期选择事件
+		selectDateEvent(index, item) {
+			if (this.disableWeek.length && item.date >= weekDate()[0] && item.date <= weekDate()[1]) {
+				let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+				let index = new Date(item.timeStamp).getDay();
+				if (this.disableWeek.indexOf(weekBox[index]) != -1) {
+					uni.showToast({
+						title: weekBox[index] + '不可以预约',
+						icon: 'none'
+					})
+					return false;
+				}
+			}
+
+			this.dateActive = index;
+			this.selectDate = item.date;
+			this.initOnload();
+			this.handleSubmit();
+		},
+
+		// 时间选择事件
+		selectTimeEvent(index, item) {
+			if (item.disable) return;
+			if (this.isMultiple) {
+				item.isActive = !item.isActive;
+				this.timeArr = this.timeArr.slice();
+				this.orderTimeArr[this.selectDate] = this.timeArr.reduce((prev, cur) => {
+					cur.isActive && prev.push(cur.time);
+					return prev;
+				}, []);
+			} else {
+				this.timeActive = index;
+				this.selectTime = item.time;
+				this.orderDateTime = {
+					data: `${this.selectDate}`,
+					time: `${item.time}`
+				};
+			}
+			this.handleSubmit();
+		},
+
+		// 选择时间段
+		handleSelectQuantum(index, item) {
+			if (item.disable) return;
+
+			function clearTime() {
+				this.timeQuanBeginIndex = index;
+				this.timeQuanBegin = item.time;
+				this.timeQuanEnd = '';
+			}
+
+			if (!this.timeQuanBegin) {
+				clearTime.call(this);
+				return;
+			}
+			if (!this.timeQuanEnd && this.timeQuanBegin) {
+				let isDisble = false;
+				let start = this.timeQuanBeginIndex;
+				let end = index;
+				start > end && ([start, end] = [end, start]);
+				for (let i = start + 1; i < end; i++) {
+					if (this.timeArr[i].disable) {
+						isDisble = true;
+						clearTime.call(this);
 						return;
 					}
 				}
-			},
-
-			// 日期选择事件
-			selectDateEvent(index, item) {
-				if (this.disableWeek.length && item.date >= weekDate()[0] && item.date <= weekDate()[1]) {
-					let weekBox = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-					let index = new Date(item.timeStamp).getDay();
-					if (this.disableWeek.indexOf(weekBox[index]) != -1) {
-						uni.showToast({
-							title: weekBox[index] + '不可以预约',
-							icon: 'none'
-						})
-						return false;
-					}
-				}
-
-				this.dateActive = index;
-				this.selectDate = item.date;
-				this.initOnload();
-				this.handleSubmit();
-			},
-
-			// 时间选择事件
-			selectTimeEvent(index, item) {
-				if (item.disable) return;
-				if (this.isMultiple) {
-					item.isActive = !item.isActive;
-					this.timeArr = this.timeArr.slice();
-					this.orderTimeArr[this.selectDate] = this.timeArr.reduce((prev, cur) => {
-						cur.isActive && prev.push(cur.time);
-						return prev;
-					}, []);
-				} else {
-					this.timeActive = index;
-					this.selectTime = item.time;
-					this.orderDateTime = {
-						data: `${this.selectDate}`,
-						time: `${item.time}`
-					};
-				}
-				this.handleSubmit();
-			},
-
-			// 选择时间段
-			handleSelectQuantum(index, item) {
-				if (item.disable) return;
-
-				function clearTime() {
-					this.timeQuanBeginIndex = index;
-					this.timeQuanBegin = item.time;
-					this.timeQuanEnd = '';
-				}
-
-				if (!this.timeQuanBegin) {
-					clearTime.call(this);
-					return;
-				}
-				if (!this.timeQuanEnd && this.timeQuanBegin) {
-					let isDisble = false;
-					let start = this.timeQuanBeginIndex;
-					let end = index;
-					start > end && ([start, end] = [end, start]);
+				if (!isDisble) {
 					for (let i = start + 1; i < end; i++) {
-						if (this.timeArr[i].disable) {
-							isDisble = true;
-							clearTime.call(this);
-							return;
-						}
+						this.timeArr[i].isInclude = true;
 					}
-					if (!isDisble) {
-						for (let i = start + 1; i < end; i++) {
-							this.timeArr[i].isInclude = true;
-						}
-					}
-					this.timeQuanEnd = item.time;
-					return;
 				}
+				this.timeQuanEnd = item.time;
+				return;
+			}
 
-				if (this.timeQuanBegin && this.timeQuanEnd) {
-					this.timeArr.forEach(t => {
-						t.isInclude = false;
-					});
-					clearTime.call(this);
-				}
-			},
-			handleChange() {
-				this.timeQuanBegin > this.timeQuanEnd && ([this.timeQuanBegin, this.timeQuanEnd] = [this.timeQuanEnd, this.timeQuanBegin]);
-			},
-			handleSubmit() {
-				if (this.isSection) {
-					this.handleChange();
-					this.$emit('change', {
-						beginTime: `${this.selectDate} ${this.timeQuanBegin}`,
-						endTime: `${this.selectDate} ${this.timeQuanEnd}`
-					});
-					return;
-				}
+			if (this.timeQuanBegin && this.timeQuanEnd) {
+				this.timeArr.forEach(t => {
+					t.isInclude = false;
+				});
+				clearTime.call(this);
+			}
+		},
+		handleChange() {
+			this.timeQuanBegin > this.timeQuanEnd && ([this.timeQuanBegin, this.timeQuanEnd] = [this.timeQuanEnd, this.timeQuanBegin]);
+		},
+		handleSubmit() {
+			if (this.isSection) {
+				this.handleChange();
+				this.$emit('change', {
+					beginTime: `${this.selectDate} ${this.timeQuanBegin}`,
+					endTime: `${this.selectDate} ${this.timeQuanEnd}`
+				});
+				return;
+			}
 
-				if (this.isMultiple) {
-					let time = [];
-					for (let date in this.orderTimeArr) {
-						this.orderTimeArr[date].forEach(item => {
-							time.push(`${date} ${item}`);
-						});
-					}
-					this.$emit('change', time);
-				} else {
-					// this.$emit('change', currentTime().year + '-' + this.orderDateTime);
-					this.$emit('change', {
-						date: currentTime().year + '-' + this.orderDateTime.data,
-						time: this.orderDateTime.time
+			if (this.isMultiple) {
+				let time = [];
+				for (let date in this.orderTimeArr) {
+					this.orderTimeArr[date].forEach(item => {
+						time.push(`${date} ${item}`);
 					});
 				}
+				this.$emit('change', time);
+			} else {
+				// this.$emit('change', currentTime().year + '-' + this.orderDateTime);
+				this.$emit('change', {
+					date: currentTime().year + '-' + this.orderDateTime.data,
+					time: this.orderDateTime.time
+				});
 			}
 		}
-	};
+	}
+};
 </script>
 <style lang="scss" scoped>
-	@import './yuyue-date.scss';
+@import './yuyue-date.scss';
 </style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
index c8eae81..d388389 100644
--- a/pages_promotion/fenxiao/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -153,10 +153,13 @@
 
 <script>
 	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';
+	import htmlParser from '@/common/js/html-parser.js';
 	export default {
+		components: {
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		},		
 		data() {
 			return {
 				isChecked: false,
@@ -187,9 +190,6 @@
 				isOpen: false
 			};
 		},
-		components: {
-			uniPopup
-		},
 		mixins: [fenxiaoWords],
 		onLoad(option) {
 			setTimeout( () => {
diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue
index dbd75d2..cae58bf 100644
--- a/pages_promotion/fenxiao/bill.vue
+++ b/pages_promotion/fenxiao/bill.vue
@@ -3,7 +3,8 @@
 		<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>
@@ -11,7 +12,8 @@
 						<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>
@@ -22,32 +24,25 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
 export default {
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
 	data() {
 		return {
 			accountList: {},
 			showEmpty: true
 		};
 	},
-	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -58,7 +53,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 	},
 	methods: {
 		getData(mescroll) {
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
index a3f6786..c9cc7f6 100644
--- a/pages_promotion/fenxiao/child_fenxiao.vue
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -40,31 +40,24 @@
 </template>
 
 <script>
-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';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
 	data() {
 		return {
 			teamList: [],
 			emptyShow: false,
 		};
 	},
-	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},	
 	mixins: [fenxiaoWords],
 	onShow() {
 		setTimeout(() => {
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
index ef3f20c..e9ba3dd 100644
--- a/pages_promotion/fenxiao/goods_list.vue
+++ b/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">
@@ -132,24 +132,18 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+	
 import list from './public/js/goods_list.js';
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	mixins: [list, fenxiaoWords]
@@ -157,7 +151,7 @@ export default {
 </script>
 
 <style>
-.quick-nav >>> .uni-scroll-view-content {
+.quick-nav>>>.uni-scroll-view-content {
 	display: flex;
 }
 </style>
@@ -165,8 +159,10 @@ 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;
@@ -190,6 +186,7 @@ export default {
 		}
 	}
 }
+
 .content {
 	overflow: hidden;
 	padding: 0 30rpx 160rpx;
@@ -202,12 +199,14 @@ 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;
 			}
@@ -221,6 +220,7 @@ export default {
 			border-radius: 10rpx;
 			overflow: hidden;
 			flex-shrink: 0;
+
 			image {
 				width: 100%;
 				height: 100%;
@@ -241,6 +241,7 @@ export default {
 			.goods-name {
 				width: 100%;
 				line-height: 1.3;
+
 				.name {
 					line-height: 1.3;
 					word-break: break-all;
@@ -250,10 +251,12 @@ 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;
@@ -285,6 +288,7 @@ export default {
 					padding: 0 $padding;
 					border-radius: 50rpx;
 					border: 2rpx solid $base-color;
+
 					text {
 						color: $base-color;
 						border-radius: 40rpx;
@@ -299,6 +303,7 @@ export default {
 			}
 		}
 	}
+
 	.active-btn {
 		position: fixed;
 		bottom: 40rpx;
@@ -312,10 +317,12 @@ export default {
 		border-radius: 50rpx;
 		background-color: $base-color;
 		color: #fff;
+
 		.btn {
 			flex: 1;
 			text-align: center;
 		}
+
 		.share-btn {
 			margin: 0;
 			padding: 0;
@@ -355,6 +362,7 @@ export default {
 					border: none;
 					line-height: 1;
 					height: auto;
+
 					text {
 						margin-top: 20rpx;
 						font-size: $font-size-tag;
@@ -367,6 +375,7 @@ export default {
 					font-size: 80rpx;
 					line-height: initial;
 				}
+
 				.icon-fuzhilianjie,
 				.icon-pengyouquan,
 				.icon-haowuquan,
@@ -383,39 +392,48 @@ 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;
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index dc128d6..8cc162d 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -261,11 +261,25 @@
 
 <script>
 import fenxiaoWords from '@/common/js/fenxiao-words.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
 export default {
 	components: {
-		uniPopup
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+		uniTag: () => import('@/components/uni-tag/uni-tag.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif	
 	},
 	data() {
 		return {
diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue
index a673cb0..07f7946 100644
--- a/pages_promotion/fenxiao/level.vue
+++ b/pages_promotion/fenxiao/level.vue
@@ -4,13 +4,16 @@
 			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
 		</view>
 
-		<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr">
+		<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx"
+			@change="swiperChange" :current="curr">
 			<swiper-item v-for="(item, index) in levelList" :key="index">
-				<view class="level-item" :class="{'curr': index == curr}">
+				<view class="level-item" :class="{ 'curr': index == curr }">
 					<view class="level-wrap">
 						<view class="member-info">
 							<view class="head-img">
-								<image :src="fenxiaoInfo.headimg ? $util.img(fenxiaoInfo.headimg) : $util.getDefaultImage().head" @error="fenxiaoInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+								<image
+									:src="fenxiaoInfo.headimg ? $util.img(fenxiaoInfo.headimg) : $util.getDefaultImage().head"
+									@error="fenxiaoInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 							</view>
 							<view class="nickname">{{ fenxiaoInfo.nickname }}</view>
 							<view class="level-name">{{ item.level_name }}</view>
@@ -42,7 +45,8 @@
 			<view class="condition-title">
 				<view class="title">快速升级技巧</view>
 				<view class="rate price-font">
-					<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num : levelInfo.complete }}</text>
+					<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num :
+						levelInfo.complete }}</text>
 					<text class="num">/{{ levelInfo.task_num }}</text>
 				</view>
 			</view>
@@ -50,17 +54,17 @@
 				<view class="task-item" v-for="(item, index) in levelInfo.task" :key="index">
 					<view class="flex-box">
 						<view class="title">
-							{{item.title}}
+							{{ item.title }}
 							<text class="iconfont icon-wenxiao" @click="openTips(item)"></text>
 						</view>
-						<view class="status" :class="{'complete': item.progress == 100}">
+						<view class="status" :class="{ 'complete': item.progress == 100 }">
 							{{ item.progress == 100 ? '已完成' : '未完成' }}</view>
 					</view>
 					<view class="progress">
 						<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
 					</view>
 					<view class="flex-box">
-						<view class="desc">{{item.desc}}</view>
+						<view class="desc">{{ item.desc }}</view>
 						<view class="rate price-font">
 							<text class="complete">{{ item.value }}</text>
 							<text class="num">/{{ item.condition }}</text>
@@ -89,231 +93,237 @@
 </template>
 
 <script>
-	import fenxiaoWords from 'common/js/fenxiao-words.js';
-	export default {
-		data() {
-			return {
-				fenxiaoInfo: {
-					condition: {
-						last_level: null
-					}
-				},
-				config: {},
-				levelList: [],
-				curr: 0,
-				tips: ''
-			};
-		},
-		mixins: [fenxiaoWords],
-		computed: {
-			levelInfo() {
-				if (this.levelList.length) {
-					let level = this.levelList[this.curr];
-					level.task = [];
-					level.complete = 0;
-
-					if (level.one_fenxiao_order_num > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到'+ level.one_fenxiao_order_num + '单',
-							condition: level.one_fenxiao_order_num,
-							value: this.fenxiaoInfo.one_fenxiao_order_num,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_fenxiao_total_order > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到'+ this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							condition: this.moneyFormat(level.one_fenxiao_total_order),
-							value: this.fenxiaoInfo.one_fenxiao_total_order,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
-								.toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_fenxiao_order_money > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到'+ this.moneyFormat(level.one_fenxiao_order_money) + '元',
-							condition: this.moneyFormat(level.one_fenxiao_order_money),
-							value: this.fenxiaoInfo.one_fenxiao_order_money,
-							progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
-								.toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_num > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费单数满' + level.order_num + '单',
-							tips: '分销商自己购买的订单次数达到'+ level.order_num + '单',
-							condition: level.order_num,
-							value: this.fenxiaoInfo.order_num,
-							progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_money > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
-							tips: '分销商自己购买的订单总额满足'+ this.moneyFormat(level.order_money) + '元',
-							condition: this.moneyFormat(level.order_money),
-							value: this.fenxiaoInfo.order_money,
-							progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友人数达到' + level.one_child_num + '人',
-							tips: '分销商的直属下级会员人数达到'+level.one_child_num+'人（包含已经申请成为分销商的）',
-							condition: level.one_child_num,
-							value: this.fenxiaoInfo.one_child_num,
-							progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_fenxiao_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
-							tips: '分销商的直属下级分销商人数达到'+ level.one_child_fenxiao_num + '人',
-							condition: level.one_child_fenxiao_num,
-							value: this.fenxiaoInfo.one_child_fenxiao_num,
-							progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
-						}
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
-					return level;
+import fenxiaoWords from 'common/js/fenxiao-words.js';
+export default {
+	components: {
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			fenxiaoInfo: {
+				condition: {
+					last_level: null
 				}
-			}
-		},
-		onLoad() {},
-		onShow() {
-			setTimeout( () => {
-				if (!this.addonIsExist.fenxiao) {
-					this.$util.showToast({
-						title: '商家未开启分销',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
+			},
+			config: {},
+			levelList: [],
+			curr: 0,
+			tips: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	computed: {
+		levelInfo() {
+			if (this.levelList.length) {
+				let level = this.levelList[this.curr];
+				level.task = [];
+				level.complete = 0;
+
+				if (level.one_fenxiao_order_num > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
+						tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到' + level.one_fenxiao_order_num + '单',
+						condition: level.one_fenxiao_order_num,
+						value: this.fenxiaoInfo.one_fenxiao_order_num,
+						progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
+					}
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
 				}
-			},1000);
-
-			if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
-
-			if (this.storeToken) {
-				this.getFenxiaoInfo();
-				this.getBasicsConfig();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_promotion/fenxiao/level'
-				});
-			}
-		},
-		methods: {
-			/**
-			 * 获取分销等级信息
-			 */
-			getFenxiaoLevel() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/Level/lists',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.levelList = res.data;
-							this.levelList.forEach((item, index) => {
-								if (item.level_id == this.fenxiaoInfo.level_id) this.curr = index;
-							})
-						}
+				if (level.one_fenxiao_total_order > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+						tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+						condition: this.moneyFormat(level.one_fenxiao_total_order),
+						value: this.fenxiaoInfo.one_fenxiao_total_order,
+						progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
+							.toFixed(2)
 					}
-				});
-			},
-			/**
-			 * 获取分销商信息
-			 */
-			getFenxiaoInfo() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/detail',
-					success: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						if (res.code >= 0 && res.data) {
-							this.fenxiaoInfo = res.data;
-							this.curr = this.fenxiaoInfo.level_num;
-							this.getFenxiaoLevel();
-						} else {
-							this.$util.redirectTo('/pages_promotion/fenxiao/apply');
-						}
-					},
-					fail: () => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_fenxiao_order_money > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
+						tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
+						condition: this.moneyFormat(level.one_fenxiao_order_money),
+						value: this.fenxiaoInfo.one_fenxiao_order_money,
+						progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
+							.toFixed(2)
 					}
-				});
-			},
-			/**
-			 * 获取分销基本配置
-			 */
-			getBasicsConfig() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/config/basics',
-					success: res => {
-						if (res.code >= 0) {
-							this.config = res.data;
-						}
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.order_num > 0) {
+					let task = {
+						title: '自身消费',
+						desc: '自身消费单数满' + level.order_num + '单',
+						tips: '分销商自己购买的订单次数达到' + level.order_num + '单',
+						condition: level.order_num,
+						value: this.fenxiaoInfo.order_num,
+						progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
 					}
-				});
-			},
-			swiperChange(e) {
-				this.curr = e.detail.current;
-			},
-			moneyFormat(money) {
-				if (isNaN(parseFloat(money))) return money;
-				return parseFloat(money).toFixed(2);
-			},
-			openTips(data) {
-				this.tips = data.tips;
-				this.$refs.tips.open();
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.order_money > 0) {
+					let task = {
+						title: '自身消费',
+						desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
+						tips: '分销商自己购买的订单总额满足' + this.moneyFormat(level.order_money) + '元',
+						condition: this.moneyFormat(level.order_money),
+						value: this.fenxiaoInfo.order_money,
+						progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
+					}
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_child_num > 0) {
+					let task = {
+						title: '邀请好友',
+						desc: '邀请好友人数达到' + level.one_child_num + '人',
+						tips: '分销商的直属下级会员人数达到' + level.one_child_num + '人（包含已经申请成为分销商的）',
+						condition: level.one_child_num,
+						value: this.fenxiaoInfo.one_child_num,
+						progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
+					}
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_child_fenxiao_num > 0) {
+					let task = {
+						title: '邀请好友',
+						desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
+						tips: '分销商的直属下级分销商人数达到' + level.one_child_fenxiao_num + '人',
+						condition: level.one_child_fenxiao_num,
+						value: this.fenxiaoInfo.one_child_fenxiao_num,
+						progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
+					}
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
+				return level;
 			}
 		}
-	};
+	},
+	onLoad() { },
+	onShow() {
+		setTimeout(() => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
+
+		if (this.storeToken) {
+			this.getFenxiaoInfo();
+			this.getBasicsConfig();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_promotion/fenxiao/level'
+			});
+		}
+	},
+	methods: {
+		/**
+		 * 获取分销等级信息
+		 */
+		getFenxiaoLevel() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/Level/lists',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.levelList = res.data;
+						this.levelList.forEach((item, index) => {
+							if (item.level_id == this.fenxiaoInfo.level_id) this.curr = index;
+						})
+					}
+				}
+			});
+		},
+		/**
+		 * 获取分销商信息
+		 */
+		getFenxiaoInfo() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/detail',
+				success: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					if (res.code >= 0 && res.data) {
+						this.fenxiaoInfo = res.data;
+						this.curr = this.fenxiaoInfo.level_num;
+						this.getFenxiaoLevel();
+					} else {
+						this.$util.redirectTo('/pages_promotion/fenxiao/apply');
+					}
+				},
+				fail: () => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 获取分销基本配置
+		 */
+		getBasicsConfig() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/basics',
+				success: res => {
+					if (res.code >= 0) {
+						this.config = res.data;
+					}
+				}
+			});
+		},
+		swiperChange(e) {
+			this.curr = e.detail.current;
+		},
+		moneyFormat(money) {
+			if (isNaN(parseFloat(money))) return money;
+			return parseFloat(money).toFixed(2);
+		},
+		openTips(data) {
+			this.tips = data.tips;
+			this.$refs.tips.open();
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/level.scss';
+@import './public/css/level.scss';
 </style>
 <style scoped 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;
+}
 
-	/deep/ .uni-popup {
-		z-index: 8;
-	}
+/deep/ .uni-popup {
+	z-index: 8;
+}
 
-	/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>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue
index 36e0a17..6e398d2 100644
--- a/pages_promotion/fenxiao/order.vue
+++ b/pages_promotion/fenxiao/order.vue
@@ -2,40 +2,51 @@
 	<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>
@@ -57,18 +68,24 @@
 								<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>
@@ -79,22 +96,16 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
+
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -133,7 +144,7 @@ export default {
 		if (option.type != undefined) this.selectId = option.type;
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -144,9 +155,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(() => {
@@ -204,7 +215,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue
index 4158687..eb2267a 100644
--- a/pages_promotion/fenxiao/order_detail.vue
+++ b/pages_promotion/fenxiao/order_detail.vue
@@ -12,15 +12,20 @@
 				</view>
 				<view class="detail-body">
 					<view class="detail-body-box">
-						<view class="goods-image"><image :src="$util.img(orderData.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill"></image></view>
+						<view class="goods-image">
+							<image :src="$util.img(orderData.sku_image, { size: 'mid' })" @error="imageError()"
+								mode="aspectFill"></image>
+						</view>
 						<view class="order-info">
 							<view class="goods-name">{{ orderData.sku_name }}</view>
 							<view class="goods-sub-section margin-top">
 								<view>
 									<text class="goods-price">
 										<text class="unit price-color">￥</text>
-										<text class="price-color font-size-toolbar" >{{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}</text>
-										<text class="unit price-color">.{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
+										<text class="price-color font-size-toolbar">{{
+											parseFloat(orderData.price).toFixed(2).split(".")[0] }}</text>
+										<text class="unit price-color">.{{
+											parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
 									</text>
 								</view>
 								<view>
@@ -61,9 +66,10 @@
 						<text class="price-color font-size-toolbar">
 							<text class="font-size-goods-tag">￥</text>
 							{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
-							<text class="font-size-goods-tag">.{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}</text>
+							<text class="font-size-goods-tag">.{{
+								parseFloat(orderData.commission).toFixed(2).split(".")[1] }}</text>
 						</text>
-						
+
 					</view>
 				</view>
 			</view>
@@ -76,6 +82,10 @@
 <script>
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			isIphoneX: false,
@@ -85,7 +95,6 @@ export default {
 			}
 		};
 	},
-	components: {},
 	onLoad(option) {
 		if (option.id) {
 			this.orderId = option.id;
@@ -97,7 +106,7 @@ export default {
 	},
 	mixins: [fenxiaoWords],
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -108,7 +117,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
 		this.isIphoneX = this.$util.uniappIsIPhoneX();
 
@@ -151,7 +160,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getOrderData();
 			}
@@ -166,12 +175,14 @@ export default {
 	padding: 0 $padding;
 	box-sizing: border-box;
 	margin-top: $margin-updown;
+
 	.order-detail-box {
 		width: 100%;
 		height: 100%;
 		box-sizing: border-box;
 		background: #ffffff;
 		border-radius: $border-radius;
+
 		.header {
 			width: 100%;
 			padding: 30rpx;
@@ -179,12 +190,14 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			box-sizing: border-box;
+
 			.title {
 				display: inline-block;
 				position: relative;
 				line-height: 1;
 			}
 		}
+
 		.detail-body {
 			width: 100%;
 			padding: 0 30rpx 30rpx 30rpx;
@@ -194,10 +207,12 @@ export default {
 				width: 100%;
 				height: 100%;
 				display: flex;
+
 				.goods-image {
 					width: 180rpx;
 					height: 180rpx;
 					border-radius: $border-radius;
+
 					image {
 						width: 100%;
 						height: 100%;
@@ -205,6 +220,7 @@ export default {
 						border-radius: $border-radius;
 					}
 				}
+
 				.order-info {
 					width: calc(100% - 200rpx);
 					height: 180rpx;
@@ -213,6 +229,7 @@ export default {
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
+
 					.goods-name {
 						display: -webkit-box;
 						-webkit-box-orient: vertical;
@@ -240,6 +257,7 @@ export default {
 						view {
 							flex: 1;
 							line-height: 1.3;
+
 							&:last-of-type {
 								text-align: right;
 
@@ -253,18 +271,22 @@ export default {
 				}
 			}
 		}
+
 		.detail-content {
 			width: 100%;
 			padding: 0 30rpx 30rpx 30rpx;
 			box-sizing: border-box;
 			border-bottom: 1rpx solid $color-line;
+
 			text {
 				font-size: $font-size-base;
 			}
+
 			.order-info-item .tit {
 				display: inline-block;
 			}
 		}
+
 		.detail-footer {
 			width: 100%;
 			height: 100rpx;
@@ -280,17 +302,21 @@ export default {
 		}
 	}
 }
+
 .commission {
 	margin-top: 20rpx;
+
 	.detail-content {
 		border: 0 !important;
 	}
 }
+
 .order-money-detail {
 	width: 100%;
 	padding: 0 $padding;
 	box-sizing: border-box;
 	margin-top: $margin-updown;
+
 	.order-money-detail-box {
 		width: 100%;
 		height: 100%;
@@ -298,6 +324,7 @@ export default {
 		box-sizing: border-box;
 		background: #ffffff;
 		border-radius: $border-radius;
+
 		.header {
 			width: 100%;
 			height: 70rpx;
@@ -306,6 +333,7 @@ export default {
 			display: flex;
 			align-items: center;
 			box-sizing: border-box;
+
 			.title {
 				padding-left: 20rpx;
 				display: inline-block;
@@ -313,6 +341,7 @@ export default {
 				line-height: 1;
 				font-weight: 600;
 			}
+
 			.title::before {
 				content: '';
 				display: block;
@@ -324,10 +353,12 @@ export default {
 				border-radius: 6rpx;
 			}
 		}
+
 		.money-detail-body {
 			width: 100%;
 			padding: $padding;
 			box-sizing: border-box;
+
 			.order-cell {
 				display: flex;
 				margin: 10rpx 0;
@@ -363,6 +394,7 @@ export default {
 						margin-left: 6rpx;
 					}
 				}
+
 				text {
 					color: $color-tip;
 					font-size: $font-size-tag;
@@ -371,7 +403,8 @@ export default {
 		}
 	}
 }
-.price-color{
+
+.price-color {
 	color: var(--price-color);
 }
 </style>
diff --git a/pages_promotion/fenxiao/promote.vue b/pages_promotion/fenxiao/promote.vue
index e634a8d..4b7c66b 100644
--- a/pages_promotion/fenxiao/promote.vue
+++ b/pages_promotion/fenxiao/promote.vue
@@ -57,8 +57,18 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 export default {
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
+	},
 	data() {
 		return {
 			tabIndex: 0,
diff --git a/pages_promotion/fenxiao/promote_code.vue b/pages_promotion/fenxiao/promote_code.vue
index d1063e3..637f0a9 100644
--- a/pages_promotion/fenxiao/promote_code.vue
+++ b/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,7 +25,8 @@
 				<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>
@@ -42,265 +43,272 @@
 </template>
 
 <script>
-	import {
-		Weixin
-	} from 'common/js/wx-jssdk.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import {
+	Weixin
+} from 'common/js/wx-jssdk.js';
 
-	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]),
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
+	},
+	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
+					},
 					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: '下载失败'
-							});
+						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 (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: '下载失败'
 						});
 					}
-				});
-				// #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 {
+				},
+				fail: res => {
 					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
 		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
+		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: '海报生成失败'
+				});
+			}
 		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getFenxiaoDetail();
-				}
+
+		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();
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		min-height: 100vh;
-		background-color: #f5f5f5;
+.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%;
 	}
+}
 
-	.poster-wrap {
-		padding: 40rpx 0;
-		width: calc(100vw - 80rpx);
-		margin: 0 40rpx;
-		line-height: 1;
+.swiper {
+	height: 1240rpx;
+}
 
-		image {
-			border-radius: 20rpx;
-			overflow: hidden;
-			width: 100%;
-		}
-	}
+.btn {
+	margin: 0 80rpx;
+	margin-top: 30rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: $border-radius;
+	color: #fff;
+	text-align: center;
+}
 
-	.swiper {
-		height: 1240rpx;
-	}
+.tips {
+	text-align: center;
+	font-size: $font-size-base;
+	color: #999;
+	font-weight: 600;
+	margin-top: 20rpx;
+}
 
-	.btn {
-		margin: 0 80rpx;
-		margin-top: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: $border-radius;
-		color: #fff;
+.dialog-popup {
+	width: 580rpx;
+	background: #fff;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	overflow: hidden;
+	height: initial;
+
+	.title {
+		padding: 30rpx 30rpx 0 30rpx;
 		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
 	}
 
-	.tips {
+	.message {
+		padding: 0 30rpx;
+		color: #666;
 		text-align: center;
 		font-size: $font-size-base;
-		color: #999;
-		font-weight: 600;
-		margin-top: 20rpx;
+		line-height: 1.3;
+		margin-top: 30rpx;
 	}
 
-	.dialog-popup {
-		width: 580rpx;
-		background: #fff;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		overflow: hidden;
-		height: initial;
+	.action-wrap {
+		margin-top: 50rpx;
+		height: 80rpx;
+		display: flex;
+		border-top: 2rpx solid #eee;
 
-		.title {
-			padding: 30rpx 30rpx 0 30rpx;
+		&>view {
+			flex: 1;
 			text-align: center;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
+			line-height: 80rpx;
 
-		.message {
-			padding: 0 30rpx;
-			color: #666;
-			text-align: center;
-			font-size: $font-size-base;
-			line-height: 1.3;
-			margin-top: 30rpx;
-		}
+			&:first-child {
+				border-right: 2rpx solid #eee;
+				color: #999;
+			}
 
-		.action-wrap {
-			margin-top: 50rpx;
-			height: 80rpx;
-			display: flex;
-			border-top: 2rpx solid #eee;
-
-			&>view {
-				flex: 1;
-				text-align: center;
+			button {
+				border: none;
 				line-height: 80rpx;
-
-				&:first-child {
-					border-right: 2rpx solid #eee;
-					color: #999;
-				}
-
-				button {
-					border: none;
-					line-height: 80rpx;
-					padding: 0;
-					margin: 0;
-					width: 100%;
-					height: 100%;
-				}
+				padding: 0;
+				margin: 0;
+				width: 100%;
+				height: 100%;
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
index 6a134eb..8211aa3 100644
--- a/pages_promotion/fenxiao/ranking_list.vue
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -3,17 +3,22 @@
 		<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>
@@ -26,7 +31,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>
@@ -50,7 +55,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>
@@ -67,20 +72,21 @@
 						</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>
@@ -97,337 +103,329 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
 
-	
-	export default {
-		components: {
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},	
-		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 = [];
-				}
-				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();
-					}
-				});
-			},
-			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;
-						}
-					},
-				});
-			},
+export default {
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	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 = [];
+			}
+			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();
+				}
+			});
+		},
+		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;
-	}
+.container {
+	width: 100vw;
+	height: 100vh;
+}
 
-	.banner {
-		width: 100%;
-		height: 200rpx;
-		// background: $base-color;
-	}
+.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 {
+	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;
+	.info-pic {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		border: 4rpx solid #fff;
+		position: relative;
+
+		image {
+			width: 100%;
+			height: 100%;
 			border-radius: 50%;
-			border: 4rpx solid #fff;
-			position: relative;
-
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: 50%;
-			}
-
-		}
-
-		.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 {
+	.member-info {
+		flex: 1;
+		width: 0;
+		margin-left: 32rpx;
 		display: flex;
-		width: 100%;
-		margin-top: 22rpx;
 
-		.fenxiao-index-other {
-			margin: 0 24rpx 20rpx 24rpx;
-			border-radius: 16rpx;
-			background-color: #ffffff;
-			padding: 30rpx 0;
+		view {
+			color: #fff;
+		}
+
+		.rank-info-box {
+			line-height: 1;
 			flex: 1;
+		}
 
-			&:last-child {
-				margin-left: 0;
+		.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-item {
-				margin: 0 30rpx;
+			.all-money-tit-wrap {
+				flex: 1;
+				margin-left: 24rpx;
 				display: flex;
-				font-size: $font-size-tag;
-				align-items: center;
+				flex-direction: column;
+				height: 70rpx;
 
-				.img-wrap {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 70rpx;
-					height: 70rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
+				.all-money-tit {
+					line-height: 1;
+					color: $color-title;
+					font-size: $font-size-base;
+					flex: 1;
 				}
 
-				.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;
-					}
+				.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;
-	}
+.icon-wenxiao {
+	text-align: center;
+	font-size: 50rpx;
+	color: var(--base-color) !important;
+}
 
-	.number {
-		font-weight: 600;
-		text-align: center;
-	}
+.number {
+	font-weight: 600;
+	text-align: center;
+}
 
-	.info-text {
-		font-size: 20rpx;
-		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-title {
+	font-size: 50rpx;
+	font-weight: 900;
+	color: #f5f5f5;
+	text-align: center;
+}
 
-	.info-rank {
-		color: #f5f5f5;
-		margin-top: 10rpx;
-	}
+.info-rank {
+	color: #f5f5f5;
+	margin-top: 10rpx;
+}
 
-	.title-rakn-text {
-		text-align: center;
-		font-size: 30rpx;
-		font-weight: 900;
-	}
+.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-list {
+	transform: translateY(-120rpx);
+	margin: 200rpx 24rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 10rpx 20rpx;
+	margin-top: 140rpx;
 
-		.ranking-item {
+	.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;
-			padding: 20rpx 0;
-			border-bottom: 2rpx solid #f5f5f5;
+			justify-content: center;
+			box-sizing: border-box;
+			font-size: 24rpx;
+		}
 
-			&:last-child {
-				border-bottom: 0;
-			}
+		&:nth-child(1) .ranking {
+			background: rgb(249, 186, 1);
+			border-radius: 50%;
+			border: 10rpx solid rgb(254, 220, 92);
+		}
 
-			.ranking {
-				width: 60rpx;
-				height: 60rpx;
+		&: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;
-				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);
-			}
+				overflow: hidden;
 
-			&: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%;
-					}
+				image {
+					width: 100%;
+					height: 100%;
 				}
+			}
 
-				.nickname {
-					color: #333;
-					margin: 0 20rpx;
-					font-size: 28rpx;
-				}
+			.nickname {
+				color: #333;
+				margin: 0 20rpx;
+				font-size: 28rpx;
 			}
 		}
 	}
+}
 </style>
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index 36927b5..f0e643b 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -72,23 +72,16 @@
 </template>
 
 <script>
-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';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index 87d9a47..069ee50 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -83,22 +83,15 @@
 </template>
 
 <script>
-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';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue
index e5dfb4e..32052cf 100644
--- a/pages_promotion/fenxiao/withdraw_apply.vue
+++ b/pages_promotion/fenxiao/withdraw_apply.vue
@@ -69,6 +69,9 @@
 
 <script>
 	export default {
+		components: {
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		},
 		data() {
 			return {
 				withdrawInfo: {},
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 60812fd..c24c1ba 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -5,16 +5,20 @@
 				<block v-if="withdrawList.length">
 					<view class="detailed-wrap">
 						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
+							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index"
+								@click="toDetail(item.id)">
 								<view class="info">
-									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
+									<view class="event">{{ item.transfer_type == 'balance' && '余额' ||
+										item.transfer_type == 'alipay' && '支付宝' || item.transfer_type == 'bank' && '银行卡' ||
+										item.transfer_type =='wechatpay'&&'微信' }}</view>
 									<view>
 										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
 									</view>
 								</view>
 								<view class="right-wrap">
 									<view class="num color-base-text">￥{{ item.money }}</view>
-									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
+									<view class="status-name" :style="withdrawState[item.status].color">{{
+										item.status_name }}</view>
 								</view>
 							</view>
 						</view>
@@ -29,26 +33,19 @@
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
-<script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+<script>	
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
-	},			
+	},
 	data() {
 		return {
 			withdrawState: {
@@ -74,7 +71,7 @@ export default {
 		};
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -85,9 +82,9 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
-		if(this.fenxiaoWords && this.fenxiaoWords.withdraw)this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
+		if (this.fenxiaoWords && this.fenxiaoWords.withdraw) this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -173,7 +170,7 @@ export default {
 		display: flex;
 		height: 90rpx;
 
-		& > view {
+		&>view {
 			flex: 1;
 			text-align: left;
 			padding: 0 $padding;
diff --git a/pages_promotion/fenxiao/withdrawal_detail.vue b/pages_promotion/fenxiao/withdrawal_detail.vue
index 51d563a..3be361f 100644
--- a/pages_promotion/fenxiao/withdrawal_detail.vue
+++ b/pages_promotion/fenxiao/withdrawal_detail.vue
@@ -54,6 +54,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			id: 0,
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index c0a454c..693c7c4 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -3,19 +3,19 @@
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">
-				
-				
-			<!-- 	<view class="flex-item input-wrap">
+
+
+				<!-- 	<view class="flex-item input-wrap">
 					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" placeholder="请输入您要搜索的商品" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view> -->
-				
+
 				<view style="width: 100rpx;height: 100rpx;">
 					<image :src="$util.img(merch.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;" />
 				</view>
 				<view style="margin-left: 20rpx;padding-top: 22rpx;">
-					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{merch.merch_name}}</view>
+					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{ merch.merch_name }}</view>
 					<view style="color:rgb(255 202 40)">
 						<text class="icox icox-xing"></text>
 						<text class="icox icox-xing"></text>
@@ -24,12 +24,13 @@
 						<text class="icox icox-xing"></text>
 					</view>
 				</view>
-				
+
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
+					@click="sortTabClick('')">
 					<text :class="{ 'color-base-text': orderType === '' }">综合</text>
 				</view>
 
@@ -39,12 +40,16 @@
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
 					<text :class="{ 'color-base-text': orderType === 'discount_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">
+				<!-- 	<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
 					<text @click="sortTabClick('screen')">筛选</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
@@ -56,17 +61,20 @@
 		<mescroll-uni top="240" 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.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -74,15 +82,19 @@
 							<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">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $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">
@@ -95,34 +107,35 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											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,11 +143,12 @@
 
 									<!--自定义图标 -->
 									<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>
@@ -143,29 +157,36 @@
 				</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">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $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">
@@ -176,48 +197,50 @@
 									<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>
 									</view>
-						
+
 									<!--自定义图标 -->
 									<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>
@@ -235,7 +258,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" />
@@ -243,7 +266,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="最低价" />
@@ -253,7 +276,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">
@@ -269,8 +292,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<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>
@@ -290,47 +316,43 @@
 </template>
 
 <script>
-	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 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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
-	import list from './public/js/list.js';
+	
+import list from './public/js/list.js';
 
-	export default {
-		components: {
-			uniDrawer,
-			uniTag,
-			nsGoodsSkuIndex,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		data() {
-			return {};
-		},
-		mixins: [list]
-	};
+export default {
+	components: {
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
+		uniTag: () => import('@/components/uni-tag/uni-tag.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
+	},
+	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;
-	}
+<style lang="scss" scoped>
+/deep/ .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>
\ No newline at end of file
diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
index 91180a8..e016d17 100644
--- a/pages_promotion/merch/merchcategory.vue
+++ b/pages_promotion/merch/merchcategory.vue
@@ -61,7 +61,10 @@
 
 <script>
 	export default {
-		components: {},
+		components: {
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		},
 		data() {
 			return {
 				scrollTop: 0,
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index 5dfd5ad..b992616 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -195,18 +195,23 @@
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
-import htmlParser from '@/common/js/html-parser';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import toTop from '@/components/toTop/toTop.vue';
+import htmlParser from '@/common/js/html-parser.js';
 import scroll from '@/common/js/scroll-view.js';
+
 export default {
 	components: {
-		uniPopup,
-		uniNumberBox,
-		nsGoodsSku,
-		toTop
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
 	},
 	data() {
 		return {
@@ -498,7 +503,7 @@ export default {
 	}
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index fa3ce71..f313859 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -4,7 +4,9 @@
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap" @click.stop="search()" @tap.stop="search()">
-					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()" @click.stop="search()" @tap.stop="search()" :placeholder="isEnEnv ? 'Please enter product keywords' : '请输入商品关键词'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()"
+						@click.stop="search()" @tap.stop="search()"
+						:placeholder="isEnEnv ? 'Please enter product keywords' : '请输入商品关键词'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()" @tap.stop="search()"></text>
 				</view>
 			</view>
@@ -17,15 +19,20 @@
 				<view class="price-wrap" @click="sortTabClick('point')">
 					<text :class="{ 'color-base-text': order === 'point' }">{{ isEnEnv ? 'Points' : '积分' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
+						<view class="iconfont icon-shangsanjiao-copy"
+							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
+						<view class="iconfont icon-sanjiao"
+							:class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
 					</view>
 				</view>
 				<view class="price-wrap" @click="sortTabClick('create_time')">
-					<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : '上新时间' }}</text>
+					<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : '上新时间'
+						}}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
+						<view class="iconfont icon-shangsanjiao-copy"
+							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
+						<view class="iconfont icon-sanjiao"
+							:class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
 					</view>
 				</view>
 				<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
@@ -47,7 +54,8 @@
 							</view>
 							<view class="info-wrap">
 								<view class="name-wrap">
-									<view class="goods-name" @click="toDetail(item)">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+									<view class="goods-name" @click="toDetail(item)">{{ isEnEnv ? item.en_goods_name :
+										item.goods_name }}</view>
 								</view>
 								<view class="lineheight-clear">
 									<view class="discount-price">
@@ -55,14 +63,18 @@
 										<text class="unit  font-size-tag">{{ isEnEnv ? 'Points' : '积分' }}</text>
 										<block v-if="item.price > 0 && item.pay_type > 0">
 											<text class="unit  font-size-tag">+</text>
-											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price  font-size-toolbar" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
-											<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
+											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol')
+												}}</text>
+											<text class="price  font-size-toolbar">{{
+												parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit  font-size-tag">.{{
+												parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
 										</block>
 									</view>
 								</view>
-								<view class="pro-info"  v-if="item.stock_show">
-									<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : '库存' }}{{ item.stock }}</view>
+								<view class="pro-info" v-if="item.stock_show">
+									<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : '库存' }}{{
+										item.stock }}</view>
 									<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
 										<!-- <button type="primary" size="mini">立即兑换</button> -->
 									</view>
@@ -71,7 +83,8 @@
 						</view>
 					</view>
 					<view class="empty" v-if="goodsList.length == 0">
-						<ns-empty :isIndex="false" :text="isEnEnv ? 'No point products available' : '暂无积分商品'"></ns-empty>
+						<ns-empty :isIndex="false"
+							:text="isEnEnv ? 'No point products available' : '暂无积分商品'"></ns-empty>
 					</view>
 				</view>
 			</block>
@@ -85,18 +98,25 @@
 				<view class="item-wrap">
 					<view class="label"><text>{{ isEnEnv ? 'Point Range' : '积分区间' }}</text></view>
 					<view class="price-wrap">
-						<input class="uni-input" type="digit" v-model="minPoint" :placeholder="isEnEnv ? 'Min' : '最低'" />
+						<input class="uni-input" type="digit" v-model="minPoint"
+							:placeholder="isEnEnv ? 'Min' : '最低'" />
 						<view class="h-line"></view>
-						<input class="uni-input" type="digit" v-model="maxPoint" :placeholder="isEnEnv ? 'Max' : '最高'" />
+						<input class="uni-input" type="digit" v-model="maxPoint"
+							:placeholder="isEnEnv ? 'Max' : '最高'" />
 					</view>
 				</view>
 				<!-- 分类筛选项 -->
 				<view class="category-list-wrap">
 					<text class="first">{{ isEnEnv ? 'All Categories' : '全部分类' }}</text>
 					<view class="class-box">
-						<view @click="selectedCategory('')" class="list-wrap"><text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' : '全部' }}</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('')" class="list-wrap"><text
+								:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' :
+								'全部' }}</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>
 					</view>
 				</view>
@@ -115,301 +135,443 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
 
-	export default {
-		components: {
-			uniDrawer,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		data() {
-			return {
-				listStyle: '',
-				priceOrder: 'desc',
-				categoryList: [], //排序类型
-				goodsList: [],
-				order: '',
-				sort: 'desc',
-				showScreen: false,
-				keyword: '',
-				categoryId: 0,
-				minPoint: '',
-				maxPoint: '',
-				isFreeShipping: false, //是否免邮
-				isIphoneX: false,
-				coupon: 0,
-				emptyShow: false,
-				isList: true, //列表样式
-				mescroll: null,
-				isLogin: false,
-				couponList: [],
-				hongbaoList: [],
-				point: 0,
-			};
-		},
-		onLoad(options) {
-			this.categoryId = options.category_id || 0;
-			this.keyword = options.keyword || '';
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			this.coupon = options.coupon || 0;
-			this.loadCategoryList(this.categoryId);
-		},
-		methods: {
-			//获取积分商品详情
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						type: 1,
-						keyword: this.keyword,
-						category_id: this.categoryId,
-						min_point: this.minPoint,
-						max_point: this.maxPoint,
-						is_free_shipping: (this.isFreeShipping ? 1 : 0),
-						order: this.order,
-						sort: this.sort,
-						coupon: this.coupon
-					},
-					success: res => {
-						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.goodsList = []; //如果是第一页需手动制空列表
-						this.goodsList = this.goodsList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						//联网失败的回调
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+export default {
+	components: {
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			listStyle: '',
+			priceOrder: 'desc',
+			categoryList: [], //排序类型
+			goodsList: [],
+			order: '',
+			sort: 'desc',
+			showScreen: false,
+			keyword: '',
+			categoryId: 0,
+			minPoint: '',
+			maxPoint: '',
+			isFreeShipping: false, //是否免邮
+			isIphoneX: false,
+			coupon: 0,
+			emptyShow: false,
+			isList: true, //列表样式
+			mescroll: null,
+			isLogin: false,
+			couponList: [],
+			hongbaoList: [],
+			point: 0,
+		};
+	},
+	onLoad(options) {
+		this.categoryId = options.category_id || 0;
+		this.keyword = options.keyword || '';
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		this.coupon = options.coupon || 0;
+		this.loadCategoryList(this.categoryId);
+	},
+	methods: {
+		//获取积分商品详情
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					type: 1,
+					keyword: this.keyword,
+					category_id: this.categoryId,
+					min_point: this.minPoint,
+					max_point: this.maxPoint,
+					is_free_shipping: (this.isFreeShipping ? 1 : 0),
+					order: this.order,
+					sort: this.sort,
+					coupon: this.coupon
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
 					}
-				});
-			},
-			//加载分类
-			loadCategoryList(fid, sid) {
-				this.$api.sendRequest({
-					url: '/api/goodscategory/tree',
-					data: {},
-					success: res => {
-						if (res.data != null) this.categoryList = res.data;
-					}
-				});
-			},
-			goodsImg(imgStr) {
-				let imgs = imgStr.split(',');
-				return imgs[0] ? this.$util.img(imgs[0], {
-					size: 'mid'
-				}) : this.$util.getDefaultImage().goods;
-			},
-			imgError(index) {
-				this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
-			},
-			//跳转至详情页面
-			toDetail(item) {
-				this.$util.redirectTo('/pages_promotion/point/detail', {
-					id: item.id
-				});
-			},
-			search() {
-				this.emptyShow = false;
-				this.goodsList = [];
-				this.$refs.mescroll.refresh();
-			},
-			//筛选点击
-			sortTabClick(tag) {
-				if (tag == 'point') {
-					this.order = 'point';
-					this.sort = 'desc';
-				} else if (tag == 'create_time') {
-					this.order = 'create_time';
-					this.sort = 'desc';
-				} else if (tag == 'screen') {
-					//筛选
-					this.showScreen = true;
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					//联网失败的回调
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//加载分类
+		loadCategoryList(fid, sid) {
+			this.$api.sendRequest({
+				url: '/api/goodscategory/tree',
+				data: {},
+				success: res => {
+					if (res.data != null) this.categoryList = res.data;
+				}
+			});
+		},
+		goodsImg(imgStr) {
+			let imgs = imgStr.split(',');
+			return imgs[0] ? this.$util.img(imgs[0], {
+				size: 'mid'
+			}) : this.$util.getDefaultImage().goods;
+		},
+		imgError(index) {
+			this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+		},
+		//跳转至详情页面
+		toDetail(item) {
+			this.$util.redirectTo('/pages_promotion/point/detail', {
+				id: item.id
+			});
+		},
+		search() {
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		//筛选点击
+		sortTabClick(tag) {
+			if (tag == 'point') {
+				this.order = 'point';
+				this.sort = 'desc';
+			} else if (tag == 'create_time') {
+				this.order = 'create_time';
+				this.sort = 'desc';
+			} else if (tag == 'screen') {
+				//筛选
+				this.showScreen = true;
+				return;
+			} else {
+				this.order = '';
+				this.sort = '';
+			}
+
+			this.order = tag;
+			if (tag === 'create_time') {
+				this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+				this.sort = this.priceOrder;
+			} else if (tag === 'point') {
+				this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
+				this.sort = this.priceOrder;
+			}
+
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+		},
+		selectedCategory(categoryId) {
+			this.categoryId = categoryId;
+		},
+		screenData() {
+			if (this.minPoint != '' || this.maxPoint != '') {
+				// if (!Number(this.minPoint) && this.minPoint) {
+				// 	this.$util.showToast({
+				// 		title: '请输入最低价'
+				// 	});
+				// 	return;
+				// }
+				if (!Number(this.maxPoint) && this.maxPoint) {
+					this.$util.showToast({
+						title: this.isEnEnv ? 'Please enter the maximum price' : '请输入最高价'
+					});
 					return;
-				} else {
-					this.order = '';
-					this.sort = '';
 				}
-
-				this.order = tag;
-				if (tag === 'create_time') {
-					this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
-					this.sort = this.priceOrder;
-				} else if (tag === 'point') {
-					this.priceOrder = this.priceOrder === 'asc' ? 'desc' : 'asc';
-					this.sort = this.priceOrder;
+				if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
+					this.$util.showToast({
+						title: this.isEnEnv ? 'Filter price cannot be less than 0' : '筛选价格不能小于0'
+					});
+					return;
 				}
+				if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
 
-				this.emptyShow = false;
-				this.goodsList = [];
-				this.$refs.mescroll.refresh();
-			},
-			selectedCategory(categoryId) {
-				this.categoryId = categoryId;
-			},
-			screenData() {
-				if (this.minPoint != '' || this.maxPoint != '') {
-					// if (!Number(this.minPoint) && this.minPoint) {
-					// 	this.$util.showToast({
-					// 		title: '请输入最低价'
-					// 	});
-					// 	return;
-					// }
-					if (!Number(this.maxPoint) && this.maxPoint) {
-						this.$util.showToast({
-							title: this.isEnEnv ? 'Please enter the maximum price' : '请输入最高价'
-						});
-						return;
-					}
-					if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
-						this.$util.showToast({
-							title: this.isEnEnv ? 'Filter price cannot be less than 0' : '筛选价格不能小于0'
-						});
-						return;
-					}
-					if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
-
-						this.$util.showToast({
-							title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : '最低价不能大于最高价'
-						});
-						return;
-					}
-					if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
-						this.$util.showToast({
-							title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : '最高价不能小于最低价'
-						});
-						return;
-					}
+					this.$util.showToast({
+						title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : '最低价不能大于最高价'
+					});
+					return;
 				}
-				this.emptyShow = false;
-				this.goodsList = [];
-				this.$refs.mescroll.refresh();
-				this.showScreen = false;
-			},
-			//重置数据
-			resetData() {
-				this.showScreen = false;
-				this.categoryId = 0
-				this.minPoint = ''
-				this.maxPoint = ''
-			},
+				if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
+					this.$util.showToast({
+						title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : '最高价不能小于最低价'
+					});
+					return;
+				}
+			}
+			this.emptyShow = false;
+			this.goodsList = [];
+			this.$refs.mescroll.refresh();
+			this.showScreen = false;
 		},
-	};
+		//重置数据
+		resetData() {
+			this.showScreen = false;
+			this.categoryId = 0
+			this.minPoint = ''
+			this.maxPoint = ''
+		},
+	},
+};
 </script>
 
 <style lang="scss">
-	.head-wrap {
-		background: #fff;
-		position: fixed;
-		width: 100%;
-		left: 0;
-		z-index: 1;
+.head-wrap {
+	background: #fff;
+	position: fixed;
+	width: 100%;
+	left: 0;
+	z-index: 1;
 
-		.search-wrap {
-			flex: 0.5;
-			padding: 30rpx 30rpx 0;
-			font-size: $font-size-tag;
+	.search-wrap {
+		flex: 0.5;
+		padding: 30rpx 30rpx 0;
+		font-size: $font-size-tag;
+		display: flex;
+		align-items: center;
+
+		.input-wrap {
+			flex: 1;
 			display: flex;
+			justify-content: space-between;
 			align-items: center;
+			background: $color-bg;
+			height: 70rpx;
+			padding-left: 10rpx;
+			border-radius: 70rpx;
 
-			.input-wrap {
-				flex: 1;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
+			input {
+				width: 90%;
 				background: $color-bg;
-				height: 70rpx;
-				padding-left: 10rpx;
-				border-radius: 70rpx;
-
-				input {
-					width: 90%;
-					background: $color-bg;
-					font-size: $font-size-tag;
-					height: 50rpx;
-					padding: 10rpx 25rpx 10rpx 40rpx;
-					line-height: 50rpx;
-					border-radius: 40rpx;
-				}
-
-				text {
-					font-size: $font-size-toolbar;
-					color: $color-tip;
-					width: 80rpx;
-					text-align: center;
-					margin-right: 20rpx;
-				}
+				font-size: $font-size-tag;
+				height: 50rpx;
+				padding: 10rpx 25rpx 10rpx 40rpx;
+				line-height: 50rpx;
+				border-radius: 40rpx;
 			}
 
-			.category-wrap,
-			.list-style {
-				display: flex;
-				justify-content: center;
-				align-items: center;
+			text {
+				font-size: $font-size-toolbar;
+				color: $color-tip;
+				width: 80rpx;
+				text-align: center;
+				margin-right: 20rpx;
+			}
+		}
+
+		.category-wrap,
+		.list-style {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.iconfont {
+				font-size: 50rpx;
+				color: $color-tip;
+			}
+
+			text {
+				display: block;
+				margin-top: 60rpx;
+			}
+		}
+	}
+
+	.sort-wrap {
+		display: flex;
+		padding: 10rpx 20rpx 10rpx 0;
+
+		>view {
+			flex: 1;
+			text-align: center;
+			font-size: $font-size-base;
+			height: 60rpx;
+			line-height: 60rpx;
+		}
+
+		.comprehensive-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
 
 				.iconfont {
-					font-size: 50rpx;
-					color: $color-tip;
-				}
-
-				text {
-					display: block;
-					margin-top: 60rpx;
+					font-size: $font-size-toolbar;
+					line-height: 1;
+					margin-bottom: 5rpx;
 				}
 			}
 		}
 
-		.sort-wrap {
+		.price-wrap {
 			display: flex;
-			padding: 10rpx 20rpx 10rpx 0;
+			justify-content: center;
+			align-items: center;
 
-			>view {
-				flex: 1;
-				text-align: center;
-				font-size: $font-size-base;
-				height: 60rpx;
-				line-height: 60rpx;
-			}
-
-			.comprehensive-wrap {
+			.iconfont-wrap {
 				display: flex;
 				justify-content: center;
 				align-items: center;
+				flex-direction: column;
+				width: 40rpx;
 
-				.iconfont-wrap {
+				.iconfont {
+					float: left;
+					font-size: 24rpx;
+					line-height: 1;
+					height: 20rpx;
+					color: #909399;
+				}
+			}
+		}
+
+		.screen-wrap {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.iconfont-wrap {
+				display: inline-block;
+				margin-left: 10rpx;
+				width: 40rpx;
+
+				.iconfont {
+					font-size: $font-size-toolbar;
+					line-height: 1;
+				}
+			}
+		}
+	}
+}
+
+.category-list-wrap {
+	height: 100%;
+
+	.class-box {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 $padding;
+
+		view {
+			width: calc((100% - 60rpx) / 3);
+			font-size: $font-size-goods-tag;
+			margin-right: 20rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			margin-bottom: 12rpx;
+			flex-shrink: 0;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			background: rgba(245, 245, 245, 1);
+			border-radius: 5rpx;
+
+			&:nth-of-type(3n) {
+				margin-right: 0;
+			}
+		}
+	}
+
+	.first {
+		font-size: $font-size-tag;
+		display: block;
+		// background: $page-color-base;
+		padding: 20rpx;
+	}
+
+	.second {
+		border-bottom: 2rpx solid $color-line;
+		padding: 20rpx;
+		display: block;
+		font-size: $font-size-tag;
+	}
+
+	.third {
+		padding: 0 20rpx 20rpx;
+		overflow: hidden;
+		font-size: $font-size-tag;
+
+		>view {
+			display: inline-block;
+			margin-right: 20rpx;
+			margin-top: 20rpx;
+		}
+
+		.uni-tag {
+			padding: 0 20rpx;
+		}
+	}
+}
+
+.screen-wrap {
+	.title {
+		font-size: $font-size-tag;
+		padding: $padding;
+		background: #f6f4f5;
+	}
+
+	scroll-view {
+		height: 85%;
+
+		.item-wrap {
+			border-bottom: 1px solid #f0f0f0;
+
+			.label {
+				font-size: $font-size-tag;
+				padding: $padding;
+
+				view {
 					display: inline-block;
-					margin-left: 10rpx;
-					width: 40rpx;
+					font-size: 60rpx;
+					height: 40rpx;
+					vertical-align: middle;
+					line-height: 40rpx;
+				}
+			}
 
-					.iconfont {
-						font-size: $font-size-toolbar;
-						line-height: 1;
-						margin-bottom: 5rpx;
-					}
+			.list {
+				margin: $margin-updown $margin-both;
+				overflow: hidden;
+
+				>view {
+					display: inline-block;
+					margin-right: 25rpx;
+					margin-bottom: 25rpx;
+				}
+
+				.uni-tag {
+					padding: 0 $padding;
+					font-size: $font-size-goods-tag;
+					background: #f5f5f5;
+					height: 52rpx;
+					line-height: 52rpx;
+					border: 0;
 				}
 			}
 
@@ -417,491 +579,346 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
+				padding: $padding;
 
-				.iconfont-wrap {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-					width: 40rpx;
+				input {
+					flex: 1;
+					background: #f5f5f5;
+					height: 52rpx;
+					width: 182rpx;
+					line-height: 50rpx;
+					font-size: $font-size-goods-tag;
+					border-radius: 50rpx;
+					text-align: center;
 
-					.iconfont {
-						float: left;
-						font-size: 24rpx;
-						line-height: 1;
-						height: 20rpx;
-						color: #909399;
+					&:first-child {
+						margin-right: 10rpx;
 					}
-				}
-			}
 
-			.screen-wrap {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.iconfont-wrap {
-					display: inline-block;
-					margin-left: 10rpx;
-					width: 40rpx;
-
-					.iconfont {
-						font-size: $font-size-toolbar;
-						line-height: 1;
+					&:last-child {
+						margin-left: 10rpx;
 					}
 				}
 			}
 		}
 	}
 
-	.category-list-wrap {
-		height: 100%;
+	.footer {
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: flex-start;
+		//position: absolute;
+		bottom: 0;
+		width: 100%;
 
-		.class-box {
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 $padding;
-
-			view {
-				width: calc((100% - 60rpx) / 3);
-				font-size: $font-size-goods-tag;
-				margin-right: 20rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				text-align: center;
-				margin-bottom: 12rpx;
-				flex-shrink: 0;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				background: rgba(245, 245, 245, 1);
-				border-radius: 5rpx;
-
-				&:nth-of-type(3n) {
-					margin-right: 0;
-				}
-			}
+		.footer-box {
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+			margin: 0;
+			width: 40%;
 		}
 
-		.first {
-			font-size: $font-size-tag;
-			display: block;
-			// background: $page-color-base;
-			padding: 20rpx;
+		.footer-box1 {
+			border-top-left-radius: 0;
+			border-bottom-left-radius: 0;
+			margin: 0;
+			width: 40%;
 		}
+	}
+}
 
-		.second {
-			border-bottom: 2rpx solid $color-line;
-			padding: 20rpx;
-			display: block;
-			font-size: $font-size-tag;
-		}
+.safe-area {
+	bottom: 68rpx !important;
+}
 
-		.third {
-			padding: 0 20rpx 20rpx;
+.empty {
+	margin-top: 100rpx;
+}
+
+.buy-num {
+	font-size: $font-size-activity-tag;
+}
+
+.icon {
+	width: 34rpx;
+	height: 30rpx;
+}
+
+.list-style-new {
+	display: flex;
+	align-items: center;
+
+	.line {
+		width: 4rpx;
+		height: 28rpx;
+		background-color: rgba(227, 227, 227, 1);
+		margin-right: 60rpx;
+	}
+}
+
+.h-line {
+	width: 37rpx;
+	height: 2rpx;
+	background-color: $color-tip;
+}
+
+.lineheight-clear {
+	line-height: 1 !important;
+}
+
+// 商品列表单列样式
+.goods-list.single-column {
+	.goods-item {
+		padding: 26rpx;
+		background: #fff;
+		margin: $margin-updown $margin-both;
+		border-radius: $border-radius;
+		display: flex;
+		position: relative;
+
+		.goods-img {
+			width: 200rpx;
+			height: 200rpx;
 			overflow: hidden;
-			font-size: $font-size-tag;
-
-			>view {
-				display: inline-block;
-				margin-right: 20rpx;
-				margin-top: 20rpx;
-			}
-
-			.uni-tag {
-				padding: 0 20rpx;
-			}
-		}
-	}
-
-	.screen-wrap {
-		.title {
-			font-size: $font-size-tag;
-			padding: $padding;
-			background: #f6f4f5;
-		}
-
-		scroll-view {
-			height: 85%;
-
-			.item-wrap {
-				border-bottom: 1px solid #f0f0f0;
-
-				.label {
-					font-size: $font-size-tag;
-					padding: $padding;
-
-					view {
-						display: inline-block;
-						font-size: 60rpx;
-						height: 40rpx;
-						vertical-align: middle;
-						line-height: 40rpx;
-					}
-				}
-
-				.list {
-					margin: $margin-updown $margin-both;
-					overflow: hidden;
-
-					>view {
-						display: inline-block;
-						margin-right: 25rpx;
-						margin-bottom: 25rpx;
-					}
-
-					.uni-tag {
-						padding: 0 $padding;
-						font-size: $font-size-goods-tag;
-						background: #f5f5f5;
-						height: 52rpx;
-						line-height: 52rpx;
-						border: 0;
-					}
-				}
-
-				.price-wrap {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					padding: $padding;
-
-					input {
-						flex: 1;
-						background: #f5f5f5;
-						height: 52rpx;
-						width: 182rpx;
-						line-height: 50rpx;
-						font-size: $font-size-goods-tag;
-						border-radius: 50rpx;
-						text-align: center;
-
-						&:first-child {
-							margin-right: 10rpx;
-						}
-
-						&:last-child {
-							margin-left: 10rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.footer {
-			height: 90rpx;
-			display: flex;
-			justify-content: center;
-			align-items: flex-start;
-			//position: absolute;
-			bottom: 0;
-			width: 100%;
-
-			.footer-box {
-				border-top-right-radius: 0;
-				border-bottom-right-radius: 0;
-				margin: 0;
-				width: 40%;
-			}
-
-			.footer-box1 {
-				border-top-left-radius: 0;
-				border-bottom-left-radius: 0;
-				margin: 0;
-				width: 40%;
-			}
-		}
-	}
-
-	.safe-area {
-		bottom: 68rpx !important;
-	}
-
-	.empty {
-		margin-top: 100rpx;
-	}
-
-	.buy-num {
-		font-size: $font-size-activity-tag;
-	}
-
-	.icon {
-		width: 34rpx;
-		height: 30rpx;
-	}
-
-	.list-style-new {
-		display: flex;
-		align-items: center;
-
-		.line {
-			width: 4rpx;
-			height: 28rpx;
-			background-color: rgba(227, 227, 227, 1);
-			margin-right: 60rpx;
-		}
-	}
-
-	.h-line {
-		width: 37rpx;
-		height: 2rpx;
-		background-color: $color-tip;
-	}
-
-	.lineheight-clear {
-		line-height: 1 !important;
-	}
-
-	// 商品列表单列样式
-	.goods-list.single-column {
-		.goods-item {
-			padding: 26rpx;
-			background: #fff;
-			margin: $margin-updown $margin-both;
 			border-radius: $border-radius;
-			display: flex;
-			position: relative;
+			margin-right: 20rpx;
 
-			.goods-img {
-				width: 200rpx;
-				height: 200rpx;
-				overflow: hidden;
-				border-radius: $border-radius;
-				margin-right: 20rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.goods-tag {
-				color: #fff;
-				line-height: 1;
-				padding: 8rpx 12rpx;
-				position: absolute;
-				border-top-left-radius: $border-radius;
-				border-bottom-right-radius: $border-radius;
-				top: 26rpx;
-				left: 26rpx;
-				font-size: $font-size-goods-tag;
-			}
-
-			.goods-tag-img {
-				position: absolute;
-				border-top-left-radius: $border-radius;
-				width: 80rpx;
-				height: 80rpx;
-				top: 26rpx;
-				left: 26rpx;
-				z-index: 5;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.info-wrap {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-			}
-
-			.name-wrap {
-				flex: 1;
-			}
-
-			.goods-name {
-				font-size: $font-size-base;
-				line-height: 1.3;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				height: 68rpx;
-			}
-
-			.introduction {
-				line-height: 1;
-				margin-top: 10rpx;
-			}
-
-			.discount-price {
-				display: inline-block;
-				font-weight: bold;
-				line-height: 1;
-				margin-top: 16rpx;
-				color: var(--price-color);
-				.unit {
-					margin-right: 6rpx;
-				}
-			}
-
-			.pro-info {
-				display: flex;
-				margin-top: 16rpx;
-
-				.delete-price {
-					text-decoration: line-through;
-					flex: 1;
-
-					.unit {
-						margin-right: 6rpx;
-					}
-				}
-
-				&>view {
-					line-height: 1;
-
-					&:nth-child(2) {
-						text-align: right;
-					}
-				}
-			}
-
-			.member-price-tag {
-				display: inline-block;
-				width: 60rpx;
-				line-height: 1;
-				margin-left: 6rpx;
-
-				image {
-					width: 100%;
-				}
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-	}
 
-	// 商品列表双列样式
-	.goods-list.double-column {
-		display: flex;
-		flex-wrap: wrap;
-		margin: 0 $margin-both;
-		padding-top: $margin-updown;
+		.goods-tag {
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 12rpx;
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			border-bottom-right-radius: $border-radius;
+			top: 26rpx;
+			left: 26rpx;
+			font-size: $font-size-goods-tag;
+		}
 
-		.goods-item {
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 26rpx;
+			left: 26rpx;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
 			flex: 1;
-			position: relative;
-			background-color: #fff;
-			flex-basis: 48%;
-			max-width: calc((100% - 30rpx) / 2);
-			margin: 0 $margin-both $margin-updown 0;
-			border-radius: $border-radius;
+			display: flex;
+			flex-direction: column;
+		}
 
-			&:nth-child(2n) {
-				margin-right: 0;
+		.name-wrap {
+			flex: 1;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			height: 68rpx;
+		}
+
+		.introduction {
+			line-height: 1;
+			margin-top: 10rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+			color: var(--price-color);
+
+			.unit {
+				margin-right: 6rpx;
 			}
+		}
 
-			.goods-img {
-				position: relative;
-				overflow: hidden;
-				padding-top: 100%;
-				border-top-left-radius: $border-radius;
-				border-top-right-radius: $border-radius;
+		.pro-info {
+			display: flex;
+			margin-top: 16rpx;
 
-				image {
-					width: 100%;
-					position: absolute;
-					top: 50%;
-					left: 0;
-					transform: translateY(-50%);
-				}
-			}
+			.delete-price {
+				text-decoration: line-through;
+				flex: 1;
 
-			.goods-tag {
-				color: #fff;
-				line-height: 1;
-				padding: 8rpx 16rpx;
-				position: absolute;
-				border-bottom-right-radius: $border-radius;
-				top: 0;
-				left: 0;
-				font-size: $font-size-goods-tag;
-			}
-
-			.goods-tag-img {
-				position: absolute;
-				border-top-left-radius: $border-radius;
-				width: 80rpx;
-				height: 80rpx;
-				top: 0;
-				left: 0;
-				z-index: 5;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.info-wrap {
-				padding: 0 26rpx 26rpx 26rpx;
-			}
-
-			.goods-name {
-				font-size: $font-size-base;
-				line-height: 1.3;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				margin-top: 20rpx;
-				height: 68rpx;
-			}
-
-			.discount-price {
-				display: inline-block;
-				font-weight: bold;
-				line-height: 1;
-				margin-top: 16rpx;
-				color: var(--price-color);
 				.unit {
 					margin-right: 6rpx;
 				}
 			}
 
-			.pro-info {
-				display: flex;
-				margin-top: 16rpx;
-
-				.delete-price {
-					text-decoration: line-through;
-					flex: 1;
-
-					.unit {
-						margin-right: 6rpx;
-					}
-				}
-
-				&>view {
-					line-height: 1;
-
-					&:nth-child(2) {
-						text-align: right;
-					}
-				}
-			}
-
-			.member-price-tag {
-				display: inline-block;
-				width: 60rpx;
+			&>view {
 				line-height: 1;
-				margin-left: 6rpx;
 
-				image {
-					width: 100%;
+				&:nth-child(2) {
+					text-align: right;
 				}
 			}
 		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+			}
+		}
 	}
-</style>
-<style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
-		background-color: #f5f5f5 !important;
+}
+
+// 商品列表双列样式
+.goods-list.double-column {
+	display: flex;
+	flex-wrap: wrap;
+	margin: 0 $margin-both;
+	padding-top: $margin-updown;
+
+	.goods-item {
+		flex: 1;
+		position: relative;
+		background-color: #fff;
+		flex-basis: 48%;
+		max-width: calc((100% - 30rpx) / 2);
+		margin: 0 $margin-both $margin-updown 0;
+		border-radius: $border-radius;
+
+		&:nth-child(2n) {
+			margin-right: 0;
+		}
+
+		.goods-img {
+			position: relative;
+			overflow: hidden;
+			padding-top: 100%;
+			border-top-left-radius: $border-radius;
+			border-top-right-radius: $border-radius;
+
+			image {
+				width: 100%;
+				position: absolute;
+				top: 50%;
+				left: 0;
+				transform: translateY(-50%);
+			}
+		}
+
+		.goods-tag {
+			color: #fff;
+			line-height: 1;
+			padding: 8rpx 16rpx;
+			position: absolute;
+			border-bottom-right-radius: $border-radius;
+			top: 0;
+			left: 0;
+			font-size: $font-size-goods-tag;
+		}
+
+		.goods-tag-img {
+			position: absolute;
+			border-top-left-radius: $border-radius;
+			width: 80rpx;
+			height: 80rpx;
+			top: 0;
+			left: 0;
+			z-index: 5;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info-wrap {
+			padding: 0 26rpx 26rpx 26rpx;
+		}
+
+		.goods-name {
+			font-size: $font-size-base;
+			line-height: 1.3;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			margin-top: 20rpx;
+			height: 68rpx;
+		}
+
+		.discount-price {
+			display: inline-block;
+			font-weight: bold;
+			line-height: 1;
+			margin-top: 16rpx;
+			color: var(--price-color);
+
+			.unit {
+				margin-right: 6rpx;
+			}
+		}
+
+		.pro-info {
+			display: flex;
+			margin-top: 16rpx;
+
+			.delete-price {
+				text-decoration: line-through;
+				flex: 1;
+
+				.unit {
+					margin-right: 6rpx;
+				}
+			}
+
+			&>view {
+				line-height: 1;
+
+				&:nth-child(2) {
+					text-align: right;
+				}
+			}
+		}
+
+		.member-price-tag {
+			display: inline-block;
+			width: 60rpx;
+			line-height: 1;
+			margin-left: 6rpx;
+
+			image {
+				width: 100%;
+			}
+		}
 	}
+}
+</style>
+<style lang="scss" scoped>
+/deep/ .uni-tag--primary.uni-tag--inverted {
+	background-color: #f5f5f5 !important;
+}
 </style>
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
index c1331b1..47f99e5 100644
--- a/pages_promotion/point/list.vue
+++ b/pages_promotion/point/list.vue
@@ -2,16 +2,19 @@
 	<view class="conteiner" :style="themeColor">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="point-navbar"
-			:style="{'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
-			<view class="nav-wrap" :style="{width: menuButtonBounding.left + 'px'}">
-				<view class="back" @click="back" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
+			:style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
+			<view class="nav-wrap" :style="{ width: menuButtonBounding.left + 'px' }">
+				<view class="back" @click="back"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
 					<text class="iconfont icon-back_light"></text>
 				</view>
 				<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')">
 					<text class="iconfont icon-sousuo3"></text>
 					<text class="tips">搜索商品</text>
 				</view>
-				<view class="sign" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }" @click="redirect('/pages_tool/member/signin')">
+				<view class="sign"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }"
+					@click="redirect('/pages_tool/member/signin')">
 					<image :src="$util.img('public/uniapp/point/navbar-sing-icon.png')" mode="widthFix"></image>
 				</view>
 			</view>
@@ -20,7 +23,7 @@
 		<!-- #endif -->
 
 		<scroll-view scroll-y="true" class="point-scroll-view" @scrolltolower="getData">
-			<view class="point-wrap" :style="{'background-position-y': -menuButtonBounding.bottom + 'px'}">
+			<view class="point-wrap" :style="{ 'background-position-y': -menuButtonBounding.bottom + 'px' }">
 				<view class="head-box">
 					<view class="account-content">
 						<view class="left">
@@ -28,9 +31,9 @@
 							<view>我的积分</view>
 						</view>
 						<view class="right">
-							<text class="point price-font">{{point}}</text>
+							<text class="point price-font">{{ point }}</text>
 							<text class="text">积分</text>
-					<!-- 		<text class="iconfont icon-right"></text> -->
+							<!-- 		<text class="iconfont icon-right"></text> -->
 						</view>
 					</view>
 					<view class="remark">
@@ -39,7 +42,7 @@
 					</view>
 				</view>
 
-			<!-- 	<view class="menu-wrap">
+				<!-- 	<view class="menu-wrap">
 					<view class="menu-list">
 						<view class="menu-item" @click="openPointPopup()">
 							<image :src="$util.img('/public/uniapp/point/point-rule.png')" class="menu-img"></image>
@@ -65,7 +68,7 @@
 						</view>
 					</view>
 				</view> -->
-<!-- 
+				<!-- 
 				<view class="poster-wrap">
 					<view class="poster-item" @click="redirect('/pages_tool/recharge/list')">
 						<image :src="$util.img('/public/uniapp/point/recharge-poster.png')" mode="widthFix"></image>
@@ -75,7 +78,8 @@
 					</view>
 				</view> -->
 
-				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')" v-if="rechargeList.length">
+				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')"
+					v-if="rechargeList.length">
 					<view class="item-wrap" v-for="(item, index) in rechargeList.slice(0, 4)" :key="index">
 						<view class="recharge">储值{{ parseFloat(item.buy_price) }}元</view>
 						<view class="point">可得{{ item.point }}积分</view>
@@ -92,10 +96,13 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-scroll" :class="{'single-row': couponList.length < 3}">
-								<view class="list-wrap-item coupon-list-wrap-item" v-for="(couponItem, couponIndex) in couponList" :key="couponIndex" @click="toDetail(couponItem)">
+							<view class="list-wrap-scroll" :class="{ 'single-row': couponList.length < 3 }">
+								<view class="list-wrap-item coupon-list-wrap-item"
+									v-for="(couponItem, couponIndex) in couponList" :key="couponIndex"
+									@click="toDetail(couponItem)">
 									<view class="img-box">
-										<image :src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')"/>
+										<image
+											:src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')" />
 									</view>
 									<view class="content">
 										<view class="coupon"
@@ -114,10 +121,14 @@
 												</view>
 												<view class="coupon-info">
 													<view class="coupon_condition font-size-activity-tag">
-														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' +
+															parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
 													</view>
-													<view class="coupon_type font-size-activity-tag" v-if="couponItem.goods_type == 1">全场券</view>
-													<view class="coupon_type font-size-activity-tag" v-else-if="couponItem.goods_type == 2||couponItem.goods_type == 3">指定券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-if="couponItem.goods_type == 1">全场券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-else-if="couponItem.goods_type == 2 || couponItem.goods_type == 3">
+														指定券</view>
 												</view>
 											</view>
 											<view class="coupon_right">
@@ -139,7 +150,9 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-item hongbao-list-wrap-item" v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex" @click="toDetail(hongbaoItem)">
+							<view class="list-wrap-item hongbao-list-wrap-item"
+								v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex"
+								@click="toDetail(hongbaoItem)">
 								<view class="img-box">
 									<image :src="$util.img('public/uniapp/point/hongbao_bg.png')"></image>
 								</view>
@@ -188,17 +201,19 @@
 												<block v-if="item.price > 0 && item.pay_type > 0">
 													<text class="unit  font-size-tag">+</text>
 													<view>
-														<text class="font-size-tag">{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
-														<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
+														<text class="font-size-tag">{{
+															parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+														<text class="unit  font-size-tag">.{{
+															parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
 													</view>
 												</block>
 											</view>
 											<view class="btn" @click="toDetail(item)">兑换</view>
 										</view>
-										<view class="pro-info" v-if="item.stock_show || item.sale_show ">
-											<view class="font-size-activity-tag color-tip" v-if="item.stock_show ">
+										<view class="pro-info" v-if="item.stock_show || item.sale_show">
+											<view class="font-size-activity-tag color-tip" v-if="item.stock_show">
 												库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}</view>
-											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show ">
+											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show">
 												已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
 											</view>
 										</view>
@@ -216,19 +231,19 @@
 			<uni-popup ref="pointPopup" type="bottom">
 				<view class="tips-layer">
 					<view class="head" @click="closePointPopup()">
-						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明'}}</view>
+						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明' }}</view>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="body">
 						<view class="detail margin-bottom">
-							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }}</view>
 							<view class="font-size-base">1、积分可在注册、签到、分享、消费、充值时获得。</view>
 							<view class="font-size-base">2、在购买部分商品时可获得积分。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用' }}</view>
 							<view class="font-size-base">1、积分可用于兑换积分中心的商品。</view>
 							<view class="font-size-base">2、积分可在参与某些活动时使用。</view>
 							<view class="font-size-base">3、积分不得转让，出售，不设有效期。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询' }}</view>
 							<view class="font-size-base">1、积分可在会员中心中查询具体数额以及明细。</view>
 						</view>
 					</view>
@@ -245,349 +260,358 @@
 	</view>
 </template>
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				mescroll: {
-					num: 0,
-					total: 1,
-					loading: false
-				},
-				categoryList: [{
-						id: 1,
-						name: '积分换好物'
-					},
-					{
-						id: 2,
-						name: '积分换券'
-					},
-					{
-						id: 3,
-						name: '积分换红包'
+
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			mescroll: {
+				num: 0,
+				total: 1,
+				loading: false
+			},
+			categoryList: [{
+				id: 1,
+				name: '积分换好物'
+			},
+			{
+				id: 2,
+				name: '积分换券'
+			},
+			{
+				id: 3,
+				name: '积分换红包'
+			}
+			],
+			isLogin: false,
+			goodsList: [],
+			couponList: [],
+			hongbaoList: [],
+			point: 0,
+			signState: 1, // 签到是否开启
+			mpShareData: null, //小程序分享数据
+			menuButtonBounding: {
+				bottom: 0
+			},
+			rechargeList: [], //充值套餐
+			newestGame: null
+		};
+	},
+	onLoad(option) {
+		setTimeout(() => {
+			if (!this.addonIsExist.pointexchange) {
+				this.$util.showToast({
+					title: '商家未开启积分商城',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		// #ifdef MP-WEIXIN
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+		//小程序分享接收source_member
+		if (option.source_member) {
+			uni.setStorageSync('source_member', option.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (option.scene) {
+			var sceneParams = decodeURIComponent(option.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
+				});
+			}
+		}
+		this.getData();
+		this.getRechargeList();
+		this.getNewestGame();
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+
+		//小程序分享
+		// #ifdef MP-WEIXIN
+		this.$util.getMpShare().then(res => {
+			this.mpShareData = res;
+		});
+		// #endif
+
+		if (this.storeToken) this.getAccountInfo();
+		this.getCouponList();
+		this.getHongbaoList();
+		// this.getSignState();
+	},
+	methods: {
+		// 签到是否开启
+		getSignState() {
+			this.$api.sendRequest({
+				url: '/api/membersignin/getSignStatus',
+				success: res => {
+					if (res.code == 0) {
+						this.signState = res.data.is_use;
 					}
-				],
-				isLogin: false,
-				goodsList: [],
-				couponList: [],
-				hongbaoList: [],
-				point: 0,
-				signState: 1, // 签到是否开启
-				mpShareData: null, //小程序分享数据
-				menuButtonBounding: {
-					bottom: 0
-				},
-				rechargeList: [], //充值套餐
-				newestGame: null
-			};
-		},
-		onLoad(option) {
-			setTimeout( () => {
-				if (!this.addonIsExist.pointexchange) {
-					this.$util.showToast({
-						title: '商家未开启积分商城',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
 				}
-			},1000);
-
-			// #ifdef MP-WEIXIN
-			this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
-			// #endif
-			//小程序分享接收source_member
-			if (option.source_member) {
-				uni.setStorageSync('source_member', option.source_member);
-			}
-			// 小程序扫码进入，接收source_member
-			if (option.scene) {
-				var sceneParams = decodeURIComponent(option.scene);
-				sceneParams = sceneParams.split('&');
-				if (sceneParams.length) {
-					sceneParams.forEach(item => {
-						if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
-						if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
-						if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
-					});
-				}
-			}
-			this.getData();
-			this.getRechargeList();
-			this.getNewestGame();
-		},
-		onShow() {
-			//记录分享关系
-			if (this.storeToken && uni.getStorageSync('source_member')) {
-				this.$util.onSourceMember(uni.getStorageSync('source_member'));
-			}
-
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
 			});
-			// #endif
-
-			if (this.storeToken) this.getAccountInfo();
-			this.getCouponList();
-			this.getHongbaoList();
-			// this.getSignState();
 		},
-		methods: {
-			// 签到是否开启
-			getSignState() {
-				this.$api.sendRequest({
-					url: '/api/membersignin/getSignStatus',
-					success: res => {
-						if (res.code == 0) {
-							this.signState = res.data.is_use;
-						}
+		jumpPage(url) {
+			this.$util.redirectTo(url);
+		},
+		// 打开积分说明弹出层
+		openPointPopup() {
+			this.$refs.pointPopup.open();
+		},
+		// 打开积分说明弹出层
+		closePointPopup() {
+			this.$refs.pointPopup.close();
+		},
+		// 优惠券
+		getCouponList() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page_size: 0,
+					type: 2
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.couponList = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
 					}
-				});
-			},
-			jumpPage(url) {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 红包
+		getHongbaoList() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page_size: 0,
+					type: 3
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.hongbaoList = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//获取积分商品详情
+		getData() {
+			if (this.mescroll.loading || this.mescroll.num >= this.mescroll.total) return;
+			this.mescroll.loading = true;
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page: this.mescroll.num + 1,
+					page_size: 10,
+					type: 1
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					//设置列表数据
+					this.mescroll.loading = false;
+					this.mescroll.total = res.data.page_count;
+					this.mescroll.num += 1;
+					if (this.mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					this.mescroll.loading = false;
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//跳转至详情页面
+		toDetail(item) {
+			this.$util.redirectTo('/pages_promotion/point/detail', {
+				id: item.id
+			});
+		},
+		goGoodsList() {
+			this.$util.redirectTo('/pages_promotion/point/goods_list');
+		},
+		//获取个人
+		getAccountInfo() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/info',
+				data: {
+					account_type: 'point'
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						if (!isNaN(parseFloat(res.data.point))) {
+							this.point = parseFloat(res.data.point).toFixed(0);
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		//跳转至登录页面
+		login() {
+			this.$refs.login.open('/pages_promotion/point/list');
+		},
+		imgError(index) {
+			this.goodsList[index].image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		goodsImg(data) {
+			let img = '';
+			switch (data.type) {
+				case 1:
+					img = this.$util.img(data.image.split(',')[0], {
+						size: 'mid'
+					});
+					break;
+				case 2:
+					img = data.image ? this.$util.img(data.image) : this.$util.img(
+						'public/uniapp/point/coupon.png');
+					break;
+				case 3:
+					img = data.image ? this.$util.img(data.image) : this.$util.img(
+						'public/uniapp/point/hongbao.png');
+					break;
+			}
+			return img;
+		},
+		/**
+		 * 跳转
+		 * @param {Object} url
+		 */
+		redirect(url) {
+			if (!this.storeToken) {
+				this.$refs.login.open(url);
+			} else {
 				this.$util.redirectTo(url);
-			},
-			// 打开积分说明弹出层
-			openPointPopup() {
-				this.$refs.pointPopup.open();
-			},
-			// 打开积分说明弹出层
-			closePointPopup() {
-				this.$refs.pointPopup.close();
-			},
-			// 优惠券
-			getCouponList() {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page_size: 0,
-						type: 2
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.couponList = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+			}
+		},
+		getRechargeList() {
+			this.$api.sendRequest({
+				url: '/memberrecharge/api/memberrecharge/page',
+				data: {
+					page_size: 100,
+					page: 1
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let rechargeList = [];
+						res.data.list.forEach(item => {
+							if (item.point > 0) rechargeList.push(item)
+						});
+						this.rechargeList = rechargeList;
 					}
-				});
-			},
-			// 红包
-			getHongbaoList() {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page_size: 0,
-						type: 3
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.hongbaoList = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			//获取积分商品详情
-			getData() {
-				if (this.mescroll.loading || this.mescroll.num >= this.mescroll.total) return;
-				this.mescroll.loading = true;
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page: this.mescroll.num + 1,
-						page_size: 10,
-						type: 1
-					},
-					success: res => {
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						//设置列表数据
-						this.mescroll.loading = false;
-						this.mescroll.total = res.data.page_count;
-						this.mescroll.num += 1;
-						if (this.mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
-						this.goodsList = this.goodsList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						this.mescroll.loading = false;
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			//跳转至详情页面
-			toDetail(item) {
-				this.$util.redirectTo('/pages_promotion/point/detail', {
-					id: item.id
-				});
-			},
-			goGoodsList() {
-				this.$util.redirectTo('/pages_promotion/point/goods_list');
-			},
-			//获取个人
-			getAccountInfo() {
-				this.$api.sendRequest({
-					url: '/api/memberaccount/info',
-					data: {
-						account_type: 'point'
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							if (!isNaN(parseFloat(res.data.point))) {
-								this.point = parseFloat(res.data.point).toFixed(0);
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			//跳转至登录页面
-			login() {
-				this.$refs.login.open('/pages_promotion/point/list');
-			},
-			imgError(index) {
-				this.goodsList[index].image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			goodsImg(data) {
-				let img = '';
-				switch (data.type) {
-					case 1:
-						img = this.$util.img(data.image.split(',')[0], {
-							size: 'mid'
+				}
+			})
+		},
+		back() {
+			if (getCurrentPages().length > 1) uni.navigateBack({
+				delta: 1
+			});
+			else this.$util.redirectTo('/pages/index/index');
+		},
+		getNewestGame() {
+			this.$api.sendRequest({
+				url: '/api/game/newestgame',
+				success: res => {
+					if (res.code == 0 && res.data) this.newestGame = res.data;
+				}
+			})
+		},
+		luckdraw() {
+			if (this.newestGame) {
+				switch (this.newestGame.game_type) {
+					case 'cards':
+						this.$util.redirectTo('/pages_promotion/game/cards', {
+							id: this.newestGame.game_id
 						});
 						break;
-					case 2:
-						img = data.image ? this.$util.img(data.image) : this.$util.img(
-							'public/uniapp/point/coupon.png');
+					case 'egg':
+						this.$util.redirectTo('/pages_promotion/game/smash_eggs', {
+							id: this.newestGame.game_id
+						});
 						break;
-					case 3:
-						img = data.image ? this.$util.img(data.image) : this.$util.img(
-							'public/uniapp/point/hongbao.png');
+					case 'turntable':
+						this.$util.redirectTo('/pages_promotion/game/turntable', {
+							id: this.newestGame.game_id
+						});
 						break;
 				}
-				return img;
-			},
-			/**
-			 * 跳转
-			 * @param {Object} url
-			 */
-			redirect(url) {
-				if (!this.storeToken) {
-					this.$refs.login.open(url);
-				} else {
-					this.$util.redirectTo(url);
-				}
-			},
-			getRechargeList() {
-				this.$api.sendRequest({
-					url: '/memberrecharge/api/memberrecharge/page',
-					data: {
-						page_size: 100,
-						page: 1
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							let rechargeList = [];
-							res.data.list.forEach(item => {
-								if (item.point > 0) rechargeList.push(item)
-							});
-							this.rechargeList = rechargeList;
-						}
-					}
-				})
-			},
-			back() {
-				if (getCurrentPages().length > 1) uni.navigateBack({
-					delta: 1
+			} else {
+				this.$util.showToast({
+					title: '暂无相关活动'
 				});
-				else this.$util.redirectTo('/pages/index/index');
-			},
-			getNewestGame() {
-				this.$api.sendRequest({
-					url: '/api/game/newestgame',
-					success: res => {
-						if (res.code == 0 && res.data) this.newestGame = res.data;
-					}
-				})
-			},
-			luckdraw() {
-				if (this.newestGame) {
-					switch (this.newestGame.game_type) {
-						case 'cards':
-							this.$util.redirectTo('/pages_promotion/game/cards', {
-								id: this.newestGame.game_id
-							});
-							break;
-						case 'egg':
-							this.$util.redirectTo('/pages_promotion/game/smash_eggs', {
-								id: this.newestGame.game_id
-							});
-							break;
-						case 'turntable':
-							this.$util.redirectTo('/pages_promotion/game/turntable', {
-								id: this.newestGame.game_id
-							});
-							break;
-					}
-				} else {
-					this.$util.showToast({
-						title: '暂无相关活动'
-					});
-				}
 			}
-		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
 		}
-	};
+	},
+	//分享给好友
+	onShareAppMessage() {
+		return this.mpShareData.appMessage;
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		return this.mpShareData.timeLine;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style>
-	.ns-adv>>>image {
-		width: 100%;
-		border-radius: 0;
-	}
+.ns-adv>>>image {
+	width: 100%;
+	border-radius: 0;
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index 66b6a83..2ab4990 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -1,36 +1,43 @@
 <template>
 	<view class="order-container" :style="themeColor">
 		<view class="order-nav" v-if="storeToken">
-			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
-				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item"
+				:id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title"
+					:class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
 					{{ statusItem.name }}
 				</text>
 			</view>
 		</view>
-		
-		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx" >
+
+		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx">
 			<block slot="list">
 				<block v-if="orderList.length">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="detail(orderItem)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
+						@click="detail(orderItem)">
 						<view class="order-header">
 							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
 							<text class="status-name">
-								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' : orderItem.order_status == -1 ? '已关闭' : '' }}
+								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' :
+									orderItem.order_status == -1 ? '已关闭' : '' }}
 							</text>
 						</view>
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
 									<block v-if="orderItem.type == 2">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
-										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+										<image
+											:src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
+											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 									<block v-else-if="orderItem.type == 3">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
-										 @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+										<image
+											:src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
+											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 									<block v-else>
-										<image :src="$util.img(orderItem.exchange_image)" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+										<image :src="$util.img(orderItem.exchange_image)"
+											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 								</view>
 								<view class="goods-info">
@@ -42,9 +49,12 @@
 												<text class="unit price-style small">积分</text>
 												<block v-if="orderItem.price > 0">
 													+
-													<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-													<text class="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-style large">{{
+														parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+													<text class="unit price-style small">.{{
+														parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
 												</block>
 											</text>
 											<text class="goods-num">
@@ -58,8 +68,10 @@
 						</view>
 						<view class="order-footer">
 							<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
-								<view class="order-box-btn font-size-tag" @click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
-								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
+								<view class="order-box-btn font-size-tag"
+									@click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
+								<view class="order-box-btn color-base-bg color-base-border"
+									@click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
 							</view>
 							<view class="order-action" v-else>
 								<view class="order-box-btn font-size-tag">查看详情</view>
@@ -69,7 +81,8 @@
 				</block>
 				<block v-if="showEmpty && !orderList.length">
 					<view class="cart-empty">
-						<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty>
+						<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages_promotion/point/list', text: '去逛逛' }"
+							text="暂无积分兑换订单"></ns-empty>
 					</view>
 				</block>
 			</block>
@@ -83,509 +96,508 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif	
-		
-	export default {
-		components: {
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},	
-		data() {
-			return {
-				orderList: [],
-				showEmpty: false,
-				outTradeNo: '',
-				payMoney: 0,
-				statusList: [
-					{status: 'all', id: 'all', name: '全部'},
-					{status: 0, id: 'pay', name: '待支付'},
-					{status: 1, id: 'complete', name: '已完成'},
-				],
-				orderStatus: 'all',
-			};
-		},
-		onLoad() {
-			setTimeout( () => {
-				if (!this.addonIsExist.pointexchange) {
-					this.$util.showToast({
-						title: '商家未开启积分商城',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
-					}, 2000);
-				}
-			},1000);
 
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_promotion/point/order_list');
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			orderList: [],
+			showEmpty: false,
+			outTradeNo: '',
+			payMoney: 0,
+			statusList: [
+				{ status: 'all', id: 'all', name: '全部' },
+				{ status: 0, id: 'pay', name: '待支付' },
+				{ status: 1, id: 'complete', name: '已完成' },
+			],
+			orderStatus: 'all',
+		};
+	},
+	onLoad() {
+		setTimeout(() => {
+			if (!this.addonIsExist.pointexchange) {
+				this.$util.showToast({
+					title: '商家未开启积分商城',
+					mask: true,
+					duration: 2000
 				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
+				}, 2000);
 			}
-		},
-		onShow() {
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
-				}
-			}
-		},
-		methods: {
-			ontabtap(e) {
-				let index = e.target.dataset.current || e.currentTarget.dataset.current;
-				this.orderStatus = this.statusList[index].status;
-				this.$refs.loadingCover.show();
+		}, 1000);
+
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/point/order_list');
+			});
+		}
+	},
+	onShow() {
+		if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
 				this.$refs.mescroll.refresh();
-			},
-			getListData(mescroll) {
-				this.showEmpty = false;
-				this.$api.sendRequest({
-					url: '/pointexchange/api/order/page',
-					data: {
-						page: mescroll.num,
-						page_size: mescroll.size,
-						order_status: this.orderStatus
-					},
-					success: res => {
-						this.showEmpty = 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.orderList = []; //如果是第一页需手动制空列表
-						this.orderList = this.orderList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			orderClose(order_id, index) {
-				uni.showModal({
-					title: '提示',
-					content: '确定关闭此次兑换？',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/pointexchange/api/order/close',
-								data: {
-									order_id: order_id
-								},
-								success: res => {
-									if (res.code >= 0) {
-										this.orderList[index].order_status = -1;
-										this.$util.showToast({
-											title: '关闭成功'
-										});
-										this.$forceUpdate();
-									}
-								}
-							});
-						}
-					}
-				});
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment(out_trade_no, price) {
-				this.outTradeNo = out_trade_no;
-				this.payMoney = parseFloat(price);
-				this.$refs.choosePaymentPopup.open();
-			},
-			orderPay() {
-				this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-			},
-			detail(item) {
-				if (item.type == 1 && item.relate_order_id) {
-					switch (item.delivery_type) {
-						case 'store':
-							this.$util.redirectTo('/pages_order/detail_pickup', {
-								order_id: item.relate_order_id
-							});
-							break;
-						case 'local':
-							this.$util.redirectTo('/pages_order/detail_local_delivery', {
-								order_id: item.relate_order_id
-							});
-							break;
-						case 'express':
-							this.$util.redirectTo('/pages_order/detail', {
-								order_id: item.relate_order_id
-							});
-							break;
-						default:
-							this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-								order_id: item.relate_order_id
-							});
-					}
-				} else {
-					this.$util.redirectTo('/pages_order/detail_point', {
-						order_id: item.order_id
-					});
-				}
-			},
-			imageError(index) {
-				this.orderList[index].exchange_image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
 			}
 		}
-	};
+	},
+	methods: {
+		ontabtap(e) {
+			let index = e.target.dataset.current || e.currentTarget.dataset.current;
+			this.orderStatus = this.statusList[index].status;
+			this.$refs.loadingCover.show();
+			this.$refs.mescroll.refresh();
+		},
+		getListData(mescroll) {
+			this.showEmpty = false;
+			this.$api.sendRequest({
+				url: '/pointexchange/api/order/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					order_status: this.orderStatus
+				},
+				success: res => {
+					this.showEmpty = 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.orderList = []; //如果是第一页需手动制空列表
+					this.orderList = this.orderList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		orderClose(order_id, index) {
+			uni.showModal({
+				title: '提示',
+				content: '确定关闭此次兑换？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/pointexchange/api/order/close',
+							data: {
+								order_id: order_id
+							},
+							success: res => {
+								if (res.code >= 0) {
+									this.orderList[index].order_status = -1;
+									this.$util.showToast({
+										title: '关闭成功'
+									});
+									this.$forceUpdate();
+								}
+							}
+						});
+					}
+				}
+			});
+		},
+		// 显示选择支付方式弹框
+		openChoosePayment(out_trade_no, price) {
+			this.outTradeNo = out_trade_no;
+			this.payMoney = parseFloat(price);
+			this.$refs.choosePaymentPopup.open();
+		},
+		orderPay() {
+			this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+		},
+		detail(item) {
+			if (item.type == 1 && item.relate_order_id) {
+				switch (item.delivery_type) {
+					case 'store':
+						this.$util.redirectTo('/pages_order/detail_pickup', {
+							order_id: item.relate_order_id
+						});
+						break;
+					case 'local':
+						this.$util.redirectTo('/pages_order/detail_local_delivery', {
+							order_id: item.relate_order_id
+						});
+						break;
+					case 'express':
+						this.$util.redirectTo('/pages_order/detail', {
+							order_id: item.relate_order_id
+						});
+						break;
+					default:
+						this.$util.redirectTo('/pages_tool/order/detail_virtual', {
+							order_id: item.relate_order_id
+						});
+				}
+			} else {
+				this.$util.redirectTo('/pages_order/detail_point', {
+					order_id: item.order_id
+				});
+			}
+		},
+		imageError(index) {
+			this.orderList[index].exchange_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+
+/deep/ .empty {
+	padding-top: 0 !important;
+}
+
+.order-container {
+	width: 100vw;
+	height: 100vh;
+}
+
+.align-right {
+	text-align: right;
+}
+
+.order-item {
+	margin: $margin-updown 24rpx;
+	border-radius: 12rpx;
+	background: #fff;
+	position: relative;
+
+	.order-header {
+		display: flex;
+		align-items: center;
 		position: relative;
-		top: 0;
-	}
+		padding: $padding 24rpx 26rpx 24rpx;
 
-	/deep/ .empty {
-		padding-top: 0 !important;
-	}
+		&.waitpay {
+			padding-left: 70rpx;
 
-	.order-container {
-		width: 100vw;
-		height: 100vh;
-	}
-
-	.align-right {
-		text-align: right;
-	}
-
-	.order-item {
-		margin: $margin-updown 24rpx;
-		border-radius: 12rpx;
-		background: #fff;
-		position: relative;
-	
-		.order-header {
-			display: flex;
-			align-items: center;
-			position: relative;
-			padding: $padding 24rpx 26rpx 24rpx;
-	
-			&.waitpay {
-				padding-left: 70rpx;
-	
-				.iconyuan_checked,
-				.iconyuan_checkbox {
-					font-size: $font-size-toolbar;
-					position: absolute;
-					top: 48%;
-					left: 20rpx;
-					transform: translateY(-50%);
-				}
-				.iconyuan_checkbox {
-					color: $color-tip;
-				}
+			.iconyuan_checked,
+			.iconyuan_checkbox {
+				font-size: $font-size-toolbar;
+				position: absolute;
+				top: 48%;
+				left: 20rpx;
+				transform: translateY(-50%);
 			}
-	
-			.icondianpu {
-				display: inline-block;
-				line-height: 1;
-				margin-right: 12rpx;
-				font-size: $font-size-base;
-			}
-			
-			.order-no {
-				font-size: 26rpx;
-			}
-	
-			.status-name {
-				flex: 1;
-				text-align: right;
-				font-size: 26rpx;
-				font-weight: 600;
+
+			.iconyuan_checkbox {
+				color: $color-tip;
 			}
 		}
-	
-		.order-body {
-			.goods-wrap {
-				display: flex;
+
+		.icondianpu {
+			display: inline-block;
+			line-height: 1;
+			margin-right: 12rpx;
+			font-size: $font-size-base;
+		}
+
+		.order-no {
+			font-size: 26rpx;
+		}
+
+		.status-name {
+			flex: 1;
+			text-align: right;
+			font-size: 26rpx;
+			font-weight: 600;
+		}
+	}
+
+	.order-body {
+		.goods-wrap {
+			display: flex;
+			position: relative;
+			padding: 0 24rpx 30rpx 24rpx;
+
+			&:last-of-type {
+				margin-bottom: 0;
+			}
+
+			.goods-img {
+				width: 160rpx;
+				height: 160rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: $border-radius;
+				}
+			}
+
+			.goods-info {
+				flex: 1;
 				position: relative;
-				padding: 0 24rpx 30rpx 24rpx;
-	
-				&:last-of-type {
-					margin-bottom: 0;
-				}
-	
-				.goods-img {
-					width: 160rpx;
-					height: 160rpx;
-					margin-right: 20rpx;
-	
-					image {
-						width: 100%;
-						height: 100%;
-						border-radius: $border-radius;
-					}
-				}
-	
-				.goods-info {
+				max-width: calc(100% - 180rpx);
+				display: flex;
+				flex-direction: column;
+
+				.pro-info {
 					flex: 1;
-					position: relative;
-					max-width: calc(100% - 180rpx);
+				}
+
+				.goods-name {
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					line-height: 1.5;
+					font-size: $font-size-base;
+					color: $color-title;
+				}
+
+				.goods-sub-section {
+					width: 100%;
+					line-height: 1.3;
 					display: flex;
-					flex-direction: column;
-	
-					.pro-info {
+					margin-top: 14rpx;
+
+					.goods-price {
+						font-size: $font-size-tag;
+						color: var(--price-color);
 						flex: 1;
+						font-weight: bold;
 					}
-	
-					.goods-name {
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						line-height: 1.5;
-						font-size: $font-size-base;
-						color: $color-title;
+
+					.goods-num {
+						font-size: $font-size-tag;
+						color: $color-tip;
+						flex: 1;
+						text-align: right;
+						line-height: 1;
+
+						.iconfont {
+							font-size: $font-size-tag;
+						}
 					}
-	
-					.goods-sub-section {
-						width: 100%;
+
+					.goods-type {
+						font-size: $font-size-tag;
+					}
+
+					.unit {
+						font-size: $font-size-tag;
+						margin-right: 2rpx;
+					}
+
+					view {
+						flex: 1;
 						line-height: 1.3;
 						display: flex;
-						margin-top: 14rpx;
-	
-						.goods-price {
-							font-size: $font-size-tag;
-							color: var(--price-color);
-							flex: 1;
-							font-weight: bold;
-						}
-						.goods-num {
-							font-size: $font-size-tag;
-							color: $color-tip;
-							flex: 1;
+						flex-direction: column;
+
+						&:last-of-type {
 							text-align: right;
-							line-height: 1;
-	
+
 							.iconfont {
+								line-height: 1;
 								font-size: $font-size-tag;
 							}
 						}
-						.goods-type {
-							font-size: $font-size-tag;
-						}
-	
-						.unit {
-							font-size: $font-size-tag;
-							margin-right: 2rpx;
-						}
-	
-						view {
-							flex: 1;
-							line-height: 1.3;
-							display: flex;
-							flex-direction: column;
-	
-							&:last-of-type {
-								text-align: right;
-	
-								.iconfont {
-									line-height: 1;
-									font-size: $font-size-tag;
-								}
-							}
-						}
-					}
-	
-					.goods-action {
-						text-align: right;
-	
-						.action-btn {
-							line-height: 1;
-							padding: 14rpx 20rpx;
-							color: $color-title;
-							display: inline-block;
-							border-radius: $border-radius;
-							background: #fff;
-							border: 2rpx solid #999;
-							font-size: $font-size-tag;
-							margin-left: 10rpx;
-						}
 					}
 				}
-			}
-			
-			.multi-order-goods {
-				width: calc(100vw - 96rpx);
-				white-space: nowrap;
-				margin: 0 24rpx 30rpx 24rpx!important;
-				position: relative;
-				
-				.scroll-view {
-					width: 100%;
-				}
-				
-				.goods-wrap {
-					padding: 0;
-				}
-				
-				.goods-img {
-					min-width: 160rpx;
-				}
-				
-				.shade {
-					position: absolute;
-					z-index: 5;
-					height: 100%;
-					width: 44rpx;
-					right: 0;
-					top: 0;
-					
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-	
-		.order-footer {
-			.order-base-info {
-				.total {
-					padding: $padding;
-					font-size: $font-size-tag;
-					background: rgba(248, 248, 248, 0.5);
-					display: flex;
-					margin: 0 24rpx;
-	
-					& > text {
-						flex: 1;
+
+				.goods-action {
+					text-align: right;
+
+					.action-btn {
 						line-height: 1;
+						padding: 14rpx 20rpx;
+						color: $color-title;
+						display: inline-block;
+						border-radius: $border-radius;
+						background: #fff;
+						border: 2rpx solid #999;
+						font-size: $font-size-tag;
 						margin-left: 10rpx;
 					}
 				}
-	
-				.order-type {
-					padding-top: 20rpx;
-					flex: 0.5;
-	
-					& > text {
-						line-height: 1;
-					}
+			}
+		}
+
+		.multi-order-goods {
+			width: calc(100vw - 96rpx);
+			white-space: nowrap;
+			margin: 0 24rpx 30rpx 24rpx !important;
+			position: relative;
+
+			.scroll-view {
+				width: 100%;
+			}
+
+			.goods-wrap {
+				padding: 0;
+			}
+
+			.goods-img {
+				min-width: 160rpx;
+			}
+
+			.shade {
+				position: absolute;
+				z-index: 5;
+				height: 100%;
+				width: 44rpx;
+				right: 0;
+				top: 0;
+
+				image {
+					width: 100%;
+					height: 100%;
 				}
 			}
-	
-			.order-action {
-				text-align: right;
-				padding: 30rpx 24rpx;
-				position: relative;
-				
-				.order-time {
-					position: absolute;
-					top: 35rpx;
-					left: 30rpx;
-					display: flex;
-					align-items: center;
-					font-size: 10px;
-					color:#b5b6b9;
-					
-					image {
-						width: 26rpx;
-						height: 26rpx;
-						margin-right: 6rpx;
-					}
-				}
-	
-				.action-btn {
+		}
+	}
+
+	.order-footer {
+		.order-base-info {
+			.total {
+				padding: $padding;
+				font-size: $font-size-tag;
+				background: rgba(248, 248, 248, 0.5);
+				display: flex;
+				margin: 0 24rpx;
+
+				&>text {
+					flex: 1;
 					line-height: 1;
-					padding: 20rpx 26rpx;
-					color: #333;
-					display: inline-block;
-					border-radius: $border-radius;
-					background: #fff;
-					border: 2rpx solid #999;
-					font-size: $font-size-tag;
 					margin-left: 10rpx;
 				}
 			}
+
+			.order-type {
+				padding-top: 20rpx;
+				flex: 0.5;
+
+				&>text {
+					line-height: 1;
+				}
+			}
+		}
+
+		.order-action {
+			text-align: right;
+			padding: 30rpx 24rpx;
+			position: relative;
+
+			.order-time {
+				position: absolute;
+				top: 35rpx;
+				left: 30rpx;
+				display: flex;
+				align-items: center;
+				font-size: 10px;
+				color: #b5b6b9;
+
+				image {
+					width: 26rpx;
+					height: 26rpx;
+					margin-right: 6rpx;
+				}
+			}
+
+			.action-btn {
+				line-height: 1;
+				padding: 20rpx 26rpx;
+				color: #333;
+				display: inline-block;
+				border-radius: $border-radius;
+				background: #fff;
+				border: 2rpx solid #999;
+				font-size: $font-size-tag;
+				margin-left: 10rpx;
+			}
 		}
 	}
+}
 
-	.empty {
-		padding-top: 200rpx;
+.empty {
+	padding-top: 200rpx;
+	text-align: center;
+
+	.empty-image {
+		width: 180rpx;
+		height: 180rpx;
+	}
+}
+
+.order-nav {
+	width: 100vw;
+	height: 80rpx;
+	flex-direction: row;
+	/* #ifndef APP-PLUS */
+	white-space: nowrap;
+	/* #endif */
+	background: #fff;
+	display: flex;
+	position: fixed;
+	left: 0;
+	z-index: 998;
+	justify-content: space-around;
+	border-radius: 0px 0px 24rpx 24rpx;
+
+	.uni-tab-item {
+		width: 120rpx;
 		text-align: center;
-
-		.empty-image {
-			width: 180rpx;
-			height: 180rpx;
-		}
 	}
-	
-	.order-nav {
-		width: 100vw;
+
+	.uni-tab-item-title {
+		display: inline-block;
 		height: 80rpx;
-		flex-direction: row;
+		line-height: 80rpx;
+		border-bottom: 1px solid #fff;
+		flex-wrap: nowrap;
 		/* #ifndef APP-PLUS */
 		white-space: nowrap;
 		/* #endif */
-		background: #fff;
-		display: flex;
-		position: fixed;
-		left: 0;
-		z-index: 998;
-		justify-content: space-around;
-		border-radius: 0px 0px 24rpx 24rpx;
-	
-		.uni-tab-item {
-			width: 120rpx;
-			text-align: center;
-		}
-	
-		.uni-tab-item-title {
-			display: inline-block;
-			height: 80rpx;
-			line-height: 80rpx;
-			border-bottom: 1px solid #fff;
-			flex-wrap: nowrap;
-			/* #ifndef APP-PLUS */
-			white-space: nowrap;
-			/* #endif */
-			text-align: center;
-			font-size: 30rpx;
-			position: relative;
-		}
-	
-		.uni-tab-item-title-active::after {
-			content: " ";
-			display: block;
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			height: 6rpx;
-			background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
-		}
-	
-		::-webkit-scrollbar {
-			width: 0;
-			height: 0;
-			color: transparent;
-		}
+		text-align: center;
+		font-size: 30rpx;
+		position: relative;
 	}
+
+	.uni-tab-item-title-active::after {
+		content: " ";
+		display: block;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 6rpx;
+		background: linear-gradient(270deg, var(--base-color-light-9) 0%, var(--base-color) 100%);
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+}
 </style>
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
index 155cf6f..b53424f 100644
--- a/pages_promotion/point/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -2,9 +2,9 @@
 	<view class="order-container" :style="themeColor" :class="{ 'safe-area': isIphoneX }">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="payment-navbar" :style="{
-				'padding-top': menuButtonBounding.top + 'px',
-				height: menuButtonBounding.height + 'px'
-			}">
+			'padding-top': menuButtonBounding.top + 'px',
+			height: menuButtonBounding.height + 'px'
+		}">
 			<view class="nav-wrap">
 				<text class="iconfont icon-back_light" @click="back"></text>
 				<view class="navbar-title">确认订单</view>
@@ -18,11 +18,12 @@
 			<!-- 选择地址 -->
 			<template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.is_virtual == 0">
 				<!-- 配送方式 -->
-				<view class="delivery-mode" v-if="orderCreateData.delivery &&orderPaymentData.delivery.express_type.length > 1">
+				<view class="delivery-mode"
+					v-if="orderCreateData.delivery && orderPaymentData.delivery.express_type.length > 1">
 					<view class="action">
 						<view v-for="(deliveryItem, deliveryIndex) in orderPaymentData.delivery.express_type"
 							:key="deliveryIndex"
-							:class="{active: deliveryItem.name == orderCreateData.delivery.delivery_type}"
+							:class="{ active: deliveryItem.name == orderCreateData.delivery.delivery_type }"
 							@click="selectDeliveryType(deliveryItem)">
 							{{ deliveryItem.title }}
 							<!-- 外圆角 -->
@@ -31,10 +32,12 @@
 					</view>
 				</view>
 
-				<view class="address-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}"
+				<view class="address-box"
+					:class="{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
 					v-if="orderPaymentData.delivery.delivery_type != 'store'">
 					<block v-if="storeInfo.storeList.length > 1 && orderPaymentData.delivery.delivery_type == 'local'">
-						<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length" @click="$refs.deliveryPopup.open()">
+						<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length"
+							@click="$refs.deliveryPopup.open()">
 							<view class="info">
 								由 <text class="store-name">{{ storeInfo.currStore.store_name }}</text> 提供配送
 							</view>
@@ -49,14 +52,19 @@
 							</view>
 						</view>
 					</block>
-					<view class="info-wrap" :class="{'local': orderPaymentData.delivery.delivery_type == 'local'}" v-if="orderCreateData.member_address" @click="selectAddress">
+					<view class="info-wrap" :class="{ 'local': orderPaymentData.delivery.delivery_type == 'local' }"
+						v-if="orderCreateData.member_address" @click="selectAddress">
 						<view class="content">
-							<text class="name font-size-base">{{ orderCreateData.member_address.name ? orderCreateData.member_address.name : '' }}</text>
-							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ? orderCreateData.member_address.mobile : '' }}</text>
+							<text class="name font-size-base">{{ orderCreateData.member_address.name ?
+								orderCreateData.member_address.name : '' }}</text>
+							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ?
+								orderCreateData.member_address.mobile : '' }}</text>
 							<text class="cell-more iconfont icon-right"></text>
 							<view class="desc-wrap">
-								{{ orderCreateData.member_address.full_address ? orderCreateData.member_address.full_address : '' }}
-								{{ orderCreateData.member_address.address ? orderCreateData.member_address.address : '' }}
+								{{ orderCreateData.member_address.full_address ?
+									orderCreateData.member_address.full_address : '' }}
+								{{ orderCreateData.member_address.address ? orderCreateData.member_address.address : ''
+								}}
 							</view>
 						</view>
 					</view>
@@ -69,11 +77,14 @@
 
 					<!-- 外卖配送 -->
 					<block v-if="orderPaymentData.delivery.delivery_type == 'local'">
-						<view class="local-box" v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
+						<view class="local-box"
+							v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
 							<view class="pick-block" @click="localtime">
 								<view class="font-size-base">送达时间</view>
 								<view class="time-picker">
-									<text :class="{'color-tip': !orderCreateData.buyer_ask_delivery_title}">{{ orderCreateData.buyer_ask_delivery_title ? orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
+									<text :class="{ 'color-tip': !orderCreateData.buyer_ask_delivery_title }">{{
+										orderCreateData.buyer_ask_delivery_title ?
+											orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
 									<text class="iconfont icon-right cell-more"></text>
 								</view>
 							</view>
@@ -82,7 +93,9 @@
 					<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
 				</view>
 
-				<view class="store-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}" v-if="orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore">
+				<view class="store-box"
+					:class="{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
+					v-if="orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore">
 					<block v-if="storeInfo.currStore">
 						<view @click="openSiteDelivery" class="store-info">
 							<view class="store-address-info">
@@ -104,20 +117,22 @@
 						<view class="mobile-wrap store-mobile">
 							<view class="form-group">
 								<text class="text">姓名</text>
-								<input type="text" placeholder-class="color-tip placeholder" class="input" v-model="member_address.name" disabled />
+								<input type="text" placeholder-class="color-tip placeholder" class="input"
+									v-model="member_address.name" disabled />
 							</view>
 						</view>
 						<view class="mobile-wrap store-mobile">
 							<view class="form-group">
 								<text class="text">预留手机</text>
 								<input type="number" maxlength="11" placeholder="请输入您的手机号码"
-									placeholder-class="color-tip placeholder" class="input" v-model="member_address.mobile" />
+									placeholder-class="color-tip placeholder" class="input"
+									v-model="member_address.mobile" />
 							</view>
 						</view>
 						<view class="store-time">
 							<view class="left">自提时间</view>
 							<view class="right" @click="storetime">
-								{{orderCreateData.buyer_ask_delivery_title}}
+								{{ orderCreateData.buyer_ask_delivery_title }}
 								<text class="iconfont icon-right"></text>
 							</view>
 						</view>
@@ -137,27 +152,35 @@
 				<view class="form-group">
 					<text class="iconfont icon-dianhua2"></text>
 					<text class="text">手机号码</text>
-					<input type="number" maxlength="11" placeholder="请输入您的手机号码" placeholder-class="color-tip placeholder" class="input" v-model="orderCreateData.member_address.mobile" />
+					<input type="number" maxlength="11" placeholder="请输入您的手机号码"
+						placeholder-class="color-tip placeholder" class="input"
+						v-model="orderCreateData.member_address.mobile" />
 				</view>
 			</view>
 
 			<!-- 店铺 -->
-			<view class="site-wrap" :class="orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''">
+			<view class="site-wrap"
+				:class="orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''">
 				<view class="site-body">
 					<view class="goods-wrap">
 						<block v-if="orderPaymentData.exchange_info.type == 2">
 							<view class="goods-img">
-								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError()" mode="aspectFill"/>
+								<image
+									:src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')"
+									@error="imageError()" mode="aspectFill" />
 							</view>
 						</block>
 						<block v-else-if="orderPaymentData.exchange_info.type == 3">
 							<view class="goods-img">
-								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError()" mode="aspectFill"/>
+								<image
+									:src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')"
+									@error="imageError()" mode="aspectFill" />
 							</view>
 						</block>
 						<block v-else>
 							<view class="goods-img">
-								<image :src="$util.img(orderPaymentData.exchange_info.image)" @error="imageError()" mode="aspectFill"/>
+								<image :src="$util.img(orderPaymentData.exchange_info.image)" @error="imageError()"
+									mode="aspectFill" />
 							</view>
 						</block>
 						<view class="goods-info">
@@ -182,7 +205,8 @@
 				<view class="site-footer">
 					<view class="order-cell">
 						<text class="tit">买家留言</text>
-						<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip" v-model="orderCreateData.buyer_message" /></view>
+						<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip"
+								v-model="orderCreateData.buyer_message" /></view>
 					</view>
 				</view>
 			</view>
@@ -196,7 +220,8 @@
 						<text class="unit">积分</text>
 					</view>
 				</view>
-				<view class="order-cell" v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
+				<view class="order-cell"
+					v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
 					<text class="tit">运费</text>
 					<view class="box">
 						<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -206,8 +231,9 @@
 
 			</view>
 
-			<view class="error-message" v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''">
-				{{orderPaymentData.delivery.error_msg}}
+			<view class="error-message"
+				v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''">
+				{{ orderPaymentData.delivery.error_msg }}
 			</view>
 			<view class="order-submit" :class="{ 'bottom-safe-area': isIphoneX }">
 				<view class="order-settlement-info">
@@ -221,12 +247,14 @@
 					</template>
 				</view>
 				<view class="submit-btn">
-					<button v-if="createBtn()" type="primary" class="mini" size="mini" @click="openChoosePayment()">提交订单</button>
+					<button v-if="createBtn()" type="primary" class="mini" size="mini"
+						@click="openChoosePayment()">提交订单</button>
 					<button v-else class="no-submit mini" size="mini">
-						<block v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
-							差{{ orderPaymentData.delivery.start_money-orderPaymentData.price | moneyFormat }}起送
+						<block
+							v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
+							差{{ orderPaymentData.delivery.start_money - orderPaymentData.price | moneyFormat }}起送
 						</block>
-						<block v-else >提交订单</block>
+						<block v-else>提交订单</block>
 					</button>
 				</view>
 			</view>
@@ -241,22 +269,29 @@
 					</view>
 					<view class="popup-body store-popup" :class="{ 'safe-area': isIphoneX }">
 						<view class="delivery-content">
-							<view class="item-wrap" v-for="(item, index) in storeInfo.storeList" :key="index" @click="selectPickupPoint(item)">
+							<view class="item-wrap" v-for="(item, index) in storeInfo.storeList" :key="index"
+								@click="selectPickupPoint(item)">
 								<view class="detail">
-									<view class="name" :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''">
+									<view class="name"
+										:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''">
 										<text>{{ item.store_name }}</text>
 										<text v-if="item.distance">({{ item.distance }}km)</text>
 									</view>
 									<view class="info">
-										<view :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">
+										<view
+											:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
+											class="font-size-goods-tag">
 											营业时间：{{ item.open_date }}
 										</view>
-										<view :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">
+										<view
+											:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
+											class="font-size-goods-tag">
 											地址：{{ item.full_address }}{{ item.address }}
 										</view>
 									</view>
 								</view>
-								<view class="icon" v-if="item.store_id == orderPaymentData.delivery.store_id"><text class="iconfont icon-yuan_checked color-base-text"></text></view>
+								<view class="icon" v-if="item.store_id == orderPaymentData.delivery.store_id"><text
+										class="iconfont icon-yuan_checked color-base-text"></text></view>
 							</view>
 							<view v-if="!storeInfo.storeList" class="empty">所选择收货地址附近没有可以自提的门店</view>
 						</view>
@@ -267,7 +302,8 @@
 		</scroll-view>
 
 		<!-- 选择支付方式弹窗 -->
-		<ns-payment ref="choosePaymentPopup" :payMoney="orderPaymentData.order_money" @confirm="orderCreate"></ns-payment>
+		<ns-payment ref="choosePaymentPopup" :payMoney="orderPaymentData.order_money"
+			@confirm="orderCreate"></ns-payment>
 
 		<loading-cover ref="loadingCover"></loading-cover>
 
@@ -277,48 +313,41 @@
 </template>
 
 <script>
-	import payment from './public/js/payment.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+import payment from './public/js/payment.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsSelectTime,
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		mixins: [payment]
-	};
+
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	mixins: [payment]
+};
 </script>
 
 <style lang="scss">
-	@import "@/common/css/order_parment.scss";
+@import "@/common/css/order_parment.scss";
 </style>
 <style lang="scss" scoped>
-	/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;
+}
 
-	/deep/ .uni-popup {
-		z-index: 8;
-	}
+/deep/ .uni-popup {
+	z-index: 8;
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/point/result.vue b/pages_promotion/point/result.vue
index ce14ea8..62c7f14 100644
--- a/pages_promotion/point/result.vue
+++ b/pages_promotion/point/result.vue
@@ -12,81 +12,81 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {};
+export default {
+	data() {
+		return {};
+	},
+	onShow() {
+	},
+	methods: {
+		toOrderList() {
+			this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
 		},
-		onShow() {
-		},
-		methods: {
-			toOrderList() {
-				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
-			},
-			toIndex() {
-				this.$util.redirectTo('/pages/index/index');
-			}
+		toIndex() {
+			this.$util.redirectTo('/pages/index/index');
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-		background: #fff;
+.container {
+	width: 100vw;
+	height: 100vh;
+	background: #fff;
 
-		.image-wrap {
-			display: flex;
-			justify-content: center;
-			padding: 200rpx 0 40rpx 0;
+	.image-wrap {
+		display: flex;
+		justify-content: center;
+		padding: 200rpx 0 40rpx 0;
 
-			.result-image {
-				width: 166rpx;
-			}
-		}
-
-		.msg {
-			text-align: center;
-			line-height: 1;
-			margin-bottom: 50rpx;
-			font-size: $font-size-base;
-			color: #000;
-		}
-
-		.pay-amount {
-			color: #999;
-			text-align: center;
-			line-height: 1;
-			margin-bottom: 30rpx;
-		}
-
-		.action {
-			width: 90%;
-			margin: 0 auto;
-			text-align: center;
-			margin-top: 150rpx;
-			display: flex;
-			justify-content: space-between;
-
-			.btn {
-				width: 310rpx;
-				height: 78rpx;
-				border: 2rpx solid #ffffff;
-				border-radius: $border-radius;
-				font-size: $font-size-tag;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.alone {
-				margin-left: 0;
-				width: 60%;
-			}
-
-			.go-home {
-				color: #fff;
-			}
+		.result-image {
+			width: 166rpx;
 		}
 	}
+
+	.msg {
+		text-align: center;
+		line-height: 1;
+		margin-bottom: 50rpx;
+		font-size: $font-size-base;
+		color: #000;
+	}
+
+	.pay-amount {
+		color: #999;
+		text-align: center;
+		line-height: 1;
+		margin-bottom: 30rpx;
+	}
+
+	.action {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		margin-top: 150rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.btn {
+			width: 310rpx;
+			height: 78rpx;
+			border: 2rpx solid #ffffff;
+			border-radius: $border-radius;
+			font-size: $font-size-tag;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.alone {
+			margin-left: 0;
+			width: 60%;
+		}
+
+		.go-home {
+			color: #fff;
+		}
+	}
+}
 </style>
diff --git a/pages_tool/agreement/contenr.vue b/pages_tool/agreement/contenr.vue
index 7dfcaa9..581f70b 100644
--- a/pages_tool/agreement/contenr.vue
+++ b/pages_tool/agreement/contenr.vue
@@ -5,50 +5,48 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 export default {
-	 components: {
-	  },
-    data() {
-        return {
-			content:'',
-			type:'',
-			uniacid:0
-        };
-    },
-    onLoad(option) {
+	components: {
+	},
+	data() {
+		return {
+			content: '',
+			type: '',
+			uniacid: 0
+		};
+	},
+	onLoad(option) {
 		this.type = option.type
-		this.uniacid = option.uniacid?option.uniacid:0
-		
-        this.isIphoneX = this.$util.uniappIsIPhoneX()
-		 this.getcontent()
-    },
-    onShow() {
-      
-    },
-    methods: {
-        getcontent() {
+		this.uniacid = option.uniacid ? option.uniacid : 0
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX()
+		this.getcontent()
+	},
+	onShow() {
+
+	},
+	methods: {
+		getcontent() {
 			// privacy  content
 			var data = {
-				type:this.type
+				type: this.type
 			}
-			if(this.uniacid > 0) data.uniacid = this.uniacid
-            this.$api.sendRequest({
-               	url: '/api/config/agreement',
-				data:data,
-                success: res => {
+			if (this.uniacid > 0) data.uniacid = this.uniacid
+			this.$api.sendRequest({
+				url: '/api/config/agreement',
+				data: data,
+				success: res => {
 					console.log(res.data.title)
 					uni.setNavigationBarTitle({
-						title:res.data.title
+						title: res.data.title
 					})
 					this.content = res.data.content
-				}                   
-            });
-        }
-    }
+				}
+			});
+		}
+	}
 };
 </script>
 
-<style lang="scss">
-
-</style>
\ No newline at end of file
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/pages_tool/article/detail.vue b/pages_tool/article/detail.vue
index d2c7c25..7b39f90 100644
--- a/pages_tool/article/detail.vue
+++ b/pages_tool/article/detail.vue
@@ -25,134 +25,140 @@
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				articleId: 0,
-				detail: {},
-				content: ''
-			};
-		},
-		onLoad(options) {
-			this.articleId = options.article_id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.articleId = sceneParams.split('-')[1];
-			}
-			if (this.articleId == 0) {
-				this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/article/info',
-					data: {
-						article_id: this.articleId
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.detail = res.data;
-							this.$langConfig.title(this.detail.article_title);
-							this.content = htmlParser(this.detail.article_content);
-							this.setPublicShare();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-							}, 2000);
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
-				this.$util.setPublicShare({
-					title: this.detail.article_title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = this.detail.article_title;
-			var path = '/pages_tool/article/detail?article_id=' + this.articleId;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.article_title;
-			var query = 'article_id=' + this.articleId;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
+import htmlParser from '@/common/js/html-parser.js';
+export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif			
+	},
+	data() {
+		return {
+			articleId: 0,
+			detail: {},
+			content: ''
+		};
+	},
+	onLoad(options) {
+		this.articleId = options.article_id || 0;
+		// 小程序扫码进入
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.scene);
+			this.articleId = sceneParams.split('-')[1];
 		}
-	};
+		if (this.articleId == 0) {
+			this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+		}
+	},
+	onShow() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.$api.sendRequest({
+				url: '/api/article/info',
+				data: {
+					article_id: this.articleId
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.detail = res.data;
+						this.$langConfig.title(this.detail.article_title);
+						this.content = htmlParser(this.detail.article_content);
+						this.setPublicShare();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+						}, 2000);
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
+			this.$util.setPublicShare({
+				title: this.detail.article_title,
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
+		}
+	},
+	onShareAppMessage(res) {
+		var title = this.detail.article_title;
+		var path = '/pages_tool/article/detail?article_id=' + this.articleId;
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		var title = this.detail.article_title;
+		var query = 'article_id=' + this.articleId;
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	}
+};
 </script>
 
 <style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background: #ffffff;
+.page {
+	width: 100%;
+	height: 100%;
+	padding: 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+}
+
+.help-title {
+	font-size: $font-size-toolbar;
+	text-align: left;
+	font-weight: bold;
+}
+
+.help-content {
+	margin-top: $margin-updown;
+	word-break: break-all;
+}
+
+.help-meta {
+	text-align: left;
+	margin-top: $margin-updown;
+	color: $color-tip;
+
+	.help-time {
+		font-size: $font-size-tag;
+	}
+}
+
+.bottom-area {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-top: 40rpx;
+
+	.price-font {
+		font-weight: normal !important;
 	}
 
-	.help-title {
-		font-size: $font-size-toolbar;
-		text-align: left;
-		font-weight: bold;
-	}
-
-	.help-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-	}
-
-	.help-meta {
-		text-align: left;
-		margin-top: $margin-updown;
-		color: $color-tip;
-
-		.help-time {
-			font-size: $font-size-tag;
-		}
-	}
-
-	.bottom-area {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 40rpx;
-
-		.price-font {
-			font-weight: normal !important;
-		}
-
-		view {
-			color: #999;
-			font-size: 24rpx;
-		}
+	view {
+		color: #999;
+		font-size: 24rpx;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index bcbbb96..4d9ca46 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -6,7 +6,8 @@
 					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
 					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="article-img">
-							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)"/>
+							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix"
+								@error="imgError(index)" />
 						</view>
 						<view class="info-wrap">
 							<text class="title">{{ item.article_title }}</text>
@@ -33,203 +34,195 @@
 </template>
 
 <script>
-	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif	
-	
-	export default {
-		data() {
-			return {
-				list: []
-			};
-		},
-		components: {
-			nsAdv,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		onShow() {
-			this.setPublicShare();
-		},
-		methods: {
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/article/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num
-					},
-					success: res => {
-						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();
+
+export default {
+	components: {
+		nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			list: []
+		};
+	},
+	onShow() {
+		this.setPublicShare();
+	},
+	methods: {
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/article/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
 					}
-				});
-			},
-			toDetail(item) {
-				this.$util.redirectTo('/pages_tool/article/detail', {
-					article_id: item.article_id
-				});
-			},
-			imgError(index) {
-				if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
-				this.$util.setPublicShare({
-					title: '文章列表',
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
+					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();
+				}
+			});
 		},
-		onShareAppMessage(res) {
-			var title = '文章列表';
-			var path = '/pages_tool/article/list';
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
+		toDetail(item) {
+			this.$util.redirectTo('/pages_tool/article/detail', {
+				article_id: item.article_id
+			});
 		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = '文章列表';
-			var query = '/pages_tool/article/list';
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
+		imgError(index) {
+			if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
+			this.$util.setPublicShare({
+				title: '文章列表',
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
 		}
-	};
+	},
+	onShareAppMessage(res) {
+		var title = '文章列表';
+		var path = '/pages_tool/article/list';
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		var title = '文章列表';
+		var query = '/pages_tool/article/list';
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+
+.empty-wrap {
+	padding-top: 200rpx;
+}
+
+.article-wrap {
+	background: #f8f8f8;
+
+	.adv-wrap {
+		margin: 24rpx 24rpx 0 24rpx;
+		width: auto;
 	}
 
-	.empty-wrap {
-		padding-top: 200rpx;
-	}
+	.item {
+		display: flex;
+		padding: 20rpx;
+		background-color: #fff;
+		margin: 24rpx;
+		border-radius: 16rpx;
 
-	.article-wrap {
-		background: #f8f8f8;
+		.article-img {
+			margin-right: 20rpx;
+			width: 160rpx;
+			height: 160rpx;
+			overflow: hidden;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
-		.adv-wrap {
-			margin: 24rpx 24rpx 0 24rpx;
-			width: auto;
+			image {
+				width: 100%;
+			}
 		}
 
-		.item {
+		.info-wrap {
+			flex: 1;
 			display: flex;
-			padding: 20rpx;
-			background-color: #fff;
-			margin: 24rpx;
-			border-radius: 16rpx;
+			flex-direction: column;
+			justify-content: space-between;
 
-			.article-img {
-				margin-right: 20rpx;
-				width: 160rpx;
-				height: 160rpx;
+			.title {
+				font-weight: bold;
+				margin-bottom: 10rpx;
 				overflow: hidden;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				image {
-					width: 100%;
-				}
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				font-size: 30rpx;
+				line-height: 1.5;
 			}
 
-			.info-wrap {
-				flex: 1;
+			.abstract {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				font-size: $font-size-tag;
+			}
+
+			.read-wrap {
 				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
+				color: #999ca7;
+				justify-content: flex-start;
+				align-items: center;
+				margin-top: 10rpx;
+				line-height: 1;
 
-				.title {
-					font-weight: bold;
-					margin-bottom: 10rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-					font-size: 30rpx;
-					line-height: 1.5;
-				}
-
-				.abstract {
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
+				text {
 					font-size: $font-size-tag;
 				}
 
-				.read-wrap {
-					display: flex;
-					color: #999ca7;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 10rpx;
-					line-height: 1;
+				.iconfont {
+					font-size: 36rpx;
+					vertical-align: bottom;
+					margin-right: 10rpx;
+				}
 
-					text {
-						font-size: $font-size-tag;
-					}
+				.category-icon {
+					width: 8rpx;
+					height: 8rpx;
+					border-radius: 50%;
+					background: $base-color;
+					margin-right: 10rpx;
+				}
 
-					.iconfont {
-						font-size: 36rpx;
-						vertical-align: bottom;
-						margin-right: 10rpx;
-					}
-
-					.category-icon {
-						width: 8rpx;
-						height: 8rpx;
-						border-radius: 50%;
-						background: $base-color;
-						margin-right: 10rpx;
-					}
-
-					.date {
-						margin-left: 20rpx;
-					}
+				.date {
+					margin-left: 20rpx;
 				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue
index 50303ad..7b52aac 100644
--- a/pages_tool/cases/index.vue
+++ b/pages_tool/cases/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view :style="themeColor">
     <view class="about w100">
       <view class="list_cotact padding-top">
         <view class="container">
@@ -8,7 +8,9 @@
               <view class="bl clearfix bor bg-white">
                 <block v-if="item.$orig.case_type === 0">
                   <view class="video-container">
-                    <video class="adaptive-video" style="height:400rpx;" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo" :poster="item.g0" :src="item.g1" controls="true"></video>
+                    <video class="adaptive-video" style="height:400rpx;" autoPauseIfNavigate="true"
+                      autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo"
+                      :poster="item.g0" :src="item.g1" controls="true"></video>
                   </view>
                 </block>
                 <block v-if="item.$orig.case_type === 1">
@@ -17,16 +19,16 @@
                   </view>
                 </block>
                 <view style="padding:20rpx;">
-                  <view style="font-size:36rpx;font-weight:600;">{{item.$orig.title}}</view>
-                  <view>{{item.$orig.desc}}</view>
-                  <view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{"完成时间：" + item.g3}}</view>
+                  <view style="font-size:36rpx;font-weight:600;">{{ item.$orig.title }}</view>
+                  <view>{{ item.$orig.desc }}</view>
+                  <view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{ "完成时间：" + item.g3 }}</view>
                   <block v-if="item.$orig.files_url">
                     <view @tap="toDetail(item.$orig)" class="item">
                       <view class="article-img">
                         <image class="cover-img" :src="item.g4" mode="widthFix" @error="imgError(index)"></image>
                       </view>
                       <view class="info-wrap">
-                        <view class="title">{{item.$orig.files_title}}</view>
+                        <view class="title">{{ item.$orig.files_title }}</view>
                         <view class="read-wrap">
                           <text>查看PDF文件</text>
                         </view>
@@ -59,13 +61,15 @@
                 <view class="fui-cell">
                   <view class="fui-cell-label">联系方式</view>
                   <view class="fui-cell-info">
-                    <input class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" v-model="Form.mobile" />
+                    <input class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number"
+                      v-model="Form.mobile" />
                   </view>
                 </view>
                 <view class="fui-cell">
                   <view class="fui-cell-label" style="position:absolute;top:10px;">留言内容</view>
                   <view class="fui-cell-info" style="margin-left:160rpx;border:solid 2rpx #eee;">
-                    <textarea class="textarea" style="font-size:28rpx;padding:10rpx;" placeholder="请输入留言内容" v-model="Form.remark"></textarea>
+                    <textarea class="textarea" style="font-size:28rpx;padding:10rpx;" placeholder="请输入留言内容"
+                      v-model="Form.remark"></textarea>
                   </view>
                 </view>
               </view>
@@ -77,9 +81,11 @@
         </view>
       </uni-popup>
     </view>
-    <uni-popup ref="videoPopup" class="vue-ref" style="background:transparent;width:100%;height:100%;" type="center" @change="videochange">
+    <uni-popup ref="videoPopup" class="vue-ref" style="background:transparent;width:100%;height:100%;" type="center"
+      @change="videochange">
       <view class="video-container" style="position:fixed;top:30%;width:100%;left:0;">
-        <video class="adaptive-video" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo" :src="video_url" controls="true"></video>
+        <video class="adaptive-video" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false"
+          enableAutoRotation="true" id="myVideo" :src="video_url" controls="true"></video>
       </view>
     </uni-popup>
   </view>
@@ -88,6 +94,9 @@
 <script>
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
+  components: {
+    uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+  },
   data() {
     return {
       dataList: [],
@@ -113,7 +122,7 @@ export default {
   },
   components: {
     uniPopup
-  },  
+  },
   methods: {
     init() {
       this.$api.sendRequest({
@@ -535,14 +544,15 @@ image {
   height: 60rpx;
 }
 
-.list_cotact .bor .name, .view_ul_100 .name {
+.list_cotact .bor .name,
+.view_ul_100 .name {
   font-size: 32rpx;
   line-height: 44rpx;
   margin-top: 20rpx;
   color: #fff;
 }
 
-.list_cotact .view_ul_one .view_li:nth-child(1) > button {
+.list_cotact .view_ul_one .view_li:nth-child(1)>button {
   background: #0054a5;
   height: 200rpx;
   line-height: 20rpx;
@@ -563,7 +573,7 @@ image {
   width: 100%;
 }
 
-.view_ul_100 > view {
+.view_ul_100>view {
   background: #fff;
 }
 
@@ -577,12 +587,12 @@ image {
   margin-top: 0;
 }
 
-.list_cotact .view_ul_two .view_li > view {
+.list_cotact .view_ul_two .view_li>view {
   background-color: #fff;
   padding: 20rpx 30rpx 0rpx 30rpx;
 }
 
-.list_cotact .view_ul_two .view_li > view .address {
+.list_cotact .view_ul_two .view_li>view .address {
   background-color: #5dc2d0;
   color: #fff;
   display: inline-block;
diff --git a/pages_tool/components/chat-message/chat-message.vue b/pages_tool/components/chat-message/chat-message.vue
index de52ecd..e4a9cf7 100644
--- a/pages_tool/components/chat-message/chat-message.vue
+++ b/pages_tool/components/chat-message/chat-message.vue
@@ -71,11 +71,7 @@
 </template>
 
 <script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
-	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import htmlParser from '@/common/js/html-parser.js';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -88,6 +84,12 @@
 				type: Boolean
 			}
 		},
+		components: {
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+			nsChatGoods: () => import('@/pages_tool/components/ns-chat/ns-chat-goods.vue'),
+			nsChatOrder: () => import('@/pages_tool/components/ns-chat/ns-chat-order.vue'),
+			nsChatReceiveGoods: () => import('@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue'),
+		},
 		data() {
 			return {
 				avatar: '', //店铺头像
diff --git a/pages_tool/components/uni-calendar/uni-calendar.vue b/pages_tool/components/uni-calendar/uni-calendar.vue
index 604f6d4..0d47d42 100644
--- a/pages_tool/components/uni-calendar/uni-calendar.vue
+++ b/pages_tool/components/uni-calendar/uni-calendar.vue
@@ -44,7 +44,7 @@
 
 <script>
 import Calendar from './util.js';
-import uniCalendarItem from './uni-calendar-item.vue';
+
 /**
  * Calendar 日历
  * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
@@ -67,7 +67,7 @@ import uniCalendarItem from './uni-calendar-item.vue';
  */
 export default {
 	components: {
-		uniCalendarItem
+		uniCalendarItem: () => import('./uni-calendar-item.vue'),
 	},
 	props: {
 		date: {
diff --git a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
index 9475ea5..0f93bc1 100644
--- a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
+++ b/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
@@ -38,14 +38,12 @@
 </template>
 
 <script>
-import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
-import uniIcons from '@/components/uni-icons/uni-icons.vue';
 
 export default {
 	name: 'UniNavBar',
 	components: {
-		uniStatusBar,
-		uniIcons
+		uniStatusBar: () => import('@/pages_tool/components/uni-status-bar/uni-status-bar.vue'),
+		uniIcons: () => import('@/components/uni-icons/uni-icons.vue'),
 	},
 	props: {
 		title: {
diff --git a/pages_tool/contact/contact.vue b/pages_tool/contact/contact.vue
index 47a76d5..2fcfe56 100644
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue
@@ -10,7 +10,8 @@
 							style="background: #1daa39;width: 100%;border-radius: 10rpx;">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}
+								</view>
 							</view>
 						</view>
 					</view>
@@ -28,7 +29,8 @@
 						<view @click="tapMessage" class="view_li w50_li  text-center">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}
+								</view>
 							</view>
 						</view>
 					</view>
@@ -51,7 +53,8 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/boda.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.mobile }}</view>
-									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn" style="background: #0054a5;">{{ $lang('call') }}</span>
+									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn"
+											style="background: #0054a5;">{{ $lang('call') }}</span>
 									</view>
 								</view>
 								<view class="contact_name"
@@ -59,7 +62,8 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/emall.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.email }}</view>
-									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn" style="background: #888;">{{ $lang('copy') }}</span>
+									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn"
+											style="background: #888;">{{ $lang('copy') }}</span>
 									</view>
 								</view>
 							</view>
@@ -84,7 +88,8 @@
 						:longitude="shop.longitude" :latitude="shop.latitude" show-location>
 						<cover-view
 							style="position:absolute;right:10px;bottom:30rpx;z-index:9;background:#4d83ff;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;"
-							@click="tomap"><cover-view style="font-size:24rpx">{{ $lang('oneClickNavigation') }}</cover-view>
+							@click="tomap"><cover-view style="font-size:24rpx">{{ $lang('oneClickNavigation')
+								}}</cover-view>
 						</cover-view>
 					</map>
 				</view>
@@ -113,26 +118,32 @@
 								<view class="fui-cell  ">
 									<view class="fui-cell-label ">{{ $lang('name') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.realname" class="fui-input" :placeholder="$lang('pleaseEnterName')" value=""></input>
+										<input v-model="Form.realname" class="fui-input"
+											:placeholder="$lang('pleaseEnterName')" value=""></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
 									<view class="fui-cell-label">{{ $lang('contactInfo') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.mobile" class="fui-input" maxlength="11" :placeholder="$lang('pleaseEnterMobile')" type="number"></input>
+										<input v-model="Form.mobile" class="fui-input" maxlength="11"
+											:placeholder="$lang('pleaseEnterMobile')" type="number"></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
-									<view class="fui-cell-label" style="position: absolute;top:10px">{{ $lang('messageContent') }}</view>
+									<view class="fui-cell-label" style="position: absolute;top:10px">{{
+										$lang('messageContent') }}</view>
 									<view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
 										<!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
-										<textarea class="textarea" v-model="Form.remark" :placeholder="$lang('pleaseEnterMessage')" style="font-size: 28rpx;padding: 10rpx;"></textarea>
+										<textarea class="textarea" v-model="Form.remark"
+											:placeholder="$lang('pleaseEnterMessage')"
+											style="font-size: 28rpx;padding: 10rpx;"></textarea>
 									</view>
 								</view>
 							</view>
 						</view>
 					</scroll-view>
-					<view class="button-box"><button type="primary" @click="save()">{{ $lang('submit') }}</button></view>
+					<view class="button-box"><button type="primary" @click="save()">{{ $lang('submit') }}</button>
+					</view>
 				</view>
 			</uni-popup>
 		</view>
@@ -143,12 +154,15 @@
 </template>
 
 <script>
-import toTop from '@/components/toTop/toTop.vue';
+
 import scroll from '@/common/js/scroll-view.js';
 
 export default {
 	components: {
-		toTop
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		hoverNav: () => import('@/components/hover-nav/hover-nav.vue'),
+		diyBottomNav: () => import('@/components-diy/diy-bottom-nav.vue'),
 	},
 	mixins: [scroll],
 	data() {
@@ -277,7 +291,7 @@ export default {
 					console.log('复制失败');
 					// 可以添加错误处理或用户友好的提示
 					uni.showToast({
-						title:  err.message || err.errMsg || this.$lang('copyFailed'),
+						title: err.message || err.errMsg || this.$lang('copyFailed'),
 						icon: 'none',
 						duration: 2000
 					});
diff --git a/pages_tool/files/list.vue b/pages_tool/files/list.vue
index 9c40ad4..78b9ea8 100644
--- a/pages_tool/files/list.vue
+++ b/pages_tool/files/list.vue
@@ -2,41 +2,23 @@
   <view>
     <view class="search-wrap uni-flex uni-row">
       <view class="flex-item input-wrap">
-        <input 
-          class="uni-input" 
-          maxlength="50" 
-          placeholder="请输入您要搜索的文件名称" 
-          v-model="keyword" 
-          @confirm="search" 
-          @input="__set_model($event, 'keyword')"
-        />
+        <input class="uni-input" maxlength="50" placeholder="请输入您要搜索的文件名称" v-model="keyword" @confirm="search"
+          @input="__set_model($event, 'keyword')" />
         <text class="iconfont icon-sousuo3" @tap="search"></text>
       </view>
     </view>
-    <mescroll-uni 
-      ref="mescroll" 
-      top="100" 
-      @getData="getData"
-    >
+    <mescroll-uni ref="mescroll" top="100" @getData="getData">
       <view slot="list">
         <block v-if="list.length > 0">
           <view class="article-wrap">
-            <ns-adv 
-              keyword="NS_ARTICLE" 
-              class-name="adv-wrap"
-            ></ns-adv>
+            <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
             <block v-for="(item, index) in list" :key="index">
               <view class="item" @tap="toDetail(item.$orig)">
                 <view class="article-img">
-                  <image 
-                    class="cover-img" 
-                    :src="item.g1" 
-                    mode="widthFix" 
-                    @error="imgError(index)"
-                  ></image>
+                  <image class="cover-img" :src="item.g1" mode="widthFix" @error="imgError(index)"></image>
                 </view>
                 <view class="info-wrap">
-                  <view class="title">{{item.$orig.files_title}}</view>
+                  <view class="title">{{ item.$orig.files_title }}</view>
                   <view class="read-wrap">
                     <text>查看PDF文件</text>
                   </view>
@@ -53,227 +35,250 @@
         <loading-cover ref="loadingCover"></loading-cover>
       </view>
     </mescroll-uni>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <!-- 小程序隐私协议 -->
     <privacy-popup ref="privacyPopup"></privacy-popup>
+    <!-- #endif -->
   </view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        category_id: '',
-        list: [],
-        title: '',
-        keyword: ''
-      }
+export default {
+  data() {
+    return {
+      category_id: '',
+      list: [],
+      title: '',
+      keyword: ''
+    }
+  },
+  components: {
+    nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
+    nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+    loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+    MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+
+    // #ifdef MP-WEIXIN
+    privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+    // #endif
+  },
+  onLoad(options) {
+    if (options.category_id > 0) {
+      this.category_id = options.category_id
+    }
+  },
+  onShow() {
+  },
+  methods: {
+    __set_model(event, field) {
+      this[field] = event.detail.value
     },
-    components: {
-      nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
-      nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-      loadingCover: () => import('@/components/loading-cover/loading-cover.vue')
+    search() {
+      this.list = []
+      this.$refs.mescroll.refresh()
     },
-    onLoad(options) {
-      if (options.category_id > 0) {
-        this.category_id = options.category_id
-      }
-    },
-    onShow() {
-    },
-    methods: {
-      __set_model(event, field) {
-        this[field] = event.detail.value
-      },
-      search() {
-        this.list = []
-        this.$refs.mescroll.refresh()
-      },
-      getData(page) {
-        this.$api.sendRequest({
-          url: '/api/files/getpage',
-          data: {
-            page_size: page.size,
-            page: page.num,
-            category_id: this.category_id,
-            keyword: this.keyword
-          },
-          success: res => {
-            let list = []
-            let message = res.message
-            if (res.code === 0 && res.data) {
-              list = res.data.list
-              if (!this.title && res.data.list.length > 0) {
-                uni.setNavigationBarTitle({
-                  title: res.data.list[0].category_name
-                })
-              }
-            } else {
-              this.$util.showToast({
-                title: message
+    getData(page) {
+      this.$api.sendRequest({
+        url: '/api/files/getpage',
+        data: {
+          page_size: page.size,
+          page: page.num,
+          category_id: this.category_id,
+          keyword: this.keyword
+        },
+        success: res => {
+          let list = []
+          let message = res.message
+          if (res.code === 0 && res.data) {
+            list = res.data.list
+            if (!this.title && res.data.list.length > 0) {
+              uni.setNavigationBarTitle({
+                title: res.data.list[0].category_name
               })
             }
-            page.endSuccess(list.length)
-            if (page.num === 1) {
-              this.list = []
-            }
-            this.list = this.list.concat(list.map(item => {
-              const orig = item
-              const g1 = this.$util.img("addon/personnel/shop/view/enterprise/fileicon.png")
-              return { $orig: orig, g1: g1 }
-            }))
-            if (this.$refs.loadingCover) {
-              this.$refs.loadingCover.hide()
+          } else {
+            this.$util.showToast({
+              title: message
+            })
+          }
+          page.endSuccess(list.length)
+          if (page.num === 1) {
+            this.list = []
+          }
+          this.list = this.list.concat(list.map(item => {
+            const orig = item
+            const g1 = this.$util.img("addon/personnel/shop/view/enterprise/fileicon.png")
+            return { $orig: orig, g1: g1 }
+          }))
+          if (this.$refs.loadingCover) {
+            this.$refs.loadingCover.hide()
+          }
+        },
+        fail: () => {
+          page.endErr()
+          if (this.$refs.loadingCover) {
+            this.$refs.loadingCover.hide()
+          }
+        }
+      })
+    },
+    toDetail(item) {
+      console.log(item.files_url)
+      uni.showLoading({
+        title: '正在加载'
+      })
+      try {
+        uni.downloadFile({
+          url: item.files_url,
+          success: res => {
+            console.log(res)
+            if (res.statusCode === 200) {
+              uni.openDocument({
+                filePath: res.tempFilePath,
+                success: () => {
+                  console.log('打开成功')
+                },
+                fail: () => {
+                },
+                complete: () => {
+                  uni.hideLoading()
+                }
+              })
             }
           },
           fail: () => {
-            page.endErr()
-            if (this.$refs.loadingCover) {
-              this.$refs.loadingCover.hide()
+            uni.hideLoading()
+          },
+          complete: res => {
+            console.log('下载完成', res)
+            if (res.statusCode === 404) {
+              uni.showToast({
+                title: '文件不存在',
+                icon: 'none'
+              })
             }
           }
         })
-      },
-      toDetail(item) {
-        console.log(item.files_url)
-        uni.showLoading({
-          title: '正在加载'
-        })
-        try {
-          uni.downloadFile({
-            url: item.files_url,
-            success: res => {
-              console.log(res)
-              if (res.statusCode === 200) {
-                uni.openDocument({
-                  filePath: res.tempFilePath,
-                  success: () => {
-                    console.log('打开成功')
-                  },
-                  fail: () => {
-                  },
-                  complete: () => {
-                    uni.hideLoading()
-                  }
-                })
-              }
-            },
-            fail: () => {
-              uni.hideLoading()
-            },
-            complete: res => {
-              console.log('下载完成', res)
-              if (res.statusCode === 404) {
-                uni.showToast({
-                  title: '文件不存在',
-                  icon: 'none'
-                })
-              }
-            }
-          })
-        } catch (e) {
-          console.log('CatchClause', e)
-          uni.hideLoading()
-        }
-      },
-      imgError(index) {
-        if (this.list[index]) {
-          this.list[index].cover_img = this.$util.getDefaultImage().article
-        }
+      } catch (e) {
+        console.log('CatchClause', e)
+        uni.hideLoading()
+      }
+    },
+    imgError(index) {
+      if (this.list[index]) {
+        this.list[index].cover_img = this.$util.getDefaultImage().article
       }
     }
   }
+}
 </script>
 
 <style scoped>
-  .search-wrap {
-    flex: 0.5;
-    padding: 30rpx 30rpx 0;
-    font-size: 24rpx;
-    display: flex;
-    align-items: center;
-  }
-  .search-wrap .iconfont {
-    margin-left: 16rpx;
-    font-size: 36rpx;
-  }
-  .search-wrap .input-wrap {
-    flex: 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background: #fff;
-    height: 64rpx;
-    padding-left: 10rpx;
-    border-radius: 70rpx;
-  }
-  .search-wrap .input-wrap input {
-    width: 90%;
-    background: #fff;
-    font-size: 24rpx;
-    height: 100%;
-    padding: 0 25rpx 0 40rpx;
-    line-height: 50rpx;
-    border-radius: 40rpx;
-  }
-  .search-wrap .input-wrap text {
-    font-size: 32rpx;
-    color: #909399;
-    width: 80rpx;
-    text-align: center;
-    margin-right: 20rpx;
-  }
-  .empty-wrap {
-    padding-top: 200rpx;
-  }
-  .article-wrap {
-    background: #f8f8f8;
-  }
-  .article-wrap .adv-wrap {
-    margin: 24rpx 24rpx 0 24rpx;
-    width: auto;
-  }
-  .article-wrap .item {
-    display: flex;
-    padding: 20rpx;
-    background-color: #fff;
-    margin: 24rpx;
-    border-radius: 16rpx;
-  }
-  .article-wrap .item .article-img {
-    margin-right: 20rpx;
-    width: 80rpx;
-    height: 80rpx;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .article-wrap .item .article-img image {
-    width: 100%;
-  }
-  .article-wrap .item .info-wrap {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-  .article-wrap .item .info-wrap .title {
-    font-weight: 700;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    font-size: 24rpx;
-  }
-  .article-wrap .item .info-wrap .read-wrap {
-    display: flex;
-    color: #999ca7;
-    justify-content: flex-start;
-    align-items: center;
-    margin-top: 10rpx;
-    line-height: 1;
-  }
-  .article-wrap .item .info-wrap .read-wrap text {
-    font-size: 24rpx;
-  }
+.search-wrap {
+  flex: 0.5;
+  padding: 30rpx 30rpx 0;
+  font-size: 24rpx;
+  display: flex;
+  align-items: center;
+}
+
+.search-wrap .iconfont {
+  margin-left: 16rpx;
+  font-size: 36rpx;
+}
+
+.search-wrap .input-wrap {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #fff;
+  height: 64rpx;
+  padding-left: 10rpx;
+  border-radius: 70rpx;
+}
+
+.search-wrap .input-wrap input {
+  width: 90%;
+  background: #fff;
+  font-size: 24rpx;
+  height: 100%;
+  padding: 0 25rpx 0 40rpx;
+  line-height: 50rpx;
+  border-radius: 40rpx;
+}
+
+.search-wrap .input-wrap text {
+  font-size: 32rpx;
+  color: #909399;
+  width: 80rpx;
+  text-align: center;
+  margin-right: 20rpx;
+}
+
+.empty-wrap {
+  padding-top: 200rpx;
+}
+
+.article-wrap {
+  background: #f8f8f8;
+}
+
+.article-wrap .adv-wrap {
+  margin: 24rpx 24rpx 0 24rpx;
+  width: auto;
+}
+
+.article-wrap .item {
+  display: flex;
+  padding: 20rpx;
+  background-color: #fff;
+  margin: 24rpx;
+  border-radius: 16rpx;
+}
+
+.article-wrap .item .article-img {
+  margin-right: 20rpx;
+  width: 80rpx;
+  height: 80rpx;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.article-wrap .item .article-img image {
+  width: 100%;
+}
+
+.article-wrap .item .info-wrap {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.article-wrap .item .info-wrap .title {
+  font-weight: 700;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  font-size: 24rpx;
+}
+
+.article-wrap .item .info-wrap .read-wrap {
+  display: flex;
+  color: #999ca7;
+  justify-content: flex-start;
+  align-items: center;
+  margin-top: 10rpx;
+  line-height: 1;
+}
+
+.article-wrap .item .info-wrap .read-wrap text {
+  font-size: 24rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue
index 52f2d16..c6342be 100644
--- a/pages_tool/form/form.vue
+++ b/pages_tool/form/form.vue
@@ -10,7 +10,7 @@
                 <button type="primary" size="mini" class="button mini" @click="create()">提交</button>
             </view>
         </view>
-        <ns-empty :text="complete  ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
+        <ns-empty :text="complete ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
 
         <loading-cover ref="loadingCover"></loading-cover>
         <ns-login ref="login"></ns-login>
@@ -18,130 +18,135 @@
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                id: 0,
-                detail: null,
-                isRepeat: false,
-                complete: false,
-                scroll:true
-            };
-        },
-        onLoad(data) {
-            // #ifdef MP-ALIPAY
-            let options = my.getLaunchOptionsSync();
-            options.query && Object.assign(data, options.query)
-            // #endif
+export default {
+    components: {
+        nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+        nsForm: () => import('@/components/ns-form/ns-form.vue'),
+        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+        nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+    },
+    data() {
+        return {
+            id: 0,
+            detail: null,
+            isRepeat: false,
+            complete: false,
+            scroll: true
+        };
+    },
+    onLoad(data) {
+        // #ifdef MP-ALIPAY
+        let options = my.getLaunchOptionsSync();
+        options.query && Object.assign(data, options.query)
+        // #endif
 
-            this.id = data.id || 0;
-            if (data.scene) {
-                var sceneParams = decodeURIComponent(data.scene);
-                sceneParams = sceneParams.split('&');
-                if (sceneParams.length) {
-                    sceneParams.forEach(item => {
-                        if (item.indexOf('id') != -1) this.id = item.split('-')[1];
-                    });
+        this.id = data.id || 0;
+        if (data.scene) {
+            var sceneParams = decodeURIComponent(data.scene);
+            sceneParams = sceneParams.split('&');
+            if (sceneParams.length) {
+                sceneParams.forEach(item => {
+                    if (item.indexOf('id') != -1) this.id = item.split('-')[1];
+                });
+            }
+        }
+        if (this.storeToken) {
+            this.getData();
+        } else {
+            this.$nextTick(() => {
+                this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
+            })
+        }
+    },
+    watch: {
+        storeToken: function (nVal, oVal) {
+            if (nVal) this.getData();
+        }
+    },
+    methods: {
+        getData() {
+            this.$api.sendRequest({
+                url: '/form/api/form/info',
+                data: {
+                    form_id: this.id
+                },
+                success: res => {
+                    if (res.code == 0 && res.data) {
+                        this.detail = res.data;
+                    }
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                },
+                fail: res => {
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
                 }
-            }
-            if (this.storeToken) {
-                this.getData();
-            } else {
-                this.$nextTick(() => {
-                    this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
-                })
-            }
+            });
         },
-        watch: {
-            storeToken: function(nVal, oVal) {
-                if (nVal) this.getData();
-            }
-        },
-        methods: {
-            getData() {
+        create() {
+            if (this.$refs.form.verify()) {
+                if (this.isRepeat) return;
+                this.isRepeat = true;
+
                 this.$api.sendRequest({
-                    url: '/form/api/form/info',
+                    url: '/form/api/form/create',
                     data: {
-                        form_id: this.id
+                        form_id: this.id,
+                        form_data: JSON.stringify(this.$refs.form.formData)
                     },
                     success: res => {
-                        if (res.code == 0 && res.data) {
-                            this.detail = res.data;
+                        if (res.code == 0) {
+                            this.$util.showToast({ title: '提交成功' })
+                            setTimeout(() => {
+                                this.complete = true;
+                                this.detail = null;
+                            }, 1500)
+                        } else {
+                            this.isRepeat = false;
+                            this.$util.showToast({ title: res.message })
                         }
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    },
-                    fail: res => {
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
                     }
                 });
-            },
-            create() {
-                if (this.$refs.form.verify()) {
-                    if (this.isRepeat) return;
-                    this.isRepeat = true;
-
-                    this.$api.sendRequest({
-                        url: '/form/api/form/create',
-                        data: {
-                            form_id: this.id,
-                            form_data: JSON.stringify(this.$refs.form.formData)
-                        },
-                        success: res => {
-                            if (res.code == 0) {
-                                this.$util.showToast({ title: '提交成功' })
-                                setTimeout(() => {
-                                    this.complete = true;
-                                    this.detail = null;
-                                }, 1500)
-                            } else {
-                                this.isRepeat = false;
-                                this.$util.showToast({ title: res.message })
-                            }
-                        }
-                    });
-                }
-            },
-        }
-    };
+            }
+        },
+    }
+};
 </script>
 
 <style lang="scss">
+.form-banner {
+    width: 100vw;
+    line-height: 1;
 
-    .form-banner {
-        width: 100vw;
+    image {
+        width: 100%;
         line-height: 1;
+    }
+}
 
-        image {
-            width: 100%;
-            line-height: 1;
-        }
+.system-form-wrap {
+    background: $color-bg;
+    border-radius: 32rpx;
+    overflow: hidden;
+    margin: 0 0 60rpx 0;
+    padding: 0 26rpx;
+    transform: translateY(-40rpx);
+
+    .form-title {
+        line-height: 100rpx;
+        padding-top: 20rpx;
     }
 
-    .system-form-wrap {
-        background: $color-bg;
+    .button {
+        height: 80rpx;
+        line-height: 80rpx !important;
+        margin-top: 30rpx !important;
+        width: 100%;
+        border-radius: 80rpx;
+    }
+
+    /deep/ .form-wrap {
+        background: #fff;
+        padding: 30rpx;
         border-radius: 32rpx;
-        overflow: hidden;
-        margin: 0 0 60rpx 0;
-        padding: 0 26rpx;
-        transform: translateY(-40rpx);
-
-        .form-title {
-            line-height: 100rpx;
-            padding-top: 20rpx;
-        }
-
-        .button {
-            height: 80rpx;
-            line-height: 80rpx !important;
-            margin-top: 30rpx !important;
-            width: 100%;
-            border-radius: 80rpx;
-        }
-
-        /deep/ .form-wrap {
-            background: #fff;
-            padding: 30rpx;
-            border-radius: 32rpx;
-        }
     }
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 7743cc8..66e4a5b 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -3,11 +3,13 @@
 		<block v-if="detail">
 			<view class="page">
 				<view class="system-form-wrap">
-					<view class="form-title" style="text-align:center;padding-top:40rpx;font-weight:600;font-size:30rpx;">
+					<view class="form-title"
+						style="text-align:center;padding-top:40rpx;font-weight:600;font-size:30rpx;">
 						请填写表单所需信息
 					</view>
 					<ns-newform ref="form" :data="detail.json_data" @submit="create"></ns-newform>
-					<button class="button mini" style="font-size:32rpx;" type="primary" size="mini" @click="create">提交</button>
+					<button class="button mini" style="font-size:32rpx;" type="primary" size="mini"
+						@click="create">提交</button>
 				</view>
 			</view>
 		</block>
@@ -21,6 +23,12 @@
 
 <script>
 export default {
+    components: {
+        nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+        nsNewform: () => import('@/components/ns-newform/ns-newform.vue'),
+        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+        nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+    },
 	data() {
 		return {
 			id: 0,
@@ -37,7 +45,7 @@ export default {
 				title: '提示',
 				content: '参数错误',
 				showCancel: false,
-				success: () => {}
+				success: () => { }
 			})
 			return false
 		}
@@ -103,7 +111,7 @@ export default {
 							title: '提示',
 							content: '提交成功',
 							showCancel: false,
-							success: () => {}
+							success: () => { }
 						})
 					} else {
 						this.isRepeat = false
diff --git a/pages_tool/goods/brand.vue b/pages_tool/goods/brand.vue
index 1865f85..89265a4 100644
--- a/pages_tool/goods/brand.vue
+++ b/pages_tool/goods/brand.vue
@@ -24,116 +24,106 @@
 </template>
 
 <script>
-	import uniGrid from '@/components/uni-grid/uni-grid.vue';
-	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
-	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
-	export default {
-		components: {
-			uniGrid,
-			uniGridItem,
-			nsAdv,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
+export default {
+	components: {
+		uniGrid: () => import('@/components/uni-grid/uni-grid.vue'),
+		uniGridItem: () => import('@/components/uni-grid-item/uni-grid-item.vue'),
+		nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			brandList: [],
+			siteId: 0
+		};
+	},
+	onLoad(options) {
+		if (options.site_id) this.siteId = options.site_id;
+	},
+	onShow() { },
+	methods: {
+		change(e) {
+			this.$util.redirectTo('/pages_goods/list', {
+				brand_id: this.brandList[e.detail.index].brand_id
+			});
 		},
-		data() {
-			return {
-				brandList: [],
-				siteId: 0
-			};
-		},
-		onLoad(options) {
-			if (options.site_id) this.siteId = options.site_id;
-		},
-		onShow() {},
-		methods: {
-			change(e) {
-				this.$util.redirectTo('/pages_goods/list', {
-					brand_id: this.brandList[e.detail.index].brand_id
-				});
-			},
-			getBrandList(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/goodsbrand/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						site_id: this.siteId
-					},
-					success: res => {
-						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.brandList = []; //如果是第一页需手动制空列表
-						this.brandList = this.brandList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		getBrandList(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/goodsbrand/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					site_id: this.siteId
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
 					}
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = '你想要的大牌都在这里';
-			var path = '/pages_tool/goods/brand';
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.brandList = []; //如果是第一页需手动制空列表
+					this.brandList = this.brandList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
 		}
-	};
+	},
+	onShareAppMessage(res) {
+		var title = '你想要的大牌都在这里';
+		var path = '/pages_tool/goods/brand';
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	}
+};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-grid-item {
-		width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
+/deep/ .uni-grid-item {
+	width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
+}
+
+.adv-wrap {
+	margin: $margin-updown $margin-both;
+	width: auto;
+}
+
+.brand-content {
+	padding: $padding 0;
+	box-sizing: border-box;
+	background: #ffffff;
+	margin: $margin-updown $margin-both 0;
+
+	.brand-pic {
+		width: 60%;
+		height: 50%;
 	}
 
-	.adv-wrap {
-		margin: $margin-updown $margin-both;
-		width: auto;
-	}
-
-	.brand-content {
-		padding: $padding 0;
-		box-sizing: border-box;
-		background: #ffffff;
-		margin: $margin-updown $margin-both 0;
-
-		.brand-pic {
-			width: 60%;
-			height: 50%;
-		}
-
-		.brand_name {
-			width: 70%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			text-align: center;
-		}
+	.brand_name {
+		width: 70%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		text-align: center;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index 2b332ba..80c0bfc 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -2,42 +2,53 @@
 	<view :style="themeColor">
 		<view class="cf-container color-line-border">
 			<view class="tab">
-				<view @click="changeSort(1)"><text :class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
-				<view @click="changeSort(2, 'reward')"><text :class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
-				<view @click="changeSort(3, 'discount')"><text :class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
-		<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
+				<view @click="changeSort(1)"><text
+						:class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
+				<view @click="changeSort(2, 'reward')"><text
+						:class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
+				<view @click="changeSort(3, 'discount')"><text
+						:class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
+				<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
 			</view>
 		</view>
 
 		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCouponList">
 			<block slot="list">
 				<view class="coupon-listone">
-					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)"
+						:style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 						<view class="item-base" :class="{ disabled: item.useState == 2 }">
-							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+							<image class="coupon-line" mode="heightFix"
+								:src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
 							<view>
-								<view class="use_price price-font" v-if="item.type == 'reward'" :class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-if="item.type == 'reward'"
+									:class="{ disabled: item.useState == 2 }">
 									<text>￥</text>
 									{{ parseFloat(item.money) }}
 								</view>
-								<view class="use_price price-font" v-else-if="item.type == 'discount'" :class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-else-if="item.type == 'discount'"
+									:class="{ disabled: item.useState == 2 }">
 									{{ parseFloat(item.discount) }}
 									<text>折</text>
 								</view>
-								<view class="use_condition font-size-tag" v-if="item.at_least > 0" :class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
-								<view class="use_condition font-size-tag" v-else :class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0"
+									:class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else
+									:class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
 							</view>
 						</view>
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.useState == 2 }">指定商品</view>
+								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3"
+									:class="{ disabled: item.useState == 2 }">指定商品</view>
 								<view class="max_price" v-else :class="{ disabled: item.useState == 2 }">全场商品</view>
 								<view class="max_price" v-if="item.discount_limit != '0.00'">
 									(最大优惠{{ item.discount_limit }}元)
 								</view>
-								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
-							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{
+									item.use_channel_name }}</view>
+								<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
 								</view> -->
 							</view>
@@ -70,406 +81,401 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
-	export default {
-		components: {
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		data() {
-			return {
-				list: [],
-				sort: 1,
-				types: '',
-				couponBtnSwitch: false,
-				//分享建立上下级id
-				mpShareData: null //小程序分享数据
-			};
-		},
-		onLoad(option) {
-			setTimeout( () => {
-				if (!this.addonIsExist.coupon) {
-					this.$util.showToast({
-						title: '商家未开启优惠券',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
-				}
-			},1000);
-			
-			//小程序分享接收source_member
-			if (option.source_member) {
-				uni.setStorageSync('source_member', option.source_member);
-			}
-			// 小程序扫码进入，接收source_member
-			if (option.scene) {
-				var sceneParams = decodeURIComponent(option.scene);
-				sceneParams = sceneParams.split('&');
-				if (sceneParams.length) {
-					sceneParams.forEach(item => {
-						if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
-						if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
-						if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
-					});
-				}
-			}
-		},
-		onShow() {
-			//记录分享关系
-			if (this.storeToken && uni.getStorageSync('source_member')) {
-				this.$util.onSourceMember(uni.getStorageSync('source_member'));
-			}
 
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
-			});
-			// #endif
-		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
-		},
-		methods: {
-			changeSort(sort, types) {
-				this.list = [];
-				this.sort = sort;
-				this.types = types;
-				this.$refs.mescroll.refresh(false);
-			},
-			liClick(item, index) {
-				if(['limit', 'expire', 'out'].includes(item.receivedType)) return false;
-				if (item.useState == 0) this.receiveCoupon(item, index);
-				else this.toGoodsList(item, index);
-			},
-
-			//领取优惠券
-			receiveCoupon(item, index) {
-				if (this.couponBtnSwitch) return;
-				this.couponBtnSwitch = true;
-				if (this.storeToken) {
-					this.$api.sendRequest({
-						url: '/coupon/api/coupon/receive',
-						data: {
-							coupon_type_id: item.coupon_type_id,
-							get_type: 2 //获取方式:1订单2.直接领取3.活动领取
-						},
-						success: res => {
-							this.couponBtnSwitch = false;
-							let msg = '领取成功，快去使用吧';
-							let list = this.list;
-							if (res.code < 0) msg = res.message;
-							
-							if (res.data.is_exist == 1) {
-								for (let i = 0; i < list.length; i++) {
-									if (list[i].coupon_type_id == item.coupon_type_id) {
-										list[i].useState = 1;
-									}
-								}
-							} else {
-								for (let i = 0; i < list.length; i++) {
-									if (list[i].coupon_type_id == item.coupon_type_id) {
-										list[i].receivedType = res.data.type;
-										list[i].useState = 2;
-									}
-								}
-							}
-							this.$util.showToast({
-								title: msg
-							});
-						},
-						fail: res => {
-							this.couponBtnSwitch = false;
-						}
-					});
-				} else {
-					this.couponBtnSwitch = false;
-					this.$refs.login.open('/pages_tool/goods/coupon');
-				}
-			},
-			//获取优惠券列表
-			getMemberCouponList(mescroll) {
-				this.$api.sendRequest({
-					url: '/coupon/api/coupon/typepagelists',
-					data: {
-						page: mescroll.num,
-						page_size: mescroll.size,
-						sort: this.sort,
-						type: this.types
-					},
-					success: res => {
-						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 (newArr.length) {
-							newArr.forEach(v => {
-								if (v.count == v.lead_count) v.useState = 2;
-								else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
-								else v.useState = 0;
-							});
-						}
-						//设置列表数据
-						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
+export default {
+	components: {
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			list: [],
+			sort: 1,
+			types: '',
+			couponBtnSwitch: false,
+			//分享建立上下级id
+			mpShareData: null //小程序分享数据
+		};
+	},
+	onLoad(option) {
+		setTimeout(() => {
+			if (!this.addonIsExist.coupon) {
+				this.$util.showToast({
+					title: '商家未开启优惠券',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		//小程序分享接收source_member
+		if (option.source_member) {
+			uni.setStorageSync('source_member', option.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (option.scene) {
+			var sceneParams = decodeURIComponent(option.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
 				});
-			},
-			imageError(index) {
-				this.list[index].logo = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			couponImageError(index) {
-				this.list[index].image = this.$util.img('public/uniapp/goods/coupon.png');
-				this.$forceUpdate();
-			},
-			toGoodsList(item) {
-				if (item.goods_type != 1) {
-					this.$util.redirectTo('/pages_goods/list', {
-						coupon: item.coupon_type_id
-					});
-				} else {
-					this.$util.redirectTo('/pages_goods/list', {});
-				}
 			}
 		}
-	};
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+
+		//小程序分享
+		// #ifdef MP-WEIXIN
+		this.$util.getMpShare().then(res => {
+			this.mpShareData = res;
+		});
+		// #endif
+	},
+	//分享给好友
+	onShareAppMessage() {
+		return this.mpShareData.appMessage;
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		return this.mpShareData.timeLine;
+	},
+	methods: {
+		changeSort(sort, types) {
+			this.list = [];
+			this.sort = sort;
+			this.types = types;
+			this.$refs.mescroll.refresh(false);
+		},
+		liClick(item, index) {
+			if (['limit', 'expire', 'out'].includes(item.receivedType)) return false;
+			if (item.useState == 0) this.receiveCoupon(item, index);
+			else this.toGoodsList(item, index);
+		},
+
+		//领取优惠券
+		receiveCoupon(item, index) {
+			if (this.couponBtnSwitch) return;
+			this.couponBtnSwitch = true;
+			if (this.storeToken) {
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/receive',
+					data: {
+						coupon_type_id: item.coupon_type_id,
+						get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+					},
+					success: res => {
+						this.couponBtnSwitch = false;
+						let msg = '领取成功，快去使用吧';
+						let list = this.list;
+						if (res.code < 0) msg = res.message;
+
+						if (res.data.is_exist == 1) {
+							for (let i = 0; i < list.length; i++) {
+								if (list[i].coupon_type_id == item.coupon_type_id) {
+									list[i].useState = 1;
+								}
+							}
+						} else {
+							for (let i = 0; i < list.length; i++) {
+								if (list[i].coupon_type_id == item.coupon_type_id) {
+									list[i].receivedType = res.data.type;
+									list[i].useState = 2;
+								}
+							}
+						}
+						this.$util.showToast({
+							title: msg
+						});
+					},
+					fail: res => {
+						this.couponBtnSwitch = false;
+					}
+				});
+			} else {
+				this.couponBtnSwitch = false;
+				this.$refs.login.open('/pages_tool/goods/coupon');
+			}
+		},
+		//获取优惠券列表
+		getMemberCouponList(mescroll) {
+			this.$api.sendRequest({
+				url: '/coupon/api/coupon/typepagelists',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					sort: this.sort,
+					type: this.types
+				},
+				success: res => {
+					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 (newArr.length) {
+						newArr.forEach(v => {
+							if (v.count == v.lead_count) v.useState = 2;
+							else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
+							else v.useState = 0;
+						});
+					}
+					//设置列表数据
+					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+					this.list = this.list.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		imageError(index) {
+			this.list[index].logo = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		couponImageError(index) {
+			this.list[index].image = this.$util.img('public/uniapp/goods/coupon.png');
+			this.$forceUpdate();
+		},
+		toGoodsList(item) {
+			if (item.goods_type != 1) {
+				this.$util.redirectTo('/pages_goods/list', {
+					coupon: item.coupon_type_id
+				});
+			} else {
+				this.$util.redirectTo('/pages_goods/list', {});
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	.coupon-head {
-		padding: 20rpx 50rpx;
-		display: flex;
-		background: #fff;
+.coupon-head {
+	padding: 20rpx 50rpx;
+	display: flex;
+	background: #fff;
 
-		.sort {
-			border: 2rpx solid #c5c5c5;
-			padding: 1rpx 20rpx;
-			border-radius: $border-radius;
-			cursor: pointer;
-			margin-right: 15rpx;
-		}
+	.sort {
+		border: 2rpx solid #c5c5c5;
+		padding: 1rpx 20rpx;
+		border-radius: $border-radius;
+		cursor: pointer;
+		margin-right: 15rpx;
 	}
+}
 
-	.coupon-listone {
-		padding: 0 30rpx;
+.coupon-listone {
+	padding: 0 30rpx;
 
-		.item {
-			display: flex;
-			background-color: #fff2f0;
+	.item {
+		display: flex;
+		background-color: #fff2f0;
+		background-size: 100% 100%;
+		border-radius: 20rpx;
+		align-items: stretch;
+		margin-top: $padding;
+		overflow: hidden;
+
+		.item-base {
+			position: relative;
+			width: 197rpx;
+			min-width: 197rpx;
+			text-align: center;
+			background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+			background-repeat: no-repeat;
 			background-size: 100% 100%;
-			border-radius: 20rpx;
-			align-items: stretch;
-			margin-top: $padding;
-			overflow: hidden;
+			padding: 38rpx 10rpx 38rpx 18rpx;
 
-			.item-base {
+			&.disabled {
+				background: #dedede;
+			}
+
+			.coupon-line {
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 100%;
+			}
+
+			>view {
+				height: auto;
 				position: relative;
-				width: 197rpx;
-				min-width: 197rpx;
-				text-align: center;
-				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
-				background-repeat: no-repeat;
-				background-size: 100% 100%;
-				padding: 38rpx 10rpx 38rpx 18rpx;
+				top: 50%;
+				transform: translate(0, -50%);
+			}
+
+			.use_price {
+				font-size: 60rpx;
+				line-height: 1;
+				color: #fff;
+
+				text {
+					font-size: $font-size-toolbar;
+				}
 
 				&.disabled {
-					background: #dedede;
-				}
-
-				.coupon-line {
-					position: absolute;
-					right: 0;
-					top: 0;
-					height: 100%;
-				}
-
-				>view {
-					height: auto;
-					position: relative;
-					top: 50%;
-					transform: translate(0, -50%);
-				}
-
-				.use_price {
-					font-size: 60rpx;
-					line-height: 1;
-					color: #fff;
-
-					text {
-						font-size: $font-size-toolbar;
-					}
-
-					&.disabled {
-						color: $color-tip;
-					}
-				}
-
-				.use_condition {
-					color: #fff;
-					margin-top: $padding;
-
-					&.margin_top_none {
-						margin-top: 0;
-					}
-
-					&.disabled {
-						color: $color-tip;
-					}
-				}
-
-				&::after {
-					position: absolute;
-					content: '';
-					background-color: #f8f8f8;
-					left: 0;
-					top: 50%;
-					transform: translate(0, -50%);
-					height: 30rpx;
-					width: 15rpx;
-					border-radius: 0 30rpx 30rpx 0;
+					color: $color-tip;
 				}
 			}
 
-			.item-btn {
-				width: 160rpx;
-				min-width: 160rpx;
-				align-self: center;
-				position: relative;
+			.use_condition {
+				color: #fff;
+				margin-top: $padding;
 
-				view {
-					width: 100rpx;
-					height: 50rpx;
-					border-radius: $border-radius;
-					line-height: 50rpx;
-					margin: auto;
-					text-align: center;
-					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
-					color: var(--btn-text-color);
+				&.margin_top_none {
+					margin-top: 0;
+				}
+
+				&.disabled {
+					color: $color-tip;
+				}
+			}
+
+			&::after {
+				position: absolute;
+				content: '';
+				background-color: #f8f8f8;
+				left: 0;
+				top: 50%;
+				transform: translate(0, -50%);
+				height: 30rpx;
+				width: 15rpx;
+				border-radius: 0 30rpx 30rpx 0;
+			}
+		}
+
+		.item-btn {
+			width: 160rpx;
+			min-width: 160rpx;
+			align-self: center;
+			position: relative;
+
+			view {
+				width: 100rpx;
+				height: 50rpx;
+				border-radius: $border-radius;
+				line-height: 50rpx;
+				margin: auto;
+				text-align: center;
+				background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+				color: var(--btn-text-color);
+				font-size: $font-size-tag;
+
+				&.disabled {
+					background: #dedede !important;
+					color: #909399 !important;
+				}
+			}
+
+			&::after {
+				position: absolute;
+				content: '';
+				background-color: #f8f8f8;
+				right: 0;
+				top: 50%;
+				transform: translate(0, -50%);
+				height: 30rpx;
+				width: 15rpx;
+				border-radius: 30rpx 0 0 30rpx;
+			}
+		}
+
+		.item-info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			margin-left: 20rpx;
+			overflow: hidden;
+			background-repeat-x: no-repeat;
+			background-repeat-y: repeat;
+
+			.use_time {
+				padding: 20rpx 0;
+				border-top: 2rpx dashed #cccccc;
+				font-size: $font-size-activity-tag;
+				color: #909399;
+			}
+
+			.use_title {
+				font-size: $font-size-base;
+				font-weight: 500;
+				padding: 20rpx 0;
+
+				// height:80rpx;
+				.title {
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+				.max_price {
+					font-weight: 400;
 					font-size: $font-size-tag;
-
-					&.disabled {
-						background: #dedede !important;
-						color: #909399 !important;
-					}
-				}
-
-				&::after {
-					position: absolute;
-					content: '';
-					background-color: #f8f8f8;
-					right: 0;
-					top: 50%;
-					transform: translate(0, -50%);
-					height: 30rpx;
-					width: 15rpx;
-					border-radius: 30rpx 0 0 30rpx;
-				}
-			}
-
-			.item-info {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				margin-left: 20rpx;
-				overflow: hidden;
-				background-repeat-x: no-repeat;
-				background-repeat-y: repeat;
-
-				.use_time {
-					padding: 20rpx 0;
-					border-top: 2rpx dashed #cccccc;
-					font-size: $font-size-activity-tag;
-					color: #909399;
-				}
-
-				.use_title {
-					font-size: $font-size-base;
-					font-weight: 500;
-					padding: 20rpx 0;
-
-					// height:80rpx;
-					.title {
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-					}
-
-					.max_price {
-						font-weight: 400;
-						font-size: $font-size-tag;
-					}
 				}
 			}
 		}
 	}
+}
 
-	.empty {
-		margin-top: 200rpx;
-	}
+.empty {
+	margin-top: 200rpx;
+}
 
-	.cf-container {
-		background: #fff;
-		overflow: hidden;
-	}
+.cf-container {
+	background: #fff;
+	overflow: hidden;
+}
 
-	.tab {
-		display: flex;
-		justify-content: space-between;
+.tab {
+	display: flex;
+	justify-content: space-between;
+	height: 86rpx;
+
+	>view {
+		text-align: center;
+		width: 33%;
 		height: 86rpx;
 
-		>view {
-			text-align: center;
-			width: 33%;
-			height: 86rpx;
-
-			text {
-				display: inline-block;
-				line-height: 86rpx;
-				height: 80rpx;
-				font-size: 30rpx;
-			}
+		text {
+			display: inline-block;
+			line-height: 86rpx;
+			height: 80rpx;
+			font-size: 30rpx;
 		}
 	}
+}
 
-	.active {
-		border-bottom: 4rpx solid;
-	}
-	.truncate {
-		overflow: hidden;
-		-o-text-overflow: ellipsis;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+.active {
+	border-bottom: 4rpx solid;
+}
+
+.truncate {
+	overflow: hidden;
+	-o-text-overflow: ellipsis;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue
index eb910ea..7daebfe 100644
--- a/pages_tool/goods/coupon_receive.vue
+++ b/pages_tool/goods/coupon_receive.vue
@@ -39,6 +39,13 @@
 
 <script>
 	export default {
+		components: {
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+			// #ifdef MP-WEIXIN
+			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+			// #endif
+		},
 		data() {
 			return {
 				info: {},
diff --git a/pages_tool/goods/evaluate.vue b/pages_tool/goods/evaluate.vue
index 19ea5bc..3ed0889 100644
--- a/pages_tool/goods/evaluate.vue
+++ b/pages_tool/goods/evaluate.vue
@@ -25,7 +25,7 @@
 									</view>
 									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
 									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time)
-										}}</view>
+									}}</view>
 								</view>
 								<view class="evaluator-xing">
 									<xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
@@ -74,24 +74,16 @@
 </template>
 
 <script>
-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';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif		
 
-import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
 export default {
 	components: {
-		xiaoStarComponent,
-		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
+		xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_tool/goods/not_exist.vue b/pages_tool/goods/not_exist.vue
index 36a10bc..e4c1559 100644
--- a/pages_tool/goods/not_exist.vue
+++ b/pages_tool/goods/not_exist.vue
@@ -12,16 +12,17 @@ export default {
 	data() {
 		return {};
 	},
-	onShow() {},
+	onShow() { },
 	methods: {}
 };
 </script>
 
 <style lang="scss">
-.page{
+.page {
 	height: 100vh;
 	overflow: hidden;
 }
+
 .closeBox {
 	width: 100%;
 	display: flex;
@@ -30,9 +31,11 @@ export default {
 	align-items: center;
 	margin-top: 260rpx;
 }
+
 image {
 	width: 400rpx;
 }
+
 .close-title {
 	font-size: $font-size-base;
 	color: $color-tip;
diff --git a/pages_tool/goods/search.vue b/pages_tool/goods/search.vue
index 1b50446..296dd33 100644
--- a/pages_tool/goods/search.vue
+++ b/pages_tool/goods/search.vue
@@ -3,7 +3,9 @@
 		<view class="content">
 			<view class="cate-search">
 				<view class="search-box" @click="search()" @tap.stop="search()">
-					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" @click="search()" @tap="search()" :placeholder="searchWords ? searchWords : ''" />
+					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search"
+						@focus="inputFocus" focus @confirm="search()" @click="search()" @tap="search()"
+						:placeholder="searchWords ? searchWords : ''" />
 					<text class="iconfont icon-sousuo3" @click="search()"></text>
 				</view>
 			</view>
@@ -15,8 +17,10 @@
 							<view class="title">历史搜索</view>
 							<view class="icon iconfont icon-icon7" @click="deleteHistoryList"></view>
 						</view>
-						<view class="history-bottom " id="history-list" :style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
-							<view class="history-li" v-for="(item, index) in historyList" :key="index" @click="otherSearch(item)">
+						<view class="history-bottom " id="history-list"
+							:style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
+							<view class="history-li" v-for="(item, index) in historyList" :key="index"
+								@click="otherSearch(item)">
 								<view>{{ item }}</view>
 							</view>
 							<view class="history-li history_more" v-if="isAllHistory" @click="isAllHistory = false">
@@ -33,7 +37,8 @@
 							<view class="title">热门搜索</view>
 						</view>
 						<view class="history-bottom">
-							<view class="history-li" v-for="(item, index) in hotList" :key="index" @click="otherSearch(item)" @longtap="deleteItem(item)">
+							<view class="history-li" v-for="(item, index) in hotList" :key="index"
+								@click="otherSearch(item)" @longtap="deleteItem(item)">
 								<view>{{ item }}</view>
 							</view>
 						</view>
@@ -45,297 +50,297 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				inputValue: '', //搜索框的值
-				historyList: [], //历史搜索记录
-				searchList: [], //搜索发现列表
-				alikeList: [],
-				isIndex: false,
-				searchWords: '',
-				hotList: [],
-				isAllHistory: false
-			};
+export default {
+	data() {
+		return {
+			inputValue: '', //搜索框的值
+			historyList: [], //历史搜索记录
+			searchList: [], //搜索发现列表
+			alikeList: [],
+			isIndex: false,
+			searchWords: '',
+			hotList: [],
+			isAllHistory: false
+		};
+	},
+	onLoad(options) {
+		if (options.keyword) this.inputValue = options.keyword;
+		uni.getStorageSync('search') ? '' : uni.setStorageSync('search', []);
+	},
+	onShow() {
+		this.findHistoryList();
+		this.defaultSearch();
+		this.findHotList();
+		this.$nextTick(function () {
+			this.getHistoryHeight();
+		});
+	},
+	methods: {
+		//获取历史搜索记录
+		findHistoryList() {
+			this.historyList = uni.getStorageSync('search').reverse();
 		},
-		onLoad(options) {
-			if (options.keyword) this.inputValue = options.keyword;
-			uni.getStorageSync('search') ? '' : uni.setStorageSync('search', []);
-		},
-		onShow() {
-			this.findHistoryList();
-			this.defaultSearch();
-			this.findHotList();
-			this.$nextTick(function() {
-				this.getHistoryHeight();
-			});
-		},
-		methods: {
-			//获取历史搜索记录
-			findHistoryList() {
-				this.historyList = uni.getStorageSync('search').reverse();
-			},
-			//删除所有历史记录
-			deleteHistoryList() {
-				uni.showModal({
-					title: '提示',
-					content: '确认删除全部历史记录？',
-					success: res => {
-						if (res.confirm) {
-							uni.setStorageSync('search', []);
-							this.findHistoryList();
-						}
-					}
-				});
-			},
-			//删除历史记录的某一项
-			deleteItem(e) {
-				uni.showModal({
-					title: '提示',
-					content: '确认删除该条历史记录？',
-					success: res => {
-						if (res.confirm) {
-							let array = uni.getStorageSync('search');
-							let newArr = array.filter(v => {
-								return v != e;
-							});
-							uni.setStorageSync('search', newArr);
-							this.findHistoryList();
-						}
-					}
-				});
-			},
-			// 获取默认搜素
-			defaultSearch() {
-				this.$api.sendRequest({
-					url: '/api/goods/defaultSearchWords',
-					success: res => {
-						this.searchWords = res.data.words;
-					}
-				});
-			},
-			// 获取热门搜素
-			findHotList() {
-				this.$api.sendRequest({
-					url: '/api/goods/hotSearchWords',
-					success: res => {
-						if (res.data.words != '') {
-							this.hotList = res.data.words.split(',');
-						}
-					}
-				});
-			},
-			//input框获取焦点事件
-			inputFocus(e) {
-				if (this.inputValue.trim() != '') this.dataList = [];
-			},
-			//点击其他列表搜索
-			otherSearch(e) {
-				this.inputValue = e;
-				this.search();
-			},
-			//搜索
-			search() {
-
-				if (this.inputValue.trim() != '') {
-
-					// 对历史搜索处理,判断有无,最近搜索显示在最前
-					let historyList = uni.getStorageSync('search');
-					let array = [];
-					if (historyList.length) {
-						array = historyList.filter(v => {
-							return v != this.inputValue.trim();
-						});
-						array.push(this.inputValue.trim());
-					} else {
-						array.push(this.inputValue.trim());
-					}
-					uni.setStorageSync('search', array);
-
-					this.$util.redirectTo('/pages_goods/list', {
-						keyword: this.inputValue.trim()
-					});
-				} else {
-					if (this.searchWords == '') {
-						this.$util.showToast({
-							title: '搜索内容不能为空哦'
-						});
-					} else {
-						this.$util.redirectTo('/pages_goods/list', {
-							//keyword: this.searchWords
-						});
+		//删除所有历史记录
+		deleteHistoryList() {
+			uni.showModal({
+				title: '提示',
+				content: '确认删除全部历史记录？',
+				success: res => {
+					if (res.confirm) {
+						uni.setStorageSync('search', []);
+						this.findHistoryList();
 					}
 				}
-			},
-			// 获取元素高度
-			getHistoryHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#history-list')
-					.boundingClientRect(data => {
-						if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
-							this.isAllHistory = true;
-						}
-					}).exec();
+			});
+		},
+		//删除历史记录的某一项
+		deleteItem(e) {
+			uni.showModal({
+				title: '提示',
+				content: '确认删除该条历史记录？',
+				success: res => {
+					if (res.confirm) {
+						let array = uni.getStorageSync('search');
+						let newArr = array.filter(v => {
+							return v != e;
+						});
+						uni.setStorageSync('search', newArr);
+						this.findHistoryList();
+					}
+				}
+			});
+		},
+		// 获取默认搜素
+		defaultSearch() {
+			this.$api.sendRequest({
+				url: '/api/goods/defaultSearchWords',
+				success: res => {
+					this.searchWords = res.data.words;
+				}
+			});
+		},
+		// 获取热门搜素
+		findHotList() {
+			this.$api.sendRequest({
+				url: '/api/goods/hotSearchWords',
+				success: res => {
+					if (res.data.words != '') {
+						this.hotList = res.data.words.split(',');
+					}
+				}
+			});
+		},
+		//input框获取焦点事件
+		inputFocus(e) {
+			if (this.inputValue.trim() != '') this.dataList = [];
+		},
+		//点击其他列表搜索
+		otherSearch(e) {
+			this.inputValue = e;
+			this.search();
+		},
+		//搜索
+		search() {
+
+			if (this.inputValue.trim() != '') {
+
+				// 对历史搜索处理,判断有无,最近搜索显示在最前
+				let historyList = uni.getStorageSync('search');
+				let array = [];
+				if (historyList.length) {
+					array = historyList.filter(v => {
+						return v != this.inputValue.trim();
+					});
+					array.push(this.inputValue.trim());
+				} else {
+					array.push(this.inputValue.trim());
+				}
+				uni.setStorageSync('search', array);
+
+				this.$util.redirectTo('/pages_goods/list', {
+					keyword: this.inputValue.trim()
+				});
+			} else {
+				if (this.searchWords == '') {
+					this.$util.showToast({
+						title: '搜索内容不能为空哦'
+					});
+				} else {
+					this.$util.redirectTo('/pages_goods/list', {
+						//keyword: this.searchWords
+					});
+				}
 			}
+		},
+		// 获取元素高度
+		getHistoryHeight() {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#history-list')
+				.boundingClientRect(data => {
+					if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
+						this.isAllHistory = true;
+					}
+				}).exec();
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+
+/deep/ .empty {
+	margin-top: 0 !important;
+}
+
+.cart-empty {
+	padding-top: 54px;
+}
+
+.content {
+	// overflow: hidden;
+	width: 100vw;
+	/* #ifdef MP */
+	height: 100vh;
+	/* #endif */
+	/* #ifdef H5 */
+	height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
+	/* #endif */
+	/* #ifdef APP-PLUS */
+	height: calc(100vh - 44px - env(safe-area-inset-bottom));
+	/* #endif */
+	background: #ffffff;
+}
+
+.cate-search {
+	width: 100%;
+	background: #ffffff;
+	padding: 10rpx 30rpx;
+	box-sizing: border-box;
+	/* #ifdef H5 */
+	padding-top: 30rpx;
+	/* #endif */
+
+	input {
+		font-size: $font-size-base;
+		height: 100%;
+		padding: 0 25rpx 0 30rpx;
+		width: calc(100% - 120rpx);
 	}
 
-	/deep/ .empty {
-		margin-top: 0 !important;
+	text {
+		font-size: 32rpx;
+		color: $color-tip;
+		width: 120rpx;
+		text-align: center;
 	}
 
-	.cart-empty {
-		padding-top: 54px;
-	}
-
-	.content {
-		// overflow: hidden;
-		width: 100vw;
-		/* #ifdef MP */
-		height: 100vh;
-		/* #endif */
-		/* #ifdef H5 */
-		height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		height: calc(100vh - 44px - env(safe-area-inset-bottom));
-		/* #endif */
-		background: #ffffff;
-	}
-
-	.cate-search {
+	.search-box {
 		width: 100%;
+		height: 64rpx;
+		background: $color-bg;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+	}
+}
+
+.search-content {
+	box-sizing: border-box;
+	background: #ffffff;
+}
+
+.history {
+	width: 100%;
+	box-sizing: border-box;
+
+	.history-box {
+		width: 100%;
+		height: 100%;
 		background: #ffffff;
-		padding: 10rpx 30rpx;
+		padding: 30rpx 30rpx 0rpx 30rpx;
+
 		box-sizing: border-box;
-		/* #ifdef H5 */
-		padding-top: 30rpx;
-		/* #endif */
+		overflow: hidden;
 
-		input {
-			font-size: $font-size-base;
-			height: 100%;
-			padding: 0 25rpx 0 30rpx;
-			width: calc(100% - 120rpx);
-		}
-
-		text {
-			font-size: 32rpx;
-			color: $color-tip;
-			width: 120rpx;
-			text-align: center;
-		}
-
-		.search-box {
+		.history-top {
 			width: 100%;
-			height: 64rpx;
-			background: $color-bg;
+			height: 60rpx;
 			display: flex;
-			justify-content: center;
+			justify-content: space-between;
 			align-items: center;
-			border-radius: 40rpx;
-		}
-	}
+			font-size: $font-size-toolbar;
 
-	.search-content {
-		box-sizing: border-box;
-		background: #ffffff;
-	}
-
-	.history {
-		width: 100%;
-		box-sizing: border-box;
-
-		.history-box {
-			width: 100%;
-			height: 100%;
-			background: #ffffff;
-			padding: 30rpx 30rpx 0rpx 30rpx;
-
-			box-sizing: border-box;
-			overflow: hidden;
-
-			.history-top {
-				width: 100%;
-				height: 60rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
+			.title {
+				font-weight: 500;
 				font-size: $font-size-toolbar;
-
-				.title {
-					font-weight: 500;
-					font-size: $font-size-toolbar;
-				}
-
-				.iconfont {
-					color: $color-tip;
-					font-size: $font-size-base;
-				}
 			}
 
-			.history-bottom {
-				width: 100%;
-				padding-top: $padding;
-				position: relative;
-
-				.history-li {
-					display: inline-block;
-					margin-right: 20rpx;
-					margin-bottom: 15rpx;
-					max-width: 100%;
-
-					view {
-						line-height: 66rpx;
-						background: #f8f8f8 !important;
-						height: 66rpx;
-						color: #303133 !important;
-						margin: 0 0rpx 4rpx 0 !important;
-						padding: 0 $padding;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						border-radius: 20rpx;
-					}
-
-					&.history_more {
-						margin-right: 0;
-						position: absolute;
-						bottom: 0;
-						right: 0;
-					}
-				}
+			.iconfont {
+				color: $color-tip;
+				font-size: $font-size-base;
 			}
 		}
 
-		.hidden-show {
+		.history-bottom {
 			width: 100%;
-			height: 70rpx;
-			text-align: center;
-			line-height: 70rpx;
+			padding-top: $padding;
+			position: relative;
+
+			.history-li {
+				display: inline-block;
+				margin-right: 20rpx;
+				margin-bottom: 15rpx;
+				max-width: 100%;
+
+				view {
+					line-height: 66rpx;
+					background: #f8f8f8 !important;
+					height: 66rpx;
+					color: #303133 !important;
+					margin: 0 0rpx 4rpx 0 !important;
+					padding: 0 $padding;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					border-radius: 20rpx;
+				}
+
+				&.history_more {
+					margin-right: 0;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
+			}
 		}
 	}
 
-	.search-alike {
+	.hidden-show {
 		width: 100%;
-		height: calc(100vh - 100rpx);
-
-		padding: 0 $padding;
-		box-sizing: border-box;
-
-		.alike-box {
-			width: 100%;
-			height: 100%;
-			background: #ffffff;
-			border-radius: $padding;
-			overflow: hidden;
-		}
+		height: 70rpx;
+		text-align: center;
+		line-height: 70rpx;
 	}
+}
+
+.search-alike {
+	width: 100%;
+	height: calc(100vh - 100rpx);
+
+	padding: 0 $padding;
+	box-sizing: border-box;
+
+	.alike-box {
+		width: 100%;
+		height: 100%;
+		background: #ffffff;
+		border-radius: $padding;
+		overflow: hidden;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/help/detail.vue b/pages_tool/help/detail.vue
index cd41c7f..cb6104b 100644
--- a/pages_tool/help/detail.vue
+++ b/pages_tool/help/detail.vue
@@ -15,51 +15,49 @@
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				id: 0,
-				detail: {},
-				content: ''
-			};
-		},
-		onLoad(options) {
-			this.id = options.id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.id = sceneParams.split('-')[1];
-			}
-			if (this.id == 0) {
-				this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/help/info',
-					data: {
-						id: this.id
-					},
-					success: res => {
-						if (res.code == 0) {
-							if (res.data) {
-								this.detail = res.data;
-								this.$langConfig.title(this.detail.title);
-								this.content = htmlParser(res.data.content);
-								this.setPublicShare();
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-								setTimeout(() => {
-									this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-								}, 2000);
-							}
+import htmlParser from '@/common/js/html-parser.js';
+export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
+	data() {
+		return {
+			id: 0,
+			detail: {},
+			content: ''
+		};
+	},
+	onLoad(options) {
+		this.id = options.id || 0;
+		// 小程序扫码进入
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.scene);
+			this.id = sceneParams.split('-')[1];
+		}
+		if (this.id == 0) {
+			this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+		}
+	},
+	onShow() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.$api.sendRequest({
+				url: '/api/help/info',
+				data: {
+					id: this.id
+				},
+				success: res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.detail = res.data;
+							this.$langConfig.title(this.detail.title);
+							this.content = htmlParser(res.data.content);
+							this.setPublicShare();
 						} else {
 							this.$util.showToast({
 								title: res.message
@@ -68,73 +66,81 @@
 								this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
 							}, 2000);
 						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+						}, 2000);
 					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
-				this.$util.setPublicShare({
-					title: this.detail.title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
 		},
-		onShareAppMessage(res) {
-			var title = this.detail.title;
-			var path = '/pages_tool/help/detail?id=' + this.id;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.title;
-			var query = 'id=' + this.id;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
+			this.$util.setPublicShare({
+				title: this.detail.title,
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
 		}
-	};
+	},
+	onShareAppMessage(res) {
+		var title = this.detail.title;
+		var path = '/pages_tool/help/detail?id=' + this.id;
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		var title = this.detail.title;
+		var query = 'id=' + this.id;
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	}
+};
 </script>
 
 <style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background: #ffffff;
-	}
+.page {
+	width: 100%;
+	height: 100%;
+	padding: 30rpx;
+	box-sizing: border-box;
+	background: #ffffff;
+}
 
-	.help-title {
-		font-size: $font-size-toolbar;
-		text-align: center;
-	}
+.help-title {
+	font-size: $font-size-toolbar;
+	text-align: center;
+}
 
-	.help-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-	}
+.help-content {
+	margin-top: $margin-updown;
+	word-break: break-all;
+}
 
-	.help-meta {
-		text-align: right;
-		margin-top: $margin-updown;
-		color: $color-tip;
+.help-meta {
+	text-align: right;
+	margin-top: $margin-updown;
+	color: $color-tip;
 
-		.help-time {
-			font-size: $font-size-tag;
-		}
+	.help-time {
+		font-size: $font-size-tag;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
index 32f5f6b..83ae09e 100644
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -3,7 +3,8 @@
 		<block v-if="dataList.length">
 			<view class="help-item" v-for="(item, index) in dataList" :key="index">
 				<view :class="['item-title', item.child_list.length == 0 ? 'empty' : '']">{{ item.class_name }}</view>
-				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
+				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_index"
+					@click="helpDetail(s_item)">{{ s_item.title }}</view>
 			</view>
 		</block>
 		<block v-else><ns-empty text="暂无帮助信息" :isIndex="false"></ns-empty></block>
@@ -19,12 +20,18 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif
+	},
 	data() {
 		return {
 			dataList: []
 		};
 	},
-	onLoad() {},
+	onLoad() { },
 	onShow() {
 		this.setPublicShare();
 		this.getData();
@@ -85,8 +92,8 @@ export default {
 		return {
 			title: title,
 			path: path,
-			success: res => {},
-			fail: res => {}
+			success: res => { },
+			fail: res => { }
 		};
 	}
 };
@@ -112,6 +119,7 @@ export default {
 			font-size: 30rpx;
 			color: #000;
 			border-bottom: 2rpx solid #f1f1f1;
+
 			&.empty {
 				padding-bottom: 0;
 				border-bottom: none;
diff --git a/pages_tool/index/diy.vue b/pages_tool/index/diy.vue
index fe93e58..eeadbea 100644
--- a/pages_tool/index/diy.vue
+++ b/pages_tool/index/diy.vue
@@ -56,15 +56,25 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
 import microPageJs from './public/js/diy.js';
 
 export default {
 	components: {
-		uniPopup,
-		nsNavbar
+		diyIndexPage: () => import('@/components-diy/diy-index-page.vue'),
+		diyGroup: () => import('@/components-diy/diy-group.vue'),
+		diyBottomNav: () => import('@/components-diy/diy-bottom-nav.vue'),
+
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
+		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif			
 	},
 	mixins: [diyJs, microPageJs]
 };
@@ -79,13 +89,16 @@ export default {
 	background: none !important;
 }
 
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-	border-radius: 0;
-}
-
 .choose-store>>>.goodslist-uni-popup-box {
 	width: 80%;
 }
+</style>
+
+<style lang="scss" scoped>
+	
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
 
 /deep/ .placeholder {
 	height: 0;
@@ -101,4 +114,4 @@ export default {
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue
index bf8281f..fd02aef 100644
--- a/pages_tool/login/find.vue
+++ b/pages_tool/login/find.vue
@@ -23,25 +23,13 @@
 			<!-- 输入手机号和验证码 -->
 			<block v-if="stepShow == 0">
 				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="17"
-						v-model="formData.mobile"
-						:placeholder="$lang('accountPlaceholder')"
-					/>
+					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="17"
+						v-model="formData.mobile" :placeholder="$lang('accountPlaceholder')" />
 				</view>
 
 				<view class="form-input align-type">
-					<input
-						class="uni-input info-content"
-						placeholder-class="placeholder-class"
-						type="number"
-						maxlength="4"
-						:placeholder="$lang('captchaPlaceholder')"
-						v-model="formData.captcha"
-					/>
+					<input class="uni-input info-content" placeholder-class="placeholder-class" type="number"
+						maxlength="4" :placeholder="$lang('captchaPlaceholder')" v-model="formData.captcha" />
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 
@@ -56,27 +44,13 @@
 			<!-- 输入新密码 -->
 			<block v-if="stepShow == 2">
 				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="30"
-						password="true"
-						:placeholder="$lang('passwordPlaceholder')"
-						v-model="formData.password"
-					/>
+					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
+						password="true" :placeholder="$lang('passwordPlaceholder')" v-model="formData.password" />
 				</view>
 
 				<view class="form-input">
-					<input
-						class="uni-input"
-						placeholder-class="placeholder-class"
-						type="text"
-						maxlength="30"
-						password="true"
-						:placeholder="$lang('rePasswordPlaceholder')"
-						v-model="formData.rePassword"
-					/>
+					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
+						password="true" :placeholder="$lang('rePasswordPlaceholder')" v-model="formData.rePassword" />
 				</view>
 
 				<button type="primary" class="find-btn" @click="save">{{ $lang('save') }}</button>
@@ -87,10 +61,9 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
 	components: {
-		mypOne
+		mypOne: () => import('@/pages_tool/components/myp-one/myp-one.vue'),
 	},
 	data() {
 		return {
@@ -138,17 +111,17 @@ export default {
 		// 下一步
 		async nextStep() {
 			let step0Rule = [
-					{
-						name: 'mobile',
-						checkType: 'phoneno',
-						errorMsg: '请输入正确的手机号'
-					},
-					{
-						name: 'captcha',
-						checkType: 'required',
-						errorMsg: this.$lang('captchaPlaceholder')
-					}
-				], //手机验证
+				{
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				},
+				{
+					name: 'captcha',
+					checkType: 'required',
+					errorMsg: this.$lang('captchaPlaceholder')
+				}
+			], //手机验证
 				step0CheckRes;
 
 			step0CheckRes = validate.check(this.formData, step0Rule);
diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue
index 190452c..d7cbe43 100644
--- a/pages_tool/login/login.vue
+++ b/pages_tool/login/login.vue
@@ -1,7 +1,8 @@
 <template>
 	<view :style="themeColor">
 		<scroll-view scroll-y="false" class="container">
-			<view class="header-wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
+			<view class="header-wrap"
+				:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
 				<view class="t-b">
 					<div v-html="$lang('welcomeText')"></div>
 				</view>
@@ -66,9 +67,12 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import registerReward from '@/components/register-reward/register-reward.vue';
 
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		registerReward: () => import('@/components/register-reward/register-reward.vue'),
+	},
 	data() {
 		return {
 			isAgree: false,
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index 6fa4744..aa3ead7 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -3,7 +3,8 @@
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">
 				<view class="nc-info-list-content">
-					<view class="list-item balance-item" @click="setBalanceDefault()" v-if="type=='fenxiao' && payList && payList.balance">
+					<view class="list-item balance-item" @click="setBalanceDefault()"
+						v-if="type == 'fenxiao' && payList && payList.balance">
 						<view class="item-top">
 							<view class="item-left">
 								<view class="title-text">提现到余额</view>
@@ -32,9 +33,10 @@
 							</view>
 
 							<view class="item-bottom">
-								<view class="account-default" @click="setDefault(item.id,item.is_default)">
+								<view class="account-default" @click="setDefault(item.id, item.is_default)">
 									<text class="default">设为默认账户</text>
-									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)"
+										:color="themeStyle.main_color" />
 									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
 								</view>
 								<view class="account-btn">
@@ -46,10 +48,13 @@
 						</view>
 					</block>
 				</view>
-				<view v-if="dataList.length <= 0 && (type != 'fenxiao'  || (type == 'fenxiao' && payList && !payList.balance))" class="empty-box">
+				<view
+					v-if="dataList.length <= 0 && (type != 'fenxiao' || (type == 'fenxiao' && payList && !payList.balance))"
+					class="empty-box">
 					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
 					<view class="tips">暂无账户信息，请添加</view>
-					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount')
+					}}</button>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -62,404 +67,399 @@
 </template>
 
 <script>
-	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';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
-	export default {
-		components: {
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif	
+	},
+	data() {
+		return {
+			dataList: [], //账号列表
+			back: '', // 返回页
+			redirect: 'redirectTo', // 跳转方式
+			type: 'member',
+			payList: null
+		};
+	},
+	onLoad(option) {
+		if (option.back) this.back = option.back;
+		if (option.type) this.type = option.type;
+		if (option.redirect) this.redirect = option.redirect;
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getTransferType();
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/account');
+			});
+		}
+	},
+	methods: {
+		// 编辑提现账户信息
+		editAccount(type, id) {
+			let data = {};
+			data.type = this.type;
+			if (type == 'edit') data.id = id;
+			if (this.back) data.back = this.back;
+			this.$util.redirectTo('/pages_tool/member/account_edit', data);
 		},
-		data() {
-			return {
-				dataList: [], //账号列表
-				back: '', // 返回页
-				redirect: 'redirectTo', // 跳转方式
-				type: 'member',
-				payList: null
-			};
-		},
-		onLoad(option) {
-			if (option.back) this.back = option.back;
-			if (option.type) this.type = option.type;
-			if (option.redirect) this.redirect = option.redirect;
-		},
-		onShow() {
-			if (this.storeToken) {
-				this.getTransferType();
-				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/account');
-				});
-			}
-		},
-		methods: {
-			// 编辑提现账户信息
-			editAccount(type, id) {
-				let data = {};
-				data.type = this.type;
-				if (type == 'edit') data.id = id;
-				if (this.back) data.back = this.back;
-				this.$util.redirectTo('/pages_tool/member/account_edit', data);
-			},
-			deleteAccount(id) {
-				uni.showModal({
-					title: '操作提示',
-					content: '确定要删除该账户吗？',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/api/memberbankaccount/delete',
-								data: {
-									id: id
-								},
-								success: result => {
-									if (result.code == 0) {
-										this.$util.showToast({
-											title: '删除成功'
-										});
-										this.$refs.mescroll.refresh();
-									} else {
-										this.$util.showToast({
-											title: '删除失败'
-										});
-									}
+		deleteAccount(id) {
+			uni.showModal({
+				title: '操作提示',
+				content: '确定要删除该账户吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/memberbankaccount/delete',
+							data: {
+								id: id
+							},
+							success: result => {
+								if (result.code == 0) {
+									this.$util.showToast({
+										title: '删除成功'
+									});
+									this.$refs.mescroll.refresh();
+								} else {
+									this.$util.showToast({
+										title: '删除失败'
+									});
 								}
-							});
-						}
-					}
-				});
-			},
-			setDefault(id, is_default) {
-				if (is_default == 1) return;
-				this.$api.sendRequest({
-					url: '/api/memberbankaccount/setdefault',
-					data: {
-						id
-					},
-					success: res => {
-						if (res.data >= 0) {
-							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, this.redirect);
-							} else {
-								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
-								this.dataList = [];
-								this.$refs.mescroll.refresh();
 							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			setBalanceDefault() {
-				this.$util.redirectTo(this.back, {
-					'is_balance': 1
-				}, this.redirect);
-			},
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/memberbankaccount/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num
-					},
-					success: res => {
-						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.dataList = []; //如果是第一页需手动制空列表
-						this.dataList = this.dataList.concat(newArr); //追加新数据
-
-						let withdrawType = {
-							bank: '银行',
-							alipay: '支付宝',
-							wechatpay: '微信'
-						};
-
-						this.dataList.forEach(item => {
-							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
-								item.withdraw_type] : '';
 						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-				});
-			},
-			getTransferType() {
-				let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
-				"/fenxiao/api/withdraw/transferType";
-				this.$api.sendRequest({
-					url: url,
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.payList = res.data;
-						}
-					}
-				});
-			}
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
 				}
+			});
+		},
+		setDefault(id, is_default) {
+			if (is_default == 1) return;
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/setdefault',
+				data: {
+					id
+				},
+				success: res => {
+					if (res.data >= 0) {
+						if (this.back != '') {
+							this.$util.redirectTo(this.back, {}, this.redirect);
+						} else {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+							this.dataList = [];
+							this.$refs.mescroll.refresh();
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		setBalanceDefault() {
+			this.$util.redirectTo(this.back, {
+				'is_balance': 1
+			}, this.redirect);
+		},
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				success: res => {
+					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.dataList = []; //如果是第一页需手动制空列表
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+
+					let withdrawType = {
+						bank: '银行',
+						alipay: '支付宝',
+						wechatpay: '微信'
+					};
+
+					this.dataList.forEach(item => {
+						item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
+							item.withdraw_type] : '';
+					});
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		getTransferType() {
+			let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
+				"/fenxiao/api/withdraw/transferType";
+			this.$api.sendRequest({
+				url: url,
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.payList = res.data;
+					}
+				}
+			});
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.empty-box {
-		width: 100vw;
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+.empty-box {
+	width: 100vw;
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
 
-		image {
-			width: 50%;
-		}
-
-		.tips {
-			color: #999999;
-			font-size: 26rpx;
-		}
-
-		.get-account,
-		.add-account {
-			width: 50%;
-			height: 78rpx;
-			line-height: 78rpx;
-			border-radius: 78rpx;
-			margin-top: 50rpx;
-			font-weight: 600;
-		}
-
-		.get-account {
-			width: 50%;
-			background: #fff;
-			color: $base-color;
-			border: 2rpx solid $base-color;
-			margin-top: 20rpx;
-			box-sizing: border-box;
-		}
+	image {
+		width: 50%;
 	}
 
-	.mescroll-downwarp+.empty-box {
-		height: calc(100vh - 260rpx);
+	.tips {
+		color: #999999;
+		font-size: 26rpx;
 	}
 
+	.get-account,
+	.add-account {
+		width: 50%;
+		height: 78rpx;
+		line-height: 78rpx;
+		border-radius: 78rpx;
+		margin-top: 50rpx;
+		font-weight: 600;
+	}
 
-	.btn-add {
-		margin-top: 60rpx;
-		bottom: 0;
-		width: 100%;
+	.get-account {
+		width: 50%;
 		background: #fff;
-		position: fixed;
-		padding: 0 30rpx;
+		color: $base-color;
+		border: 2rpx solid $base-color;
+		margin-top: 20rpx;
 		box-sizing: border-box;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		z-index: 10;
+	}
+}
 
-		.add-account {
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: 80rpx;
-			margin: 30rpx 0 30rpx;
-			font-size: $font-size-toolbar;
+.mescroll-downwarp+.empty-box {
+	height: calc(100vh - 260rpx);
+}
 
-			text {
-				margin-right: 10rpx;
-				font-size: $font-size-base;
-			}
+
+.btn-add {
+	margin-top: 60rpx;
+	bottom: 0;
+	width: 100%;
+	background: #fff;
+	position: fixed;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	z-index: 10;
+
+	.add-account {
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 80rpx;
+		margin: 30rpx 0 30rpx;
+		font-size: $font-size-toolbar;
+
+		text {
+			margin-right: 10rpx;
+			font-size: $font-size-base;
 		}
 	}
+}
 
-	.zw {
-		margin-top: 250rpx;
-	}
+.zw {
+	margin-top: 250rpx;
+}
 
-	.list-item {
-		margin: 0 0;
-		padding: 24rpx $margin-both;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		margin-bottom: 18rpx;
-		border-radius: 10rpx;
-		overflow: hidden;
-		position: relative;
-
-		&.balance-item {
-			.item-top {
-				border: none;
-				padding: 0;
-			}
-		}
-
-		&:first-child {
-			margin-top: 18rpx;
-		}
-
-		.item-mr {
-			font-size: $font-size-activity-tag;
-			color: #fff;
-			height: 150rpx;
-			width: 150rpx;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			position: absolute;
-			right: -90rpx;
-			top: -90rpx;
-			transform: rotate(45deg);
-		}
+.list-item {
+	margin: 0 0;
+	padding: 24rpx $margin-both;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+	background-color: #fff;
+	margin-bottom: 18rpx;
+	border-radius: 10rpx;
+	overflow: hidden;
+	position: relative;
 
+	&.balance-item {
 		.item-top {
-			border-bottom: 2rpx solid $color-line;
-			padding-bottom: 26rpx;
+			border: none;
+			padding: 0;
+		}
+	}
+
+	&:first-child {
+		margin-top: 18rpx;
+	}
+
+	.item-mr {
+		font-size: $font-size-activity-tag;
+		color: #fff;
+		height: 150rpx;
+		width: 150rpx;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+		position: absolute;
+		right: -90rpx;
+		top: -90rpx;
+		transform: rotate(45deg);
+	}
+
+	.item-top {
+		border-bottom: 2rpx solid $color-line;
+		padding-bottom: 26rpx;
+		display: flex;
+		flex-direction: row;
+
+		.item-left {
 			display: flex;
-			flex-direction: row;
+			flex-direction: column;
+			width: calc(100% - 100rpx);
 
-			.item-left {
+			.title-text {
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+
+			.info-content {
 				display: flex;
-				flex-direction: column;
-				width: calc(100% - 100rpx);
 
-				.title-text {
-					font-size: 30rpx;
-					font-weight: bold;
-				}
-
-				.info-content {
-					display: flex;
-
-					.top-title {
-						font-size: 26rpx;
-						margin-right: 15rpx;
-					}
-
-					.top-num {
-						font-size: 26rpx;
-					}
-				}
-
-				.content-bottom {
+				.top-title {
+					font-size: 26rpx;
+					margin-right: 15rpx;
+				}
+
+				.top-num {
 					font-size: 26rpx;
-					height: 50rpx;
 				}
 			}
 
-			.item-btn {
-				width: 100rpx;
-				display: flex;
-				align-items: center;
-				color: #999;
-				font-size: 24rpx;
-				justify-content: flex-end;
+			.content-bottom {
+				font-size: 26rpx;
+				height: 50rpx;
 			}
-
 		}
 
-		.item-bottom {
+		.item-btn {
+			width: 100rpx;
 			display: flex;
-			justify-content: space-between;
-			padding-top: 24rpx;
+			align-items: center;
+			color: #999;
+			font-size: 24rpx;
+			justify-content: flex-end;
+		}
 
-			.account-default {
-				display: flex;
-				align-items: center;
-				font-size: 24rpx;
+	}
+
+	.item-bottom {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 24rpx;
+
+		.account-default {
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			line-height: 1;
+			color: #666666;
+
+			.default {}
+
+			.iconfont {
 				line-height: 1;
-				color: #666666;
+			}
+		}
 
-				.default {}
+		.account-btn {
+			font-size: $font-size-base;
+			line-height: 1;
+			display: flex;
+			align-items: center;
 
-				.iconfont {
-					line-height: 1;
+			.edit {
+				text {
+					vertical-align: center;
+					margin-right: 10rpx;
+					font-size: 30rpx;
 				}
 			}
 
-			.account-btn {
-				font-size: $font-size-base;
-				line-height: 1;
-				display: flex;
+			.delete {
+				background: #F1F1F1;
+				justify-content: center;
 				align-items: center;
+				border-radius: 50%;
+				padding: 10rpx;
+				text-align: center;
+				width: 48rpx;
+				height: 48rpx;
+				box-sizing: border-box;
 
-				.edit {
-					text {
-						vertical-align: center;
-						margin-right: 10rpx;
-						font-size: 30rpx;
-					}
-				}
-
-				.delete {
-					background: #F1F1F1;
-					justify-content: center;
-					align-items: center;
-					border-radius: 50%;
-					padding: 10rpx;
-					text-align: center;
-					width: 48rpx;
-					height: 48rpx;
-					box-sizing: border-box;
-
-					text {
-						font-size: 26rpx;
-					}
+				text {
+					font-size: 26rpx;
 				}
 			}
 		}
 	}
+}
 </style>
 <style lang="scss">
-	/deep/ .mescroll-upwarp {
-		padding-bottom: 150rpx;
-	}
+/deep/ .mescroll-upwarp {
+	padding-bottom: 150rpx;
+}
 </style>
 <style>
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
-		height: 48rpx !important;
-		width: 88rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
+	height: 48rpx !important;
+	width: 88rpx !important;
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
-		height: 44rpx !important;
-		width: 44rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
+	height: 44rpx !important;
+	width: 44rpx !important;
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
-		background-color: #EDEDED !important;
-		height: 44rpx !important;
-		width: 90rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
+	background-color: #EDEDED !important;
+	height: 44rpx !important;
+	width: 90rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/account_edit.vue b/pages_tool/member/account_edit.vue
index 0225527..5507b2c 100644
--- a/pages_tool/member/account_edit.vue
+++ b/pages_tool/member/account_edit.vue
@@ -2,7 +2,8 @@
 	<view class="account-list-content" :style="themeColor">
 		<view class="edit-item">
 			<text class="tit">{{ $lang('name') }}</text>
-			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name"
+				v-model="formData.realname" />
 		</view>
 		<view class="edit-item">
 			<text class="tit">{{ $lang('mobilePhone') }}</text>
@@ -17,11 +18,13 @@
 		</view>
 		<view class="edit-item" v-if="formData.withdraw_type == 'bank'">
 			<text class="tit">银行名称</text>
-			<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称" v-model.trim="formData.branch_bank_name" />
+			<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称"
+				v-model.trim="formData.branch_bank_name" />
 		</view>
 		<view class="edit-item" v-if="formData.withdraw_type != 'wechatpay'">
 			<text class="tit">提现账号</text>
-			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号" v-model.trim="formData.bank_account" />
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号"
+				v-model.trim="formData.bank_account" />
 		</view>
 		<view class="btn">
 			<button type="primary" class="add" @click="saveAccount">{{ $lang('save') }}</button>
@@ -33,6 +36,9 @@
 <script>
 import validate from 'common/js/validate.js';
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			formData: {
@@ -294,7 +300,7 @@ export default {
 	}
 }
 
-.account-list-content > .edit-item + .edit-item {
+.account-list-content>.edit-item+.edit-item {
 	border-top: 2rpx solid $color-line;
 }
 
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index 055f213..804cfc8 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -97,26 +97,16 @@
 </template>
 
 <script>
-import {
-	Weixin
-} from 'common/js/wx-jssdk.js';
-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';
-
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
+import { Weixin } from 'common/js/wx-jssdk.js';
 
 export default {
 	components: {
-		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_tool/member/address_edit.vue b/pages_tool/member/address_edit.vue
index d028016..3297fbe 100644
--- a/pages_tool/member/address_edit.vue
+++ b/pages_tool/member/address_edit.vue
@@ -7,31 +7,21 @@
                     {{ $lang('consignee') }}
                     <text>*</text>
                 </text>
-                <input
-                    class="uni-input"
-                    type="text"
-                    placeholder-class="placeholder-class"
-                    :placeholder="$lang('consigneePlaceholder')"
-                    maxlength="30"
-                    name="name"
-                    v-model="formData.name" />
+                <input class="uni-input" type="text" placeholder-class="placeholder-class"
+                    :placeholder="$lang('consigneePlaceholder')" maxlength="30" name="name" v-model="formData.name" />
             </view>
             <view class="edit-item">
                 <text class="tit">
                     {{ $lang('mobile') }}
                     <text>*</text>
                 </text>
-                <input class="uni-input" type="number" placeholder-class="placeholder-class" :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
+                <input class="uni-input" type="number" placeholder-class="placeholder-class"
+                    :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
             </view>
             <view class="edit-item">
                 <text class="tit">{{ $lang('telephone') }}</text>
-                <input
-                    class="uni-input"
-                    type="text"
-                    placeholder-class="placeholder-class"
-                    :placeholder="$lang('telephonePlaceholder')"
-                    maxlength="20"
-                    v-model="formData.telephone" />
+                <input class="uni-input" type="text" placeholder-class="placeholder-class"
+                    :placeholder="$lang('telephonePlaceholder')" maxlength="20" v-model="formData.telephone" />
             </view>
             <!--  外卖地址区分 -->
             <block v-if="localType == 2">
@@ -40,7 +30,9 @@
                         {{ $lang('receivingCity') }}
                         <text>*</text>
                     </text>
-                    <view class="text_inp" :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }" @click="selectAddress">
+                    <view class="text_inp"
+                        :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }"
+                        @click="selectAddress">
                         {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
                     </view>
 
@@ -54,7 +46,8 @@
                         <text>*</text>
                     </text>
                     <pick-regions :default-regions="defaultRegions" @getRegions="handleGetRegions">
-                        <text class="select-address " :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
+                        <text class="select-address "
+                            :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
                             {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
                         </text>
                     </pick-regions>
@@ -66,7 +59,8 @@
                     {{ $lang('address') }}
                     <text>*</text>
                 </text>
-                <input class="uni-input" type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
+                <input class="uni-input" type="text" placeholder-class="placeholder-class"
+                    :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
                 <!-- <textarea class="uni-input  " type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" ></textarea> -->
             </view>
         </view>
@@ -79,423 +73,424 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
-    import validate from 'common/js/validate.js';
-    import Config from '@/common/js/config.js';
 
-    export default {
-        components: {
-            pickRegions
-        },
-        data() {
-            return {
-                formData: {
-                    id: 0,
-                    name: '',
-                    mobile: '',
-                    telephone: '',
-                    province_id: '',
-                    city_id: '',
-                    district_id: '',
-                    community_id: '',
-                    address: '',
-                    full_address: '',
-                    latitude: 0,
-                    longitude: 0,
-                    is_default: 1
-                },
+import validate from 'common/js/validate.js';
+import Config from '@/common/js/config.js';
+
+export default {
+    components: {
+        pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
+        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+    },
+    data() {
+        return {
+            formData: {
+                id: 0,
+                name: '',
+                mobile: '',
+                telephone: '',
+                province_id: '',
+                city_id: '',
+                district_id: '',
+                community_id: '',
                 address: '',
-                addressValue: '',
-                back: '', // 返回页
-                redirect: 'redirectTo', // 跳转方式
-                flag: false, //防重复标识
-                defaultRegions: [],
-                localType: 1
-            };
-        },
-        onLoad(option) {
-            if (option.back) this.back = option.back;
-            if (option.redirect) this.redirect = option.redirect;
-            if (option.type) this.localType = option.type;
-            if (option.id && !option.name) {
-                this.formData.id = option.id;
-                this.getAddressDetail();
-            } else if (option.name) {
-                if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
-                this.formData.address = option.name;
-                this.localType = 2;
-                this.getAddress(option.latng);
-                //给formData复制
-                var tempArr = this.getQueryVariable('latng').split(',');
-                this.formData.latitude = tempArr[0];
-                this.formData.longitude = tempArr[1];
-            } else {
-                if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-            }
-        },
-        onBackPress() {
-            uni.setStorageSync('addressInfo', '');
-        },
-        onShow() {
-            if (this.formData.id) {
-                uni.setNavigationBarTitle({
-                    title: '编辑收货地址'
-                });
-            } else {
-                uni.setNavigationBarTitle({
-                    title: '新增收货地址'
-                });
-            }
-        },
-        onReady() {
-            this.$refs.loadingCover.hide();
-        },
-        onHide() {
-            this.flag = false;
-        },
-        methods: {
-            // 获取地址信息
-            getAddressDetail() {
-                this.$api.sendRequest({
-                    url: '/api/memberaddress/info',
-                    data: {
-                        id: this.formData.id
-                    },
-                    success: res => {
-                        let data = res.data;
-                        if (data != null) {
-                            this.formData.name = data.name;
-                            this.formData.mobile = data.mobile;
-                            this.formData.telephone = data.telephone;
-                            this.formData.address = data.address;
-                            this.formData.full_address = data.full_address;
-                            this.formData.latitude = data.latitude;
-                            this.formData.longitude = data.longitude;
-                            this.formData.is_default = data.is_default;
-                            this.localType = data.type;
-                            this.defaultRegions = [data.province_id, data.city_id, data.district_id];
-                        }
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                    },
-                    fail: res => {
-                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                full_address: '',
+                latitude: 0,
+                longitude: 0,
+                is_default: 1
+            },
+            address: '',
+            addressValue: '',
+            back: '', // 返回页
+            redirect: 'redirectTo', // 跳转方式
+            flag: false, //防重复标识
+            defaultRegions: [],
+            localType: 1
+        };
+    },
+    onLoad(option) {
+        if (option.back) this.back = option.back;
+        if (option.redirect) this.redirect = option.redirect;
+        if (option.type) this.localType = option.type;
+        if (option.id && !option.name) {
+            this.formData.id = option.id;
+            this.getAddressDetail();
+        } else if (option.name) {
+            if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
+            this.formData.address = option.name;
+            this.localType = 2;
+            this.getAddress(option.latng);
+            //给formData复制
+            var tempArr = this.getQueryVariable('latng').split(',');
+            this.formData.latitude = tempArr[0];
+            this.formData.longitude = tempArr[1];
+        } else {
+            if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+        }
+    },
+    onBackPress() {
+        uni.setStorageSync('addressInfo', '');
+    },
+    onShow() {
+        if (this.formData.id) {
+            uni.setNavigationBarTitle({
+                title: '编辑收货地址'
+            });
+        } else {
+            uni.setNavigationBarTitle({
+                title: '新增收货地址'
+            });
+        }
+    },
+    onReady() {
+        this.$refs.loadingCover.hide();
+    },
+    onHide() {
+        this.flag = false;
+    },
+    methods: {
+        // 获取地址信息
+        getAddressDetail() {
+            this.$api.sendRequest({
+                url: '/api/memberaddress/info',
+                data: {
+                    id: this.formData.id
+                },
+                success: res => {
+                    let data = res.data;
+                    if (data != null) {
+                        this.formData.name = data.name;
+                        this.formData.mobile = data.mobile;
+                        this.formData.telephone = data.telephone;
+                        this.formData.address = data.address;
+                        this.formData.full_address = data.full_address;
+                        this.formData.latitude = data.latitude;
+                        this.formData.longitude = data.longitude;
+                        this.formData.is_default = data.is_default;
+                        this.localType = data.type;
+                        this.defaultRegions = [data.province_id, data.city_id, data.district_id];
                     }
-                });
-            },
-            //获取详细地址
-            getAddress(value) {
-                this.$api.sendRequest({
-                    url: '/api/memberaddress/tranAddressInfo',
-                    data: {
-                        latlng: value
-                    },
-                    success: res => {
-                        if (res.code == 0) {
-                            this.formData.full_address = '';
-                            this.formData.full_address += res.data.province != undefined ? res.data.province : '';
-                            this.formData.full_address += res.data.city != undefined ? '-' + res.data.city : '';
-                            this.formData.full_address += res.data.district != undefined ? '-' + res.data.district : '';
-                            this.addressValue = '';
-                            this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
-                            this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
-                            this.addressValue += res.data.district_id != undefined ? '-' + res.data.district_id : '';
-                        } else {
-                            this.showToast({
-                                title: '数据有误'
-                            });
-                        }
-                    }
-                });
-            },
-            // 获取选择的地区
-            handleGetRegions(regions) {
-                this.formData.full_address = '';
-                this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
-                this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
-                this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
-                this.addressValue = '';
-                this.addressValue += regions[0] != undefined ? regions[0].value : '';
-                this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
-                this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
-            },
-
-            selectAddress() {
-                // #ifdef MP
-               /* uni.chooseLocation({
-                    success: res => {
-                        this.formData.latitude = res.latitude;
-                        this.formData.longitude = res.longitude;
-                        this.formData.address = res.name;
-                        this.getAddress(res.latitude + ',' + res.longitude);
-                    },
-                    fail(res) {
-                        uni.getSetting({
-                            success: function(res) {
-                                var statu = res.authSetting;
-                                if (!statu['scope.userLocation']) {
-                                    uni.showModal({
-                                        title: '是否授权当前位置',
-                                        content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
-                                        success(tip) {
-                                            if (tip.confirm) {
-                                                uni.openSetting({
-                                                    success: function (data) {
-                                                        if (data.authSetting['scope.userLocation'] === true) {
-                                                            this.$util.showToast({
-                                                                title: '授权成功'
-                                                            });
-                                                            //授权成功之后，再调用chooseLocation选择地方
-                                                            setTimeout(function () {
-                                                                uni.chooseLocation({
-                                                                    success: data => {
-                                                                        this.formData.latitude = res.latitude;
-                                                                        this.formData.longitude = res.longitude;
-                                                                        this.formData.address = res.name;
-                                                                        this.getAddress(res.latitude + ',' + res.longitude);
-                                                                    }
-                                                                });
-                                                            }, 1000);
-                                                        }
-                                                    }
-                                                });
-                                            } else {
-                                                this.$util.showToast({
-                                                    title: '授权失败'
-                                                });
-                                            }
-                                        }
-                                    });
-                                }
-                            }
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                },
+                fail: res => {
+                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                }
+            });
+        },
+        //获取详细地址
+        getAddress(value) {
+            this.$api.sendRequest({
+                url: '/api/memberaddress/tranAddressInfo',
+                data: {
+                    latlng: value
+                },
+                success: res => {
+                    if (res.code == 0) {
+                        this.formData.full_address = '';
+                        this.formData.full_address += res.data.province != undefined ? res.data.province : '';
+                        this.formData.full_address += res.data.city != undefined ? '-' + res.data.city : '';
+                        this.formData.full_address += res.data.district != undefined ? '-' + res.data.district : '';
+                        this.addressValue = '';
+                        this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
+                        this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
+                        this.addressValue += res.data.district_id != undefined ? '-' + res.data.district_id : '';
+                    } else {
+                        this.showToast({
+                            title: '数据有误'
                         });
                     }
-                });*/
-                // #endif
-                // #ifdef H5
-                var urlencode = this.formData;
-                uni.setStorageSync('addressInfo', urlencode);
-                let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
-                if (this.formData.id) backurl += '&id=' + this.formData.id;
-                if (this.back) backurl += '&back=' + this.back;
-
-                window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
-                // #endif
-            },
-
-            getQueryVariable(variable) {
-                var query = window.location.search.substring(1);
-                var vars = query.split('&');
-                for (var i = 0; i < vars.length; i++) {
-                    var pair = vars[i].split('=');
-                    if (pair[0] == variable) {
-                        return pair[1];
-                    }
                 }
+            });
+        },
+        // 获取选择的地区
+        handleGetRegions(regions) {
+            this.formData.full_address = '';
+            this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
+            this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
+            this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
+            this.addressValue = '';
+            this.addressValue += regions[0] != undefined ? regions[0].value : '';
+            this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
+            this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
+        },
+
+        selectAddress() {
+            // #ifdef MP
+            /* uni.chooseLocation({
+                 success: res => {
+                     this.formData.latitude = res.latitude;
+                     this.formData.longitude = res.longitude;
+                     this.formData.address = res.name;
+                     this.getAddress(res.latitude + ',' + res.longitude);
+                 },
+                 fail(res) {
+                     uni.getSetting({
+                         success: function(res) {
+                             var statu = res.authSetting;
+                             if (!statu['scope.userLocation']) {
+                                 uni.showModal({
+                                     title: '是否授权当前位置',
+                                     content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+                                     success(tip) {
+                                         if (tip.confirm) {
+                                             uni.openSetting({
+                                                 success: function (data) {
+                                                     if (data.authSetting['scope.userLocation'] === true) {
+                                                         this.$util.showToast({
+                                                             title: '授权成功'
+                                                         });
+                                                         //授权成功之后，再调用chooseLocation选择地方
+                                                         setTimeout(function () {
+                                                             uni.chooseLocation({
+                                                                 success: data => {
+                                                                     this.formData.latitude = res.latitude;
+                                                                     this.formData.longitude = res.longitude;
+                                                                     this.formData.address = res.name;
+                                                                     this.getAddress(res.latitude + ',' + res.longitude);
+                                                                 }
+                                                             });
+                                                         }, 1000);
+                                                     }
+                                                 }
+                                             });
+                                         } else {
+                                             this.$util.showToast({
+                                                 title: '授权失败'
+                                             });
+                                         }
+                                     }
+                                 });
+                             }
+                         }
+                     });
+                 }
+             });*/
+            // #endif
+            // #ifdef H5
+            var urlencode = this.formData;
+            uni.setStorageSync('addressInfo', urlencode);
+            let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
+            if (this.formData.id) backurl += '&id=' + this.formData.id;
+            if (this.back) backurl += '&back=' + this.back;
+
+            window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+            // #endif
+        },
+
+        getQueryVariable(variable) {
+            var query = window.location.search.substring(1);
+            var vars = query.split('&');
+            for (var i = 0; i < vars.length; i++) {
+                var pair = vars[i].split('=');
+                if (pair[0] == variable) {
+                    return pair[1];
+                }
+            }
+            return false;
+        },
+        vertify() {
+            this.formData.name = this.formData.name.trim();
+            this.formData.mobile = this.formData.mobile.trim();
+            this.formData.address = this.formData.address.trim();
+            var rule = [{
+                name: 'name',
+                checkType: 'required',
+                errorMsg: '请输入姓名'
+            },
+            {
+                name: 'mobile',
+                checkType: 'required',
+                errorMsg: '请输入手机号'
+            },
+            {
+                name: 'mobile',
+                checkType: 'phoneno',
+                errorMsg: '请输入正确的手机号'
+            },
+            {
+                name: 'full_address',
+                checkType: 'required',
+                errorMsg: '请选择省市区县'
+            },
+            {
+                name: 'address',
+                checkType: 'required',
+                errorMsg: '详细地址不能为空'
+            }
+            ];
+            var checkRes = validate.check(this.formData, rule);
+            if (checkRes) {
+                return true;
+            } else {
+                this.$util.showToast({
+                    title: validate.error
+                });
+                this.flag = false;
                 return false;
-            },
-            vertify() {
-                this.formData.name = this.formData.name.trim();
-                this.formData.mobile = this.formData.mobile.trim();
-                this.formData.address = this.formData.address.trim();
-                var rule = [{
-                        name: 'name',
-                        checkType: 'required',
-                        errorMsg: '请输入姓名'
-                    },
-                    {
-                        name: 'mobile',
-                        checkType: 'required',
-                        errorMsg: '请输入手机号'
-                    },
-                    {
-                        name: 'mobile',
-                        checkType: 'phoneno',
-                        errorMsg: '请输入正确的手机号'
-                    },
-                    {
-                        name: 'full_address',
-                        checkType: 'required',
-                        errorMsg: '请选择省市区县'
-                    },
-                    {
-                        name: 'address',
-                        checkType: 'required',
-                        errorMsg: '详细地址不能为空'
-                    }
-                ];
-                var checkRes = validate.check(this.formData, rule);
-                if (checkRes) {
-                    return true;
-                } else {
-                    this.$util.showToast({
-                        title: validate.error
-                    });
-                    this.flag = false;
-                    return false;
+            }
+        },
+        saveAddress() {
+            if (this.flag) return;
+            this.flag = true;
+            if (this.vertify()) {
+                let addressValueArr = this.addressValue.split('-'),
+                    data = {},
+                    url = '';
+
+                data = {
+                    name: this.formData.name,
+                    mobile: this.formData.mobile,
+                    telephone: this.formData.telephone,
+                    province_id: addressValueArr[0],
+                    city_id: addressValueArr[1],
+                    district_id: addressValueArr[2] ? addressValueArr[2] : '',
+                    community_id: 0,
+                    address: this.formData.address,
+                    full_address: this.formData.full_address,
+                    latitude: this.formData.latitude,
+                    longitude: this.formData.longitude,
+                    is_default: this.formData.is_default,
+                    type: this.localType
+                };
+
+                url = 'add';
+                if (this.formData.id) {
+                    url = 'edit';
+                    data.id = this.formData.id;
+                    if (this.back != '') data.is_default = 1;
                 }
-            },
-            saveAddress() {
-                if (this.flag) return;
-                this.flag = true;
-                if (this.vertify()) {
-                    let addressValueArr = this.addressValue.split('-'),
-                        data = {},
-                        url = '';
+                this.$api.sendRequest({
+                    url: '/api/memberaddress/' + url,
+                    data: data,
+                    success: res => {
+                        this.flag = false;
 
-                    data = {
-                        name: this.formData.name,
-                        mobile: this.formData.mobile,
-                        telephone: this.formData.telephone,
-                        province_id: addressValueArr[0],
-                        city_id: addressValueArr[1],
-                        district_id: addressValueArr[2] ? addressValueArr[2] : '',
-                        community_id: 0,
-                        address: this.formData.address,
-                        full_address: this.formData.full_address,
-                        latitude: this.formData.latitude,
-                        longitude: this.formData.longitude,
-                        is_default: this.formData.is_default,
-                        type: this.localType
-                    };
-
-                    url = 'add';
-                    if (this.formData.id) {
-                        url = 'edit';
-                        data.id = this.formData.id;
-                        if (this.back != '') data.is_default = 1;
-                    }
-                    this.$api.sendRequest({
-                        url: '/api/memberaddress/' + url,
-                        data: data,
-                        success: res => {
-                            this.flag = false;
-
-                            if (res.code == 0) {
-                                if (this.back != '') {
-                                    this.$util.redirectTo(this.back, {}, 'redirectTo');
-                                } else {
-                                    this.$util.showToast({
-                                        title: res.message
-                                    });
-                                    uni.navigateBack({
-                                        delta: 1
-                                    });
-                                }
-                                uni.removeStorageSync('addressInfo');
+                        if (res.code == 0) {
+                            if (this.back != '') {
+                                this.$util.redirectTo(this.back, {}, 'redirectTo');
                             } else {
                                 this.$util.showToast({
                                     title: res.message
                                 });
+                                uni.navigateBack({
+                                    delta: 1
+                                });
                             }
-                        },
-                        fail: res => {
-                            this.flag = false;
+                            uni.removeStorageSync('addressInfo');
+                        } else {
+                            this.$util.showToast({
+                                title: res.message
+                            });
                         }
-                    });
-                }
+                    },
+                    fail: res => {
+                        this.flag = false;
+                    }
+                });
             }
         }
-    };
+    }
+};
 </script>
 
 <style lang="scss">
-    /deep/ pick-regions,
-    .pick-regions {
+/deep/ pick-regions,
+.pick-regions {
+    flex: 1;
+}
+
+.edit-wrap {
+    background: #fff;
+    overflow: hidden;
+
+    .tip {
+        padding: 20rpx 30rpx 10rpx;
+        background-color: #f8f8f8;
+        color: $color-tip;
+    }
+}
+
+.edit-item {
+    display: flex;
+    align-items: center;
+    margin: 0 30rpx;
+    min-height: 100rpx;
+    background-color: #fff;
+
+    .text_inp {
+        margin-left: $margin-updown;
         flex: 1;
     }
 
-    .edit-wrap {
-        background: #fff;
-        overflow: hidden;
+    .tit {
+        width: 148rpx;
 
-        .tip {
-            padding: 20rpx 30rpx 10rpx;
-            background-color: #f8f8f8;
-            color: $color-tip;
-        }
-    }
-
-    .edit-item {
-        display: flex;
-        align-items: center;
-        margin: 0 30rpx;
-        min-height: 100rpx;
-        background-color: #fff;
-
-        .text_inp {
-            margin-left: $margin-updown;
-            flex: 1;
-        }
-
-        .tit {
-            width: 148rpx;
-
-            text {
-                margin-left: 10rpx;
-                color: #ff4544;
-            }
-
-            &.margin_tit {
-                align-self: flex-start;
-                margin-top: 24rpx;
-            }
-        }
-
-        .icon-location {
-            color: #606266;
-            align-self: flex-start;
-            margin-top: 20rpx;
-        }
-
-        .select-address {
-            display: block;
+        text {
             margin-left: 10rpx;
-
-            &.empty {
-                color: #808080;
-            }
+            color: #ff4544;
         }
 
-        textarea,
-        input {
-            flex: 1;
-            font-size: $font-size-base;
-            margin-left: 20rpx;
-            padding: 0;
-        }
-
-        textarea {
-            margin-top: 6rpx;
-            height: 100rpx;
-            padding-bottom: 20rpx;
-            padding-top: 20rpx;
-            line-height: 50rpx;
+        &.margin_tit {
+            align-self: flex-start;
+            margin-top: 24rpx;
         }
     }
 
-    .edit-wrap>.edit-item+.edit-item {
-        border-top: 2rpx solid #ebedf0;
+    .icon-location {
+        color: #606266;
+        align-self: flex-start;
+        margin-top: 20rpx;
     }
 
-    .add {
-        margin-top: 60rpx;
-        height: 80rpx;
-        line-height: 80rpx !important;
-        border-radius: 80rpx;
-        font-weight: 500;
-        width: calc(100% - 60rpx);
-        margin-left: 30rpx;
-        font-size: 32rpx;
+    .select-address {
+        display: block;
+        margin-left: 10rpx;
+
+        &.empty {
+            color: #808080;
+        }
     }
 
-    .btn {
-        position: fixed;
-        width: 100%;
-        bottom: 30rpx;
-        height: auto;
-        padding-bottom: constant(safe-area-inset-bottom);
-        /*兼容 IOS<11.2*/
-        padding-bottom: env(safe-area-inset-bottom);
-        /*兼容 IOS>11.2*/
+    textarea,
+    input {
+        flex: 1;
+        font-size: $font-size-base;
+        margin-left: 20rpx;
+        padding: 0;
     }
+
+    textarea {
+        margin-top: 6rpx;
+        height: 100rpx;
+        padding-bottom: 20rpx;
+        padding-top: 20rpx;
+        line-height: 50rpx;
+    }
+}
+
+.edit-wrap>.edit-item+.edit-item {
+    border-top: 2rpx solid #ebedf0;
+}
+
+.add {
+    margin-top: 60rpx;
+    height: 80rpx;
+    line-height: 80rpx !important;
+    border-radius: 80rpx;
+    font-weight: 500;
+    width: calc(100% - 60rpx);
+    margin-left: 30rpx;
+    font-size: 32rpx;
+}
+
+.btn {
+    position: fixed;
+    width: 100%;
+    bottom: 30rpx;
+    height: auto;
+    padding-bottom: constant(safe-area-inset-bottom);
+    /*兼容 IOS<11.2*/
+    padding-bottom: env(safe-area-inset-bottom);
+    /*兼容 IOS>11.2*/
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue
index d258e4f..1b93d35 100644
--- a/pages_tool/member/apply_withdrawal.vue
+++ b/pages_tool/member/apply_withdrawal.vue
@@ -31,7 +31,8 @@
 			</view>
 			<view class="bootom">
 				<view>
-					<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
+					<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{
+						withdrawInfo.member_info.balance_money | moneyFormat }}</text>
 					<text class="all-tx color-base-text" @click="allTx">全部提现</text>
 				</view>
 			</view>
@@ -41,7 +42,8 @@
 			</view>
 		</view>
 
-		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
+		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal"
+			:class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
 			提现
 		</view>
 
@@ -53,163 +55,130 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				withdrawInfo: {
-					config: {
-						is_use: 0,
-						min: 1,
-						rate: 0
-					},
-					member_info: {
-						balance_money: 0,
-						balance_withdraw: 0,
-						balance_withdraw_apply: 0
-					}
+export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			withdrawInfo: {
+				config: {
+					is_use: 0,
+					min: 1,
+					rate: 0
 				},
-				bankAccountInfo: {},
-				withdrawMoney: '',
-				isSub: false
-			};
+				member_info: {
+					balance_money: 0,
+					balance_withdraw: 0,
+					balance_withdraw_apply: 0
+				}
+			},
+			bankAccountInfo: {},
+			withdrawMoney: '',
+			isSub: false
+		};
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getWithdrawInfo();
+			this.getBankAccountInfo();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/member/apply_withdrawal'
+			});
+		}
+	},
+	methods: {
+		toWithdrawal() {
+			this.$util.redirectTo('/pages_tool/member/withdrawal');
 		},
-		onShow() {
-			if (this.storeToken) {
-				this.getWithdrawInfo();
-				this.getBankAccountInfo();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_tool/member/apply_withdrawal'
+		//全部提现
+		allTx() {
+			this.withdrawMoney = this.withdrawInfo.member_info.balance_money;
+		},
+		// 删除提现金额
+		remove() {
+			this.withdrawMoney = '';
+		},
+		/**
+		 * 获取提现信息
+		 */
+		getWithdrawInfo() {
+			this.$api.sendRequest({
+				url: '/api/memberwithdraw/info',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.withdrawInfo = res.data;
+						if (this.withdrawInfo.config.is_use == 0) {
+							this.$util.showToast({
+								title: '未开启提现'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/member/index');
+							}, 1500);
+						}
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 银行账号信息
+		 */
+		getBankAccountInfo() {
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/defaultinfo',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.bankAccountInfo = res.data;
+					}
+				}
+			});
+		},
+		verify() {
+			if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
+				this.$util.showToast({
+					title: '请输入提现金额'
 				});
+				return false;
 			}
+			if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
+				this.$util.showToast({
+					title: '提现金额超出可提现金额'
+				});
+				return false;
+			}
+			if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
+				this.$util.showToast({
+					title: '提现金额小于最低提现金额'
+				});
+				return false;
+			}
+			return true;
 		},
-		methods: {
-			toWithdrawal() {
-				this.$util.redirectTo('/pages_tool/member/withdrawal');
-			},
-			//全部提现
-			allTx() {
-				this.withdrawMoney = this.withdrawInfo.member_info.balance_money;
-			},
-			// 删除提现金额
-			remove() {
-				this.withdrawMoney = '';
-			},
-			/**
-			 * 获取提现信息
-			 */
-			getWithdrawInfo() {
-				this.$api.sendRequest({
-					url: '/api/memberwithdraw/info',
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.withdrawInfo = res.data;
-							if (this.withdrawInfo.config.is_use == 0) {
-								this.$util.showToast({
-									title: '未开启提现'
-								});
-								setTimeout(() => {
-									this.$util.redirectTo('/pages/member/index');
-								}, 1500);
-							}
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
+		withdraw() {
+			if (!this.bankAccountInfo.withdraw_type) {
+				this.$util.showToast({
+					title: '请先添加提现方式'
 				});
-			},
-			/**
-			 * 银行账号信息
-			 */
-			getBankAccountInfo() {
-				this.$api.sendRequest({
-					url: '/api/memberbankaccount/defaultinfo',
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.bankAccountInfo = res.data;
-						}
-					}
-				});
-			},
-			verify() {
-				if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
-					this.$util.showToast({
-						title: '请输入提现金额'
-					});
-					return false;
-				}
-				if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
-					this.$util.showToast({
-						title: '提现金额超出可提现金额'
-					});
-					return false;
-				}
-				if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
-					this.$util.showToast({
-						title: '提现金额小于最低提现金额'
-					});
-					return false;
-				}
-				return true;
-			},
-			withdraw() {
-				if (!this.bankAccountInfo.withdraw_type) {
-					this.$util.showToast({
-						title: '请先添加提现方式'
-					});
-					return;
-				}
-				if (this.verify()) {
-					if (this.isSub) return;
-					this.isSub = true;
-
-					var applet_type = 0;
-					if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
-						// #ifdef MP
-						applet_type = 1;
-						// #endif
-					}
+				return;
+			}
+			if (this.verify()) {
+				if (this.isSub) return;
+				this.isSub = true;
 
+				var applet_type = 0;
+				if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
 					// #ifdef MP
-					this.subscribeMessage(() => {
-						this.$api.sendRequest({
-							url: '/api/memberwithdraw/apply',
-							data: {
-								apply_money: this.withdrawMoney,
-								transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
-								realname: this.bankAccountInfo.realname,
-								mobile: this.bankAccountInfo.mobile,
-								bank_name: this.bankAccountInfo.branch_bank_name,
-								account_number: this.bankAccountInfo.bank_account,
-								applet_type: applet_type
-							},
-							success: res => {
-								if (res.code >= 0) {
-									this.$util.showToast({
-										title: '提现申请成功'
-									});
-									setTimeout(() => {
-										this.$util.redirectTo(
-											'/pages_tool/member/withdrawal', {},
-											'redirectTo');
-									}, 1500);
-								} else {
-									this.isSub = false;
-									this.$util.showToast({
-										title: res.message
-									});
-								}
-							},
-							fail: res => {
-								this.isSub = false;
-							}
-						});
-					});
+					applet_type = 1;
 					// #endif
+				}
 
-					// #ifndef MP-WEIXIN
+				// #ifdef MP
+				this.subscribeMessage(() => {
 					this.$api.sendRequest({
 						url: '/api/memberwithdraw/apply',
 						data: {
@@ -227,7 +196,8 @@
 									title: '提现申请成功'
 								});
 								setTimeout(() => {
-									this.$util.redirectTo('/pages_tool/member/withdrawal', {},
+									this.$util.redirectTo(
+										'/pages_tool/member/withdrawal', {},
 										'redirectTo');
 								}, 1500);
 							} else {
@@ -241,185 +211,220 @@
 							this.isSub = false;
 						}
 					});
-					// #endif
-				}
-			},
-			goAccount() {
-				this.$util.redirectTo(
-					'/pages_tool/member/account', {
-						back: '/pages_tool/member/apply_withdrawal'
-					},
-					'redirectTo'
-				);
-			},
-			/**
-			 * 微信订阅消息
-			 */
-			subscribeMessage(callback) {
+				});
+				// #endif
+
+				// #ifndef MP-WEIXIN
 				this.$api.sendRequest({
-					url: '/weapp/api/weapp/messagetmplids',
+					url: '/api/memberwithdraw/apply',
 					data: {
-						keywords: 'USER_WITHDRAWAL_SUCCESS'
+						apply_money: this.withdrawMoney,
+						transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
+						realname: this.bankAccountInfo.realname,
+						mobile: this.bankAccountInfo.mobile,
+						bank_name: this.bankAccountInfo.branch_bank_name,
+						account_number: this.bankAccountInfo.bank_account,
+						applet_type: applet_type
 					},
 					success: res => {
-						if (res.code == 0 && res.data.length) {
-							uni.requestSubscribeMessage({
-								tmplIds: res.data,
-								fail: res => {
-									console.log('fail', res);
-								},
-								complete: () => {
-									callback();
-								}
+						if (res.code >= 0) {
+							this.$util.showToast({
+								title: '提现申请成功'
 							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/member/withdrawal', {},
+									'redirectTo');
+							}, 1500);
 						} else {
-							callback();
+							this.isSub = false;
+							this.$util.showToast({
+								title: res.message
+							});
 						}
 					},
 					fail: res => {
-						callback();
+						this.isSub = false;
 					}
 				});
+				// #endif
 			}
 		},
-	};
+		goAccount() {
+			this.$util.redirectTo(
+				'/pages_tool/member/account', {
+				back: '/pages_tool/member/apply_withdrawal'
+			},
+				'redirectTo'
+			);
+		},
+		/**
+		 * 微信订阅消息
+		 */
+		subscribeMessage(callback) {
+			this.$api.sendRequest({
+				url: '/weapp/api/weapp/messagetmplids',
+				data: {
+					keywords: 'USER_WITHDRAWAL_SUCCESS'
+				},
+				success: res => {
+					if (res.code == 0 && res.data.length) {
+						uni.requestSubscribeMessage({
+							tmplIds: res.data,
+							fail: res => {
+								console.log('fail', res);
+							},
+							complete: () => {
+								callback();
+							}
+						});
+					} else {
+						callback();
+					}
+				},
+				fail: res => {
+					callback();
+				}
+			});
+		}
+	},
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-		background: #fff;
-	}
+.container {
+	width: 100vw;
+	height: 100vh;
+	background: #fff;
+}
 
-	.empty-box {
-		height: 20rpx;
-	}
+.empty-box {
+	height: 20rpx;
+}
 
-	.bank-account-wrap {
-		margin: 0 20rpx;
-		padding: 20rpx 30rpx;
-		border-bottom: 2rpx solid #f7f7f7;
-		position: relative;
+.bank-account-wrap {
+	margin: 0 20rpx;
+	padding: 20rpx 30rpx;
+	border-bottom: 2rpx solid #f7f7f7;
+	position: relative;
 
-		.tx-wrap {
-			display: flex;
-			justify-content: space-between;
+	.tx-wrap {
+		display: flex;
+		justify-content: space-between;
+		margin-right: 60rpx;
+
+		.tx-bank {
 			margin-right: 60rpx;
-
-			.tx-bank {
-				margin-right: 60rpx;
-				flex: 1;
-				margin-left: 10rpx;
-				text-align: right;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-
-			.tx-img {
-				position: absolute;
-				right: 100rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				width: 40rpx;
-				height: 40rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
+			flex: 1;
+			margin-left: 10rpx;
+			text-align: right;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
 		}
 
-		.iconfont {
+		.tx-img {
 			position: absolute;
-			right: 40rpx;
+			right: 100rpx;
 			top: 50%;
 			transform: translateY(-50%);
-		}
-	}
+			width: 40rpx;
+			height: 40rpx;
 
-	.withdraw-wrap {
-		margin: 0 20rpx;
-		padding: 30rpx;
-		border-radius: 16rpx;
-		box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
-
-		.money-wrap {
-			padding: 20rpx 0;
-			border-bottom: 2rpx solid #eee;
-			display: flex;
-			align-items: baseline;
-
-			.unit {
-				font-size: 60rpx;
-				line-height: 1.3;
-			}
-
-			.withdraw-money {
-				height: 70rpx;
-				line-height: 70rpx;
-				min-height: 70rpx;
-				padding-left: 20rpx;
-				font-size: 60rpx;
-				flex: 1;
-				font-weight: bolder;
-			}
-
-			.delete {
-				width: 40rpx;
-				height: 40rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		.bootom {
-			display: flex;
-			padding-top: 20rpx;
-
-			text {
-				line-height: 1;
-				flex: 2;
-			}
-
-			.all-tx {
-				padding-left: 10rpx;
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
 	}
 
-	.btn {
-		margin: 0 30rpx;
-		margin-top: 60rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: $border-radius;
+	.iconfont {
+		position: absolute;
+		right: 40rpx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+}
+
+.withdraw-wrap {
+	margin: 0 20rpx;
+	padding: 30rpx;
+	border-radius: 16rpx;
+	box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
+
+	.money-wrap {
+		padding: 20rpx 0;
+		border-bottom: 2rpx solid #eee;
+		display: flex;
+		align-items: baseline;
+
+		.unit {
+			font-size: 60rpx;
+			line-height: 1.3;
+		}
+
+		.withdraw-money {
+			height: 70rpx;
+			line-height: 70rpx;
+			min-height: 70rpx;
+			padding-left: 20rpx;
+			font-size: 60rpx;
+			flex: 1;
+			font-weight: bolder;
+		}
+
+		.delete {
+			width: 40rpx;
+			height: 40rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.bootom {
+		display: flex;
+		padding-top: 20rpx;
+
+		text {
+			line-height: 1;
+			flex: 2;
+		}
+
+		.all-tx {
+			padding-left: 10rpx;
+		}
+	}
+}
+
+.btn {
+	margin: 0 30rpx;
+	margin-top: 60rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: $border-radius;
+	color: #fff;
+	text-align: center;
+	background-color: var(--main-color);
+
+	&.disabled {
+		background: #ccc;
+		border-color: #ccc;
 		color: #fff;
+	}
+}
+
+.recoend {
+	margin-top: 40rpx;
+
+	.recoend-con {
 		text-align: center;
-		background-color: var(--main-color);
-
-		&.disabled {
-			background: #ccc;
-			border-color: #ccc;
-			color: #fff;
-		}
 	}
+}
 
-	.recoend {
-		margin-top: 40rpx;
-
-		.recoend-con {
-			text-align: center;
-		}
-	}
-
-	.desc {
-		font-size: $font-size-tag;
-		color: #999;
-	}
+.desc {
+	font-size: $font-size-tag;
+	color: #999;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue
index 1976189..f00c414 100644
--- a/pages_tool/member/balance.vue
+++ b/pages_tool/member/balance.vue
@@ -2,9 +2,9 @@
 	<view class="balance" :style="themeColor">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
-				'padding-top': menuButtonBounding.top + 'px',
-				'height': menuButtonBounding.height + 'px'
-			}">
+			'padding-top': menuButtonBounding.top + 'px',
+			'height': menuButtonBounding.height + 'px'
+		}">
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
 				<view class="navbar-title">
@@ -13,12 +13,14 @@
 			</view>
 		</view>
 		<!-- #endif -->
-		
-		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ')',backgroundSize:'100% 100%' }">
-		<!-- 	<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ') no-repeat right bottom/ auto 380rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> -->
+
+		<view class="head-wrap"
+			:style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ')', backgroundSize: '100% 100%' }">
+			<!-- 	<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ') no-repeat right bottom/ auto 380rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> -->
 			<view class="title">账户余额（元）</view>
-			<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
-<!-- 			<view class="flex-box">
+			<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) +
+				parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
+			<!-- 			<view class="flex-box">
 				<view class="flex-item">
 					<view class="num price-font">{{  balanceInfo.balance_money|moneyFormat }}</view>
 					<view class="font-size-tag">现金余额（元）</view>
@@ -49,7 +51,7 @@
 				<text class="title">余额明细</text>
 				<text class="iconfont icon-right"></text>
 			</view>
-		<!-- 	<view class="menu-item" @click="toOrderList">
+			<!-- 	<view class="menu-item" @click="toOrderList">
 				<view class="icon">
 					<text class="iconfont icon-chongzhijilu"></text>
 				</view>
@@ -57,8 +59,8 @@
 				<text class="iconfont icon-right"></text>
 			</view> -->
 		</view>
-		
-	<!-- 	<view class="action">
+
+		<!-- 	<view class="action">
 			<view @click="toList" class="recharge-withdraw" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use">
 				{{ $lang('recharge') }}
 			</view>
@@ -72,11 +74,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-
 export default {
-	components: { nsLogin, loadingCover },
+	components: { 
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'), 
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue') 
+	},
 	data() {
 		return {
 			balanceInfo: {
@@ -114,7 +116,7 @@ export default {
 		toBalanceDetail() {
 			this.$util.redirectTo('/pages_tool/member/balance_detail');
 		},
-		toApply(){
+		toApply() {
 			this.$util.redirectTo('/pages_tool/member/withdrawal');
 		},
 		toList() {
@@ -178,7 +180,7 @@ export default {
 		return true;
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getUserInfo();
 			}
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index e0baf95..5cde924 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -5,7 +5,7 @@
 				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
 			</view>
 		</scroll-view> -->
-	<!-- 	<view class="tab color-bg">
+		<!-- 	<view class="tab color-bg">
 			<view class="tab-left">
 				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
 					<view class="uni-input">
@@ -27,15 +27,18 @@
 				<block v-if="dataList.length > 0">
 					<view class="detailed-wrap">
 						<view class="balances" v-for="(item, index) in dataList" :key="index">
-							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img" v-if="item.account_data > 0"></image>
-							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix"></image>
+							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img"
+								v-if="item.account_data > 0"></image>
+							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix">
+							</image>
 							<view class="balances-info" @click="toFromDetail(item)">
 								<text class="title">{{ item.remark }}</text>
-							<!-- 	<text>{{ item.remark }}</text> -->
+								<!-- 	<text>{{ item.remark }}</text> -->
 								<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
 							</view>
 							<view class="balances-num">
-								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元</text>
+								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ?
+									'+' + item.account_data : item.account_data }}元</text>
 							</view>
 						</view>
 					</view>
@@ -50,324 +53,319 @@
 </template>
 
 <script>
-	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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
+
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
-		data() {
-			const currentDate = this.getDate({
-				format: true
+	data() {
+		const currentDate = this.getDate({
+			format: true
+		});
+		return {
+			dataList: [],
+			statusList: [{
+				name: '全部',
+				id: '0'
+			}, {
+				name: '收入',
+				id: '1'
+			}, {
+				name: '支出',
+				id: '2'
+			}],
+			scrollInto: '',
+			orderStatus: '0',
+			date: currentDate,
+			searchType: {
+				from_type: 0,
+				date: ''
+			},
+			balanceType: [{
+				label: '全部',
+				value: '0'
+			}], //积分类型
+			balanceIndex: 0,
+			related_id: 0
+		};
+	},
+	onLoad(option) {
+		if (option.group_id) this.related_id = option.group_id ? option.group_id : 0;
+		if (option.from_type) this.searchType.from_type = option.from_type;
+		if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
+		if (option.status) this.orderStatus = option.status;
+		this.getbalanceType();
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/balance');
 			});
-			return {
-				dataList: [],
-				statusList: [{
-					name: '全部',
-					id: '0'
-				}, {
-					name: '收入',
-					id: '1'
-				}, {
-					name: '支出',
-					id: '2'
-				}],
-				scrollInto: '',
-				orderStatus: '0',
-				date: currentDate,
-				searchType: {
-					from_type: 0,
-					date: ''
-				},
-				balanceType: [{
-					label: '全部',
-					value: '0'
-				}], //积分类型
-				balanceIndex: 0,
-				related_id: 0
-			};
+		}
+	},
+	methods: {
+		bindDateChange: function (e) {
+			var temp = e.target.value;
+			var tempArr = temp.split('-');
+			this.date = tempArr[0] + '年' + tempArr[1] + '月';
+			this.searchType.date = e.target.value;
+			this.$refs.mescroll.refresh();
 		},
-		onLoad(option) {
-			if (option.group_id) this.related_id = option.group_id ? option.group_id : 0;
-			if (option.from_type) this.searchType.from_type = option.from_type;
-			if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
-			if (option.status) this.orderStatus = option.status;
-			this.getbalanceType();
-		},
-		onShow() {
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/balance');
-				});
-			}
-		},
-		methods: {
-			bindDateChange: function(e) {
-				var temp = e.target.value;
-				var tempArr = temp.split('-');
-				this.date = tempArr[0] + '年' + tempArr[1] + '月';
-				this.searchType.date = e.target.value;
-				this.$refs.mescroll.refresh();
-			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
+		getDate(type) {
+			const date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
 
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}年${month}月`;
-			},
-			bindPickerChange(e) {
-				this.balanceIndex = e.detail.value;
-				this.searchType.from_type = this.balanceType[this.balanceIndex].value;
-				this.$refs.mescroll.refresh();
-			},
-			//获取分类类型
-			getbalanceType() {
-				this.$api.sendRequest({
-					url: '/api/memberaccount/fromType',
-					success: res => {
-						let balanceType = Object.assign(res.balance, res.balance_money),
-							typeArr = [{
-								label: '全部',
-								value: '0'
-							}];
-						for (var index in balanceType) {
-							typeArr.push({
-								label: balanceType[index].type_name,
-								value: index
-							})
-						}
-						this.balanceType = typeArr;
+			if (type === 'start') {
+				year = year - 60;
+			} else if (type === 'end') {
+				year = year + 2;
+			}
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}年${month}月`;
+		},
+		bindPickerChange(e) {
+			this.balanceIndex = e.detail.value;
+			this.searchType.from_type = this.balanceType[this.balanceIndex].value;
+			this.$refs.mescroll.refresh();
+		},
+		//获取分类类型
+		getbalanceType() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/fromType',
+				success: res => {
+					let balanceType = Object.assign(res.balance, res.balance_money),
+						typeArr = [{
+							label: '全部',
+							value: '0'
+						}];
+					for (var index in balanceType) {
+						typeArr.push({
+							label: balanceType[index].type_name,
+							value: index
+						})
 					}
-				});
-			},
-			ontabtap(e) {
-				let index = e.currentTarget.dataset.current;
-				this.orderStatus = this.statusList[index].id;
-				this.$refs.mescroll.refresh();
-			},
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/memberaccount/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						account_type: 'balance,balance_money',
-						from_type: this.searchType.from_type,
-						date: this.searchType.date,
-						related_id: this.related_id
-					},
-					success: res => {
-						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.dataList = []; //如果是第一页需手动制空列表
-							this.related_id = 0;
-						}
-						this.dataList = this.dataList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			toFromDetail(item) {
-				if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
-					this.$util.redirectTo('/pages_order/detail', {
-						order_id: item.type_tag
-					});
-				} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
-					this.$util.redirectTo('/pages_order/detail', {
-						order_id: item.type_tag
-					});
+					this.balanceType = typeArr;
 				}
+			});
+		},
+		ontabtap(e) {
+			let index = e.currentTarget.dataset.current;
+			this.orderStatus = this.statusList[index].id;
+			this.$refs.mescroll.refresh();
+		},
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					account_type: 'balance,balance_money',
+					from_type: this.searchType.from_type,
+					date: this.searchType.date,
+					related_id: this.related_id
+				},
+				success: res => {
+					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.dataList = []; //如果是第一页需手动制空列表
+						this.related_id = 0;
+					}
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toFromDetail(item) {
+			if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
+				this.$util.redirectTo('/pages_order/detail', {
+					order_id: item.type_tag
+				});
+			} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
+				this.$util.redirectTo('/pages_order/detail', {
+					order_id: item.type_tag
+				});
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.detailed-wrap {
-		padding-top: 20rpx;
-		
-		margin: 24rpx;
-	}
+.detailed-wrap {
+	padding-top: 20rpx;
 
-	.tab {
-		position: fixed;
-		top: 0;
-		width: 100%;
-		z-index: 10;
-		display: flex;
-		justify-content: space-between;
-		height: 80rpx;
-		background-color: $color-bg;
+	margin: 24rpx;
+}
 
-		view {
-			flex: 1;
-			text-align: center;
-			line-height: 80rpx;
+.tab {
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 10;
+	display: flex;
+	justify-content: space-between;
+	height: 80rpx;
+	background-color: $color-bg;
 
-			text {
-				margin-left: 10rpx;
-				font-size: $font-size-base;
-			}
-		}
+	view {
+		flex: 1;
+		text-align: center;
+		line-height: 80rpx;
 
-		.tab-left {
-			display: flex;
-			padding-left: 46rpx;
-		}
-
-		.tab-right {
-			display: flex;
-			justify-content: flex-end;
-			padding-right: 26rpx;
+		text {
+			margin-left: 10rpx;
+			font-size: $font-size-base;
 		}
 	}
 
-	.order-nav {
-		width: 100vw;
-		height: 70rpx;
+	.tab-left {
 		display: flex;
-		flex-direction: row;
+		padding-left: 46rpx;
+	}
+
+	.tab-right {
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 26rpx;
+	}
+}
+
+.order-nav {
+	width: 100vw;
+	height: 70rpx;
+	display: flex;
+	flex-direction: row;
+	/* #ifndef APP-PLUS */
+	white-space: nowrap;
+	/* #endif */
+	background: #fff;
+	border-bottom-left-radius: 24rpx;
+	border-bottom-right-radius: 24rpx;
+	padding-bottom: 30rpx;
+	position: fixed;
+	left: 0;
+	z-index: 998;
+
+	.uni-tab-item {
+		width: 33.33%;
+		text-align: center;
+		/* #ifndef APP-PLUS */
+		display: inline-block;
+		/* #endif */
+		flex-wrap: nowrap;
+	}
+
+	.uni-tab-item-title {
+		color: #555;
+		font-size: $font-size-base;
+		display: block;
+		height: 64rpx;
+		line-height: 64rpx;
+		border-bottom: 4rpx solid #fff;
+		padding: 0 10rpx;
+		flex-wrap: nowrap;
 		/* #ifndef APP-PLUS */
 		white-space: nowrap;
 		/* #endif */
-		background: #fff;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-		padding-bottom: 30rpx;
-		position: fixed;
-		left: 0;
-		z-index: 998;
-
-		.uni-tab-item {
-			width: 33.33%;
-			text-align: center;
-			/* #ifndef APP-PLUS */
-			display: inline-block;
-			/* #endif */
-			flex-wrap: nowrap;
-		}
-
-		.uni-tab-item-title {
-			color: #555;
-			font-size: $font-size-base;
-			display: block;
-			height: 64rpx;
-			line-height: 64rpx;
-			border-bottom: 4rpx solid #fff;
-			padding: 0 10rpx;
-			flex-wrap: nowrap;
-			/* #ifndef APP-PLUS */
-			white-space: nowrap;
-			/* #endif */
-		}
-
-		.uni-tab-item-title-active {
-			display: block;
-			height: 64rpx;
-			padding: 0 10rpx;
-		}
-
-		::-webkit-scrollbar {
-			width: 0;
-			height: 0;
-			color: transparent;
-		}
 	}
 
-	.balances {
-		padding: $margin-both 24rpx;
-		// margin: 0 $margin-both;
-		box-sizing: border-box;
-		display: flex;
-		align-items: flex-start;
-		border-bottom: 2rpx solid $color-line;
-		background: #fff;
-		margin-bottom: 20rpx;
-		border-radius: 24rpx;
-		image {
-			width: 54rpx;
-			height: 54rpx;
-			border-radius: 50%;
-			padding-top: 10rpx;
-		}
-
-		.balances-info {
-			flex: 1;
-			margin-left: 16rpx;
-			display: flex;
-			flex-direction: column;
-
-			text {
-				font-size: $font-size-toolbar;
-				line-height: 1;
-
-				&:last-child {}
-
-				&:nth-child(2) {
-					margin-top: $margin-updown;
-					font-size: $font-size-activity-tag;
-					color: $color-tip;
-				}
-
-				&:nth-child(3) {
-					font-size: $font-size-activity-tag;
-					margin-top: $margin-updown;
-					color: $color-tip;
-				}
-			}
-		}
-
-		.balances-num {
-			text {
-				line-height: 1;
-				font-size: $font-size-toolbar;
-				font-weight: 500;
-				color:#09c15f;
-				font-weight: 700;
-			}
-		}
+	.uni-tab-item-title-active {
+		display: block;
+		height: 64rpx;
+		padding: 0 10rpx;
 	}
 
-	.empty {
-		width: 100%;
-		height: 500rpx;
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+}
+
+.balances {
+	padding: $margin-both 24rpx;
+	// margin: 0 $margin-both;
+	box-sizing: border-box;
+	display: flex;
+	align-items: flex-start;
+	border-bottom: 2rpx solid $color-line;
+	background: #fff;
+	margin-bottom: 20rpx;
+	border-radius: 24rpx;
+
+	image {
+		width: 54rpx;
+		height: 54rpx;
+		border-radius: 50%;
+		padding-top: 10rpx;
+	}
+
+	.balances-info {
+		flex: 1;
+		margin-left: 16rpx;
 		display: flex;
-		justify-content: center;
 		flex-direction: column;
-		align-items: center;
+
+		text {
+			font-size: $font-size-toolbar;
+			line-height: 1;
+
+			&:last-child {}
+
+			&:nth-child(2) {
+				margin-top: $margin-updown;
+				font-size: $font-size-activity-tag;
+				color: $color-tip;
+			}
+
+			&:nth-child(3) {
+				font-size: $font-size-activity-tag;
+				margin-top: $margin-updown;
+				color: $color-tip;
+			}
+		}
 	}
+
+	.balances-num {
+		text {
+			line-height: 1;
+			font-size: $font-size-toolbar;
+			font-weight: 500;
+			color: #09c15f;
+			font-weight: 700;
+		}
+	}
+}
+
+.empty {
+	width: 100%;
+	height: 500rpx;
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/cancellation.vue b/pages_tool/member/cancellation.vue
index b1e05a8..f9d60f3 100644
--- a/pages_tool/member/cancellation.vue
+++ b/pages_tool/member/cancellation.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 export default {
 	data() {
 		return {
diff --git a/pages_tool/member/cancelrefuse.vue b/pages_tool/member/cancelrefuse.vue
index eabb02a..c446477 100644
--- a/pages_tool/member/cancelrefuse.vue
+++ b/pages_tool/member/cancelrefuse.vue
@@ -1,7 +1,9 @@
 <template>
 	<view class="container" :style="themeColor">
 		<view class="cancel-wrap">
-			<view class="cancel-img"><image :src="$util.img('public/uniapp/member/refuse.png')"></image></view>
+			<view class="cancel-img">
+				<image :src="$util.img('public/uniapp/member/refuse.png')"></image>
+			</view>
 			<view class="cancel-title">您的申请已拒绝</view>
 			<view class="cancel-reason">拒绝理由：{{ reason }}</view>
 			<view class="cancel-btn">
diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue
index a33ecf0..481ea04 100644
--- a/pages_tool/member/cancelstatus.vue
+++ b/pages_tool/member/cancelstatus.vue
@@ -19,8 +19,7 @@
 					<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
 				</view>
 				<view class="cancelstatus-box cancelstatus-box-last">
-					<view class="cancelstatus-box-sort color-base-bg" :class="[ state == 1 ?  'opacity': 'opacity-4' ]">
-						3
+					<view class="cancelstatus-box-sort color-base-bg" :class="[state == 1 ? 'opacity' : 'opacity-4']">
 					</view>
 					<view class="cancelstatus-box-con">
 						<view class="cancelstatus-box-name">审核通过，注销完成</view>
@@ -37,153 +36,153 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				state: 0
-			};
-		},
-		onLoad(option) {
-			// 判断登录
-			if (!this.storeToken) {
-				this.$util.redirectTo('/pages_tool/login/login');
-			} else {
-				this.getStatus();
-			}
-		},
-		onShow() {
+export default {
+	data() {
+		return {
+			state: 0
+		};
+	},
+	onLoad(option) {
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
 			this.getStatus();
-		},
-		methods: {
-			getStatus() {
-				this.$api.sendRequest({
-					url: '/membercancel/api/membercancel/info',
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.state = res.data.status;
-							if (this.state == -1) {
-								this.$util.redirectTo('/pages_tool/member/cancelrefuse');
-							}
-						}
-
-						if (res.code == -1) {
-							this.$store.commit('setToken', '');
-							this.$store.commit('setMemberInfo', '');
-							this.$store.commit('setMemberInfo', '');
-							this.$store.dispatch('emptyCart');
-							this.$util.redirectTo('/pages/index/index');
-						}
-					}
-				});
-			},
-			back() {
-				this.$util.redirectTo('/pages/member/index');
-			},
-			revoke() {
-				uni.showModal({
-					title: '风险提示',
-					content: '确定要撤销申请吗？',
-					confirmColor: '#000000',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/membercancel/api/membercancel/cancelApply',
-								success: res => {
-									if (res.code >= 0) {
-										this.$util.redirectTo('/pages/member/index');
-									}
-								}
-							});
-						}
-					}
-				});
-			}
 		}
-	};
+	},
+	onShow() {
+		this.getStatus();
+	},
+	methods: {
+		getStatus() {
+			this.$api.sendRequest({
+				url: '/membercancel/api/membercancel/info',
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.state = res.data.status;
+						if (this.state == -1) {
+							this.$util.redirectTo('/pages_tool/member/cancelrefuse');
+						}
+					}
+
+					if (res.code == -1) {
+						this.$store.commit('setToken', '');
+						this.$store.commit('setMemberInfo', '');
+						this.$store.commit('setMemberInfo', '');
+						this.$store.dispatch('emptyCart');
+						this.$util.redirectTo('/pages/index/index');
+					}
+				}
+			});
+		},
+		back() {
+			this.$util.redirectTo('/pages/member/index');
+		},
+		revoke() {
+			uni.showModal({
+				title: '风险提示',
+				content: '确定要撤销申请吗？',
+				confirmColor: '#000000',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/membercancel/api/membercancel/cancelApply',
+							success: res => {
+								if (res.code >= 0) {
+									this.$util.redirectTo('/pages/member/index');
+								}
+							}
+						});
+					}
+				}
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.cancelstatus-wrap {
-		.cancelstatus-block {
-			padding: 50rpx;
+.cancelstatus-wrap {
+	.cancelstatus-block {
+		padding: 50rpx;
+	}
+
+	.cancelstatus-box {
+		position: relative;
+		display: flex;
+		height: 200rpx;
+
+		.cancelstatus-box-sort {
+			width: 36rpx;
+			height: 36rpx;
+			text-align: center;
+			line-height: 36rpx;
+			border-radius: 50%;
+			color: #ffffff;
+			margin-right: 17rpx;
+			font-size: 24rpx;
 		}
 
-		.cancelstatus-box {
-			position: relative;
-			display: flex;
-			height: 200rpx;
+		.opacity {
+			opacity: 1;
 
-			.cancelstatus-box-sort {
-				width: 36rpx;
-				height: 36rpx;
-				text-align: center;
-				line-height: 36rpx;
-				border-radius: 50%;
-				color: #ffffff;
-				margin-right: 17rpx;
-				font-size: 24rpx;
-			}
-
-			.opacity {
-				opacity: 1;
-
-				&-4 {
-					opacity: 0.4;
-				}
-			}
-
-			.cancelstatus-box-name {
-				font-size: 32rpx;
-				line-height: 32rpx;
-				margin-top: 3rpx;
-			}
-
-			.cancelstatus-box-info {
-				margin-top: 15rpx;
-				color: #666666;
-				font-size: 28rpx;
-			}
-
-			.cancelstatus-box-line {
-				position: absolute;
-				width: 2rpx;
-				height: 164rpx;
-				top: 36rpx;
-				left: 18rpx;
-			}
-
-			&.cancelstatus-box-last {
-				height: 80rpx;
+			&-4 {
+				opacity: 0.4;
 			}
 		}
 
-		.cancelstatus-btn {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			position: fixed;
-			bottom: 0;
-			width: 100%;
-			height: 150rpx;
+		.cancelstatus-box-name {
+			font-size: 32rpx;
+			line-height: 32rpx;
+			margin-top: 3rpx;
+		}
 
-			button {
-				width: 300rpx;
-				height: 80rpx;
-				font-size: 28rpx;
-				line-height: 80rpx;
-				margin: 0 15rpx;
-				border-radius: $border-radius;
-			}
+		.cancelstatus-box-info {
+			margin-top: 15rpx;
+			color: #666666;
+			font-size: 28rpx;
+		}
 
-			button[type='primary'] {
-				background-color: unset !important;
-				color: #333333;
-				border: 2rpx solid #dddddd;
-			}
+		.cancelstatus-box-line {
+			position: absolute;
+			width: 2rpx;
+			height: 164rpx;
+			top: 36rpx;
+			left: 18rpx;
+		}
 
-			button:nth-child(2) {
-				color: #ffffff;
-			}
+		&.cancelstatus-box-last {
+			height: 80rpx;
 		}
 	}
+
+	.cancelstatus-btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 150rpx;
+
+		button {
+			width: 300rpx;
+			height: 80rpx;
+			font-size: 28rpx;
+			line-height: 80rpx;
+			margin: 0 15rpx;
+			border-radius: $border-radius;
+		}
+
+		button[type='primary'] {
+			background-color: unset !important;
+			color: #333333;
+			border: 2rpx solid #dddddd;
+		}
+
+		button:nth-child(2) {
+			color: #ffffff;
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue
index 4f975ab..a028ccf 100644
--- a/pages_tool/member/cancelsuccess.vue
+++ b/pages_tool/member/cancelsuccess.vue
@@ -12,88 +12,88 @@
 </template>
 
 <script>
-	export default {
-		components: {},
-		data() {
-			return {
-				state: ''
-			};
-		},
-		onLoad(option) {
+export default {
+	components: {},
+	data() {
+		return {
+			state: ''
+		};
+	},
+	onLoad(option) {
 
-			if (option.back) this.back = option.back;
+		if (option.back) this.back = option.back;
 
-			// 判断登录
-			if (!this.storeToken) {
-				this.$util.redirectTo('/pages_tool/login/login');
-			} else {
-				this.getStatus();
-			}
-		},
-		methods: {
-			getStatus() {
-				this.$api.sendRequest({
-					success: res => {
-						if (res.code >= 0) {
-							this.state = res.data.state;
-							if (res.data.state == 1) {
-								this.$store.commit('setToken', '');
-								this.$store.commit('setMemberInfo', '');
-								this.$store.dispatch('emptyCart');
-								this.$util.redirectTo('/pages/index/index');
-							}
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			this.getStatus();
+		}
+	},
+	methods: {
+		getStatus() {
+			this.$api.sendRequest({
+				success: res => {
+					if (res.code >= 0) {
+						this.state = res.data.state;
+						if (res.data.state == 1) {
+							this.$store.commit('setToken', '');
+							this.$store.commit('setMemberInfo', '');
+							this.$store.dispatch('emptyCart');
+							this.$util.redirectTo('/pages/index/index');
 						}
 					}
-				});
-			}
+				}
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.cancel-wrap {
-		padding-top: 84rpx;
-		text-align: center;
+.cancel-wrap {
+	padding-top: 84rpx;
+	text-align: center;
 
-		.cancel-img {
-			width: 100rpx;
-			height: 100rpx;
-			display: inline-block;
+	.cancel-img {
+		width: 100rpx;
+		height: 100rpx;
+		display: inline-block;
 
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.cancel-title {
-			text-align: center;
-			font-size: 24rpx;
-			line-height: 24rpx;
-			margin-top: 30rpx;
-		}
-
-		.cancel-reason {
-			color: #838383;
-			font-size: 20rpx;
-			line-height: 40rpx;
-			margin-top: 20rpx;
-			padding: 0 175rpx;
-		}
-
-		.cancel-btn {
+		image {
 			width: 100%;
-			margin-top: 173rpx;
-
-			button {
-				display: inline-block;
-				width: 300rpx;
-				height: 80rpx;
-				font-size: 28rpx;
-				line-height: 80rpx;
-				margin: 0 15rpx;
-				color: #ffffff;
-			}
+			height: 100%;
 		}
 	}
+
+	.cancel-title {
+		text-align: center;
+		font-size: 24rpx;
+		line-height: 24rpx;
+		margin-top: 30rpx;
+	}
+
+	.cancel-reason {
+		color: #838383;
+		font-size: 20rpx;
+		line-height: 40rpx;
+		margin-top: 20rpx;
+		padding: 0 175rpx;
+	}
+
+	.cancel-btn {
+		width: 100%;
+		margin-top: 173rpx;
+
+		button {
+			display: inline-block;
+			width: 300rpx;
+			height: 80rpx;
+			font-size: 28rpx;
+			line-height: 80rpx;
+			margin: 0 15rpx;
+			color: #ffffff;
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
index 2d5d236..9706d63 100644
--- a/pages_tool/member/card.vue
+++ b/pages_tool/member/card.vue
@@ -5,8 +5,9 @@
 		</view>
 		<view class="banner-container">
 			<view class="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
-				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"/>
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+					mode="aspectFill" />
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill" />
 				<view class="member-desc">
 					<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
 					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
@@ -22,15 +23,18 @@
 						<view class="level-detail">{{ levelInfo.level_name }}</view>
 						<view class="growr-name">{{ levelInfo.level_name }}可享受消费折扣和</view>
 						<view class="growr-value">会员大礼包等权益</view>
-						<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelInfo.remark != ''">
+						<view class="growth-rules font-size-tag" @click="openExplainPopup"
+							v-if="levelInfo.remark != ''">
 							<text class="iconfont icon-wenhao font-size-tag"></text>
 						</view>
-						<button type="default" class="renew-btn" @click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
+						<button type="default" class="renew-btn"
+							@click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
 					</view>
 				</view>
 			</view>
 
-			<view class="card-content" v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
+			<view class="card-content"
+				v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
 				<view class="card-content-head">
 					<view class="line-box">
 						<view class="line right"></view>
@@ -118,113 +122,111 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+
 import scroll from '@/common/js/scroll-view.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
 
-	export default {
-		components: {
-			uniPopup,
-			nsGoodsRecommend,
-			nsLogin
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				isSub: false, // 是否已提交
-				isIphoneX: false,
-				levelId: 0,
-				levelInfo: {
-					bg_color: '#333'
-				}
-			};
-		},
-		onLoad() {
-			//会员卡
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/card');
-				});
-				return;
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue')
+	},
+	mixins: [scroll],
+	data() {
+		return {
+			isSub: false, // 是否已提交
+			isIphoneX: false,
+			levelId: 0,
+			levelInfo: {
+				bg_color: '#333'
 			}
-
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-			this.levelId = this.memberInfo.member_level;
-
-			let levelInfo = this.memberInfo.member_level_info;
-			let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
-			levelInfo.charge_rule_arr = [];
-			Object.keys(charge_rule).forEach(key => {
-				levelInfo.charge_rule_arr.push({
-					key: key,
-					value: charge_rule[key]
-				});
+		};
+	},
+	onLoad() {
+		//会员卡
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/card');
 			});
-			this.levelInfo = levelInfo;
-		},
-		onShow() {},
-		methods: {
-			headimgError() {
-				this.memberInfo.headimg = this.$util.getDefaultImage().head;
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			openExplainPopup() {
-				this.$refs.explainPopup.open();
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			closeExplainPopup() {
-				this.$refs.explainPopup.close();
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index');
-			return true;
+			return;
 		}
-	};
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		this.levelId = this.memberInfo.member_level;
+
+		let levelInfo = this.memberInfo.member_level_info;
+		let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
+		levelInfo.charge_rule_arr = [];
+		Object.keys(charge_rule).forEach(key => {
+			levelInfo.charge_rule_arr.push({
+				key: key,
+				value: charge_rule[key]
+			});
+		});
+		this.levelInfo = levelInfo;
+	},
+	onShow() { },
+	methods: {
+		headimgError() {
+			this.memberInfo.headimg = this.$util.getDefaultImage().head;
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		openExplainPopup() {
+			this.$refs.explainPopup.open();
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		closeExplainPopup() {
+			this.$refs.explainPopup.close();
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 
-	.banner-container .image-container .slide-image {
-		width: calc(100% - 60rpx);
-		height: 360rpx;
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
-	}
+.banner-container .image-container .slide-image {
+	width: calc(100% - 60rpx);
+	height: 360rpx;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+}
 
-	.banner-container .image-container image {
-		background-color: #e3b66b;
-	}
+.banner-container .image-container image {
+	background-color: #e3b66b;
+}
 
-	.banner-container .slide-image .renew-btn {
-		text-align: center;
-		line-height: 56rpx;
-		height: 56rpx;
-		border-radius: $border-radius;
-		width: 160rpx;
-		font-size: $font-size-tag;
-		color: #e3b66b !important;
-		background: #fff;
-		position: absolute;
-		right: 10rpx;
-		bottom: 40rpx;
-		border: none;
-		z-index: 10;
-	}
+.banner-container .slide-image .renew-btn {
+	text-align: center;
+	line-height: 56rpx;
+	height: 56rpx;
+	border-radius: $border-radius;
+	width: 160rpx;
+	font-size: $font-size-tag;
+	color: #e3b66b !important;
+	background: #fff;
+	position: absolute;
+	right: 10rpx;
+	bottom: 40rpx;
+	border: none;
+	z-index: 10;
+}
 </style>
 
-<style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<style lang="scss" scoped>
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/card_agreement.vue b/pages_tool/member/card_agreement.vue
index aa54a01..b489938 100644
--- a/pages_tool/member/card_agreement.vue
+++ b/pages_tool/member/card_agreement.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 export default {
 	data() {
 		return {
@@ -17,7 +17,7 @@ export default {
 	onLoad() {
 		this.getAgreement();
 	},
-	onShow() {},
+	onShow() { },
 	methods: {
 		getAgreement() {
 			this.$api.sendRequest({
diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue
index 9597f20..8f8f0c7 100644
--- a/pages_tool/member/card_buy.vue
+++ b/pages_tool/member/card_buy.vue
@@ -6,7 +6,8 @@
 			</view>
 			<view class="banner-container">
 				<view class="memberInfo">
-					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+						mode="aspectFill" />
 					<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 					<view class="member-desc">
 						<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
@@ -22,26 +23,27 @@
 					:circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
 					:next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish"
 					:current="curIndex">
-					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
+					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''"
+						v-for="(item, i) in levelList" :key="i">
 						<view class="image-container" :class="[
-								curIndex === 0
-									? i === listLen - 1
-										? 'item-left'
-										: i === 1
+							curIndex === 0
+								? i === listLen - 1
+									? 'item-left'
+									: i === 1
 										? 'item-right'
 										: 'item-center'
-									: curIndex === listLen - 1
+								: curIndex === listLen - 1
 									? i === 0
 										? 'item-right'
 										: i === listLen - 2
-										? 'item-left'
-										: 'item-center'
+											? 'item-left'
+											: 'item-center'
 									: i === curIndex - 1
-									? 'item-left'
-									: i === curIndex + 1
-									? 'item-right'
-									: 'item-center'
-							]">
+										? 'item-left'
+										: i === curIndex + 1
+											? 'item-right'
+											: 'item-center'
+						]">
 							<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat"
 								:style="{
 									transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
@@ -50,14 +52,19 @@
 								}">
 								<view class="bg-border"></view>
 
-								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-								<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']"
+									:src="$util.img(levelList[curIndex]['level_picture'])" />
+								<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
 
 								<view class="info">
-									<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}</view>
-									<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}可享受消费折扣和</view>
-									<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">会员大礼包等权益</view>
-									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelList[curIndex].remark != ''">
+									<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										{{ levelList[curIndex].level_name }}</view>
+									<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
+										levelList[curIndex].level_name }}可享受消费折扣和</view>
+									<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										会员大礼包等权益</view>
+									<view class="growth-rules font-size-tag" @click="openExplainPopup"
+										v-if="levelList[curIndex].remark != ''">
 										<text class="iconfont icon-wenhao font-size-tag"></text>
 									</view>
 								</view>
@@ -78,8 +85,10 @@
 						<view class="clear"></view>
 					</view>
 					<view class="card-time-list">
-						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }" v-for="(item, index) in currCard.charge_rule_arr" :key="index">
-							<view class="card-time-item" :class="{ active: choiceIndex == index }" @click="choice(index)">
+						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }"
+							v-for="(item, index) in currCard.charge_rule_arr" :key="index">
+							<view class="card-time-item" :class="{ active: choiceIndex == index }"
+								@click="choice(index)">
 								<image :src="$util.img('public/uniapp/level/card-icon.png')" mode="widthFix"></image>
 								<view class="time-name">{{ cardType[item.key].name }}</view>
 								<view class="time-price">
@@ -172,7 +181,8 @@
 						</view>
 						<view class="agreement" v-if="agreement">
 							购买既视为同意
-							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title }}》</text>
+							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title
+								}}》</text>
 						</view>
 					</view>
 				</block>
@@ -198,7 +208,8 @@
 				</uni-popup>
 			</view>
 
-			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value" @confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
+			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value"
+				@confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
 		</block>
 		<block v-else><ns-empty text="暂无可开会员卡" :isIndex="false"></ns-empty></block>
 
@@ -209,221 +220,216 @@
 </template>
 
 <script>
-	import scroll from '@/common/js/scroll-view.js';
-import uniPopup from '@/components/uni-popup/uni-popup.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 nsPayment from '@/components/ns-payment/ns-payment.vue';
+import scroll from '@/common/js/scroll-view.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsEmpty,
-			nsLogin,
-			loadingCover,
-			nsPayment
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				isSub: false, // 是否已提交
-				isIphoneX: false,
-				couponPopList: [],
-				curIndex: 0,
-				isDescAnimating: false,
-				scaleX: (634 / 540).toFixed(4),
-				scaleY: (378 / 330).toFixed(4),
-				swiperConfig: {
-					indicatorDots: false,
-					indicatorColor: 'rgba(255, 255, 255, .4)',
-					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-					interval: 3000,
-					duration: 300,
-					circular: false,
-					previousMargin: '58rpx',
-					nextMargin: '58rpx'
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsPayment: () => import('@/components/ns-payment/ns-payment.vue')
+	},
+	mixins: [scroll],
+	data() {
+		return {
+			isSub: false, // 是否已提交
+			isIphoneX: false,
+			couponPopList: [],
+			curIndex: 0,
+			isDescAnimating: false,
+			scaleX: (634 / 540).toFixed(4),
+			scaleY: (378 / 330).toFixed(4),
+			swiperConfig: {
+				indicatorDots: false,
+				indicatorColor: 'rgba(255, 255, 255, .4)',
+				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+				interval: 3000,
+				duration: 300,
+				circular: false,
+				previousMargin: '58rpx',
+				nextMargin: '58rpx'
+			},
+			levelList: [],
+			levelId: 0,
+			cardType: {
+				week: {
+					name: '周卡',
+					unit: '周'
 				},
-				levelList: [],
-				levelId: 0,
-				cardType: {
-					week: {
-						name: '周卡',
-						unit: '周'
-					},
-					month: {
-						name: '月卡',
-						unit: '月'
-					},
-					quarter: {
-						name: '季卡',
-						unit: '季'
-					},
-					year: {
-						name: '年卡',
-						unit: '年'
-					}
+				month: {
+					name: '月卡',
+					unit: '月'
 				},
-				choiceIndex: 0,
-				outTradeNo: '',
-				agreement: null
-			};
-		},
-		computed: {
-			listLen() {
-				return this.levelList.length;
+				quarter: {
+					name: '季卡',
+					unit: '季'
+				},
+				year: {
+					name: '年卡',
+					unit: '年'
+				}
 			},
-			currCard() {
-				if (this.levelList[this.curIndex]) {
-					let card = this.levelList[this.curIndex];
-					let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
-					card.charge_rule_arr = [];
-					Object.keys(charge_rule).forEach(key => {
-						card.charge_rule_arr.push({
-							key: key,
-							value: charge_rule[key]
-						});
+			choiceIndex: 0,
+			outTradeNo: '',
+			agreement: null
+		};
+	},
+	computed: {
+		listLen() {
+			return this.levelList.length;
+		},
+		currCard() {
+			if (this.levelList[this.curIndex]) {
+				let card = this.levelList[this.curIndex];
+				let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
+				card.charge_rule_arr = [];
+				Object.keys(charge_rule).forEach(key => {
+					card.charge_rule_arr.push({
+						key: key,
+						value: charge_rule[key]
 					});
-					return card;
-				}
-			}
-		},
-		onLoad() {
-			//会员卡
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-			if (this.storeToken) {
-				this.getCardList();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/card_buy');
 				});
+				return card;
 			}
-			this.getAgreement();
-		},
-		onShow() {},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getCardList();
-				}
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				this.curIndex = e.detail.current;
-				this.choiceIndex = 0;
-				this.isDescAnimating = true;
-			},
-			animationfinish(e) {
-				this.isDescAnimating = false;
-			},
-			getCardList() {
-				this.$api.sendRequest({
-					url: '/supermember/api/membercard/lists',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.levelList = res.data;
-							this.levelId = this.memberInfo.member_level;
-							for (let i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].level_id == this.levelId) {
-									this.curIndex = i;
-									break;
-								}
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			choice(index) {
-				this.choiceIndex = index;
-			},
-			/**
-			 * 创建
-			 */
-			create() {
-				if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
-					uni.showModal({
-						title: '提示',
-						content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
-						success: res => {
-							if (res.confirm) {
-								this.$refs.choosePaymentPopup.open();
-							}
-						}
-					});
-				} else {
-					this.$refs.choosePaymentPopup.open();
-				}
-			},
-			/**
-			 * 提交
-			 */
-			toPay() {
-				if (this.isSub) return;
-				this.isSub = true;
-
-				this.$api.sendRequest({
-					url: '/supermember/api/ordercreate/create',
-					data: {
-						level_id: this.currCard.level_id,
-						period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
-					},
-					success: res => {
-						if (res.data && res.code == 0) {
-							this.outTradeNo = res.data.out_trade_no;
-							uni.setStorageSync('paySource', 'membercard');
-							this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-						} else {
-							this.isSub = false;
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			headimgError() {
-				this.memberInfo.headimg = this.$util.getDefaultImage().head;
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			openExplainPopup() {
-				this.$refs.explainPopup.open();
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			closeExplainPopup() {
-				this.$refs.explainPopup.close();
-			},
-			getAgreement() {
-				this.$api.sendRequest({
-					url: '/supermember/api/membercard/agreement',
-					success: res => {
-						if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
-							this.agreement = res.data;
-						}
-					}
-				});
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index');
-			return true;
 		}
-	};
+	},
+	onLoad() {
+		//会员卡
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (this.storeToken) {
+			this.getCardList();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/card_buy');
+			});
+		}
+		this.getAgreement();
+	},
+	onShow() { },
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.getCardList();
+			}
+		}
+	},
+	methods: {
+		swiperChange(e) {
+			this.curIndex = e.detail.current;
+			this.choiceIndex = 0;
+			this.isDescAnimating = true;
+		},
+		animationfinish(e) {
+			this.isDescAnimating = false;
+		},
+		getCardList() {
+			this.$api.sendRequest({
+				url: '/supermember/api/membercard/lists',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.levelList = res.data;
+						this.levelId = this.memberInfo.member_level;
+						for (let i = 0; i < this.levelList.length; i++) {
+							if (this.levelList[i].level_id == this.levelId) {
+								this.curIndex = i;
+								break;
+							}
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		choice(index) {
+			this.choiceIndex = index;
+		},
+		/**
+		 * 创建
+		 */
+		create() {
+			if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
+				uni.showModal({
+					title: '提示',
+					content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.choosePaymentPopup.open();
+						}
+					}
+				});
+			} else {
+				this.$refs.choosePaymentPopup.open();
+			}
+		},
+		/**
+		 * 提交
+		 */
+		toPay() {
+			if (this.isSub) return;
+			this.isSub = true;
+
+			this.$api.sendRequest({
+				url: '/supermember/api/ordercreate/create',
+				data: {
+					level_id: this.currCard.level_id,
+					period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
+				},
+				success: res => {
+					if (res.data && res.code == 0) {
+						this.outTradeNo = res.data.out_trade_no;
+						uni.setStorageSync('paySource', 'membercard');
+						this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+					} else {
+						this.isSub = false;
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		headimgError() {
+			this.memberInfo.headimg = this.$util.getDefaultImage().head;
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		openExplainPopup() {
+			this.$refs.explainPopup.open();
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		closeExplainPopup() {
+			this.$refs.explainPopup.close();
+		},
+		getAgreement() {
+			this.$api.sendRequest({
+				url: '/supermember/api/membercard/agreement',
+				success: res => {
+					if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
+						this.agreement = res.data;
+					}
+				}
+			});
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index 5153e8b..5800ebb 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -1,19 +1,24 @@
 <template>
 	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh"
+			v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<block v-if="collectionList.length > 0">
-					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index" @click.stop="toDetail(item)">
+					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index"
+						@click.stop="toDetail(item)">
 						<view class="pic">
-							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill" @error="goodsImageError(index)"></image>
+							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill"
+								@error="goodsImageError(index)"></image>
 						</view>
 						<view class="goods_info">
 							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
 							<view class="goods_opection">
 								<view class="left  lineheight-clear ">
 									<text class="symbol price-style small">￥</text>
-									<text class="price price-style large">{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
-									<text class="symbol price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
+									<text class="symbol price-style small">.{{
+										parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="right">
 									<view class="cars" @click.stop="deleteItem(item.goods_id)">
@@ -35,65 +40,57 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 import collection from './public/js/collection.js';
 
 export default {
 	components: {
-		nsGoodsRecommend,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
 		// #endif
 	},
-		mixins: [collection],
-		data() {
-			return {};
-		},
-		onShow() {
-			if (this.storeToken) {
-				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/collection');
-				});
-			}
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
-				}
+	mixins: [collection],
+	data() {
+		return {};
+	},
+	onShow() {
+		if (this.storeToken) {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/collection');
+			});
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
-	}
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
 
-	/deep/ .empty {
-		margin-top: 0 !important;
-	}
+/deep/ .empty {
+	margin-top: 0 !important;
+}
 
-	@import './public/css/collection.scss';
+@import './public/css/collection.scss';
 </style>
 
-<style  lang="scss" scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<style lang="scss" scoped>
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/contact.vue b/pages_tool/member/contact.vue
index 3ef3863..f10d1b5 100644
--- a/pages_tool/member/contact.vue
+++ b/pages_tool/member/contact.vue
@@ -10,8 +10,8 @@ export default {
 	data() {
 		return {};
 	},
-	onLoad(options) {},
-	onShow() {},
+	onLoad(options) { },
+	onShow() { },
 	methods: {}
 };
 </script>
@@ -21,6 +21,7 @@ export default {
 	width: 80%;
 	text-align: center;
 	margin: 0 auto;
+
 	image {
 		width: 500rpx;
 	}
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
index 660888b..60efffe 100644
--- a/pages_tool/member/coupon.vue
+++ b/pages_tool/member/coupon.vue
@@ -2,9 +2,12 @@
 	<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
 		<view class="cf-container color-line-border" v-if="storeToken">
 			<view class="tab">
-				<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
-				<view @click="changeState(2)"><text :class="state == 2 ? 'color-base-text active color-base-border-bottom' : ''">已使用</text></view>
-				<view @click="changeState(3)"><text :class="state == 3 ? 'color-base-text active color-base-border-bottom' : ''">已过期</text></view>
+				<view @click="changeState(1)"><text
+						:class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
+				<view @click="changeState(2)"><text
+						:class="state == 2 ? 'color-base-text active color-base-border-bottom' : ''">已使用</text></view>
+				<view @click="changeState(3)"><text
+						:class="state == 3 ? 'color-base-text active color-base-border-bottom' : ''">已过期</text></view>
 			</view>
 			<!-- <view class="coupon-head">
 				<view class="sort" :class="sort == 1 ? 'color-base-border color-base-text' : ''" @click="changeSort(1, '')">全部</view>
@@ -17,9 +20,12 @@
 		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCounponList" v-if="storeToken">
 			<block slot="list">
 				<view class="coupon-listone">
-					<view class="item" :class="['item',item.state != 1&&'item-disabled']" v-for="(item, index) in list" :key="index" @click="toGoodsList(item)" :style="{ backgroundColor: item.state != 1 ? '#FFF' : 'var(--main-color-shallow)' }">
+					<view class="item" :class="['item', item.state != 1 && 'item-disabled']" v-for="(item, index) in list"
+						:key="index" @click="toGoodsList(item)"
+						:style="{ backgroundColor: item.state != 1 ? '#FFF' : 'var(--main-color-shallow)' }">
 						<view class="item-base">
-							<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>
 								<view class="use_price " v-if="item.type == 'divideticket'">
 									<text>￥</text>
@@ -41,10 +47,13 @@
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.state == 3 }">指定商品</view>
-								<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit }}元)</view>
-								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
-							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3"
+									:class="{ disabled: item.state == 3 }">指定商品</view>
+								<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit
+									}}元)</view>
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{
+									item.use_channel_name }}</view>
+								<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
 								</view> -->
 							</view>
@@ -60,7 +69,8 @@
 					</view>
 				</view>
 				<view v-if="!list.length && showEmpty" class="margin-top cart-empty" :fixed="false">
-					<ns-empty :isIndex="true" :emptyBtn="{url: '/pages/index/index',text: '去逛逛'}" text="暂无优惠券"></ns-empty>
+					<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages/index/index', text: '去逛逛' }"
+						text="暂无优惠券"></ns-empty>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -70,347 +80,342 @@
 </template>
 
 <script>
-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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
+
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
 		// #endif
 	},
 	data() {
-			return {
-				type: '',
-				types: '',
-				state: 1,
-				sort: 1,
-				list: [],
-				isIphoneX: false, //判断手机是否是iphoneX以上
-				showEmpty: false,
-				related_id: 0
-			};
-		},
-		onLoad(data) {
-			setTimeout( () => {
-				if (!this.addonIsExist.coupon) {
-					this.$util.showToast({
-						title: '商家未开启优惠券',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
-				}
-			},1000);
+		return {
+			type: '',
+			types: '',
+			state: 1,
+			sort: 1,
+			list: [],
+			isIphoneX: false, //判断手机是否是iphoneX以上
+			showEmpty: false,
+			related_id: 0
+		};
+	},
+	onLoad(data) {
+		setTimeout(() => {
+			if (!this.addonIsExist.coupon) {
+				this.$util.showToast({
+					title: '商家未开启优惠券',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
 
-			if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+	},
+	onShow() {
+		if (this.storeToken) {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/coupon');
+			});
+		}
+	},
+	methods: {
+		//切换状态
+		changeState(state) {
+			this.list = [];
+			this.state = state;
+			this.$refs.mescroll.refresh(false);
 		},
-		onShow() {
-			if (this.storeToken) {
-				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/coupon');
-				});
-			}
+		changeSort(sort, types) {
+			this.list = [];
+			this.sort = sort;
+			this.types = types;
+			this.$refs.mescroll.refresh(false);
 		},
-		methods: {
-			//切换状态
-			changeState(state) {
-				this.list = [];
-				this.state = state;
-				this.$refs.mescroll.refresh(false);
-			},
-			changeSort(sort, types) {
-				this.list = [];
-				this.sort = sort;
-				this.types = types;
-				this.$refs.mescroll.refresh(false);
-			},
-			getMemberCounponList(mescroll) {
-				this.showEmpty = false;
-				this.$api.sendRequest({
-					url: '/coupon/api/coupon/memberpage',
-					data: {
-						page: mescroll.num,
-						page_size: mescroll.size,
-						state: this.state,
-						is_own: this.type,
-						type: this.types,
-						related_id: this.related_id
-					},
-					success: res => {
-						this.showEmpty = 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.related_id = 0;
-						}
-						this.list = this.list.concat(newArr); //追加新数据
-						let data = res.data;
-						if (data) this.couponList = data;
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+		getMemberCounponList(mescroll) {
+			this.showEmpty = false;
+			this.$api.sendRequest({
+				url: '/coupon/api/coupon/memberpage',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					state: this.state,
+					is_own: this.type,
+					type: this.types,
+					related_id: this.related_id
+				},
+				success: res => {
+					this.showEmpty = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
 					}
-				});
-			},
-			imageError(index) {
-				this.list[index].logo = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			toGoodsList(item) {
-				if (item.state == 1) {
-					this.$util.redirectTo('/pages_goods/list', {
-						coupon: item.coupon_type_id
-					});
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) {
+						this.list = []; //如果是第一页需手动制空列表
+						this.related_id = 0;
+					}
+					this.list = this.list.concat(newArr); //追加新数据
+					let data = res.data;
+					if (data) this.couponList = data;
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				}
-			}
+			});
 		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
-				}
+		imageError(index) {
+			this.list[index].logo = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		toGoodsList(item) {
+			if (item.state == 1) {
+				this.$util.redirectTo('/pages_goods/list', {
+					coupon: item.coupon_type_id
+				});
 			}
 		}
-	};
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.cart-empty {
-		margin-top: 208rpx !important;
+.cart-empty {
+	margin-top: 208rpx !important;
+}
+
+.active {
+	border-bottom: 4rpx solid;
+}
+
+.coupon-head {
+	display: flex;
+	background: #fff;
+	padding: 20rpx 50rpx;
+
+	.sort {
+		border: 2rpx solid #c5c5c5;
+		padding: 1rpx 20rpx;
+		border-radius: 10rpx;
+		cursor: pointer;
+		margin-right: 15rpx;
 	}
+}
 
-	.active {
-		border-bottom: 4rpx solid;
-	}
+.cf-container {
+	background: #fff;
+	overflow: hidden;
+}
 
-	.coupon-head {
-		display: flex;
-		background: #fff;
-		padding: 20rpx 50rpx;
+.tab {
+	display: flex;
+	justify-content: space-between;
+	height: 86rpx;
 
-		.sort {
-			border: 2rpx solid #c5c5c5;
-			padding: 1rpx 20rpx;
-			border-radius: 10rpx;
-			cursor: pointer;
-			margin-right: 15rpx;
-		}
-	}
-
-	.cf-container {
-		background: #fff;
-		overflow: hidden;
-	}
-
-	.tab {
-		display: flex;
-		justify-content: space-between;
+	>view {
+		text-align: center;
+		width: 33%;
 		height: 86rpx;
 
-		>view {
-			text-align: center;
-			width: 33%;
-			height: 86rpx;
-
-			text {
-				display: inline-block;
-				line-height: 86rpx;
-				height: 80rpx;
-				font-size: 30rpx;
-			}
+		text {
+			display: inline-block;
+			line-height: 86rpx;
+			height: 80rpx;
+			font-size: 30rpx;
 		}
 	}
+}
 
-	.coupon-listone {
-		margin: 0 30rpx;
+.coupon-listone {
+	margin: 0 30rpx;
 
-		.item {
-			display: flex;
-			background-color: #fff2f0;
+	.item {
+		display: flex;
+		background-color: #fff2f0;
+		background-size: 100% 100%;
+		border-radius: 20rpx;
+		align-items: stretch;
+		margin-top: $padding;
+		overflow: hidden;
+
+		&.item-disabled {
+			.item-base {
+				background: #e7e7e7 !important;
+			}
+		}
+
+		.item-base {
+			position: relative;
+			width: 197rpx;
+			min-width: 197rpx;
+			text-align: center;
+			background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+			background-repeat: no-repeat;
 			background-size: 100% 100%;
-			border-radius: 20rpx;
-			align-items: stretch;
-			margin-top: $padding;
-			overflow: hidden;
+			padding: 38rpx 10rpx 38rpx 18rpx;
 
-			&.item-disabled {
-				.item-base {
-					background: #e7e7e7 !important;
-				}
+			&.disabled {
+				background: #dedede;
 			}
 
-			.item-base {
+			.coupon-line {
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 100%;
+			}
+
+			>view {
+				width: calc(100%);
+				height: auto;
 				position: relative;
-				width: 197rpx;
-				min-width: 197rpx;
-				text-align: center;
-				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
-				background-repeat: no-repeat;
-				background-size: 100% 100%;
-				padding: 38rpx 10rpx 38rpx 18rpx;
+				top: 50%;
+				transform: translate(0, -50%);
+			}
+
+			.use_price {
+				font-size: 60rpx;
+				line-height: 1;
+				color: #fff;
+
+				text {
+					font-size: $font-size-toolbar;
+				}
 
 				&.disabled {
-					background: #dedede;
-				}
-
-				.coupon-line {
-					position: absolute;
-					right: 0;
-					top: 0;
-					height: 100%;
-				}
-
-				>view {
-					width: calc(100%);
-					height: auto;
-					position: relative;
-					top: 50%;
-					transform: translate(0, -50%);
-				}
-
-				.use_price {
-					font-size: 60rpx;
-					line-height: 1;
-					color: #fff;
-
-					text {
-						font-size: $font-size-toolbar;
-					}
-
-					&.disabled {
-						color: $color-tip;
-					}
-				}
-
-				.use_condition {
-					color: #fff;
-					margin-top: $padding;
-
-					&.margin_top_none {
-						margin-top: 0;
-					}
-
-					&.disabled {
-						color: $color-tip;
-					}
-				}
-
-				&::after {
-					position: absolute;
-					content: '';
-					background-color: #f8f8f8;
-					left: 0;
-					top: 50%;
-					transform: translate(0, -50%);
-					height: 30rpx;
-					width: 15rpx;
-					border-radius: 0 30rpx 30rpx 0;
+					color: $color-tip;
 				}
 			}
 
-			.item-btn {
-				position: relative;
-				width: 160rpx;
-				min-width: 160rpx;
-				align-self: center;
+			.use_condition {
+				color: #fff;
+				margin-top: $padding;
 
-				view {
-					width: 100rpx;
-					height: 50rpx;
-					border-radius: $border-radius;
-					line-height: 50rpx;
-					margin: auto;
-					text-align: center;
-					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
-					color: var(--btn-text-color);
-					;
+				&.margin_top_none {
+					margin-top: 0;
+				}
+
+				&.disabled {
+					color: $color-tip;
+				}
+			}
+
+			&::after {
+				position: absolute;
+				content: '';
+				background-color: #f8f8f8;
+				left: 0;
+				top: 50%;
+				transform: translate(0, -50%);
+				height: 30rpx;
+				width: 15rpx;
+				border-radius: 0 30rpx 30rpx 0;
+			}
+		}
+
+		.item-btn {
+			position: relative;
+			width: 160rpx;
+			min-width: 160rpx;
+			align-self: center;
+
+			view {
+				width: 100rpx;
+				height: 50rpx;
+				border-radius: $border-radius;
+				line-height: 50rpx;
+				margin: auto;
+				text-align: center;
+				background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+				color: var(--btn-text-color);
+				;
+				font-size: $font-size-tag;
+
+				&.disabled {
+					background: $color-line !important;
+					color: $color-tip !important;
+				}
+			}
+
+			&::after {
+				position: absolute;
+				content: '';
+				background-color: #f8f8f8;
+				right: 0;
+				top: 50%;
+				transform: translate(0, -50%);
+				height: 30rpx;
+				width: 15rpx;
+				border-radius: 30rpx 0 0 30rpx;
+			}
+		}
+
+		.item-info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			margin-left: $padding;
+			overflow: hidden;
+			background-repeat-x: no-repeat;
+			background-repeat-y: repeat;
+
+			.use_time {
+				padding: $padding 0;
+				border-top: 2rpx dashed #cccccc;
+				font-size: $font-size-activity-tag;
+				color: #909399;
+			}
+
+			.use_title {
+				font-size: $font-size-base;
+				font-weight: 500;
+				padding: $padding 0;
+
+				.title {
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+				.max_price {
+					font-weight: 400;
 					font-size: $font-size-tag;
-
-					&.disabled {
-						background: $color-line !important;
-						color: $color-tip !important;
-					}
-				}
-
-				&::after {
-					position: absolute;
-					content: '';
-					background-color: #f8f8f8;
-					right: 0;
-					top: 50%;
-					transform: translate(0, -50%);
-					height: 30rpx;
-					width: 15rpx;
-					border-radius: 30rpx 0 0 30rpx;
-				}
-			}
-
-			.item-info {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				margin-left: $padding;
-				overflow: hidden;
-				background-repeat-x: no-repeat;
-				background-repeat-y: repeat;
-
-				.use_time {
-					padding: $padding 0;
-					border-top: 2rpx dashed #cccccc;
-					font-size: $font-size-activity-tag;
-					color: #909399;
-				}
-
-				.use_title {
-					font-size: $font-size-base;
-					font-weight: 500;
-					padding: $padding 0;
-
-					.title {
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-					}
-
-					.max_price {
-						font-weight: 400;
-						font-size: $font-size-tag;
-					}
 				}
 			}
 		}
 	}
-	.truncate {
-		overflow: hidden;
-		-o-text-overflow: ellipsis;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+}
+
+.truncate {
+	overflow: hidden;
+	-o-text-overflow: ellipsis;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
index 4cf5824..f31e808 100644
--- a/pages_tool/member/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -10,11 +10,14 @@
 						<view class="datetime">{{ datetime(item) }}</view>
 						<view class="goods-item" :class="{ manage: manage }">
 							<view class="checkbox-wrap" v-if="manage" @click="singleElection(item)">
-								<text class="iconfont" :class="$util.inArray(item.id, idArr) != -1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
+								<text class="iconfont"
+									:class="$util.inArray(item.id, idArr) != -1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
 							</view>
 							<view class="goods-img" @click="toDetail(item)">
-								<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>
+								<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>
 							<view class="info-wrap" @click="toDetail(item)">
 								<view class="name-wrap">
@@ -24,22 +27,28 @@
 								<view class="lineheight-clear">
 									<view class="discount-price">
 										<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="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">
-										<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
+										<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix">
+										</image>
 									</view>
 								</view>
 								<view class="pro-info">
-									<view class="delete-price font-size-activity-tag color-tip price-font" v-if="showMarketPrice(item)">
+									<view class="delete-price font-size-activity-tag color-tip price-font"
+										v-if="showMarketPrice(item)">
 										<text class="unit">{{ $lang('common.currencySymbol') }}</text>
 										<text>{{ showMarketPrice(item) }}</text>
 									</view>
-									<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{
+										item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
 								</view>
 							</view>
 						</view>
@@ -49,10 +58,12 @@
 
 				<view class="bottom-wrap" v-if="goodsList.length && manage">
 					<view class="all-election" @click="allElection">
-						<view class="iconfont" :class="isAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+						<view class="iconfont"
+							:class="isAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 						<text>全选</text>
 					</view>
-					<view class="action-btn"><button type="primary" @click="deleteFootprint()" class="delete" :class="{ disabled: selected }">删除</button></view>
+					<view class="action-btn"><button type="primary" @click="deleteFootprint()" class="delete"
+							:class="{ disabled: selected }">删除</button></view>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -64,22 +75,15 @@
 
 <script>
 var dateList = [];
-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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
 		// #endif
 	},
 	data() {
@@ -179,8 +183,8 @@ export default {
 			let imgs = imgStr.split(',');
 			return imgs[0]
 				? this.$util.img(imgs[0], {
-						size: 'mid'
-				  })
+					size: 'mid'
+				})
 				: this.$util.getDefaultImage().goods;
 		},
 		imgError(index) {
@@ -250,7 +254,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
diff --git a/pages_tool/member/index.vue b/pages_tool/member/index.vue
index 1cabd7f..a7eee29 100644
--- a/pages_tool/member/index.vue
+++ b/pages_tool/member/index.vue
@@ -29,7 +29,7 @@
 				<!-- 退出登录和账号注销按钮 -->
 				<view class="action-buttons" v-if="storeToken">
 					<view class="action-btn cancel-btn" @click="cancellation">{{ $lang('cancellation') }}</view>
-					<view class="action-btn logout-btn" @click="logout">{{ $lang('logout') }}</view>					
+					<view class="action-btn logout-btn" @click="logout">{{ $lang('logout') }}</view>
 				</view>
 			</view>
 
@@ -74,15 +74,25 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+
 import diyJs from '@/common/js/diy.js';
 import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		uniPopup,
-		nsNavbar
+		diyGroup: () => import('@/components-diy/diy-group.vue'),
+		diyBottomNav: () => import('@/components-diy/diy-bottom-nav.vue'),
+
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
+		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
+		nsBirthdayGift: () => import('@/components/ns-birthday-gift/ns-birthday-gift.vue'),
+		nsNewGift: () => import('@/components/ns-new-gift/ns-new-gift.vue'),
+		hoverNav: () => import('@/components/hover-nav/hover-nav.vue'),
+
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
 	},
 	mixins: [diyJs, indexJs],
 	methods: {
@@ -156,7 +166,6 @@ export default {
 		color: #F4391c
 	}
 }
-
 </style>
 
 <style scoped>
@@ -164,33 +173,14 @@ export default {
 	background: none !important;
 }
 
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-	border-radius: 0;
-}
-
 .choose-store>>>.goodslist-uni-popup-box {
 	width: 80%;
 }
 
-/deep/ .placeholder {
-	height: 0;
-}
-
-/deep/::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	background-color: transparent;
-	display: none;
-}
-
 .hide {
 	display: none;
 }
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-
 .action-buttons {
 	display: flex;
 	flex-direction: column;
@@ -216,7 +206,28 @@ export default {
 }
 
 .cancel-btn {
-	background-color:var(--main-color);
+	background-color: var(--main-color);
 	color: #fff;
 }
-</style>
\ No newline at end of file
+</style>
+
+<style lang="scss" scoped>
+/deep/ .diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
+
+/deep/ .placeholder {
+	height: 0;
+}
+
+/deep/::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
+
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+</style>
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
index 844b6ae..4d156d6 100644
--- a/pages_tool/member/info.vue
+++ b/pages_tool/member/info.vue
@@ -2,21 +2,22 @@
 	<view :style="themeColor">
 		<view v-if="indent == 'all' && memberInfo" class="info-wrap">
 			<!-- 头像@click="headImage" -->
-			<view  class="info-list-cell info-item info-list-con" hover-class="cell-hover">
+			<view class="info-list-cell info-item info-list-con" hover-class="cell-hover">
 				<text class="cell-tit">头像</text>
 				<view class="info-list-head cell-tip">
-					<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
+					<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head"
+						@error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 				</view>
 				<text style="margin-right: 20rpx;"></text>
 			</view>
 			<!-- 账号 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
+			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
 				<text class="cell-tit">账号</text>
 				<text class="cell-tip">{{ memberInfoformData.number }}</text>
 				<text class="cell-more"></text>
 			</view> -->
 			<!-- 账号 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
+			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
 				<text class="cell-tit">{{ $lang('account') }}</text>
 				<text class="cell-tip cell-tip1">{{ memberInfoformData.number }}</text>
 			</view> -->
@@ -52,7 +53,7 @@
 				<text class="cell-more"></text>
 			</view>
 			<!-- 密码 -->
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
+			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
 				<text class="cell-tit">密码</text>
 				<text class="cell-more"></text>
 			</view> -->
@@ -62,7 +63,7 @@
 				<text class="cell-more"></text>
 			</view> -->
 
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
+			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
 				<text class="cell-tit">所在地址</text>
 				<text class="cell-tip" v-if="memberInfo.full_address">{{ memberInfo.full_address }}
 					{{ memberInfo.address }}</text>
@@ -75,11 +76,11 @@
 				<text class="cell-tit">注销账号</text>
 				<text class="cell-more"></text>
 			</view>
-		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
+			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
 				<text class="cell-tit">注销账号</text>
 				<text class="cell-more"></text>
 			</view> -->
-	<!-- 		<view class="info-list-cell info-list-con" hover-class="cell-hover">
+			<!-- 		<view class="info-list-cell info-list-con" hover-class="cell-hover">
 				<text class="cell-tit">版本号</text>
 				<text class="cell-tip cell-tip1">{{ version }}</text>
 			</view> -->
@@ -107,227 +108,227 @@
 </template>
 
 <script>
-	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
-	import info from './public/js/info.js';
+import info from './public/js/info.js';
 
-	export default {
-		components: {
-			uniNavBar
-		},
-		data() {
-			return {
-				version: ''
-			};
-		},
-		mixins: [info],
-		onLoad(data) {
-			this.version = this.$config.version;
-		},
-	};
+export default {
+	components: {
+		uniNavBar: () => import('@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
+	data() {
+		return {
+			version: ''
+		};
+	},
+	mixins: [info],
+	onLoad(data) {
+		this.version = this.$config.version;
+	},
+};
 </script>
 
 <style lang="scss">
-	.info-head {
-		.head-nav {
-			width: 100%;
-			height: var(--status-bar-height);
-			background: #ffffff;
-		}
-
-		.head-nav.active {
-			padding-top: 40rpx;
-		}
+.info-head {
+	.head-nav {
+		width: 100%;
+		height: var(--status-bar-height);
+		background: #ffffff;
 	}
 
-	.captcha {
-		width: 170rpx;
-		height: 50rpx;
+	.head-nav.active {
+		padding-top: 40rpx;
+	}
+}
+
+.captcha {
+	width: 170rpx;
+	height: 50rpx;
+}
+
+.info-list-cell {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 30rpx;
+	position: relative;
+	line-height: 50rpx;
+	background-color: #fff;
+
+	&:first-child {
+		padding: 28rpx 30rpx;
 	}
 
-	.info-list-cell {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx 30rpx;
-		position: relative;
-		line-height: 50rpx;
-		background-color: #fff;
+	.cell-tit {
+		white-space: nowrap;
+	}
 
-		&:first-child {
-			padding: 28rpx 30rpx;
-		}
+	.cell-tip1 {
+		margin-right: 40rpx;
+	}
+
+	&.log-out-btn {
+		margin-top: 40rpx;
 
 		.cell-tit {
-			white-space: nowrap;
+			margin: auto;
+		}
+	}
+
+	.info-list-head {
+		border: 1rpx solid $color-line;
+		width: 82rpx;
+		height: 82rpx;
+		border-radius: 50%;
+	}
+
+	.info-list-head image {
+		max-width: 100%;
+		max-height: 100%;
+	}
+
+	// #ifdef MP
+	&.info-item {
+		margin-top: 16rpx;
+	}
+
+	// #endif
+
+	&.info-list-con~&.info-list-con:after {
+		content: '';
+		position: absolute;
+		left: 30rpx;
+		right: 30rpx;
+		top: 0;
+		border-bottom: 1rpx solid $color-line;
+	}
+
+	.cell-tip {
+		margin-left: auto;
+		color: $color-tip;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		max-width: 470rpx;
+	}
+
+	.cell-more {
+		margin-left: 10rpx;
+		width: 32rpx;
+		height: 100%;
+	}
+
+	.cell-more:after {
+		content: '';
+		display: block;
+		width: 12rpx;
+		height: 12rpx;
+
+		border: 2rpx solid darken($color-line, 20%) {
+			right-color: transparent;
+			bottom-color: transparent;
 		}
 
-		.cell-tip1 {
-			margin-right: 40rpx;
+		transform: rotate(135deg);
+	}
+}
+
+.edit-info-box {
+	margin-top: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 20rpx 40rpx;
+	min-height: 50rpx;
+	background-color: #fff;
+
+	.info-name {
+		width: 150rpx;
+		font-size: $font-size-base;
+		text-align: left;
+	}
+
+	.info-content {
+		width: 0;
+		font-size: $font-size-base;
+		padding: 0;
+		flex: 1;
+	}
+
+	.dynacode {
+		margin: 0;
+		padding: 0 10rpx;
+		width: 250rpx;
+		height: 60rpx;
+		font-size: $font-size-base;
+		line-height: 60rpx;
+		color: #fff;
+		word-break: break-all;
+	}
+
+	.edit-sex-list {
+		display: flex;
+
+		label {
+			display: flex;
+			margin-left: 30rpx;
+			align-items: center;
 		}
+	}
 
-		&.log-out-btn {
-			margin-top: 40rpx;
+	uni-radio .uni-radio-input {
+		width: 32rpx;
+		height: 32rpx;
+	}
+}
 
-			.cell-tit {
-				margin: auto;
-			}
-		}
+.set-pass-tips {
+	padding: 20rpx 20rpx 0 20rpx;
+}
 
-		.info-list-head {
-			border: 1rpx solid $color-line;
-			width: 82rpx;
-			height: 82rpx;
-			border-radius: 50%;
-		}
+.input-len {
+	width: 500rpx !important;
+}
 
-		.info-list-head image {
-			max-width: 100%;
-			max-height: 100%;
-		}
+.save-item {
+	margin: 50rpx auto;
 
-		// #ifdef MP
-		&.info-item {
-			margin-top: 16rpx;
-		}
+	button {
+		font-size: 30rpx;
+	}
+}
 
-		// #endif
+.empty {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: $padding;
+	box-sizing: border-box;
+	justify-content: center;
+	padding-top: 80rpx;
 
-		&.info-list-con~&.info-list-con:after {
-			content: '';
-			position: absolute;
-			left: 30rpx;
-			right: 30rpx;
-			top: 0;
-			border-bottom: 1rpx solid $color-line;
-		}
+	.empty_img {
+		width: 63%;
+		height: 450rpx;
 
-		.cell-tip {
-			margin-left: auto;
-			color: $color-tip;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			max-width: 470rpx;
-		}
-
-		.cell-more {
-			margin-left: 10rpx;
-			width: 32rpx;
+		image {
+			width: 100%;
 			height: 100%;
 		}
-
-		.cell-more:after {
-			content: '';
-			display: block;
-			width: 12rpx;
-			height: 12rpx;
-
-			border: 2rpx solid darken($color-line, 20%) {
-				right-color: transparent;
-				bottom-color: transparent;
-			}
-
-			transform: rotate(135deg);
-		}
 	}
 
-	.edit-info-box {
-		margin-top: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx 40rpx;
-		min-height: 50rpx;
-		background-color: #fff;
-
-		.info-name {
-			width: 150rpx;
-			font-size: $font-size-base;
-			text-align: left;
-		}
-
-		.info-content {
-			width: 0;
-			font-size: $font-size-base;
-			padding: 0;
-			flex: 1;
-		}
-
-		.dynacode {
-			margin: 0;
-			padding: 0 10rpx;
-			width: 250rpx;
-			height: 60rpx;
-			font-size: $font-size-base;
-			line-height: 60rpx;
-			color: #fff;
-			word-break: break-all;
-		}
-
-		.edit-sex-list {
-			display: flex;
-
-			label {
-				display: flex;
-				margin-left: 30rpx;
-				align-items: center;
-			}
-		}
-
-		uni-radio .uni-radio-input {
-			width: 32rpx;
-			height: 32rpx;
-		}
+	.iconfont {
+		font-size: 190rpx;
+		color: $color-tip;
+		line-height: 1.2;
 	}
 
-	.set-pass-tips {
-		padding: 20rpx 20rpx 0 20rpx;
-	}
-
-	.input-len {
-		width: 500rpx !important;
-	}
-
-	.save-item {
-		margin: 50rpx auto;
-
-		button {
-			font-size: 30rpx;
-		}
-	}
-
-	.empty {
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: $padding;
-		box-sizing: border-box;
-		justify-content: center;
-		padding-top: 80rpx;
-
-		.empty_img {
-			width: 63%;
-			height: 450rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.iconfont {
-			font-size: 190rpx;
-			color: $color-tip;
-			line-height: 1.2;
-		}
-
-		button {
-			min-width: 300rpx;
-			margin-top: 100rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			font-size: $font-size-base;
-		}
+	button {
+		min-width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: $font-size-base;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index 6a64810..ac1a93c 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -5,7 +5,8 @@
 			<view v-if="indent == 'username'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">用户名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.username" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
+						v-model="formData.username" />
 				</view>
 				<view class="color-tip font-size-goods-tag set-pass-tips">用户名仅可修改一次，请谨慎设置</view>
 				<view class="save-item" @click="save('username')">
@@ -16,7 +17,8 @@
 			<view v-if="indent == 'name'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">昵称</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.nickName" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
+						v-model="formData.nickName" />
 				</view>
 				<view class="save-item" @click="save('name')">
 					<button type="primary">保存</button>
@@ -26,7 +28,8 @@
 			<view v-if="indent == 'realName'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">姓名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.realName" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
+						v-model="formData.realName" />
 				</view>
 				<view class="save-item" @click="save('realName')">
 					<button type="primary">保存</button>
@@ -39,7 +42,8 @@
 					<radio-group @change="radioChange" class="edit-sex-list">
 						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
 							<view>
-								<radio :color="themeStyle.main_color" :value="item.value" :checked="index === formData.sex" />
+								<radio :color="themeStyle.main_color" :value="item.value"
+									:checked="index === formData.sex" />
 							</view>
 							<view>{{ item.name }}</view>
 						</label>
@@ -53,7 +57,8 @@
 			<view v-if="indent == 'birthday'" class="edit-info edit-birthday-list">
 				<view class="edit-info-box">
 					<text class="info-name">生日</text>
-					<picker mode="date" :value="formData.birthday" :start="startDate" :end="endDate" @change="bindDateChange">
+					<picker mode="date" :value="formData.birthday" :start="startDate" :end="endDate"
+						@change="bindDateChange">
 						<view class="uni-input">{{ formData.birthday ? formData.birthday : '请选择生日' }}</view>
 					</picker>
 				</view>
@@ -69,35 +74,42 @@
 							<image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image>
 						</view>
 						<view class="color-tip margin-top margin-bottom">请先绑定手机再执行该操作</view>
-						<button type="primary" size="mini" class="mini button color-base-bg" @click="modifyInfo('mobile')">立即绑定</button>
+						<button type="primary" size="mini" class="mini button color-base-bg"
+							@click="modifyInfo('mobile')">立即绑定</button>
 					</view>
 				</block>
 				<block v-else>
 					<view class="edit-info-box" v-if="memberInfo.password">
 						<text class="info-name">原密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.currentPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
+							v-model="formData.currentPassword" />
 					</view>
 					<block v-else>
 						<view class="edit-info-box">
 							<text class="info-name">新密码</text>
-							<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
+							<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入"
+								v-model="formData.mobileVercode" />
 							<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 						</view>
 						<view class="edit-info-box">
 							<text class="info-name">再次输入</text>
-							<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
-							<button type="primary" class="dynacode" @click="passwordMoblieCode()">{{ formData.mobileCodeText }}</button>
+							<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入"
+								v-model="formData.mobileDynacode" />
+							<button type="primary" class="dynacode" @click="passwordMoblieCode()">{{
+								formData.mobileCodeText }}</button>
 						</view>
 						<view class="color-tip font-size-goods-tag set-pass-tips">
 							点击“获取动态码”，将会向您已绑定的手机号{{ memberInfoformData.mobile | mobile }}发送验证码</view>
 					</block>
 					<view class="edit-info-box">
 						<text class="info-name">新密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.newPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
+							v-model="formData.newPassword" />
 					</view>
 					<view class="edit-info-box">
 						<text class="info-name">再次输入</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.confirmPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
+							v-model="formData.confirmPassword" />
 					</view>
 
 					<view class="save-item" @click="save('password')">
@@ -109,17 +121,21 @@
 			<view v-if="indent == 'mobile'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">手机号</text>
-					<input class="uni-input info-content" type="number" maxlength="11" placeholder="请输入" v-model="formData.mobile" />
+					<input class="uni-input info-content" type="number" maxlength="11" placeholder="请输入"
+						v-model="formData.mobile" />
 				</view>
 				<view class="edit-info-box">
 					<text class="info-name">验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
+					<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入"
+						v-model="formData.mobileVercode" />
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 				<view class="edit-info-box">
 					<text class="info-name">短信验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
-					<button type="primary" class="dynacode" @click="bindMoblieCode()">{{ formData.mobileCodeText }}</button>
+					<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入"
+						v-model="formData.mobileDynacode" />
+					<button type="primary" class="dynacode" @click="bindMoblieCode()">{{ formData.mobileCodeText
+						}}</button>
 				</view>
 				<view class="save-item" @click="save('mobile')">
 					<button type="primary">保存</button>
@@ -138,7 +154,7 @@
 				<view class="edit-info-box">
 					<text class="info-name">所在地区</text>
 					<pick-regions :default-regions="defaultRegions" select-arr="3" @getRegions="handleGetRegions">
-						<text class="select-address " :class="{'color-tip': !formData.fullAddress }">
+						<text class="select-address " :class="{ 'color-tip': !formData.fullAddress }">
 							{{ formData.fullAddress ? formData.fullAddress : '请选择省市区县' }}
 						</text>
 					</pick-regions>
@@ -157,237 +173,238 @@
 </template>
 
 <script>
-	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
-	import pickRegions from '@/components/pick-regions/pick-regions.vue';
-	import info from './public/js/info.js';
-	import auth from '@/common/js/auth.js';
 
-	export default {
-		components: {
-			uniNavBar,
-			pickRegions
-		},
-		data() {
-			return {};
-		},
-		onLoad(data) {
-			if (data.type) this.indent = data.type;
-		},
-		mixins: [info, auth],
-		filters: {
-			mobile(mobile) {
-				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
-			}
+import info from './public/js/info.js';
+import auth from '@/common/js/auth.js';
+
+export default {
+	components: {
+		uniNavBar: () => import('@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
+	},
+	data() {
+		return {};
+	},
+	onLoad(data) {
+		if (data.type) this.indent = data.type;
+	},
+	mixins: [info, auth],
+	filters: {
+		mobile(mobile) {
+			return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.info-head {
-		.head-nav {
-			width: 100%;
-			height: var(--status-bar-height);
-			background: #ffffff;
-		}
+.info-head {
+	.head-nav {
+		width: 100%;
+		height: var(--status-bar-height);
+		background: #ffffff;
+	}
 
-		.head-nav.active {
-			padding-top: 40rpx;
+	.head-nav.active {
+		padding-top: 40rpx;
+	}
+}
+
+.captcha {
+	width: 170rpx;
+	height: 50rpx;
+}
+
+.info-list-cell {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 30rpx;
+	position: relative;
+	line-height: 50rpx;
+	background-color: #fff;
+
+	&:first-child {
+		padding: 28rpx 30rpx;
+	}
+
+	.cell-tip1 {
+		margin-right: 40rpx;
+	}
+
+	&.log-out-btn {
+		margin-top: 40rpx;
+
+		.cell-tit {
+			margin: auto;
 		}
 	}
 
-	.captcha {
-		width: 170rpx;
-		height: 50rpx;
+	.info-list-head {
+		border: 1rpx solid $color-line;
+		width: 82rpx;
+		height: 82rpx;
+		border-radius: 50%;
 	}
 
-	.info-list-cell {
+	.info-list-head image {
+		max-width: 100%;
+		max-height: 100%;
+	}
+
+	// #ifdef MP
+	&.info-item {
+		margin-top: 16rpx;
+	}
+
+	// #endif
+
+	&.info-list-con~&.info-list-con:after {
+		content: '';
+		position: absolute;
+		left: 30rpx;
+		right: 30rpx;
+		top: 0;
+		border-bottom: 1rpx solid $color-line;
+	}
+
+	.cell-tip {
+		margin-left: auto;
+		color: $color-tip;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		max-width: 470rpx;
+	}
+
+	.cell-more {
+		margin-left: 10rpx;
+		width: 32rpx;
+		height: 100%;
+	}
+
+	.cell-more:after {
+		content: '';
+		display: block;
+		width: 12rpx;
+		height: 12rpx;
+
+		border: 2rpx solid darken($color-line, 20%) {
+			right-color: transparent;
+			bottom-color: transparent;
+		}
+
+		transform: rotate(135deg);
+	}
+}
+
+.edit-info-box {
+	margin-top: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 20rpx 40rpx;
+	min-height: 50rpx;
+	background-color: #fff;
+
+	.info-name {
+		width: 150rpx;
+		font-size: $font-size-base;
+		text-align: left;
+	}
+
+	.info-content {
+		flex: 1;
+		width: 0;
+		font-size: $font-size-base;
+		padding: 0;
+	}
+
+	.dynacode {
+		margin: 0;
+		padding: 0 10rpx;
+		width: 250rpx;
+		height: 60rpx;
+		font-size: $font-size-base;
+		line-height: 60rpx;
+		word-break: break-all;
+	}
+
+	.edit-sex-list {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx 30rpx;
-		position: relative;
-		line-height: 50rpx;
-		background-color: #fff;
 
-		&:first-child {
-			padding: 28rpx 30rpx;
+		label {
+			display: flex;
+			margin-left: 30rpx;
+			align-items: center;
 		}
+	}
 
-		.cell-tip1 {
-			margin-right: 40rpx;
-		}
+	uni-radio .uni-radio-input {
+		width: 32rpx;
+		height: 32rpx;
+	}
 
-		&.log-out-btn {
-			margin-top: 40rpx;
+	.pick-regions {
+		flex: 1;
+	}
+}
 
-			.cell-tit {
-				margin: auto;
-			}
-		}
+.set-pass-tips {
+	padding: 20rpx 20rpx 0 20rpx;
+}
 
-		.info-list-head {
-			border: 1rpx solid $color-line;
-			width: 82rpx;
-			height: 82rpx;
-			border-radius: 50%;
-		}
+.input-len {
+	width: 500rpx !important;
+}
 
-		.info-list-head image {
-			max-width: 100%;
-			max-height: 100%;
-		}
+.save-item {
+	margin-top: 50rpx;
 
-		// #ifdef MP
-		&.info-item {
-			margin-top: 16rpx;
-		}
-		// #endif
+	button {
+		font-size: 30rpx;
+	}
+}
 
-		&.info-list-con~&.info-list-con:after {
-			content: '';
-			position: absolute;
-			left: 30rpx;
-			right: 30rpx;
-			top: 0;
-			border-bottom: 1rpx solid $color-line;
-		}
+.bind-mobile {
+	button {
+		border-radius: 60rpx;
+	}
+}
 
-		.cell-tip {
-			margin-left: auto;
-			color: $color-tip;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			max-width: 470rpx;
-		}
+.empty {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: $padding;
+	box-sizing: border-box;
+	justify-content: center;
+	padding-top: 80rpx;
 
-		.cell-more {
-			margin-left: 10rpx;
-			width: 32rpx;
+	.empty_img {
+		width: 63%;
+		height: 450rpx;
+
+		image {
+			width: 100%;
 			height: 100%;
 		}
-
-		.cell-more:after {
-			content: '';
-			display: block;
-			width: 12rpx;
-			height: 12rpx;
-
-			border: 2rpx solid darken($color-line, 20%) {
-				right-color: transparent;
-				bottom-color: transparent;
-			}
-
-			transform: rotate(135deg);
-		}
 	}
 
-	.edit-info-box {
-		margin-top: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx 40rpx;
-		min-height: 50rpx;
-		background-color: #fff;
-
-		.info-name {
-			width: 150rpx;
-			font-size: $font-size-base;
-			text-align: left;
-		}
-
-		.info-content {
-			flex: 1;
-			width: 0;
-			font-size: $font-size-base;
-			padding: 0;
-		}
-
-		.dynacode {
-			margin: 0;
-			padding: 0 10rpx;
-			width: 250rpx;
-			height: 60rpx;
-			font-size: $font-size-base;
-			line-height: 60rpx;
-			word-break: break-all;
-		}
-
-		.edit-sex-list {
-			display: flex;
-
-			label {
-				display: flex;
-				margin-left: 30rpx;
-				align-items: center;
-			}
-		}
-
-		uni-radio .uni-radio-input {
-			width: 32rpx;
-			height: 32rpx;
-		}
-
-		.pick-regions {
-			flex: 1;
-		}
+	.iconfont {
+		font-size: 190rpx;
+		color: $color-tip;
+		line-height: 1.2;
 	}
 
-	.set-pass-tips {
-		padding: 20rpx 20rpx 0 20rpx;
-	}
-
-	.input-len {
-		width: 500rpx !important;
-	}
-
-	.save-item {
-		margin-top: 50rpx;
-
-		button {
-			font-size: 30rpx;
-		}
-	}
-
-	.bind-mobile {
-		button {
-			border-radius: 60rpx;
-		}
-	}
-
-	.empty {
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: $padding;
-		box-sizing: border-box;
-		justify-content: center;
-		padding-top: 80rpx;
-
-		.empty_img {
-			width: 63%;
-			height: 450rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.iconfont {
-			font-size: 190rpx;
-			color: $color-tip;
-			line-height: 1.2;
-		}
-
-		button {
-			min-width: 300rpx;
-			margin-top: 100rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			font-size: $font-size-base;
-		}
+	button {
+		min-width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: $font-size-base;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 8321783..3e8c1b1 100644
--- a/pages_tool/member/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -9,12 +9,15 @@
 					<text class="iconfont icon-bangzhu"></text>
 					活动说明
 				</view>
-				<image class="font" :src="$util.img('public/uniapp/member/invite/top_font.png')" mode="widthFix"/>
+				<image class="font" :src="$util.img('public/uniapp/member/invite/top_font.png')" mode="widthFix" />
 				<view class="time">
-					活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) }}
+					活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1)
+					}}
 				</view>
 
-				<view class="btn" :style="{ 'background-image': 'url(' + $util.img('public/uniapp/member/invite/top_btn.png') + ')' }" @click="openSharePopup">立即邀请</view>
+				<view class="btn"
+					:style="{ 'background-image': 'url(' + $util.img('public/uniapp/member/invite/top_btn.png') + ')' }"
+					@click="openSharePopup">立即邀请</view>
 			</view>
 			<view class="content invite-list">
 				<view class="title">我的好友</view>
@@ -23,7 +26,8 @@
 						<view class="invitelist">
 							<view class="list-item" v-for="(item, index) in inviteList" :key="index">
 								<view class="img color-base-border">
-									<image mode="aspectFit" :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"/>
+									<image mode="aspectFit"
+										:src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)" />
 								</view>
 								<view class="list-left">
 									<view class="info">
@@ -43,11 +47,13 @@
 								</view>
 							</view>
 						</view>
-						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="isClick && total_num > page">
+						<view class="more_invite color-tip font-size-tag " @click="moreList"
+							v-if="isClick && total_num > page">
 							查看更多
 							<text class="iconfont icon-iconangledown"></text>
 						</view>
-						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="!isClick && inviteList.length > 5 && total_num <= page">没有更多数据了</view>
+						<view class="more_invite color-tip font-size-tag " @click="moreList"
+							v-if="!isClick && inviteList.length > 5 && total_num <= page">没有更多数据了</view>
 					</view>
 				</block>
 				<block v-else>
@@ -62,7 +68,7 @@
 				<view class="invite_active">
 					<view class="list">
 						<view class="item" v-if="$util.inArray('balance', info.type) != -1">
-							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill" />
 							<view class="desc">
 								<view class="price">
 									<text class="font-size-base">{{ $lang('common.currencySymbol') }}</text>
@@ -73,7 +79,7 @@
 						</view>
 
 						<view class="item" v-if="$util.inArray('point', info.type) != -1">
-							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill" />
 							<view class="desc">
 								<view class="price">
 									<text>{{ parseInt(info.point) }}</text>
@@ -128,7 +134,7 @@
 					<view class="step">
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/fenxiang.png')" mode="aspectFit"/>
+								<image :src="$util.img('public/uniapp/member/invite/fenxiang.png')" mode="aspectFit" />
 							</view>
 							<view class="text">分享链接给好友</view>
 						</view>
@@ -137,7 +143,7 @@
 						</view>
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/shouji.png')" mode="aspectFit"/>
+								<image :src="$util.img('public/uniapp/member/invite/shouji.png')" mode="aspectFit" />
 							</view>
 							<view class="text">好友进入</view>
 						</view>
@@ -146,7 +152,7 @@
 						</view>
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/hongbao.png')" mode="aspectFit"/>
+								<image :src="$util.img('public/uniapp/member/invite/hongbao.png')" mode="aspectFit" />
 							</view>
 							<view class="text">好友注册成功获得奖励</view>
 						</view>
@@ -231,56 +237,55 @@
 </template>
 
 <script>
-	import inviteFriends from './public/js/invite_friends.js';
-	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';
-	export default {
-		components: {
-			nsEmpty,
-			nsLogin,
-			loadingCover
-		},
-		data() {
-			return {
-				inviteList: [],
-				info: null,
-				page: 1,
-				page_size: 5,
-				total_num: 0,
-				isClick: true,
-				poster: '-1', //海报
-				posterMsg: '' //海报错误信息
-			};
-		},
-		onLoad(option) {
-			this.getBaseInfo();
-			if (this.storeToken) {
-				this.getList();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/invite_friends');
-				});
-			}
-		},
-		onShow() {},
-		mixins: [inviteFriends],
-		onReady() {}
-	};
+import inviteFriends from './public/js/invite_friends.js';
+
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			inviteList: [],
+			info: null,
+			page: 1,
+			page_size: 5,
+			total_num: 0,
+			isClick: true,
+			poster: '-1', //海报
+			posterMsg: '' //海报错误信息
+		};
+	},
+	onLoad(option) {
+		this.getBaseInfo();
+		if (this.storeToken) {
+			this.getList();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/invite_friends');
+			});
+		}
+	},
+	onShow() { },
+	mixins: [inviteFriends],
+	onReady() { }
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/invite_friends.scss';
+@import './public/css/invite_friends.scss';
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .uni-popup__wrapper.bottom {
-		border-radius: 24rpx 24rpx 0 0;
-	}
+/deep/ .uni-popup__wrapper.bottom {
+	border-radius: 24rpx 24rpx 0 0;
+}
 </style>
 
 <style scoped>
-	.poster-layer>>>.uni-popup__wrapper-box {
-		max-height: initial !important;
-	}
+.poster-layer>>>.uni-popup__wrapper-box {
+	max-height: initial !important;
+}
 </style>
diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue
index c7e6d1d..3d48a5c 100644
--- a/pages_tool/member/level.vue
+++ b/pages_tool/member/level.vue
@@ -5,7 +5,8 @@
 		</view>
 		<view class="banner-container">
 			<view class="memberInfo" v-if="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg"
+					@error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
 				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 				<view class="member-desc">
 					<view class="font-size-base">{{ memberInfo.nickname }}</view>
@@ -25,56 +26,64 @@
 				<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList"
 					:key="i">
 					<view class="image-container" :class="[
-							curIndex === 0
-								? i === listLen - 1
-									? 'item-left'
-									: i === 1
+						curIndex === 0
+							? i === listLen - 1
+								? 'item-left'
+								: i === 1
 									? 'item-right'
 									: 'item-center'
-								: curIndex === listLen - 1
+							: curIndex === listLen - 1
 								? i === 0
 									? 'item-right'
 									: i === listLen - 2
-									? 'item-left'
-									: 'item-center'
+										? 'item-left'
+										: 'item-center'
 								: i === curIndex - 1
-								? 'item-left'
-								: i === curIndex + 1
-								? 'item-right'
-								: 'item-center'
-						]">
+									? 'item-left'
+									: i === curIndex + 1
+										? 'item-right'
+										: 'item-center'
+					]">
 						<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat" :style="{
-								transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
-								transitionDuration: '.3s',
-								transitionTimingFunction: 'ease'
-							}">
-							<image v-if="levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-							<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+							transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
+							transitionDuration: '.3s',
+							transitionTimingFunction: 'ease'
+						}">
+							<image v-if="levelList[curIndex]['level_picture']"
+								:src="$util.img(levelList[curIndex]['level_picture'])" />
+							<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
 
 							<view class="info">
-								<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">
+								<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
 									{{ levelList[curIndex].level_name }}
-									<text class="isnow " :style="{color:levelList[curIndex]['level_text_color']}" v-if="levelId == item.level_id">当前等级</text>
+									<text class="isnow " :style="{ color: levelList[curIndex]['level_text_color'] }"
+										v-if="levelId == item.level_id">当前等级</text>
 								</view>
-								<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">当前成长值</view>
-								<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">{{ growth }}</view>
+								<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">当前成长值
+								</view>
+								<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
+									growth }}</view>
 								<block v-if="levelId == item.level_id">
 									<block v-if="levelList[curIndex + 1] != undefined">
 										<ns-progress :progress="levelList[curIndex + 1].rate"></ns-progress>
 										<view class="residue-growr-value"
-											:style="{color:levelList[curIndex]['level_text_color']}">
-											再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0 }}成长值成为{{
+											:style="{ color: levelList[curIndex]['level_text_color'] }">
+											再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex +
+												1].needGrowth : 0 }}成长值成为{{
 												levelList[curIndex + 1].level_name
 											}}
 										</view>
 									</block>
 									<block v-else>
-										<view class="residue-growr-value" :style="{color:levelList[curIndex]['level_text_color']}">您现在已经是最高等级</view>
+										<view class="residue-growr-value"
+											:style="{ color: levelList[curIndex]['level_text_color'] }">您现在已经是最高等级</view>
 									</block>
 								</block>
 								<block v-else>
-									<ns-progress :progress="levelList[curIndex].rate" v-if="levelList[curIndex].needGrowth > 0"></ns-progress>
-									<view class="residue-growr-value" v-if="levelList[curIndex].needGrowth > 0" :style="{color:levelList[curIndex]['level_text_color']}">
+									<ns-progress :progress="levelList[curIndex].rate"
+										v-if="levelList[curIndex].needGrowth > 0"></ns-progress>
+									<view class="residue-growr-value" v-if="levelList[curIndex].needGrowth > 0"
+										:style="{ color: levelList[curIndex]['level_text_color'] }">
 										再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
 									</view>
 								</block>
@@ -83,7 +92,8 @@
 					</view>
 				</swiper-item>
 			</swiper>
-			<view class="member-equity" v-if="levelList[curIndex].is_free_shipping > 0 || levelList[curIndex].consume_discount > 0 || levelList[curIndex].point_feedback > 0">
+			<view class="member-equity"
+				v-if="levelList[curIndex].is_free_shipping > 0 || levelList[curIndex].consume_discount > 0 || levelList[curIndex].point_feedback > 0">
 				<view class="equity-title">会员权益</view>
 				<view class="equity-itme" v-if="levelList[curIndex].is_free_shipping > 0">
 					<image :src="$util.img('public/uniapp/level/exemption_postage.png')" mode="aspectFit"></image>
@@ -109,7 +119,8 @@
 				</view>
 			</view>
 
-			<view class="member-gift" v-if="levelList[curIndex].send_balance > 0 || levelList[curIndex].send_balance > 0 || levelList[curIndex].send_coupon">
+			<view class="member-gift"
+				v-if="levelList[curIndex].send_balance > 0 || levelList[curIndex].send_balance > 0 || levelList[curIndex].send_coupon">
 				<view class="gift-title">会员礼包</view>
 				<view class="gift-itme" v-if="levelList[curIndex].send_point > 0">
 					<image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image>
@@ -125,7 +136,8 @@
 						<text class="gift-desc">赠送{{ levelList[curIndex].send_balance }}元红包</text>
 					</view>
 				</view>
-				<view class="gift-itme" v-if="levelList[curIndex].send_coupon" @click="openCoupon(levelList[curIndex].send_coupon)">
+				<view class="gift-itme" v-if="levelList[curIndex].send_coupon"
+					@click="openCoupon(levelList[curIndex].send_coupon)">
 					<image :src="$util.img('public/uniapp/level/coupon.png')" mode="aspectFit"></image>
 					<view class="gift-content">
 						<text>优惠券礼包</text>
@@ -168,215 +180,212 @@
 </template>
 
 <script>
-	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
-	import toTop from '@/components/toTop/toTop.vue';
-	import scroll from '@/common/js/scroll-view.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
 
-	export default {
-		components: {
-			nsProgress,
-			toTop,
-			uniPopup
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				couponPopList: [],
-				curIndex: 0,
-				descIndex: 0,
-				isDescAnimating: false,
-				scaleX: (634 / 540).toFixed(4),
-				scaleY: (378 / 330).toFixed(4),
-				swiperConfig: {
-					indicatorDots: false,
-					indicatorColor: 'rgba(255, 255, 255, .4)',
-					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-					interval: 3000,
-					duration: 300,
-					circular: false,
-					previousMargin: '58rpx',
-					nextMargin: '58rpx'
-				},
-				levelList: [{
-					needGrowth: 0,
-					growth: 0
-				}],
-				levelId: 0,
-				growth: 0,
+import scroll from '@/common/js/scroll-view.js';
+export default {
+	components: {
+		nsProgress: () => import('@/pages_tool/components/ns-progress/ns-progress.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+	},
+	mixins: [scroll],
+	data() {
+		return {
+			couponPopList: [],
+			curIndex: 0,
+			descIndex: 0,
+			isDescAnimating: false,
+			scaleX: (634 / 540).toFixed(4),
+			scaleY: (378 / 330).toFixed(4),
+			swiperConfig: {
+				indicatorDots: false,
+				indicatorColor: 'rgba(255, 255, 255, .4)',
+				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+				interval: 3000,
+				duration: 300,
+				circular: false,
+				previousMargin: '58rpx',
+				nextMargin: '58rpx'
+			},
+			levelList: [{
+				needGrowth: 0,
+				growth: 0
+			}],
+			levelId: 0,
+			growth: 0,
 
-				nowIndex: 0, //我当前所在等级的index
-				rule: [] //成长值规则
-			};
+			nowIndex: 0, //我当前所在等级的index
+			rule: [] //成长值规则
+		};
+	},
+	computed: {
+		listLen() {
+			return this.levelList.length;
 		},
-		computed: {
-			listLen() {
-				return this.levelList.length;
-			},
-			remark() {
-				if (this.levelList[this.curIndex]) {
-					return this.levelList[this.curIndex].remark;
-				}
-			},
-			nextIndex() {
-				let num = 0;
-				if (this.curIndex == this.levelList.length - 1) {
-					return this.curIndex;
-				} else {
-					return this.curIndex + 1;
-				}
+		remark() {
+			if (this.levelList[this.curIndex]) {
+				return this.levelList[this.curIndex].remark;
 			}
 		},
-		onLoad() {
-			this.getLevelRule();
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/level');
-				});
+		nextIndex() {
+			let num = 0;
+			if (this.curIndex == this.levelList.length - 1) {
+				return this.curIndex;
 			} else {
-				this.getLevelList();
-			}
-			// #ifdef MP-ALIPAY
-			this.scaleX = 1
-			this.scaleY = 1
-			// #endif
-		},
-		onShow() {
-		},
-		filters: {
-			rate(index, list, growth) {
-				let nowGrowth = Number(growth);
-				let minGrouth = Number(list[index].growth);
-				if (index == list.length - 1) {
-					return nowGrowth > minGrouth ? 100 : 0;
-				} else {
-					let maxGrouth = Number(list[index + 1].growth);
-					let num2 = nowGrowth - minGrouth;
-					let num1 = maxGrouth - minGrouth;
-					let num = Math.floor((num2 / num1) * 100);
-					return num > 100 ? 100 : num;
-				}
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				let that = this;
-				this.curIndex = e.detail.current;
-				this.isDescAnimating = true;
-				let timer = setTimeout(function() {
-					that.descIndex = e.detail.current;
-					clearTimeout(timer);
-				}, 150);
-			},
-			animationfinish(e) {
-				this.isDescAnimating = false;
-			},
-			getBannerDetail(index) {
-				uni.showLoading({
-					title: '将前往详情页面',
-					duration: 2000,
-					mask: true
-				});
-			},
-			getLevelList() {
-				this.$api.sendRequest({
-					url: '/api/memberlevel/lists',
-					success: res => {
-						if (res.data && res.code == 0) {
-							this.levelList = res.data;
-							for (var i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].send_coupon) {
-									this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',')
-										.length;
-								}
-							}
-							this.levelId = this.memberInfo.member_level;
-							this.growth = this.memberInfo.growth;
-							for (let i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].level_id == this.levelId) {
-									this.curIndex = i;
-									this.descIndex = i;
-									this.nowIndex = i;
-									break;
-								}
-							}
-							this.levelList.forEach((v, i) => {
-								if (parseFloat(v.growth) < parseFloat(this.growth)) {
-									v.needGrowth = 0;
-									v.rate = 100;
-								} else {
-									v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
-										.toFixed(2);
-									v.rate = (this.growth / v.growth).toFixed(2) * 100;
-								}
-							});
-
-							this.levelList.forEach(v => {
-								if (v.consume_discount) {
-									v.consume_discount = (v.consume_discount / 10).toFixed(2);
-								}
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						}
-					}
-				});
-			},
-			getLevelRule() {
-				this.$api.sendRequest({
-					url: '/api/member/accountrule',
-					success: res => {
-						if (res.code == 0 && res.data && res.data.growth) {
-							this.rule = res.data.growth;
-						}
-					}
-				});
-			},
-			growthRules() {
-				this.$util.redirectTo('/pages_tool/member/level_growth_rules');
-			},
-			openCoupon(data) {
-				this.couponPopList = [];
-				this.$api.sendRequest({
-					url: '/coupon/api/coupon/couponbyid',
-					data: {
-						id: data
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.couponPopList = res.data;
-						}
-					}
-				});
-				this.$refs.couponPopup.open();
-			},
-			closeCoupon() {
-				this.$refs.couponPopup.close();
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index');
-			return true;
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getLevelList();
-				}
+				return this.curIndex + 1;
 			}
 		}
-	};
+	},
+	onLoad() {
+		this.getLevelRule();
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/level');
+			});
+		} else {
+			this.getLevelList();
+		}
+		// #ifdef MP-ALIPAY
+		this.scaleX = 1
+		this.scaleY = 1
+		// #endif
+	},
+	onShow() {
+	},
+	filters: {
+		rate(index, list, growth) {
+			let nowGrowth = Number(growth);
+			let minGrouth = Number(list[index].growth);
+			if (index == list.length - 1) {
+				return nowGrowth > minGrouth ? 100 : 0;
+			} else {
+				let maxGrouth = Number(list[index + 1].growth);
+				let num2 = nowGrowth - minGrouth;
+				let num1 = maxGrouth - minGrouth;
+				let num = Math.floor((num2 / num1) * 100);
+				return num > 100 ? 100 : num;
+			}
+		}
+	},
+	methods: {
+		swiperChange(e) {
+			let that = this;
+			this.curIndex = e.detail.current;
+			this.isDescAnimating = true;
+			let timer = setTimeout(function () {
+				that.descIndex = e.detail.current;
+				clearTimeout(timer);
+			}, 150);
+		},
+		animationfinish(e) {
+			this.isDescAnimating = false;
+		},
+		getBannerDetail(index) {
+			uni.showLoading({
+				title: '将前往详情页面',
+				duration: 2000,
+				mask: true
+			});
+		},
+		getLevelList() {
+			this.$api.sendRequest({
+				url: '/api/memberlevel/lists',
+				success: res => {
+					if (res.data && res.code == 0) {
+						this.levelList = res.data;
+						for (var i = 0; i < this.levelList.length; i++) {
+							if (this.levelList[i].send_coupon) {
+								this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',')
+									.length;
+							}
+						}
+						this.levelId = this.memberInfo.member_level;
+						this.growth = this.memberInfo.growth;
+						for (let i = 0; i < this.levelList.length; i++) {
+							if (this.levelList[i].level_id == this.levelId) {
+								this.curIndex = i;
+								this.descIndex = i;
+								this.nowIndex = i;
+								break;
+							}
+						}
+						this.levelList.forEach((v, i) => {
+							if (parseFloat(v.growth) < parseFloat(this.growth)) {
+								v.needGrowth = 0;
+								v.rate = 100;
+							} else {
+								v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
+									.toFixed(2);
+								v.rate = (this.growth / v.growth).toFixed(2) * 100;
+							}
+						});
+
+						this.levelList.forEach(v => {
+							if (v.consume_discount) {
+								v.consume_discount = (v.consume_discount / 10).toFixed(2);
+							}
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				}
+			});
+		},
+		getLevelRule() {
+			this.$api.sendRequest({
+				url: '/api/member/accountrule',
+				success: res => {
+					if (res.code == 0 && res.data && res.data.growth) {
+						this.rule = res.data.growth;
+					}
+				}
+			});
+		},
+		growthRules() {
+			this.$util.redirectTo('/pages_tool/member/level_growth_rules');
+		},
+		openCoupon(data) {
+			this.couponPopList = [];
+			this.$api.sendRequest({
+				url: '/coupon/api/coupon/couponbyid',
+				data: {
+					id: data
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.couponPopList = res.data;
+					}
+				}
+			});
+			this.$refs.couponPopup.open();
+		},
+		closeCoupon() {
+			this.$refs.couponPopup.close();
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.getLevelList();
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/level.scss';
+@import './public/css/level.scss';
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue
index 69a684e..9511f42 100644
--- a/pages_tool/member/level_growth_rules.vue
+++ b/pages_tool/member/level_growth_rules.vue
@@ -43,232 +43,232 @@
 </template>
 
 <script>
-	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
-	import toTop from '@/components/toTop/toTop.vue';
-	import scroll from '@/common/js/scroll-view.js';
 
-	export default {
-		components: {
-			nsProgress,
-			toTop
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				curIndex: 0,
-				descIndex: 0,
-				isDescAnimating: false,
-				scaleX: (634 / 540).toFixed(4),
-				scaleY: (378 / 330).toFixed(4),
-				swiperConfig: {
-					//type==1时的默认参数
-					indicatorDots: false,
-					indicatorColor: 'rgba(255, 255, 255, .4)',
-					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-					interval: 3000,
-					duration: 300,
-					circular: false,
-					previousMargin: '58rpx',
-					nextMargin: '58rpx'
-				},
-				levelList: [{
-					needGrowth: 0,
-					growth: 0
-				}],
-				levelId: 0,
-				growth: 0,
+import scroll from '@/common/js/scroll-view.js';
 
-				nowIndex: 0, //我当前所在等级的index
-				rule: [] //成长值规则
-			};
-		},
-		computed: {
-			listLen() {
-				return this.levelList.length;
+export default {
+	components: {
+		nsProgress: () => import('@/pages_tool/components/ns-progress/ns-progress.vue'),
+		toTop: () => import('@/components/toTop/toTop.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	mixins: [scroll],
+	data() {
+		return {
+			curIndex: 0,
+			descIndex: 0,
+			isDescAnimating: false,
+			scaleX: (634 / 540).toFixed(4),
+			scaleY: (378 / 330).toFixed(4),
+			swiperConfig: {
+				//type==1时的默认参数
+				indicatorDots: false,
+				indicatorColor: 'rgba(255, 255, 255, .4)',
+				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+				interval: 3000,
+				duration: 300,
+				circular: false,
+				previousMargin: '58rpx',
+				nextMargin: '58rpx'
 			},
-		},
-		onLoad() {
-			//会员等级
-			this.getLevelList();
-			this.getLevelRule();
-		},
-		onShow() {},
-		filters: {
-			rate(index, list, growth) {
-				let nowGrowth = Number(growth);
-				let minGrouth = Number(list[index].growth);
-				if (index == list.length - 1) {
-					return nowGrowth > minGrouth ? 100 : 0;
-				} else {
-					let maxGrouth = Number(list[index + 1].growth);
-					let num2 = nowGrowth - minGrouth;
-					let num1 = maxGrouth - minGrouth;
-					let num = Math.floor((num2 / num1) * 100);
-					return num > 100 ? 100 : num;
-				}
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				let that = this;
-				this.curIndex = e.detail.current;
-				this.isDescAnimating = true;
-				let timer = setTimeout(function() {
-					that.descIndex = e.detail.current;
-					clearTimeout(timer);
-				}, 150);
-			},
-			animationfinish(e) {
-				this.isDescAnimating = false;
-			},
-			getBannerDetail(index) {
-				uni.showLoading({
-					title: '将前往详情页面',
-					duration: 2000,
-					mask: true
-				});
-			},
-			getLevelList() {
-				this.$api.sendRequest({
-					url: '/api/memberlevel/lists',
-					success: res => {
-						if (res.data && res.code == 0) {
-							this.levelList = res.data;
-							this.levelId = this.memberInfo.member_level;
-							this.growth = this.memberInfo.growth;
-							for (let i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].level_id == this.levelId) {
-									this.curIndex = i;
-									this.descIndex = i;
-									this.nowIndex = i;
-									break;
-								}
-							}
-							this.levelList.forEach((v, i) => {
-								let rate = 0;
-								if (i != this.levelList.length - 1) {
-									v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+			levelList: [{
+				needGrowth: 0,
+				growth: 0
+			}],
+			levelId: 0,
+			growth: 0,
 
-									if (v.needGrowth <= 0) {
-										rate = 100;
-									} else {
-										rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
-									}
-								} else {
-									v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
-									if (v.needGrowth <= 0) {
-										rate = 100;
-									} else {
-										rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
-									}
-								}
-								v.rate = rate;
-							});
-
-							this.levelList.forEach(v => {
-								if (v.consume_discount) {
-									v.consume_discount = (v.consume_discount / 10).toFixed(2);
-								}
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						}
-					}
-				});
-			},
-			getLevelRule() {
-				this.$api.sendRequest({
-					url: '/api/member/accountrule',
-					success: res => {
-						if (res.code == 0 && res.data && res.data.growth) {
-							this.rule = res.data.growth;
-						}
-					}
-				});
+			nowIndex: 0, //我当前所在等级的index
+			rule: [] //成长值规则
+		};
+	},
+	computed: {
+		listLen() {
+			return this.levelList.length;
+		},
+	},
+	onLoad() {
+		//会员等级
+		this.getLevelList();
+		this.getLevelRule();
+	},
+	onShow() { },
+	filters: {
+		rate(index, list, growth) {
+			let nowGrowth = Number(growth);
+			let minGrouth = Number(list[index].growth);
+			if (index == list.length - 1) {
+				return nowGrowth > minGrouth ? 100 : 0;
+			} else {
+				let maxGrouth = Number(list[index + 1].growth);
+				let num2 = nowGrowth - minGrouth;
+				let num1 = maxGrouth - minGrouth;
+				let num = Math.floor((num2 / num1) * 100);
+				return num > 100 ? 100 : num;
 			}
 		}
-	};
+	},
+	methods: {
+		swiperChange(e) {
+			let that = this;
+			this.curIndex = e.detail.current;
+			this.isDescAnimating = true;
+			let timer = setTimeout(function () {
+				that.descIndex = e.detail.current;
+				clearTimeout(timer);
+			}, 150);
+		},
+		animationfinish(e) {
+			this.isDescAnimating = false;
+		},
+		getBannerDetail(index) {
+			uni.showLoading({
+				title: '将前往详情页面',
+				duration: 2000,
+				mask: true
+			});
+		},
+		getLevelList() {
+			this.$api.sendRequest({
+				url: '/api/memberlevel/lists',
+				success: res => {
+					if (res.data && res.code == 0) {
+						this.levelList = res.data;
+						this.levelId = this.memberInfo.member_level;
+						this.growth = this.memberInfo.growth;
+						for (let i = 0; i < this.levelList.length; i++) {
+							if (this.levelList[i].level_id == this.levelId) {
+								this.curIndex = i;
+								this.descIndex = i;
+								this.nowIndex = i;
+								break;
+							}
+						}
+						this.levelList.forEach((v, i) => {
+							let rate = 0;
+							if (i != this.levelList.length - 1) {
+								v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+
+								if (v.needGrowth <= 0) {
+									rate = 100;
+								} else {
+									rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
+								}
+							} else {
+								v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+								if (v.needGrowth <= 0) {
+									rate = 100;
+								} else {
+									rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
+								}
+							}
+							v.rate = rate;
+						});
+
+						this.levelList.forEach(v => {
+							if (v.consume_discount) {
+								v.consume_discount = (v.consume_discount / 10).toFixed(2);
+							}
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				}
+			});
+		},
+		getLevelRule() {
+			this.$api.sendRequest({
+				url: '/api/member/accountrule',
+				success: res => {
+					if (res.code == 0 && res.data && res.data.growth) {
+						this.rule = res.data.growth;
+					}
+				}
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #fff;
+page {
+	background-color: #fff;
+}
+
+.grow-explain {
+	padding: 30rpx;
+	margin-top: 30rpx;
+
+	.explain-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+
+		image {
+			margin: 0 20rpx;
+			width: 54rpx;
+			height: 18rpx;
+		}
+
+		margin-bottom: 40rpx;
 	}
 
-	.grow-explain {
-		padding: 30rpx;
-		margin-top: 30rpx;
+	.explain-tr {
+		display: flex;
+	}
 
-		.explain-title {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			line-height: 1;
+	.explain-th {
+		padding: 10rpx 30rpx;
 
-			image {
-				margin: 0 20rpx;
-				width: 54rpx;
-				height: 18rpx;
-			}
-
-			margin-bottom: 40rpx;
+		&~.explain-th {
+			border-left: 4rpx solid #fff;
 		}
 
-		.explain-tr {
-			display: flex;
+		flex: 1;
+		background-color: #f6f1e4;
+	}
+
+	.explain-td {
+		padding: 10rpx 30rpx;
+
+		&~.explain-td {
+			border-left: 4rpx solid #fff;
 		}
 
-		.explain-th {
-			padding: 10rpx 30rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		flex: 1;
+		background-color: #fcfbf7;
+	}
+}
 
-			&~.explain-th {
-				border-left: 4rpx solid #fff;
-			}
+.grow-value,
+.acquisition-grow {
+	padding: 0 30rpx 30rpx;
 
-			flex: 1;
-			background-color: #f6f1e4;
-		}
+	.title {
+		display: flex;
+		align-items: center;
 
-		.explain-td {
-			padding: 10rpx 30rpx;
-
-			&~.explain-td {
-				border-left: 4rpx solid #fff;
-			}
-
-			height: 60rpx;
-			line-height: 60rpx;
-			flex: 1;
-			background-color: #fcfbf7;
+		image {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 10rpx;
 		}
 	}
 
-	.grow-value,
-	.acquisition-grow {
-		padding: 0 30rpx 30rpx;
+	.content {
+		font-size: 24rpx;
+		margin-left: 40rpx;
 
-		.title {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.content {
-			font-size: 24rpx;
-			margin-left: 40rpx;
-
-			text {
-				display: block;
-			}
+		text {
+			display: block;
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
index 593b9e1..f04891a 100644
--- a/pages_tool/member/modify_face.vue
+++ b/pages_tool/member/modify_face.vue
@@ -2,8 +2,10 @@
 	<view :style="themeColor" class="nc-modify-content">
 		<view class="modify">
 			<view>
-				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head" @error="memberImg = $util.getDefaultImage().head" mode="aspectFill"/>
-				<image v-else :src="$util.img(newImg)" @error="newImg = $util.getDefaultImage().head" mode="aspectFill" />
+				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head"
+					@error="memberImg = $util.getDefaultImage().head" mode="aspectFill" />
+				<image v-else :src="$util.img(newImg)" @error="newImg = $util.getDefaultImage().head"
+					mode="aspectFill" />
 			</view>
 		</view>
 		<view class="opection-box">
@@ -28,167 +30,166 @@
 </template>
 
 <script>
-	import imgCropping from '@/pages_tool/components/img-cropping/cropping.vue';
 
-	export default {
-		data() {
-			return {
-				memberImg: '',
-				newImg: '',
-				imgurl: ''
-			};
-		},
-		components: {
-			imgCropping
-		},
-		onShow() {
-			if (!this.storeToken) {
-				this.$util.redirectTo(
-					'/pages_tool/login/login', {
-						back: '/pages_tool/member/modify_face'
-					},
-					'redirectTo'
-				);
-				return;
-			}
-
-			this.memberImg = this.memberInfo.headimg;
-			this.imgurl = this.memberInfo.headimg;
-		},
-		methods: {
-			chooseImage() {
-				this.$refs.imgCropping.fSelect();
+export default {
+	components: {
+		imgCropping: () => import('@/pages_tool/components/img-cropping/cropping.vue'),
+	},
+	data() {
+		return {
+			memberImg: '',
+			newImg: '',
+			imgurl: ''
+		};
+	},
+	onShow() {
+		if (!this.storeToken) {
+			this.$util.redirectTo(
+				'/pages_tool/login/login', {
+				back: '/pages_tool/member/modify_face'
 			},
-			//上传返回图片
-			myUpload(rsp) {
-				let app_type = 'h5';
-				let app_type_name = 'H5';
+				'redirectTo'
+			);
+			return;
+		}
 
-				// #ifdef MP
-				app_type = 'weapp';
-				app_type_name = 'weapp';
-				// #endif
-				uni.request({
-					url: this.$config.baseUrl + '/api/upload/headimgBase64',
-					method: 'POST',
-					data: {
-						app_type: app_type,
-						app_type_name: app_type_name,
-						images: rsp.base64
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded;application/json'
-					},
-					dataType: 'json',
-					responseType: 'text',
-					success: res => {
-						if (res.data.code == 0) {
-							this.newImg = res.data.data.pic_path;
-							this.imgurl = res.data.data.pic_path;
-						}
-					},
-					fail: () => {
+		this.memberImg = this.memberInfo.headimg;
+		this.imgurl = this.memberInfo.headimg;
+	},
+	methods: {
+		chooseImage() {
+			this.$refs.imgCropping.fSelect();
+		},
+		//上传返回图片
+		myUpload(rsp) {
+			let app_type = 'h5';
+			let app_type_name = 'H5';
+
+			// #ifdef MP
+			app_type = 'weapp';
+			app_type_name = 'weapp';
+			// #endif
+			uni.request({
+				url: this.$config.baseUrl + '/api/upload/headimgBase64',
+				method: 'POST',
+				data: {
+					app_type: app_type,
+					app_type_name: app_type_name,
+					images: rsp.base64
+				},
+				header: {
+					'content-type': 'application/x-www-form-urlencoded;application/json'
+				},
+				dataType: 'json',
+				responseType: 'text',
+				success: res => {
+					if (res.data.code == 0) {
+						this.newImg = res.data.data.pic_path;
+						this.imgurl = res.data.data.pic_path;
+					}
+				},
+				fail: () => {
+					this.$util.showToast({
+						title: '头像上传失败'
+					});
+				}
+			});
+		},
+		previewImage() {
+			uni.previewImage({
+				current: 0,
+				urls: this.images
+			});
+		},
+		save() {
+			this.$api.sendRequest({
+				url: '/api/member/modifyheadimg',
+				data: {
+					headimg: this.imgurl
+				},
+				success: res => {
+					if (res.code == 0) {
+						this.memberInfo.headimg = this.imgurl;
+						this.$store.commit('setMemberInfo', this.memberInfo);
 						this.$util.showToast({
-							title: '头像上传失败'
+							title: '头像修改成功'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
+						}, 2000);
+					} else {
+						this.$util.showToast({
+							title: res.message
 						});
 					}
-				});
-			},
-			previewImage() {
-				uni.previewImage({
-					current: 0,
-					urls: this.images
-				});
-			},
-			save() {
-				this.$api.sendRequest({
-					url: '/api/member/modifyheadimg',
-					data: {
-						headimg: this.imgurl
-					},
-					success: res => {
-						if (res.code == 0) {
-							this.memberInfo.headimg = this.imgurl;
-							this.$store.commit('setMemberInfo', this.memberInfo);
-							this.$util.showToast({
-								title: '头像修改成功'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
-							}, 2000);
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			uploadFace() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'],
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						this.$api.upload({
-							url: '/api/upload/headimg',
-							filePath: tempFilePaths[0],
-							fileType: 'image',
-							success: (res) => {
-								if (res.code) {
-									this.newImg = res.data.pic_path;
-									this.imgurl = res.data.pic_path;
-								}
+				}
+			});
+		},
+		uploadFace() {
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				success: (chooseImageRes) => {
+					const tempFilePaths = chooseImageRes.tempFilePaths;
+					this.$api.upload({
+						url: '/api/upload/headimg',
+						filePath: tempFilePaths[0],
+						fileType: 'image',
+						success: (res) => {
+							if (res.code) {
+								this.newImg = res.data.pic_path;
+								this.imgurl = res.data.pic_path;
 							}
-						})
-					}
-				});
-			}
+						}
+					})
+				}
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
+page {
+	overflow: hidden;
+}
+
+.modify {
+	position: relative;
+	padding-top: 50rpx;
+
+	view {
+		width: 500rpx;
+		height: 500rpx;
+		margin: 0 auto;
 		overflow: hidden;
-	}
+		background-color: #ffffff;
+		border: 4rpx solid #ffffff;
+		border-radius: 100%;
 
-	.modify {
-		position: relative;
-		padding-top: 50rpx;
-
-		view {
-			width: 500rpx;
-			height: 500rpx;
-			margin: 0 auto;
-			overflow: hidden;
-			background-color: #ffffff;
-			border: 4rpx solid #ffffff;
-			border-radius: 100%;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
+}
 
-	.opection-box {
-		margin-top: 50rpx;
-	}
-
-	.opec {
-		width: 100%;
-		padding: 0 10%;
-		box-sizing: border-box;
-		display: flex;
-		justify-content: space-between;
-
-		button {
-			padding: 0 30rpx;
-			height: 60rpx;
-			line-height: 60rpx;
-			border: none;
-		}
+.opection-box {
+	margin-top: 50rpx;
+}
+
+.opec {
+	width: 100%;
+	padding: 0 10%;
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+
+	button {
+		padding: 0 30rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		border: none;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
index 67e2774..2b22c36 100644
--- a/pages_tool/member/pay_password.vue
+++ b/pages_tool/member/pay_password.vue
@@ -3,8 +3,10 @@
 		<view class="tips" v-if="step != 0">请输入6位支付密码，建议不要使用重复或连续数字</view>
 		<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
 		<view class="password-wrap">
-			<myp-one :maxlength="step == 0 ? 4 : 6" :is-pwd="step != 0" @input="input" ref="input" :auto-focus="true"></myp-one>
-			<view v-show="step == 0" class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">
+			<myp-one :maxlength="step == 0 ? 4 : 6" :is-pwd="step != 0" @input="input" ref="input"
+				:auto-focus="true"></myp-one>
+			<view v-show="step == 0" class="dynacode"
+				:class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">
 				{{ dynacodeData.codeText }}
 			</view>
 			<view class="action-tips" v-show="step == 0">输入短信验证码</view>
@@ -16,263 +18,263 @@
 </template>
 
 <script>
-	import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
-	export default {
-		components: {
-			mypOne
-		},
-		data() {
-			return {
-				isClick: false,
-				step: 1,
-				key: '', // 短信key
-				code: '', // 动态码
-				password: '', // 密码
-				repassword: '', // 重复密码
-				isSub: false, // 防重复提交
-				back: '', // 返回页
-				dynacodeData: {
-					seconds: 120,
-					timer: null,
-					codeText: '获取验证码',
-					isSend: false
-				}
-			};
-		},
-		onLoad(option) {
-			if (option.back) this.back = option.back;
 
-			// 判断登录
-			if (!this.storeToken) {
-				this.$util.redirectTo('/pages_tool/login/login');
-			} else {
-				if (this.memberInfo.mobile == '') {
-					uni.showModal({
-						title: '提示',
-						content: '设置支付密码需要先绑定手机号,是否立即绑定?',
-						success: res => {
-							if (res.confirm) {
-								this.$util.redirectTo('/pages_tool/member/info', {
-									action: 'mobile',
-									back: this.back
-								}, 'redirectTo');
-							} else {
-								if (this.back) this.$util.redirectTo(this.back);
-								else this.$util.redirectTo('/pages/member/index');
-							}
+export default {
+	components: {
+		mypOne: () => import('@/pages_tool/components/myp-one/myp-one.vue'),
+	},
+	data() {
+		return {
+			isClick: false,
+			step: 1,
+			key: '', // 短信key
+			code: '', // 动态码
+			password: '', // 密码
+			repassword: '', // 重复密码
+			isSub: false, // 防重复提交
+			back: '', // 返回页
+			dynacodeData: {
+				seconds: 120,
+				timer: null,
+				codeText: '获取验证码',
+				isSend: false
+			}
+		};
+	},
+	onLoad(option) {
+		if (option.back) this.back = option.back;
+
+		// 判断登录
+		if (!this.storeToken) {
+			this.$util.redirectTo('/pages_tool/login/login');
+		} else {
+			if (this.memberInfo.mobile == '') {
+				uni.showModal({
+					title: '提示',
+					content: '设置支付密码需要先绑定手机号,是否立即绑定?',
+					success: res => {
+						if (res.confirm) {
+							this.$util.redirectTo('/pages_tool/member/info', {
+								action: 'mobile',
+								back: this.back
+							}, 'redirectTo');
+						} else {
+							if (this.back) this.$util.redirectTo(this.back);
+							else this.$util.redirectTo('/pages/member/index');
 						}
-					});
+					}
+				});
+			} else {
+				this.step = 0;
+				this.sendMobileCode();
+			}
+		}
+	},
+	methods: {
+		input(val) {
+			if (this.step == 0) {
+				if (val.length == 4) {
+					this.isClick = true;
+					this.code = val;
 				} else {
-					this.step = 0;
-					this.sendMobileCode();
+					this.isClick = false;
+				}
+			} else if (this.step == 1) {
+				if (val.length == 6) {
+					this.isClick = true;
+					this.password = val;
+				} else {
+					this.isClick = false;
+				}
+			} else {
+				if (val.length == 6) {
+					this.isClick = true;
+					this.repassword = val;
+				} else {
+					this.isClick = false;
 				}
 			}
 		},
-		methods: {
-			input(val) {
+		confirm() {
+			if (this.isClick) {
 				if (this.step == 0) {
-					if (val.length == 4) {
-						this.isClick = true;
-						this.code = val;
-					} else {
-						this.isClick = false;
-					}
+					this.$api.sendRequest({
+						url: '/api/member/verifypaypwdcode',
+						data: {
+							code: this.code,
+							key: this.key
+						},
+						success: res => {
+							if (res.code == 0) {
+								this.$refs.input.clear();
+								this.isClick = false;
+								this.step = 1;
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						}
+					});
 				} else if (this.step == 1) {
-					if (val.length == 6) {
-						this.isClick = true;
-						this.password = val;
-					} else {
-						this.isClick = false;
-					}
+					this.$refs.input.clear();
+					this.isClick = false;
+					this.step = 2;
 				} else {
-					if (val.length == 6) {
-						this.isClick = true;
-						this.repassword = val;
-					} else {
-						this.isClick = false;
-					}
-				}
-			},
-			confirm() {
-				if (this.isClick) {
-					if (this.step == 0) {
+					if (this.password == this.repassword) {
+						if (this.isSub) return;
+						this.isSub = true;
 						this.$api.sendRequest({
-							url: '/api/member/verifypaypwdcode',
+							url: '/api/member/modifypaypassword',
 							data: {
+								key: this.key,
 								code: this.code,
-								key: this.key
+								password: this.password
 							},
 							success: res => {
-								if (res.code == 0) {
-									this.$refs.input.clear();
-									this.isClick = false;
-									this.step = 1;
+								if (res.code >= 0) {
+									this.$util.showToast({
+										title: '修改成功'
+									});
+									setTimeout(() => {
+										if (this.back) this.$util.redirectTo(this.back, {},
+											'redirectTo');
+										else this.$util.redirectTo('/pages/member/index');
+									}, 2000);
 								} else {
+									this.initInfo();
 									this.$util.showToast({
 										title: res.message
 									});
 								}
 							}
 						});
-					} else if (this.step == 1) {
-						this.$refs.input.clear();
-						this.isClick = false;
-						this.step = 2;
 					} else {
-						if (this.password == this.repassword) {
-							if (this.isSub) return;
-							this.isSub = true;
-							this.$api.sendRequest({
-								url: '/api/member/modifypaypassword',
-								data: {
-									key: this.key,
-									code: this.code,
-									password: this.password
-								},
-								success: res => {
-									if (res.code >= 0) {
-										this.$util.showToast({
-											title: '修改成功'
-										});
-										setTimeout(() => {
-											if (this.back) this.$util.redirectTo(this.back, {},
-												'redirectTo');
-											else this.$util.redirectTo('/pages/member/index');
-										}, 2000);
-									} else {
-										this.initInfo();
-										this.$util.showToast({
-											title: res.message
-										});
-									}
-								}
-							});
-						} else {
-							this.$util.showToast({
-								title: '两次输入的密码不一致',
-								success: res => {
-									this.initInfo();
-								}
-							});
-						}
+						this.$util.showToast({
+							title: '两次输入的密码不一致',
+							success: res => {
+								this.initInfo();
+							}
+						});
 					}
 				}
-			},
-			initInfo() {
-				this.isClick = false;
-				this.step = 1;
-				this.password = '';
-				this.repassword = '';
-				this.oldpassword = '';
-				this.isSub = false;
-				this.$refs.input.clear();
-			},
-			/**
-			 * 发送手机动态码
-			 */
-			sendMobileCode() {
-				if (this.dynacodeData.seconds != 120) return;
-				if (this.dynacodeData.isSend) return;
-				this.dynacodeData.isSend = true;
+			}
+		},
+		initInfo() {
+			this.isClick = false;
+			this.step = 1;
+			this.password = '';
+			this.repassword = '';
+			this.oldpassword = '';
+			this.isSub = false;
+			this.$refs.input.clear();
+		},
+		/**
+		 * 发送手机动态码
+		 */
+		sendMobileCode() {
+			if (this.dynacodeData.seconds != 120) return;
+			if (this.dynacodeData.isSend) return;
+			this.dynacodeData.isSend = true;
 
-				this.$api.sendRequest({
-					url: '/api/member/paypwdcode',
-					success: res => {
-						this.dynacodeData.isSend = false;
-						if (res.code >= 0) {
-							this.key = res.data.key;
+			this.$api.sendRequest({
+				url: '/api/member/paypwdcode',
+				success: res => {
+					this.dynacodeData.isSend = false;
+					if (res.code >= 0) {
+						this.key = res.data.key;
 
-							if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
-								this.dynacodeData.timer = setInterval(() => {
-									this.dynacodeData.seconds--;
-									this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-								}, 1000);
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
+						if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
+							this.dynacodeData.timer = setInterval(() => {
+								this.dynacodeData.seconds--;
+								this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+							}, 1000);
 						}
-					},
-					fail: () => {
+					} else {
 						this.$util.showToast({
-							title: 'request:fail'
+							title: res.message
 						});
-						this.dynacodeData.isSend = false;
-					}
-				});
-			}
-		},
-		filters: {
-			mobile(mobile) {
-				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
-			}
-		},
-		watch: {
-			'dynacodeData.seconds': {
-				handler(newValue, oldValue) {
-					if (newValue == 0) {
-						clearInterval(this.dynacodeData.timer);
-						this.dynacodeData = {
-							seconds: 120,
-							timer: null,
-							codeText: '获取动态码',
-							isSend: false
-						};
 					}
 				},
-				immediate: true,
-				deep: true
-			}
+				fail: () => {
+					this.$util.showToast({
+						title: 'request:fail'
+					});
+					this.dynacodeData.isSend = false;
+				}
+			});
 		}
-	};
+	},
+	filters: {
+		mobile(mobile) {
+			return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+		}
+	},
+	watch: {
+		'dynacodeData.seconds': {
+			handler(newValue, oldValue) {
+				if (newValue == 0) {
+					clearInterval(this.dynacodeData.timer);
+					this.dynacodeData = {
+						seconds: 120,
+						timer: null,
+						codeText: '获取动态码',
+						isSend: false
+					};
+				}
+			},
+			immediate: true,
+			deep: true
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-		background: #fff;
+.container {
+	width: 100vw;
+	height: 100vh;
+	background: #fff;
 
-		.tips {
-			width: 60%;
-			margin: 0 auto;
+	.tips {
+		width: 60%;
+		margin: 0 auto;
+		text-align: center;
+		padding-top: 100rpx;
+	}
+
+	.password-wrap {
+		width: 80%;
+		margin: 0 auto;
+		margin-top: 40rpx;
+
+		.action-tips {
 			text-align: center;
-			padding-top: 100rpx;
+			font-weight: 600;
+			margin-top: 80rpx;
 		}
 
-		.password-wrap {
-			width: 80%;
+		.dynacode {
+			line-height: 1;
+			margin-top: 20rpx;
+			font-size: $font-size-tag;
+		}
+
+		.btn {
 			margin: 0 auto;
-			margin-top: 40rpx;
+			margin-top: 30rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: $border-radius;
+			color: #fff;
+			text-align: center;
 
-			.action-tips {
-				text-align: center;
-				font-weight: 600;
-				margin-top: 80rpx;
-			}
-
-			.dynacode {
-				line-height: 1;
-				margin-top: 20rpx;
-				font-size: $font-size-tag;
-			}
-
-			.btn {
-				margin: 0 auto;
-				margin-top: 30rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				border-radius: $border-radius;
+			&.disabled {
+				background: #ccc !important;
+				border-color: #ccc !important;
 				color: #fff;
-				text-align: center;
-
-				&.disabled {
-					background: #ccc !important;
-					border-color: #ccc !important;
-					color: #fff;
-				}
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue
index 3c4ae9d..66acffc 100644
--- a/pages_tool/member/point.vue
+++ b/pages_tool/member/point.vue
@@ -2,10 +2,9 @@
 	<view :style="themeColor" class="point">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
-				'padding-top': menuButtonBounding.top + 'px',
-				'height': menuButtonBounding.height + 'px'
-			}"
-		>
+			'padding-top': menuButtonBounding.top + 'px',
+			'height': menuButtonBounding.height + 'px'
+		}">
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
 				<view class="navbar-title">
@@ -14,8 +13,9 @@
 			</view>
 		</view>
 		<!-- #endif -->
-		
-		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
+
+		<view class="head-wrap"
+			:style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
 			<view class="point price-font">{{ pointInfo.point }}</view>
 			<view class="title">当前积分</view>
 			<view class="flex-box">
@@ -48,7 +48,7 @@
 				<text class="title">积分商城</text>
 			</view>
 		</view>
-<!-- 
+		<!-- 
 		<view class="task-wrap">
 			<view class="title">做任务赚积分</view>
 			<view class="task-item" @click="toSign">
@@ -75,13 +75,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
 	components: {
-		nsLogin,
-		loadingCover
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 	},
 	data() {
 		return {
@@ -153,7 +151,7 @@ export default {
 		return true;
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getMemberPoint();
 			}
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index b55dd8c..a9c15fe 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view :style="themeColor">
-	<!-- 	<view class="tab color-bg">
+		<!-- 	<view class="tab color-bg">
 			<view class="tab-left">
 				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
 					<view class="uni-input">
@@ -26,10 +26,12 @@
 								<view class="info" @click="toFromDetail(item)">
 									<view class="event">{{ item.type_name }}</view>
 									<view class="time-box">
-										<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
+										<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time)
+											}}</text>
 									</view>
 								</view>
-								<view class="num color-base-text" v-if="item.account_data > 0">+{{ parseInt(item.account_data) }}</view>
+								<view class="num color-base-text" v-if="item.account_data > 0">+{{
+									parseInt(item.account_data) }}</view>
 								<view class="num " v-else>{{ parseInt(item.account_data) }}</view>
 							</view>
 						</view>
@@ -45,21 +47,15 @@
 </template>
 
 <script>
-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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
+
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -103,7 +99,7 @@ export default {
 		this.getPointType();
 	},
 	methods: {
-		bindDateChange: function(e) {
+		bindDateChange: function (e) {
 			var temp = e.target.value;
 			var tempArr = temp.split('-');
 			this.date = tempArr[0] + '年' + tempArr[1] + '月';
@@ -272,11 +268,13 @@ export default {
 			font-size: $font-size-base;
 		}
 	}
-	.tab-left{
+
+	.tab-left {
 		display: flex;
 		padding-left: 30rpx;
 	}
-	.tab-right{
+
+	.tab-right {
 		display: flex;
 		justify-content: flex-end;
 		padding-right: 40rpx;
@@ -297,7 +295,7 @@ export default {
 		display: flex;
 		height: 90rpx;
 
-		& > view {
+		&>view {
 			flex: 1;
 			text-align: left;
 			padding: 0 $padding;
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index 0efa35e..c839671 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -30,21 +30,15 @@
 </template>
 
 <script>
-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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
+
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
-		MescrollUni,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
 		// #endif
 	},
 	data() {
diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue
index aff6e64..17619c8 100644
--- a/pages_tool/member/withdrawal_detail.vue
+++ b/pages_tool/member/withdrawal_detail.vue
@@ -53,11 +53,10 @@
 </template>
 
 <script>
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
 	components: {
-		loadingCover
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 	},
 	data() {
 		return {
diff --git a/pages_tool/notice/detail.vue b/pages_tool/notice/detail.vue
index c2702fd..69a006d 100644
--- a/pages_tool/notice/detail.vue
+++ b/pages_tool/notice/detail.vue
@@ -5,7 +5,7 @@
 			<text class="notice-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
 		</view>
 		<view class="notice-content"><rich-text :nodes="content"></rich-text></view>
-	
+
 		<loading-cover ref="loadingCover"></loading-cover>
 
 		<!-- #ifdef MP-WEIXIN -->
@@ -16,126 +16,132 @@
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
-		data() {
-			return {
-				noticeId: 0,
-				content: '',
-				detail: {}
-			};
-		},
-		onLoad(options) {
-			this.noticeId = options.notice_id || 0;
-			// 小程序扫码进入
-			if (options.scene) {
-				var sceneParams = decodeURIComponent(options.scene);
-				this.noticeId = sceneParams.split('-')[1];
-			}
-			if (this.noticeId == 0) {
-				this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-			}
-		},
-		onShow() {
-			this.getData();
-		},
-		methods: {
-			getData() {
-				this.$api.sendRequest({
-					url: '/api/notice/info',
-					data: {
-						id: this.noticeId
-					},
-					success: res => {
-						if (res.code == 0) {
-							if (res.data) {
-								this.detail = res.data;
-								this.content = htmlParser(res.data.content);
-								this.$langConfig.title(this.detail.title);
-								this.setPublicShare();
-
-								if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							} else {
-								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-							}, 2000);
-						}
-					},
-					fail: res => {
-						this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/detail?notice_id=' + this.noticeId;
-				this.$util.setPublicShare({
-					title: this.detail.title,
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) :
-						''
-				});
-			}
-		},
-		onShareAppMessage(res) {
-			var title = '[公告]' + this.detail.title;
-			var path = '/pages_tool/notice/detail?notice_id=' + this.noticeId;
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			var title = this.detail.title;
-			var query = 'notice_id=' + this.noticeId;
-			return {
-				title: title,
-				query: query,
-				imageUrl: ''
-			};
+import htmlParser from '@/common/js/html-parser.js';
+export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		// #ifdef MP-WEIXIN
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		// #endif		
+	},
+	data() {
+		return {
+			noticeId: 0,
+			content: '',
+			detail: {}
+		};
+	},
+	onLoad(options) {
+		this.noticeId = options.notice_id || 0;
+		// 小程序扫码进入
+		if (options.scene) {
+			var sceneParams = decodeURIComponent(options.scene);
+			this.noticeId = sceneParams.split('-')[1];
 		}
-	};
+		if (this.noticeId == 0) {
+			this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+		}
+	},
+	onShow() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.$api.sendRequest({
+				url: '/api/notice/info',
+				data: {
+					id: this.noticeId
+				},
+				success: res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.detail = res.data;
+							this.content = htmlParser(res.data.content);
+							this.$langConfig.title(this.detail.title);
+							this.setPublicShare();
+
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+						}, 2000);
+					}
+				},
+				fail: res => {
+					this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/notice/detail?notice_id=' + this.noticeId;
+			this.$util.setPublicShare({
+				title: this.detail.title,
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) :
+					''
+			});
+		}
+	},
+	onShareAppMessage(res) {
+		var title = '[公告]' + this.detail.title;
+		var path = '/pages_tool/notice/detail?notice_id=' + this.noticeId;
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		var title = this.detail.title;
+		var query = 'notice_id=' + this.noticeId;
+		return {
+			title: title,
+			query: query,
+			imageUrl: ''
+		};
+	}
+};
 </script>
 
 <style lang="scss">
-	.page {
-		width: 100%;
-		height: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		background-color: #fff;
-	}
+.page {
+	width: 100%;
+	height: 100%;
+	padding: 30rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+}
 
-	.notice-title {
-		font-size: $font-size-toolbar;
-		text-align: left;
-		font-weight: bold;
-	}
+.notice-title {
+	font-size: $font-size-toolbar;
+	text-align: left;
+	font-weight: bold;
+}
 
-	.notice-content {
-		margin-top: $margin-updown;
-		word-break: break-all;
-		font-size: $font-size-base;
-	}
+.notice-content {
+	margin-top: $margin-updown;
+	word-break: break-all;
+	font-size: $font-size-base;
+}
 
-	.notice-meta {
-		text-align: left;
-		margin-top: $margin-updown;
-		color: $color-tip;
+.notice-meta {
+	text-align: left;
+	margin-top: $margin-updown;
+	color: $color-tip;
 
-		.notice-time {
-			font-size: $font-size-tag;
-		}
+	.notice-time {
+		font-size: $font-size-tag;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 9d9c465..bacc3da 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -28,20 +28,15 @@
 </template>
 
 <script>
-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';
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif	
+
 export default {
 	components: {
-		nsLogin,
-		MescrollUni,
-		nsEmpty,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
index 305ed6e..99bc8ff 100644
--- a/pages_tool/order/activist.vue
+++ b/pages_tool/order/activist.vue
@@ -12,9 +12,11 @@
 								<view class="status-name color-base-text" v-if="item.refund_status == -1">退款失败</view>
 							</view>
 							<view class="goods-wrap">
-								<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" :lazy-load="true"></image>
+								<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)"
+									mode="aspectFill" :lazy-load="true"></image>
 								<view class="goods-info">
-									<view class="goods-name" @click="refundDetail(item.order_goods_id)">{{ item.sku_name }}</view>
+									<view class="goods-name" @click="refundDetail(item.order_goods_id)">{{ item.sku_name
+										}}</view>
 									<view class="goods-num">
 										<view class="num-text color-base-text">{{ item.refund_status_name }}</view>
 										<view class="num-price">
@@ -27,17 +29,14 @@
 							<view class="goods-btn">
 								<view class="btn-text">
 									<text>共{{ item.num }}件商品</text>
-									<text>退款：￥{{ item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money }}</text>
+									<text>退款：￥{{ item.refund_status == 3 ? item.refund_real_money :
+										item.refund_apply_money }}</text>
 								</view>
 								<view class="order-action">
 									<view class="order-box-btn" @click="refundDetail(item.order_goods_id)">查看详情</view>
 									<block v-if="item.refund_action.length">
-										<view
-											class="order-box-btn"
-											@click="refundAction(actionItem.event, item)"
-											v-for="(actionItem, actionIndex) in item.refund_action"
-											:key="actionIndex"
-										>
+										<view class="order-box-btn" @click="refundAction(actionItem.event, item)"
+											v-for="(actionItem, actionIndex) in item.refund_action" :key="actionIndex">
 											{{ actionItem.title }}
 										</view>
 									</block>
@@ -46,7 +45,8 @@
 						</view>
 					</block>
 					<block v-else>
-						<view class="cart-empty" v-if="showEmpty"><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
+						<view class="cart-empty" v-if="showEmpty"><ns-empty :isIndex="false"
+								:text="$lang('emptyTips')"></ns-empty></view>
 					</block>
 				</view>
 			</block>
@@ -56,17 +56,12 @@
 
 <script>
 import refundMethod from './public/js/refundMethod.js';
-import MescrollUni from "@/components/mescroll/my-list-mescroll.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';
-
 export default {
 	components: {
-		MescrollUni,
-		nsEmpty,
-		nsLogin,
-		loadingCover
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 	},
 	data() {
 		return {
@@ -154,8 +149,10 @@ export default {
 	position: relative;
 	top: 0;
 }
+
 .cart-empty {
 	padding-top: 308rpx !important;
 }
+
 @import './public/css/activist.scss';
 </style>
diff --git a/pages_tool/order/detail_virtual.vue b/pages_tool/order/detail_virtual.vue
index 83f1ae5..8799438 100644
--- a/pages_tool/order/detail_virtual.vue
+++ b/pages_tool/order/detail_virtual.vue
@@ -10,13 +10,15 @@ export default {
 	data() {
 		return {};
 	},
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	onLoad(option) {
 		if (option.order_id) {
-			this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
+			this.$util.redirectTo('/pages_order/detail', { order_id: option.order_id }, 'redirectTo');
 		}
 	}
 };
 </script>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>
diff --git a/pages_tool/order/evaluate.vue b/pages_tool/order/evaluate.vue
index 1f01bdc..9d0717f 100644
--- a/pages_tool/order/evaluate.vue
+++ b/pages_tool/order/evaluate.vue
@@ -6,27 +6,31 @@
 					<view class="eval-wrap">
 						<view class="eval-good">
 							<view class="good-box">
-								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="widthFix" />
+								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })"
+									@error="imageError(index)" mode="widthFix" />
 								<view class="good_info font-size-base">{{ item.sku_name }}</view>
 							</view>
 						</view>
 						<view class="eval-star" v-if="!isEvaluate">
 							<view class="star-box">
 								<view class="star-title color-base-bg-before">描述相符</view>
-								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index" @change="setStar" /></view>
+								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index"
+										@change="setStar" /></view>
 								<view class="grade-li">
-									<view class="icon iconfont" :class="
-											goodsEvalList[index].explain_type == '1'
-												? 'icon-haoping1 color-base-text'
-												: goodsEvalList[index].explain_type == '2'
-												? 'icon-zhongchaping color-base-text'
-												: goodsEvalList[index].explain_type == '3'
+									<view class="icon iconfont" :class="goodsEvalList[index].explain_type == '1'
+										? 'icon-haoping1 color-base-text'
+										: goodsEvalList[index].explain_type == '2'
+											? 'icon-zhongchaping color-base-text'
+											: goodsEvalList[index].explain_type == '3'
 												? 'icon-zhongchaping'
 												: ''
 										"></view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '1'">好评</view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '2'">中评</view>
-									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '3'">差评</view>
+									<view class="font-size-tag color-base-text"
+										v-if="goodsEvalList[index].explain_type == '1'">好评</view>
+									<view class="font-size-tag color-base-text"
+										v-if="goodsEvalList[index].explain_type == '2'">中评</view>
+									<view class="font-size-tag color-base-text"
+										v-if="goodsEvalList[index].explain_type == '3'">差评</view>
 								</view>
 							</view>
 						</view>
@@ -35,20 +39,24 @@
 					<view class="eval-text">
 						<view class="text-box">
 							<block v-if="!isEvaluate">
-								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content" maxlength="200" />
+								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content"
+									maxlength="200" />
 								<text class="maxSize">{{ goodsEvalList[index].content.length }}/200</text>
 							</block>
 							<block v-else>
-								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content" maxlength="200" />
+								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content"
+									maxlength="200" />
 								<text class="maxSize">{{ goodsEvalList[index].again_content.length }}/200</text>
 							</block>
 
 							<view class="other-info">
 								<view class="other-info-box" v-for="(i, t) in imgList[index]" :key="t">
 									<image :src="$util.img(i)" mode="aspectFill" @click="preview(i, index)"></image>
-									<view class="imgDel" @click="deleteImg(i, index ,t)"><text class=" icon iconfont icon-delete"></text></view>
+									<view class="imgDel" @click="deleteImg(i, index, t)"><text
+											class=" icon iconfont icon-delete"></text></view>
 								</view>
-								<view class="other-info-box active" @click="addImg(index)" v-if="imgList[index].length < 6 || imgList[index].length == undefined">
+								<view class="other-info-box active" @click="addImg(index)"
+									v-if="imgList[index].length < 6 || imgList[index].length == undefined">
 									<text class="icon iconfont icon-zhaoxiangji"></text>
 									<text>{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6</text>
 								</view>
@@ -59,7 +67,8 @@
 			</view>
 			<view class="eval-bottom" :class="{ 'safe-area': isIphoneX }">
 				<view class="all-election" @click="isAll()" v-if="!isEvaluate">
-					<view class="iconfont color-base-text" :class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+					<view class="iconfont color-base-text"
+						:class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 					<text>匿名</text>
 				</view>
 				<view class="action-btn"><button type="primary" @click="save()">提交</button></view>
@@ -71,16 +80,17 @@
 </template>
 
 <script>
-	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
-	import evaluate from './public/js/evaluate.js';
-	export default {
-		components: {
-			sxRate
-		},
-		mixins: [evaluate],
-	};
+
+import evaluate from './public/js/evaluate.js';
+export default {
+	components: {
+		sxRate: () => import('@/pages_tool/components/sx-rate/index.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	mixins: [evaluate],
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/evaluate.scss'
+@import './public/css/evaluate.scss'
 </style>
\ No newline at end of file
diff --git a/pages_tool/order/logistics.vue b/pages_tool/order/logistics.vue
index 90f4522..dab892d 100644
--- a/pages_tool/order/logistics.vue
+++ b/pages_tool/order/logistics.vue
@@ -1,22 +1,27 @@
 <template>
 	<view :style="themeColor">
 		<scroll-view class="order-nav" :scroll-x="true" :show-scrollbar="false">
-			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item" @click="ontabtap(packageIndex)">
-				<text class="uni-tab-item-title" :class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
+			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item"
+				@click="ontabtap(packageIndex)">
+				<text class="uni-tab-item-title"
+					:class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
 					{{ packageItem.package_name }}
 				</text>
 			</view>
 		</scroll-view>
-		<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item" v-show="packageIndex == currIndex">
+		<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item"
+			v-show="packageIndex == currIndex">
 			<view class="container">
 				<view class="goods-wrap">
 					<view class="body">
 						<view class="goods" v-for="(goodsItem, goodsIndex) in packageItem.goods_list" :key="goodsIndex">
 							<view class="goods-img" @click="toGoodsDetail(goodsItem.sku_id)">
-								<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
+								<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+									@error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
 							</view>
 							<view class="goods-info">
-								<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name }}</view>
+								<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name
+									}}</view>
 								<view class="goods-sub-section">
 									<view>
 										<text>
@@ -31,7 +36,9 @@
 				</view>
 
 				<view class="express-company-wrap" v-if="packageItem.delivery_type == 1">
-					<view class="company-logo"><image :src="$util.img(packageItem.express_company_image)"></image></view>
+					<view class="company-logo">
+						<image :src="$util.img(packageItem.express_company_image)"></image>
+					</view>
 					<view class="info">
 						<view class="company">
 							<text>承运公司： {{ packageItem.express_company_name }}</text>
@@ -48,16 +55,14 @@
 
 				<view class="track-wrap" v-if="packageItem.delivery_type == 1">
 					<block v-if="packageItem.trace.success && packageItem.trace.list.length != 0">
-						<view
-							class="track-item"
-							v-for="(traceItem, traceIndex) in packageItem.trace.list"
-							:class="traceIndex == 0 ? 'active' : ''"
-							:key="traceIndex"
-						>
+						<view class="track-item" v-for="(traceItem, traceIndex) in packageItem.trace.list"
+							:class="traceIndex == 0 ? 'active' : ''" :key="traceIndex">
 							<view class="dot" :class="traceIndex == 0 ? 'color-base-bg' : ''"></view>
 							<view class="msg">
-								<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark }}</view>
-								<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.datetime }}</view>
+								<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark
+									}}</view>
+								<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{
+									traceItem.datetime }}</view>
 							</view>
 						</view>
 					</block>
@@ -76,6 +81,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			orderId: '',
@@ -143,7 +151,7 @@ export default {
 			this.packageList[packageIndex].goods_list[goodsIndex].sku_image = this.$util.getDefaultImage().goods;
 			this.$forceUpdate();
 		},
-		copyDeliveryNo(value){
+		copyDeliveryNo(value) {
 			this.$util.copy(value);
 		}
 	}
@@ -152,6 +160,7 @@ export default {
 
 <style lang="scss">
 @import './public/css/logistics.scss';
+
 /deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
@@ -160,6 +169,7 @@ export default {
 	color: transparent;
 	background: transparent;
 }
+
 /deep/::-webkit-scrollbar {
 	display: none;
 	width: 0;
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
index 8d57d4e..fa3b159 100644
--- a/pages_tool/order/refund.vue
+++ b/pages_tool/order/refund.vue
@@ -4,7 +4,9 @@
 			<scroll-view scroll-y="true" class="refund-container">
 				<view class="goods-wrap">
 					<view class="goods-img">
-						<image :src="$util.img(refund_data.order_goods_info.sku_image, { size: 'mid' })" @error="refund_data.order_goods_info.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
+						<image :src="$util.img(refund_data.order_goods_info.sku_image, { size: 'mid' })"
+							@error="refund_data.order_goods_info.sku_image = $util.getDefaultImage().goods"
+							mode="aspectFill" :lazy-load="true" />
 					</view>
 					<view class="goods-info">
 						<view class="goods-name">{{ refund_data.order_goods_info.sku_name }}</view>
@@ -40,32 +42,23 @@
 						</view>
 						<view class="item-wrap">
 							<view class="label">退款金额：</view>
-							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{
+								refund_data.refund_money }}</view>
 						</view>
 					</view>
-					
+
 					<view class="refund-form">
-						<view class="item-wrap"><view class="label active">退款说明</view></view>
-						
+						<view class="item-wrap">
+							<view class="label active">退款说明</view>
+						</view>
+
 						<!-- #ifdef MP-WEIXIN -->
-						<textarea
-							v-if="!showText"
-							class="newText"
-							placeholder="请输入退款说明(选填)"
-							placeholder-class="color-tip font-size-tag"
-							:auto-height="true"
-							v-model="refund_remark"
-						/>
+						<textarea v-if="!showText" class="newText" placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
 						<!-- #endif -->
 						<!-- #ifdef H5 -->
-						<textarea
-							class="newText"
-							placeholder="请输入退款说明(选填)"
-							@blur="textBlur()"
-							placeholder-class="color-tip font-size-tag"
-							:auto-height="true"
-							v-model="refund_remark"
-						/>
+						<textarea class="newText" placeholder="请输入退款说明(选填)" @blur="textBlur()"
+							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
 						<!-- #endif -->
 					</view>
 
@@ -79,14 +72,18 @@
 					<view class="refund-reason-popup popup">
 						<view class="popup-header">
 							<view><text class="tit">退款原因</text></view>
-							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text
+									class="iconfont icon-close"></text></view>
 						</view>
 						<view class="popup-body">
 							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
 								<view class="reason-list">
-									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type"
+										:key="index" @click="changeReason(item)">
 										<view class="reason">{{ item }}</view>
-										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+										<view class="iconfont"
+											:class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+										</view>
 									</view>
 								</view>
 							</scroll-view>
@@ -98,16 +95,16 @@
 				</uni-popup>
 			</scroll-view>
 			<loading-cover ref="loadingCover"></loading-cover>
-			
 		</view>
 	</view>
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
 export default {
 	components: {
-		uniPopup
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 	},
 	data() {
 		return {
@@ -191,7 +188,7 @@ export default {
 			if (this.verify()) {
 				if (this.isSub) return;
 				this.isSub = true;
-				
+
 				// #ifdef MP
 				this.subscribeMessage(() => {
 					this.$api.sendRequest({
@@ -216,7 +213,7 @@ export default {
 					});
 				})
 				// #endif
-				
+
 				// #ifndef MP-WEIXIN
 				this.$api.sendRequest({
 					url: '/api/orderrefund/refund',
@@ -257,7 +254,7 @@ export default {
 		/**
 		 * 微信订阅消息
 		 */
-		subscribeMessage(callback){
+		subscribeMessage(callback) {
 			this.$api.sendRequest({
 				url: '/weapp/api/weapp/messagetmplids',
 				data: {
@@ -270,7 +267,7 @@ export default {
 							fail: (res) => {
 								console.log('fail', res)
 							},
-							complete: ()=> {
+							complete: () => {
 								callback();
 							}
 						})
@@ -290,15 +287,18 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-<style scoped>
+
+<style lang="scss" scoped>
 /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 {
 	z-index: 8;
 }
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index deaa3c3..dcb398d 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -2,9 +2,11 @@
 	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">
-				<view class="goods-wrap" v-for="(item,index) in refund_data.order_goods_info" :key="index">
+				<view class="goods-wrap" v-for="(item, index) in refund_data.order_goods_info" :key="index">
 					<view class="goods-img">
-						<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="item.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
+						<image :src="$util.img(item.sku_image, { size: 'mid' })"
+							@error="item.sku_image = $util.getDefaultImage().goods" mode="aspectFill"
+							:lazy-load="true" />
 					</view>
 					<view class="goods-info">
 						<view class="goods-name">{{ item.sku_name }}</view>
@@ -12,7 +14,7 @@
 				</view>
 
 				<view>
-					
+
 					<view class="refund-form">
 						<view class="item-wrap" @click="openPopup('refundReasonPopup')">
 							<view class="label">退款原因：</view>
@@ -29,32 +31,23 @@
 						</view>
 						<view class="item-wrap">
 							<view class="label">退款金额：</view>
-							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{
+								refund_data.refund_money }}</view>
 						</view>
 					</view>
-					
+
 					<view class="refund-form">
-						<view class="item-wrap"><view class="label active">退款说明</view></view>
-						
+						<view class="item-wrap">
+							<view class="label active">退款说明</view>
+						</view>
+
 						<!-- #ifdef MP-WEIXIN -->
-						<textarea
-							v-if="!showText"
-							class="newText"
-							placeholder="请输入退款说明(选填)"
-							placeholder-class="color-tip font-size-tag"
-							:auto-height="true"
-							v-model="refund_remark"
-						/>
+						<textarea v-if="!showText" class="newText" placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
 						<!-- #endif -->
 						<!-- #ifdef H5 -->
-						<textarea
-							class="newText"
-							placeholder="请输入退款说明(选填)"
-							@blur="textBlur()"
-							placeholder-class="color-tip font-size-tag"
-							:auto-height="true"
-							v-model="refund_remark"
-						/>
+						<textarea class="newText" placeholder="请输入退款说明(选填)" @blur="textBlur()"
+							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
 						<!-- #endif -->
 					</view>
 
@@ -69,14 +62,18 @@
 					<view class="refund-reason-popup popup">
 						<view class="popup-header">
 							<view><text class="tit">退款原因</text></view>
-							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text
+									class="iconfont icon-close"></text></view>
 						</view>
 						<view class="popup-body">
 							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
 								<view class="reason-list">
-									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type"
+										:key="index" @click="changeReason(item)">
 										<view class="reason">{{ item }}</view>
-										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+										<view class="iconfont"
+											:class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+										</view>
 									</view>
 								</view>
 							</scroll-view>
@@ -88,16 +85,17 @@
 				</uni-popup>
 			</scroll-view>
 			<loading-cover ref="loadingCover"></loading-cover>
-			
+
 		</view>
 	</view>
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
 export default {
 	components: {
-		uniPopup
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 	},
 	data() {
 		return {
@@ -118,7 +116,7 @@ export default {
 	},
 	onLoad(option) {
 		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
-		
+
 		if (option.refund_type) this.refund_type = option.refund_type;
 	},
 	onShow() {
@@ -183,7 +181,7 @@ export default {
 			if (this.verify()) {
 				if (this.isSub) return;
 				this.isSub = true;
-				
+
 				// #ifdef MP
 				this.subscribeMessage(() => {
 					this.$api.sendRequest({
@@ -198,8 +196,8 @@ export default {
 							this.$util.showToast({ title: res.message });
 							if (res.code >= 0) {
 								uni.removeStorage({
-									key:'refund_goods_data',
-									success:res=>{
+									key: 'refund_goods_data',
+									success: res => {
 										this.$util.redirectTo('/pages_tool/order/activist');
 									}
 								})
@@ -213,7 +211,7 @@ export default {
 					});
 				})
 				// #endif
-				
+
 				// #ifndef MP-WEIXIN
 				this.$api.sendRequest({
 					url: '/api/orderrefund/refund',
@@ -227,8 +225,8 @@ export default {
 						this.$util.showToast({ title: res.message });
 						if (res.code >= 0) {
 							uni.removeStorage({
-								key:'refund_goods_data',
-								success:res=>{
+								key: 'refund_goods_data',
+								success: res => {
 									this.$util.redirectTo('/pages_tool/order/activist');
 								}
 							})
@@ -259,7 +257,7 @@ export default {
 		/**
 		 * 微信订阅消息
 		 */
-		subscribeMessage(callback){
+		subscribeMessage(callback) {
 			this.$api.sendRequest({
 				url: '/weapp/api/weapp/messagetmplids',
 				data: {
@@ -272,7 +270,7 @@ export default {
 							fail: (res) => {
 								console.log('fail', res)
 							},
-							complete: ()=> {
+							complete: () => {
 								callback();
 							}
 						})
@@ -292,19 +290,22 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-<style scoped>
+<style lang="scss" scoped>
 /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 {
 	z-index: 8;
 }
-.sub-btn{
+
+.sub-btn {
 	padding-top: 20rpx;
 	background-color: #FFFFFF;
 }
diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue
index b3a7a07..580b1ab 100644
--- a/pages_tool/order/refund_detail.vue
+++ b/pages_tool/order/refund_detail.vue
@@ -40,7 +40,8 @@
 						<!-- 商品信息 -->
 						<view class="goods-wrap">
 							<view class="goods-img" @click="refundDetail(detail)">
-								<image :src="$util.img(detail.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill" :lazy-load="true"></image>
+								<image :src="$util.img(detail.sku_image, { size: 'mid' })" @error="imageError()"
+									mode="aspectFill" :lazy-load="true"></image>
 							</view>
 							<view class="goods-info">
 								<view class="goods-name" @click="refundDetail(detail)">{{ detail.sku_name }}</view>
@@ -49,21 +50,26 @@
 						<!-- 退款信息 -->
 						<view class="info">
 							<view class="cell">退款方式：{{ detail.refund_type == 1 ? '仅退款' : '退款退货' }}</view>
-							<view class="cell" v-if="detail.refund_status == 3">退款途径：{{ detail.refund_money_type == 1 ? '原路退款' : detail.refund_money_type == 2 ? '线下退款' : '退款到余额' }}</view>
+							<view class="cell" v-if="detail.refund_status == 3">退款途径：{{ detail.refund_money_type == 1 ?
+								'原路退款' : detail.refund_money_type == 2 ? '线下退款' : '退款到余额' }}</view>
 							<view class="cell">退款原因：{{ detail.refund_reason }}</view>
-							<view class="cell" v-if="detail.refund_status == 3 && detail.refund_real_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_real_money }}</view>
-							<view class="cell" v-else-if="detail.refund_apply_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
+							<view class="cell" v-if="detail.refund_status == 3 && detail.refund_real_money > 0">退款金额：{{
+								$lang('common.currencySymbol') }}{{ detail.refund_real_money }}</view>
+							<view class="cell" v-else-if="detail.refund_apply_money > 0">退款金额：{{
+								$lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
 							<view class="cell">退款编号：{{ detail.refund_no }}</view>
 							<view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view>
-							<view class="cell" v-if="detail.refund_time">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view>
+							<view class="cell" v-if="detail.refund_time">退款时间：{{
+								$util.timeStampTurnTime(detail.refund_time) }}</view>
 							<view class="cell" v-if="detail.refund_remark != ''">退款说明：{{ detail.refund_remark }}</view>
-							<view class="cell" v-if="detail.use_point>0">退款积分：{{ detail.use_point }}</view>
+							<view class="cell" v-if="detail.use_point > 0">退款积分：{{ detail.use_point }}</view>
 						</view>
 					</view>
 				</view>
 
 				<view class="action" :class="{ 'bottom-safe-area': isIphoneX }" v-if="detail.refund_action.length">
-					<view class="order-box-btn" v-for="(actionItem, actionIndex) in detail.refund_action" :key="actionIndex" @click="refundAction(actionItem.event)">
+					<view class="order-box-btn" v-for="(actionItem, actionIndex) in detail.refund_action"
+						:key="actionIndex" @click="refundAction(actionItem.event)">
 						{{ actionItem.title }}
 					</view>
 				</view>
@@ -75,37 +81,24 @@
 						<view class="item">
 							<view class="label">物流公司</view>
 							<view class="cont">
-								<input
-									type="text"
-									placeholder="请输入物流公司"
-									class="input"
+								<input type="text" placeholder="请输入物流公司" class="input"
 									placeholder-class="input-placeholder color-tip"
-									v-model="formData.refund_delivery_name"
-								/>
+									v-model="formData.refund_delivery_name" />
 							</view>
 						</view>
 						<view class="item">
 							<view class="label">物流单号</view>
 							<view class="cont">
-								<input
-									type="text"
-									placeholder="请输入物流单号"
-									class="input"
+								<input type="text" placeholder="请输入物流单号" class="input"
 									placeholder-class="input-placeholder color-tip"
-									v-model="formData.refund_delivery_no"
-								/>
+									v-model="formData.refund_delivery_no" />
 							</view>
 						</view>
 						<view class="item">
 							<view class="label">物流说明</view>
 							<view class="cont">
-								<textarea
-									placeholder-class="color-tip font-size-tag"
-									:auto-height="true"
-									class="textarea"
-									placeholder="选填"
-									v-model="formData.refund_delivery_remark"
-								/>
+								<textarea placeholder-class="color-tip font-size-tag" :auto-height="true"
+									class="textarea" placeholder="选填" v-model="formData.refund_delivery_remark" />
 							</view>
 						</view>
 					</view>
@@ -115,7 +108,8 @@
 
 			<view v-show="action == 'consultrecord'">
 				<view class="record-wrap">
-					<view class="record-item" :class="logItem.action_way == 1 ? 'buyer' : ''" v-for="(logItem, logIndex) in detail.refund_log_list" :key="logIndex">
+					<view class="record-item" :class="logItem.action_way == 1 ? 'buyer' : ''"
+						v-for="(logItem, logIndex) in detail.refund_log_list" :key="logIndex">
 						<view class="cont">
 							<view class="head">
 								<text>{{ logItem.action_way == 1 ? '买家' : '卖家' }}</text>
@@ -130,7 +124,7 @@
 					<view class="empty-box"></view>
 				</view>
 				<view class="history-bottom" :class="{ 'bottom-safe-area': isIphoneX }">
-				<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
+					<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
 						<view>
 							<text class="iconfont icon-ziyuan"></text>
 							<text>联系客服</text>
@@ -141,15 +135,19 @@
 			</view>
 		</scroll-view>
 		<loading-cover ref="loadingCover"></loading-cover>
-		
+
 	</view>
 </template>
 
 <script>
 import refundMethod from './public/js/refundMethod.js';
 import validate from 'common/js/validate.js';
-import nsContact from '@/components/ns-contact/ns-contact.vue';
+
 export default {
+	components: {
+		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},	
 	data() {
 		return {
 			order_goods_id: '',
@@ -166,9 +164,6 @@ export default {
 			isSub: false
 		};
 	},
-	components: {
-		nsContact
-	},
 	mixins: [refundMethod],
 	onLoad(option) {
 		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
diff --git a/pages_tool/order/refund_goods_select.vue b/pages_tool/order/refund_goods_select.vue
index 0f2adcc..da75bad 100644
--- a/pages_tool/order/refund_goods_select.vue
+++ b/pages_tool/order/refund_goods_select.vue
@@ -1,225 +1,236 @@
 <template>
 	<view class="goods-select" :style="themeColor">
 		<view class="top">
-			共<text class="color-base-text">{{refund_data.length}}</text>件商品
+			共<text class="color-base-text">{{ refund_data.length }}</text>件商品
 		</view>
-		
+
 		<view class="body">
-			<view class="item" v-for="(item,index) in refund_data" :key="index">
+			<view class="item" v-for="(item, index) in refund_data" :key="index">
 				<view @click="single(index)" style="display:none">
 					<text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text>
 					<text v-else class="iconfont icon-yuan_checkbox"></text>
 				</view>
 				<image :src="$util.img(item.sku_image)" @error="error(index)"></image>
 				<view class="title">
-					<text>{{item.sku_name}}</text>
+					<text>{{ item.sku_name }}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="bottom-all">
-			<view >
-			<!-- 	@click="all"
+			<view>
+				<!-- 	@click="all"
 				<text v-if="judge" class="iconfont icon-yuan_checked color-base-text"></text>
 				<text v-else class="iconfont icon-yuan_checkbox"></text> -->
 			</view>
-			
+
 			<view v-if="nexthover" class="next" @click="next">下一步</view>
 			<view v-else class="next nexthover">请选择商品</view>
 		</view>
-		
+
 		<!-- <loading-cover ref="loadingCover"></loading-cover> -->
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				refund_type:1, 
-				refund_data:[],
-				judge:true,
-				order_goods_id:[],
-				nexthover:true
-			}
-		},
-		
-		onLoad(option){
-			if(option.refund_type){
-				this.refund_type = option.refund_type;
-				this.getGoodsInfo()
-			} else{
-				uni.showToast({
-					title:'未查找到订单信息',
-					icon:'none'
-				})
-				setTimeout(()=>{
-					this.$util.redirectTo('/pages_order/list');
-				},1000)
-			}
-		},
-		
-		methods:{
-			/**
-			 * 处理商品选中数据
-			 */
-			getGoodsInfo(){
-				uni.getStorage({
-					key:'refund_goods_data',
-					success:res=>{
-						let refund_data = JSON.parse(res.data);
-						this.refund_data = [];
-						refund_data.forEach(item=>{
-							if(item.refund_status == 0){
-								item.judge = true;
-								this.refund_data.push(item);
-							}
-						})
-					}
-				})
-			},
-			/**
-			 *单选事件 
-			 */
-			single(key){
-				this.refund_data[key].judge = !this.refund_data[key].judge;
-				let allJudge = true;
-				
-				this.refund_data.forEach((item)=>{
-					if(!item.judge){
-						allJudge = false;
-					}
-				})
-				this.judge = allJudge;
-				
-				this.getOrderIdInfo();
-				this.$forceUpdate()
-			},
-			/**
-			 * 全选选择
-			 */
-			all(){
-				
-				this.judge = !this.judge;
-				this.refund_data.map(item=>{
-					item.judge = this.judge;
-					return item;
-				})
-				
-				this.getOrderIdInfo();
-				this.$forceUpdate()
-			},
-			
-			/**
-			 * 获取选择的order_goods_id
-			 */
-			getOrderIdInfo(){
-				this.order_goods_id = [];
-				this.refund_data.forEach(item=>{
-					if(item.judge){
-						this.order_goods_id.push(item.order_goods_id)
-					}
-				})
-				if(this.order_goods_id.length == 0){
-					this.nexthover = false; 
-				}else{
-					this.nexthover = true; 
+export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			refund_type: 1,
+			refund_data: [],
+			judge: true,
+			order_goods_id: [],
+			nexthover: true
+		}
+	},
+
+	onLoad(option) {
+		if (option.refund_type) {
+			this.refund_type = option.refund_type;
+			this.getGoodsInfo()
+		} else {
+			uni.showToast({
+				title: '未查找到订单信息',
+				icon: 'none'
+			})
+			setTimeout(() => {
+				this.$util.redirectTo('/pages_order/list');
+			}, 1000)
+		}
+	},
+
+	methods: {
+		/**
+		 * 处理商品选中数据
+		 */
+		getGoodsInfo() {
+			uni.getStorage({
+				key: 'refund_goods_data',
+				success: res => {
+					let refund_data = JSON.parse(res.data);
+					this.refund_data = [];
+					refund_data.forEach(item => {
+						if (item.refund_status == 0) {
+							item.judge = true;
+							this.refund_data.push(item);
+						}
+					})
 				}
-				
-				this.$forceUpdate();
-			},
-			/**
-			 * 跳转退款界面
-			 */
-			next(){
-				this.refund_data.forEach(item=>{
+			})
+		},
+		/**
+		 *单选事件 
+		 */
+		single(key) {
+			this.refund_data[key].judge = !this.refund_data[key].judge;
+			let allJudge = true;
+
+			this.refund_data.forEach((item) => {
+				if (!item.judge) {
+					allJudge = false;
+				}
+			})
+			this.judge = allJudge;
+
+			this.getOrderIdInfo();
+			this.$forceUpdate()
+		},
+		/**
+		 * 全选选择
+		 */
+		all() {
+
+			this.judge = !this.judge;
+			this.refund_data.map(item => {
+				item.judge = this.judge;
+				return item;
+			})
+
+			this.getOrderIdInfo();
+			this.$forceUpdate()
+		},
+
+		/**
+		 * 获取选择的order_goods_id
+		 */
+		getOrderIdInfo() {
+			this.order_goods_id = [];
+			this.refund_data.forEach(item => {
+				if (item.judge) {
 					this.order_goods_id.push(item.order_goods_id)
-				})
-				if(this.order_goods_id.length == 0){
-					this.getOrderIdInfo();
 				}
-				
-				this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type:this.refund_type });
-			},
-			/**
-			 * 默认图片处理
-			 */
-			error(index){
-				this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
-				this.$forceUpdate();
+			})
+			if (this.order_goods_id.length == 0) {
+				this.nexthover = false;
+			} else {
+				this.nexthover = true;
 			}
+
+			this.$forceUpdate();
+		},
+		/**
+		 * 跳转退款界面
+		 */
+		next() {
+			this.refund_data.forEach(item => {
+				this.order_goods_id.push(item.order_goods_id)
+			})
+			if (this.order_goods_id.length == 0) {
+				this.getOrderIdInfo();
+			}
+
+			this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type: this.refund_type });
+		},
+		/**
+		 * 默认图片处理
+		 */
+		error(index) {
+			this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
+			this.$forceUpdate();
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.goods-select{
-		.top{
-			padding: 20rpx 30rpx;
-			box-sizing: border-box;
-			font-size: 28rpx;
-			background: #FFFFFF;
-			text{
-				font-size: 30rpx;
-				margin: 0 10rpx;
-				font-weight: bold;
-			}
-		}
-		.iconfont{
-			font-size: 40rpx;
-		}
-		.body{
-			margin: 30rpx;
-			border-radius: 10rpx;
-			background: #FFFFFF;
-			padding: 30rpx 0 0;
-			.item{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				padding: 0 30rpx 30rpx;
+.goods-select {
+	.top {
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+		font-size: 28rpx;
+		background: #FFFFFF;
 
-				image{
-					width: 180rpx;
-					height: 180rpx;
-					border-radius: 10rpx;
-				}
-				.title{
-					width: 368rpx;
-					height:180rpx;
-					font-size: 28rpx;
-					text{
-						text-overflow: -o-ellipsis-lastline;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 3;
-						line-clamp: 3;
-						-webkit-box-orient: vertical;
-					}
-				}
-			}
+		text {
+			font-size: 30rpx;
+			margin: 0 10rpx;
+			font-weight: bold;
 		}
-		.bottom-all{
-			padding-left: 30rpx;
+	}
+
+	.iconfont {
+		font-size: 40rpx;
+	}
+
+	.body {
+		margin: 30rpx;
+		border-radius: 10rpx;
+		background: #FFFFFF;
+		padding: 30rpx 0 0;
+
+		.item {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			background: #FFFFFF;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			box-sizing: border-box;
-			.next{
-				padding: 16rpx 80rpx;
-				color: #FFFFFF;
-				background: #ff4544;
+			padding: 0 30rpx 30rpx;
+
+			image {
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 10rpx;
 			}
-			.nexthover{
-				background: #e7dcdc !important;
+
+			.title {
+				width: 368rpx;
+				height: 180rpx;
+				font-size: 28rpx;
+
+				text {
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 3;
+					line-clamp: 3;
+					-webkit-box-orient: vertical;
+				}
 			}
 		}
 	}
-	
+
+	.bottom-all {
+		padding-left: 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: #FFFFFF;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		box-sizing: border-box;
+
+		.next {
+			padding: 16rpx 80rpx;
+			color: #FFFFFF;
+			background: #ff4544;
+		}
+
+		.nexthover {
+			background: #e7dcdc !important;
+		}
+	}
+}
 </style>
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 8ca80fd..4e6e512 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -25,96 +25,97 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				order_id: '',
-				isIphoneX: false,
-				refund_data: {},
-			};
-		},
-		onLoad(option) {
-			if (option.order_id) this.order_id = option.order_id;
-		},
-		onShow() {
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-			if (this.storeToken) {
-				this.getRefundData();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
-				});
-			}
-		},
-		methods: {
-			/**
-			 * 选择退款方式
-			 * @param {Object} type
-			 */
-			selectRefundType(type) {
-				this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
-					refund_type: type
-				});
-			},
-			/**
-			 * 获取退款订单数据
-			 */
-			getRefundData() {
-				this.$api.sendRequest({
-					url: '/api/order/detail',
-					data: {
-						order_id: this.order_id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.refund_data = res.data;
-							uni.setStorage({
-								key: 'refund_goods_data',
-								data: JSON.stringify(res.data.order_goods),
-							})
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: '未获取到该订单项退款信息'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_order/list');
-							}, 1000);
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
+
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			order_id: '',
+			isIphoneX: false,
+			refund_data: {},
+		};
+	},
+	onLoad(option) {
+		if (option.order_id) this.order_id = option.order_id;
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (this.storeToken) {
+			this.getRefundData();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
+			});
 		}
-	};
+	},
+	methods: {
+		/**
+		 * 选择退款方式
+		 * @param {Object} type
+		 */
+		selectRefundType(type) {
+			this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
+				refund_type: type
+			});
+		},
+		/**
+		 * 获取退款订单数据
+		 */
+		getRefundData() {
+			this.$api.sendRequest({
+				url: '/api/order/detail',
+				data: {
+					order_id: this.order_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.refund_data = res.data;
+						uni.setStorage({
+							key: 'refund_goods_data',
+							data: JSON.stringify(res.data.order_goods),
+						})
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: '未获取到该订单项退款信息'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_order/list');
+						}, 1000);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/refund.scss';
+@import './public/css/refund.scss';
 </style>
-<style scoped>
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none;
-		max-height: unset !important;
-		overflow-y: hidden !important;
-	}
+<style lang="scss" scoped>
+/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;
+}
 
-	/deep/ .uni-popup {
-		z-index: 8;
-	}
+/deep/ .uni-popup {
+	z-index: 8;
+}
 
-	.sub-btn {
-		padding-top: 20rpx;
-		background-color: #FFFFFF;
-	}
+.sub-btn {
+	padding-top: 20rpx;
+	background-color: #FFFFFF;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue
index 72cfdd1..abc2a58 100644
--- a/pages_tool/pay/cashier.vue
+++ b/pages_tool/pay/cashier.vue
@@ -7,15 +7,17 @@
 					<text class="unit price-font">￥</text>
 					<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
 				</view>
-				
+
 				<block v-if="payTypeList.length > 0">
 					<view class="pay-type">
-						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
+							@click="payIndex = index">
 							<view>
 								<text class="iconfont" :class="item.icon"></text>
 								<text class="name">{{ item.name }}</text>
 							</view>
-							<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+							<text class="iconfont"
+								:class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
 						</view>
 					</view>
 					<button type="primary" @click="confirm">确认支付</button>
@@ -31,11 +33,13 @@
 
 <script>
 import { Weixin } from 'common/js/wx-jssdk.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 
 export default {
-	components: { nsLogin, nsEmpty },
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			payIndex: 0,
@@ -86,7 +90,7 @@ export default {
 								this.autoPay();
 							}, 500)
 						}
-					} 
+					}
 				}
 			});
 		},
@@ -106,10 +110,10 @@ export default {
 				}
 			});
 		},
-		autoPay(){
+		autoPay() {
 			if (!this.payTypeList.length) return;
 			if (this.$util.isWeiXin()) {
-			 	this.payTypeList.forEach((item, index) => {
+				this.payTypeList.forEach((item, index) => {
 					if (item.type == 'wechatpay') {
 						this.payIndex = index;
 						this.confirm();
@@ -286,7 +290,7 @@ export default {
 		// #endif
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getPayInfo();
 			}
@@ -310,6 +314,7 @@ export default {
 	align-items: center;
 	flex-direction: column;
 	padding: 80rpx 26rpx;
+
 	.content {
 		white-space: nowrap;
 		overflow: hidden;
@@ -318,13 +323,16 @@ export default {
 		padding: 0 60rpx;
 		text-align: center;
 	}
+
 	.money-wrap {
 		font-weight: bold;
 		margin: 40rpx 0;
+
 		.unit {
 			font-size: 40rpx;
 			margin-right: 6rpx;
 		}
+
 		.money {
 			font-size: 70rpx;
 		}
@@ -334,6 +342,7 @@ export default {
 		width: 100%;
 		background: #fff;
 		border-radius: 20rpx;
+
 		.payment-item {
 			display: flex;
 			align-items: center;
@@ -341,34 +350,43 @@ export default {
 			height: 90rpx;
 			border-bottom: 2rpx solid $color-line;
 			padding: 20rpx 30rpx;
+
 			&:last-of-type {
 				border-bottom: none;
 			}
-			> view {
+
+			>view {
 				display: flex;
 				align-items: center;
+
 				.name {
 					margin-left: 20rpx;
 				}
 			}
+
 			.iconfont {
 				font-size: 64rpx;
 			}
+
 			.icon-weixin1 {
 				color: #24af41;
 			}
+
 			.icon-zhifubaozhifu- {
 				color: #00a0e9;
 			}
+
 			.icon-yuan_checked {
 				font-size: 40rpx;
 				color: $base-color;
 			}
+
 			.icon-checkboxblank {
 				font-size: 40rpx;
 			}
 		}
 	}
+
 	button {
 		width: 100%;
 		margin-top: 80rpx !important;
diff --git a/pages_tool/pay/index.vue b/pages_tool/pay/index.vue
index 19f857c..c985366 100644
--- a/pages_tool/pay/index.vue
+++ b/pages_tool/pay/index.vue
@@ -18,7 +18,9 @@
 
 <script>
 export default {
-	components: {},
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {
 			isIphoneX: false,
diff --git a/pages_tool/pay/result.vue b/pages_tool/pay/result.vue
index ffd3554..e400a78 100644
--- a/pages_tool/pay/result.vue
+++ b/pages_tool/pay/result.vue
@@ -3,16 +3,19 @@
 		<template v-if="payInfo.pay_status != undefined">
 			<view class="result-box">
 				<template v-if="payInfo.pay_status">
-					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true" class="result-image"/>
+					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true"
+						class="result-image" />
 					<view class="msg success">{{ $lang('paymentSuccess') }}</view>
 					<view class="pay-amount">
 						<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0] }}</text>
-						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1] }}</text>
+						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0]
+							}}</text>
+						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1]
+							}}</text>
 					</view>
 				</template>
 				<template v-else>
-					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image"/>
+					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image" />
 					<view class="msg fail">{{ $lang('paymentFail') }}</view>
 				</template>
 
@@ -60,284 +63,288 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				payInfo: {},
-				outTradeNo: '',
-				paySource: '',
-				consumeInfo: {},
-				consumeStatus: 0,
-			};
-		},
-		onLoad(option) {
-			if (option.code) this.outTradeNo = option.code;
-			this.paySource = uni.getStorageSync('paySource');
-		},
-		onShow() {
-			this.getPayInfo();
-			this.getConsume();
-		},
-		methods: {
-			consume(type) {
-				switch (type) {
-					case 'point':
-						this.$util.redirectTo('/pages_tool/member/point_detail', {});
-						break;
-					case 'growth':
-						this.$util.redirectTo('/pages_tool/member/level', {});
-						break;
-					case 'coupon':
-						this.$util.redirectTo('/pages_tool/member/coupon', {});
-						break;
-					default:
-						this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-						break;
-				}
-			},
-			getConsume() {
-				this.$api.sendRequest({
-					url: '/memberconsume/api/config/info',
-					data: {
-						out_trade_no: this.outTradeNo
-					},
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							let reward = res.data.value;
-							if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
-								this.consumeStatus = res.data.is_use;
-								this.consumeInfo = res.data.value;
-							}
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			getPayInfo() {
-				this.$api.sendRequest({
-					url: '/api/pay/info',
-					data: {
-						out_trade_no: this.outTradeNo
-					},
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.payInfo = res.data;
-							this.payInfo.pay_money = parseFloat(res.data.pay_money);
-							this.payInfo.pay_money += parseFloat(res.data.balance);
-							this.payInfo.pay_money += parseFloat(res.data.balance_money);
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: '未获取到支付信息！'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-							}, 1500);
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			goHome() {
-				this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-			},
-			toOrderDetail(id) {
-				if (this.payInfo.order_type == 2) {
-					this.$util.redirectTo('/pages_order/detail_pickup', {
-						order_id: id
-					}, 'redirectTo');
-				} else if (this.payInfo.order_type == 3) {
-					this.$util.redirectTo('/pages_order/detail_local_delivery', {
-						order_id: id
-					}, 'redirectTo');
-				} else if (this.payInfo.order_type == 4) {
-					this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-						order_id: id
-					}, 'redirectTo');
-				} else {
-					this.$util.redirectTo('/pages_order/detail', {
-						order_id: id
-					}, 'redirectTo');
-				}
-			},
-			toOrder(id) {
-				this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toRecharge() {
-				this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toCard() {
-				this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toPresaleOrder() {
-				this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
-			},
-			toExchangeOrder() {
-				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
-				uni.setStorageSync('paySource', '');
+export default {
+	components: {
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			payInfo: {},
+			outTradeNo: '',
+			paySource: '',
+			consumeInfo: {},
+			consumeStatus: 0,
+		};
+	},
+	onLoad(option) {
+		if (option.code) this.outTradeNo = option.code;
+		this.paySource = uni.getStorageSync('paySource');
+	},
+	onShow() {
+		this.getPayInfo();
+		this.getConsume();
+	},
+	methods: {
+		consume(type) {
+			switch (type) {
+				case 'point':
+					this.$util.redirectTo('/pages_tool/member/point_detail', {});
+					break;
+				case 'growth':
+					this.$util.redirectTo('/pages_tool/member/level', {});
+					break;
+				case 'coupon':
+					this.$util.redirectTo('/pages_tool/member/coupon', {});
+					break;
+				default:
+					this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+					break;
 			}
+		},
+		getConsume() {
+			this.$api.sendRequest({
+				url: '/memberconsume/api/config/info',
+				data: {
+					out_trade_no: this.outTradeNo
+				},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						let reward = res.data.value;
+						if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
+							this.consumeStatus = res.data.is_use;
+							this.consumeInfo = res.data.value;
+						}
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		getPayInfo() {
+			this.$api.sendRequest({
+				url: '/api/pay/info',
+				data: {
+					out_trade_no: this.outTradeNo
+				},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.payInfo = res.data;
+						this.payInfo.pay_money = parseFloat(res.data.pay_money);
+						this.payInfo.pay_money += parseFloat(res.data.balance);
+						this.payInfo.pay_money += parseFloat(res.data.balance_money);
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: '未获取到支付信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		goHome() {
+			this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+		},
+		toOrderDetail(id) {
+			if (this.payInfo.order_type == 2) {
+				this.$util.redirectTo('/pages_order/detail_pickup', {
+					order_id: id
+				}, 'redirectTo');
+			} else if (this.payInfo.order_type == 3) {
+				this.$util.redirectTo('/pages_order/detail_local_delivery', {
+					order_id: id
+				}, 'redirectTo');
+			} else if (this.payInfo.order_type == 4) {
+				this.$util.redirectTo('/pages_tool/order/detail_virtual', {
+					order_id: id
+				}, 'redirectTo');
+			} else {
+				this.$util.redirectTo('/pages_order/detail', {
+					order_id: id
+				}, 'redirectTo');
+			}
+		},
+		toOrder(id) {
+			this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
+			uni.setStorageSync('paySource', '');
+		},
+		toRecharge() {
+			this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
+			uni.setStorageSync('paySource', '');
+		},
+		toCard() {
+			this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
+			uni.setStorageSync('paySource', '');
+		},
+		toPresaleOrder() {
+			this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
+			uni.setStorageSync('paySource', '');
+		},
+		toExchangeOrder() {
+			this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
+			uni.setStorageSync('paySource', '');
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.consume-box {
-		padding: $padding;
-		background: #F8F8F8;
-		width: calc(100% - 48rpx);
-		margin: 0 24rpx 0 24rpx;
-		box-sizing: border-box;
-		border-radius: 20rpx;
+.consume-box {
+	padding: $padding;
+	background: #F8F8F8;
+	width: calc(100% - 48rpx);
+	margin: 0 24rpx 0 24rpx;
+	box-sizing: border-box;
+	border-radius: 20rpx;
 
-		.consume-head {
-			display: flex;
-			justify-content: center;
-			font-weight: 500;
+	.consume-head {
+		display: flex;
+		justify-content: center;
+		font-weight: 500;
+		font-size: 26rpx;
+
+		.consume-head-text {
+			line-height: 1;
+		}
+	}
+
+	.consume-list {
+		display: flex;
+	}
+
+	.consume-item {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: $color-title;
+		font-size: $font-size-base;
+		margin-top: 10rpx;
+
+		image {
+			width: 24rpx;
+			margin-right: 4rpx;
+		}
+
+		.consume-value {
 			font-size: 26rpx;
-
-			.consume-head-text {
-				line-height: 1;
-			}
-		}
-
-		.consume-list {
-			display: flex;
-		}
-
-		.consume-item {
-			flex: 1;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: $color-title;
-			font-size: $font-size-base;
-			margin-top: 10rpx;
-
-			image {
-				width: 24rpx;
-				margin-right: 4rpx;
-			}
-
-			.consume-value {
-				font-size: 26rpx;
-			}
-		}
-
-		.consume-remark {
-			color: $color-tip;
-			font-size: $font-size-tag;
-			padding: 10rpx 20rpx;
 		}
 	}
 
-	.clear {
-		clear: both;
+	.consume-remark {
+		color: $color-tip;
+		font-size: $font-size-tag;
+		padding: 10rpx 20rpx;
 	}
+}
 
-	.container {
+.clear {
+	clear: both;
+}
+
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+
+	.result-box {
+		padding-top: 94rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		background-color: #FFFFFF;
+		width: 100%;
+		padding-bottom: 40rpx;
+	}
 
-		.result-box {
-			padding-top: 94rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			background-color: #FFFFFF;
-			width: 100%;
-			padding-bottom: 40rpx;
+	.result-image {
+		width: 80rpx;
+		height: auto;
+		will-change: transform;
+	}
+
+	.msg {
+		font-size: 32rpx;
+		margin-top: 25rpx;
+
+		&.success {
+			color: #09BB07;
 		}
 
-		.result-image {
-			width: 80rpx;
-			height: auto;
-			will-change: transform;
+		&.fail {
+			color: #FF4646;
+		}
+	}
+
+	.pay-amount {
+		font-size: 30rpx;
+		margin: 40rpx 0 24rpx 0;
+		font-weight: 600;
+		line-height: 50rpx;
+
+		text {
+			color: #333333 !important;
+			font-weight: bold !important;
 		}
 
-		.msg {
-			font-size: 32rpx;
-			margin-top: 25rpx;
-
-			&.success {
-				color: #09BB07;
-			}
-
-			&.fail {
-				color: #FF4646;
-			}
+		.unit {
+			margin-right: 4rpx;
 		}
 
-		.pay-amount {
+		.large {
+			font-size: 60rpx !important;
+		}
+
+		.small {
+			font-size: 36rpx !important;
+		}
+	}
+
+	.action {
+		width: 100%;
+		height: 80rpx;
+		display: flex;
+		justify-content: center;
+		box-sizing: border-box;
+		margin-top: 24rpx;
+
+		.btn {
 			font-size: 30rpx;
-			margin: 40rpx 0 24rpx 0;
-			font-weight: 600;
-			line-height: 50rpx;
-
-			text {
-				color: #333333 !important;
-				font-weight: bold !important;
-			}
-
-			.unit {
-				margin-right: 4rpx;
-			}
-
-			.large {
-				font-size: 60rpx !important;
-			}
-
-			.small {
-				font-size: 36rpx !important;
-			}
-		}
-
-		.action {
-			width: 100%;
-			height: 80rpx;
-			display: flex;
-			justify-content: center;
+			width: 200rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			text-align: center;
+			border-radius: 66rpx;
+			border: 1px solid $color-tip;
 			box-sizing: border-box;
-			margin-top: 24rpx;
 
-			.btn {
-				font-size: 30rpx;
-				width: 200rpx;
-				height: 66rpx;
-				line-height: 66rpx;
-				text-align: center;
-				border-radius: 66rpx;
-				border: 1px solid $color-tip;
-				box-sizing: border-box;
-
-				&:last-child {
-					margin-left: 40rpx;
-				}
-			}
-
-			.go-home {
-				background-color: $base-color;
-				color: #fff;
-				border-color: $base-color;
+			&:last-child {
+				margin-left: 40rpx;
 			}
 		}
-	}
 
-	/deep/ .goods-recommend {
-		margin-top: 30rpx;
+		.go-home {
+			background-color: $base-color;
+			color: #fff;
+			border-color: $base-color;
+		}
 	}
+}
+
+/deep/ .goods-recommend {
+	margin-top: 30rpx;
+}
 </style>
 
-<style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+<style lang="scss" scoped>
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/pay/wx_pay.vue b/pages_tool/pay/wx_pay.vue
index f9af381..d6af337 100644
--- a/pages_tool/pay/wx_pay.vue
+++ b/pages_tool/pay/wx_pay.vue
@@ -12,15 +12,15 @@ export default {
 	name: 'wx_pay',
 	data() {
 		return {
-			show : true,
-			wx_alipay : "",
-			out_trade_no : ""
+			show: true,
+			wx_alipay: "",
+			out_trade_no: ""
 		};
 	},
 	onLoad(options) {
 		this.wx_alipay = options.wx_alipay || '';
 		this.out_trade_no = options.out_trade_no || '';
-		if(!this.$util.isWeiXin() && this.wx_alipay){
+		if (!this.$util.isWeiXin() && this.wx_alipay) {
 			this.show = false;
 			location.href = this.wx_alipay;
 		}
@@ -36,7 +36,7 @@ export default {
 				success: res => {
 					if (res.code >= 0 && res.data) {
 						this.checkPayStatus();
-					} 
+					}
 				}
 			});
 		},
@@ -64,29 +64,33 @@ export default {
 </script>
 
 <style lang="scss">
-.launch-mask{
-	position:fixed;
-	top:0px;
+.launch-mask {
+	position: fixed;
+	top: 0px;
 	left: 0px;
-	width:100%;
+	width: 100%;
 	height: 100%;
-	background:rgba(0,0,0,0.8);
-	.mask-img{
+	background: rgba(0, 0, 0, 0.8);
+
+	.mask-img {
 		text-align: right;
-		margin:10% 10px 10px 30px;
-		image{
+		margin: 10% 10px 10px 30px;
+
+		image {
 			width: 50px;
-			height:117px;
-			margin-right:9%
+			height: 117px;
+			margin-right: 9%
 		}
 	}
-	.mask-word{
+
+	.mask-word {
 		color: #fff;
 		text-align: center;
 		font-weight: bold;
 		font-size: 18px;
-		text{
-			color:#FF0036 !important
+
+		text {
+			color: #FF0036 !important
 		}
 	}
 }
diff --git a/pages_tool/recharge/list.vue b/pages_tool/recharge/list.vue
index 1f4eeaa..318fb67 100644
--- a/pages_tool/recharge/list.vue
+++ b/pages_tool/recharge/list.vue
@@ -1,52 +1,56 @@
 <template>
 	<view class="page" :style="themeColor">
-		
+
 		<view>
-		<!-- 	<view class="recharge-title">充值</view>
+			<!-- 	<view class="recharge-title">充值</view>
 			<view class="account-box">
 				<view class="label">账户余额</view>
 				<view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view>
 			</view> -->
-			
+
 			<view class="recharge-box">
 				<view class="recharge-box-title">充值金额
-					<view @click="toOrderList"><text class="color-base-text" style="color:#1db03b !important">充值记录</text></view>
+					<view @click="toOrderList"><text class="color-base-text"
+							style="color:#1db03b !important">充值记录</text></view>
 				</view>
 				<view class="box-content">
-						
-						<view class="money">
-							<text class="label">￥</text>
-							<view class="input-box">
-								<input class="reg-input" v-model="payMoney" placeholder="请输入充值金额" placeholder-style="font-size:32rpx;color:#969696;font-weight:500"></input>
-							</view>
+
+					<view class="money">
+						<text class="label">￥</text>
+						<view class="input-box">
+							<input class="reg-input" v-model="payMoney" placeholder="请输入充值金额"
+								placeholder-style="font-size:32rpx;color:#969696;font-weight:500"></input>
 						</view>
-						
-					<view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index" @click="itemClick(index, item.recharge_id, item.buy_price)" :class="isIndex == index ? 'active' : ''">
+					</view>
+
+					<view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index"
+						@click="itemClick(index, item.recharge_id, item.buy_price)"
+						:class="isIndex == index ? 'active' : ''">
 						<view class="price1 ">
 							<text class="price-font">{{ parseFloat(item.face_value).toFixed(0) }}</text>
 							<text>元</text>
 						</view>
 						<view class="price2">售价 {{ item.buy_price }} 元</view>
 					</view>
-					
+
 					<!-- <view class="content-item" @click="openRecharge()">
 						<view class="price1 ">
 							<text class="other">其他金额</text>
 						</view>
 					</view> -->
-					
+
 				</view>
-				
-			<!-- 	<view class="box-text" v-if="isIndex !== -1">
+
+				<!-- 	<view class="box-text" v-if="isIndex !== -1">
 					注：充值 {{ list[isIndex].face_value }} 元赠送：
 					<text>{{ list[isIndex].point }} 积分，</text>
 					<text>{{ list[isIndex].growth }} 成长值</text>
 					<text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text>
 				</view> -->
 			</view>
- 
+
 		</view>
-	<!-- 	<view class="explain">
+		<!-- 	<view class="explain">
 			<view class="title">充值说明</view>
 			<view class="explain_list">
 				<view v-for="(item,index) in list" :key="index"  v-if="item.point || item.growth || item.coupon_id != ''">
@@ -64,10 +68,10 @@
 			<view class="rechargeList">
 				<view class="tip">请输入充值金额</view>
 				<view class="input color-tip">
-					{{keywordsInfo.price?keywordsInfo.price:'金额'}}<text class="color-base-text">元</text>
+					{{ keywordsInfo.price ? keywordsInfo.price : '金额' }}<text class="color-base-text">元</text>
 				</view>
 				<view class="input color-tip">
-					<text class="color-base-text" v-if="payMoney > 0">售价{{payMoney}}元</text>
+					<text class="color-base-text" v-if="payMoney > 0">售价{{ payMoney }}元</text>
 				</view>
 				<view class="keywords">
 					<view class="keywords-left">
@@ -94,108 +98,164 @@
 		<!-- 选择支付方式弹窗 -->
 		<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="toPay"></ns-payment>
 		<view style="background: #fff;width: 100%;position: fixed;bottom: 0rpx;">
-			<button class="add-account" type="primary" @click="submitPayment" >充值</button>
+			<button class="add-account" type="primary" @click="submitPayment">充值</button>
 		</view>
-		
+
 		<!-- <button class="add-account" type="primary" :disabled="recharge_id > 0 ? false : true" @click="openChoosePayment">充值</button> -->
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
 
 <script>
-import nsPayment from '@/components/ns-payment/ns-payment.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	export default {
-	components: { nsPayment, loadingCover },
-		data() {
-			return {
-				list: [],
-				balanceInfo: {
-					balance: 0,
-					balance_money: 0
-				},
-				isIndex: -1,
-				recharge_id: '',
-				amount: '',
-				payMoney: '',
-				keywordsInfo: {
-					price: 0,
-					minPrice: 1,
-					maxPrice: 30
+
+export default {
+	components: {
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+		nsPayment: () => import('@/components/ns-payment/ns-payment.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
+	data() {
+		return {
+			list: [],
+			balanceInfo: {
+				balance: 0,
+				balance_money: 0
+			},
+			isIndex: -1,
+			recharge_id: '',
+			amount: '',
+			payMoney: '',
+			keywordsInfo: {
+				price: 0,
+				minPrice: 1,
+				maxPrice: 30
+			}
+		};
+	},
+	onShow() {
+		this.getUserInfo();
+		this.getData();
+	},
+	methods: {
+		openRecharge() {
+			this.isIndex = -1;
+			this.payMoney = 0;
+			this.keywordsInfo.price = 0;
+			this.recharge_id = '';
+			this.$refs.rechargePopup.open()
+		},
+		submitPayment() {
+			this.isIndex = -1;
+			this.keywordsInfo.price = 0;
+			this.recharge_id = '';
+			this.amount = this.payMoney;
+			this.openChoosePayment()
+		},
+		toOrderList() {
+			this.$util.redirectTo('/pages_tool/recharge/order_list');
+		},
+		//点击每一个
+		itemClick(index, id, buy_price) {
+			if (this.amount) this.amount = '';
+			this.isIndex = index;
+			this.recharge_id = id;
+			this.payMoney = parseFloat(buy_price);
+		},
+		//键盘点击
+		keywordsDown(val) {
+			var temp = this.keywordsInfo.price == 0 ? val : this.keywordsInfo.price + '' + val, tempamount = temp
+			this.keywordsInfo.price = temp;
+			this.payMoney = tempamount;
+		},
+		delPrice() {
+			var temp = this.keywordsInfo.price.toString()
+			if (temp.length) {
+				this.keywordsInfo.price = temp.slice(0, temp.length - 1)
+				if (this.keywordsInfo.price.length > 0) {
+					this.payMoney = this.keywordsInfo.price;
+				} else {
+					this.payMoney = '';
 				}
-			};
+			}
 		},
-		onShow() {
-			this.getUserInfo();
-			this.getData();
-		},
-		methods: {
-			openRecharge() {
-				this.isIndex = -1;
-				this.payMoney = 0;
-				this.keywordsInfo.price = 0;
-				this.recharge_id = '';
-				this.$refs.rechargePopup.open()
-			},
-			submitPayment(){
-				this.isIndex = -1;
-				this.keywordsInfo.price = 0;
-				this.recharge_id = '';
+		keywordsPayment() {
+			if (this.keywordsInfo.price > 0) {
 				this.amount = this.payMoney;
+				this.$refs.rechargePopup.close()
 				this.openChoosePayment()
-			},
-			toOrderList() {
-				this.$util.redirectTo('/pages_tool/recharge/order_list');
-			},
-			//点击每一个
-			itemClick(index, id, buy_price) {
-				if (this.amount) this.amount = '';
-				this.isIndex = index;
-				this.recharge_id = id;
-				this.payMoney = parseFloat(buy_price);
-			},
-			//键盘点击
-			keywordsDown(val) {
-				var temp = this.keywordsInfo.price == 0 ? val : this.keywordsInfo.price + '' + val, tempamount = temp
-				this.keywordsInfo.price = temp;
-				this.payMoney = tempamount;
-			},
-			delPrice() {
-				var temp = this.keywordsInfo.price.toString()
-				if (temp.length) {
-					this.keywordsInfo.price = temp.slice(0, temp.length - 1)
-					if (this.keywordsInfo.price.length > 0) {
-						this.payMoney = this.keywordsInfo.price;
+			} else {
+				this.$util.showToast({
+					title: "请输入充值金额"
+				})
+			}
+
+		},
+		//输入框聚焦
+		cumberFocus() {
+			this.isIndex = -1;
+		},
+		getUserInfo() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/info',
+				data: {
+					account_type: 'balance,balance_money'
+				},
+				success: res => {
+					if (res.data) {
+						this.balanceInfo = res.data;
 					} else {
-						this.payMoney = '';
+						this.$util.showToast({
+							title: res.message
+						});
 					}
 				}
-			},
-			keywordsPayment() {
-				if (this.keywordsInfo.price > 0) {
-					this.amount = this.payMoney;
-					this.$refs.rechargePopup.close()
-					this.openChoosePayment()
-				} else {
-					this.$util.showToast({
-						title: "请输入充值金额"
-					})
-				}
+			});
+		},
+		getData() {
+			this.$api.sendRequest({
+				url: '/memberrecharge/api/memberrecharge/page',
+				data: {
+					page_size: 100,
+					page: 1
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					//设置列表数据
+					this.list = newArr; //追加新数据
 
-			},
-			//输入框聚焦
-			cumberFocus() {
-				this.isIndex = -1;
-			},
-			getUserInfo() {
+					if (this.list.length > 0) {
+						this.isIndex = 0;
+						this.recharge_id = this.list[0]['recharge_id'];
+						this.payMoney = parseFloat(this.list[0]['buy_price']);
+					}
+
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: () => {
+					//联网失败的回调
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		toPay() {
+			if (this.recharge_id !== '') {
 				this.$api.sendRequest({
-					url: '/api/memberaccount/info',
+					url: '/memberrecharge/api/ordercreate/create',
 					data: {
-						account_type: 'balance,balance_money'
+						recharge_id: this.recharge_id
 					},
 					success: res => {
-						if (res.data) {
-							this.balanceInfo = res.data;
+						if (res.data && res.code == 0) {
+							this.$refs.choosePaymentPopup.getPayInfo(res.data);
 						} else {
 							this.$util.showToast({
 								title: res.message
@@ -203,439 +263,403 @@ import loadingCover from '@/components/loading-cover/loading-cover.vue';
 						}
 					}
 				});
-			},
-			getData() {
+			} else if (this.amount !== '') {
 				this.$api.sendRequest({
-					url: '/memberrecharge/api/memberrecharge/page',
+					url: '/memberrecharge/api/ordercreate/create',
 					data: {
-						page_size: 100,
-						page: 1
+						recharge_id: 0,
+						face_value: this.amount
 					},
 					success: res => {
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
+						if (res.data && res.code == 0) {
+							this.$refs.choosePaymentPopup.getPayInfo(res.data);
 						} else {
 							this.$util.showToast({
-								title: msg
+								title: res.message
 							});
 						}
-						//设置列表数据
-						this.list = newArr; //追加新数据
-						
-						if(this.list.length > 0){
-							this.isIndex = 0;
-							this.recharge_id = this.list[0]['recharge_id'];
-							this.payMoney = parseFloat(this.list[0]['buy_price']);
-						}
-						
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: () => {
-						//联网失败的回调
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
 				});
-			},
-			toPay() {
-				if (this.recharge_id !== '') {
-					this.$api.sendRequest({
-						url: '/memberrecharge/api/ordercreate/create',
-						data: {
-							recharge_id: this.recharge_id
-						},
-						success: res => {
-							if (res.data && res.code == 0) {
-								this.$refs.choosePaymentPopup.getPayInfo(res.data);
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else if (this.amount !== '') {
-					this.$api.sendRequest({
-						url: '/memberrecharge/api/ordercreate/create',
-						data: {
-							recharge_id: 0,
-							face_value: this.amount
-						},
-						success: res => {
-							if (res.data && res.code == 0) {
-								this.$refs.choosePaymentPopup.getPayInfo(res.data);
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else {
-					this.$util.showToast({
-						title: '请选择套餐'
-					});
-				}
-			},
-			imageError(index) {
-				this.list[index].cover_img = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment() {
-				uni.setStorageSync('paySource', 'recharge');
-				if (this.amount !== '') this.payMoney = parseFloat(this.amount);
-				this.$refs.choosePaymentPopup.open();
+			} else {
+				this.$util.showToast({
+					title: '请选择套餐'
+				});
 			}
+		},
+		imageError(index) {
+			this.list[index].cover_img = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		// 显示选择支付方式弹框
+		openChoosePayment() {
+			uni.setStorageSync('paySource', 'recharge');
+			if (this.amount !== '') this.payMoney = parseFloat(this.amount);
+			this.$refs.choosePaymentPopup.open();
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.page{
-		// min-height: 100vh;
-		// // width: 100%;
-		// background-color: #FFFFFF;
-		// padding: 32rpx;
-		box-sizing: border-box;
-	}
-	
-	/deep/ .mescroll-uni-fixed {
-		bottom: 280rpx !important;
-	}
-	.recharge-title{
-		font-size: 60rpx;
+.page {
+	// min-height: 100vh;
+	// // width: 100%;
+	// background-color: #FFFFFF;
+	// padding: 32rpx;
+	box-sizing: border-box;
+}
+
+/deep/ .mescroll-uni-fixed {
+	bottom: 280rpx !important;
+}
+
+.recharge-title {
+	font-size: 60rpx;
+	font-weight: bold;
+}
+
+.account-box {
+	margin-top: 30rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: baseline;
+	border-bottom: 2rpx solid #F6F6F6;
+	padding-bottom: 20rpx;
+
+	.label {
+		font-size: 30rpx;
 		font-weight: bold;
 	}
-	.account-box{
-		margin-top: 30rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: baseline;
-		border-bottom: 2rpx solid #F6F6F6;
-		padding-bottom: 20rpx;
-		.label{
-			font-size:30rpx;
-			font-weight:bold;
-		}
-		.value{
-			
-			text{
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-			.price-font{
-				font-size: 60rpx;
-				font-weight: bold;
-			}
-			
-		}
-	}
-	.explain {
-		margin-top: 80rpx;
-		padding: $padding 0;
-		background-color: #fff;
-		border-radius: $border-radius;
 
-		.title {
-			font-size: 32rpx;
+	.value {
+
+		text {
+			font-size: 28rpx;
 			font-weight: bold;
 		}
 
-		.explain_list {
-
-			view {
-				font-size: $font-size-sub;
-				color: $color-tip;
-			}
+		.price-font {
+			font-size: 60rpx;
+			font-weight: bold;
 		}
+
+	}
+}
+
+.explain {
+	margin-top: 80rpx;
+	padding: $padding 0;
+	background-color: #fff;
+	border-radius: $border-radius;
+
+	.title {
+		font-size: 32rpx;
+		font-weight: bold;
 	}
 
-	.rechargeList {
-		.tip {
-			padding: $margin-both;
-			text-align: center;
-			font-size: $font-size-toolbar;
+	.explain_list {
+
+		view {
+			font-size: $font-size-sub;
+			color: $color-tip;
+		}
+	}
+}
+
+.rechargeList {
+	.tip {
+		padding: $margin-both;
+		text-align: center;
+		font-size: $font-size-toolbar;
+	}
+
+	.input {
+		text-align: center;
+
+		text {
+			margin-left: 10rpx;
 		}
 
-		.input {
-			text-align: center;
+		margin-bottom: $margin-updown;
+	}
 
-			text {
-				margin-left: 10rpx;
-			}
+	.keywords {
+		display: flex;
+		border-top: 1px solid $color-line;
+		margin-top: $margin-updown;
 
-			margin-bottom: $margin-updown;
-		}
-
-		.keywords {
+		.keywords-left {
+			flex: 1;
 			display: flex;
-			border-top: 1px solid $color-line;
-			margin-top: $margin-updown;
+			flex-wrap: wrap;
 
-			.keywords-left {
-				flex: 1;
-				display: flex;
-				flex-wrap: wrap;
+			>view {
+				width: calc((100% - 3px) / 3);
+				text-align: center;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-right: 1px solid $color-line;
+				border-bottom: 1px solid $color-line;
+				font-size: 40rpx;
 
-				>view {
-					width: calc((100% - 3px) / 3);
-					text-align: center;
-					height: 112rpx;
-					line-height: 112rpx;
-					border-right: 1px solid $color-line;
-					border-bottom: 1px solid $color-line;
-					font-size: 40rpx;
-
-					&.active:active {
-						background-color: rgba($color: #000000, $alpha: 0.5);
-					}
+				&.active:active {
+					background-color: rgba($color: #000000, $alpha: 0.5);
 				}
 			}
+		}
 
-			.keywords-right {
-				display: flex;
-				flex-wrap: wrap;
-				flex-direction: column;
-				width: 200rpx;
+		.keywords-right {
+			display: flex;
+			flex-wrap: wrap;
+			flex-direction: column;
+			width: 200rpx;
 
-				text-align: center;
+			text-align: center;
 
-				>view {
-					flex: 1;
-					line-height: 228rpx;
+			>view {
+				flex: 1;
+				line-height: 228rpx;
 
-					&:last-child {
-						color: #fff
-					}
+				&:last-child {
+					color: #fff
 				}
 			}
 		}
 	}
+}
 
-	.recharge-price {
-		width: calc(100% - 60rpx);
-		background-color: #ffffff;
-		margin: 20rpx 30rpx 0;
-		border-radius: 10rpx;
-		padding: 30rpx 30rpx 25rpx;
-		box-sizing: border-box;
+.recharge-price {
+	width: calc(100% - 60rpx);
+	background-color: #ffffff;
+	margin: 20rpx 30rpx 0;
+	border-radius: 10rpx;
+	padding: 30rpx 30rpx 25rpx;
+	box-sizing: border-box;
 
-		.recharge-price-title {
-			font-size: $font-size-base;
+	.recharge-price-title {
+		font-size: $font-size-base;
+		color: $color-title;
+		line-height: 1;
+	}
+
+	.recharge-price-custom {
+		border-bottom: 1px solid #dddddd;
+		padding-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		margin-top: 45rpx;
+
+		text {
+			font-size: 54rpx;
 			color: $color-title;
 			line-height: 1;
 		}
 
-		.recharge-price-custom {
-			border-bottom: 1px solid #dddddd;
-			padding-bottom: 20rpx;
-			display: flex;
-			align-items: center;
-			margin-top: 45rpx;
-
-			text {
-				font-size: 54rpx;
-				color: $color-title;
-				line-height: 1;
-			}
-
-			input {
-				font-size: 54rpx;
-				line-height: 1;
-			}
-		}
-
-		.recharge-price-desc {
-			display: flex;
-			margin-top: 16rpx;
-			align-items: center;
-
-			image {
-				width: 34rpx;
-				height: 34rpx;
-				margin-right: 13rpx;
-			}
-
-			text {
-				font-size: $font-size-sub;
-				color: $color-tip;
-				line-height: 1;
-			}
+		input {
+			font-size: 54rpx;
+			line-height: 1;
 		}
 	}
 
-	.recharge-box {
-		
-		padding:28rpx 24rpx 32rpx;
-		background: #fff;
-		height: 100%;
-		box-sizing: border-box;
-		border-radius: 24rpx;
-		margin: 32rpx;
-		.recharge-box-title {
-			font-size: $font-size-base;
-			color: #212121;
-			line-height: 1;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 28rpx;
+	.recharge-price-desc {
+		display: flex;
+		margin-top: 16rpx;
+		align-items: center;
+
+		image {
+			width: 34rpx;
+			height: 34rpx;
+			margin-right: 13rpx;
 		}
 
-		.box-title {
-			text-align: center;
-			font-size: $font-size-toolbar;
-		}
-
-		.box-custom {
-			width: 226rpx;
-			border-bottom: 1px solid #dddddd;
-			margin: 0 auto;
-			margin-top: 49rpx;
-			line-height: 1;
-			padding-bottom: 10rpx;
-			box-sizing: border-box;
-
-			.pla-number {
-				font-size: 30rpx;
-			}
-
-			input {
-				height: 97rpx;
-				width: 100%;
-				font-size: 62rpx;
-				color: #000;
-				text-align: center;
-				line-height: 1;
-			}
-		}
-
-		.box-content {
-			width: 100%;
-			box-sizing: border-box;
-			display: flex;
-			flex-wrap: wrap;
-			max-height: 50vh;
-			overflow-y: scroll;
-			.money{
-				width: 100%;
-				display: -webkit-box;
-				display: -webkit-flex;
-				display: flex;
-				-webkit-flex-wrap: nowrap;
-				flex-wrap: nowrap;
-				-webkit-box-align: end;
-				-webkit-align-items: flex-end;
-				align-items: flex-end;
-				.label{
-					width: 30px;
-					font-size: 30px;
-					text-align: center;
-					line-height: 42px;
-					padding-bottom: 2px;
-					color: #212121;
-					font-weight: 600;
-					-webkit-flex-shrink: 0;
-					flex-shrink: 0;
-				}
-				.input-box{
-				    width: 0;
-				    -webkit-box-flex: 1;
-				    -webkit-flex: 1;
-				    flex: 1;
-					.reg-input {
-					    height: 48px !important;
-						font-size: 34px !important;
-						line-height: 48px !important;
-						height: 48px;
-						font-weight: 700 !important;
-						color: #212121;
-					}
-				}
-			}
-			.content-item {
-				width: calc((100% - 48rpx) / 3);
-				margin-right: 24rpx;
-				height: 142rpx;
-				margin-top: 25rpx;
-				border-radius: 16rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				color: $color-title;
-				box-sizing: border-box;
-				text-align: center;
-				background: #F7F7FB;
-				
-				&:nth-child(3n) {
-					margin-right: 0;
-				}
-
-				.price1 {
-					font-size: $font-size-base;
-					display: flex;
-					align-items: flex-end;
-					color: #333333;
-					text:first-child {
-						font-size: 40rpx;
-						line-height: 1;
-					}
-
-					text:nth-child(2) {
-						font-size: $font-size-base;
-						line-height: 1;
-					}
-					.other{
-						font-size: 32rpx!important;
-						color: #666666;
-					}
-				}
-
-				.price2 {
-					font-size: $font-size-tag;
-					color: #666666;
-					line-height: 1;
-					margin-top: 16rpx;
-				}
-
-				&.color-base-bg {
-
-					.price1,
-					.price2 {
-						color: #ffffff !important;
-					}
-				}
-				&.active{
-					background: linear-gradient(136deg, var(--promotion-aux-color) 0%, var(--promotion-color) 100%);
-					.price1,
-					.price2 {
-						color: #ffffff !important;
-					}
-				}
-			}
-			
-		}
-
-		.box-text {
-			margin-top: 40rpx;
+		text {
 			font-size: $font-size-sub;
-			color: var(--main-color);
+			color: $color-tip;
+			line-height: 1;
 		}
 	}
-	.add-account {
-		margin: 0;
-		margin-top: 5vh;
-		height: 76rpx;
-		line-height: 76rpx;
-		// width: 100%;
-		border-radius: 90rpx;
-		background: #1db03b!important;
-		color:#fff !important;
-		font-size: 28rpx;
-		margin: 18rpx 24rpx;
+}
+
+.recharge-box {
+
+	padding: 28rpx 24rpx 32rpx;
+	background: #fff;
+	height: 100%;
+	box-sizing: border-box;
+	border-radius: 24rpx;
+	margin: 32rpx;
+
+	.recharge-box-title {
+		font-size: $font-size-base;
+		color: #212121;
+		line-height: 1;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 28rpx;
 	}
+
+	.box-title {
+		text-align: center;
+		font-size: $font-size-toolbar;
+	}
+
+	.box-custom {
+		width: 226rpx;
+		border-bottom: 1px solid #dddddd;
+		margin: 0 auto;
+		margin-top: 49rpx;
+		line-height: 1;
+		padding-bottom: 10rpx;
+		box-sizing: border-box;
+
+		.pla-number {
+			font-size: 30rpx;
+		}
+
+		input {
+			height: 97rpx;
+			width: 100%;
+			font-size: 62rpx;
+			color: #000;
+			text-align: center;
+			line-height: 1;
+		}
+	}
+
+	.box-content {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		flex-wrap: wrap;
+		max-height: 50vh;
+		overflow-y: scroll;
+
+		.money {
+			width: 100%;
+			display: -webkit-box;
+			display: -webkit-flex;
+			display: flex;
+			-webkit-flex-wrap: nowrap;
+			flex-wrap: nowrap;
+			-webkit-box-align: end;
+			-webkit-align-items: flex-end;
+			align-items: flex-end;
+
+			.label {
+				width: 30px;
+				font-size: 30px;
+				text-align: center;
+				line-height: 42px;
+				padding-bottom: 2px;
+				color: #212121;
+				font-weight: 600;
+				-webkit-flex-shrink: 0;
+				flex-shrink: 0;
+			}
+
+			.input-box {
+				width: 0;
+				-webkit-box-flex: 1;
+				-webkit-flex: 1;
+				flex: 1;
+
+				.reg-input {
+					height: 48px !important;
+					font-size: 34px !important;
+					line-height: 48px !important;
+					height: 48px;
+					font-weight: 700 !important;
+					color: #212121;
+				}
+			}
+		}
+
+		.content-item {
+			width: calc((100% - 48rpx) / 3);
+			margin-right: 24rpx;
+			height: 142rpx;
+			margin-top: 25rpx;
+			border-radius: 16rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			color: $color-title;
+			box-sizing: border-box;
+			text-align: center;
+			background: #F7F7FB;
+
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+
+			.price1 {
+				font-size: $font-size-base;
+				display: flex;
+				align-items: flex-end;
+				color: #333333;
+
+				text:first-child {
+					font-size: 40rpx;
+					line-height: 1;
+				}
+
+				text:nth-child(2) {
+					font-size: $font-size-base;
+					line-height: 1;
+				}
+
+				.other {
+					font-size: 32rpx !important;
+					color: #666666;
+				}
+			}
+
+			.price2 {
+				font-size: $font-size-tag;
+				color: #666666;
+				line-height: 1;
+				margin-top: 16rpx;
+			}
+
+			&.color-base-bg {
+
+				.price1,
+				.price2 {
+					color: #ffffff !important;
+				}
+			}
+
+			&.active {
+				background: linear-gradient(136deg, var(--promotion-aux-color) 0%, var(--promotion-color) 100%);
+
+				.price1,
+				.price2 {
+					color: #ffffff !important;
+				}
+			}
+		}
+
+	}
+
+	.box-text {
+		margin-top: 40rpx;
+		font-size: $font-size-sub;
+		color: var(--main-color);
+	}
+}
+
+.add-account {
+	margin: 0;
+	margin-top: 5vh;
+	height: 76rpx;
+	line-height: 76rpx;
+	// width: 100%;
+	border-radius: 90rpx;
+	background: #1db03b !important;
+	color: #fff !important;
+	font-size: 28rpx;
+	margin: 18rpx 24rpx;
+}
 </style>
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
index 8b7870e..c35f44e 100644
--- a/pages_tool/recharge/order_list.vue
+++ b/pages_tool/recharge/order_list.vue
@@ -9,11 +9,14 @@
 								<text class="color-tip font-size-tag">{{ orderItem.order_no }}</text>
 							</view>
 							<view class="align-right">
-								<text class="color-tip font-size-tag">{{ $util.timeStampTurnTime(orderItem.create_time) }}</text>
+								<text class="color-tip font-size-tag">{{ $util.timeStampTurnTime(orderItem.create_time)
+									}}</text>
 							</view>
 						</view>
 						<view class="order-body">
-							<view class="goods_info_flex"><view class="goods-name font-size-base">充值成功</view></view>
+							<view class="goods_info_flex">
+								<view class="goods-name font-size-base">充值成功</view>
+							</view>
 
 							<view class="goods-img color-base-text">
 								￥
@@ -40,17 +43,13 @@
 </template>
 
 <script>
-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';
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 
 export default {
-    components: { 
-		nsLogin, 
-		loadingCover, 
-		nsEmpty, 
-		MescrollUni 
+	components: {
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 	},
 	data() {
 		return {
@@ -129,7 +128,7 @@ export default {
 		line-height: 80rpx;
 		border-bottom: 1px solid #e3e3e3;
 
-		& > view {
+		&>view {
 			flex: 1;
 			line-height: 1;
 			font-weight: 500;
diff --git a/pages_tool/seal/medium/detail.vue b/pages_tool/seal/medium/detail.vue
index 5010303..6efc34c 100644
--- a/pages_tool/seal/medium/detail.vue
+++ b/pages_tool/seal/medium/detail.vue
@@ -2,17 +2,17 @@
   <view>
     <view class="content">
       <view class="goods-attr">
-        <view class="title">{{title}}</view>
+        <view class="title">{{ title }}</view>
         <view class="attr-wrap">
           <block v-for="(item, index) in list" :key="index">
             <view class="item">
-              <text class="attr-name" :style="{background: item.background}">{{item.text}}</text>
-              <text class="value-name" :style="{color: item.color}">{{item.value}}</text>
+              <text class="attr-name" :style="{ background: item.background }">{{ item.text }}</text>
+              <text class="value-name" :style="{ color: item.color }">{{ item.value }}</text>
             </view>
           </block>
         </view>
       </view>
-      <block v-if="g0>0">
+      <block v-if="g0 > 0">
         <view class="foot">
           <view @tap="generateImage" class="item" style="margin-right:30rpx;">导出图片</view>
           <view @tap="generatePdf" class="item">导出PDF</view>
@@ -60,7 +60,7 @@ export default {
               const filePath = res.tempFilePath;
               uni.shareFileMessage({
                 filePath: filePath,
-                success: () => {},
+                success: () => { },
                 fail: console.error
               });
             }
diff --git a/pages_tool/seal/medium/search.vue b/pages_tool/seal/medium/search.vue
index b84606f..7b3cb61 100644
--- a/pages_tool/seal/medium/search.vue
+++ b/pages_tool/seal/medium/search.vue
@@ -3,7 +3,8 @@
     <view class="content">
       <view class="cate-search">
         <view class="search-box">
-          <input class="uni-input" maxlength="50" confirm-type="search" :focus="true" placeholder="请输入介质名称 '如汽油'" v-model="inputValue" @focus="inputFocus" @confirm="search" @input="inputChange" />
+          <input class="uni-input" maxlength="50" confirm-type="search" :focus="true" placeholder="请输入介质名称 '如汽油'"
+            v-model="inputValue" @focus="inputFocus" @confirm="search" @input="inputChange" />
           <text @tap="search" class="iconfont icon-sousuo3"></text>
         </view>
       </view>
@@ -17,7 +18,7 @@
               <view class="history-bottom">
                 <block v-for="(item, index) in list" :key="index">
                   <view @tap="otherSearch(item, index)" @longtap="deleteItem(item, index)" class="history-li">
-                    <view>{{item.name}}</view>
+                    <view>{{ item.name }}</view>
                   </view>
                 </block>
               </view>
@@ -33,11 +34,9 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty';
-
 export default {
   components: {
-    nsEmpty
+    nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
   },
   data() {
     return {
diff --git a/pages_tool/seal/structure.vue b/pages_tool/seal/structure.vue
index c8b9c03..3dd1d29 100644
--- a/pages_tool/seal/structure.vue
+++ b/pages_tool/seal/structure.vue
@@ -2,14 +2,15 @@
   <view>
     <view class="picker-container">
       <view v-for="(item, idx) in pickerList" :key="item.id" class="single-picker">
-        <picker mode="selector" :value="item.value" :range="item.range" range-key="name" @change="bindPickerChange($event, idx, item)">
-          <view class="picker">当前选择：{{item.range[item.value].name || '请选择'}}</view>
+        <picker mode="selector" :value="item.value" :range="item.range" range-key="name"
+          @change="bindPickerChange($event, idx, item)">
+          <view class="picker">当前选择：{{ item.range[item.value].name || '请选择' }}</view>
         </picker>
       </view>
     </view>
     <block v-if="answerName">
       <view style="font-size:32rpx;color:#ff0000;text-align:center;">
-        <view style="color:#ff0000;">选型结果：</view>{{answerName}}
+        <view style="color:#ff0000;">选型结果：</view>{{ answerName }}
       </view>
     </block>
     <block v-if="files_url">
diff --git a/pages_tool/storeclose/storeclose.vue b/pages_tool/storeclose/storeclose.vue
index c710e27..ae33a05 100644
--- a/pages_tool/storeclose/storeclose.vue
+++ b/pages_tool/storeclose/storeclose.vue
@@ -16,15 +16,15 @@ export default {
 	},
 	onShow() {
 		this.isIphoneX = this.$util.uniappIsIPhoneX();
-		
+
 		this.getSiteStatus();
-		
+
 		// #ifdef MP-WEIXIN
 		wx.hideHomeButton();
 		// #endif
 	},
-	methods:{
-		getSiteStatus(){
+	methods: {
+		getSiteStatus() {
 			this.$api.sendRequest({
 				url: '/api/site/status',
 				data: {},
@@ -78,6 +78,7 @@ export default {
 		margin-right: 10rpx;
 	}
 }
+
 .closeBox {
 	width: 100%;
 	display: flex;
@@ -86,9 +87,11 @@ export default {
 	align-items: center;
 	margin-top: 330rpx;
 }
+
 image {
 	width: 240rpx;
 }
+
 .close-title {
 	font-size: $font-size-toolbar;
 	color: $color-tip;
diff --git a/pages_tool/vr/index.vue b/pages_tool/vr/index.vue
index 66e4295..91bb1c3 100644
--- a/pages_tool/vr/index.vue
+++ b/pages_tool/vr/index.vue
@@ -3,11 +3,14 @@
 		<view class="iconfont iconshang navigate-back" @click="navigateBack"></view>
 		<web-view :src="src"></web-view>
 	</view>
-<!-- 	<diy-bottom-nav></diy-bottom-nav> -->
+	<!-- 	<diy-bottom-nav></diy-bottom-nav> -->
 </template>
 
 <script>
 export default {
+	components: {
+		diyBottomNav: () => import('@/components-diy/diy-bottom-nav.vue'),
+	},
 	data() {
 		return {
 			src: ''
@@ -21,7 +24,7 @@ export default {
 				console.log(res)
 				if (res.code == 0) {
 					uni.setNavigationBarTitle({
-						title:res.data.title
+						title: res.data.title
 					})
 					this.src = res.data.url
 				}
diff --git a/pages_tool/weapp/order_shipping.vue b/pages_tool/weapp/order_shipping.vue
index f63a3ad..fabeb14 100644
--- a/pages_tool/weapp/order_shipping.vue
+++ b/pages_tool/weapp/order_shipping.vue
@@ -1,48 +1,48 @@
 <template>
 	<view>
-		<view class="error-msg">{{errorMsg}}</view>
+		<view class="error-msg">{{ errorMsg }}</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				outTradeNo:'',
-				errorMsg:'',
-			}
-		},
-		onLoad(option) {
-			if (option.merchant_trade_no){
-				this.outTradeNo = option.merchant_trade_no;
-				this.getOrderDetailPath();
-			}else{
-				this.errorMsg = '缺少merchant_trade_no参数';
-			}
-		},
-		methods: {
-			getOrderDetailPath(){
-				this.$api.sendRequest({
-					url: '/api/pay/outTradeNoToOrderDetailPath',
-					data:{
-						out_trade_no : this.outTradeNo,
-					},
-					success: res => {
-						if (res.code < 0) {
-							this.errorMsg = res.message || '未知错误';
-						}else{
-							this.$util.redirectTo(res.data);
-						}
+export default {
+	data() {
+		return {
+			outTradeNo: '',
+			errorMsg: '',
+		}
+	},
+	onLoad(option) {
+		if (option.merchant_trade_no) {
+			this.outTradeNo = option.merchant_trade_no;
+			this.getOrderDetailPath();
+		} else {
+			this.errorMsg = '缺少merchant_trade_no参数';
+		}
+	},
+	methods: {
+		getOrderDetailPath() {
+			this.$api.sendRequest({
+				url: '/api/pay/outTradeNoToOrderDetailPath',
+				data: {
+					out_trade_no: this.outTradeNo,
+				},
+				success: res => {
+					if (res.code < 0) {
+						this.errorMsg = res.message || '未知错误';
+					} else {
+						this.$util.redirectTo(res.data);
 					}
-				});
-			},
+				}
+			});
 		},
-	}
+	},
+}
 </script>
 
 <style>
-	.error-msg{
-		text-align: center;
-		padding-top: 10vh;
-	}
+.error-msg {
+	text-align: center;
+	padding-top: 10vh;
+}
 </style>
diff --git a/pages_tool/webview/webview.vue b/pages_tool/webview/webview.vue
index 62f7d93..bd3a940 100644
--- a/pages_tool/webview/webview.vue
+++ b/pages_tool/webview/webview.vue
@@ -11,14 +11,11 @@
 </template>
 
 <script>
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 
 export default {
 	components: {
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {