chore(组件): 组件尽量使用异步导入模式

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() {

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 {

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: {

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 {

components-diy/diy-digit.vue

@@ -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,
+		uvCountTo: () => import('@/components/uv-count-to/uv-count-to.vue'),
-		nsLogin
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
 	},
 	props: {
 		value: {

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,
+		uniGrid: () => import('@/components/uni-grid/uni-grid.vue'),
-		uniGridItem
+		uniGridItem: () => import('@/components/uni-grid-item/uni-grid-item.vue'),
+		XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'),
 	},
 	data() {
 		return {

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: {

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 {

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 {

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 {

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: {

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,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		MescrollUni
+		nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
 	},
 	data() {
 		return {

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,

components-diy/diy-map.vue

@@ -32,6 +32,7 @@ export default {
 	},
 	created() {
 	},
+	
 	mixins: [DiyMinx],
 	watch: {
 		// 组件刷新监听

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 {

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 {

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: [

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,

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 {

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 {};

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 {

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 {

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,

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 {};
 	},

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: ''

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',

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: '',

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 {

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 {

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: {

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: {
     // 初始消息列表

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,
+			nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
-			nsLogin,
+			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			MescrollUni,
+			MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-			loadingCover,
+			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-			nsEmpty,
+			nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 			// #ifdef MP-WEIXIN
-			privacyPopup
+			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 			// #endif
 		},
 		props: {

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: {

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,
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-            nsGoodsRecommend,
+            nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-            pengpaiFadeinOut,
+            pengpaiFadeinOut: () => import('@/components/pengpai-fadein-out/pengpai-fadein-out.vue'),
-            toTop,
+            toTop: () => import('@/components/toTop/toTop.vue'),
-            xiaoStarComponent
+            xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue'),
         },
         mixins: [scroll, detail]
     };

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,
+		MescrollEmpty: () => import('./components/mescroll-empty.vue'),
-		MescrollTop
+		MescrollTop: () => import('./components/mescroll-top.vue'),
 	},
 	data() {
 		return {

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,
+			MescrollEmpty: () => import('./components/mescroll-empty.vue'),
-			MescrollTop
+			MescrollTop: () => import('./components/mescroll-top.vue'),
+			nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
 		},
 		props: {
 			down: Object, // 下拉刷新的参数配置

components/mescroll/my-list-mescroll.vue

@@ -20,10 +20,9 @@
 </template>
 
 <script>
-import Mescroll from './mescroll-uni.vue';
 export default {
 	components: {
-		Mescroll
+		Mescroll: () => import('./mescroll-uni.vue'),
 	},
 	data() {
 		return {

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;
 	}

components/ns-contact/ns-contact.vue

@@ -54,6 +54,9 @@
                 default: ''
             }
         },
+        components: {
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+        },
         data() {
             return {
                 config: null,

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: {

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

@@ -1,4 +1,5 @@
 <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']"
@@ -7,6 +8,7 @@
             <text class="price-font">{{ textPrice }}</text>
             <text>{{ text }}</text>
         </view>
+    </view>
 </template>
 
 <script>

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() {

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,
+			nsLoading: () => import('@/components/ns-loading/ns-loading.vue'),
-			nsGoodsSkuIndex
+			nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
 		},
 		data() {
 			return {

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: {

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 {

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: {

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,
+			uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			registerReward,
+			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;

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;

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;

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: {

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,
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-            nsSwitch
+            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')

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);
+				dateTime.setHours(startHours[0], startHours[1], 0, 0);
-				obj.start_time = dateTime.getTime()/1000;
+				obj.start_time = dateTime.getTime() / 1000;
 				obj.start_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[0];
 
 				// 结束时间戳
-				dateTime.setHours(endHours[0],endHours[1],0,0);
+				dateTime.setHours(endHours[0], endHours[1], 0, 0);
-				obj.end_time = dateTime.getTime()/1000;
+				obj.end_time = dateTime.getTime() / 1000;
 				obj.end_date = dateTime.getFullYear() + '-' + month + '-' + date + ' ' + format[1];
 
 				this.$emit('selectTime', { data: obj, type: judge });
@@ -157,15 +159,15 @@ 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;
+					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:
@@ -244,7 +246,7 @@ 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 }]
 			}
 
 			//判断选中是否为当天
@@ -271,7 +273,7 @@ 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);
 									}
@@ -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);
 			}

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,
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-            nsSwitch
+            nsSwitch: () => import('@/components/ns-switch/ns-switch.vue'),
         },
         props: {
             // 是否可用余额支付

components/pick-regions/pick-regions.vue

@@ -44,6 +44,9 @@
                 type: String
             }
         },
+        components: {
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
+        },
         data() {
             return {
                 pickerValueArray: [],

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 {

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：图片

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

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,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsNavbar,
+		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
-		toTop,
+		toTop: () => import('@/components/toTop/toTop.vue'),
-		nsLogin,
+		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]

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>
 													</view>
-													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+													<text class="iconfont icon-unfold"
+														v-if="item.sku_spec_format.length"></text>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<block v-if="item.promotion_type == 1">
-												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+												<block
+													v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
-															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
+																$lang('common.currencySymbol') }}</text>
-															<text class="unit price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0]
-															<image :src="$util.img('public/uniapp/index/discount.png')"/>
+															}}
+															<text class="unit price-style small">.{{
+																parseFloat(item.discount_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image
+																:src="$util.img('public/uniapp/index/discount.png')" />
 														</view>
 													</view>
 												</block>
@@ -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>
+															<text class="unit price-style small">.{{
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
+																parseFloat(item.price).toFixed(2).split('.')[1]
+																}}</text>
 														</view>
 													</view>
 												</block>
@@ -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>
@@ -141,16 +167,25 @@
 										<view class="goods-sub-section">
 											<view class="goods-price">
 												<text class="bottom-price price-style large">
-													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+													<template
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
-														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0] }}
+														<text class="unit price-style small">{{
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] }}</text>
+															$lang('common.currencySymbol') }}</text>
-														<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.member_price).toFixed(2).split('.')[1]
+															}}</text>
+														<image :src="$util.img('public/uniapp/index/VIP.png')" />
 													</template>
 													<template v-else>
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+														<text class="unit price-style small">{{
-														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0] }}
+															$lang('common.currencySymbol') }}</text>
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1] }}</text>
+														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
+															}}</text>
 													</template>
 												</text>
 											</view>
@@ -165,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-if="discount.coupon_info.receive_type != 'wait'"
-								<button type="primary" v-else @click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+									disabled>已领取</button>
+								<button type="primary" v-else
+									@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
 							</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 					<view class="cart-bottom-block"></view>
 				</view>
 			</uni-popup>
@@ -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="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0]
-						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] }}</text>
+							}}</text>
+						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
+							}}</text>
 					</block>
 					<block v-else>
 						<text class="value price-font">{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}</text>
@@ -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
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled v-else>{{
-					v-else>{{ $lang('settlement') }}({{ totalCount }})</button>
+					$lang('settlement') }}({{
+						totalCount }})</button>
 			</view>
 		</view>
 
 		<diy-bottom-nav></diy-bottom-nav>
 
-		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail" :goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy" @refresh="refreshSkuDetail"></ns-goods-sku>
+		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail"
+			:goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy"
+			@refresh="refreshSkuDetail"></ns-goods-sku>
 
 		<!-- 加载动画 -->
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -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 {
+import scroll from '@/common/js/scroll-view.js';
+import cart from './public/js/cart.js';
+
+export default {
 	components: {
-		nsGoodsRecommend,
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-		uniNumberBox,
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
-		toTop,
+		toTop: () => import('@/components/toTop/toTop.vue'),
-		nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover,
+		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]
-	};
+};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 
-	@import './public/css/cart.scss';
+@import './public/css/cart.scss';
 </style>

pages_goods/category.vue

@@ -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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {

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,
+            uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-            nsGoodsRecommend,
+            nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-            pengpaiFadeinOut,
+            pengpaiFadeinOut: () => import('@/components/pengpai-fadein-out/pengpai-fadein-out.vue'),
-            toTop,
+            toTop: () => import('@/components/toTop/toTop.vue'),
-            xiaoStarComponent
+            xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue')
         },
         mixins: [scroll, detail]
     };

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%;

pages_goods/detail.vue

@@ -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
+							<uni-count-down :day="goodsSkuDetail.discountTimeMachine.d"
-								:day="goodsSkuDetail.discountTimeMachine.d"
 								:hour="goodsSkuDetail.discountTimeMachine.h"
 								:minute="goodsSkuDetail.discountTimeMachine.i"
-								:second="goodsSkuDetail.discountTimeMachine.s"
+								:second="goodsSkuDetail.discountTimeMachine.s" splitorColor="#ffffff"
-								splitorColor="#ffffff"
+								backgroundColor="#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 price-font">{{
-								<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[1] }}</text>
+									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 price-font">{{
-									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.member_price).toFixed(2).split('.')[1] }}</text>
+										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,40 +62,51 @@
 								</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 price-font">{{
-									<text class="price-symbol price-font">.{{ parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[1] }}</text>
+										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-if="showDiscount && goodsSkuDetail.price > 0">{{
-								<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{ goodsSkuDetail.market_price }}</text>
+									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="sku-name-wrap">{{ isEnEnv ? goodsSkuDetail.en_goods_name :
-						<text class="introduction" v-if="goodsSkuDetail.introduction" :style="{ color: goodsSkuDetail.config ? goodsSkuDetail.config.introduction_color : '' }">
+							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.stock_show">{{ $lang('stock') }}: {{ goodsSkuDetail.stock
-							<text v-if="goodsSkuDetail.sale_show">{{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }}</text>
+								+ 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">
@@ -104,23 +118,27 @@
 				</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"
+				<view class="group-wrap fenxiao-detail" v-if="
-					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="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="money">{{
-								<text class="unit">.{{ parseFloat(goodsSkuDetail.fenxiao_detail.commission_money).toFixed(2).split('.')[1] }}</text>
+									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>
@@ -158,9 +176,10 @@
 			<!--多规格-->
 			<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>
@@ -202,16 +221,9 @@
 			<!-- 业务区域 -->
 			<template v-slot:business>
 				<!-- SKU选择 -->
-				<ns-goods-sku
+				<ns-goods-sku v-if="goodsSkuDetail.goods_id" ref="goodsSku" @refresh="refreshGoodsSkuDetail"
-					v-if="goodsSkuDetail.goods_id"
+					:goods-id="goodsSkuDetail.goods_id" :goods-detail="goodsSkuDetail" :max-buy="goodsSkuDetail.max_buy"
-					ref="goodsSku"
+					:min-buy="goodsSkuDetail.min_buy" @getSkuId="setSkuId"></ns-goods-sku>
-					@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="unit price-font">{{
-																	<text class="price price-font">{{ goodsSkuDetail.price }}</text>
+																		$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="unit price-font">{{
-																			<text class="price price-font">{{ goods.price }}</text>
+																				$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-item ns-gradient-diy-goods-list" v-for="(item, index) in couponList"
-									<view class="coupon-info" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+									: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 v-if="item.type == 'discount' && item.discount_limit > 0"
-											<view class="time font-size-goods-tag" v-if="item.validity_type == 0">有效期：{{ $util.timeStampTurnTime(item.end_time) }}</view>
+												class="limit">最多可抵￥{{
-											<view class="time font-size-goods-tag" v-else-if="item.validity_type == 1">有效期：领取之日起{{ item.fixed_term }}天内有效</view>
+													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,7 +438,7 @@
 								<text>商品留言</text>
 								<text class="iconfont icon-close"></text>
 							</view>
-							<scroll-view scroll-y class="manjian-body" >
+							<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>
@@ -415,7 +456,8 @@
 									<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">
@@ -438,38 +480,40 @@
 
 					<template v-if="goodsSkuDetail.goods_state == 1">
 
-							<ns-goods-action-button
+						<ns-goods-action-button class="goods-action-button active3" :disabled-text="$lang('status')"
-								class="goods-action-button active3"
-								:disabled-text="$lang('status')"
 							:disabled="true"
-								v-if="goodsSkuDetail.store_goods_status != undefined && goodsSkuDetail.store_goods_status != 1"
+							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
+							<ns-goods-action-icon :text="$lang('cart')"
-									:text="$lang('cart')"
+								:cornerMarkBg="themeStyle.goods_detail.goods_cart_num_corner" icon="icon-gouwuche2"
-									:cornerMarkBg="themeStyle.goods_detail.goods_cart_num_corner"
+								:corner-mark="cartNumber > 0 ? cartNumber + '' : ''" @click="goCart" />
-									icon="icon-gouwuche2"
+							<ns-goods-action-icon :text="$lang('kefu')" icon="icox icox-kefu" :send-data="contactData"
-									:corner-mark="cartNumber > 0 ? cartNumber + '' : ''"
+								:chatParam="chatRoomParams" />
-									@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" />
+							<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 == 1"
-									<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" />
+									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>
 								<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" />
+									<ns-goods-action-button class="goods-action-button active3"
+										:disabled-text="$lang('sellout')" :disabled="true" />
 								</block>
 								<block v-else-if="
 									goodsSkuDetail.is_limit == 1 &&
@@ -477,23 +521,17 @@
 									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" />
+									<ns-goods-action-button class="goods-action-button active3"
+										:disabled-text="$lang('max')" :disabled="true" />
 								</block>
 								<block v-else>
-										<ns-goods-action-button
+									<ns-goods-action-button class="goods-action-button" :text="$lang('addcart')"
-											class="goods-action-button"
-											:text="$lang('addcart')"
 										:backgroundColor="themeStyle.goods_detail.goods_btn_color_shallow"
-											@click="joinCart"
+										@click="joinCart" v-if="goodsSkuDetail.is_virtual == 0" />
-											v-if="goodsSkuDetail.is_virtual == 0"
+									<ns-goods-action-button class="goods-action-button"
-										/>
-										<ns-goods-action-button
-											class="goods-action-button"
 										:backgroundColor="themeStyle.goods_detail.goods_btn_color"
-											:textColor="themeStyle.btn_text_color"
+										:textColor="themeStyle.btn_text_color" :text="$lang('buynow')"
-											:text="$lang('buynow')"
+										@click="buyNow" />
-											@click="buyNow"
-										/>
 								</block>
 
 							</block>
@@ -501,7 +539,8 @@
 
 					</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>
 
 
@@ -521,40 +560,25 @@
 </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,
+		nsGoodsAction: () => import('@/pages_goods/components/ns-goods-action/ns-goods-action.vue'),
-			nsGoodsActionIcon,
+		nsGoodsActionIcon: () => import('@/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue'),
-			nsGoodsActionButton,
+		nsGoodsActionButton: () => import('@/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue'),
-			uniPopup,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			nsGoodsSku,
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
-			uniCountDown,
+		uniCountDown: () => import('@/components/uni-count-down/uni-count-down.vue'),
-			nsGoodsPromotion,
+		nsGoodsPromotion: () => import('@/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue'),
-			goodsDetailView,
+		goodsDetailView: () => import('@/pages_goods/components/goods-detail-view/goods-detail-view.vue'),
-			toTop,
+		toTop: () => import('@/components/toTop/toTop.vue'),
-			nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
 		// #ifdef MP-WEIXIN
-			privacyPopup,
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	mixins: [goodsDetailBase, detail, scroll]
@@ -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;
 }

pages_goods/list.vue

@@ -4,31 +4,40 @@
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap">
-					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
+						:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
+					@click="changeListStyle()"></view>
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
-					<text :class="{ 'color-base-text': orderType === '' }">{{langstatus?$lang('Random'):'综合'}}</text>
+					@click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
 				</view>
 
-				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">{{langstatus?$lang('Sales'):'销量'}}
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">
+					{{ langstatus ? $lang('Sales') : '销量' }}
 				</view>
 
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
-					<text :class="{ 'color-base-text': orderType === 'discount_price' }">{{langstatus?$lang('Price'):'价格'}}</text>
+					<text
+						:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : '价格' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
 				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">{{langstatus?$lang('Filter'):'筛选'}}</text>
+					<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : '筛选' }}</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
@@ -39,17 +48,20 @@
 		<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>
@@ -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="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
 
 
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -79,7 +94,8 @@
 									<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">
 									<!-- 购物车图标 -->
@@ -118,7 +134,8 @@
 									}" 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="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -161,8 +184,9 @@
 								</view>
 							</view>
 							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap" >
+								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -201,7 +225,8 @@
 									}" 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>
@@ -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">
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -279,45 +307,37 @@
 </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 {
+import list from './public/js/list.js';
+
+export default {
 	components: {
-		uniDrawer,
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
-		uniTag,
+		uniTag: () => import('@/components/uni-tag/uni-tag.vue'),
-		nsGoodsSkuIndex,
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
-		nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		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]
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
-<style scoped>
+<style lang="scss" scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+/deep/ .uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

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">
@@ -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_barcode)"
-						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))" class="qrcode" mode="widthFix"/>
+							@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 ? '; ' : '' }}
+										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }} </block>
-									</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="price-style large">{{
-										<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+											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="price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
+										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,7 +327,8 @@
 			<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>
 			<!-- 联系客服 -->
@@ -349,14 +362,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>
@@ -365,7 +381,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">
@@ -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,11 +633,17 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+import orderMethod from './public/js/orderMethod.js';
-	import orderMethod from './public/js/orderMethod.js';
+
-	import nsPayment from '@/components/payment/payment.vue';
+export default {
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
+	components: {
-	export default {
+		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,
@@ -636,11 +667,6 @@
 		};
 	},
 	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;
@@ -807,17 +833,18 @@
 			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) {
+.pickup-code-info .code img:nth-child(1) {
 	margin-bottom: 30rpx;
-	}
+}
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

pages_order/detail_local_delivery.vue

@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {};
 	},

pages_order/detail_pickup.vue

@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+	},
 	data() {
 		return {};
 	},

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 == 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"
-				<image v-if="orderData.order_status == -1" :src="$util.img('public/uniapp/order/order-icon-close.png')"/>
+					: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>
@@ -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,12 +138,14 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+export default {
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
-	export default {
 	components: {
-			nsGoodsRecommend,
+		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-			nsContact
+		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 {
@@ -290,14 +297,14 @@
 			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 {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

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,
+		nsPayment: () => import('@/components/payment/payment.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 	},
 	data() {
 		return {

pages_order/payment.vue

@@ -6,6 +6,9 @@
 
 <script>
 export default {
+	components: {
+		commonPayment: () => import('@/components/common-payment/common-payment.vue'),
+	},
 	data() {
 		return {
 			api: {

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,16 +71,16 @@
 </template>
 
 <script>
-	// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
+// 插件地址：https://ext.dcloud.net.cn/plugin?id=3593
-	import {
+import {
 	initData,
 	initTime,
 	timeStamp,
 	currentTime,
 	strFormat,
 	weekDate
-	} from './yuyue-date.js';
+} from './yuyue-date.js';
-	export default {
+export default {
 	name: 'times',
 	model: {
 		prop: 'showPop',
@@ -133,21 +138,21 @@
 		appointTime: {
 			// 预约的时间
 			type: Array,
-				default () {
+			default() {
 				return [];
 			}
 		},
 		disableTimeSlot: {
 			// 预约开始和结束时间，来禁用时间段
 			type: Object,
-				default () {
+			default() {
 				return {};
 			}
 		},
 		disableWeek: {
 			// 限制周几不可以预约
 			type: Array,
-				default () {
+			default() {
 				return [];
 			}
 		}
@@ -160,11 +165,11 @@
 				}
 			}
 		},
-			beginTime: function(nVal, oVal) {
+		beginTime: function (nVal, oVal) {
 			this.initOnload();
 			this.handleSubmit();
 		},
-			endTime: function(nVal, oVal) {
+		endTime: function (nVal, oVal) {
 			this.initOnload();
 			this.handleSubmit();
 		},
@@ -407,8 +412,8 @@
 			}
 		}
 	}
-	};
+};
 </script>
 <style lang="scss" scoped>
-	@import './yuyue-date.scss';
+@import './yuyue-date.scss';
 </style>

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( () => {

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) {

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(() => {

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" :class="{ selected: categoryId == 0 }"
-							<view
+								@click="changeCategory(0)">全部</view>
-								class="quick-nav-item"
+							<view class="quick-nav-item" v-for="item in categoryList" :key="item.category_id"
-								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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty,
+		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;

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 {

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,8 +93,14 @@
 </template>
 
 <script>
-	import fenxiaoWords from 'common/js/fenxiao-words.js';
+import fenxiaoWords from 'common/js/fenxiao-words.js';
-	export default {
+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: {
@@ -116,7 +126,7 @@
 					let task = {
 						title: '下级消费',
 						desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数达到'+ 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)
@@ -128,7 +138,7 @@
 					let task = {
 						title: '下级消费',
 						desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							tips: '分销商自己购买和推荐的直属会员购买的订单的总额达到'+ 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)
@@ -141,7 +151,7 @@
 					let task = {
 						title: '下级消费',
 						desc: '下级消费产生佣金总额满' + this.moneyFormat(level.one_fenxiao_order_money) + '元',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单佣金总额达到'+ 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)
@@ -154,7 +164,7 @@
 					let task = {
 						title: '自身消费',
 						desc: '自身消费单数满' + level.order_num + '单',
-							tips: '分销商自己购买的订单次数达到'+ 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)
@@ -166,7 +176,7 @@
 					let task = {
 						title: '自身消费',
 						desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
-							tips: '分销商自己购买的订单总额满足'+ 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)
@@ -178,7 +188,7 @@
 					let task = {
 						title: '邀请好友',
 						desc: '邀请好友人数达到' + level.one_child_num + '人',
-							tips: '分销商的直属下级会员人数达到'+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)
@@ -190,7 +200,7 @@
 					let task = {
 						title: '邀请好友',
 						desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
-							tips: '分销商的直属下级分销商人数达到'+ 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)
@@ -203,9 +213,9 @@
 			}
 		}
 	},
-		onLoad() {},
+	onLoad() { },
 	onShow() {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -216,7 +226,7 @@
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '等级');
 
@@ -292,28 +302,28 @@
 			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 {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 
-	/deep/ .uni-popup {
+/deep/ .uni-popup {
 	z-index: 8;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

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 small">{{
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+												$lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</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="unit price-style small">{{ $lang('common.currencySymbol')
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+											}}</text>
-										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</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 font-size-toolbar">{{
-									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+										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"
-					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+						v-if="selectId == 0 && 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"
-					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+						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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty,
+		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();
 			}

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="price-color font-size-toolbar">{{
-										<text class="unit price-color">.{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}</text>
+											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,7 +66,8 @@
 						<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>
@@ -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>

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,

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,12 +43,21 @@
 </template>
 
 <script>
-	import {
+import {
 	Weixin
-	} from 'common/js/wx-jssdk.js';
+} from 'common/js/wx-jssdk.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
-	export default {
+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: [],
@@ -58,9 +68,7 @@
 			mpShareData: null //小程序分享数据
 		};
 	},
-		components: {
+
-			uniPopup
-		},
 	methods: {
 		/**
 		 * 获取分销海报
@@ -151,7 +159,7 @@
 		}
 	},
 	onLoad(option) {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -162,19 +170,19 @@
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		if (option.templateId) {
 			this.templateId = option.templateId.split(',');
 		}
 
 		if (this.storeToken) {
-				if(option.poster){
+			if (option.poster) {
 				this.poster = decodeURIComponent(option.poster).split(',')
 				setTimeout(() => {
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				}, 500)
-				}else{
+			} else {
 				this.getFenxiaoDetail();
 			}
 
@@ -201,23 +209,23 @@
 		return this.mpShareData.timeLine;
 	},
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getFenxiaoDetail();
 			}
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.container {
+.container {
 	width: 100vw;
 	min-height: 100vh;
 	background-color: #f5f5f5;
-	}
+}
 
-	.poster-wrap {
+.poster-wrap {
 	padding: 40rpx 0;
 	width: calc(100vw - 80rpx);
 	margin: 0 40rpx;
@@ -228,13 +236,13 @@
 		overflow: hidden;
 		width: 100%;
 	}
-	}
+}
 
-	.swiper {
+.swiper {
 	height: 1240rpx;
-	}
+}
 
-	.btn {
+.btn {
 	margin: 0 80rpx;
 	margin-top: 30rpx;
 	height: 80rpx;
@@ -242,17 +250,17 @@
 	border-radius: $border-radius;
 	color: #fff;
 	text-align: center;
-	}
+}
 
-	.tips {
+.tips {
 	text-align: center;
 	font-size: $font-size-base;
 	color: #999;
 	font-weight: 600;
 	margin-top: 20rpx;
-	}
+}
 
-	.dialog-popup {
+.dialog-popup {
 	width: 580rpx;
 	background: #fff;
 	box-sizing: border-box;
@@ -302,5 +310,5 @@
 			}
 		}
 	}
-	}
+}
 </style>

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"
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
+									@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>
@@ -75,12 +80,13 @@
 							<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,23 +103,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 {
-	export default {
 	components: {
-			nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-			loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-			nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-			privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -190,22 +188,22 @@
 			});
 		},
 	}
-	}
+}
 </script>
 
 <style lang="scss">
-	.container {
+.container {
 	width: 100vw;
 	height: 100vh;
-	}
+}
 
-	.banner {
+.banner {
 	width: 100%;
 	height: 200rpx;
 	// background: $base-color;
-	}
+}
 
-	.info {
+.info {
 	width: 100%;
 	display: flex;
 	justify-content: space-between;
@@ -259,9 +257,9 @@
 
 	}
 
-	}
+}
 
-	.fenxiao-team {
+.fenxiao-team {
 	display: flex;
 	width: 100%;
 	margin-top: 22rpx;
@@ -318,43 +316,43 @@
 			}
 		}
 	}
-	}
+}
 
-	.icon-wenxiao {
+.icon-wenxiao {
 	text-align: center;
 	font-size: 50rpx;
 	color: var(--base-color) !important;
-	}
+}
 
-	.number {
+.number {
 	font-weight: 600;
 	text-align: center;
-	}
+}
 
-	.info-text {
+.info-text {
 	font-size: 20rpx;
 	text-align: center;
-	}
+}
 
-	.info-title {
+.info-title {
 	font-size: 50rpx;
 	font-weight: 900;
 	color: #f5f5f5;
 	text-align: center;
-	}
+}
 
-	.info-rank {
+.info-rank {
 	color: #f5f5f5;
 	margin-top: 10rpx;
-	}
+}
 
-	.title-rakn-text {
+.title-rakn-text {
 	text-align: center;
 	font-size: 30rpx;
 	font-weight: 900;
-	}
+}
 
-	.ranking-list {
+.ranking-list {
 	transform: translateY(-120rpx);
 	margin: 200rpx 24rpx;
 	background: #fff;
@@ -429,5 +427,5 @@
 			}
 		}
 	}
-	}
+}
 </style>

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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {

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,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {

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: {},

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>
@@ -30,23 +34,16 @@
 	</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		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
 		// #ifdef MP-WEIXIN
-		privacyPopup
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -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;

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,

pages_promotion/merch/detail.vue

@@ -15,7 +15,7 @@
 					<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>
@@ -29,7 +29,8 @@
 
 			<!-- 排序 -->
 			<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,8 +40,12 @@
 				<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-copy asc"
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
@@ -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="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $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,7 +107,8 @@
 									<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">
 									<!-- 购物车图标 -->
@@ -134,7 +147,8 @@
 									}" 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="price price-style large">{{
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $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">
@@ -177,8 +198,9 @@
 								</view>
 							</view>
 							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap" >
+								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -217,7 +239,8 @@
 									}" 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>
@@ -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">
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -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';
 	
-	export default {
+import list from './public/js/list.js';
+
+export default {
 	components: {
-			uniDrawer,
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
-			uniTag,
+		uniTag: () => import('@/components/uni-tag/uni-tag.vue'),
-			nsGoodsSkuIndex,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			MescrollUni,
+		nsGoodsSkuIndex: () => import('@/components/ns-goods-sku/ns-goods-sku-index.vue'),
-			nsLogin,
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
-			loadingCover,
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
-			nsEmpty,
+		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
+		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>
+<style lang="scss" scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+/deep/ .uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

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,

pages_promotion/point/detail.vue

@@ -195,18 +195,23 @@
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import htmlParser from '@/common/js/html-parser.js';
-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 scroll from '@/common/js/scroll-view.js';
+
 export default {
 	components: {
-		uniPopup,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		uniNumberBox,
+		uniNumberBox: () => import('@/components/uni-number-box/uni-number-box.vue'),
-		nsGoodsSku,
+		nsGoodsSku: () => import('@/components/ns-goods-sku/ns-goods-sku.vue'),
-		toTop
+		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;
 }

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-shangsanjiao-copy"
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
+							: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-shangsanjiao-copy"
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
+							: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="unit  font-size-tag">{{ $lang('common.currencySymbol')
-											<text class="price  font-size-toolbar" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+												}}</text>
-											<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}</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="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('')" class="list-wrap"><text
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+								:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' :
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+								'全部' }}</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,24 +135,19 @@
 </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 {
+export default {
 	components: {
-			uniDrawer,
+		uniDrawer: () => import('@/components/uni-drawer/uni-drawer.vue'),
-			MescrollUni,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			nsLogin,
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
-			loadingCover,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			nsEmpty,
+		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
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -318,11 +333,11 @@
 			this.maxPoint = ''
 		},
 	},
-	};
+};
 </script>
 
 <style lang="scss">
-	.head-wrap {
+.head-wrap {
 	background: #fff;
 	position: fixed;
 	width: 100%;
@@ -452,9 +467,9 @@
 			}
 		}
 	}
-	}
+}
 
-	.category-list-wrap {
+.category-list-wrap {
 	height: 100%;
 
 	.class-box {
@@ -512,9 +527,9 @@
 			padding: 0 20rpx;
 		}
 	}
-	}
+}
 
-	.screen-wrap {
+.screen-wrap {
 	.title {
 		font-size: $font-size-tag;
 		padding: $padding;
@@ -611,26 +626,26 @@
 			width: 40%;
 		}
 	}
-	}
+}
 
-	.safe-area {
+.safe-area {
 	bottom: 68rpx !important;
-	}
+}
 
-	.empty {
+.empty {
 	margin-top: 100rpx;
-	}
+}
 
-	.buy-num {
+.buy-num {
 	font-size: $font-size-activity-tag;
-	}
+}
 
-	.icon {
+.icon {
 	width: 34rpx;
 	height: 30rpx;
-	}
+}
 
-	.list-style-new {
+.list-style-new {
 	display: flex;
 	align-items: center;
 
@@ -640,20 +655,20 @@
 		background-color: rgba(227, 227, 227, 1);
 		margin-right: 60rpx;
 	}
-	}
+}
 
-	.h-line {
+.h-line {
 	width: 37rpx;
 	height: 2rpx;
 	background-color: $color-tip;
-	}
+}
 
-	.lineheight-clear {
+.lineheight-clear {
 	line-height: 1 !important;
-	}
+}
 
-	// 商品列表单列样式
+// 商品列表单列样式
-	.goods-list.single-column {
+.goods-list.single-column {
 	.goods-item {
 		padding: 26rpx;
 		background: #fff;
@@ -735,6 +750,7 @@
 			line-height: 1;
 			margin-top: 16rpx;
 			color: var(--price-color);
+
 			.unit {
 				margin-right: 6rpx;
 			}
@@ -773,10 +789,10 @@
 			}
 		}
 	}
-	}
+}
 
-	// 商品列表双列样式
+// 商品列表双列样式
-	.goods-list.double-column {
+.goods-list.double-column {
 	display: flex;
 	flex-wrap: wrap;
 	margin: 0 $margin-both;
@@ -860,6 +876,7 @@
 			line-height: 1;
 			margin-top: 16rpx;
 			color: var(--price-color);
+
 			.unit {
 				margin-right: 6rpx;
 			}
@@ -898,10 +915,10 @@
 			}
 		}
 	}
-	}
+}
 </style>
-<style scoped>
+<style lang="scss" scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+/deep/ .uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
-	}
+}
 </style>

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' }">
+			:style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
-			<view class="nav-wrap" :style="{width: menuButtonBounding.left + 'px'}">
+			<view class="nav-wrap" :style="{ width: menuButtonBounding.left + 'px' }">
-				<view class="back" @click="back" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + '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,7 +31,7 @@
 							<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> -->
 						</view>
@@ -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-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-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"
-													<view class="coupon_type font-size-activity-tag" v-else-if="couponItem.goods_type == 2||couponItem.goods_type == 3">指定券</view>
+														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="font-size-tag">{{
-														<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
+															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="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="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,10 +260,19 @@
 	</view>
 </template>
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+
-	export default {
+export default {
 	components: {
-			uniPopup
+		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 {
@@ -285,7 +309,7 @@
 		};
 	},
 	onLoad(option) {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.pointexchange) {
 				this.$util.showToast({
 					title: '商家未开启积分商城',
@@ -296,7 +320,7 @@
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		// #ifdef MP-WEIXIN
 		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
@@ -579,15 +603,15 @@
 	onShareTimeline() {
 		return this.mpShareData.timeLine;
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style>
-	.ns-adv>>>image {
+.ns-adv>>>image {
 	width: 100%;
 	border-radius: 0;
-	}
+}
 </style>

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">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item"
-				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+				: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')"
+										<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')"
+										<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="unit price-style small">{{
-													<text class="price-style large">{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+														$lang('common.currencySymbol') }}</text>
-													<text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</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 font-size-tag"
-								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
+									@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,22 +96,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	
 
-	export default {
+export default {
 	components: {
-			MescrollUni,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			nsLogin,
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
-			loadingCover,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			nsEmpty,
+		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
+		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
 		// #endif
 	},
 	data() {
@@ -108,15 +117,15 @@
 			outTradeNo: '',
 			payMoney: 0,
 			statusList: [
-					{status: 'all', id: 'all', name: '全部'},
+				{ status: 'all', id: 'all', name: '全部' },
-					{status: 0, id: 'pay', name: '待支付'},
+				{ status: 0, id: 'pay', name: '待支付' },
-					{status: 1, id: 'complete', name: '已完成'},
+				{ status: 1, id: 'complete', name: '已完成' },
 			],
 			orderStatus: 'all',
 		};
 	},
 	onLoad() {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.pointexchange) {
 				this.$util.showToast({
 					title: '商家未开启积分商城',
@@ -127,7 +136,7 @@
 					this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -139,7 +148,7 @@
 		if (this.$refs.mescroll) this.$refs.mescroll.refresh();
 	},
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
@@ -252,29 +261,29 @@
 			this.$forceUpdate();
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
+/deep/ .fixed {
 	position: relative;
 	top: 0;
-	}
+}
 
-	/deep/ .empty {
+/deep/ .empty {
 	padding-top: 0 !important;
-	}
+}
 
-	.order-container {
+.order-container {
 	width: 100vw;
 	height: 100vh;
-	}
+}
 
-	.align-right {
+.align-right {
 	text-align: right;
-	}
+}
 
-	.order-item {
+.order-item {
 	margin: $margin-updown 24rpx;
 	border-radius: 12rpx;
 	background: #fff;
@@ -297,6 +306,7 @@
 				left: 20rpx;
 				transform: translateY(-50%);
 			}
+
 			.iconyuan_checkbox {
 				color: $color-tip;
 			}
@@ -376,6 +386,7 @@
 						flex: 1;
 						font-weight: bold;
 					}
+
 					.goods-num {
 						font-size: $font-size-tag;
 						color: $color-tip;
@@ -387,6 +398,7 @@
 							font-size: $font-size-tag;
 						}
 					}
+
 					.goods-type {
 						font-size: $font-size-tag;
 					}
@@ -434,7 +446,7 @@
 		.multi-order-goods {
 			width: calc(100vw - 96rpx);
 			white-space: nowrap;
-				margin: 0 24rpx 30rpx 24rpx!important;
+			margin: 0 24rpx 30rpx 24rpx !important;
 			position: relative;
 
 			.scroll-view {
@@ -474,7 +486,7 @@
 				display: flex;
 				margin: 0 24rpx;
 
-					& > text {
+				&>text {
 					flex: 1;
 					line-height: 1;
 					margin-left: 10rpx;
@@ -485,7 +497,7 @@
 				padding-top: 20rpx;
 				flex: 0.5;
 
-					& > text {
+				&>text {
 					line-height: 1;
 				}
 			}
@@ -503,7 +515,7 @@
 				display: flex;
 				align-items: center;
 				font-size: 10px;
-					color:#b5b6b9;
+				color: #b5b6b9;
 
 				image {
 					width: 26rpx;
@@ -525,9 +537,9 @@
 			}
 		}
 	}
-	}
+}
 
-	.empty {
+.empty {
 	padding-top: 200rpx;
 	text-align: center;
 
@@ -535,9 +547,9 @@
 		width: 180rpx;
 		height: 180rpx;
 	}
-	}
+}
 
-	.order-nav {
+.order-nav {
 	width: 100vw;
 	height: 80rpx;
 	flex-direction: row;
@@ -587,5 +599,5 @@
 		height: 0;
 		color: transparent;
 	}
-	}
+}
 </style>

pages_promotion/point/payment.vue

@@ -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="name font-size-base">{{ orderCreateData.member_address.name ?
-							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ? orderCreateData.member_address.mobile : '' }}</text>
+								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.full_address ?
-								{{ orderCreateData.member_address.address ? orderCreateData.member_address.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 !== ''">
+			<view class="error-message"
-				{{orderPaymentData.delivery.error_msg}}
+				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">
+						<block
-							差{{ orderPaymentData.delivery.start_money-orderPaymentData.price | moneyFormat }}起送
+							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 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		
 
-	export default {
+
+export default {
 	components: {
-			uniPopup,
+		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-			nsSelectTime,
+		nsSelectTime: () => import('@/components/ns-select-time/ns-select-time.vue'),
-			nsLogin,
+		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			MescrollUni,
+		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-			loadingCover,
+		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-			nsEmpty,
+		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsPayment: () => import('@/components/payment/payment.vue'),
 		// #ifdef MP-WEIXIN
-			privacyPopup
+		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 {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 
-	/deep/ .uni-popup {
+/deep/ .uni-popup {
 	z-index: 8;
-	}
+}
 </style>

pages_promotion/point/result.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-	export default {
+export default {
 	data() {
 		return {};
 	},
@@ -26,11 +26,11 @@
 			this.$util.redirectTo('/pages/index/index');
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.container {
+.container {
 	width: 100vw;
 	height: 100vh;
 	background: #fff;
@@ -88,5 +88,5 @@
 			color: #fff;
 		}
 	}
-	}
+}
 </style>

pages_tool/agreement/contenr.vue

@@ -5,20 +5,20 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
 export default {
 	components: {
 	},
 	data() {
 		return {
-			content:'',
+			content: '',
-			type:'',
+			type: '',
-			uniacid:0
+			uniacid: 0
 		};
 	},
 	onLoad(option) {
 		this.type = option.type
-		this.uniacid = option.uniacid?option.uniacid:0
+		this.uniacid = option.uniacid ? option.uniacid : 0
 
 		this.isIphoneX = this.$util.uniappIsIPhoneX()
 		this.getcontent()
@@ -30,16 +30,16 @@ export default {
 		getcontent() {
 			// privacy  content
 			var data = {
-				type:this.type
+				type: this.type
 			}
-			if(this.uniacid > 0) data.uniacid = this.uniacid
+			if (this.uniacid > 0) data.uniacid = this.uniacid
 			this.$api.sendRequest({
 				url: '/api/config/agreement',
-				data:data,
+				data: data,
 				success: res => {
 					console.log(res.data.title)
 					uni.setNavigationBarTitle({
-						title:res.data.title
+						title: res.data.title
 					})
 					this.content = res.data.content
 				}
@@ -49,6 +49,4 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss"></style>
-
-</style>

pages_tool/article/detail.vue

@@ -25,8 +25,14 @@
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
+import htmlParser from '@/common/js/html-parser.js';
-	export default {
+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,
@@ -93,8 +99,8 @@
 		return {
 			title: title,
 			path: path,
-				success: res => {},
+			success: res => { },
-				fail: res => {}
+			fail: res => { }
 		};
 	},
 	//分享到朋友圈
@@ -107,30 +113,30 @@
 			imageUrl: ''
 		};
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.page {
+.page {
 	width: 100%;
 	height: 100%;
 	padding: 30rpx;
 	box-sizing: border-box;
 	background: #ffffff;
-	}
+}
 
-	.help-title {
+.help-title {
 	font-size: $font-size-toolbar;
 	text-align: left;
 	font-weight: bold;
-	}
+}
 
-	.help-content {
+.help-content {
 	margin-top: $margin-updown;
 	word-break: break-all;
-	}
+}
 
-	.help-meta {
+.help-meta {
 	text-align: left;
 	margin-top: $margin-updown;
 	color: $color-tip;
@@ -138,9 +144,9 @@
 	.help-time {
 		font-size: $font-size-tag;
 	}
-	}
+}
 
-	.bottom-area {
+.bottom-area {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -154,5 +160,5 @@
 		color: #999;
 		font-size: 24rpx;
 	}
-	}
+}
 </style>

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,31 +34,23 @@
 </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 {
+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: []
 		};
 	},
-		components: {
-			nsAdv,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
 	onShow() {
 		this.setPublicShare();
 	},
@@ -116,8 +109,8 @@
 		return {
 			title: title,
 			path: path,
-				success: res => {},
+			success: res => { },
-				fail: res => {}
+			fail: res => { }
 		};
 	},
 	//分享到朋友圈
@@ -130,20 +123,20 @@
 			imageUrl: ''
 		};
 	}
-	};
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
+/deep/ .fixed {
 	position: relative;
 	top: 0;
-	}
+}
 
-	.empty-wrap {
+.empty-wrap {
 	padding-top: 200rpx;
-	}
+}
 
-	.article-wrap {
+.article-wrap {
 	background: #f8f8f8;
 
 	.adv-wrap {
@@ -231,5 +224,5 @@
 			}
 		}
 	}
-	}
+}
 </style>

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 style="font-size:36rpx;font-weight:600;">{{ item.$orig.title }}</view>
-                  <view>{{item.$orig.desc}}</view>
+                  <view>{{ item.$orig.desc }}</view>
-                  <view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{"完成时间：" + item.g3}}</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: [],
@@ -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;

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 htmlParser from '@/common/js/html-parser.js';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
-	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -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: '', //店铺头像