diff --git a/.local.config.js b/.local.config.js
new file mode 100644
index 0000000..9026bc8
--- /dev/null
+++ b/.local.config.js
@@ -0,0 +1,39 @@
+// 本地调试配置示例文件
+// 复制此文件并重命名为 local.config.js 以使用自定义本地配置
+
+const localDevConfig = ({
+    '460': { // 制氧设备平台
+        uniacid: 460,
+        domain: 'https://xcx30.5g-quickapp.com/',
+    },
+    '2285': { // 数码喷墨墨水
+        uniacid: 2285,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },
+    '2811': { // POCT检测分析平台
+        uniacid: 2811,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },  
+    '2724': { // 生物菌肥
+        uniacid: 2724,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },     
+    '2505': { // 煤矿钻机
+        uniacid: 2505,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },   
+    '2777': { // 养老服务
+        uniacid: 2777,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },         
+    '1': { // 开发平台
+        uniacid: 1,
+        domain: 'https://dev.aigc-quickapp.com',
+    },
+    '1-test': { // 测试平台
+        uniacid: 1,
+        domain: 'https://test.aigc-quickapp.com',
+    },
+})['2285']; // 选择要使用的环境配置
+
+export default localDevConfig;
\ No newline at end of file
diff --git a/components-diy/diy-digit.vue b/components-diy/diy-digit.vue
index 4a51a91..83cdf74 100644
--- a/components-diy/diy-digit.vue
+++ b/components-diy/diy-digit.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<view :style="componentStyle" data-component-name="diy-digit">
 		<scroll-view :class="['graphic-nav', value.showStyle == 'fixed' ? 'fixed-layout' : value.showStyle]"
 			:scroll-x="value.showStyle == 'singleSlide'">
@@ -38,16 +38,10 @@
 </template>
 
 <script>
-import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
-import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 // 自定义数字展示
 export default {
 	name: 'diy-digit',
-	components: {
-		uvCountTo,
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,
diff --git a/components-diy/diy-goods-brand.vue b/components-diy/diy-goods-brand.vue
index 21ea2b2..f8d202c 100644
--- a/components-diy/diy-goods-brand.vue
+++ b/components-diy/diy-goods-brand.vue
@@ -19,8 +19,6 @@
 
 <script>
 // 商品品牌
-import uniGrid from '@/components/uni-grid/uni-grid.vue';
-import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 
 import DiyMinx from './minx.js'
 // 自定义商品品牌展示	
@@ -31,10 +29,6 @@ export default {
 			type: Object
 		}
 	},
-	components: {
-		uniGrid,
-		uniGridItem
-	},
 	data() {
 		return {
 			list: [],
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index 5d41156..59441df 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -253,15 +253,11 @@
 </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
-	},
 	props: {
 		value: {
 			type: Object,
diff --git a/components-diy/diy-image-nav.vue b/components-diy/diy-image-nav.vue
index 08ef3fd..8615a21 100644
--- a/components-diy/diy-image-nav.vue
+++ b/components-diy/diy-image-nav.vue
@@ -38,14 +38,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue'
+
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
-	components: {
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,
diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue
index 466d481..4575aaf 100644
--- a/components-diy/diy-index-page.vue
+++ b/components-diy/diy-index-page.vue
@@ -169,7 +169,7 @@
 </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 {
@@ -191,7 +191,6 @@ export default {
 	},
 	mixins: [DiyMinx],
 	components: {
-		nsLoading,
 		MescrollUni
 	},
 	data() {
diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue
index 68c088e..37afec7 100644
--- a/components-diy/diy-member-info.vue
+++ b/components-diy/diy-member-info.vue
@@ -243,7 +243,7 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 // 自定义会员中心——会员信息展示
-import nsContact from '@/components/ns-contact/ns-contact.vue';
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-member-info',
@@ -259,9 +259,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsContact
-	},
 	data() {
 		return {
 			info: null,
diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index 2717333..c60f3b1 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -62,13 +62,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
-	components: {
-		uniPopup
-	},
 	props: {
 		value: {
 			type: Object,
diff --git a/components/ai-chat-message/ai-chat-message.vue b/components/ai-chat-message/ai-chat-message.vue
index 528f729..9f6b438 100644
--- a/components/ai-chat-message/ai-chat-message.vue
+++ b/components/ai-chat-message/ai-chat-message.vue
@@ -357,14 +357,10 @@
   </view>
 </template>
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue'
 import aiService from '@/common/js/ai-service.js'
 
 export default {
   name: 'ai-chat-message',
-  components: {
-    nsLoading
-  },
   props: {
     // 初始消息列表
     initialMessages: {
diff --git a/pages_tool/components/chat-message/chat-message.vue b/components/chat-message/chat-message.vue
similarity index 95%
rename from pages_tool/components/chat-message/chat-message.vue
rename to components/chat-message/chat-message.vue
index de52ecd..0c32d9e 100644
--- a/pages_tool/components/chat-message/chat-message.vue
+++ b/components/chat-message/chat-message.vue
@@ -71,11 +71,7 @@
 </template>
 
 <script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
 	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -98,12 +94,6 @@
 				currImg: ''
 			};
 		},
-		components: {
-			nsChatGoods,
-			nsChatOrder,
-			uniPopup,
-			nsChatReceiveGoods
-		},
 		mounted() {
 			this.avatar = this.$util.img(this.siteInfo.logo_square);
 			this.myHeadImg = this.$util.img(this.memberInfo.headimg);
diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index 81960cb..b92f879 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -636,30 +636,13 @@
 <script>
 	import payment from './payment.js';
 
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif	
+
 
 	export default {
 		name: 'common-payment',
 		data() {
 			return {};
 		},
-		components: {
-			nsSelectTime,
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
 		props: {
 			api: Object,
 			createDataKey: String
diff --git a/components/goods-detail-view/goods-detail-view.vue b/components/goods-detail-view/goods-detail-view.vue
index 7590573..3a6a6cb 100644
--- a/components/goods-detail-view/goods-detail-view.vue
+++ b/components/goods-detail-view/goods-detail-view.vue
@@ -420,12 +420,7 @@
 
 <script>
     // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
     import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
     import detail from './detail.js';
 
     export default {
@@ -438,13 +433,6 @@
                 }
             }
         },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
         mixins: [scroll, detail]
     };
 </script>
diff --git a/pages_tool/components/img-cropping/cropping.vue b/components/img-cropping/img-cropping.vue
similarity index 100%
rename from pages_tool/components/img-cropping/cropping.vue
rename to components/img-cropping/img-cropping.vue
diff --git a/pages_promotion/components/l-time/l-time.vue b/components/l-time/l-time.vue
similarity index 100%
rename from pages_promotion/components/l-time/l-time.vue
rename to components/l-time/l-time.vue
diff --git a/pages_promotion/components/l-time/time.js b/components/l-time/time.js
similarity index 100%
rename from pages_promotion/components/l-time/time.js
rename to components/l-time/time.js
diff --git a/components/mescroll/mescroll-uni.vue b/components/mescroll/mescroll-uni.vue
index ccc425a..3d0ef07 100644
--- a/components/mescroll/mescroll-uni.vue
+++ b/components/mescroll/mescroll-uni.vue
@@ -62,8 +62,6 @@
 	// 引入回到顶部组件
 	import MescrollTop from './components/mescroll-top.vue';
 
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-
 	export default {
 		name: 'mescroll-uni',
 		components: {
diff --git a/pages_tool/components/myp-one/myp-one.vue b/components/myp-one/myp-one.vue
similarity index 100%
rename from pages_tool/components/myp-one/myp-one.vue
rename to components/myp-one/myp-one.vue
diff --git a/components/ns-adv/ns-adv.vue b/components/ns-adv/ns-adv.vue
index 0d44df7..978f3bd 100644
--- a/components/ns-adv/ns-adv.vue
+++ b/components/ns-adv/ns-adv.vue
@@ -1,120 +1,120 @@
-<template>
-	<view v-if="advList.length" :class="['container-box',className]">
-		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
-			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
-				<view class="image-box">
-					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
-				</view>
-			</swiper-item>
-		</swiper>
-		<view v-else class="container-box item-wrap">
-			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'ns-advert',
-		props: {
-			keyword: {
-				type: String
-			},
-			className: {
-				type: String
-			}
-		},
-		data() {
-			return {
-				advList: [],
-				isImage: false,
-				//滑块的高度(单位px)
-				swiperHeight: 150,
-				//当前索引
-				currentIndex: 0,
-			};
-		},
-		created() {
-			this.getAdvList();
-		},
-		methods: {
-			//获取广告位
-			getAdvList() {
-				var item = {
-					adv_image: '',
-					adv_url: ''
-				};
-				this.$api.sendRequest({
-					url: '/api/adv/detail',
-					data: {
-						keyword: this.keyword
-					},
-					success: res => {
-						if (res.code == 0) {
-							var data = res.data.adv_list;
-							for (var index in data) {
-								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
-							}
-							this.advList = res.data.adv_list;
-
-							//动态设置swiper的高度
-							this.$nextTick(() => {
-								this.setSwiperHeight();
-							});
-						}
-					}
-				});
-			},
-			jumppage(e) {
-				this.$util.diyRedirectTo(e);
-			},
-			imageLoad(data) {
-				this.isImage = true;
-			},
-			//手动切换题目
-			changeSwiper(e) {
-				this.currentIndex = e.detail.current;
-				//动态设置swiper的高度，使用nextTick延时设置
-				this.$nextTick(() => {
-					this.setSwiperHeight();
-				});
-			},
-			//动态设置swiper的高度
-			setSwiperHeight() {
-				if (this.advList.length > 1) {
-					setTimeout(() => {
-						let element = "#content-wrap" + this.currentIndex;
-						let query = uni.createSelectorQuery().in(this);
-						query.select(element).boundingClientRect();
-						query.exec((res) => {
-							if (res && res[0]) {
-								this.swiperHeight = res[0].height;
-							}
-						});
-					}, 10);
-				}
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container-box {
-		width: 100%;
-
-		.item-wrap {
-			border-radius: 10rpx;
-
-			.image-box {
-				border-radius: 10rpx;
-			}
-
-			image {
-				width: 100%;
-				height: auto;
-				border-radius: 10rpx;
-				will-change: transform;
-			}
-		}
-	}
+<template>
+	<view v-if="advList.length" :class="['container-box',className]">
+		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
+			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
+				<view class="image-box">
+					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view v-else class="container-box item-wrap">
+			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-advert',
+		props: {
+			keyword: {
+				type: String
+			},
+			className: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				advList: [],
+				isImage: false,
+				//滑块的高度(单位px)
+				swiperHeight: 150,
+				//当前索引
+				currentIndex: 0,
+			};
+		},
+		created() {
+			this.getAdvList();
+		},
+		methods: {
+			//获取广告位
+			getAdvList() {
+				var item = {
+					adv_image: '',
+					adv_url: ''
+				};
+				this.$api.sendRequest({
+					url: '/api/adv/detail',
+					data: {
+						keyword: this.keyword
+					},
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data.adv_list;
+							for (var index in data) {
+								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
+							}
+							this.advList = res.data.adv_list;
+
+							//动态设置swiper的高度
+							this.$nextTick(() => {
+								this.setSwiperHeight();
+							});
+						}
+					}
+				});
+			},
+			jumppage(e) {
+				this.$util.diyRedirectTo(e);
+			},
+			imageLoad(data) {
+				this.isImage = true;
+			},
+			//手动切换题目
+			changeSwiper(e) {
+				this.currentIndex = e.detail.current;
+				//动态设置swiper的高度，使用nextTick延时设置
+				this.$nextTick(() => {
+					this.setSwiperHeight();
+				});
+			},
+			//动态设置swiper的高度
+			setSwiperHeight() {
+				if (this.advList.length > 1) {
+					setTimeout(() => {
+						let element = "#content-wrap" + this.currentIndex;
+						let query = uni.createSelectorQuery().in(this);
+						query.select(element).boundingClientRect();
+						query.exec((res) => {
+							if (res && res[0]) {
+								this.swiperHeight = res[0].height;
+							}
+						});
+					}, 10);
+				}
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
index e34abb7..254126c 100644
--- a/components/ns-birthday-gift/ns-birthday-gift.vue
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -80,14 +80,10 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	// 注册奖励弹出层
 	export default {
 		name: 'ns-birthday-gift',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				birthday: {
diff --git a/pages_tool/components/ns-chat/ns-chat-goods.vue b/components/ns-chat/ns-chat-goods.vue
similarity index 100%
rename from pages_tool/components/ns-chat/ns-chat-goods.vue
rename to components/ns-chat/ns-chat-goods.vue
diff --git a/pages_tool/components/ns-chat/ns-chat-order.vue b/components/ns-chat/ns-chat-order.vue
similarity index 100%
rename from pages_tool/components/ns-chat/ns-chat-order.vue
rename to components/ns-chat/ns-chat-order.vue
diff --git a/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue b/components/ns-chat/ns-chat-receiveGoods.vue
similarity index 100%
rename from pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
rename to components/ns-chat/ns-chat-receiveGoods.vue
diff --git a/components/ns-form/ns-form.vue b/components/ns-form/ns-form.vue
index 452c8df..8c29353 100644
--- a/components/ns-form/ns-form.vue
+++ b/components/ns-form/ns-form.vue
@@ -200,12 +200,8 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     export default {
         name: 'ns-form',
-        components: {
-            pickRegions
-        },
         props: {
             data: {
                 type: Array,
diff --git a/components/ns-goods-action-button/ns-goods-action-button.vue b/components/ns-goods-action-button/ns-goods-action-button.vue
index 1210943..7798141 100644
--- a/components/ns-goods-action-button/ns-goods-action-button.vue
+++ b/components/ns-goods-action-button/ns-goods-action-button.vue
@@ -1,96 +1,96 @@
-<template>
-    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
-    <view class="action-buttom-wrap"
-        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
-        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
-        @click="clickEvent">
-        <text class="price-font">{{ textPrice }}</text>
-        <text>{{ text }}</text>
-    </view>
-</template>
-
-<script>
-    export default {
-        name: 'ns-goods-action-button',
-        props: {
-            // 商品底部按钮文字
-            text: {
-                type: String,
-                default: ''
-            },
-            // 商品底部按钮价格文字
-            textPrice: {
-                type: String,
-                default: ''
-            },
-            // 背景色
-            background: {
-                type: String,
-                default: ''
-            },
-            // 背景色样式
-            backgroundClass: {
-                type: String,
-                default: ''
-            },
-            // 
-            backgroundColor: {
-                type: String,
-                default: ''
-            },
-            // 是否禁用
-            disabled: {
-                type: Boolean,
-                default: false
-            },
-            // 禁用文字提示
-            disabledText: {
-                type: String,
-                default: ''
-            },
-            // 文字颜色
-            textColor: {
-                type: String,
-                default: ''
-            },
-        },
-        computed: {},
-        methods: {
-            clickEvent() {
-                this.$emit('click');
-            }
-        }
-    };
-</script>
-
-<style lang="scss">
-    .action-buttom-wrap {
-        flex: 1;
-        height: 70rpx;
-        font-weight: 600;
-        font-size: 30rpx;
-        line-height: 70rpx;
-        border: none;
-        color: #fff;
-        text-align: center;
-        border-radius: 10rpx;
-        margin-right: 20rpx;
-    }
-
-    .action-buttom-wrap.has-second {
-        line-height: 50rpx;
-    }
-
-    .action-buttom-wrap.has-second text {
-        display: block;
-        line-height: 1.2;
-    }
-
-    .action-buttom-wrap:active {
-        opacity: 0.8;
-    }
-
-    .action-buttom-wrap.disabled {
-        background: $color-disabled;
-    }
+<template>
+    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
+    <view class="action-buttom-wrap"
+        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
+        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
+        @click="clickEvent">
+        <text class="price-font">{{ textPrice }}</text>
+        <text>{{ text }}</text>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'ns-goods-action-button',
+        props: {
+            // 商品底部按钮文字
+            text: {
+                type: String,
+                default: ''
+            },
+            // 商品底部按钮价格文字
+            textPrice: {
+                type: String,
+                default: ''
+            },
+            // 背景色
+            background: {
+                type: String,
+                default: ''
+            },
+            // 背景色样式
+            backgroundClass: {
+                type: String,
+                default: ''
+            },
+            // 
+            backgroundColor: {
+                type: String,
+                default: ''
+            },
+            // 是否禁用
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+            // 禁用文字提示
+            disabledText: {
+                type: String,
+                default: ''
+            },
+            // 文字颜色
+            textColor: {
+                type: String,
+                default: ''
+            },
+        },
+        computed: {},
+        methods: {
+            clickEvent() {
+                this.$emit('click');
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    .action-buttom-wrap {
+        flex: 1;
+        height: 70rpx;
+        font-weight: 600;
+        font-size: 30rpx;
+        line-height: 70rpx;
+        border: none;
+        color: #fff;
+        text-align: center;
+        border-radius: 10rpx;
+        margin-right: 20rpx;
+    }
+
+    .action-buttom-wrap.has-second {
+        line-height: 50rpx;
+    }
+
+    .action-buttom-wrap.has-second text {
+        display: block;
+        line-height: 1.2;
+    }
+
+    .action-buttom-wrap:active {
+        opacity: 0.8;
+    }
+
+    .action-buttom-wrap.disabled {
+        background: $color-disabled;
+    }
 </style>
\ No newline at end of file
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.vue b/components/ns-goods-action-icon/ns-goods-action-icon.vue
index f958edd..dded95b 100644
--- a/components/ns-goods-action-icon/ns-goods-action-icon.vue
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue
@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
@@ -72,9 +71,6 @@ export default {
 			}
 		}
 	},
-	components:{
-		nsContact
-	},
 	methods: {
 		clickEvent() {
 			this.$emit('click');
diff --git a/components/ns-goods-recommend/ns-goods-recommend.vue b/components/ns-goods-recommend/ns-goods-recommend.vue
index 10a7d57..88223eb 100644
--- a/components/ns-goods-recommend/ns-goods-recommend.vue
+++ b/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -3,16 +3,9 @@
 </template>
 
 <script>
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-
 	// 商品推荐
 	export default {
 		name: 'ns-goods-recommend',
-		components: {
-			nsLoading,
-			nsGoodsSkuIndex
-		},
 		data() {
 			return {
 				list: [],
diff --git a/components/ns-goods-sku/ns-goods-sku-category.vue b/components/ns-goods-sku/ns-goods-sku-category.vue
index a220d93..360cb59 100644
--- a/components/ns-goods-sku/ns-goods-sku-category.vue
+++ b/components/ns-goods-sku/ns-goods-sku-category.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku-new.vue';
+	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-new.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku-category',
diff --git a/components/ns-goods-sku/ns-goods-sku-index.vue b/components/ns-goods-sku/ns-goods-sku-index.vue
index 4e632ca..345b7a1 100644
--- a/components/ns-goods-sku/ns-goods-sku-index.vue
+++ b/components/ns-goods-sku/ns-goods-sku-index.vue
@@ -2,235 +2,233 @@
 	<view class="goods-sku">
 		<ns-login ref="login"></ns-login>
 		<!-- sku选择 -->
-		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
+		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id"
+			:goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy"
+			@refresh="refreshGoodsSkuDetail"></ns-goods-sku>
 	</view>
 </template>
 
 <script>
-	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-	// 商品SKU
-	export default {
-		name: 'ns-goods-sku-index',
-		components: {
-			nsGoodsSku
+// 商品SKU
+export default {
+	name: 'ns-goods-sku-index',
+	data() {
+		return {
+			timeout: {},
+			isRepeat: false,
+			goodsDetail: {}
+		};
+	},
+	created() { },
+	methods: {
+		/**
+		 * 添加购物车
+		 * @param {Object} config 购物车事件（detail-详情，cart-加入购物车）
+		 * @param {Object} data 商品项
+		 */
+		addCart(config, data, event) {
+			if (!this.storeToken) {
+				this.$refs.login.open('/pages/index/index')
+				return;
+			}
+			if (config == "detail" || data.is_virtual) {
+				this.$util.redirectTo('/pages_goods/detail', {
+					goods_id: data.goods_id
+				});
+				return false;
+			}
+			// 多规格
+			if (data.goods_spec_format) {
+				this.multiSpecificationGoods(data);
+			} else {
+				this.singleSpecificationGoods(data, event);
+			}
 		},
-		data() {
-			return {
-				timeout: {},
-				isRepeat: false,
-				goodsDetail: {}
-			};
-		},
-		created() {},
-		methods: {
-			/**
-			 * 添加购物车
-			 * @param {Object} config 购物车事件（detail-详情，cart-加入购物车）
-			 * @param {Object} data 商品项
-			 */
-			addCart(config, data, event) {
-				if (!this.storeToken) {
-					this.$refs.login.open('/pages/index/index')
-					return;
-				}
-				if (config == "detail" || data.is_virtual) {
-					this.$util.redirectTo('/pages_goods/detail', {
-						goods_id: data.goods_id
-					});
-					return false;
-				}
-				// 多规格
-				if (data.goods_spec_format) {
-					this.multiSpecificationGoods(data);
-				} else {
-					this.singleSpecificationGoods(data, event);
-				}
-			},
-			/**
-			 * 单规格
-			 * @param {Object} data 商品项
-			 */
-			singleSpecificationGoods(data, event) {
-				let cart =
-					this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
-						.sku_id
-					] ?
+		/**
+		 * 单规格
+		 * @param {Object} data 商品项
+		 */
+		singleSpecificationGoods(data, event) {
+			let cart =
+				this.cartList['goods_' + data.goods_id] && this.cartList['goods_' + data.goods_id]['sku_' + data
+					.sku_id
+				] ?
 					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] :
 					null;
-				
-				let cartNum = cart ? cart.num : 0;
-				let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
-				let minBuy = data.min_buy > 0 ? data.min_buy : 1;
-				let num = cartNum >= minBuy ? cartNum : minBuy;
-				let _num = num;
-				if(cart && cart.cart_id){
-					_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
-				}
-				let cart_id = cart ? cart.cart_id : 0;
-				if (_num > parseInt(data.stock)) {
-					this.$util.showToast({
-						title: '商品库存不足'
-					});
-					return;
-				}
-				if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
-					this.$util.showToast({
-						title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
-					});
-					return;
-				}
 
-				if (cart) {
-					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
-				} else {
-
-					// 如果商品第一次添加，则初始化数据
-					if (!this.cartList['goods_' + data.goods_id]) {
-						this.cartList['goods_' + data.goods_id] = {};
-					}
-
-					let discount_price = data.discount_price;
-					if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
-						discount_price = data.member_price;
-					}
-
-					this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
-						cart_id,
-						goods_id: data.goods_id,
-						sku_id: data.sku_id,
-						num: _num,
-						discount_price
-					};
-				}
-
-				if (this.isRepeat) return;
-				this.isRepeat = true;
-
-				this.$emit('addCart', event.currentTarget.id);
-
-				this.$api.sendRequest({
-					url: api,
-					data: {
-						cart_id,
-						sku_id: data.sku_id,
-						num: _num
-					},
-					success: res => {
-						this.isRepeat = false;
-						if (res.code == 0) {
-							if (cart_id == 0) {
-								this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id =
-									res.data;
-							}
-							this.$util.showToast({
-								title: "商品添加购物车成功"
-							});
-							this.$store.commit('setCartChange');
-							this.$store.dispatch('cartCalculate');
-							this.$emit("cartListChange", this.cartList);
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
+			let cartNum = cart ? cart.num : 0;
+			let api = cart && cart.cart_id ? '/api/cart/edit' : '/api/cart/add';
+			let minBuy = data.min_buy > 0 ? data.min_buy : 1;
+			let num = cartNum >= minBuy ? cartNum : minBuy;
+			let _num = num;
+			if (cart && cart.cart_id) {
+				_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
+			}
+			let cart_id = cart ? cart.cart_id : 0;
+			if (_num > parseInt(data.stock)) {
+				this.$util.showToast({
+					title: '商品库存不足'
 				});
-			},
-			/**
-			 * 多规格
-			 * @param {Object} data 商品项
-			 */
-			multiSpecificationGoods(data) {
-				this.$api.sendRequest({
-					url: '/api/goodssku/getInfoForCategory',
-					data: {
-						sku_id: data.sku_id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							let item = res.data;
-							item.unit = item.unit || '件';
+				return;
+			}
+			if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
+				this.$util.showToast({
+					title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
+				});
+				return;
+			}
 
-							if (item.sku_images) item.sku_images = item.sku_images.split(',');
-							else item.sku_images = [];
+			if (cart) {
+				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = _num;
+			} else {
 
-							// 多规格时合并主图
-							if (item.goods_spec_format && item.goods_image) {
-								item.goods_image = item.goods_image.split(',');
-								item.sku_images = item.goods_image.concat(item.sku_images);
-							}
+				// 如果商品第一次添加，则初始化数据
+				if (!this.cartList['goods_' + data.goods_id]) {
+					this.cartList['goods_' + data.goods_id] = {};
+				}
 
-							// 当前商品SKU规格
-							if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+				let discount_price = data.discount_price;
+				if (data.member_price > 0 && Number(data.member_price) <= Number(data.discount_price)) {
+					discount_price = data.member_price;
+				}
 
-							// 商品SKU格式
-							if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+				this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+					cart_id,
+					goods_id: data.goods_id,
+					sku_id: data.sku_id,
+					num: _num,
+					discount_price
+				};
+			}
 
-							// 限时折扣
-							if (item.promotion_type == 1) {
-								item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
-							}
+			if (this.isRepeat) return;
+			this.isRepeat = true;
 
-							if (item.promotion_type == 1 && item.discountTimeMachine) {
-								if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
-									item.show_price = item.member_price;
-								} else {
-									item.show_price = item.discount_price;
-								}
-							} else if (item.member_price > 0) {
+			this.$emit('addCart', event.currentTarget.id);
+
+			this.$api.sendRequest({
+				url: api,
+				data: {
+					cart_id,
+					sku_id: data.sku_id,
+					num: _num
+				},
+				success: res => {
+					this.isRepeat = false;
+					if (res.code == 0) {
+						if (cart_id == 0) {
+							this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].cart_id =
+								res.data;
+						}
+						this.$util.showToast({
+							title: "商品添加购物车成功"
+						});
+						this.$store.commit('setCartChange');
+						this.$store.dispatch('cartCalculate');
+						this.$emit("cartListChange", this.cartList);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		/**
+		 * 多规格
+		 * @param {Object} data 商品项
+		 */
+		multiSpecificationGoods(data) {
+			this.$api.sendRequest({
+				url: '/api/goodssku/getInfoForCategory',
+				data: {
+					sku_id: data.sku_id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						let item = res.data;
+						item.unit = item.unit || '件';
+
+						if (item.sku_images) item.sku_images = item.sku_images.split(',');
+						else item.sku_images = [];
+
+						// 多规格时合并主图
+						if (item.goods_spec_format && item.goods_image) {
+							item.goods_image = item.goods_image.split(',');
+							item.sku_images = item.goods_image.concat(item.sku_images);
+						}
+
+						// 当前商品SKU规格
+						if (item.sku_spec_format) item.sku_spec_format = JSON.parse(item.sku_spec_format);
+
+						// 商品SKU格式
+						if (item.goods_spec_format) item.goods_spec_format = JSON.parse(item.goods_spec_format);
+
+						// 限时折扣
+						if (item.promotion_type == 1) {
+							item.discountTimeMachine = this.$util.countDown(item.end_time - res.timestamp);
+						}
+
+						if (item.promotion_type == 1 && item.discountTimeMachine) {
+							if (item.member_price > 0 && Number(item.member_price) <= Number(item.discount_price)) {
 								item.show_price = item.member_price;
 							} else {
-								item.show_price = item.price;
+								item.show_price = item.discount_price;
 							}
-							this.goodsDetail = item;
-
-							this.$nextTick(() => {
-								if (this.$refs.goodsSku) {
-									this.$refs.goodsSku.show("join_cart", (res) => {
-
-										let goods = this.cartList['goods_' + res.goods_id];
-										let cart = null;
-										if (goods && goods['sku_' + res.sku_id]) {
-											cart = goods['sku_' + res.sku_id];
-										}
-
-										if (cart) {
-											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id].num = res.num;
-										} else {
-
-											// 如果商品第一次添加，则初始化数据
-											if (!this.cartList['goods_' + res.goods_id]) {
-												this.cartList['goods_' + res.goods_id] = {};
-											}
-
-											this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id] = {
-												cart_id: res.cart_id,
-												goods_id: res.goods_id,
-												sku_id: res.sku_id,
-												num: res.num,
-												discount_price: res.discount_price
-											};
-
-										}
-
-										this.$store.dispatch('cartCalculate');
-										this.$emit("cartListChange", this.cartList);
-
-										// 加入购物车动效
-										setTimeout(() => {
-											this.$store.commit('setCartChange');
-										}, 100);
-
-									});
-								}
-							});
+						} else if (item.member_price > 0) {
+							item.show_price = item.member_price;
+						} else {
+							item.show_price = item.price;
 						}
+						this.goodsDetail = item;
+
+						this.$nextTick(() => {
+							if (this.$refs.goodsSku) {
+								this.$refs.goodsSku.show("join_cart", (res) => {
+
+									let goods = this.cartList['goods_' + res.goods_id];
+									let cart = null;
+									if (goods && goods['sku_' + res.sku_id]) {
+										cart = goods['sku_' + res.sku_id];
+									}
+
+									if (cart) {
+										this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id].num = res.num;
+									} else {
+
+										// 如果商品第一次添加，则初始化数据
+										if (!this.cartList['goods_' + res.goods_id]) {
+											this.cartList['goods_' + res.goods_id] = {};
+										}
+
+										this.cartList['goods_' + res.goods_id]['sku_' + res.sku_id] = {
+											cart_id: res.cart_id,
+											goods_id: res.goods_id,
+											sku_id: res.sku_id,
+											num: res.num,
+											discount_price: res.discount_price
+										};
+
+									}
+
+									this.$store.dispatch('cartCalculate');
+									this.$emit("cartListChange", this.cartList);
+
+									// 加入购物车动效
+									setTimeout(() => {
+										this.$store.commit('setCartChange');
+									}, 100);
+
+								});
+							}
+						});
 					}
-				});
-			},
-			refreshGoodsSkuDetail(data) {
-				this.goodsDetail = Object.assign({}, this.goodsDetail, data);
-			}
+				}
+			});
+		},
+		refreshGoodsSkuDetail(data) {
+			this.goodsDetail = Object.assign({}, this.goodsDetail, data);
 		}
-	};
+	}
+};
 </script>
\ No newline at end of file
diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue
index a7441d7..0c06877 100644
--- a/components/ns-goods-sku/ns-goods-sku.vue
+++ b/components/ns-goods-sku/ns-goods-sku.vue
@@ -214,7 +214,7 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
+	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index 9bb8391..ab92cf2 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -51,32 +51,38 @@
 					<view class="item-wrap">
 						<text class="label">头像</text>
 						<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+								@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 							<text class="iconfont icon-right color-tip"></text>
 						</button>
 					</view>
 					<view class="item-wrap">
 						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+							maxlength="50" />
 					</view>
 					<!-- #endif  -->
 
 					<!-- #ifdef MP-ALIPAY -->
 					<view class="item-wrap">
 						<text class="label">头像</text>
-						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo" :plain="true" class="border-0">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo"
+							:plain="true" class="border-0">
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+								@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 							<text class="iconfont icon-right color-tip"></text>
 						</button>
 					</view>
 					<view class="item-wrap">
 						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+							maxlength="50" />
 					</view>
 					<!-- #endif  -->
 					<view class="item-wrap" v-if="forceBindingMobileControl">
 						<text class="label">手机号</text>
-						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0" @getphonenumber="getPhoneNumber">
+						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0"
+							@getphonenumber="getPhoneNumber">
 							<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
 							<text class="color-base-text" v-else>获取手机号</text>
 						</button>
@@ -97,333 +103,484 @@
 </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
 
-	// #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';
 
-	import auth from '@/common/js/auth.js';
-	import validate from '@/common/js/validate.js';
+export default {
+	mixins: [auth],
+	name: 'ns-login',
+	components: {
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+		return {
+			url: '',
+			registerConfig: {},
+			avatarUrl: '', // 头像预览路径
+			headImg: '', // 头像上传路径
+			nickName: '', // 昵称
+			isSub: false,
 
-	export default {
-		mixins: [auth],
-		name: 'ns-login',
-		components: {
-			uniPopup,
-			registerReward,
+			// 绑定手机号
+			isOpenCaptcha: 0, // 前台登录验证码，0：关闭，1：开启
+			captcha: {
+				id: '',
+				img: ''
+			},
+			formData: {
+				key: '',
+				mobile: '',
+				vercode: '',
+				dynacode: ''
+			},
+			dynacodeData: {
+				seconds: 120,
+				timer: null,
+				codeText: '获取动态码',
+				isSend: false
+			},
+			// 小程序获取手机号所需数据
+			authMobileData: {
+				iv: '',
+				encryptedData: ''
+			}
+		};
+	},
+	options: {
+		styleIsolation: 'shared'
+	},
+	mounted() { },
+	watch: {
+		'dynacodeData.seconds': {
+			handler(newValue, oldValue) {
+				if (newValue == 0) {
+					this.refreshDynacodeData();
+				}
+			},
+			immediate: true,
+			deep: true
+		}
+	},
+	computed: {
+		// 控制按钮是否禁用
+		isDisabled() {
 			// #ifdef MP-WEIXIN
-			privacyPopup
+			if (this.nickName.length == 0) return true;
+			// #endif
+
+			// 强制绑定手机号验证
+			if (this.forceBindingMobileControl) {
+				if (this.formData.mobile.length == 0) return true;
+
+				// #ifdef H5
+
+				// 验证码
+				if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
+
+				// 动态码
+				if (this.formData.dynacode.length == 0) return true;
+
+				// #endif
+			}
+			return false;
+		},
+		forceBindingMobileControl() {
+			if (this.registerConfig && this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1)
+				return true;
+			else return false;
+		}
+	},
+	methods: {
+		// 获取注册配置
+		getRegisterConfig(callback = null) {
+			this.$api.sendRequest({
+				url: '/api/register/config',
+				success: res => {
+					if (res.code >= 0) {
+						this.registerConfig = res.data.value;
+						if (callback) callback();
+					}
+				}
+			});
+		},
+		open(url) {
+			if (url) this.url = url;
+			// #ifdef MP
+			this.getCode(authData => {
+				this.authLogin(authData, 'authOnlyLogin');
+			});
+			// #endif
+
+			// #ifdef H5
+			if (this.$util.isWeChatMiniProgram()) {
+				// 微信小程序环境，使用微信授权登录
+				let authData = uni.getStorageSync('authInfo');
+				if (authData) this.authLogin(authData);
+				else this.getCode();
+			} else if (this.$util.isWeiXin()) {
+				// 微信浏览器环境，显示登录页面
+				this.toLogin();
+			} else {
+				// 其他浏览器环境，显示登录页面
+				this.toLogin();
+			}
+			// #endif
+
+			// #ifndef MP || H5
+			this.toLogin();
 			// #endif
 		},
-		data() {
-			return {
-				url: '',
-				registerConfig: {},
-				avatarUrl: '', // 头像预览路径
-				headImg: '', // 头像上传路径
-				nickName: '', // 昵称
-				isSub: false,
-
-				// 绑定手机号
-				isOpenCaptcha: 0, // 前台登录验证码，0：关闭，1：开启
-				captcha: {
-					id: '',
-					img: ''
-				},
-				formData: {
-					key: '',
-					mobile: '',
-					vercode: '',
-					dynacode: ''
-				},
-				dynacodeData: {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				},
-				// 小程序获取手机号所需数据
-				authMobileData: {
-					iv: '',
-					encryptedData: ''
-				}
-			};
+		// 跳转去登录页
+		toLogin() {
+			if (this.url) this.$util.redirectTo('/pages_tool/login/login', {
+				back: encodeURIComponent(this.url)
+			});
+			else this.$util.redirectTo('/pages_tool/login/login');
 		},
-		options: {
-			styleIsolation: 'shared'
+		cancelCompleteInfo() {
+			if (this.$refs.completeInfoPopup) this.$refs.completeInfoPopup.close();
+			this.$store.commit('setBottomNavHidden', false); // 显示底部导航
 		},
-		mounted() {},
-		watch: {
-			'dynacodeData.seconds': {
-				handler(newValue, oldValue) {
-					if (newValue == 0) {
-						this.refreshDynacodeData();
-					}
-				},
-				immediate: true,
-				deep: true
-			}
+		blurNickName(e) {
+			if (e.detail.value) this.nickName = e.detail.value;
 		},
-		computed: {
-			// 控制按钮是否禁用
-			isDisabled() {
-				// #ifdef MP-WEIXIN
-				if (this.nickName.length == 0) return true;
-				// #endif
+		onChooseAvatar(e) {
+			this.avatarUrl = e.detail.avatarUrl;
+			uni.getFileSystemManager().readFile({
+				filePath: this.avatarUrl, //选择图片返回的相对路径
+				encoding: 'base64', //编码格式
+				success: res => {
+					let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
 
-				// 强制绑定手机号验证
-				if (this.forceBindingMobileControl) {
-					if (this.formData.mobile.length == 0) return true;
-
-					// #ifdef H5
-
-					// 验证码
-					if (this.isOpenCaptcha == 1 && this.formData.vercode.length == 0) return true;
-
-					// 动态码
-					if (this.formData.dynacode.length == 0) return true;
-
-					// #endif
-				}
-				return false;
-			},
-			forceBindingMobileControl() {
-				if (this.registerConfig && this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1)
-					return true;
-				else return false;
-			}
-		},
-		methods: {
-			// 获取注册配置
-			getRegisterConfig(callback = null) {
-				this.$api.sendRequest({
-					url: '/api/register/config',
-					success: res => {
-						if (res.code >= 0) {
-							this.registerConfig = res.data.value;
-							if (callback) callback();
-						}
-					}
-				});
-			},
-			open(url) {
-				if (url) this.url = url;
-				// #ifdef MP
-				this.getCode(authData => {
-					this.authLogin(authData, 'authOnlyLogin');
-				});
-				// #endif
-
-				// #ifdef H5
-				if (this.$util.isWeChatMiniProgram()) {
-					// 微信小程序环境，使用微信授权登录
-					let authData = uni.getStorageSync('authInfo');
-					if (authData) this.authLogin(authData);
-					else this.getCode();
-				} else if (this.$util.isWeiXin()) {
-					// 微信浏览器环境，显示登录页面
-					this.toLogin();
-				} else {
-					// 其他浏览器环境，显示登录页面
-					this.toLogin();
-				}
-				// #endif
-
-				// #ifndef MP || H5
-				this.toLogin();
-				// #endif
-			},
-			// 跳转去登录页
-			toLogin() {
-				if (this.url) this.$util.redirectTo('/pages_tool/login/login', {
-					back: encodeURIComponent(this.url)
-				});
-				else this.$util.redirectTo('/pages_tool/login/login');
-			},
-			cancelCompleteInfo() {
-				if (this.$refs.completeInfoPopup) this.$refs.completeInfoPopup.close();
-				this.$store.commit('setBottomNavHidden', false); // 显示底部导航
-			},
-			blurNickName(e) {
-				if (e.detail.value) this.nickName = e.detail.value;
-			},
-			onChooseAvatar(e) {
-				this.avatarUrl = e.detail.avatarUrl;
-				uni.getFileSystemManager().readFile({
-					filePath: this.avatarUrl, //选择图片返回的相对路径
-					encoding: 'base64', //编码格式
-					success: res => {
-						let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示的哦
-
-						this.$api.uploadBase64({
-							base64,
-							success: res => {
-								if (res.code == 0) {
-									this.headImg = res.data.pic_path;
-								} else {
-									this.$util.showToast({
-										title: res.message
-									});
-								}
-							},
-							fail: () => {
+					this.$api.uploadBase64({
+						base64,
+						success: res => {
+							if (res.code == 0) {
+								this.headImg = res.data.pic_path;
+							} else {
 								this.$util.showToast({
-									title: '上传失败'
+									title: res.message
 								});
 							}
-						})
-					}
-				});
-			},
-			openCompleteInfoPop() {
-				this.getRegisterConfig();
-
-				// #ifdef H5
-				if (!this.storeToken) this.getCaptchaConfig();
-				// #endif
-
-				this.$refs.completeInfoPopup.open(() => {
-					this.$store.commit('setBottomNavHidden', false); //显示底部导航
-				});
-				this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
-			},
-			// 获取前台登录验证码开关配置
-			getCaptchaConfig() {
-				this.$api.sendRequest({
-					url: '/api/config/getCaptchaConfig',
-					success: res => {
-						if (res.code >= 0) {
-							this.isOpenCaptcha = res.data.shop_reception_login;
-							if (this.isOpenCaptcha) this.getCaptcha();
-						}
-					}
-				});
-			},
-			// 获取验证码
-			getCaptcha() {
-				this.$api.sendRequest({
-					url: '/api/captcha/captcha',
-					data: {
-						captcha_id: this.captcha.id
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.captcha = res.data;
-							this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
-						}
-					}
-				});
-			},
-			// 发送手机动态码
-			sendMobileCode() {
-				if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
-				var data = {
-					mobile: this.formData.mobile,
-					captcha_id: this.captcha.id,
-					captcha_code: this.formData.vercode
-				};
-				var rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.isOpenCaptcha == 1) {
-					rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: '请输入验证码'
-					});
-				}
-				var checkRes = validate.check(data, rule);
-				if (!checkRes) {
-					this.$util.showToast({
-						title: validate.error
-					});
-					return;
-				}
-				this.dynacodeData.isSend = true;
-
-				if (this.dynacodeData.seconds == 120) {
-					this.dynacodeData.timer = setInterval(() => {
-						this.dynacodeData.seconds--;
-						this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-					}, 1000);
-				}
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobileCode',
-					data: data,
-					success: res => {
-						if (res.code >= 0) {
-							this.formData.key = res.data.key;
-						} else {
+						},
+						fail: () => {
 							this.$util.showToast({
-								title: res.message
+								title: '上传失败'
 							});
-							this.refreshDynacodeData();
 						}
-					},
-					fail: () => {
+					})
+				}
+			});
+		},
+		openCompleteInfoPop() {
+			this.getRegisterConfig();
+
+			// #ifdef H5
+			if (!this.storeToken) this.getCaptchaConfig();
+			// #endif
+
+			this.$refs.completeInfoPopup.open(() => {
+				this.$store.commit('setBottomNavHidden', false); //显示底部导航
+			});
+			this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
+		},
+		// 获取前台登录验证码开关配置
+		getCaptchaConfig() {
+			this.$api.sendRequest({
+				url: '/api/config/getCaptchaConfig',
+				success: res => {
+					if (res.code >= 0) {
+						this.isOpenCaptcha = res.data.shop_reception_login;
+						if (this.isOpenCaptcha) this.getCaptcha();
+					}
+				}
+			});
+		},
+		// 获取验证码
+		getCaptcha() {
+			this.$api.sendRequest({
+				url: '/api/captcha/captcha',
+				data: {
+					captcha_id: this.captcha.id
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.captcha = res.data;
+						this.captcha.img = this.captcha.img.replace(/\r\n/g, '');
+					}
+				}
+			});
+		},
+		// 发送手机动态码
+		sendMobileCode() {
+			if (this.dynacodeData.seconds != 120 || this.dynacodeData.isSend) return;
+			var data = {
+				mobile: this.formData.mobile,
+				captcha_id: this.captcha.id,
+				captcha_code: this.formData.vercode
+			};
+			var rule = [{
+				name: 'mobile',
+				checkType: 'required',
+				errorMsg: '请输入手机号'
+			}, {
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: '请输入正确的手机号'
+			}];
+			if (this.isOpenCaptcha == 1) {
+				rule.push({
+					name: 'captcha_code',
+					checkType: 'required',
+					errorMsg: '请输入验证码'
+				});
+			}
+			var checkRes = validate.check(data, rule);
+			if (!checkRes) {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return;
+			}
+			this.dynacodeData.isSend = true;
+
+			if (this.dynacodeData.seconds == 120) {
+				this.dynacodeData.timer = setInterval(() => {
+					this.dynacodeData.seconds--;
+					this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+				}, 1000);
+			}
+
+			this.$api.sendRequest({
+				url: '/api/tripartite/mobileCode',
+				data: data,
+				success: res => {
+					if (res.code >= 0) {
+						this.formData.key = res.data.key;
+					} else {
 						this.$util.showToast({
-							title: 'request:fail'
+							title: res.message
 						});
 						this.refreshDynacodeData();
 					}
-				});
-			},
-			refreshDynacodeData() {
-				this.getCaptcha();
-				clearInterval(this.dynacodeData.timer);
-				this.dynacodeData = {
-					seconds: 120,
-					timer: null,
-					codeText: '获取动态码',
-					isSend: false
-				};
-			},
-			// 表单验证
-			verify(data) {
-				let rule = [{
-					name: 'mobile',
-					checkType: 'required',
-					errorMsg: '请输入手机号'
-				}, {
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				}];
-				if (this.isOpenCaptcha == 1) {
-					if (this.captcha.id != '') rule.push({
-						name: 'captcha_code',
-						checkType: 'required',
-						errorMsg: '请输入验证码'
-					});
-				}
-				rule.push({
-					name: 'code',
-					checkType: 'required',
-					errorMsg: '请输入动态码'
-				});
-
-				var checkRes = validate.check(data, rule);
-				if (checkRes) {
-					return true;
-				} else {
+				},
+				fail: () => {
 					this.$util.showToast({
-						title: validate.error
+						title: 'request:fail'
 					});
-					return false;
+					this.refreshDynacodeData();
 				}
-			},
-			// 微信公众号强制绑定手机号
-			forceBindMobile() {
+			});
+		},
+		refreshDynacodeData() {
+			this.getCaptcha();
+			clearInterval(this.dynacodeData.timer);
+			this.dynacodeData = {
+				seconds: 120,
+				timer: null,
+				codeText: '获取动态码',
+				isSend: false
+			};
+		},
+		// 表单验证
+		verify(data) {
+			let rule = [{
+				name: 'mobile',
+				checkType: 'required',
+				errorMsg: '请输入手机号'
+			}, {
+				name: 'mobile',
+				checkType: 'phoneno',
+				errorMsg: '请输入正确的手机号'
+			}];
+			if (this.isOpenCaptcha == 1) {
+				if (this.captcha.id != '') rule.push({
+					name: 'captcha_code',
+					checkType: 'required',
+					errorMsg: '请输入验证码'
+				});
+			}
+			rule.push({
+				name: 'code',
+				checkType: 'required',
+				errorMsg: '请输入动态码'
+			});
+
+			var checkRes = validate.check(data, rule);
+			if (checkRes) {
+				return true;
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+		},
+		// 微信公众号强制绑定手机号
+		forceBindMobile() {
+			let authData = uni.getStorageSync('authInfo');
+			let data = {
+				mobile: this.formData.mobile,
+				key: this.formData.key,
+				code: this.formData.dynacode
+			};
+			if (this.captcha.id != '') {
+				data.captcha_id = this.captcha.id;
+				data.captcha_code = this.formData.vercode;
+			}
+
+			if (authData) Object.assign(data, authData);
+			if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+			if (authData.nickName) data.nickname = authData.nickName;
+
+			if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+			if (this.isSub) return;
+			this.isSub = true;
+
+			this.$api.sendRequest({
+				url: '/api/tripartite/mobile',
+				data,
+				success: res => {
+					if (res.code >= 0) {
+						this.$store.commit('setToken', res.data.token);
+						this.getMemberInfo();
+						this.$store.dispatch('getCartNumber');
+						this.$refs.completeInfoPopup.close();
+						this.$store.commit('setBottomNavHidden', false); // 显示底部导航
+						if (res.data.is_register) this.$refs.registerReward.open(this.url);
+					} else {
+						this.isSub = false;
+						this.getCaptcha();
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					this.isSub = false;
+					this.getCaptcha();
+				}
+			});
+		},
+		// 微信小程序获取手机号
+		getPhoneNumber(e) {
+			console.log(e)
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
 				let authData = uni.getStorageSync('authInfo');
+				if (authData) Object.assign(this.authMobileData, authData, e.detail);
+				if (uni.getStorageSync('source_member')) this.authMobileData.source_member = uni.getStorageSync('source_member');
+
+				this.$api.sendRequest({
+					url: '/api/tripartite/getPhoneNumber',
+					data: this.authMobileData,
+					success: res => {
+						if (res.code >= 0) {
+							this.formData.mobile = res.data.mobile;
+						} else {
+							this.formData.mobile = '';
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			} else {
+				this.$util.showToast({
+					title: e.detail.errMsg
+				})
+			}
+		},
+		// 微信小程序强制绑定手机号
+		bindMobile() {
+			let data = this.authMobileData;
+			let authData = uni.getStorageSync('authInfo');
+			if (authData) Object.assign(data, authData);
+			if (authData.avatarUrl) data.headimg = authData.avatarUrl;
+			if (authData.nickName) data.nickname = authData.nickName;
+
+			this.$api.sendRequest({
+				url: '/api/tripartite/mobileauth',
+				data,
+				success: res => {
+					if (res.code >= 0) {
+						this.$store.commit('setToken', res.data.token);
+						this.getMemberInfo();
+						this.$store.dispatch('getCartNumber');
+						this.cancelCompleteInfo();
+						if (res.data.is_register) this.$refs.registerReward.open(this.url);
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					this.$util.showToast({
+						title: 'request:fail'
+					});
+				}
+			});
+		},
+		/**
+		 * 授权登录
+		 */
+		authLogin(data, type = 'authLogin') {
+			uni.showLoading({
+				title: '登录中'
+			});
+			uni.setStorageSync('authInfo', data);
+			if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
+			this.$api.sendRequest({
+				url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
+				data,
+				success: res => {
+					if (res.code >= 0) {
+						this.$store.commit('setToken', res.data.token);
+						this.getMemberInfo();
+						this.$store.dispatch('getCartNumber');
+						if (res.data.is_register) this.$refs.registerReward.open(this
+							.url);
+						this.cancelCompleteInfo();
+						setTimeout(() => {
+							uni.hideLoading();
+						}, 1000);
+					} else if (res.data == 'MEMBER_NOT_EXIST') {
+						this.getRegisterConfig(() => {
+							uni.hideLoading();
+							if (this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1) {
+								this.openCompleteInfoPop();
+							} else if (this.registerConfig.third_party == 0) {
+								this.toLogin();
+							} else {
+								this.openCompleteInfoPop();
+							}
+						});
+					} else {
+						uni.hideLoading();
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: () => {
+					uni.hideLoading();
+					this.$util.showToast({
+						title: '登录失败'
+					});
+				}
+			});
+		},
+		// 微信公众号，强制绑定手机号，验证
+		saveH5() {
+			if (this.$util.isWeiXin() && this.forceBindingMobileControl) {
 				let data = {
 					mobile: this.formData.mobile,
 					key: this.formData.key,
@@ -433,365 +590,209 @@
 					data.captcha_id = this.captcha.id;
 					data.captcha_code = this.formData.vercode;
 				}
-
-				if (authData) Object.assign(data, authData);
-				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
-				if (authData.nickName) data.nickname = authData.nickName;
-
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-				if (this.isSub) return;
-				this.isSub = true;
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobile',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							this.$refs.completeInfoPopup.close();
-							this.$store.commit('setBottomNavHidden', false); // 显示底部导航
-							if (res.data.is_register) this.$refs.registerReward.open(this.url);
-						} else {
-							this.isSub = false;
-							this.getCaptcha();
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: res => {
-						this.isSub = false;
-						this.getCaptcha();
-					}
+				if (!this.verify(data)) return;
+			}
+			this.forceBindMobile();
+		},
+		// 微信小程序保存数据
+		saveMp() {
+			if (this.nickName.length == 0) {
+				this.$util.showToast({
+					title: '请输入昵称'
 				});
-			},
-			// 微信小程序获取手机号
-			getPhoneNumber(e) {
-				console.log(e)
-				if (e.detail.errMsg == 'getPhoneNumber:ok') {
-					let authData = uni.getStorageSync('authInfo');
-					if (authData) Object.assign(this.authMobileData, authData, e.detail);
-					if (uni.getStorageSync('source_member')) this.authMobileData.source_member = uni.getStorageSync('source_member');
+				return;
+			}
+			let authData = uni.getStorageSync('authInfo');
+			if (authData) Object.assign(authData, {
+				nickName: this.nickName,
+				avatarUrl: this.headImg
+			});
+			uni.setStorageSync('authInfo', authData);
 
-					this.$api.sendRequest({
-						url: '/api/tripartite/getPhoneNumber',
-						data: this.authMobileData,
-						success: res => {
-							if (res.code >= 0) {
-								this.formData.mobile = res.data.mobile;
-							} else {
-								this.formData.mobile = '';
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else {
-					this.$util.showToast({
-						title: e.detail.errMsg
-					})
-				}
-			},
-			// 微信小程序强制绑定手机号
-			bindMobile() {
-				let data = this.authMobileData;
-				let authData = uni.getStorageSync('authInfo');
-				if (authData) Object.assign(data, authData);
-				if (authData.avatarUrl) data.headimg = authData.avatarUrl;
-				if (authData.nickName) data.nickname = authData.nickName;
-
-				this.$api.sendRequest({
-					url: '/api/tripartite/mobileauth',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							this.cancelCompleteInfo();
-							if (res.data.is_register) this.$refs.registerReward.open(this.url);
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: res => {
-						this.$util.showToast({
-							title: 'request:fail'
-						});
-					}
-				});
-			},
-			/**
-			 * 授权登录
-			 */
-			authLogin(data, type = 'authLogin') {
-				uni.showLoading({
-					title: '登录中'
-				});
-				uni.setStorageSync('authInfo', data);
-				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
-
-				this.$api.sendRequest({
-					url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
-					data,
-					success: res => {
-						if (res.code >= 0) {
-							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
-							this.$store.dispatch('getCartNumber');
-							if (res.data.is_register) this.$refs.registerReward.open(this
-								.url);
-							this.cancelCompleteInfo();
-							setTimeout(() => {
-								uni.hideLoading(); 
-							}, 1000);
-						} else if (res.data == 'MEMBER_NOT_EXIST') {
-							this.getRegisterConfig(() => {
-								uni.hideLoading();
-								if (this.registerConfig.third_party == 1 && this.registerConfig.bind_mobile == 1) {
-									this.openCompleteInfoPop();
-								} else if (this.registerConfig.third_party == 0) {
-									this.toLogin();
-								} else {
-									this.openCompleteInfoPop();
-								}
-							});
-						} else {
-							uni.hideLoading();
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: () => {
-						uni.hideLoading();
-						this.$util.showToast({
-							title: '登录失败'
-						});
-					}
-				});
-			},
-			// 微信公众号，强制绑定手机号，验证
-			saveH5() {
-				if (this.$util.isWeiXin() && this.forceBindingMobileControl) {
-					let data = {
-						mobile: this.formData.mobile,
-						key: this.formData.key,
-						code: this.formData.dynacode
-					};
-					if (this.captcha.id != '') {
-						data.captcha_id = this.captcha.id;
-						data.captcha_code = this.formData.vercode;
-					}
-					if (!this.verify(data)) return;
-				}
-				this.forceBindMobile();
-			},
-			// 微信小程序保存数据
-			saveMp() {
-				if (this.nickName.length == 0) {
-					this.$util.showToast({
-						title: '请输入昵称'
-					});
-					return;
-				}
-				let authData = uni.getStorageSync('authInfo');
-				if (authData) Object.assign(authData, {
-					nickName: this.nickName,
-					avatarUrl: this.headImg
-				});
-				uni.setStorageSync('authInfo', authData);
-
-				if (this.forceBindingMobileControl) this.bindMobile();
-				else this.authLogin(authData);
-			},
-			// #ifdef MP-ALIPAY
-			aliappGetUserinfo() {
-				my.getOpenUserInfo({
-					success: (res) => {
-						let userInfo = JSON.parse(res.response).response
-						if (userInfo.code && userInfo.code == '10000') {
-							if (userInfo.avatar) {
-								this.avatarUrl = userInfo.avatar;
-								this.$api.pullImage({
-									path: this.avatarUrl,
-									success: res => {
-										if (res.code == 0) {
-											this.headImg = res.data.pic_path;
-										} else {
-											this.$util.showToast({
-												title: res.message
-											});
-										}
-									},
-									fail: () => {
+			if (this.forceBindingMobileControl) this.bindMobile();
+			else this.authLogin(authData);
+		},
+		// #ifdef MP-ALIPAY
+		aliappGetUserinfo() {
+			my.getOpenUserInfo({
+				success: (res) => {
+					let userInfo = JSON.parse(res.response).response
+					if (userInfo.code && userInfo.code == '10000') {
+						if (userInfo.avatar) {
+							this.avatarUrl = userInfo.avatar;
+							this.$api.pullImage({
+								path: this.avatarUrl,
+								success: res => {
+									if (res.code == 0) {
+										this.headImg = res.data.pic_path;
+									} else {
 										this.$util.showToast({
-											title: '头像拉取失败'
+											title: res.message
 										});
 									}
-								})
-							}
-							this.nickName = userInfo.nickName
-						} else {
-							this.$util.showToast({
-								title: userInfo.subMsg
+								},
+								fail: () => {
+									this.$util.showToast({
+										title: '头像拉取失败'
+									});
+								}
 							})
 						}
-					},
-					fail: (err) => {
+						this.nickName = userInfo.nickName
+					} else {
 						this.$util.showToast({
-							title: err.subMsg
+							title: userInfo.subMsg
 						})
 					}
-				});
-			},
-			// #endif
-			getMemberInfo() {
-				this.$api.sendRequest({
-					url: '/api/member/info',
-					success: (res) => {
-						if (res.code >= 0) {
-							// 登录成功，存储会员信息
-							this.$store.commit('setMemberInfo', res.data);
-						}
+				},
+				fail: (err) => {
+					this.$util.showToast({
+						title: err.subMsg
+					})
+				}
+			});
+		},
+		// #endif
+		getMemberInfo() {
+			this.$api.sendRequest({
+				url: '/api/member/info',
+				success: (res) => {
+					if (res.code >= 0) {
+						// 登录成功，存储会员信息
+						this.$store.commit('setMemberInfo', res.data);
 					}
-				});
-			}
+				}
+			});
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.complete-info-popup {
-		.complete-info-wrap {
-			background: #fff;
-			padding: 50rpx 40rpx 40rpx;
+.complete-info-popup {
+	.complete-info-wrap {
+		background: #fff;
+		padding: 50rpx 40rpx 40rpx;
 
-			.head {
-				position: relative;
-				border-bottom: 2rpx solid $color-line;
-				padding-bottom: 20rpx;
+		.head {
+			position: relative;
+			border-bottom: 2rpx solid $color-line;
+			padding-bottom: 20rpx;
 
-				.title {
-					font-size: $font-size-toolbar;
-					display: block;
-				}
-
-				.tips {
-					font-size: $font-size-base;
-					display: block;
-				}
-
-				.iconfont {
-					position: absolute;
-					right: 0;
-					top: -30rpx;
-					display: inline-block;
-					width: 56rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					text-align: right;
-					font-size: $font-size-toolbar;
-					font-weight: bold;
-				}
+			.title {
+				font-size: $font-size-toolbar;
+				display: block;
 			}
 
-			.item-wrap {
-				border-bottom: 2rpx solid $color-line;
-				display: flex;
-				align-items: center;
-				padding: 16rpx 0;
-
-				.label {
-					font-size: $font-size-toolbar;
-					margin-right: 40rpx;
-					width: 100rpx;
-				}
-
-				button {
-					background: transparent;
-					margin: 0;
-					padding: 0;
-					border-radius: 0;
-					flex: 1;
-					text-align: left;
-					display: flex;
-					align-items: center;
-					font-size: $font-size-toolbar;
-					border: none;
-
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						overflow: hidden;
-					}
-				}
-
-				.iconfont {
-					flex: 1;
-					text-align: right;
-					font-size: $font-size-tag;
-				}
-
-				input {
-					flex: 1;
-					height: 80rpx;
-					box-sizing: border-box;
-					font-size: $font-size-toolbar;
-				}
-
-				.send {
-					border: 2rpx solid $base-color;
-					height: 60rpx;
-					line-height: 60rpx;
-					border-radius: 60rpx;
-					font-size: $font-size-tag;
-					text-align: center;
-					padding: 0 40rpx;
-				}
-
-				.captcha {
-					height: 80rpx;
-					width: 200rpx;
-				}
-
-				.auth-login {
-					width: calc(100% - 100rpx);
-					height: 80rpx;
-					line-height: 80rpx;
-					border-radius: 80rpx;
-				}
+			.tips {
+				font-size: $font-size-base;
+				display: block;
 			}
 
-			.save-btn {
-				width: 280rpx;
-				height: 90rpx;
-				line-height: 90rpx;
-				background-color: #07c160;
-				color: #fff;
-				margin: 40rpx auto 20rpx;
+			.iconfont {
+				position: absolute;
+				right: 0;
+				top: -30rpx;
+				display: inline-block;
+				width: 56rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: right;
+				font-size: $font-size-toolbar;
+				font-weight: bold;
 			}
 		}
+
+		.item-wrap {
+			border-bottom: 2rpx solid $color-line;
+			display: flex;
+			align-items: center;
+			padding: 16rpx 0;
+
+			.label {
+				font-size: $font-size-toolbar;
+				margin-right: 40rpx;
+				width: 100rpx;
+			}
+
+			button {
+				background: transparent;
+				margin: 0;
+				padding: 0;
+				border-radius: 0;
+				flex: 1;
+				text-align: left;
+				display: flex;
+				align-items: center;
+				font-size: $font-size-toolbar;
+				border: none;
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 10rpx;
+					overflow: hidden;
+				}
+			}
+
+			.iconfont {
+				flex: 1;
+				text-align: right;
+				font-size: $font-size-tag;
+			}
+
+			input {
+				flex: 1;
+				height: 80rpx;
+				box-sizing: border-box;
+				font-size: $font-size-toolbar;
+			}
+
+			.send {
+				border: 2rpx solid $base-color;
+				height: 60rpx;
+				line-height: 60rpx;
+				border-radius: 60rpx;
+				font-size: $font-size-tag;
+				text-align: center;
+				padding: 0 40rpx;
+			}
+
+			.captcha {
+				height: 80rpx;
+				width: 200rpx;
+			}
+
+			.auth-login {
+				width: calc(100% - 100rpx);
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: 80rpx;
+			}
+		}
+
+		.save-btn {
+			width: 280rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			background-color: #07c160;
+			color: #fff;
+			margin: 40rpx auto 20rpx;
+		}
 	}
+}
 </style>
 <style scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
-		background: none !important;
-		max-width: unset !important;
-		max-height: unset !important;
-		overflow: unset !important;
-	}
+/deep/ .reward-popup .uni-popup__wrapper-box {
+	background: none !important;
+	max-width: unset !important;
+	max-height: unset !important;
+	overflow: unset !important;
+}
 
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
-		border-top-left-radius: 30rpx !important;
-		border-top-right-radius: 30rpx !important;
-	}
+.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
+.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+	border-top-left-radius: 30rpx !important;
+	border-top-right-radius: 30rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/components/ns-new-gift/ns-new-gift.vue b/components/ns-new-gift/ns-new-gift.vue
index a6553c9..eed5fa9 100644
--- a/components/ns-new-gift/ns-new-gift.vue
+++ b/components/ns-new-gift/ns-new-gift.vue
@@ -75,12 +75,8 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	export default {
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				newgift: {
diff --git a/components/ns-newform/ns-newform.vue b/components/ns-newform/ns-newform.vue
index b341175..209b68c 100644
--- a/components/ns-newform/ns-newform.vue
+++ b/components/ns-newform/ns-newform.vue
@@ -278,13 +278,8 @@
 </template>
 
 <script>
-import pickRegions from '@/components/pick-regions/pick-regions.vue'
-
 export default {
 	name: 'ns-form',
-	components: {
-		pickRegions
-	},
 	props: {
 		data: {
 			type: Array,
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
index ba31411..7bb750f 100644
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -22,10 +22,12 @@
                     </view>
                     <block v-if="payMoney > 0">
                         <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
+                                @click="payIndex = index">
                                 <view class="iconfont" :class="item.icon"></view>
                                 <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                                <text class="iconfont"
+                                    :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
                             </view>
                         </block>
                         <block v-else>
@@ -43,396 +45,354 @@
 
 <!-- 旧版支付组件 订单表不为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
+// #ifdef H5
+import { Weixin } from 'common/js/wx-jssdk.js';
+// #endif
 
-    export default {
-        name: 'ns-payment',
-        components: {
-            uniPopup,
-            nsSwitch
+export default {
+    name: 'ns-payment',
+    props: {
+        balanceDeduct: {
+            type: [Number, String],
+            default: ''
         },
-        props: {
-            balanceDeduct: {
-                type: [Number, String],
-                default: ''
-            },
-            isBalance: {
-                type: Number,
-                default: 0
-            },
-            payMoney: {
-                type: [Number, String],
-                default: 0
-            }
+        isBalance: {
+            type: Number,
+            default: 0
         },
-        data() {
-            return {
-                isIphoneX: false,
-                payIndex: 0,
-                // #ifdef H5
-                payTypeList: [{
-                        name: '支付宝支付',
-                        icon: 'icon-zhifubaozhifu-',
-                        type: 'alipay'
-                    },
-                    {
-                        name: '微信支付',
-                        icon: 'icon-weixin1',
-                        type: 'wechatpay'
-                    }
-                ],
-                timer: null,
-                // #endif
-                // #ifdef MP-WEIXIN
-                payTypeList: [{
-                    name: '微信支付',
-                    provider: 'wxpay',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay'
-                }],
-                isMatched: 0, // 支付是否需要校验
-                // #endif
-                // #ifdef MP-ALIPAY
-                payTypeList: [{
-                    name: '支付宝支付',
-                    icon: 'icon-zhifubaozhifu-',
-                    type: 'alipay',
-                    provider: 'alipay'
-                }],
-                // #endif
-                payInfo: {},
-                balanceConfig: 0,
-                // 预售页面判断
-                sale: true
-            };
-        },
-        created(e) {
+        payMoney: {
+            type: [Number, String],
+            default: 0
+        }
+    },
+    data() {
+        return {
+            isIphoneX: false,
+            payIndex: 0,
             // #ifdef H5
-            let url = window.location.href
-            // #endif
-            // #ifndef H5
-            let 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')
-            if (list || detail) {
-                this.sale = false
+            payTypeList: [{
+                name: '支付宝支付',
+                icon: 'icon-zhifubaozhifu-',
+                type: 'alipay'
+            },
+            {
+                name: '微信支付',
+                icon: 'icon-weixin1',
+                type: 'wechatpay'
             }
-            this.isIphoneX = this.$util.uniappIsIPhoneX();
-            this.getPayType();
-            this.getBalanceConfig();
-            // #ifdef MP-WEIXIN
-            if (uni.getStorageSync('paySource') == '') this.payIsMatched();
+            ],
+            timer: null,
             // #endif
+            // #ifdef MP-WEIXIN
+            payTypeList: [{
+                name: '微信支付',
+                provider: 'wxpay',
+                icon: 'icon-weixin1',
+                type: 'wechatpay'
+            }],
+            isMatched: 0, // 支付是否需要校验
+            // #endif
+            // #ifdef MP-ALIPAY
+            payTypeList: [{
+                name: '支付宝支付',
+                icon: 'icon-zhifubaozhifu-',
+                type: 'alipay',
+                provider: 'alipay'
+            }],
+            // #endif
+            payInfo: {},
+            balanceConfig: 0,
+            // 预售页面判断
+            sale: true
+        };
+    },
+    created(e) {
+        // #ifdef H5
+        let url = window.location.href
+        // #endif
+        // #ifndef H5
+        let 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')
+        if (list || detail) {
+            this.sale = false
+        }
+        this.isIphoneX = this.$util.uniappIsIPhoneX();
+        this.getPayType();
+        this.getBalanceConfig();
+        // #ifdef MP-WEIXIN
+        if (uni.getStorageSync('paySource') == '') this.payIsMatched();
+        // #endif
+    },
+    methods: {
+        // #ifdef MP-WEIXIN
+        payIsMatched() {
+            if (uni.getStorageSync('is_test')) {
+                this.isMatched = 1;
+                return;
+            }
+            let options = wx.getLaunchOptionsSync();
+            this.$api.sendRequest({
+                url: '/shopcomponent/api/weapp/scenecheck',
+                data: {
+                    scene: options.scene
+                },
+                success: res => {
+                    if (res.code == 0) this.isMatched = res.data;
+                }
+            })
         },
-        methods: {
-            // #ifdef MP-WEIXIN
-            payIsMatched() {
-                if (uni.getStorageSync('is_test')) {
-                    this.isMatched = 1;
-                    return;
-                }
-                let options = wx.getLaunchOptionsSync();
-                this.$api.sendRequest({
-                    url: '/shopcomponent/api/weapp/scenecheck',
-                    data: {
-                        scene: options.scene
-                    },
-                    success: res => {
-                        if (res.code == 0) this.isMatched = res.data;
-                    }
-                })
-            },
-            // #endif
-            open() {
-                this.$refs.choosePaymentPopup.open();
-            },
-            close() {
-                this.$refs.choosePaymentPopup.close();
-            },
-            // 使用余额
-            useBalance() {
-                this.$emit('useBalance');
-            },
-            confirm() {
-                if (this.payTypeList.length == 0 && this.payMoney > 0) {
-                    this.$util.showToast({
-                        title: '请选择支付方式！'
-                    });
-                    return;
-                }
-                uni.showLoading({
-                    title: '支付中...',
-                    mask: true
+        // #endif
+        open() {
+            this.$refs.choosePaymentPopup.open();
+        },
+        close() {
+            this.$refs.choosePaymentPopup.close();
+        },
+        // 使用余额
+        useBalance() {
+            this.$emit('useBalance');
+        },
+        confirm() {
+            if (this.payTypeList.length == 0 && this.payMoney > 0) {
+                this.$util.showToast({
+                    title: '请选择支付方式！'
                 });
-                this.$refs.choosePaymentPopup.close();
-                this.$emit('confirm');
-                uni.setStorageSync('pay_flag', 1);
-            },
-            getPayInfo(out_trade_no) {
-                this.$api.sendRequest({
-                    url: '/api/pay/info',
-                    data: {
-                        out_trade_no
-                    },
-                    success: res => {
-                        if (res.code >= 0 && res.data) {
-                            this.payInfo = res.data;
-                            this.pay();
+                return;
+            }
+            uni.showLoading({
+                title: '支付中...',
+                mask: true
+            });
+            this.$refs.choosePaymentPopup.close();
+            this.$emit('confirm');
+            uni.setStorageSync('pay_flag', 1);
+        },
+        getPayInfo(out_trade_no) {
+            this.$api.sendRequest({
+                url: '/api/pay/info',
+                data: {
+                    out_trade_no
+                },
+                success: res => {
+                    if (res.code >= 0 && res.data) {
+                        this.payInfo = res.data;
+                        this.pay();
+                    } else {
+                        this.$util.showToast({
+                            title: '未获取到支付信息！'
+                        });
+                        setTimeout(() => {
+                            this.$util.redirectTo('/pages/index/index');
+                        }, 1500);
+                    }
+                }
+            });
+        },
+        getBalanceConfig() {
+            this.$api.sendRequest({
+                url: '/api/pay/getBalanceConfig',
+                data: {},
+                success: res => {
+                    this.balanceConfig = res.data.balance_show;
+                }
+            });
+        },
+        getPayType() {
+            this.$api.sendRequest({
+                url: '/api/pay/type',
+                success: res => {
+                    if (res.code == 0) {
+                        if (res.data.pay_type == '') {
+                            this.payTypeList = [];
                         } else {
-                            this.$util.showToast({
-                                title: '未获取到支付信息！'
+                            this.payTypeList.forEach((val, key) => {
+                                if (res.data.pay_type.indexOf(val.type) == -1) {
+                                    this.payTypeList.splice(key, 1);
+                                }
                             });
-                            setTimeout(() => {
-                                this.$util.redirectTo('/pages/index/index');
-                            }, 1500);
                         }
                     }
-                });
-            },
-            getBalanceConfig() {
-                this.$api.sendRequest({
-                    url: '/api/pay/getBalanceConfig',
-                    data: {},
-                    success: res => {
-                        this.balanceConfig = res.data.balance_show;
+                }
+            });
+        },
+        // #ifdef H5
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            if (!payType) return;
+            var return_url = '';
+            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                return_url = '/pages_promotion/blindbox/index?outTradeNo=';
+            } else {
+                return_url = '/pages_tool/pay/result?code=';
+            }
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType.type,
+                    return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no)
+                },
+                success: res => {
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        switch (payType.type) {
+                            case 'alipay':
+                                if (this.$util.isWeiXin()) {
+                                    var wx_alipay = encodeURIComponent(res.data.data);
+                                    this.$util.redirectTo(
+                                        '/pages_tool/pay/wx_pay', {
+                                        wx_alipay: wx_alipay,
+                                        out_trade_no: this.payInfo.out_trade_no
+                                    }, '',
+                                        'redirectTo');
+                                } else {
+                                    location.href = res.data.data;
+                                    this.checkPayStatus();
+                                }
+                                break;
+                            case 'wechatpay':
+                                if (this.$util.isWeiXin()) {
+                                    if (uni.getSystemInfoSync().platform == 'ios') {
+                                        var url = uni.getStorageSync('initUrl');
+                                    } else {
+                                        var url = location.href;
+                                    }
+                                    // 获取jssdk配置
+                                    this.$api.sendRequest({
+                                        url: '/wechat/api/wechat/jssdkconfig',
+                                        data: { url: url },
+                                        success: jssdkRes => {
+                                            var wxJS = new Weixin(),
+                                                payData = res.data.data;
+                                            wxJS.init(jssdkRes.data);
+                                            wxJS.pay({
+                                                timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
+                                                nonceStr: payData.nonceStr,
+                                                package: payData.package,
+                                                signType: payData.signType,
+                                                paySign: payData.paySign
+                                            },
+                                                res => {
+                                                    if (res.errMsg == 'chooseWXPay:ok') {
+                                                        if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                                            this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                                                                outTradeNo: this.payInfo.out_trade_no
+                                                            }, '', 'redirectTo');
+                                                        } else {
+                                                            this.$util.redirectTo('/pages_tool/pay/result', {
+                                                                code: this.payInfo.out_trade_no
+                                                            }, '', 'redirectTo');
+                                                        }
+
+                                                    } else {
+                                                        this.$util.showToast({
+                                                            title: res.errMsg
+                                                        });
+                                                    }
+                                                },
+                                                res => {
+                                                    this.$util.showToast({
+                                                        title: '您已取消支付'
+                                                    });
+                                                    setTimeout(() => {
+                                                        this.$util.redirectTo('/pages_tool/pay/result', {
+                                                            code: this.payInfo.out_trade_no
+                                                        }, 'redirectTo');
+                                                    }, 2000);
+                                                }
+                                            );
+                                        }
+                                    });
+                                } else {
+                                    location.href = res.data.url;
+                                    this.checkPayStatus();
+                                }
+                                break;
+                        }
+                    } else {
+                        this.$util.showToast({ title: res.message });
                     }
-                });
-            },
-            getPayType() {
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({ title: 'request:fail' });
+                }
+            });
+        },
+        checkPayStatus() {
+            this.timer = setInterval(() => {
                 this.$api.sendRequest({
-                    url: '/api/pay/type',
+                    url: '/api/pay/status',
+                    data: { out_trade_no: this.payInfo.out_trade_no },
                     success: res => {
                         if (res.code == 0) {
-                            if (res.data.pay_type == '') {
-                                this.payTypeList = [];
-                            } else {
-                                this.payTypeList.forEach((val, key) => {
-                                    if (res.data.pay_type.indexOf(val.type) == -1) {
-                                        this.payTypeList.splice(key, 1);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-            },
-            // #ifdef H5
-            pay() {
-                var payType = this.payTypeList[this.payIndex];
-                if (!payType) return;
-                var return_url = '';
-                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                    return_url = '/pages_promotion/blindbox/index?outTradeNo=';
-                } else {
-                    return_url = '/pages_tool/pay/result?code=';
-                }
-                this.$api.sendRequest({
-                    url: '/api/pay/pay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType.type,
-                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no)
-                    },
-                    success: res => {
-                        uni.hideLoading();
-                        if (res.code >= 0) {
-                            switch (payType.type) {
-                                case 'alipay':
-                                    if (this.$util.isWeiXin()) {
-                                        var wx_alipay = encodeURIComponent(res.data.data);
-                                        this.$util.redirectTo(
-                                            '/pages_tool/pay/wx_pay', {
-                                                wx_alipay: wx_alipay,
-                                                out_trade_no: this.payInfo.out_trade_no
-                                            }, '',
-                                            'redirectTo');
-                                    } else {
-                                        location.href = res.data.data;
-                                        this.checkPayStatus();
-                                    }
-                                    break;
-                                case 'wechatpay':
-                                    if (this.$util.isWeiXin()) {
-                                        if (uni.getSystemInfoSync().platform == 'ios') {
-                                            var url = uni.getStorageSync('initUrl');
-                                        } else {
-                                            var url = location.href;
-                                        }
-                                        // 获取jssdk配置
-                                        this.$api.sendRequest({
-                                            url: '/wechat/api/wechat/jssdkconfig',
-                                            data: { url: url },
-                                            success: jssdkRes => {
-                                                var wxJS = new Weixin(),
-                                                        payData = res.data.data;
-                                                wxJS.init(jssdkRes.data);
-                                                wxJS.pay({
-                                                            timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
-                                                            nonceStr: payData.nonceStr,
-                                                            package: payData.package,
-                                                            signType: payData.signType,
-                                                            paySign: payData.paySign
-                                                        },
-                                                        res => {
-                                                            if (res.errMsg == 'chooseWXPay:ok') {
-                                                                if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                                                    this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                                                                        outTradeNo: this.payInfo.out_trade_no
-                                                                    }, '', 'redirectTo');
-                                                                } else {
-                                                                    this.$util.redirectTo('/pages_tool/pay/result', {
-                                                                        code: this.payInfo.out_trade_no
-                                                                    }, '', 'redirectTo');
-                                                                }
-
-                                                            } else {
-                                                                this.$util.showToast({
-                                                                    title: res.errMsg
-                                                                });
-                                                            }
-                                                        },
-                                                        res => {
-                                                            this.$util.showToast({
-                                                                title: '您已取消支付'
-                                                            });
-                                                            setTimeout(() => {
-                                                                this.$util.redirectTo('/pages_tool/pay/result', {
-                                                                    code: this.payInfo.out_trade_no
-                                                                }, 'redirectTo');
-                                                            }, 2000);
-                                                        }
-                                                );
-                                            }
-                                        });
-                                    } else {
-                                        location.href = res.data.url;
-                                        this.checkPayStatus();
-                                    }
-                                    break;
+                            if (res.data.pay_status == 2) {
+                                clearInterval(this.timer);
+                                this.$util.redirectTo('/pages_tool/pay/result', {
+                                    code: this.payInfo.out_trade_no
+                                }, '', 'redirectTo');
                             }
                         } else {
-                            this.$util.showToast({ title: res.message });
+                            clearInterval(this.timer);
                         }
-                    },
-                    fail: res => {
-                        uni.hideLoading();
-                        this.$util.showToast({ title: 'request:fail' });
                     }
                 });
-            },
-            checkPayStatus() {
-                this.timer = setInterval(() => {
-                    this.$api.sendRequest({
-                        url: '/api/pay/status',
-                        data: { out_trade_no: this.payInfo.out_trade_no },
-                        success: res => {
-                            if (res.code == 0) {
-                                if (res.data.pay_status == 2) {
-                                    clearInterval(this.timer);
-                                    this.$util.redirectTo('/pages_tool/pay/result', {
-                                        code: this.payInfo.out_trade_no
-                                    }, '', 'redirectTo');
-                                }
-                            } else {
-                                clearInterval(this.timer);
-                            }
-                        }
-                    });
-                }, 1000);
-            },
-            // #endif
-            // #ifdef MP
-            pay() {
-                var payType = this.payTypeList[this.payIndex];
-                if (!payType) return;
-                this.$api.sendRequest({
-                    url: '/api/pay/pay',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType.type,
-                        is_matched: this.isMatched,
-                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene
-                    },
-                    success: res => {
-                        uni.hideLoading();
-                        if (res.code >= 0) {
-                            var payData = res.data.data;
+            }, 1000);
+        },
+        // #endif
+        // #ifdef MP
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            if (!payType) return;
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType.type,
+                    is_matched: this.isMatched,
+                    scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene
+                },
+                success: res => {
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        var payData = res.data.data;
 
-                            // #ifdef MP-WEIXIN
-                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync()
-                                    .scene;
-                            if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
-                                uni.requestOrderPayment({
-                                    timeStamp: payData.timeStamp,
-                                    nonceStr: payData.nonceStr,
-                                    package: payData.package,
-                                    signType: payData.signType,
-                                    paySign: payData.paySign,
-                                    // orderInfo: payData.orderInfo,
-                                    success: res => {
-                                        uni.removeStorage({key: 'is_test'})
-                                        if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                            this.$util.redirectTo(
-                                                    '/pages_promotion/blindbox/index', {
-                                                        outTradeNo: this
-                                                                .payInfo.out_trade_no
-                                                    }, '',
-                                                    'redirectTo');
-                                        } else {
-                                            this.$util.redirectTo(
-                                                    '/pages_tool/pay/result', {
-                                                        code: this
-                                                                .payInfo.out_trade_no
-                                                    }, '',
-                                                    'redirectTo');
-                                        }
-                                    },
-                                    fail: res => {
-                                        this.flag = false;
-                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({title: '您已取消支付'});
-                                        } else {
-                                            uni.showModal({
-                                                content: '支付失败,失败原因: ' + res.errMsg,
-                                                showCancel: false
-                                            });
-                                        }
-                                        setTimeout(() => {
-                                            uni.removeStorage({key: 'is_test'})
-                                            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                                                this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                                                    outTradeNo: this.payInfo.out_trade_no
-                                                }, '', 'redirectTo');
-                                            } else {
-                                                this.$util.redirectTo('/pages_tool/pay/result', {
-                                                    code: this.payInfo.out_trade_no
-                                                }, '', 'redirectTo');
-                                            }
-                                        }, 2000);
-                                    }
-                                })
-                                return
-                            }
-                            // #endif
-
-                            uni.requestPayment({
-                                provider: payType.provider,
-                                ...payData,
+                        // #ifdef MP-WEIXIN
+                        var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync()
+                            .scene;
+                        if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
+                            uni.requestOrderPayment({
+                                timeStamp: payData.timeStamp,
+                                nonceStr: payData.nonceStr,
+                                package: payData.package,
+                                signType: payData.signType,
+                                paySign: payData.paySign,
+                                // orderInfo: payData.orderInfo,
                                 success: res => {
-                                    this.$util.redirectTo('/pages_tool/pay/result', {
-                                        code: this.payInfo.out_trade_no
-                                    }, '', 'redirectTo');
+                                    uni.removeStorage({ key: 'is_test' })
+                                    if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                        this.$util.redirectTo(
+                                            '/pages_promotion/blindbox/index', {
+                                            outTradeNo: this
+                                                .payInfo.out_trade_no
+                                        }, '',
+                                            'redirectTo');
+                                    } else {
+                                        this.$util.redirectTo(
+                                            '/pages_tool/pay/result', {
+                                            code: this
+                                                .payInfo.out_trade_no
+                                        }, '',
+                                            'redirectTo');
+                                    }
                                 },
                                 fail: res => {
                                     this.flag = false;
-                                    if (res.errMsg == 'requestPayment:fail cancel') {
-                                        this.$util.showToast({title: '您已取消支付'});
+                                    if (res.errMsg == 'requestOrderPayment:fail cancel') {
+                                        this.$util.showToast({ title: '您已取消支付' });
                                     } else {
                                         uni.showModal({
                                             content: '支付失败,失败原因: ' + res.errMsg,
@@ -440,208 +400,244 @@
                                         });
                                     }
                                     setTimeout(() => {
-                                        this.$util.redirectTo('/pages_tool/pay/result', {
-                                                    code: this.payInfo.out_trade_no
-                                                },
-                                                'redirectTo');
+                                        uni.removeStorage({ key: 'is_test' })
+                                        if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                                            this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                                                outTradeNo: this.payInfo.out_trade_no
+                                            }, '', 'redirectTo');
+                                        } else {
+                                            this.$util.redirectTo('/pages_tool/pay/result', {
+                                                code: this.payInfo.out_trade_no
+                                            }, '', 'redirectTo');
+                                        }
                                     }, 2000);
                                 }
-                            });
+                            })
+                            return
+                        }
+                        // #endif
 
-                        } else {
-                            this.$util.showToast({ title: res.message });
-                            setTimeout(() => {
+                        uni.requestPayment({
+                            provider: payType.provider,
+                            ...payData,
+                            success: res => {
                                 this.$util.redirectTo('/pages_tool/pay/result', {
                                     code: this.payInfo.out_trade_no
-                                }, 'redirectTo');
-                            }, 2000);
-                        }
-                    },
-                    fail: res => {
-                        uni.hideLoading();
-                        this.$util.showToast({ title: 'request:fail' });
+                                }, '', 'redirectTo');
+                            },
+                            fail: res => {
+                                this.flag = false;
+                                if (res.errMsg == 'requestPayment:fail cancel') {
+                                    this.$util.showToast({ title: '您已取消支付' });
+                                } else {
+                                    uni.showModal({
+                                        content: '支付失败,失败原因: ' + res.errMsg,
+                                        showCancel: false
+                                    });
+                                }
+                                setTimeout(() => {
+                                    this.$util.redirectTo('/pages_tool/pay/result', {
+                                        code: this.payInfo.out_trade_no
+                                    },
+                                        'redirectTo');
+                                }, 2000);
+                            }
+                        });
+
+                    } else {
+                        this.$util.showToast({ title: res.message });
+                        setTimeout(() => {
+                            this.$util.redirectTo('/pages_tool/pay/result', {
+                                code: this.payInfo.out_trade_no
+                            }, 'redirectTo');
+                        }, 2000);
                     }
-                });
-            }
-            // #endif
-        },
-        // #ifdef H5
-        deactivated() {
-            clearInterval(this.timer);
-        },
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({ title: 'request:fail' });
+                }
+            });
+        }
         // #endif
-    };
+    },
+    // #ifdef H5
+    deactivated() {
+        clearInterval(this.timer);
+    },
+    // #endif
+};
 </script>
 
 <style lang="scss">
-    .popup {
-        width: 75vw;
-        background: #fff;
-        border-top-left-radius: $border-radius;
-        border-top-right-radius: $border-radius;
+.popup {
+    width: 75vw;
+    background: #fff;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
 
-        .popup-header {
-            display: flex;
-            border-bottom: 2rpx solid $color-line;
-            position: relative;
-            padding: 40rpx;
+    .popup-header {
+        display: flex;
+        border-bottom: 2rpx solid $color-line;
+        position: relative;
+        padding: 40rpx;
 
-            .tit {
-                flex: 1;
-                font-size: $font-size-toolbar;
-                line-height: 1;
-                text-align: center;
-            }
-
-            .iconfont {
-                line-height: 1;
-                position: absolute;
-                right: 30rpx;
-                top: 50%;
-                transform: translate(0, -50%);
-                color: $color-tip;
-                font-size: $font-size-toolbar;
-            }
+        .tit {
+            flex: 1;
+            font-size: $font-size-toolbar;
+            line-height: 1;
+            text-align: center;
         }
 
-        .popup-body {
-            height: calc(100% - 250rpx);
-
-            &.safe-area {
-                height: calc(100% - 270rpx);
-            }
-        }
-
-        .popup-footer {
-            height: 100rpx;
-
-            .confirm-btn {
-                height: 72rpx;
-                line-height: 72rpx;
-                color: #fff;
-                text-align: center;
-                margin: 20rpx 30rpx 0;
-                border-radius: $border-radius;
-                font-size: $font-size-base;
-
-            }
-
-            &.bottom-safe-area {
-                padding-bottom: constant(safe-area-inset-bottom);
-                padding-bottom: env(safe-area-inset-bottom);
-            }
+        .iconfont {
+            line-height: 1;
+            position: absolute;
+            right: 30rpx;
+            top: 50%;
+            transform: translate(0, -50%);
+            color: $color-tip;
+            font-size: $font-size-toolbar;
         }
     }
 
-    .choose-payment-popup {
-        .payment-item {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            height: 90rpx;
-            margin: 0 30rpx;
-            border-bottom: 2rpx solid $color-line;
-            padding: 20rpx 0;
+    .popup-body {
+        height: calc(100% - 250rpx);
 
-            &:nth-child(2) {
-                padding-top: 0;
-            }
+        &.safe-area {
+            height: calc(100% - 270rpx);
+        }
+    }
 
-            &:last-child {
-                border-bottom: none;
-            }
+    .popup-footer {
+        height: 100rpx;
 
-            .iconfont {
-                font-size: 64rpx;
-            }
+        .confirm-btn {
+            height: 72rpx;
+            line-height: 72rpx;
+            color: #fff;
+            text-align: center;
+            margin: 20rpx 30rpx 0;
+            border-radius: $border-radius;
+            font-size: $font-size-base;
 
-            .icon-yue {
-                color: #faa218;
-            }
-
-            .icon-weixin1 {
-                color: #24af41;
-            }
-
-            .icon-zhifubaozhifu- {
-                color: #00a0e9;
-            }
-
-            .icon-checkboxblank {
-                font-size: 40rpx;
-                color: $color-line;
-            }
-
-            .icon-yuan_checked {
-                font-size: 40rpx;
-            }
-
-            .name {
-                margin-left: 20rpx;
-                font-size: $font-size-base;
-                flex: 1;
-            }
-
-            .info-wrap {
-                flex: 1;
-                margin-left: 20rpx;
-
-                .name {
-                    margin-left: 0;
-                    font-size: $font-size-base;
-                    flex: 1;
-                }
-
-                .money {
-                    color: $color-tip;
-                    font-size: $font-size-tag;
-                }
-            }
-
-            .box {
-                flex: 1;
-                padding: 0 10rpx;
-                line-height: inherit;
-                text-align: right;
-
-                input {
-                    font-size: $font-size-tag !important;
-                }
-            }
-
-            &.set-pay-password {
-                height: initial;
-
-                .box {
-                    font-size: $font-size-tag !important;
-                }
-            }
         }
 
-        .pay-money {
-            text-align: center;
-            padding: 20rpx 0 40rpx 0;
-            background-color: #fff;
-            font-weight: bold;
-            margin-top: 30rpx;
-            line-height: 1;
+        &.bottom-safe-area {
+            padding-bottom: constant(safe-area-inset-bottom);
+            padding-bottom: env(safe-area-inset-bottom);
+        }
+    }
+}
 
-            .unit {
-                margin-right: 4rpx;
-                font-size: $font-size-tag;
+.choose-payment-popup {
+    .payment-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 90rpx;
+        margin: 0 30rpx;
+        border-bottom: 2rpx solid $color-line;
+        padding: 20rpx 0;
+
+        &:nth-child(2) {
+            padding-top: 0;
+        }
+
+        &:last-child {
+            border-bottom: none;
+        }
+
+        .iconfont {
+            font-size: 64rpx;
+        }
+
+        .icon-yue {
+            color: #faa218;
+        }
+
+        .icon-weixin1 {
+            color: #24af41;
+        }
+
+        .icon-zhifubaozhifu- {
+            color: #00a0e9;
+        }
+
+        .icon-checkboxblank {
+            font-size: 40rpx;
+            color: $color-line;
+        }
+
+        .icon-yuan_checked {
+            font-size: 40rpx;
+        }
+
+        .name {
+            margin-left: 20rpx;
+            font-size: $font-size-base;
+            flex: 1;
+        }
+
+        .info-wrap {
+            flex: 1;
+            margin-left: 20rpx;
+
+            .name {
+                margin-left: 0;
+                font-size: $font-size-base;
+                flex: 1;
             }
 
             .money {
-                font-size: $font-size-toolbar;
+                color: $color-tip;
+                font-size: $font-size-tag;
+            }
+        }
+
+        .box {
+            flex: 1;
+            padding: 0 10rpx;
+            line-height: inherit;
+            text-align: right;
+
+            input {
+                font-size: $font-size-tag !important;
+            }
+        }
+
+        &.set-pay-password {
+            height: initial;
+
+            .box {
+                font-size: $font-size-tag !important;
             }
         }
     }
 
-    .empty {
-        width: 100%;
+    .pay-money {
         text-align: center;
-        padding: 40rpx 0;
-        color: $color-sub;
-        font-size: $font-size-tag;
+        padding: 20rpx 0 40rpx 0;
+        background-color: #fff;
+        font-weight: bold;
+        margin-top: 30rpx;
+        line-height: 1;
+
+        .unit {
+            margin-right: 4rpx;
+            font-size: $font-size-tag;
+        }
+
+        .money {
+            font-size: $font-size-toolbar;
+        }
     }
+}
+
+.empty {
+    width: 100%;
+    text-align: center;
+    padding: 40rpx 0;
+    color: $color-sub;
+    font-size: $font-size-tag;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/components/ns-progress/ns-progress.vue b/components/ns-progress/ns-progress.vue
similarity index 100%
rename from pages_tool/components/ns-progress/ns-progress.vue
rename to components/ns-progress/ns-progress.vue
diff --git a/components/ns-select-time/ns-select-time.vue b/components/ns-select-time/ns-select-time.vue
index 15a5553..8d39484 100644
--- a/components/ns-select-time/ns-select-time.vue
+++ b/components/ns-select-time/ns-select-time.vue
@@ -30,12 +30,8 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	name: "nsSelectTime",
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			//选中日期的键值
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 4147770..501039a 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -43,9 +43,6 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
     // #ifdef H5
     import {
         Weixin
@@ -54,10 +51,6 @@
 
     export default {
         name: 'payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
         props: {
             // 是否可用余额支付
             balanceUsable: {
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
index b567b1f..4146909 100644
--- a/components/register-reward/register-reward.vue
+++ b/components/register-reward/register-reward.vue
@@ -78,14 +78,9 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				reward: null,
diff --git a/pages_tool/components/sx-rate/common.js b/components/sx-rate/common.js
similarity index 100%
rename from pages_tool/components/sx-rate/common.js
rename to components/sx-rate/common.js
diff --git a/pages_tool/components/sx-rate/index.vue b/components/sx-rate/index.vue
similarity index 100%
rename from pages_tool/components/sx-rate/index.vue
rename to components/sx-rate/index.vue
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.css b/components/sx-rate/sx-rate/iconfont.css
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.css
rename to components/sx-rate/sx-rate/iconfont.css
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.eot b/components/sx-rate/sx-rate/iconfont.eot
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.eot
rename to components/sx-rate/sx-rate/iconfont.eot
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.svg b/components/sx-rate/sx-rate/iconfont.svg
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.svg
rename to components/sx-rate/sx-rate/iconfont.svg
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.ttf b/components/sx-rate/sx-rate/iconfont.ttf
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.ttf
rename to components/sx-rate/sx-rate/iconfont.ttf
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.woff b/components/sx-rate/sx-rate/iconfont.woff
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.woff
rename to components/sx-rate/sx-rate/iconfont.woff
diff --git a/pages_tool/components/sx-rate/sx-rate/iconfont.woff2 b/components/sx-rate/sx-rate/iconfont.woff2
similarity index 100%
rename from pages_tool/components/sx-rate/sx-rate/iconfont.woff2
rename to components/sx-rate/sx-rate/iconfont.woff2
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.js b/components/yuyue-date/yuyue-date.js
similarity index 100%
rename from pages_promotion/components/yuyue-date/yuyue-date.js
rename to components/yuyue-date/yuyue-date.js
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.scss b/components/yuyue-date/yuyue-date.scss
similarity index 94%
rename from pages_promotion/components/yuyue-date/yuyue-date.scss
rename to components/yuyue-date/yuyue-date.scss
index 7e37727..0d49f1c 100644
--- a/pages_promotion/components/yuyue-date/yuyue-date.scss
+++ b/components/yuyue-date/yuyue-date.scss
@@ -1,158 +1,158 @@
-.content {
-	text-align: center;
-	height: 100%;
-	.head {
-		position: relative;
-		font-weight: bold;
-		padding: 32rpx 0 24rpx;
-		font-size: $font-size-toolbar;
-		.iconfont {
-			position: absolute;
-			right: 20rpx;
-		}
-	}
-
-	.container {
-		view,
-		text,
-		image {
-			box-sizing: border-box;
-		}
-		.date-list-wrap {
-			display: flex;
-			align-items: center;
-			border-bottom: 2rpx solid #e6e6e6;
-			scroll-view {
-				width: 80%;
-				white-space: nowrap;
-				height: 100rpx;
-				line-height: 100rpx;
-				background-color: #fff;
-				position: relative;
-				.flex-box {
-					display: inline-block;
-					width: 25%;
-
-					&.active {
-						.date-box {
-							border: none;
-							.days {
-								font-weight: bold;
-								color: #818181;
-							}
-							.date {
-								font-weight: bold;
-								color: #818181;
-							}
-						}
-					}
-					.date-box {
-						color: #909399;
-						text {
-							font-size: $font-size-tag;
-						}
-					}
-				}
-			}
-			.appointed-day {
-				flex: 1;
-				border-left: 2rpx solid #e6e6e6;
-				.day-box,
-				.iconfont {
-					font-size: $font-size-tag;
-					color: #909399;
-				}
-				.iconfont {
-					margin-left: 4rpx;
-				}
-			}
-		}
-		.time-box {
-			padding: 0 12rpx;
-			display: flex;
-			flex-wrap: wrap;
-			overflow: scroll;
-			background-color: #fff;
-			height: auto;
-			.item {
-				width: 25%;
-				padding: 0 8rpx;
-				margin-top: 30rpx;
-				&-box {
-					width: 100%;
-					height: 140rpx;
-					padding: 0 40rpx;
-					background: #fff;
-					color: #333;
-					border: 2rpx solid #eeeeee;
-					font-size: $font-size-base;
-					border-radius: 10rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					&.disable {
-						background: #f1f3f6 !important;
-						color: #999 !important;
-					}
-					&.active {
-						background: $base-color;
-						color:#fff;
-						// background: #0094D7;
-						border: 2rpx solid $base-color;
-						font-weight: bold;
-					}
-					.all {
-						font-size: $font-size-tag;
-						padding-top: 10rpx;
-					}
-					//  自定义样式
-					&.diy{
-						height: 60rpx;
-						border-radius: 40rpx;
-						.all{
-							display: none;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.bottom {
-		display: flex;
-		flex-direction: row;
-		position: fixed;
-		align-items: center;
-		bottom: 0;
-		top: auto;
-		left: 0;
-		width: 100%;
-		background-color: #fff;
-		box-shadow: 0 -2rpx 20rpx #bcbcbc;
-
-		.show-time {
-			width: 66%;
-			height: 100rpx;
-			line-height: 100rpx;
-			font-size: $font-size-base;
-			text-align: left;
-			margin-left: 40rpx;
-		}
-
-		.submit-btn {
-			width: 25%;
-			height: 70rpx;
-			line-height: 70rpx;
-			font-size: $font-size-base;
-		}
-	}
-}
-
-.yuyue-date-desc{
-	padding-top: 2rpx;
-	padding-bottom: 4rpx;
-	font-size: $font-size-tag;
-	color: $color-sub;
-	text-align: center;
-}
+.content {
+	text-align: center;
+	height: 100%;
+	.head {
+		position: relative;
+		font-weight: bold;
+		padding: 32rpx 0 24rpx;
+		font-size: $font-size-toolbar;
+		.iconfont {
+			position: absolute;
+			right: 20rpx;
+		}
+	}
+
+	.container {
+		view,
+		text,
+		image {
+			box-sizing: border-box;
+		}
+		.date-list-wrap {
+			display: flex;
+			align-items: center;
+			border-bottom: 2rpx solid #e6e6e6;
+			scroll-view {
+				width: 80%;
+				white-space: nowrap;
+				height: 100rpx;
+				line-height: 100rpx;
+				background-color: #fff;
+				position: relative;
+				.flex-box {
+					display: inline-block;
+					width: 25%;
+
+					&.active {
+						.date-box {
+							border: none;
+							.days {
+								font-weight: bold;
+								color: #818181;
+							}
+							.date {
+								font-weight: bold;
+								color: #818181;
+							}
+						}
+					}
+					.date-box {
+						color: #909399;
+						text {
+							font-size: $font-size-tag;
+						}
+					}
+				}
+			}
+			.appointed-day {
+				flex: 1;
+				border-left: 2rpx solid #e6e6e6;
+				.day-box,
+				.iconfont {
+					font-size: $font-size-tag;
+					color: #909399;
+				}
+				.iconfont {
+					margin-left: 4rpx;
+				}
+			}
+		}
+		.time-box {
+			padding: 0 12rpx;
+			display: flex;
+			flex-wrap: wrap;
+			overflow: scroll;
+			background-color: #fff;
+			height: auto;
+			.item {
+				width: 25%;
+				padding: 0 8rpx;
+				margin-top: 30rpx;
+				&-box {
+					width: 100%;
+					height: 140rpx;
+					padding: 0 40rpx;
+					background: #fff;
+					color: #333;
+					border: 2rpx solid #eeeeee;
+					font-size: $font-size-base;
+					border-radius: 10rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					&.disable {
+						background: #f1f3f6 !important;
+						color: #999 !important;
+					}
+					&.active {
+						background: $base-color;
+						color:#fff;
+						// background: #0094D7;
+						border: 2rpx solid $base-color;
+						font-weight: bold;
+					}
+					.all {
+						font-size: $font-size-tag;
+						padding-top: 10rpx;
+					}
+					//  自定义样式
+					&.diy{
+						height: 60rpx;
+						border-radius: 40rpx;
+						.all{
+							display: none;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.bottom {
+		display: flex;
+		flex-direction: row;
+		position: fixed;
+		align-items: center;
+		bottom: 0;
+		top: auto;
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		box-shadow: 0 -2rpx 20rpx #bcbcbc;
+
+		.show-time {
+			width: 66%;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: $font-size-base;
+			text-align: left;
+			margin-left: 40rpx;
+		}
+
+		.submit-btn {
+			width: 25%;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.yuyue-date-desc{
+	padding-top: 2rpx;
+	padding-bottom: 4rpx;
+	font-size: $font-size-tag;
+	color: $color-sub;
+	text-align: center;
+}
diff --git a/pages_promotion/components/yuyue-date/yuyue-date.vue b/components/yuyue-date/yuyue-date.vue
similarity index 100%
rename from pages_promotion/components/yuyue-date/yuyue-date.vue
rename to components/yuyue-date/yuyue-date.vue
diff --git a/pages.json b/pages.json
index 4e2c1e6..3c4e66f 100644
--- a/pages.json
+++ b/pages.json
@@ -953,7 +953,8 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"diy-*(\\W.*)": "@/components-diy/diy$1.vue"
+			"diy-*(\\W.*)": "@/components-diy/diy$1.vue",
+			"uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue"
 		}
 	},
 	"preloadRule": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6e69e86..806a457 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -148,24 +148,19 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
+
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 import diyJs from '@/common/js/diy.js';
-import toTop from '@/components/toTop/toTop.vue';
+
 import scroll from '@/common/js/scroll-view.js';
 
 import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		uniPopup,
-		nsNavbar,
-		toTop,
-		nsLogin,
+
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index 07cdbbe..06228d7 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -1,7 +1,8 @@
 <template>
 	<view :style="themeColor">
 		<view class="container">
-			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
+			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true"
+				:refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
 				<block v-if="hasData">
 					<view class="cart-header" v-if="cartData.length">
 						<view class="num-wrap">共{{ cartData[0].cartList.length }}种商品</view>
@@ -20,51 +21,67 @@
 								<text class="iconfont icon-right"></text>
 							</view>
 						</view>
-						<view class="store-wrap" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
+						<view class="store-wrap"
+							v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
 							<text class="iconfont icon-dianpu"></text>
-							<text class="name">{{globalStoreInfo.store_name}}</text>
+							<text class="name">{{ globalStoreInfo.store_name }}</text>
 						</view>
 						<block v-for="(item, cartIndex) in siteItem.cartList" :key="cartIndex">
 							<view class="cart-goods" @touchstart="touchS($event)" @touchend="touchE($event, item)">
 								<view class="goods-wrap" :class="{ edit: item.edit }">
-									<view class="iconfont" :class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'" @click="singleElection(siteIndex, cartIndex)"></view>
+									<view class="iconfont"
+										:class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"
+										@click="singleElection(siteIndex, cartIndex)"></view>
 									<view @click="toGoodsDetail(item)" class="goods-img">
-										<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(siteIndex, cartIndex)" mode="aspectFill"/>
+										<image :src="$util.img(item.sku_image, { size: 'mid' })"
+											@error="imageError(siteIndex, cartIndex)" mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view>
-											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ?
+												item.en_goods_name : item.goods_name }}</view>
 											<view class="sku-wrap">
 												<view class="sku">
-													<view class="goods-spec" v-if="item.sku_spec_format.length" @click="selectSku(item)">
+													<view class="goods-spec" v-if="item.sku_spec_format.length"
+														@click="selectSku(item)">
 														<block v-for="(x, i) in item.sku_spec_format" :key="i">
 															{{ x.spec_name }}:{{ x.spec_value_name }}
 															{{ i < item.sku_spec_format.length - 1 ? ';' : '' }}
-														</block>
+																</block>
 													</view>
-													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+													<text class="iconfont icon-unfold"
+														v-if="item.sku_spec_format.length"></text>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<block v-if="item.promotion_type == 1">
-												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+												<block
+													v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+															<text class="unit price-style small">.{{
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/discount.png')"/>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0]
+															}}
+															<text class="unit price-style small">.{{
+																parseFloat(item.discount_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image
+																:src="$util.img('public/uniapp/index/discount.png')" />
 														</view>
 													</view>
 												</block>
@@ -73,19 +90,25 @@
 												<block v-if="Number(item.member_price) > 0">
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+															<text class="unit price-style small">.{{
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
+																parseFloat(item.price).toFixed(2).split('.')[1]
+																}}</text>
 														</view>
 													</view>
 												</block>
@@ -100,14 +123,16 @@
 											<text class="discount-tag">满减</text>
 											<scroll-view scroll-x="true" class="scroll-view">
 												<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
-													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{ mitem.discount_money }}</text>
+													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{
+														mitem.discount_money }}</text>
 													<text class="interval" v-if="mitem.discount_money"></text>
 												</block>
 											</scroll-view>
 										</view>
 									</view>
 								</view>
-								<view class="item-del color-base-bg" :class="{ show: item.edit }" @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
+								<view class="item-del color-base-bg" :class="{ show: item.edit }"
+									@click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
 							</view>
 						</block>
 					</view>
@@ -124,7 +149,8 @@
 								<view class="goods-wrap">
 									<view class="iconfont icon-yuan_checked color-tip"></view>
 									<view class="goods-img">
-										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" mode="aspectFill"/>
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+											mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -134,23 +160,32 @@
 													<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 														{{ x.spec_name }}:{{ x.spec_value_name }}
 														{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-													</block>
+															</block>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<view class="goods-price">
 												<text class="bottom-price price-style large">
-													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0] }}
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] }}</text>
-														<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+													<template
+														v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+														<text class="unit price-style small">{{
+															$lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.member_price).toFixed(2).split('.')[1]
+															}}</text>
+														<image :src="$util.img('public/uniapp/index/VIP.png')" />
 													</template>
 													<template v-else>
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0] }}
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1] }}</text>
+														<text class="unit price-style small">{{
+															$lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
+															}}</text>
 													</template>
 												</text>
 											</view>
@@ -165,7 +200,8 @@
 				<block v-else>
 					<view class="cart-empty">
 						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
-						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
+						<button type="primary" size="mini" class="button mini" v-if="!storeToken"
+							@click="toLogin">去登录</button>
 					</view>
 				</block>
 				<ns-goods-recommend ref="goodrecommend" route="cart"></ns-goods-recommend>
@@ -201,7 +237,7 @@
 							<view class="money price-font ">￥{{ discount.order_money | moneyFormat }}</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 				</view>
 			</uni-popup>
 
@@ -213,9 +249,11 @@
 					</view>
 					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
 						<view class="coupon-item">
-							<view class="coupon-info" :style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+							<view class="coupon-info"
+								:style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 								<view class="info-wrap">
-									<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+									<image class="coupon-line" mode="heightFix"
+										:src="$util.img('public/uniapp/coupon/coupon_line.png')" />
 									<view class="coupon-money">
 										<template v-if="discount.coupon_info.type == 'reward'">
 											<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -237,24 +275,30 @@
 								</view>
 								<view class="desc-wrap">
 									<view class="coupon-name">{{ discount.coupon_info.coupon_name }}</view>
-									<view v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0" class="limit">
+									<view
+										v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0"
+										class="limit">
 										最多可抵￥{{ discount.coupon_info.discount_limit }}
 									</view>
-									<view class="time font-size-goods-tag" v-if="discount.coupon_info.validity_type == 0">
+									<view class="time font-size-goods-tag"
+										v-if="discount.coupon_info.validity_type == 0">
 										有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
 									</view>
-									<view class="time font-size-goods-tag" v-else-if="discount.coupon_info.validity_type == 1">
+									<view class="time font-size-goods-tag"
+										v-else-if="discount.coupon_info.validity_type == 1">
 										有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
 									</view>
 									<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
 								</view>
 
-								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" disabled>已领取</button>
-								<button type="primary" v-else @click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'"
+									disabled>已领取</button>
+								<button type="primary" v-else
+									@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
 							</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 					<view class="cart-bottom-block"></view>
 				</view>
 			</uni-popup>
@@ -262,7 +306,8 @@
 
 		<view class="cart-bottom" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }" v-if="hasData">
 			<view class="all-election" @click="allElection">
-				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+				</view>
 				<text>{{ $lang('allElection') }}</text>
 			</view>
 			<view class="settlement-info" :style="{ visibility: isAction ? 'hidden' : 'visible' }">
@@ -270,8 +315,10 @@
 					{{ $lang('total') }}：
 					<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 					<block v-if="Object.keys(discount).length">
-						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</text>
-						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] }}</text>
+						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0]
+							}}</text>
+						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
+							}}</text>
 					</block>
 					<block v-else>
 						<text class="value price-font">{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}</text>
@@ -288,16 +335,20 @@
 			</view>
 			<view class="action-btn" v-else>
 				<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
-					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{ totalCount }})
+					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{
+						totalCount }})
 				</button>
-				<button type="primary" size="mini" class="mini" @click="settlement" disabled
-					v-else>{{ $lang('settlement') }}({{ totalCount }})</button>
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled v-else>{{
+					$lang('settlement') }}({{
+						totalCount }})</button>
 			</view>
 		</view>
 
 		<diy-bottom-nav></diy-bottom-nav>
 
-		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail" :goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy" @refresh="refreshSkuDetail"></ns-goods-sku>
+		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail"
+			:goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy"
+			@refresh="refreshSkuDetail"></ns-goods-sku>
 
 		<!-- 加载动画 -->
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -315,44 +366,33 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
-	import toTop from '@/components/toTop/toTop.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import scroll from '@/common/js/scroll-view.js';
-	import cart from './public/js/cart.js';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
-	export default {
-		components: {
-		nsGoodsRecommend,
-		uniNumberBox,
-		toTop,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
+import scroll from '@/common/js/scroll-view.js';
+import cart from './public/js/cart.js';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+
+export default {
+	components: {
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
 	},
-		mixins: [scroll, cart]
-	};
+	mixins: [scroll, cart]
+};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none;
-		max-height: unset !important;
-		overflow-y: hidden !important;
-	}
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none;
+	max-height: unset !important;
+	overflow-y: hidden !important;
+}
 
-	/deep/ .uni-popup__wrapper {
-		border-radius: 20rpx 20rpx 0 0;
-	}
+/deep/ .uni-popup__wrapper {
+	border-radius: 20rpx 20rpx 0 0;
+}
 
-	@import './public/css/cart.scss';
+@import './public/css/cart.scss';
 </style>
\ No newline at end of file
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index 57902b4..e43b94a 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -25,15 +25,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsLogin,
-		loadingCover,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_goods/components/goods-detail-view/detail.js b/pages_goods/components/goods-detail-view/detail.js
deleted file mode 100644
index 45a3720..0000000
--- a/pages_goods/components/goods-detail-view/detail.js
+++ /dev/null
@@ -1,465 +0,0 @@
-// 商品详情业务
-import {
-	Weixin
-} from '@/common/js/wx-jssdk.js';
-
-export default {
-	data() {
-		return {
-			skuId: 0,
-			goodsId: 0,
-			isIphoneX: false, //判断手机是否是iphoneX以上
-			whetherCollection: 0,
-
-			//是否开启预览，0：不开启，1：开启
-			preview: 0,
-			videoContext: '',
-
-			// 媒体,图片,视频
-
-			// 解决每个商品SKU图片数量不同时，无法切换到第一个，导致轮播图显示不出来
-			swiperInterval: 1,
-			swiperAutoplay: false,
-			swiperCurrent: 1,
-			switchMedia: 'img',
-
-			//评价
-			goodsEvaluate: [{
-				member_headimg: '',
-				member_name: '',
-				content: '',
-				images: [],
-				create_time: 0,
-				sku_name: ''
-			}],
-			evaluateConfig: {
-				evaluate_audit: 1,
-				evaluate_show: 0,
-				evaluate_status: 1
-			},
-
-			// 是否可分享到好物圈
-			goodsCircle: false,
-			service: null,
-			shareUrl: '', // 分享链接
-			source_member: 0, //分享人的id
-			isCommunity: false, //社群弹窗
-
-			poster: "-1", //海报
-			posterMsg: "", //海报错误信息
-			posterHeight: 0,
-			posterParams: {}, //海报所需参数
-			goodsRoute: '',
-			posterApi: '',
-			goodsAttrShow: false, // 商品属性是否展开
-
-			//门店列表
-			storeList: {
-				data: [],
-				page: 1,
-				page_size: 10
-			},
-			isShowStore: false,
-			latitude: null, // 纬度
-			longitude: null, // 经度
-			evaluateCount: 0, // 商品评论数量
-			deliveryType: null, // 配送方式
-			isVirtual: 0 //是否为虚拟商品
-		}
-	},
-	created() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (this.location) {
-			this.latitude = this.location.latitude;
-			this.longitude = this.location.longitude;
-		} else {
-			this.$util.getLocation();
-		}
-		this.getStoreData();
-	},
-	watch: {
-		location: function (nVal) {
-			if (nVal) {
-				this.latitude = nVal.latitude;
-				this.longitude = nVal.longitude;
-				this.getStoreData();
-			}
-		}
-	},
-	methods: {
-		init(params) {
-			this.skuId = params.sku_id;
-			this.goodsId = params.goods_id;
-			this.preview = params.preview;
-			this.source_member = params.source_member;
-			this.whetherCollection = params.whetherCollection;
-			this.posterParams = params.posterParams;
-
-			this.shareUrl = params.shareUrl;
-			this.goodsRoute = params.goodsRoute;
-			this.posterApi = params.posterApi;
-			this.isVirtual = params.isVirtual;
-			this.deliveryType = params.deliveryType;
-			this.evaluateConfig = params.evaluateConfig;
-
-			if (this.evaluateConfig.evaluate_show == 1) {
-				//商品评论
-				this.getGoodsEvaluate(params.evaluateList);
-				this.evaluateCount = params.evaluateCount;
-			}
-
-			for (let k in this.deliveryType) {
-				if (k == 'store') {
-					this.isShowStore = true;
-				}
-			}
-
-			this.getService();
-
-			this.videoContext = uni.createVideoContext('goodsVideo');
-
-			// #ifdef MP-WEIXIN
-			this.goodsSyncToGoodsCircle();
-			// #endif
-
-		},
-		swiperChange(e) {
-			this.swiperCurrent = e.detail.current + 1;
-		},
-
-		//-------------------------------------服务-------------------------------------
-
-		openMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.open();
-		},
-		closeMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.close();
-		},
-
-		//-------------------------------------门店列表-------------------------------------
-		openStoreListPopup() {
-			this.$refs.storeListPopup.open();
-		},
-		closeStoreListPopup() {
-			this.$refs.storeListPopup.close();
-		},
-		getStoreData() {
-			//门店列表
-			let data = {
-				page: this.storeList.page,
-				page_size: this.storeList.page_size
-			};
-			if (this.latitude && this.longitude) {
-				data.latitude = this.latitude;
-				data.longitude = this.longitude;
-			}
-			this.$api.sendRequest({
-				url: '/api/store/page',
-				data: data,
-				success: res => {
-					if (this.storeList.page == 1) this.storeList.data == [];
-					if (res.code >= 0 && res.data) {
-						this.storeList.data = this.storeList.data.concat(res.data.list);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		selectStore(item) {
-			this.$util.redirectTo('/pages_tool/store/detail', {
-				store_id: item.store_id
-			});
-			this.closeStoreListPopup();
-		},
-		//-------------------------------------属性-------------------------------------
-
-		switchGoodsAttr() {
-			this.goodsAttrShow = !this.goodsAttrShow;
-		},
-		//-------------------------------------评价-------------------------------------
-		//商品评论列表
-		getGoodsEvaluate(list) {
-			if (list) {
-				this.goodsEvaluate = list;
-				this.goodsEvaluate.forEach((item, index) => {
-					if (this.goodsEvaluate[index].images) this.goodsEvaluate[index].images = this.goodsEvaluate[index].images.split(",");
-					if (this.goodsEvaluate[index].is_anonymous == 1) this.goodsEvaluate[index].member_name = this.goodsEvaluate[index].member_name.replace(this.goodsEvaluate[index].member_name.substring(1, this.goodsEvaluate[index].member_name.length - 1), '***')
-				})
-				// if (this.goodsEvaluate.images) this.goodsEvaluate.images = this.goodsEvaluate.images.split(",");
-				// if (this.goodsEvaluate.is_anonymous == 1) this.goodsEvaluate.member_name = this.goodsEvaluate.member_name.replace(
-				// this.goodsEvaluate.member_name.substring(1, this.goodsEvaluate.member_name.length - 1), '***')
-			}
-		},
-		// 预览评价图片
-		previewEvaluate(index, img_index, field) {
-			var paths = [];
-			for (let i = 0; i < this.goodsEvaluate[index][field].length; i++) {
-				paths.push(this.$util.img(this.goodsEvaluate[index][field][i]));
-			}
-			uni.previewImage({
-				current: img_index,
-				urls: paths
-			});
-		},
-		//-------------------------------------关注-------------------------------------
-		async collection() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-
-			if (this.storeToken) {
-
-				//未关注添加关注
-				if (this.whetherCollection == 0) {
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/add",
-						data: {
-							sku_id: this.skuId,
-							goods_id: this.goodsSkuDetail.goods_id,
-							sku_name: this.goodsSkuDetail.sku_name,
-							sku_price: this.goodsSkuDetail.show_price,
-							sku_image: this.goodsSkuDetail.sku_image
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 1;
-					}
-				} else {
-					//已关注取消关注
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/delete",
-						data: {
-							goods_id: this.goodsSkuDetail.goods_id
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 0;
-					}
-				}
-				return this.whetherCollection;
-			} else {
-				if (this.source_member) {
-					this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
-				} else {
-					this.$refs.login.open(this.shareUrl);
-				}
-			}
-		},
-		//-------------------------------------分享-------------------------------------
-		// 打开分享弹出层
-		openSharePopup() {
-			this.$refs.sharePopup.open();
-		},
-		// 关闭分享弹出层
-		closeSharePopup() {
-			this.$refs.sharePopup.close();
-		},
-		copyUrl() {
-			let text = this.$config.h5Domain + this.shareUrl;
-			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
-			this.$util.copy(text, () => {
-				this.closeSharePopup();
-			});
-		},
-
-		//-------------------------------------海报-------------------------------------
-		// 打开海报弹出层
-		openPosterPopup() {
-			this.getGoodsPoster();
-			this.$refs.sharePopup.close();
-		},
-		// 关闭海报弹出层
-		closePosterPopup() {
-			this.$refs.posterPopup.close();
-			this.poster = ''
-		},
-		//生成海报
-		getGoodsPoster() {
-			uni.showLoading({
-				'title': '海报生成中...'
-			})
-			//活动海报信息
-			if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
-
-			this.$api.sendRequest({
-				url: this.posterApi,
-				data: {
-					page: this.goodsRoute,
-					qrcode_param: JSON.stringify(this.posterParams)
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.$refs.posterPopup.open();
-						this.poster = res.data.path + "?time=" + new Date().getTime();
-					} else {
-						this.posterMsg = res.message;
-						this.$util.showToast({
-							title: res.message
-						})
-					}
-					uni.hideLoading();
-				},
-				fail: err => {
-					uni.hideLoading();
-				}
-			});
-		},
-		// 预览图片
-		previewMedia(index) {
-			var paths = [];
-			for (let i = 0; i < this.goodsSkuDetail.sku_images.length; i++) {
-				paths.push(this.$util.img(this.goodsSkuDetail.sku_images[i], {
-					size: 'big'
-				}));
-			}
-			uni.previewImage({
-				current: index,
-				urls: paths,
-				// longPressActions: {
-				// 	itemList: ['发送给朋友', '保存图片', '关注'],
-				// 	success: function(data) {
-				// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-				// 	},
-				// 	fail: function(err) {
-				// 		console.log(err.errMsg);
-				// 	}
-				// }
-			});
-		},
-		swiperImageError(index) {
-			this.goodsSkuDetail.sku_images[index] = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		// #ifdef MP || APP-PLUS
-		//小程序中保存海报
-		saveGoodsPoster() {
-			let url = this.$util.img(this.poster);
-			uni.downloadFile({
-				url: url,
-				success: (res) => {
-					if (res.errMsg == "downloadFile:ok") {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: () => {
-								this.$util.showToast({
-									title: "保存成功"
-								});
-							},
-							fail: (err) => {
-								this.$util.showToast({
-									title: "保存失败，请稍后重试"
-								});
-							}
-						});
-					}
-				},
-				fail: (err) => {
-					this.$util.showToast({
-						title: "保存失败，请稍后重试"
-					});
-				}
-			});
-		},
-		// #endif
-		//售后保障查询
-		getService() {
-			this.$api.sendRequest({
-				url: '/api/goods/aftersale',
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.service = res.data;
-					}
-				}
-			});
-		},
-
-		// #ifdef MP-WEIXIN
-		/**
-		 *    将商品同步到微信圈子
-		 */
-		goodsSyncToGoodsCircle() {
-			this.$api.sendRequest({
-				url: '/goodscircle/api/goods/sync',
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.goodsCircle = true;
-					}
-				}
-			})
-		},
-		/**
-		 * 将商品推荐到微信圈子
-		 */
-		openBusinessView() {
-			if (wx.openBusinessView) {
-				wx.openBusinessView({
-					businessType: 'friendGoodsRecommend',
-					extraData: {
-						product: {
-							item_code: this.goodsSkuDetail.goods_id,
-							title: this.goodsSkuDetail.sku_name,
-							image_list: this.goodsSkuDetail.sku_images.map((ele) => {
-								return this.$util.img(ele);
-							})
-						}
-					},
-					success: function (res) {
-						console.log('success', res);
-					},
-					fail: function (res) {
-						console.log('fail', res);
-					}
-				})
-			}
-		},
-		// #endif
-		toEvaluateDetail(id) {
-			this.$util.redirectTo('/pages_tool/goods/evaluate', {
-				goods_id: id
-			});
-		},
-		showImg(e) {
-			//拿到图片的路径里面的内容放在我们数组中
-			let contentimg = e.target.dataset.nodes;
-			let arrImg = [];
-			for (var i = 0; i < contentimg.length; i++) {
-				var img = contentimg[i].children;
-				if (Array.isArray(img)) {
-					for (var j = 0; j < img.length; j++) {
-						if (img[j].attrs && img[j].name == "img") {
-							if (img[j].attrs.src) {
-								arrImg.push(img[j].attrs.src)
-							}
-						}
-					}
-				}
-			}
-			//最后一步就是把我们的所有图片放在预览的api中就可以了
-			uni.previewImage({
-				current: arrImg,
-				urls: arrImg,
-			})
-		},
-
-		//-------------------------------------社群-------------------------------------
-
-		//添加福利群
-		onCommunity() {
-			this.isCommunity = true
-		},
-		onCloseCommunity() {
-			this.isCommunity = false
-		},
-
-	}
-
-}
\ No newline at end of file
diff --git a/pages_goods/components/goods-detail-view/goods-detail-view.vue b/pages_goods/components/goods-detail-view/goods-detail-view.vue
deleted file mode 100644
index 7590573..0000000
--- a/pages_goods/components/goods-detail-view/goods-detail-view.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<template>
-    <view>
-        <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
-            <view class="goods-container">
-                <!-- 弹幕 -->
-                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
-
-                <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
-                    <!-- 商品图片 -->
-                    <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
-                                <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
-                                </view>
-                            </swiper-item>
-                        </swiper>
-                        <view class="img-indicator-dots">
-                            <text>{{ swiperCurrent }}</text>
-                            <text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
-                        </view>
-                    </view>
-
-                    <!-- 商品视频 -->
-                    <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
-                    </view>
-
-                    <!-- 切换视频、图片 -->
-                    <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
-                    </view>
-                </view>
-
-                <!-- 价格区域 -->
-                <view class="goods-gression">
-                    <slot name="price"></slot>
-                </view>
-
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-
-                    <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
-                        <block v-if="deliveryType">
-                            <view class="box">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
-                                </block>
-                            </view>
-                            <text class="iconfont icon-right"></text>
-                        </block>
-                        <block v-else>
-                            <view class="box">未配置</view>
-                        </block>
-                    </view>
-
-                    <!-- 门店 -->
-               <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
-                        <view class="label">门店</view>
-                        <view class="list-wrap">
-                            <view class="name-wrap">
-                                <text class="icondiy icon-system-shop"></text>
-                                <text class="name">{{globalStoreInfo.store_name}}</text>
-                            </view>
-                            <view class="other-wrap">
-                                <text class="distance" v-if="parseFloat(globalStoreInfo.distance)">距离{{ globalStoreInfo.distance > 1 ? globalStoreInfo.distance + 'km' : globalStoreInfo.distance * 1000 + 'm' }}</text>
-                                <text class="decorate" v-if="parseFloat(globalStoreInfo.distance)">.</text>
-                                <view class="address">{{ globalStoreInfo.full_address + globalStoreInfo.address }}
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view> -->
-
-                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
-                        <view class="label">服务</view>
-                        <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
-                                <view class="item-wrap-box">
-                                    <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <text>{{ item.service_name }}</text>
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-		
-                </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-                    <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        <view class="list-wrap" style="display: flex;">
-                            <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                            </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-                </view>
-
-                <!-- 配送方式 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="deliveryType" type="bottom">
-                        <view class="deliverytype-popup-layer popup-layer">
-                            <view class="head-wrap" @click="$refs.deliveryType.close()">
-                                <text>配送</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y class="type-body">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
-                                        <text class="iconfont" :class="item.icon"></text>
-                                        <view class="content">
-                                            <view class="title">{{ item.name }}</view>
-                                            <view class="desc">{{ item.desc }}</view>
-                                        </view>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 商品服务 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="merchantsServicePopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer">
-                            <view class="head-wrap" @click="closeMerchantsServicePopup()">
-                                <text>商品服务</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <view class="info-wrap">
-                                        <text class="title">{{ item.service_name }}</text>
-                                        <text class="describe" v-if="item.desc">{{ item.desc }}</text>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                            <view class="button-box">
-                                <button type="primary" @click="closeMerchantsServicePopup()">确定</button>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 门店列表 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="storeListPopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
-                            <view class="head-wrap" @click="closeStoreListPopup()">
-                                <text>门店列表</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
-                                        <view class="item-box">
-                                            <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else/>
-                                            </view>
-                                            <view class="item-info">
-                                                <view class="item-title">
-                                                    <text class="title">{{ item.store_name }}</text>
-                                                    <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
-                                                    </text>
-                                                </view>
-                                                <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
-                                                </view>
-                                                <view class="item-address">{{ item.full_address + item.address }}</view>
-                                            </view>
-                                            <view class="item-right"><text class="iconfont icon-right"></text></view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 业务区域 -->
-                <slot name="business"></slot>
-
-                <view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
-                    <view class="community-box">
-                        <image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
-                        <view class="community-content">
-                            <view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
-                            <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
-                        </view>
-                    </view>
-                    <view class="community-btn" @click="onCommunity()">添加</view>
-                </view>
-
-                <!-- 促销 -->
-            <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
-                    <view class="community-model-content" @click.stop>
-                        <view class="community-model-content-radius">
-                            <view>添加社群</view>
-                        </view>
-                        <view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
-                            <image :src="goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1 ? $util.img(goodsSkuDetail.qr_data.qr_img) : $util.img('public/uniapp/goods/detail_erweiImage.png') " mode="aspectFill" show-menu-by-longpress="true"/>
-                        </view>
-                        <view class="community-model-content-text">长按识别二维码，添加社群</view>
-                    </view>
-                    <view class="community-model-close" @click.stop="onCloseCommunity()">
-                        <text class="iconfont icon-close"></text>
-                    </view>
-                </view> -->
-
-                <!-- 参与流程 -->
-                <slot name="articipation"></slot>
-
-                <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
-                    <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
-                        <view class="tit">
-                            <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
-                            <view>
-                                <text class="color-title font-size-base">
-                                    评价
-                                    <text class="font-size-base">({{ evaluateCount }})</text>
-                                </text>
-                                <text class="evaluate-item-empty" v-if="!evaluateCount">暂无评价</text>
-                                <view class="evaluate-item-empty" v-else>
-                                    <text class="font-size-tag">查看全部</text>
-                                    <text class="iconfont icon-right font-size-tag"></text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index"
-                            v-if="item.content">
-                            <view class="evaluator">
-                                <view class="evaluator-info">
-                                    <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                    </view>
-                                    <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
-                                        </text>
-                                        <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-                                        <view v-if="item.scores" class="evaluator-xing">
-                                            <xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
-                                        </view>
-                                    </view>
-                                </view>
-                                <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
-                            </view>
-                            <view class="cont margin-top">{{ item.content }}</view>
-                            <scroll-view scroll-x="true">
-                                <view class="evaluate-img" v-if="item.images">
-                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-                                        <image :src="$util.img(img)" mode="aspectFill" />
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </view>
-                </view>
-				
-                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
-                    <view class="title">规格属性</view>
-                    <view class="attr-wrap">
-                        <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
-                            <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
-                                <text class="attr-name">{{ item.attr_name }}</text>
-                                <text class="value-name">{{ item.attr_value_name }}</text>
-                            </view>
-                        </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
-                            <block v-if="!goodsAttrShow">
-                                展开<text class="iconfont icon-iconangledown"></text>
-                            </block>
-                            <block v-else>
-                                收起<text class="iconfont icon-iconangledown-copy"></text>
-                            </block>
-                        </view>
-                    </view>
-                </view>
-
-				
-
-                <!-- 详情 -->
-                <view class="goods-detail-tab">
-                    <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
-                    </view>
-                    <view class="detail-content active">
-                        <view class="detail-content-item">
-                            <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
-                            </view>
-                            <view class="goods-details active" v-else></view>
-                            <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 商品推荐 -->
-                <ns-goods-recommend ref="goodrecommend" route="goods_detail"></ns-goods-recommend>
-
-                <ns-copyright></ns-copyright>
-
-                <!-- 海报 -->
-                <view @touchmove.prevent.stop class="poster-layer">
-                    <uni-popup ref="posterPopup" type="center">
-                        <template v-if="poster != '-1'">
-                            <view class="poster-wrap">
-                                <view class="image-wrap">
-                                    <image :src="$util.img(poster)" :show-menu-by-longpress="true" mode="widthFix" />
-                                    <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
-                                </view>
-                                <!-- #ifdef MP || APP-PLUS  -->
-                                <view class="save-btn" @click="saveGoodsPoster()">保存图片</view>
-                                <!-- #endif -->
-                                <!-- #ifdef H5 -->
-                                <view class="save-btn">长按图片进行保存</view>
-                                <!-- #endif -->
-                            </view>
-                        </template>
-                    </uni-popup>
-                </view>
-
-                <!-- 分享弹窗 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="sharePopup" type="bottom" class="share-popup">
-                        <view>
-                            <view class="share-title">分享</view>
-                            <view class="share-content">
-                                <!-- #ifdef MP -->
-                                <view class="share-box">
-                                    <button class="share-btn" :plain="true" open-type="share">
-                                        <view class="iconfont icon-share-friend"></view>
-                                        <text>分享给好友</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <!-- #ifdef MP-WEIXIN -->
-                                <view class="share-box" v-if="goodsCircle">
-                                    <button class="share-btn" :plain="true" @click="openBusinessView">
-                                        <view class="iconfont icon-haowuquan"></view>
-                                        <text>分享到好物圈</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <view class="share-box" @click="openPosterPopup">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-pengyouquan"></view>
-                                        <text>生成分享海报</text>
-                                    </button>
-                                </view>
-                                <!-- #ifdef H5 -->
-                                <view class="share-box" @click="copyUrl">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-fuzhilianjie"></view>
-                                        <text>复制链接</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-                            </view>
-                            <view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <slot name="fixedbtn"></slot>
-            </view>
-        </view>
-
-        <!-- 操作区域 -->
-        <slot name="action"></slot>
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-        <ns-login ref="login"></ns-login>
-    </view>
-</template>
-
-<script>
-    // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
-    import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import detail from './detail.js';
-
-    export default {
-        name: 'goods-detail-view',
-        props: {
-            goodsSkuDetail: {
-                type: Object,
-                default: () => {
-                    return {};
-                }
-            }
-        },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
-        mixins: [scroll, detail]
-    };
-</script>
-
-<style lang="scss">
-    @import '@/common/css/goods_detail.scss';
-</style>
-<style scoped></style>
\ No newline at end of file
diff --git a/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue b/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue
deleted file mode 100644
index 7798141..0000000
--- a/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
-    <view class="action-buttom-wrap"
-        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
-        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
-        @click="clickEvent">
-        <text class="price-font">{{ textPrice }}</text>
-        <text>{{ text }}</text>
-    </view>
-</template>
-
-<script>
-    export default {
-        name: 'ns-goods-action-button',
-        props: {
-            // 商品底部按钮文字
-            text: {
-                type: String,
-                default: ''
-            },
-            // 商品底部按钮价格文字
-            textPrice: {
-                type: String,
-                default: ''
-            },
-            // 背景色
-            background: {
-                type: String,
-                default: ''
-            },
-            // 背景色样式
-            backgroundClass: {
-                type: String,
-                default: ''
-            },
-            // 
-            backgroundColor: {
-                type: String,
-                default: ''
-            },
-            // 是否禁用
-            disabled: {
-                type: Boolean,
-                default: false
-            },
-            // 禁用文字提示
-            disabledText: {
-                type: String,
-                default: ''
-            },
-            // 文字颜色
-            textColor: {
-                type: String,
-                default: ''
-            },
-        },
-        computed: {},
-        methods: {
-            clickEvent() {
-                this.$emit('click');
-            }
-        }
-    };
-</script>
-
-<style lang="scss">
-    .action-buttom-wrap {
-        flex: 1;
-        height: 70rpx;
-        font-weight: 600;
-        font-size: 30rpx;
-        line-height: 70rpx;
-        border: none;
-        color: #fff;
-        text-align: center;
-        border-radius: 10rpx;
-        margin-right: 20rpx;
-    }
-
-    .action-buttom-wrap.has-second {
-        line-height: 50rpx;
-    }
-
-    .action-buttom-wrap.has-second text {
-        display: block;
-        line-height: 1.2;
-    }
-
-    .action-buttom-wrap:active {
-        opacity: 0.8;
-    }
-
-    .action-buttom-wrap.disabled {
-        background: $color-disabled;
-    }
-</style>
\ No newline at end of file
diff --git a/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue b/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue
deleted file mode 100644
index f958edd..0000000
--- a/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-	<view>
-		<block v-if="text == '客服' || text == 'Contact'">
-		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
-				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
-					<view class="iconfont color-title" :class="icon"></view>
-					<text>{{ text }}</text>
-					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
-				</button>
-			<!-- </ns-contact> -->
-		</block>
-		<block v-else>
-			<view class="action-icon-wrap" @click="clickEvent">
-				<view class="iconfont " :class="icon"></view>
-				<text>{{ text }}</text>
-				<view class="corner-mark color-base-bg" :class="{'max' : parseInt(cornerMark)>99}" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark > 99 ? '99+' : cornerMark }}</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
-export default {
-	name: 'ns-goods-action-icon',
-	props: {
-		// 商品底部icon导航icon图标
-		icon: {
-			type: String,
-			default: ''
-		},
-		// 商品底部icon导航文字
-		text: {
-			type: String,
-			default: ''
-		},
-		// 角标文字
-		cornerMark: {
-			type: String,
-			default: ''
-		},
-		// 角标背景色
-		cornerMarkBg: {
-			type: String,
-			default: ''
-		},
-		// 角标文字颜色
-		cornerMarkColor: {
-			type: String,
-			default: '#fff'
-		},
-		// 开放能力
-		openType: {
-			type: String,
-			default: ''
-		},
-		// 发送内容 openType="contact"时有效
-		sendData: {
-			type: Object,
-			default: function() {
-				return {
-					title: '',
-					path: '',
-					img: ''
-				};
-			}
-		},
-		chatParam: {
-			type: Object,
-			default: function(){
-				return {}
-			}
-		}
-	},
-	components:{
-		nsContact
-	},
-	methods: {
-		clickEvent() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.action-icon-wrap {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100rpx;
-	min-width: 90rpx;
-	text-align: center;
-	position: relative;
-	margin-right: 6rpx;
-}
-.action-icon-wrap button {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	border: none;
-	z-index: 1;
-	padding: 0;
-	margin: 0;
-	background: none;
-	top: 0;
-	left: 0;
-	opacity: 0;
-}
-
-.action-icon-wrap button::after {
-	border: none !important;
-}
-
-.action-icon-wrap .iconfont {
-	margin: 0 auto 10rpx;
-	line-height: 1;
-	font-size: 40rpx;
-}
-
-.action-icon-wrap .corner-mark {
-	position: absolute;
-	z-index: 99;
-	font-size: $font-size-activity-tag;
-	top: 4rpx;
-	right: 12rpx;
-	color: #fff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 24rpx;
-	height: 24rpx;
-	padding: 6rpx;
-	border-radius: 50%;
-	&.max{
-		right:-4rpx;
-		width: 40rpx;
-		border-radius: 24rpx;
-	}
-}
-
-.action-icon-wrap text {
-	font-size: $font-size-tag;
-	line-height: 1;
-}
-</style>
diff --git a/pages_goods/components/ns-goods-action/ns-goods-action.vue b/pages_goods/components/ns-goods-action/ns-goods-action.vue
deleted file mode 100644
index 4e9e0f5..0000000
--- a/pages_goods/components/ns-goods-action/ns-goods-action.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-	<view class="ns-goods-action bottom-safe-area" :class="{ 'bottom-safe-area': safeArea }"><slot></slot></view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-action',
-	props: {
-		safeArea: {
-			type: Boolean,
-			default: false
-		}
-	}
-};
-</script>
-
-<style>
-.ns-goods-action {
-	position: fixed;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	z-index: 9;
-}
-.ns-goods-action.bottom-safe-area {
-	padding-bottom: 0;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-}
-</style>
diff --git a/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue b/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue
deleted file mode 100644
index d102e84..0000000
--- a/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-	<!-- 当前商品参与的营销活动入口 -->
-	<view class="ns-goods-promotion" v-if="goodsPromotion.length">
-		<view v-for="(item, index) in goodsPromotion" v-if="promotion != item.promotion_type" :key="index">
-			<view v-if="item.promotion_type == 'discount'" class="item" @click="redirectTo('/pages_goods/detail', { goods_id: item.goods_id })">
-				<text class="promotion-mark ">限时折扣</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { groupbuy_id: item.groupbuy_id })">
-				<!-- <view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { id: item.groupbuy_id })"> -->
-				<text class="promotion-mark ">团购</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pintuan'" class="item" @click="redirectTo('/pages_promotion/pintuan/detail', { pintuan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'seckill'" class="item" @click="redirectTo('/pages_promotion/seckill/detail', { seckill_id: item.id })">
-				<text class="promotion-mark ">秒杀</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'topic'" class="item" @click="redirectTo('/pages_promotion/topics/goods_detail', { id: item.id })">
-				<text class="promotion-mark ">专题活动</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'bargain'" class="item" @click="redirectTo('/pages_promotion/bargain/detail', { b_id: item.bargain_id })">
-				<text class="promotion-mark ">砍价</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pinfan'" class="item" @click="redirectTo('/pages_promotion/pinfan/detail', { pinfan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团返利</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-promotion',
-	props: {
-		promotion: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			goodsPromotion: {
-				type: Array
-			}
-		};
-	},
-	created() {},
-	methods: {
-		refresh(goodsPromotion) {
-			this.goodsPromotion = goodsPromotion;
-		},
-		redirectTo(path, param) {
-			this.$util.redirectTo(path, param);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.ns-goods-promotion {
-	background-color: #fff;
-	& > view {
-	}
-	.item {
-		display: flex;
-		font-size: $font-size-base;
-		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid $color-line;
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.promotion-mark {
-			padding: 12rpx 14rpx;
-			margin-right: 16rpx;
-			line-height: 1;
-			color: var(--main-color);
-			border-radius: 6rpx;
-			font-size: $font-size-tag;
-			font-weight: bold;
-			background-color: var(--main-color-shallow);
-		}
-
-		.title {
-			flex: 1;
-			line-height: 1;
-		}
-
-		.iconfont {
-			color: $color-tip;
-			font-size: $font-size-base;
-		}
-
-		.img-wrap {
-			width: 38rpx;
-			height: 38rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-</style>
diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue
index 875d0e2..e17cba1 100644
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -521,38 +521,16 @@
 </template>
 
 <script>
-import nsGoodsAction from '@/pages_goods/components/ns-goods-action/ns-goods-action.vue';
-	import nsGoodsActionIcon from '@/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue';
-	import nsGoodsActionButton from '@/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
 import detail from './public/js/detail.js';
 import scroll from '@/common/js/scroll-view.js';
-import toTop from '@/components/toTop/toTop.vue';
-import nsGoodsPromotion from '@/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue';
 import goodsDetailBase from '@/common/js/goods_detail_base.js';
-import goodsDetailView from '@/pages_goods/components/goods-detail-view/goods-detail-view.vue';
 // 按需引入全局组件
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 
 export default {
 	components: {
-			nsGoodsAction,
-			nsGoodsActionIcon,
-			nsGoodsActionButton,
-			uniPopup,
-			nsGoodsSku,
-			uniCountDown,
-			nsGoodsPromotion,
-			goodsDetailView,
-			toTop,
-			nsLogin,
-			loadingCover,
 			// #ifdef MP-WEIXIN
 			privacyPopup,
 			// #endif
diff --git a/pages_goods/list.vue b/pages_goods/list.vue
index 8d9c4d8..b406c53 100644
--- a/pages_goods/list.vue
+++ b/pages_goods/list.vue
@@ -1,34 +1,43 @@
 <template>
-	<view class="content" :style="themeColor"> 
+	<view class="content" :style="themeColor">
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap">
-					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
+						:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
+					@click="changeListStyle()"></view>
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
-					<text :class="{ 'color-base-text': orderType === '' }">{{langstatus?$lang('Random'):'综合'}}</text>
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
+					@click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
 				</view>
 
-				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">{{langstatus?$lang('Sales'):'销量'}}
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">
+					{{ langstatus ? $lang('Sales') : '销量' }}
 				</view>
 
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
-					<text :class="{ 'color-base-text': orderType === 'discount_price' }">{{langstatus?$lang('Price'):'价格'}}</text>
+					<text
+						:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : '价格' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
 				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">{{langstatus?$lang('Filter'):'筛选'}}</text>
+					<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : '筛选' }}</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
@@ -39,18 +48,21 @@
 		<mescroll-uni top="180" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.goods_stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
-									
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -58,15 +70,18 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								
-								
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+
+
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -79,34 +94,35 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
@@ -114,11 +130,12 @@
 
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : ''
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -127,29 +144,35 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
-						
+
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -160,48 +183,50 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 							</view>
-							<view class="pro-info"  v-if="item.isinformation == 0">
-								<view class="block-wrap" >
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+							<view class="pro-info" v-if="item.isinformation == 0">
+								<view class="block-wrap">
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : ''
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -219,7 +244,7 @@
 			<view class="title color-tip">筛选</view>
 			<scroll-view scroll-y>
 				<!-- 包邮 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>是否包邮</text></view>
 					<view class="list">
 						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
@@ -227,7 +252,7 @@
 				</view> -->
 
 				<!-- 价格筛选项 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>价格区间(元)</text></view>
 					<view class="price-wrap">
 						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
@@ -237,7 +262,7 @@
 				</view> -->
 
 				<!-- 品牌筛选项 -->
-		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+				<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
 					<view class="label"><text>品牌</text></view>
 					<view class="list">
 						<view v-for="(item, index) in brandList" :key="index">
@@ -253,8 +278,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -274,50 +302,40 @@
 		<!-- 底部tabBar -->
 		<view id="tab-bar">
 			<diy-bottom-nav></diy-bottom-nav>
-		</view>		
+		</view>
 	</view>
 </template>
 
 <script>
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
-	import uniTag from '@/components/uni-tag/uni-tag.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
-	import list from './public/js/list.js';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+import list from './public/js/list.js';
 
-	export default {
-		components: {
-		uniDrawer,
-		uniTag,
-		nsGoodsSkuIndex,
-		nsEmpty,
+export default {
+	components: {
 		MescrollUni,
-		loadingCover,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
 	},
-		data() {
-			return {};
-		},
-		mixins: [list]
-	};
+	data() {
+		return {};
+	},
+	mixins: [list]
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
-		background-color: #f5f5f5 !important;
-	}
+>>>.uni-tag--primary.uni-tag--inverted {
+	background-color: #f5f5f5 !important;
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_order/detail.vue b/pages_order/detail.vue
index 659d78b..16202b9 100644
--- a/pages_order/detail.vue
+++ b/pages_order/detail.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
 				<image :src="$util.img(action.icon)"></image>
 				<view class="status-name">
@@ -64,9 +65,9 @@
 						</view>
 						<view class="store-info-detail">
 							<view class="store-name" @click="
-									$util.redirectTo('/pages_tool/store/detail', {
-										store_id: orderData.delivery_store_id
-									})
+								$util.redirectTo('/pages_tool/store/detail', {
+									store_id: orderData.delivery_store_id
+								})
 								">
 								<text class="name font-size-base">{{ orderData.delivery_store_name }}</text>
 								<text class="iconfont icon-right font-size-base"></text>
@@ -108,8 +109,11 @@
 						<text class="copy" @click="$util.copy(orderData.delivery_code)">复制</text>
 					</view>
 					<view class="code">
-						<image :src="$util.img(orderData.pickup_barcode)" @click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode" mode="widthFix"/>
-						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))" class="qrcode" mode="widthFix"/>
+						<image :src="$util.img(orderData.pickup_barcode)"
+							@click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode"
+							mode="widthFix" />
+						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))"
+							class="qrcode" mode="widthFix" />
 					</view>
 				</view>
 			</view>
@@ -121,7 +125,8 @@
 				<view v-for="(goodsItem, goodsIndex) in orderData.order_goods" :key="goodsIndex" class="goods-item">
 					<view class="goods-wrap">
 						<view class="goods-img" @click="goDetail(goodsItem)">
-							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
+							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+								@error="imageError(goodsIndex)" mode="aspectFill" />
 						</view>
 						<view class="goods-info" @click="goDetail(goodsItem)">
 							<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -129,16 +134,18 @@
 								<view class="goods-spec">
 									<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 										{{ x.spec_value_name }}
-										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-									</block>
+										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }} </block>
 								</view>
 							</view>
 							<view class="goods-sub-section">
 								<view>
 									<text class="goods-price ">
 										<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-										<text class="price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
-										<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+										<text class="price-style large">{{
+											parseFloat(goodsItem.price).toFixed(2).split('.')[0]
+											}}</text>
+										<text class="unit price-style small">.{{
+											parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
 									</text>
 								</view>
 								<view>
@@ -152,8 +159,10 @@
 								次卡抵扣
 								<text class="goods-price ">
 									<text class="unit price-style small">-{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-style large">{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
+									<text class="price-style large">{{
+										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
 								</text>
 							</view>
 						</view>
@@ -164,7 +173,8 @@
 							<text class="tit">{{ item.value.title }}：</text>
 							<view class="box img-box" v-if="item.controller == 'Img'">
 								<view class="img" v-for="(img, imgIndex) in item.img_lists" :key="imgIndex">
-									<image :src="$util.img(img)" mode="widthFix" @click="previewMedia($util.img(img))"/>
+									<image :src="$util.img(img)" mode="widthFix"
+										@click="previewMedia($util.img(img))" />
 								</view>
 							</view>
 							<view class="box" v-else>
@@ -176,13 +186,15 @@
 
 					<view class="goods-action">
 						<block v-if="orderData.is_enable_refund">
-							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
+							<view @click="goRefund(goodsItem.order_goods_id)"
+								v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
 								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">
 									{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
 								</view>
 							</view>
 						</block>
-						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
+						<view @click="goRefundDetail(goodsItem.order_goods_id)"
+							v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
 							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
 						</view>
 					</view>
@@ -315,11 +327,12 @@
 			<block v-if="orderData.goods_class == 5">
 				<view class="order-cell">
 					<text class="tit">我的卡包：</text>
-					<view class="box"><text class="color-base-text" @click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
+					<view class="box"><text class="color-base-text"
+							@click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
 				</view>
 			</block>
 			<!-- 联系客服 -->
-	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+			<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
@@ -349,23 +362,27 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
+							}}次/共{{
+								orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
+							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
 			</view>
- 
+
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
+						class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -426,14 +443,17 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
+							}}次/共{{
+								orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
+							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
@@ -442,7 +462,8 @@
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
+						class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -574,7 +595,9 @@
 			</view>
 
 			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0">
-				<view class="order-box-btn white" v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1" @click="operation('memberOrderEvaluation')">
+				<view class="order-box-btn white"
+					v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1"
+					@click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
 				</view>
@@ -588,7 +611,8 @@
 				</block>
 			</view>
 
-			<view class="order-action fixed-bottom bottom-safe-area" v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
+			<view class="order-action fixed-bottom bottom-safe-area"
+				v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
 				<view class="order-box-btn white" @click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
@@ -597,7 +621,8 @@
 		</view>
 
 		<!-- 订单 -->
-		<view class="fixed-bottom-box bottom-safe-area" v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
+		<view class="fixed-bottom-box bottom-safe-area"
+			v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
 		</view>
 
 		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
@@ -608,216 +633,209 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import orderMethod from './public/js/orderMethod.js';
-	import nsPayment from '@/components/payment/payment.vue';
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
-	export default {
-		data() {
-			return {
-				isIphoneX: false,
-				orderId: 0,
-				merchantTradeNo: '',
-				orderData: {
-					action: [],
-					virtual_goods: {
-						is_veirfy: 0,
-						verify_record: []
-					}
-				},
-				action: {
-					icon: ''
-				},
-				evaluateConfig: {
-					evaluate_audit: 1,
-					evaluate_show: 0,
-					evaluate_status: 1
-				}
-			};
-		},
-		mixins: [orderMethod],
-		components: {
-			nsGoodsRecommend,
-			nsPayment,
-			nsContact
-		},
-		onLoad(option) {
-			if (option.order_id) this.orderId = option.order_id;
-			if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
-		},
-		onShow() {
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-			if (this.storeToken) {
-				this.getEvaluateConfig();
-				this.getOrderData();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
-				});
-			}
-		},
-		methods: {
-			goDetail(e) {
-				this.$util.redirectTo('/pages_goods/detail', {
-					goods_id: e.goods_id
-				});
-			},
-			goRefund(id) {
-				this.$util.redirectTo('/pages_tool/order/refund', {
-					order_goods_id: id
-				});
-			},
-			goRefundDetail(id) {
-				this.$util.redirectTo('/pages_tool/order/refund_detail', {
-					order_goods_id: id
-				});
-			},
-			getOrderData() {
-				this.$api.sendRequest({
-					url: '/api/order/detail',
-					data: {
-						order_id: this.orderId,
-						merchant_trade_no: this.merchantTradeNo
-					},
-					success: res => {
-						if (res.code >= 0) {
-							if (res.data.order_status == 0) {
-								let date = Date.parse(new Date()) / 1000;
-								res.data.closeTimeMachine = this.$util.countDown(res.data.create_time + res.data.auto_close - date);
-							}
-							let num = 0;
-							this.orderData = res.data;
-							this.orderId = this.orderData.order_id;
-							let refund_order_goods_ids = [];
-							this.orderData.order_goods.forEach(v => {
-								if (v.sku_spec_format) {
-									v.sku_spec_format = JSON.parse(v.sku_spec_format);
-								} else {
-									v.sku_spec_format = [];
-								}
-
-								if (v.refund_status == 0 || v.refund_status == -1) {
-									num += 1;
-									refund_order_goods_ids.push(v.order_goods_id);
-								}
-							});
-							this.action = JSON.parse(res.data.order_status_action);
-
-							//判断在可退款商品数量大于1时出现批量删除按钮
-							if (num > 1) {
-								this.orderData.refund_batch_status = true;
-								this.orderData.refund_order_goods_ids = refund_order_goods_ids;
-							} else {
-								this.orderData.refund_batch_status = false;
-							}
-
-							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
-
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.showToast({
-								title: '未获取到订单信息！'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_order/list');
-							}, 1500);
-						}
-					},
-					fail: res => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			/**
-			 * 下拉刷新
-			 */
-			onPullDownRefresh() {
-				this.getOrderData();
-			},
-			operation(action) {
-				switch (action) {
-					case 'orderPay': // 支付
-						this.orderPay(this.orderData);
-						break;
-					case 'orderClose': //关闭
-						this.orderClose(this.orderData.order_id, () => {
-							this.getOrderData();
-						});
-						break;
-					case 'memberTakeDelivery': //收货
-						this.orderDelivery(this.orderData, () => {
-							this.getOrderData();
-						});
-						break;
-					case 'trace': //查看物流
-						this.$util.redirectTo('/pages_tool/order/logistics', {
-							order_id: this.orderData.order_id
-						});
-						break;
-					case 'memberOrderEvaluation': //评价
-						this.$util.redirectTo('/pages_tool/order/evaluate', {
-							order_id: this.orderData.order_id
-						});
-						break;
-						//批量退款
-					case 'memberBatchRefund':
-						this.$util.redirectTo('/pages_tool/order/refund_type_select', {
-							order_id: this.orderId
-						});
-						break;
-					case 'memberVirtualTakeDelivery':
-						this.orderVirtualDelivery(this.orderData, () => {
-							this.getOrderData();
-						});
-						break;
+import orderMethod from './public/js/orderMethod.js';
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderId: 0,
+			merchantTradeNo: '',
+			orderData: {
+				action: [],
+				virtual_goods: {
+					is_veirfy: 0,
+					verify_record: []
 				}
 			},
-			imageError(index) {
-				this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
+			action: {
+				icon: ''
 			},
-			getEvaluateConfig() {
-				this.$api.sendRequest({
-					url: '/api/goodsevaluate/config',
-					success: res => {
-						if (res.code == 0) {
-							var data = res.data;
-							this.evaluateConfig = data;
-						}
-					}
-				});
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment() {
-				this.$refs.choosePaymentPopup.open();
-			},
-			// 预览图片
-			previewMedia(pickup) {
-				var paths = [];
-				paths.push(pickup);
+			evaluateConfig: {
+				evaluate_audit: 1,
+				evaluate_show: 0,
+				evaluate_status: 1
+			}
+		};
+	},
+	mixins: [orderMethod],
+	onLoad(option) {
+		if (option.order_id) this.orderId = option.order_id;
+		if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
 
-				uni.previewImage({
-					urls: paths
-				});
-			}
-		},
-		filters: {
-			abs(value) {
-				return Math.abs(parseFloat(value)).toFixed(2);
-			}
+		if (this.storeToken) {
+			this.getEvaluateConfig();
+			this.getOrderData();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
+			});
 		}
-	};
+	},
+	methods: {
+		goDetail(e) {
+			this.$util.redirectTo('/pages_goods/detail', {
+				goods_id: e.goods_id
+			});
+		},
+		goRefund(id) {
+			this.$util.redirectTo('/pages_tool/order/refund', {
+				order_goods_id: id
+			});
+		},
+		goRefundDetail(id) {
+			this.$util.redirectTo('/pages_tool/order/refund_detail', {
+				order_goods_id: id
+			});
+		},
+		getOrderData() {
+			this.$api.sendRequest({
+				url: '/api/order/detail',
+				data: {
+					order_id: this.orderId,
+					merchant_trade_no: this.merchantTradeNo
+				},
+				success: res => {
+					if (res.code >= 0) {
+						if (res.data.order_status == 0) {
+							let date = Date.parse(new Date()) / 1000;
+							res.data.closeTimeMachine = this.$util.countDown(res.data.create_time + res.data.auto_close - date);
+						}
+						let num = 0;
+						this.orderData = res.data;
+						this.orderId = this.orderData.order_id;
+						let refund_order_goods_ids = [];
+						this.orderData.order_goods.forEach(v => {
+							if (v.sku_spec_format) {
+								v.sku_spec_format = JSON.parse(v.sku_spec_format);
+							} else {
+								v.sku_spec_format = [];
+							}
+
+							if (v.refund_status == 0 || v.refund_status == -1) {
+								num += 1;
+								refund_order_goods_ids.push(v.order_goods_id);
+							}
+						});
+						this.action = JSON.parse(res.data.order_status_action);
+
+						//判断在可退款商品数量大于1时出现批量删除按钮
+						if (num > 1) {
+							this.orderData.refund_batch_status = true;
+							this.orderData.refund_order_goods_ids = refund_order_goods_ids;
+						} else {
+							this.orderData.refund_batch_status = false;
+						}
+
+						if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info = JSON.parse(this.orderData.delivery_store_info);
+
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: '未获取到订单信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_order/list');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 下拉刷新
+		 */
+		onPullDownRefresh() {
+			this.getOrderData();
+		},
+		operation(action) {
+			switch (action) {
+				case 'orderPay': // 支付
+					this.orderPay(this.orderData);
+					break;
+				case 'orderClose': //关闭
+					this.orderClose(this.orderData.order_id, () => {
+						this.getOrderData();
+					});
+					break;
+				case 'memberTakeDelivery': //收货
+					this.orderDelivery(this.orderData, () => {
+						this.getOrderData();
+					});
+					break;
+				case 'trace': //查看物流
+					this.$util.redirectTo('/pages_tool/order/logistics', {
+						order_id: this.orderData.order_id
+					});
+					break;
+				case 'memberOrderEvaluation': //评价
+					this.$util.redirectTo('/pages_tool/order/evaluate', {
+						order_id: this.orderData.order_id
+					});
+					break;
+				//批量退款
+				case 'memberBatchRefund':
+					this.$util.redirectTo('/pages_tool/order/refund_type_select', {
+						order_id: this.orderId
+					});
+					break;
+				case 'memberVirtualTakeDelivery':
+					this.orderVirtualDelivery(this.orderData, () => {
+						this.getOrderData();
+					});
+					break;
+			}
+		},
+		imageError(index) {
+			this.orderData.order_goods[index].sku_image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		getEvaluateConfig() {
+			this.$api.sendRequest({
+				url: '/api/goodsevaluate/config',
+				success: res => {
+					if (res.code == 0) {
+						var data = res.data;
+						this.evaluateConfig = data;
+					}
+				}
+			});
+		},
+		// 显示选择支付方式弹框
+		openChoosePayment() {
+			this.$refs.choosePaymentPopup.open();
+		},
+		// 预览图片
+		previewMedia(pickup) {
+			var paths = [];
+			paths.push(pickup);
+
+			uni.previewImage({
+				urls: paths
+			});
+		}
+	},
+	filters: {
+		abs(value) {
+			return Math.abs(parseFloat(value)).toFixed(2);
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/detail.scss';
+@import './public/css/detail.scss';
 </style>
 <style scoped>
-	.pickup-code-info .code img:nth-child(1) {
-		margin-bottom: 30rpx;
-	}
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+.pickup-code-info .code img:nth-child(1) {
+	margin-bottom: 30rpx;
+}
+
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_order/detail_point.vue b/pages_order/detail_point.vue
index a62cc38..37ee721 100644
--- a/pages_order/detail_point.vue
+++ b/pages_order/detail_point.vue
@@ -1,14 +1,18 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
-				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')"/>
-				<image v-if="orderData.order_status == 1" :src="$util.img('public/uniapp/order/order-icon-received.png')"/>
-				<image v-if="orderData.order_status == -1" :src="$util.img('public/uniapp/order/order-icon-close.png')"/>
+				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')" />
+				<image v-if="orderData.order_status == 1"
+					:src="$util.img('public/uniapp/order/order-icon-received.png')" />
+				<image v-if="orderData.order_status == -1"
+					:src="$util.img('public/uniapp/order/order-icon-close.png')" />
 				<view class="status-name">
 					<view class="status-name">
-						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' : orderData.order_status == -1 ? '已关闭' : '' }}
+						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' :
+							orderData.order_status == -1 ? '已关闭' : '' }}
 					</view>
 				</view>
 			</view>
@@ -79,7 +83,7 @@
 				</view>
 			</view>
 			<!-- 联系客服 -->
-	<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
+			<!-- 		<ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
@@ -120,7 +124,8 @@
 
 			<view class="order-action" v-if="orderData.order_status == 0 && orderData.type == 1">
 				<view class="order-box-btn" @click="orderClose()">关闭</view>
-				<view class="order-box-btn color-base-bg color-base-border color-text-white" @click="openChoosePayment()">支付</view>
+				<view class="order-box-btn color-base-bg color-base-border color-text-white"
+					@click="openChoosePayment()">支付</view>
 			</view>
 		</view>
 
@@ -133,171 +138,165 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
-	export default {
-		components: {
-			nsGoodsRecommend,
-			nsContact
-		},
-		data() {
-			return {
-				isIphoneX: false,
-				orderId: 0,
-				orderData: {
-					action: []
-				},
-				action: {
-					icon: ''
-				},
-				storeDetail: {}
-			};
-		},
-		onLoad(option) {
-			if (option.order_id) this.orderId = option.order_id;
-		},
-		onShow() {
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderId: 0,
+			orderData: {
+				action: []
+			},
+			action: {
+				icon: ''
+			},
+			storeDetail: {}
+		};
+	},
+	onLoad(option) {
+		if (option.order_id) this.orderId = option.order_id;
+	},
+	onShow() {
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
 
-			if (this.storeToken) {
-				this.getOrderData();
-			} else {
-				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages_order/detail_point?order_id=' + this.orderId
-				});
-			}
-		},
-		methods: {
-			goRefund(id) {
-				this.$util.redirectTo('/pages_tool/order/refund', {
-					order_goods_id: id
-				});
-			},
-			goRefundDetail(id) {
-				this.$util.redirectTo('/pages_tool/order/refund_detail', {
-					order_goods_id: id
-				});
-			},
-			goDetail(id) {
-				this.$util.redirectTo('/pages_promotion/point/detail', {
-					id: id
-				});
-			},
-			navigateBack() {
-				this.$util.goBack();
-			},
-			getOrderData() {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/order/info',
-					data: {
-						order_id: this.orderId
-					},
-					success: res => {
-						uni.stopPullDownRefresh();
-						if (res.code >= 0) {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							this.orderData = res.data;
-							if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info =
-								JSON.parse(this.orderData.delivery_store_info);
-						} else {
-							this.$util.showToast({
-								title: '未获取到订单信息！'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_order/list');
-							}, 1500);
-						}
-					},
-					fail: res => {
-						uni.stopPullDownRefresh();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			/**
-			 * 下拉刷新
-			 */
-			onPullDownRefresh() {
-				this.getOrderData();
-			},
-			orderClose() {
-				uni.showModal({
-					title: '提示',
-					content: '确定关闭此次兑换？',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/pointexchange/api/order/close',
-								data: {
-									order_id: this.orderData.order_id
-								},
-								success: res => {
-									if (res.code >= 0) {
-										this.$util.showToast({
-											title: '关闭成功'
-										});
-										this.getOrderData();
-									}
-								}
-							});
-						}
-					}
-				});
-			},
-			// 显示选择支付方式弹框
-			openChoosePayment() {
-				this.$refs.choosePaymentPopup.open();
-			},
-			orderPay() {
-				uni.setStorageSync('paySource', 'pointexchange');
-				this.$refs.choosePaymentPopup.getPayInfo(this.orderData.out_trade_no);
-			},
-			exchangeImage(data) {
-				let img = '';
-				switch (data.type) {
-					case 1:
-						img = this.$util.img(data.exchange_image, {
-							size: 'mid'
-						});
-						break;
-					case 2:
-						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
-							'public/uniapp/point/coupon.png');
-						break;
-					case 3:
-						img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
-							'public/uniapp/point/hongbao.png');
-						break;
-				}
-				return img;
-			},
-			imageError() {
-				switch (this.orderData.type) {
-					case 2:
-						this.orderData.exchange_image = this.$util.img('public/uniapp/point/coupon.png');
-						break;
-					case 3:
-						this.orderData.exchange_image = this.$util.img('public/uniapp/point/hongbao.png');
-						break;
-					default:
-						this.orderData.exchange_image = this.$util.getDefaultImage().goods;
-				}
-				this.$forceUpdate();
-			},
-		},
-		filters: {
-			abs(value) {
-				return Math.abs(parseFloat(value)).toFixed(2);
-			}
+		if (this.storeToken) {
+			this.getOrderData();
+		} else {
+			this.$util.redirectTo('/pages_tool/login/login', {
+				back: '/pages_order/detail_point?order_id=' + this.orderId
+			});
 		}
-	};
+	},
+	methods: {
+		goRefund(id) {
+			this.$util.redirectTo('/pages_tool/order/refund', {
+				order_goods_id: id
+			});
+		},
+		goRefundDetail(id) {
+			this.$util.redirectTo('/pages_tool/order/refund_detail', {
+				order_goods_id: id
+			});
+		},
+		goDetail(id) {
+			this.$util.redirectTo('/pages_promotion/point/detail', {
+				id: id
+			});
+		},
+		navigateBack() {
+			this.$util.goBack();
+		},
+		getOrderData() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/order/info',
+				data: {
+					order_id: this.orderId
+				},
+				success: res => {
+					uni.stopPullDownRefresh();
+					if (res.code >= 0) {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						this.orderData = res.data;
+						if (this.orderData.delivery_store_info != '') this.orderData.delivery_store_info =
+							JSON.parse(this.orderData.delivery_store_info);
+					} else {
+						this.$util.showToast({
+							title: '未获取到订单信息！'
+						});
+						setTimeout(() => {
+							this.$util.redirectTo('/pages_order/list');
+						}, 1500);
+					}
+				},
+				fail: res => {
+					uni.stopPullDownRefresh();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		/**
+		 * 下拉刷新
+		 */
+		onPullDownRefresh() {
+			this.getOrderData();
+		},
+		orderClose() {
+			uni.showModal({
+				title: '提示',
+				content: '确定关闭此次兑换？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/pointexchange/api/order/close',
+							data: {
+								order_id: this.orderData.order_id
+							},
+							success: res => {
+								if (res.code >= 0) {
+									this.$util.showToast({
+										title: '关闭成功'
+									});
+									this.getOrderData();
+								}
+							}
+						});
+					}
+				}
+			});
+		},
+		// 显示选择支付方式弹框
+		openChoosePayment() {
+			this.$refs.choosePaymentPopup.open();
+		},
+		orderPay() {
+			uni.setStorageSync('paySource', 'pointexchange');
+			this.$refs.choosePaymentPopup.getPayInfo(this.orderData.out_trade_no);
+		},
+		exchangeImage(data) {
+			let img = '';
+			switch (data.type) {
+				case 1:
+					img = this.$util.img(data.exchange_image, {
+						size: 'mid'
+					});
+					break;
+				case 2:
+					img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+						'public/uniapp/point/coupon.png');
+					break;
+				case 3:
+					img = data.exchange_image ? this.$util.img(data.exchange_image) : this.$util.img(
+						'public/uniapp/point/hongbao.png');
+					break;
+			}
+			return img;
+		},
+		imageError() {
+			switch (this.orderData.type) {
+				case 2:
+					this.orderData.exchange_image = this.$util.img('public/uniapp/point/coupon.png');
+					break;
+				case 3:
+					this.orderData.exchange_image = this.$util.img('public/uniapp/point/hongbao.png');
+					break;
+				default:
+					this.orderData.exchange_image = this.$util.getDefaultImage().goods;
+			}
+			this.$forceUpdate();
+		},
+	},
+	filters: {
+		abs(value) {
+			return Math.abs(parseFloat(value)).toFixed(2);
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/detail.scss';
+@import './public/css/detail.scss';
 </style>
 <style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_order/list.vue b/pages_order/list.vue
index 0d45196..60bdaaf 100644
--- a/pages_order/list.vue
+++ b/pages_order/list.vue
@@ -166,19 +166,12 @@
 
 <script>
 import orderMethod from './public/js/orderMethod.js';
-import nsPayment from '@/components/payment/payment.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 
 export default {
 	components: {
-		nsPayment,
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty
 	},
 	data() {
 		return {
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
index c8eae81..ef3e730 100644
--- a/pages_promotion/fenxiao/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -152,9 +152,8 @@
 </template>
 
 <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 validate from '@/common/js/validate.js';
+	import fenxiaoWords from '@/common/js/fenxiao-words.js';
 	import htmlParser from '@/common/js/html-parser';
 	export default {
 		data() {
@@ -187,9 +186,6 @@
 				isOpen: false
 			};
 		},
-		components: {
-			uniPopup
-		},
 		mixins: [fenxiaoWords],
 		onLoad(option) {
 			setTimeout( () => {
diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue
index dbd75d2..114bdc9 100644
--- a/pages_promotion/fenxiao/bill.vue
+++ b/pages_promotion/fenxiao/bill.vue
@@ -22,12 +22,9 @@
 </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';
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif
 
 export default {
@@ -37,14 +34,11 @@ export default {
 			showEmpty: true
 		};
 	},
-	components: {
-		nsLogin,
-		MescrollUni,
-		loadingCover,
-		nsEmpty,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
+	components: {
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 	onShow() {
 		setTimeout( () => {
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
index a3f6786..9d4c381 100644
--- a/pages_promotion/fenxiao/child_fenxiao.vue
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -41,9 +41,6 @@
 
 <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
@@ -57,10 +54,7 @@ export default {
 		};
 	},
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
index ef3f20c..e0989f9 100644
--- a/pages_promotion/fenxiao/goods_list.vue
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -2,28 +2,28 @@
 	<view class="content" :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
-				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+				<view class="goods-list"
+					:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
 					<scroll-view class="quick-nav" scroll-x="true">
 						<!-- #ifdef MP -->
 						<view class="uni-scroll-view-content">
 							<!-- #endif -->
-							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }" @click="changeCategory(0)">全部</view>
-							<view
-								class="quick-nav-item"
-								v-for="item in categoryList"
-								:key="item.category_id"
+							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }"
+								@click="changeCategory(0)">全部</view>
+							<view class="quick-nav-item" v-for="item in categoryList" :key="item.category_id"
 								:class="{ selected: categoryId == item.category_id }"
-								@click="changeCategory(item.category_id)"
-							>
+								@click="changeCategory(item.category_id)">
 								{{ item.category_name }}
 							</view>
 							<!-- #ifdef MP -->
 						</view>
 						<!-- #endif -->
 					</scroll-view>
-					<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+					<view v-for="(item, index) in goodsList" :key="index" class="goods-item"
+						@click="navToDetailPage(item)">
 						<view class="image-wrap">
-							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" />
+							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)"
+								mode="aspectFill" />
 						</view>
 						<view class="goods-content">
 							<view class="goods-name">
@@ -132,22 +132,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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import list from './public/js/goods_list.js';
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -157,7 +151,7 @@ export default {
 </script>
 
 <style>
-.quick-nav >>> .uni-scroll-view-content {
+.quick-nav>>>.uni-scroll-view-content {
 	display: flex;
 }
 </style>
@@ -165,8 +159,10 @@ export default {
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
+
 .quick-nav {
 	margin-bottom: 20rpx;
+
 	.quick-nav-item {
 		display: flex;
 		align-items: center;
@@ -190,6 +186,7 @@ export default {
 		}
 	}
 }
+
 .content {
 	overflow: hidden;
 	padding: 0 30rpx 160rpx;
@@ -202,12 +199,14 @@ export default {
 		background-size: 100%;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
+
 		.goods-item {
 			margin-bottom: 20rpx;
 			background: #ffffff;
 			padding: $padding;
 			display: flex;
 			border-radius: 10rpx;
+
 			&:last-child {
 				margin-bottom: 0;
 			}
@@ -221,6 +220,7 @@ export default {
 			border-radius: 10rpx;
 			overflow: hidden;
 			flex-shrink: 0;
+
 			image {
 				width: 100%;
 				height: 100%;
@@ -241,6 +241,7 @@ export default {
 			.goods-name {
 				width: 100%;
 				line-height: 1.3;
+
 				.name {
 					line-height: 1.3;
 					word-break: break-all;
@@ -250,10 +251,12 @@ export default {
 					-webkit-line-clamp: 2;
 					-webkit-box-orient: vertical;
 				}
+
 				.label-list {
 					display: flex;
 					align-items: center;
 					margin-top: 6rpx;
+
 					.label-item {
 						padding: 4rpx 10rpx;
 						font-size: $font-size-tag;
@@ -285,6 +288,7 @@ export default {
 					padding: 0 $padding;
 					border-radius: 50rpx;
 					border: 2rpx solid $base-color;
+
 					text {
 						color: $base-color;
 						border-radius: 40rpx;
@@ -299,6 +303,7 @@ export default {
 			}
 		}
 	}
+
 	.active-btn {
 		position: fixed;
 		bottom: 40rpx;
@@ -312,10 +317,12 @@ export default {
 		border-radius: 50rpx;
 		background-color: $base-color;
 		color: #fff;
+
 		.btn {
 			flex: 1;
 			text-align: center;
 		}
+
 		.share-btn {
 			margin: 0;
 			padding: 0;
@@ -355,6 +362,7 @@ export default {
 					border: none;
 					line-height: 1;
 					height: auto;
+
 					text {
 						margin-top: 20rpx;
 						font-size: $font-size-tag;
@@ -367,6 +375,7 @@ export default {
 					font-size: 80rpx;
 					line-height: initial;
 				}
+
 				.icon-fuzhilianjie,
 				.icon-pengyouquan,
 				.icon-haowuquan,
@@ -383,39 +392,48 @@ export default {
 			text-align: center;
 		}
 	}
+
 	.poster-layer {
 		.generate-poster {
 			padding: 40rpx 0;
+
 			.iconfont {
 				font-size: 80rpx;
 				color: #07c160;
 				line-height: initial;
 			}
-			> view {
+
+			>view {
 				text-align: center;
+
 				&:last-child {
 					margin-top: 20rpx;
 				}
 			}
 		}
+
 		.image-wrap {
 			width: 64%;
 			height: 854rpx;
 			margin: 60rpx auto 40rpx auto;
 			box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
+
 			image {
 				width: 480rpx;
 				height: 854rpx;
 			}
 		}
+
 		.msg {
 			padding: 40rpx;
 		}
+
 		.save {
 			text-align: center;
 			height: 80rpx;
 			line-height: 80rpx;
 		}
+
 		.close {
 			position: absolute;
 			top: 0;
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index dc128d6..178e244 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -261,12 +261,8 @@
 
 <script>
 import fenxiaoWords from '@/common/js/fenxiao-words.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
 export default {
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			info: {
diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue
index 36e0a17..11f4ef5 100644
--- a/pages_promotion/fenxiao/order.vue
+++ b/pages_promotion/fenxiao/order.vue
@@ -2,40 +2,51 @@
 	<view :style="themeColor">
 		<view class="withdraw-cate">
 			<block v-for="(item, index) in category" :key="index">
-				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
+				<view @click="selectCate(item.id)" class="cate-li"
+					:class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}
+				</view>
 			</block>
 		</view>
 		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
+						@click="toDetail(orderItem.fenxiao_order_id)">
 						<view class="order-header">
 							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
 							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-green"
+								v-else-if="orderItem.is_settlement == 1">已结算</text>
 							<text class="status-name color-text-orange" v-else>待结算</text>
 						</view>
 
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })"
+										@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
 										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
 										<view>
 											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
-											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
+											<text class="price-color  price-style small">{{
+												$lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large">{{
+												parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+											<text class="price-color price-style small">.{{
+												parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
 										</view>
 									</view>
 									<view class="goods-sub-section">
 										<view class="goods-price">
-											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
-										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+											<text class="unit price-style small">{{ $lang('common.currencySymbol')
+												}}</text>
+											<text class="price-color price-style large">{{
+												parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit price-style small">.{{
+												parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
 										</view>
 										<view>
 											<text>
@@ -57,18 +68,24 @@
 								<view class="total">
 									<text>合计：</text>
 									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
-									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+									<text class="price-color font-size-toolbar">{{
+										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
+									<text class="price-color">.{{
+										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="cart-empty">
-					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无订单" :isIndex="false"
+						v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无待结算订单" :isIndex="false"
+						v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已结算订单" :isIndex="false"
+						v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已退款订单" :isIndex="false"
+						v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
 				</view>
 			</view>
 		</mescroll-uni>
@@ -79,20 +96,14 @@
 </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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -133,7 +144,7 @@ export default {
 		if (option.type != undefined) this.selectId = option.type;
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -144,9 +155,9 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
-		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '订单');
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -204,7 +215,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
diff --git a/pages_promotion/fenxiao/promote_code.vue b/pages_promotion/fenxiao/promote_code.vue
index d1063e3..6adca17 100644
--- a/pages_promotion/fenxiao/promote_code.vue
+++ b/pages_promotion/fenxiao/promote_code.vue
@@ -4,7 +4,7 @@
 			<swiper-item v-for="(item, index) in poster" :key="index">
 				<view class="swiper-item">
 					<view class="poster-wrap">
-						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
+						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true" />
 					</view>
 				</view>
 			</swiper-item>
@@ -25,7 +25,8 @@
 				<view class="action-wrap">
 					<view @click="closeDialog">取消</view>
 					<view>
-						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+						<button type="default" open-type="openSetting" @opensetting="closeDialog"
+							hover-class="none">立即授权</button>
 					</view>
 				</view>
 			</view>
@@ -42,265 +43,261 @@
 </template>
 
 <script>
-	import {
-		Weixin
-	} from 'common/js/wx-jssdk.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import {
+	Weixin
+} from 'common/js/wx-jssdk.js';
 
-	export default {
-		data() {
-			return {
-				poster: [],
-				fenxiaoInfo: {},
-				posterIndex: 0,
-				//海报模板id
-				templateId: ['default'],
-				mpShareData: null //小程序分享数据
-			};
-		},
-		components: {
-			uniPopup
-		},
-		methods: {
-			/**
-			 * 获取分销海报
-			 */
-			getPoster(id) {
-				return new Promise((resolve, reject) => {
-					this.$api.sendRequest({
-						url: '/fenxiao/api/fenxiao/poster',
-						data: {
-							page: '/pages/index/index',
-							qrcode_param: JSON.stringify({}),
-							template_id: id
-						},
-						success: res => {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							if (res.code >= 0) {
-								resolve(res.data.path);
-							}
-						},
-						fail: res => {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							reject();
-						}
-					});
-				});
-			},
-			getIndex(e) {
-				this.posterIndex = e.detail.current;
-			},
-			save() {
-				// #ifdef MP
-				uni.downloadFile({
-					url: this.$util.img(this.poster[this.posterIndex]),
+export default {
+	data() {
+		return {
+			poster: [],
+			fenxiaoInfo: {},
+			posterIndex: 0,
+			//海报模板id
+			templateId: ['default'],
+			mpShareData: null //小程序分享数据
+		};
+	},
+	methods: {
+		/**
+		 * 获取分销海报
+		 */
+		getPoster(id) {
+			return new Promise((resolve, reject) => {
+				this.$api.sendRequest({
+					url: '/fenxiao/api/fenxiao/poster',
+					data: {
+						page: '/pages/index/index',
+						qrcode_param: JSON.stringify({}),
+						template_id: id
+					},
 					success: res => {
-						if (res.statusCode === 200) {
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath,
-								success: () => {
-									this.$util.showToast({
-										title: '保存成功'
-									});
-								},
-								fail: res => {
-									if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
-										res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
-										this.$refs.popupDialog.open();
-									} else {
-										this.$util.showToast({
-											title: '保存失败，请稍后重试'
-										});
-									}
-								}
-							});
-						} else {
-							this.$util.showToast({
-								title: '下载失败'
-							});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						if (res.code >= 0) {
+							resolve(res.data.path);
 						}
 					},
 					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						reject();
+					}
+				});
+			});
+		},
+		getIndex(e) {
+			this.posterIndex = e.detail.current;
+		},
+		save() {
+			// #ifdef MP
+			uni.downloadFile({
+				url: this.$util.img(this.poster[this.posterIndex]),
+				success: res => {
+					if (res.statusCode === 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: () => {
+								this.$util.showToast({
+									title: '保存成功'
+								});
+							},
+							fail: res => {
+								if (res.errMsg == 'saveImageToPhotosAlbum:fail auth deny' ||
+									res.errMsg == 'saveImageToPhotosAlbum:fail:auth denied') {
+									this.$refs.popupDialog.open();
+								} else {
+									this.$util.showToast({
+										title: '保存失败，请稍后重试'
+									});
+								}
+							}
+						});
+					} else {
 						this.$util.showToast({
 							title: '下载失败'
 						});
 					}
-				});
-				// #endif
-			},
-			getFenxiaoDetail() {
-				this.poster = [];
-				try {
-					this.templateId.forEach((item, index) => {
-						this.getPoster(item).then(resolve => {
-							this.poster.push(resolve);
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						}).catch(reject => {
-							throw reject;
-						});
-					});
-				} catch {
+				},
+				fail: res => {
 					this.$util.showToast({
-						title: '海报生成失败'
+						title: '下载失败'
 					});
 				}
-			},
-
-			closeDialog() {
-				this.$refs.popupDialog.close();
-			}
-		},
-		onLoad(option) {
-			setTimeout( () => {
-				if (!this.addonIsExist.fenxiao) {
-					this.$util.showToast({
-						title: '商家未开启分销',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
-				}
-			},1000);
-
-			if (option.templateId) {
-				this.templateId = option.templateId.split(',');
-			}
-
-			if (this.storeToken) {
-				if(option.poster){
-					this.poster = decodeURIComponent(option.poster).split(',')
-					setTimeout(() => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}, 500)
-				}else{
-					this.getFenxiaoDetail();
-				}
-				
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
-				});
-			}
-		},
-		onShow() {
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
 			});
 			// #endif
 		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
+		getFenxiaoDetail() {
+			this.poster = [];
+			try {
+				this.templateId.forEach((item, index) => {
+					this.getPoster(item).then(resolve => {
+						this.poster.push(resolve);
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}).catch(reject => {
+						throw reject;
+					});
+				});
+			} catch {
+				this.$util.showToast({
+					title: '海报生成失败'
+				});
+			}
 		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getFenxiaoDetail();
-				}
+
+		closeDialog() {
+			this.$refs.popupDialog.close();
+		}
+	},
+	onLoad(option) {
+		setTimeout(() => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		if (option.templateId) {
+			this.templateId = option.templateId.split(',');
+		}
+
+		if (this.storeToken) {
+			if (option.poster) {
+				this.poster = decodeURIComponent(option.poster).split(',')
+				setTimeout(() => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}, 500)
+			} else {
+				this.getFenxiaoDetail();
+			}
+
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/promote_code');
+			});
+		}
+	},
+	onShow() {
+		//小程序分享
+		// #ifdef MP-WEIXIN
+		this.$util.getMpShare().then(res => {
+			this.mpShareData = res;
+		});
+		// #endif
+	},
+	//分享给好友
+	onShareAppMessage() {
+		return this.mpShareData.appMessage;
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		return this.mpShareData.timeLine;
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.getFenxiaoDetail();
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		min-height: 100vh;
-		background-color: #f5f5f5;
+.container {
+	width: 100vw;
+	min-height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.poster-wrap {
+	padding: 40rpx 0;
+	width: calc(100vw - 80rpx);
+	margin: 0 40rpx;
+	line-height: 1;
+
+	image {
+		border-radius: 20rpx;
+		overflow: hidden;
+		width: 100%;
 	}
+}
 
-	.poster-wrap {
-		padding: 40rpx 0;
-		width: calc(100vw - 80rpx);
-		margin: 0 40rpx;
-		line-height: 1;
+.swiper {
+	height: 1240rpx;
+}
 
-		image {
-			border-radius: 20rpx;
-			overflow: hidden;
-			width: 100%;
-		}
-	}
+.btn {
+	margin: 0 80rpx;
+	margin-top: 30rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: $border-radius;
+	color: #fff;
+	text-align: center;
+}
 
-	.swiper {
-		height: 1240rpx;
-	}
+.tips {
+	text-align: center;
+	font-size: $font-size-base;
+	color: #999;
+	font-weight: 600;
+	margin-top: 20rpx;
+}
 
-	.btn {
-		margin: 0 80rpx;
-		margin-top: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: $border-radius;
-		color: #fff;
+.dialog-popup {
+	width: 580rpx;
+	background: #fff;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	overflow: hidden;
+	height: initial;
+
+	.title {
+		padding: 30rpx 30rpx 0 30rpx;
 		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
 	}
 
-	.tips {
+	.message {
+		padding: 0 30rpx;
+		color: #666;
 		text-align: center;
 		font-size: $font-size-base;
-		color: #999;
-		font-weight: 600;
-		margin-top: 20rpx;
+		line-height: 1.3;
+		margin-top: 30rpx;
 	}
 
-	.dialog-popup {
-		width: 580rpx;
-		background: #fff;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		overflow: hidden;
-		height: initial;
+	.action-wrap {
+		margin-top: 50rpx;
+		height: 80rpx;
+		display: flex;
+		border-top: 2rpx solid #eee;
 
-		.title {
-			padding: 30rpx 30rpx 0 30rpx;
+		&>view {
+			flex: 1;
 			text-align: center;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
+			line-height: 80rpx;
 
-		.message {
-			padding: 0 30rpx;
-			color: #666;
-			text-align: center;
-			font-size: $font-size-base;
-			line-height: 1.3;
-			margin-top: 30rpx;
-		}
+			&:first-child {
+				border-right: 2rpx solid #eee;
+				color: #999;
+			}
 
-		.action-wrap {
-			margin-top: 50rpx;
-			height: 80rpx;
-			display: flex;
-			border-top: 2rpx solid #eee;
-
-			&>view {
-				flex: 1;
-				text-align: center;
+			button {
+				border: none;
 				line-height: 80rpx;
-
-				&:first-child {
-					border-right: 2rpx solid #eee;
-					color: #999;
-				}
-
-				button {
-					border: none;
-					line-height: 80rpx;
-					padding: 0;
-					margin: 0;
-					width: 100%;
-					height: 100%;
-				}
+				padding: 0;
+				margin: 0;
+				width: 100%;
+				height: 100%;
 			}
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
index 6a134eb..32af31b 100644
--- a/pages_promotion/fenxiao/ranking_list.vue
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -3,17 +3,22 @@
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
 			<view slot="list">
 				<block v-if="list.length != 0">
-					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
+					<view class="banner"
+						:style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/header_bg.png') + ') no-repeat top left / 100% 100%' }">
 						<view class="info">
 							<view class="info-pic">
-								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head"
+									@error="info.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 							</view>
 							<view class="member-info">
 								<view class="rank-info-box">
-									<text class="name">{{info.nickname}}</text>
+									<text class="name">{{ info.nickname }}</text>
 								</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
+								<view class="withdrawal"
+									@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')"
+									v-if="type == 'profit'">点击提现</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')"
+									v-if="type == 'invited_num'">我的团队</view>
 							</view>
 						</view>
 					</view>
@@ -26,7 +31,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">分销佣金</text>
-									<text class="all-money-num">{{ info.today_commission}}元</text>
+									<text class="all-money-num">{{ info.today_commission }}元</text>
 								</view>
 							</view>
 						</view>
@@ -50,7 +55,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">推广人数</text>
-									<text class="all-money-num">{{ info.one_child_num}}人</text>
+									<text class="all-money-num">{{ info.one_child_num }}人</text>
 								</view>
 							</view>
 						</view>
@@ -67,20 +72,21 @@
 						</view>
 					</view>
 
-					<view class="title-rakn-text"  v-if="type == 'profit'">佣金排行</view>
-					<view class="title-rakn-text"  v-if="type == 'invited_num'">推广排行</view>
+					<view class="title-rakn-text" v-if="type == 'profit'">佣金排行</view>
+					<view class="title-rakn-text" v-if="type == 'invited_num'">推广排行</view>
 
 					<view class="ranking-list">
 						<view class="ranking-item" v-for="(item, index) in list" :key="index">
 							<view class="ranking price-font">{{ index + 1 }}</view>
 							<view class="content">
 								<view class="head-img">
-									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
+										@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 								</view>
 								<view class="nickname">{{ item.nickname }}</view>
 							</view>
 							<view class="price-font price-style" v-if="type == 'profit'">
-								￥{{ item.total_commission|moneyFormat }}</view>
+								￥{{ item.total_commission | moneyFormat }}</view>
 							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
 							</view>
 						</view>
@@ -97,337 +103,331 @@
 </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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 
-	
-	export default {
-		components: {
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},	
-		data() {
-			return {
-				list: [],
-				emptyShow: false,
-				type: '',
-				ranking: 0,
-				info: {}
-			}
-		},
-		onLoad(data) {
-			this.type = data.type;
-			this.getRanking();
-			this.getFenxiaoDetail();
-		},
-		methods: {
-			getData(mescroll) {
-				this.emptyShow = false;
-				if (mescroll.num == 1) {
-					this.list = [];
-				}
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/rankinglist',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num,
-						type: this.type
-					},
-					success: res => {
-						this.emptyShow = true;
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						mescroll.endSuccess(newArr.length);
-						//设置列表数据
-						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			getRanking() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/ranking',
-					data: {
-						type: this.type
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.ranking = res.data;
-						}
-					}
-				})
-			},
-			getFenxiaoDetail() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/detail',
-					success: res => {
-						if (res.data) {
-							this.info = res.data;
-						}
-					},
-				});
-			},
+
+export default {
+	components: {
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+		return {
+			list: [],
+			emptyShow: false,
+			type: '',
+			ranking: 0,
+			info: {}
 		}
+	},
+	onLoad(data) {
+		this.type = data.type;
+		this.getRanking();
+		this.getFenxiaoDetail();
+	},
+	methods: {
+		getData(mescroll) {
+			this.emptyShow = false;
+			if (mescroll.num == 1) {
+				this.list = [];
+			}
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/rankinglist',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num,
+					type: this.type
+				},
+				success: res => {
+					this.emptyShow = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+					this.list = this.list.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		getRanking() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/ranking',
+				data: {
+					type: this.type
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.ranking = res.data;
+					}
+				}
+			})
+		},
+		getFenxiaoDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/detail',
+				success: res => {
+					if (res.data) {
+						this.info = res.data;
+					}
+				},
+			});
+		},
 	}
+}
 </script>
 
 <style lang="scss">
-	.container {
-		width: 100vw;
-		height: 100vh;
-	}
+.container {
+	width: 100vw;
+	height: 100vh;
+}
 
-	.banner {
-		width: 100%;
-		height: 200rpx;
-		// background: $base-color;
-	}
+.banner {
+	width: 100%;
+	height: 200rpx;
+	// background: $base-color;
+}
 
-	.info {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 50rpx 80rpx 0;
-		box-sizing: border-box;
+.info {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 50rpx 80rpx 0;
+	box-sizing: border-box;
 
-		.info-pic {
-			width: 100rpx;
-			height: 100rpx;
+	.info-pic {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		border: 4rpx solid #fff;
+		position: relative;
+
+		image {
+			width: 100%;
+			height: 100%;
 			border-radius: 50%;
-			border: 4rpx solid #fff;
-			position: relative;
-
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: 50%;
-			}
-
-		}
-
-		.member-info {
-			flex: 1;
-			width: 0;
-			margin-left: 32rpx;
-			display: flex;
-
-			view {
-				color: #fff;
-			}
-
-			.rank-info-box {
-				line-height: 1;
-				flex: 1;
-			}
-
-			.name {
-				font-size: 32rpx;
-				font-weight: 600;
-				color: #FFFFFF;
-			}
-
-			.withdrawal {
-				border-radius: 4px;
-				line-height: 23px;
-				margin: auto;
-				text-align: center;
-				font-size: 11px;
-			}
-
 		}
 
 	}
 
-	.fenxiao-team {
+	.member-info {
+		flex: 1;
+		width: 0;
+		margin-left: 32rpx;
 		display: flex;
-		width: 100%;
-		margin-top: 22rpx;
 
-		.fenxiao-index-other {
-			margin: 0 24rpx 20rpx 24rpx;
-			border-radius: 16rpx;
-			background-color: #ffffff;
-			padding: 30rpx 0;
+		view {
+			color: #fff;
+		}
+
+		.rank-info-box {
+			line-height: 1;
 			flex: 1;
+		}
 
-			&:last-child {
-				margin-left: 0;
+		.name {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #FFFFFF;
+		}
+
+		.withdrawal {
+			border-radius: 4px;
+			line-height: 23px;
+			margin: auto;
+			text-align: center;
+			font-size: 11px;
+		}
+
+	}
+
+}
+
+.fenxiao-team {
+	display: flex;
+	width: 100%;
+	margin-top: 22rpx;
+
+	.fenxiao-index-other {
+		margin: 0 24rpx 20rpx 24rpx;
+		border-radius: 16rpx;
+		background-color: #ffffff;
+		padding: 30rpx 0;
+		flex: 1;
+
+		&:last-child {
+			margin-left: 0;
+		}
+
+		.all-money-item {
+			margin: 0 30rpx;
+			display: flex;
+			font-size: $font-size-tag;
+			align-items: center;
+
+			.img-wrap {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 70rpx;
+				height: 70rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 
-			.all-money-item {
-				margin: 0 30rpx;
+			.all-money-tit-wrap {
+				flex: 1;
+				margin-left: 24rpx;
 				display: flex;
-				font-size: $font-size-tag;
-				align-items: center;
+				flex-direction: column;
+				height: 70rpx;
 
-				.img-wrap {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 70rpx;
-					height: 70rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
+				.all-money-tit {
+					line-height: 1;
+					color: $color-title;
+					font-size: $font-size-base;
+					flex: 1;
 				}
 
-				.all-money-tit-wrap {
-					flex: 1;
-					margin-left: 24rpx;
-					display: flex;
-					flex-direction: column;
-					height: 70rpx;
-
-					.all-money-tit {
-						line-height: 1;
-						color: $color-title;
-						font-size: $font-size-base;
-						flex: 1;
-					}
-
-					.all-money-num {
-						color: $color-tip;
-						font-size: 24rpx;
-						line-height: 1;
-					}
+				.all-money-num {
+					color: $color-tip;
+					font-size: 24rpx;
+					line-height: 1;
 				}
 			}
 		}
 	}
+}
 
-	.icon-wenxiao {
-		text-align: center;
-		font-size: 50rpx;
-		color: var(--base-color) !important;
-	}
+.icon-wenxiao {
+	text-align: center;
+	font-size: 50rpx;
+	color: var(--base-color) !important;
+}
 
-	.number {
-		font-weight: 600;
-		text-align: center;
-	}
+.number {
+	font-weight: 600;
+	text-align: center;
+}
 
-	.info-text {
-		font-size: 20rpx;
-		text-align: center;
-	}
+.info-text {
+	font-size: 20rpx;
+	text-align: center;
+}
 
-	.info-title {
-		font-size: 50rpx;
-		font-weight: 900;
-		color: #f5f5f5;
-		text-align: center;
-	}
+.info-title {
+	font-size: 50rpx;
+	font-weight: 900;
+	color: #f5f5f5;
+	text-align: center;
+}
 
-	.info-rank {
-		color: #f5f5f5;
-		margin-top: 10rpx;
-	}
+.info-rank {
+	color: #f5f5f5;
+	margin-top: 10rpx;
+}
 
-	.title-rakn-text {
-		text-align: center;
-		font-size: 30rpx;
-		font-weight: 900;
-	}
+.title-rakn-text {
+	text-align: center;
+	font-size: 30rpx;
+	font-weight: 900;
+}
 
-	.ranking-list {
-		transform: translateY(-120rpx);
-		margin: 200rpx 24rpx;
-		background: #fff;
-		border-radius: 16rpx;
-		padding: 10rpx 20rpx;
-		margin-top: 140rpx;
+.ranking-list {
+	transform: translateY(-120rpx);
+	margin: 200rpx 24rpx;
+	background: #fff;
+	border-radius: 16rpx;
+	padding: 10rpx 20rpx;
+	margin-top: 140rpx;
 
-		.ranking-item {
+	.ranking-item {
+		display: flex;
+		align-items: center;
+		padding: 20rpx 0;
+		border-bottom: 2rpx solid #f5f5f5;
+
+		&:last-child {
+			border-bottom: 0;
+		}
+
+		.ranking {
+			width: 60rpx;
+			height: 60rpx;
 			display: flex;
 			align-items: center;
-			padding: 20rpx 0;
-			border-bottom: 2rpx solid #f5f5f5;
+			justify-content: center;
+			box-sizing: border-box;
+			font-size: 24rpx;
+		}
 
-			&:last-child {
-				border-bottom: 0;
-			}
+		&:nth-child(1) .ranking {
+			background: rgb(249, 186, 1);
+			border-radius: 50%;
+			border: 10rpx solid rgb(254, 220, 92);
+		}
 
-			.ranking {
-				width: 60rpx;
-				height: 60rpx;
+		&:nth-child(2) .ranking {
+			background: rgb(172, 185, 194);
+			border-radius: 50%;
+			border: 10rpx solid rgb(215, 223, 229);
+		}
+
+		&:nth-child(3) .ranking {
+			background: rgb(211, 163, 136);
+			border-radius: 50%;
+			border: 10rpx solid rgb(235, 201, 190);
+		}
+
+		.content {
+			flex: 1;
+			width: 0;
+			padding: 0 20rpx;
+			display: flex;
+			align-items: center;
+
+			.head-img {
+				width: 90rpx;
+				height: 90rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				box-sizing: border-box;
-				font-size: 24rpx;
-			}
-
-			&:nth-child(1) .ranking {
-				background: rgb(249, 186, 1);
 				border-radius: 50%;
-				border: 10rpx solid rgb(254, 220, 92);
-			}
+				overflow: hidden;
 
-			&:nth-child(2) .ranking {
-				background: rgb(172, 185, 194);
-				border-radius: 50%;
-				border: 10rpx solid rgb(215, 223, 229);
-			}
-
-			&:nth-child(3) .ranking {
-				background: rgb(211, 163, 136);
-				border-radius: 50%;
-				border: 10rpx solid rgb(235, 201, 190);
-			}
-
-			.content {
-				flex: 1;
-				width: 0;
-				padding: 0 20rpx;
-				display: flex;
-				align-items: center;
-
-				.head-img {
-					width: 90rpx;
-					height: 90rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border-radius: 50%;
-					overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
+				image {
+					width: 100%;
+					height: 100%;
 				}
+			}
 
-				.nickname {
-					color: #333;
-					margin: 0 20rpx;
-					font-size: 28rpx;
-				}
+			.nickname {
+				color: #333;
+				margin: 0 20rpx;
+				font-size: 28rpx;
 			}
 		}
 	}
+}
 </style>
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index 36927b5..df61a30 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -73,9 +73,6 @@
 
 <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		
@@ -83,10 +80,7 @@ import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index 87d9a47..9dbf836 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -84,19 +84,13 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 60812fd..d7fa24b 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -5,16 +5,20 @@
 				<block v-if="withdrawList.length">
 					<view class="detailed-wrap">
 						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
+							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index"
+								@click="toDetail(item.id)">
 								<view class="info">
-									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
+									<view class="event">{{ item.transfer_type == 'balance' && '余额' ||
+										item.transfer_type == 'alipay' && '支付宝' || item.transfer_type == 'bank' && '银行卡' ||
+										item.transfer_type =='wechatpay'&&'微信' }}</view>
 									<view>
 										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
 									</view>
 								</view>
 								<view class="right-wrap">
 									<view class="num color-base-text">￥{{ item.money }}</view>
-									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
+									<view class="status-name" :style="withdrawState[item.status].color">{{
+										item.status_name }}</view>
 								</view>
 							</view>
 						</view>
@@ -30,25 +34,19 @@
 	</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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
-	},			
+	},
 	data() {
 		return {
 			withdrawState: {
@@ -74,7 +72,7 @@ export default {
 		};
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -85,9 +83,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 +171,7 @@ export default {
 		display: flex;
 		height: 90rpx;
 
-		& > view {
+		&>view {
 			flex: 1;
 			text-align: left;
 			padding: 0 $padding;
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index c0a454c..297edfb 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -3,19 +3,19 @@
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row" style="margin-bottom: 20rpx;">
-				
-				
-			<!-- 	<view class="flex-item input-wrap">
+
+
+				<!-- 	<view class="flex-item input-wrap">
 					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" placeholder="请输入您要搜索的商品" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view> -->
-				
+
 				<view style="width: 100rpx;height: 100rpx;">
 					<image :src="$util.img(merch.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;" />
 				</view>
 				<view style="margin-left: 20rpx;padding-top: 22rpx;">
-					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{merch.merch_name}}</view>
+					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{ merch.merch_name }}</view>
 					<view style="color:rgb(255 202 40)">
 						<text class="icox icox-xing"></text>
 						<text class="icox icox-xing"></text>
@@ -24,12 +24,13 @@
 						<text class="icox icox-xing"></text>
 					</view>
 				</view>
-				
+
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
+					@click="sortTabClick('')">
 					<text :class="{ 'color-base-text': orderType === '' }">综合</text>
 				</view>
 
@@ -39,12 +40,16 @@
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
 					<text :class="{ 'color-base-text': orderType === 'discount_price' }">价格</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
-			<!-- 	<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
+				<!-- 	<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
 					<text @click="sortTabClick('screen')">筛选</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
@@ -56,17 +61,20 @@
 		<mescroll-uni top="240" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -74,15 +82,19 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价'
+										}}</text>
 								</view>
-								
-								
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+
+
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -95,34 +107,35 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
 
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
@@ -130,11 +143,12 @@
 
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : ''
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -143,29 +157,36 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
-						
+
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价'
+										}}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -176,48 +197,50 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 							</view>
-							<view class="pro-info"  v-if="item.isinformation == 0">
-								<view class="block-wrap" >
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+							<view class="pro-info" v-if="item.isinformation == 0">
+								<view class="block-wrap">
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
 									<view v-if="config.style == 'icon-cart'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart shopping-cart-btn iconfont icon-gouwuche click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--加号图标 -->
 									<view v-else-if="config.style == 'icon-add'" :style="{
-											color: config.theme == 'diy' ? config.textColor : '',
-											borderColor: config.theme == 'diy' ? config.textColor : ''
-										}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : '',
+										borderColor: config.theme == 'diy' ? config.textColor : ''
+									}" class="cart plus-sign-btn iconfont icon-add1 click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!-- 按钮 -->
 									<view v-else-if="config.style == 'button'" :style="{
-											backgroundColor: config.theme == 'diy' ? config.bgColor : '',
-											color: config.theme == 'diy' ? config.textColor : '',
-											fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
-											padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
-										}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
+										backgroundColor: config.theme == 'diy' ? config.bgColor : '',
+										color: config.theme == 'diy' ? config.textColor : '',
+										fontWeight: config.theme == 'diy' ? (config.fontWeight ? 'bold' : 'normal') : '',
+										padding: config.theme == 'diy' ? '12rpx ' + config.padding * 2 + 'rpx' : ''
+									}" class="cart buy-btn click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										{{ config.text }}
 										<view class="click-event"></view>
 									</view>
-						
+
 									<!--自定义图标 -->
 									<view v-else-if="config.style == 'icon-diy'" :style="{
-											color: config.theme == 'diy' ? config.textColor : ''
-										}" class="icon-diy click-wrap" :id="'goods-' + item.id"
+										color: config.theme == 'diy' ? config.textColor : ''
+									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -235,7 +258,7 @@
 			<view class="title color-tip">筛选</view>
 			<scroll-view scroll-y>
 				<!-- 包邮 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>是否包邮</text></view>
 					<view class="list">
 						<uni-tag :inverted="true" text="包邮" :type="isFreeShipping ? 'primary' : 'default'" @click="isFreeShipping = !isFreeShipping" />
@@ -243,7 +266,7 @@
 				</view> -->
 
 				<!-- 价格筛选项 -->
-			<!-- 	<view class="item-wrap">
+				<!-- 	<view class="item-wrap">
 					<view class="label"><text>价格区间(元)</text></view>
 					<view class="price-wrap">
 						<input class="uni-input" type="digit" v-model="minPrice" placeholder="最低价" />
@@ -253,7 +276,7 @@
 				</view> -->
 
 				<!-- 品牌筛选项 -->
-		<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
+				<!-- 		<view class="item-wrap" v-if="brandList.length > 0">
 					<view class="label"><text>品牌</text></view>
 					<view class="list">
 						<view v-for="(item, index) in brandList" :key="index">
@@ -269,8 +292,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -290,47 +316,36 @@
 </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 {
-		components: {
-			uniDrawer,
-			uniTag,
-			nsGoodsSkuIndex,
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
-		data() {
-			return {};
-		},
-		mixins: [list]
-	};
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
+import list from './public/js/list.js';
+
+export default {
+	components: {
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+		return {};
+	},
+	mixins: [list]
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
-		background-color: #f5f5f5 !important;
-	}
+>>>.uni-tag--primary.uni-tag--inverted {
+	background-color: #f5f5f5 !important;
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index 5dfd5ad..b035f3f 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -5,7 +5,8 @@
 				<view class="goods-media">
 					<!-- #ifdef H5 -->
 					<cover-view class="share">
-						<view class="share_left"><text class="iconfont icon-back_light" @click="$util.goBack()"></text></view>
+						<view class="share_left"><text class="iconfont icon-back_light" @click="$util.goBack()"></text>
+						</view>
 					</cover-view>
 					<!-- #endif -->
 
@@ -13,12 +14,21 @@
 						<swiper class="swiper">
 							<swiper-item :item-id="'goods_id_' + pointInfo.type">
 								<view class="item" v-if="pointInfo.type == 2">
-									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError($util.img('public/uniapp/point/coupon.png'))" mode="aspectFit"/>
+									<image class="adv-pic"
+										:src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/coupon.png')"
+										@error="imageError($util.img('public/uniapp/point/coupon.png'))"
+										mode="aspectFit" />
 								</view>
 								<view class="item" v-else-if="pointInfo.type == 3">
-									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError($util.img('public/uniapp/point/hongbao.png'))" mode="aspectFit"/>
+									<image class="adv-pic"
+										:src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/hongbao.png')"
+										@error="imageError($util.img('public/uniapp/point/hongbao.png'))"
+										mode="aspectFit" />
+								</view>
+								<view class="item" v-else>
+									<image class="adv-pic" :src="$util.img(pointInfo.image)" @error="imageError()"
+										mode="aspectFit"></image>
 								</view>
-								<view class="item" v-else><image class="adv-pic" :src="$util.img(pointInfo.image)" @error="imageError()" mode="aspectFit"></image></view>
 							</swiper-item>
 						</swiper>
 					</view>
@@ -27,7 +37,8 @@
 					<view class="goods-module-wrap">
 						<text class="price-symbol ">{{ pointInfo.point }}积分</text>
 						<template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0">
-							<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price }}</text>
+							<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price
+								}}</text>
 						</template>
 
 						<view class="market-price-wrap" v-if="pointInfo.price">
@@ -35,26 +46,36 @@
 							<text class="money">{{ pointInfo.price }}</text>
 						</view>
 
-						<view class="follow-and-share" v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
-							<text class="color-tip" v-if="pointInfo.pointCoupon != 1">库存:{{ pointInfo.stock }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
+						<view class="follow-and-share"
+							v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
+							<text class="color-tip" v-if="pointInfo.pointCoupon != 1">库存:{{ pointInfo.stock }}{{
+								pointInfo.stock >= 0 ?
+									pointInfo.unit : '' }}</text>
 							<text class="color-tip" v-else>库存:无限{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
 						</view>
 					</view>
 					<view class="goods-module-wrap info">
-						<text class="sku-name-wrap" v-if="pointInfo.type == 1">{{ isEnEnv ? pointInfo.en_goods_name : pointInfo.goods_name }}</text>
+						<text class="sku-name-wrap" v-if="pointInfo.type == 1">{{ isEnEnv ? pointInfo.en_goods_name :
+							pointInfo.goods_name
+							}}</text>
 						<text class="sku-name-wrap" v-else>{{ pointInfo.name }}</text>
 					</view>
 					<view class="coupon-desc">
-						<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance }}元</view>
+						<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance
+							}}元</view>
 						<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">无门槛优惠券</view>
-						<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least + '减' + pointInfo.money }}</view>
+						<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least +
+							'减' + pointInfo.money
+							}}</view>
 						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">
 							满{{ pointInfo.at_least }}元
 							<text>{{ pointInfo.discount }}折</text>
 						</view>
-						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{ pointInfo.discount_limit }}元</view>
+						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{
+							pointInfo.discount_limit }}元</view>
 						<view class="time color-tip" v-if="pointInfo.coupon_type">
-							{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' : $util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
+							{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' :
+								$util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
 						</view>
 					</view>
 				</view>
@@ -71,22 +92,23 @@
 				</view>
 
 				<!-- 促销 -->
-				<view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
+				<view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()"
+					v-show="isCommunity">
 					<view class="community-model-content" @click.stop>
-						<view class="community-model-content-radius"><view>添加社群</view></view>
+						<view class="community-model-content-radius">
+							<view>添加社群</view>
+						</view>
 						<view class="community-model-content-draw" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_img">
-							<image
-								:src="
-									pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
-										? $util.img(pointInfo.qr_data.qr_img)
-										: $util.img('public/uniapp/goods/detail_erweiImage.png')
-								"
-								mode="aspectFill"
-								show-menu-by-longpress="true"/>
+							<image :src="pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
+									? $util.img(pointInfo.qr_data.qr_img)
+									: $util.img('public/uniapp/goods/detail_erweiImage.png')
+								" mode="aspectFill" show-menu-by-longpress="true" />
 						</view>
 						<view class="community-model-content-text">长按识别二维码，添加社群</view>
 					</view>
-					<view class="community-model-close" @click.stop="onCloseCommunity()"><text class="iconfont icon-close"></text></view>
+					<view class="community-model-close" @click.stop="onCloseCommunity()"><text
+							class="iconfont icon-close"></text>
+					</view>
 				</view>
 				<!-- 添加二维码 end -->
 				<block v-if="pointInfo.type == 1">
@@ -95,15 +117,20 @@
 						<view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange">
 							<view class="label">选择</view>
 							<view class="box">
-								<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+								<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name
+									}}/{{
+										item.spec_value_name }}</text>
 							</view>
 							<text class="iconfont icon-right"></text>
 						</view>
 
-						<view class="item goods-attribute" @click="openAttributePopup()" v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
+						<view class="item goods-attribute" @click="openAttributePopup()"
+							v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
 							<view class="label">属性</view>
 							<view class="box">
-								<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index" v-if="index < 2">{{ item.attr_name }}: {{ item.attr_value_name }}</text>
+								<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index"
+									v-if="index < 2">{{
+										item.attr_name }}: {{ item.attr_value_name }}</text>
 							</view>
 							<text class="iconfont icon-right"></text>
 						</view>
@@ -118,12 +145,14 @@
 									<text class="iconfont icon-close"></text>
 								</view>
 								<scroll-view scroll-y class="goods-attribute-body">
-									<view class="item" v-for="(item, index) in pointInfo.goods_attr_format" :key="index">
+									<view class="item" v-for="(item, index) in pointInfo.goods_attr_format"
+										:key="index">
 										<text class="attr-name">{{ item.attr_name }}</text>
 										<text class="value-name">{{ item.attr_value_name }}</text>
 									</view>
 								</scroll-view>
-								<view class="button-box"><button type="primary" @click="closeAttributePopup()">确定</button></view>
+								<view class="button-box"><button type="primary"
+										@click="closeAttributePopup()">确定</button></view>
 							</view>
 						</uni-popup>
 					</view>
@@ -136,7 +165,8 @@
 									<text class="iconfont icon-close"></text>
 								</view>
 								<scroll-view scroll-y>
-									<view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in pointInfo.goods_service" :key="index">
+									<view class="item" :class="{ 'empty-desc': !item.desc }"
+										v-for="(item, index) in pointInfo.goods_service" :key="index">
 										<view class="iconfont icon-dui "></view>
 										<view class="info-wrap">
 											<text class="title">{{ item.service_name }}</text>
@@ -144,7 +174,8 @@
 										</view>
 									</view>
 								</scroll-view>
-								<view class="button-box"><button type="primary" @click="closeMerchantsServicePopup()">确定</button></view>
+								<view class="button-box"><button type="primary"
+										@click="closeMerchantsServicePopup()">确定</button></view>
 							</view>
 						</uni-popup>
 					</view>
@@ -152,41 +183,42 @@
 
 				<!-- 详情 -->
 				<view class="goods-detail-tab">
-					<view class="detail-tab"><view class="tab-item">兑换详情</view></view>
+					<view class="detail-tab">
+						<view class="tab-item">兑换详情</view>
+					</view>
 
 					<view class="detail-content">
 						<view class="detail-content-item">
-							<view class="goods-details" v-if="pointInfo.content"><rich-text :nodes="pointInfo.content"></rich-text></view>
+							<view class="goods-details" v-if="pointInfo.content"><rich-text
+									:nodes="pointInfo.content"></rich-text>
+							</view>
 							<view class="goods-details active" v-else>暂无兑换详情！</view>
 						</view>
 					</view>
 				</view>
 
 				<!-- SKU选择 -->
-				<ns-goods-sku
-					v-if="pointInfo.id"
-					ref="goodsSku"
-					@refresh="refreshGoodsSkuDetail"
-					:goods-detail="pointInfo"
-					:goods-id="pointInfo.goods_id"
-					:max-buy="pointInfo.max_buy"
-					:min-buy="pointInfo.min_buy"
-					source="point"
-				></ns-goods-sku>
+				<ns-goods-sku v-if="pointInfo.id" ref="goodsSku" @refresh="refreshGoodsSkuDetail"
+					:goods-detail="pointInfo" :goods-id="pointInfo.goods_id" :max-buy="pointInfo.max_buy"
+					:min-buy="pointInfo.min_buy" source="point"></ns-goods-sku>
 			</view>
 		</view>
 
-		<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button type="primary" >登录之后方可兑换</button></view>
+		<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button
+				type="primary">登录之后方可兑换</button></view>
 		<block v-else>
-			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button disabled>库存不足</button></view>
-			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button disabled>积分不足</button></view>
-			<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button type="primary" hover-class="none">兑换</button></view>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button
+					disabled>库存不足</button></view>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button
+					disabled>积分不足</button></view>
+			<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button
+					type="primary" hover-class="none">兑换</button></view>
 		</block>
 
 		<loading-cover ref="loadingCover"></loading-cover>
 		<ns-login ref="login"></ns-login>
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		
+
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- 小程序隐私协议 -->
@@ -195,19 +227,10 @@
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+
 import htmlParser from '@/common/js/html-parser';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
 export default {
-	components: {
-		uniPopup,
-		uniNumberBox,
-		nsGoodsSku,
-		toTop
-	},
 	data() {
 		return {
 			id: 0,
@@ -280,8 +303,8 @@ export default {
 			title: title,
 			path: path,
 			imageUrl: imageUrl,
-			success: res => {},
-			fail: res => {}
+			success: res => { },
+			fail: res => { }
 		};
 	},
 
@@ -318,7 +341,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.isLogin = true;
 				this.getPointInfo();
@@ -470,9 +493,11 @@ export default {
 
 <style lang="scss">
 @import '@/common/css/goods_detail.scss';
+
 .group-wrap .goods-module-wrap.info {
 	padding-bottom: 10rpx;
 }
+
 .group-wrap {
 	padding-bottom: 20rpx;
 }
@@ -492,6 +517,7 @@ export default {
 		height: 80rpx;
 		line-height: 80rpx;
 		border-radius: 10rpx;
+
 		&[type='primary'] {
 			background-color: var(--goods-btn-color);
 		}
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index fa3ce71..1efcbbf 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -116,21 +116,13 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
 
 	export default {
 		components: {
-			uniDrawer,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
index c1331b1..fba11b6 100644
--- a/pages_promotion/point/list.vue
+++ b/pages_promotion/point/list.vue
@@ -2,16 +2,19 @@
 	<view class="conteiner" :style="themeColor">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="point-navbar"
-			:style="{'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
-			<view class="nav-wrap" :style="{width: menuButtonBounding.left + 'px'}">
-				<view class="back" @click="back" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
+			:style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
+			<view class="nav-wrap" :style="{ width: menuButtonBounding.left + 'px' }">
+				<view class="back" @click="back"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
 					<text class="iconfont icon-back_light"></text>
 				</view>
 				<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')">
 					<text class="iconfont icon-sousuo3"></text>
 					<text class="tips">搜索商品</text>
 				</view>
-				<view class="sign" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }" @click="redirect('/pages_tool/member/signin')">
+				<view class="sign"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }"
+					@click="redirect('/pages_tool/member/signin')">
 					<image :src="$util.img('public/uniapp/point/navbar-sing-icon.png')" mode="widthFix"></image>
 				</view>
 			</view>
@@ -20,7 +23,7 @@
 		<!-- #endif -->
 
 		<scroll-view scroll-y="true" class="point-scroll-view" @scrolltolower="getData">
-			<view class="point-wrap" :style="{'background-position-y': -menuButtonBounding.bottom + 'px'}">
+			<view class="point-wrap" :style="{ 'background-position-y': -menuButtonBounding.bottom + 'px' }">
 				<view class="head-box">
 					<view class="account-content">
 						<view class="left">
@@ -28,9 +31,9 @@
 							<view>我的积分</view>
 						</view>
 						<view class="right">
-							<text class="point price-font">{{point}}</text>
+							<text class="point price-font">{{ point }}</text>
 							<text class="text">积分</text>
-					<!-- 		<text class="iconfont icon-right"></text> -->
+							<!-- 		<text class="iconfont icon-right"></text> -->
 						</view>
 					</view>
 					<view class="remark">
@@ -39,7 +42,7 @@
 					</view>
 				</view>
 
-			<!-- 	<view class="menu-wrap">
+				<!-- 	<view class="menu-wrap">
 					<view class="menu-list">
 						<view class="menu-item" @click="openPointPopup()">
 							<image :src="$util.img('/public/uniapp/point/point-rule.png')" class="menu-img"></image>
@@ -65,7 +68,7 @@
 						</view>
 					</view>
 				</view> -->
-<!-- 
+				<!-- 
 				<view class="poster-wrap">
 					<view class="poster-item" @click="redirect('/pages_tool/recharge/list')">
 						<image :src="$util.img('/public/uniapp/point/recharge-poster.png')" mode="widthFix"></image>
@@ -75,7 +78,8 @@
 					</view>
 				</view> -->
 
-				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')" v-if="rechargeList.length">
+				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')"
+					v-if="rechargeList.length">
 					<view class="item-wrap" v-for="(item, index) in rechargeList.slice(0, 4)" :key="index">
 						<view class="recharge">储值{{ parseFloat(item.buy_price) }}元</view>
 						<view class="point">可得{{ item.point }}积分</view>
@@ -92,10 +96,13 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-scroll" :class="{'single-row': couponList.length < 3}">
-								<view class="list-wrap-item coupon-list-wrap-item" v-for="(couponItem, couponIndex) in couponList" :key="couponIndex" @click="toDetail(couponItem)">
+							<view class="list-wrap-scroll" :class="{ 'single-row': couponList.length < 3 }">
+								<view class="list-wrap-item coupon-list-wrap-item"
+									v-for="(couponItem, couponIndex) in couponList" :key="couponIndex"
+									@click="toDetail(couponItem)">
 									<view class="img-box">
-										<image :src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')"/>
+										<image
+											:src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')" />
 									</view>
 									<view class="content">
 										<view class="coupon"
@@ -114,10 +121,14 @@
 												</view>
 												<view class="coupon-info">
 													<view class="coupon_condition font-size-activity-tag">
-														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' +
+															parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
 													</view>
-													<view class="coupon_type font-size-activity-tag" v-if="couponItem.goods_type == 1">全场券</view>
-													<view class="coupon_type font-size-activity-tag" v-else-if="couponItem.goods_type == 2||couponItem.goods_type == 3">指定券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-if="couponItem.goods_type == 1">全场券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-else-if="couponItem.goods_type == 2 || couponItem.goods_type == 3">
+														指定券</view>
 												</view>
 											</view>
 											<view class="coupon_right">
@@ -139,7 +150,9 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-item hongbao-list-wrap-item" v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex" @click="toDetail(hongbaoItem)">
+							<view class="list-wrap-item hongbao-list-wrap-item"
+								v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex"
+								@click="toDetail(hongbaoItem)">
 								<view class="img-box">
 									<image :src="$util.img('public/uniapp/point/hongbao_bg.png')"></image>
 								</view>
@@ -188,17 +201,19 @@
 												<block v-if="item.price > 0 && item.pay_type > 0">
 													<text class="unit  font-size-tag">+</text>
 													<view>
-														<text class="font-size-tag">{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
-														<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
+														<text class="font-size-tag">{{
+															parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+														<text class="unit  font-size-tag">.{{
+															parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
 													</view>
 												</block>
 											</view>
 											<view class="btn" @click="toDetail(item)">兑换</view>
 										</view>
-										<view class="pro-info" v-if="item.stock_show || item.sale_show ">
-											<view class="font-size-activity-tag color-tip" v-if="item.stock_show ">
+										<view class="pro-info" v-if="item.stock_show || item.sale_show">
+											<view class="font-size-activity-tag color-tip" v-if="item.stock_show">
 												库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}</view>
-											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show ">
+											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show">
 												已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
 											</view>
 										</view>
@@ -216,19 +231,19 @@
 			<uni-popup ref="pointPopup" type="bottom">
 				<view class="tips-layer">
 					<view class="head" @click="closePointPopup()">
-						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明'}}</view>
+						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明' }}</view>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="body">
 						<view class="detail margin-bottom">
-							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }}</view>
 							<view class="font-size-base">1、积分可在注册、签到、分享、消费、充值时获得。</view>
 							<view class="font-size-base">2、在购买部分商品时可获得积分。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用' }}</view>
 							<view class="font-size-base">1、积分可用于兑换积分中心的商品。</view>
 							<view class="font-size-base">2、积分可在参与某些活动时使用。</view>
 							<view class="font-size-base">3、积分不得转让，出售，不设有效期。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询' }}</view>
 							<view class="font-size-base">1、积分可在会员中心中查询具体数额以及明细。</view>
 						</view>
 					</view>
@@ -245,349 +260,345 @@
 	</view>
 </template>
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				mescroll: {
-					num: 0,
-					total: 1,
-					loading: false
-				},
-				categoryList: [{
-						id: 1,
-						name: '积分换好物'
-					},
-					{
-						id: 2,
-						name: '积分换券'
-					},
-					{
-						id: 3,
-						name: '积分换红包'
+export default {
+	data() {
+		return {
+			mescroll: {
+				num: 0,
+				total: 1,
+				loading: false
+			},
+			categoryList: [{
+				id: 1,
+				name: '积分换好物'
+			},
+			{
+				id: 2,
+				name: '积分换券'
+			},
+			{
+				id: 3,
+				name: '积分换红包'
+			}
+			],
+			isLogin: false,
+			goodsList: [],
+			couponList: [],
+			hongbaoList: [],
+			point: 0,
+			signState: 1, // 签到是否开启
+			mpShareData: null, //小程序分享数据
+			menuButtonBounding: {
+				bottom: 0
+			},
+			rechargeList: [], //充值套餐
+			newestGame: null
+		};
+	},
+	onLoad(option) {
+		setTimeout(() => {
+			if (!this.addonIsExist.pointexchange) {
+				this.$util.showToast({
+					title: '商家未开启积分商城',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+			}
+		}, 1000);
+
+		// #ifdef MP-WEIXIN
+		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
+		// #endif
+		//小程序分享接收source_member
+		if (option.source_member) {
+			uni.setStorageSync('source_member', option.source_member);
+		}
+		// 小程序扫码进入，接收source_member
+		if (option.scene) {
+			var sceneParams = decodeURIComponent(option.scene);
+			sceneParams = sceneParams.split('&');
+			if (sceneParams.length) {
+				sceneParams.forEach(item => {
+					if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
+					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
+				});
+			}
+		}
+		this.getData();
+		this.getRechargeList();
+		this.getNewestGame();
+	},
+	onShow() {
+		//记录分享关系
+		if (this.storeToken && uni.getStorageSync('source_member')) {
+			this.$util.onSourceMember(uni.getStorageSync('source_member'));
+		}
+
+		//小程序分享
+		// #ifdef MP-WEIXIN
+		this.$util.getMpShare().then(res => {
+			this.mpShareData = res;
+		});
+		// #endif
+
+		if (this.storeToken) this.getAccountInfo();
+		this.getCouponList();
+		this.getHongbaoList();
+		// this.getSignState();
+	},
+	methods: {
+		// 签到是否开启
+		getSignState() {
+			this.$api.sendRequest({
+				url: '/api/membersignin/getSignStatus',
+				success: res => {
+					if (res.code == 0) {
+						this.signState = res.data.is_use;
 					}
-				],
-				isLogin: false,
-				goodsList: [],
-				couponList: [],
-				hongbaoList: [],
-				point: 0,
-				signState: 1, // 签到是否开启
-				mpShareData: null, //小程序分享数据
-				menuButtonBounding: {
-					bottom: 0
-				},
-				rechargeList: [], //充值套餐
-				newestGame: null
-			};
-		},
-		onLoad(option) {
-			setTimeout( () => {
-				if (!this.addonIsExist.pointexchange) {
-					this.$util.showToast({
-						title: '商家未开启积分商城',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
-					}, 2000);
 				}
-			},1000);
-
-			// #ifdef MP-WEIXIN
-			this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
-			// #endif
-			//小程序分享接收source_member
-			if (option.source_member) {
-				uni.setStorageSync('source_member', option.source_member);
-			}
-			// 小程序扫码进入，接收source_member
-			if (option.scene) {
-				var sceneParams = decodeURIComponent(option.scene);
-				sceneParams = sceneParams.split('&');
-				if (sceneParams.length) {
-					sceneParams.forEach(item => {
-						if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
-						if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
-						if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
-					});
-				}
-			}
-			this.getData();
-			this.getRechargeList();
-			this.getNewestGame();
-		},
-		onShow() {
-			//记录分享关系
-			if (this.storeToken && uni.getStorageSync('source_member')) {
-				this.$util.onSourceMember(uni.getStorageSync('source_member'));
-			}
-
-			//小程序分享
-			// #ifdef MP-WEIXIN
-			this.$util.getMpShare().then(res => {
-				this.mpShareData = res;
 			});
-			// #endif
-
-			if (this.storeToken) this.getAccountInfo();
-			this.getCouponList();
-			this.getHongbaoList();
-			// this.getSignState();
 		},
-		methods: {
-			// 签到是否开启
-			getSignState() {
-				this.$api.sendRequest({
-					url: '/api/membersignin/getSignStatus',
-					success: res => {
-						if (res.code == 0) {
-							this.signState = res.data.is_use;
-						}
+		jumpPage(url) {
+			this.$util.redirectTo(url);
+		},
+		// 打开积分说明弹出层
+		openPointPopup() {
+			this.$refs.pointPopup.open();
+		},
+		// 打开积分说明弹出层
+		closePointPopup() {
+			this.$refs.pointPopup.close();
+		},
+		// 优惠券
+		getCouponList() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page_size: 0,
+					type: 2
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.couponList = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
 					}
-				});
-			},
-			jumpPage(url) {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 红包
+		getHongbaoList() {
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page_size: 0,
+					type: 3
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.hongbaoList = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//获取积分商品详情
+		getData() {
+			if (this.mescroll.loading || this.mescroll.num >= this.mescroll.total) return;
+			this.mescroll.loading = true;
+			this.$api.sendRequest({
+				url: '/pointexchange/api/goods/page',
+				data: {
+					page: this.mescroll.num + 1,
+					page_size: 10,
+					type: 1
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					//设置列表数据
+					this.mescroll.loading = false;
+					this.mescroll.total = res.data.page_count;
+					this.mescroll.num += 1;
+					if (this.mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
+					this.goodsList = this.goodsList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail() {
+					this.mescroll.loading = false;
+					//联网失败的回调
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		//跳转至详情页面
+		toDetail(item) {
+			this.$util.redirectTo('/pages_promotion/point/detail', {
+				id: item.id
+			});
+		},
+		goGoodsList() {
+			this.$util.redirectTo('/pages_promotion/point/goods_list');
+		},
+		//获取个人
+		getAccountInfo() {
+			this.$api.sendRequest({
+				url: '/api/memberaccount/info',
+				data: {
+					account_type: 'point'
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						if (!isNaN(parseFloat(res.data.point))) {
+							this.point = parseFloat(res.data.point).toFixed(0);
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		//跳转至登录页面
+		login() {
+			this.$refs.login.open('/pages_promotion/point/list');
+		},
+		imgError(index) {
+			this.goodsList[index].image = this.$util.getDefaultImage().goods;
+			this.$forceUpdate();
+		},
+		goodsImg(data) {
+			let img = '';
+			switch (data.type) {
+				case 1:
+					img = this.$util.img(data.image.split(',')[0], {
+						size: 'mid'
+					});
+					break;
+				case 2:
+					img = data.image ? this.$util.img(data.image) : this.$util.img(
+						'public/uniapp/point/coupon.png');
+					break;
+				case 3:
+					img = data.image ? this.$util.img(data.image) : this.$util.img(
+						'public/uniapp/point/hongbao.png');
+					break;
+			}
+			return img;
+		},
+		/**
+		 * 跳转
+		 * @param {Object} url
+		 */
+		redirect(url) {
+			if (!this.storeToken) {
+				this.$refs.login.open(url);
+			} else {
 				this.$util.redirectTo(url);
-			},
-			// 打开积分说明弹出层
-			openPointPopup() {
-				this.$refs.pointPopup.open();
-			},
-			// 打开积分说明弹出层
-			closePointPopup() {
-				this.$refs.pointPopup.close();
-			},
-			// 优惠券
-			getCouponList() {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page_size: 0,
-						type: 2
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.couponList = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+			}
+		},
+		getRechargeList() {
+			this.$api.sendRequest({
+				url: '/memberrecharge/api/memberrecharge/page',
+				data: {
+					page_size: 100,
+					page: 1
+				},
+				success: res => {
+					if (res.code == 0 && res.data) {
+						let rechargeList = [];
+						res.data.list.forEach(item => {
+							if (item.point > 0) rechargeList.push(item)
+						});
+						this.rechargeList = rechargeList;
 					}
-				});
-			},
-			// 红包
-			getHongbaoList() {
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page_size: 0,
-						type: 3
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.hongbaoList = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			//获取积分商品详情
-			getData() {
-				if (this.mescroll.loading || this.mescroll.num >= this.mescroll.total) return;
-				this.mescroll.loading = true;
-				this.$api.sendRequest({
-					url: '/pointexchange/api/goods/page',
-					data: {
-						page: this.mescroll.num + 1,
-						page_size: 10,
-						type: 1
-					},
-					success: res => {
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						//设置列表数据
-						this.mescroll.loading = false;
-						this.mescroll.total = res.data.page_count;
-						this.mescroll.num += 1;
-						if (this.mescroll.num == 1) this.goodsList = []; //如果是第一页需手动制空列表
-						this.goodsList = this.goodsList.concat(newArr); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail() {
-						this.mescroll.loading = false;
-						//联网失败的回调
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			//跳转至详情页面
-			toDetail(item) {
-				this.$util.redirectTo('/pages_promotion/point/detail', {
-					id: item.id
-				});
-			},
-			goGoodsList() {
-				this.$util.redirectTo('/pages_promotion/point/goods_list');
-			},
-			//获取个人
-			getAccountInfo() {
-				this.$api.sendRequest({
-					url: '/api/memberaccount/info',
-					data: {
-						account_type: 'point'
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							if (!isNaN(parseFloat(res.data.point))) {
-								this.point = parseFloat(res.data.point).toFixed(0);
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			//跳转至登录页面
-			login() {
-				this.$refs.login.open('/pages_promotion/point/list');
-			},
-			imgError(index) {
-				this.goodsList[index].image = this.$util.getDefaultImage().goods;
-				this.$forceUpdate();
-			},
-			goodsImg(data) {
-				let img = '';
-				switch (data.type) {
-					case 1:
-						img = this.$util.img(data.image.split(',')[0], {
-							size: 'mid'
+				}
+			})
+		},
+		back() {
+			if (getCurrentPages().length > 1) uni.navigateBack({
+				delta: 1
+			});
+			else this.$util.redirectTo('/pages/index/index');
+		},
+		getNewestGame() {
+			this.$api.sendRequest({
+				url: '/api/game/newestgame',
+				success: res => {
+					if (res.code == 0 && res.data) this.newestGame = res.data;
+				}
+			})
+		},
+		luckdraw() {
+			if (this.newestGame) {
+				switch (this.newestGame.game_type) {
+					case 'cards':
+						this.$util.redirectTo('/pages_promotion/game/cards', {
+							id: this.newestGame.game_id
 						});
 						break;
-					case 2:
-						img = data.image ? this.$util.img(data.image) : this.$util.img(
-							'public/uniapp/point/coupon.png');
+					case 'egg':
+						this.$util.redirectTo('/pages_promotion/game/smash_eggs', {
+							id: this.newestGame.game_id
+						});
 						break;
-					case 3:
-						img = data.image ? this.$util.img(data.image) : this.$util.img(
-							'public/uniapp/point/hongbao.png');
+					case 'turntable':
+						this.$util.redirectTo('/pages_promotion/game/turntable', {
+							id: this.newestGame.game_id
+						});
 						break;
 				}
-				return img;
-			},
-			/**
-			 * 跳转
-			 * @param {Object} url
-			 */
-			redirect(url) {
-				if (!this.storeToken) {
-					this.$refs.login.open(url);
-				} else {
-					this.$util.redirectTo(url);
-				}
-			},
-			getRechargeList() {
-				this.$api.sendRequest({
-					url: '/memberrecharge/api/memberrecharge/page',
-					data: {
-						page_size: 100,
-						page: 1
-					},
-					success: res => {
-						if (res.code == 0 && res.data) {
-							let rechargeList = [];
-							res.data.list.forEach(item => {
-								if (item.point > 0) rechargeList.push(item)
-							});
-							this.rechargeList = rechargeList;
-						}
-					}
-				})
-			},
-			back() {
-				if (getCurrentPages().length > 1) uni.navigateBack({
-					delta: 1
+			} else {
+				this.$util.showToast({
+					title: '暂无相关活动'
 				});
-				else this.$util.redirectTo('/pages/index/index');
-			},
-			getNewestGame() {
-				this.$api.sendRequest({
-					url: '/api/game/newestgame',
-					success: res => {
-						if (res.code == 0 && res.data) this.newestGame = res.data;
-					}
-				})
-			},
-			luckdraw() {
-				if (this.newestGame) {
-					switch (this.newestGame.game_type) {
-						case 'cards':
-							this.$util.redirectTo('/pages_promotion/game/cards', {
-								id: this.newestGame.game_id
-							});
-							break;
-						case 'egg':
-							this.$util.redirectTo('/pages_promotion/game/smash_eggs', {
-								id: this.newestGame.game_id
-							});
-							break;
-						case 'turntable':
-							this.$util.redirectTo('/pages_promotion/game/turntable', {
-								id: this.newestGame.game_id
-							});
-							break;
-					}
-				} else {
-					this.$util.showToast({
-						title: '暂无相关活动'
-					});
-				}
 			}
-		},
-		//分享给好友
-		onShareAppMessage() {
-			return this.mpShareData.appMessage;
-		},
-		//分享到朋友圈
-		onShareTimeline() {
-			return this.mpShareData.timeLine;
 		}
-	};
+	},
+	//分享给好友
+	onShareAppMessage() {
+		return this.mpShareData.appMessage;
+	},
+	//分享到朋友圈
+	onShareTimeline() {
+		return this.mpShareData.timeLine;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style>
-	.ns-adv>>>image {
-		width: 100%;
-		border-radius: 0;
-	}
+.ns-adv>>>image {
+	width: 100%;
+	border-radius: 0;
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index 66b6a83..7ed130c 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -84,9 +84,6 @@
 
 <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	
@@ -94,9 +91,6 @@
 	export default {
 		components: {
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
index 155cf6f..3813eab 100644
--- a/pages_promotion/point/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -278,24 +278,14 @@
 
 <script>
 	import payment from './public/js/payment.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.vue';
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+	// #endif	
 
 	export default {
 		components: {
-			uniPopup,
-			nsSelectTime,
-			nsLogin,
 			MescrollUni,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index bcbbb96..92dbe25 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -33,11 +33,7 @@
 </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	
@@ -49,11 +45,7 @@
 			};
 		},
 		components: {
-			nsAdv,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue
index 50303ad..6eb35d8 100644
--- a/pages_tool/cases/index.vue
+++ b/pages_tool/cases/index.vue
@@ -86,7 +86,6 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
   data() {
     return {
@@ -111,9 +110,6 @@ export default {
   onShareAppMessage() {
     // 分享功能
   },
-  components: {
-    uniPopup
-  },  
   methods: {
     init() {
       this.$api.sendRequest({
diff --git a/pages_tool/components/ns-adv/ns-adv.vue b/pages_tool/components/ns-adv/ns-adv.vue
deleted file mode 100644
index 978f3bd..0000000
--- a/pages_tool/components/ns-adv/ns-adv.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-	<view v-if="advList.length" :class="['container-box',className]">
-		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
-			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
-				<view class="image-box">
-					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
-				</view>
-			</swiper-item>
-		</swiper>
-		<view v-else class="container-box item-wrap">
-			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'ns-advert',
-		props: {
-			keyword: {
-				type: String
-			},
-			className: {
-				type: String
-			}
-		},
-		data() {
-			return {
-				advList: [],
-				isImage: false,
-				//滑块的高度(单位px)
-				swiperHeight: 150,
-				//当前索引
-				currentIndex: 0,
-			};
-		},
-		created() {
-			this.getAdvList();
-		},
-		methods: {
-			//获取广告位
-			getAdvList() {
-				var item = {
-					adv_image: '',
-					adv_url: ''
-				};
-				this.$api.sendRequest({
-					url: '/api/adv/detail',
-					data: {
-						keyword: this.keyword
-					},
-					success: res => {
-						if (res.code == 0) {
-							var data = res.data.adv_list;
-							for (var index in data) {
-								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
-							}
-							this.advList = res.data.adv_list;
-
-							//动态设置swiper的高度
-							this.$nextTick(() => {
-								this.setSwiperHeight();
-							});
-						}
-					}
-				});
-			},
-			jumppage(e) {
-				this.$util.diyRedirectTo(e);
-			},
-			imageLoad(data) {
-				this.isImage = true;
-			},
-			//手动切换题目
-			changeSwiper(e) {
-				this.currentIndex = e.detail.current;
-				//动态设置swiper的高度，使用nextTick延时设置
-				this.$nextTick(() => {
-					this.setSwiperHeight();
-				});
-			},
-			//动态设置swiper的高度
-			setSwiperHeight() {
-				if (this.advList.length > 1) {
-					setTimeout(() => {
-						let element = "#content-wrap" + this.currentIndex;
-						let query = uni.createSelectorQuery().in(this);
-						query.select(element).boundingClientRect();
-						query.exec((res) => {
-							if (res && res[0]) {
-								this.swiperHeight = res[0].height;
-							}
-						});
-					}, 10);
-				}
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container-box {
-		width: 100%;
-
-		.item-wrap {
-			border-radius: 10rpx;
-
-			.image-box {
-				border-radius: 10rpx;
-			}
-
-			image {
-				width: 100%;
-				height: auto;
-				border-radius: 10rpx;
-				will-change: transform;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages_tool/contact/contact.vue b/pages_tool/contact/contact.vue
index 47a76d5..2f7bbbc 100644
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue
@@ -143,13 +143,9 @@
 </template>
 
 <script>
-import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
 
 export default {
-	components: {
-		toTop
-	},
 	mixins: [scroll],
 	data() {
 		return {
diff --git a/pages_tool/files/list.vue b/pages_tool/files/list.vue
index 9c40ad4..9ec62f3 100644
--- a/pages_tool/files/list.vue
+++ b/pages_tool/files/list.vue
@@ -58,7 +58,17 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif  
   export default {
+    components: {
+      MescrollUni,
+      // #ifdef MP-WEIXIN
+      privacyPopup,
+      // #endif
+    },
     data() {
       return {
         category_id: '',
@@ -67,11 +77,6 @@
         keyword: ''
       }
     },
-    components: {
-      nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
-      nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-      loadingCover: () => import('@/components/loading-cover/loading-cover.vue')
-    },
     onLoad(options) {
       if (options.category_id > 0) {
         this.category_id = options.category_id
diff --git a/pages_tool/goods/brand.vue b/pages_tool/goods/brand.vue
index 1865f85..1545fef 100644
--- a/pages_tool/goods/brand.vue
+++ b/pages_tool/goods/brand.vue
@@ -24,25 +24,13 @@
 </template>
 
 <script>
-	import uniGrid from '@/components/uni-grid/uni-grid.vue';
-	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
-	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
 	export default {
 		components: {
-			uniGrid,
-			uniGridItem,
-			nsAdv,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index 2b332ba..f17bfde 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -71,18 +71,12 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
 	export default {
 		components: {
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif
diff --git a/pages_tool/goods/evaluate.vue b/pages_tool/goods/evaluate.vue
index 19ea5bc..dc88b50 100644
--- a/pages_tool/goods/evaluate.vue
+++ b/pages_tool/goods/evaluate.vue
@@ -75,21 +75,14 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif		
 
-import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
 export default {
 	components: {
-		xiaoStarComponent,
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_tool/index/diy.vue b/pages_tool/index/diy.vue
index fe93e58..0ecff06 100644
--- a/pages_tool/index/diy.vue
+++ b/pages_tool/index/diy.vue
@@ -56,16 +56,11 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+
 import diyJs from '@/common/js/diy.js';
 import microPageJs from './public/js/diy.js';
 
 export default {
-	components: {
-		uniPopup,
-		nsNavbar
-	},
 	mixins: [diyJs, microPageJs]
 };
 </script>
diff --git a/pages_tool/login/find.vue b/pages_tool/login/find.vue
index bf8281f..07d65a9 100644
--- a/pages_tool/login/find.vue
+++ b/pages_tool/login/find.vue
@@ -87,11 +87,7 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
-	components: {
-		mypOne
-	},
 	data() {
 		return {
 			findMode: 'mobile',
diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue
index 190452c..72e0bbe 100644
--- a/pages_tool/login/login.vue
+++ b/pages_tool/login/login.vue
@@ -66,7 +66,6 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import registerReward from '@/components/register-reward/register-reward.vue';
 
 export default {
 	data() {
@@ -103,9 +102,6 @@ export default {
 			authInfo: null
 		};
 	},
-	components: {
-		registerReward
-	},
 	onLoad(option) {
 		if (option.back) this.back = option.back;
 		this.getRegisterConfig();
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index 6fa4744..638fc76 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -3,7 +3,8 @@
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">
 				<view class="nc-info-list-content">
-					<view class="list-item balance-item" @click="setBalanceDefault()" v-if="type=='fenxiao' && payList && payList.balance">
+					<view class="list-item balance-item" @click="setBalanceDefault()"
+						v-if="type == 'fenxiao' && payList && payList.balance">
 						<view class="item-top">
 							<view class="item-left">
 								<view class="title-text">提现到余额</view>
@@ -32,9 +33,10 @@
 							</view>
 
 							<view class="item-bottom">
-								<view class="account-default" @click="setDefault(item.id,item.is_default)">
+								<view class="account-default" @click="setDefault(item.id, item.is_default)">
 									<text class="default">设为默认账户</text>
-									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)"
+										:color="themeStyle.main_color" />
 									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
 								</view>
 								<view class="account-btn">
@@ -46,10 +48,13 @@
 						</view>
 					</block>
 				</view>
-				<view v-if="dataList.length <= 0 && (type != 'fenxiao'  || (type == 'fenxiao' && payList && !payList.balance))" class="empty-box">
+				<view
+					v-if="dataList.length <= 0 && (type != 'fenxiao' || (type == 'fenxiao' && payList && !payList.balance))"
+					class="empty-box">
 					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
 					<view class="tips">暂无账户信息，请添加</view>
-					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount')
+						}}</button>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -62,404 +67,398 @@
 </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 MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
-	export default {
-		components: {
-			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
+export default {
+	components: {
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+		return {
+			dataList: [], //账号列表
+			back: '', // 返回页
+			redirect: 'redirectTo', // 跳转方式
+			type: 'member',
+			payList: null
+		};
+	},
+	onLoad(option) {
+		if (option.back) this.back = option.back;
+		if (option.type) this.type = option.type;
+		if (option.redirect) this.redirect = option.redirect;
+	},
+	onShow() {
+		if (this.storeToken) {
+			this.getTransferType();
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/account');
+			});
+		}
+	},
+	methods: {
+		// 编辑提现账户信息
+		editAccount(type, id) {
+			let data = {};
+			data.type = this.type;
+			if (type == 'edit') data.id = id;
+			if (this.back) data.back = this.back;
+			this.$util.redirectTo('/pages_tool/member/account_edit', data);
 		},
-		data() {
-			return {
-				dataList: [], //账号列表
-				back: '', // 返回页
-				redirect: 'redirectTo', // 跳转方式
-				type: 'member',
-				payList: null
-			};
-		},
-		onLoad(option) {
-			if (option.back) this.back = option.back;
-			if (option.type) this.type = option.type;
-			if (option.redirect) this.redirect = option.redirect;
-		},
-		onShow() {
-			if (this.storeToken) {
-				this.getTransferType();
-				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/account');
-				});
-			}
-		},
-		methods: {
-			// 编辑提现账户信息
-			editAccount(type, id) {
-				let data = {};
-				data.type = this.type;
-				if (type == 'edit') data.id = id;
-				if (this.back) data.back = this.back;
-				this.$util.redirectTo('/pages_tool/member/account_edit', data);
-			},
-			deleteAccount(id) {
-				uni.showModal({
-					title: '操作提示',
-					content: '确定要删除该账户吗？',
-					success: res => {
-						if (res.confirm) {
-							this.$api.sendRequest({
-								url: '/api/memberbankaccount/delete',
-								data: {
-									id: id
-								},
-								success: result => {
-									if (result.code == 0) {
-										this.$util.showToast({
-											title: '删除成功'
-										});
-										this.$refs.mescroll.refresh();
-									} else {
-										this.$util.showToast({
-											title: '删除失败'
-										});
-									}
+		deleteAccount(id) {
+			uni.showModal({
+				title: '操作提示',
+				content: '确定要删除该账户吗？',
+				success: res => {
+					if (res.confirm) {
+						this.$api.sendRequest({
+							url: '/api/memberbankaccount/delete',
+							data: {
+								id: id
+							},
+							success: result => {
+								if (result.code == 0) {
+									this.$util.showToast({
+										title: '删除成功'
+									});
+									this.$refs.mescroll.refresh();
+								} else {
+									this.$util.showToast({
+										title: '删除失败'
+									});
 								}
-							});
-						}
-					}
-				});
-			},
-			setDefault(id, is_default) {
-				if (is_default == 1) return;
-				this.$api.sendRequest({
-					url: '/api/memberbankaccount/setdefault',
-					data: {
-						id
-					},
-					success: res => {
-						if (res.data >= 0) {
-							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, this.redirect);
-							} else {
-								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
-								this.dataList = [];
-								this.$refs.mescroll.refresh();
 							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			setBalanceDefault() {
-				this.$util.redirectTo(this.back, {
-					'is_balance': 1
-				}, this.redirect);
-			},
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/memberbankaccount/page',
-					data: {
-						page_size: mescroll.size,
-						page: mescroll.num
-					},
-					success: res => {
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						mescroll.endSuccess(newArr.length);
-						//设置列表数据
-						if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
-						this.dataList = this.dataList.concat(newArr); //追加新数据
-
-						let withdrawType = {
-							bank: '银行',
-							alipay: '支付宝',
-							wechatpay: '微信'
-						};
-
-						this.dataList.forEach(item => {
-							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
-								item.withdraw_type] : '';
 						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-				});
-			},
-			getTransferType() {
-				let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
-				"/fenxiao/api/withdraw/transferType";
-				this.$api.sendRequest({
-					url: url,
-					success: res => {
-						if (res.code >= 0 && res.data) {
-							this.payList = res.data;
-						}
-					}
-				});
-			}
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
 				}
+			});
+		},
+		setDefault(id, is_default) {
+			if (is_default == 1) return;
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/setdefault',
+				data: {
+					id
+				},
+				success: res => {
+					if (res.data >= 0) {
+						if (this.back != '') {
+							this.$util.redirectTo(this.back, {}, this.redirect);
+						} else {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+							this.dataList = [];
+							this.$refs.mescroll.refresh();
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		setBalanceDefault() {
+			this.$util.redirectTo(this.back, {
+				'is_balance': 1
+			}, this.redirect);
+		},
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/memberbankaccount/page',
+				data: {
+					page_size: mescroll.size,
+					page: mescroll.num
+				},
+				success: res => {
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+
+					let withdrawType = {
+						bank: '银行',
+						alipay: '支付宝',
+						wechatpay: '微信'
+					};
+
+					this.dataList.forEach(item => {
+						item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
+							item.withdraw_type] : '';
+					});
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		getTransferType() {
+			let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
+				"/fenxiao/api/withdraw/transferType";
+			this.$api.sendRequest({
+				url: url,
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.payList = res.data;
+					}
+				}
+			});
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
 			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	.empty-box {
-		width: 100vw;
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+.empty-box {
+	width: 100vw;
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
 
-		image {
-			width: 50%;
-		}
-
-		.tips {
-			color: #999999;
-			font-size: 26rpx;
-		}
-
-		.get-account,
-		.add-account {
-			width: 50%;
-			height: 78rpx;
-			line-height: 78rpx;
-			border-radius: 78rpx;
-			margin-top: 50rpx;
-			font-weight: 600;
-		}
-
-		.get-account {
-			width: 50%;
-			background: #fff;
-			color: $base-color;
-			border: 2rpx solid $base-color;
-			margin-top: 20rpx;
-			box-sizing: border-box;
-		}
+	image {
+		width: 50%;
 	}
 
-	.mescroll-downwarp+.empty-box {
-		height: calc(100vh - 260rpx);
+	.tips {
+		color: #999999;
+		font-size: 26rpx;
 	}
 
+	.get-account,
+	.add-account {
+		width: 50%;
+		height: 78rpx;
+		line-height: 78rpx;
+		border-radius: 78rpx;
+		margin-top: 50rpx;
+		font-weight: 600;
+	}
 
-	.btn-add {
-		margin-top: 60rpx;
-		bottom: 0;
-		width: 100%;
+	.get-account {
+		width: 50%;
 		background: #fff;
-		position: fixed;
-		padding: 0 30rpx;
+		color: $base-color;
+		border: 2rpx solid $base-color;
+		margin-top: 20rpx;
 		box-sizing: border-box;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		z-index: 10;
+	}
+}
 
-		.add-account {
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: 80rpx;
-			margin: 30rpx 0 30rpx;
-			font-size: $font-size-toolbar;
+.mescroll-downwarp+.empty-box {
+	height: calc(100vh - 260rpx);
+}
 
-			text {
-				margin-right: 10rpx;
-				font-size: $font-size-base;
-			}
+
+.btn-add {
+	margin-top: 60rpx;
+	bottom: 0;
+	width: 100%;
+	background: #fff;
+	position: fixed;
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	z-index: 10;
+
+	.add-account {
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 80rpx;
+		margin: 30rpx 0 30rpx;
+		font-size: $font-size-toolbar;
+
+		text {
+			margin-right: 10rpx;
+			font-size: $font-size-base;
 		}
 	}
+}
 
-	.zw {
-		margin-top: 250rpx;
-	}
+.zw {
+	margin-top: 250rpx;
+}
 
-	.list-item {
-		margin: 0 0;
-		padding: 24rpx $margin-both;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		margin-bottom: 18rpx;
-		border-radius: 10rpx;
-		overflow: hidden;
-		position: relative;
-
-		&.balance-item {
-			.item-top {
-				border: none;
-				padding: 0;
-			}
-		}
-
-		&:first-child {
-			margin-top: 18rpx;
-		}
-
-		.item-mr {
-			font-size: $font-size-activity-tag;
-			color: #fff;
-			height: 150rpx;
-			width: 150rpx;
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			position: absolute;
-			right: -90rpx;
-			top: -90rpx;
-			transform: rotate(45deg);
-		}
+.list-item {
+	margin: 0 0;
+	padding: 24rpx $margin-both;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+	background-color: #fff;
+	margin-bottom: 18rpx;
+	border-radius: 10rpx;
+	overflow: hidden;
+	position: relative;
 
+	&.balance-item {
 		.item-top {
-			border-bottom: 2rpx solid $color-line;
-			padding-bottom: 26rpx;
+			border: none;
+			padding: 0;
+		}
+	}
+
+	&:first-child {
+		margin-top: 18rpx;
+	}
+
+	.item-mr {
+		font-size: $font-size-activity-tag;
+		color: #fff;
+		height: 150rpx;
+		width: 150rpx;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+		position: absolute;
+		right: -90rpx;
+		top: -90rpx;
+		transform: rotate(45deg);
+	}
+
+	.item-top {
+		border-bottom: 2rpx solid $color-line;
+		padding-bottom: 26rpx;
+		display: flex;
+		flex-direction: row;
+
+		.item-left {
 			display: flex;
-			flex-direction: row;
+			flex-direction: column;
+			width: calc(100% - 100rpx);
 
-			.item-left {
+			.title-text {
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+
+			.info-content {
 				display: flex;
-				flex-direction: column;
-				width: calc(100% - 100rpx);
 
-				.title-text {
-					font-size: 30rpx;
-					font-weight: bold;
-				}
-
-				.info-content {
-					display: flex;
-
-					.top-title {
-						font-size: 26rpx;
-						margin-right: 15rpx;
-					}
-
-					.top-num {
-						font-size: 26rpx;
-					}
-				}
-
-				.content-bottom {
+				.top-title {
+					font-size: 26rpx;
+					margin-right: 15rpx;
+				}
+
+				.top-num {
 					font-size: 26rpx;
-					height: 50rpx;
 				}
 			}
 
-			.item-btn {
-				width: 100rpx;
-				display: flex;
-				align-items: center;
-				color: #999;
-				font-size: 24rpx;
-				justify-content: flex-end;
+			.content-bottom {
+				font-size: 26rpx;
+				height: 50rpx;
 			}
-
 		}
 
-		.item-bottom {
+		.item-btn {
+			width: 100rpx;
 			display: flex;
-			justify-content: space-between;
-			padding-top: 24rpx;
+			align-items: center;
+			color: #999;
+			font-size: 24rpx;
+			justify-content: flex-end;
+		}
 
-			.account-default {
-				display: flex;
-				align-items: center;
-				font-size: 24rpx;
+	}
+
+	.item-bottom {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 24rpx;
+
+		.account-default {
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			line-height: 1;
+			color: #666666;
+
+			.default {}
+
+			.iconfont {
 				line-height: 1;
-				color: #666666;
+			}
+		}
 
-				.default {}
+		.account-btn {
+			font-size: $font-size-base;
+			line-height: 1;
+			display: flex;
+			align-items: center;
 
-				.iconfont {
-					line-height: 1;
+			.edit {
+				text {
+					vertical-align: center;
+					margin-right: 10rpx;
+					font-size: 30rpx;
 				}
 			}
 
-			.account-btn {
-				font-size: $font-size-base;
-				line-height: 1;
-				display: flex;
+			.delete {
+				background: #F1F1F1;
+				justify-content: center;
 				align-items: center;
+				border-radius: 50%;
+				padding: 10rpx;
+				text-align: center;
+				width: 48rpx;
+				height: 48rpx;
+				box-sizing: border-box;
 
-				.edit {
-					text {
-						vertical-align: center;
-						margin-right: 10rpx;
-						font-size: 30rpx;
-					}
-				}
-
-				.delete {
-					background: #F1F1F1;
-					justify-content: center;
-					align-items: center;
-					border-radius: 50%;
-					padding: 10rpx;
-					text-align: center;
-					width: 48rpx;
-					height: 48rpx;
-					box-sizing: border-box;
-
-					text {
-						font-size: 26rpx;
-					}
+				text {
+					font-size: 26rpx;
 				}
 			}
 		}
 	}
+}
 </style>
 <style lang="scss">
-	/deep/ .mescroll-upwarp {
-		padding-bottom: 150rpx;
-	}
+/deep/ .mescroll-upwarp {
+	padding-bottom: 150rpx;
+}
 </style>
 <style>
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
-		height: 48rpx !important;
-		width: 88rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
+	height: 48rpx !important;
+	width: 88rpx !important;
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
-		height: 44rpx !important;
-		width: 44rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
+	height: 44rpx !important;
+	width: 44rpx !important;
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
-		background-color: #EDEDED !important;
-		height: 44rpx !important;
-		width: 90rpx !important;
-	}
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
+	background-color: #EDEDED !important;
+	height: 44rpx !important;
+	width: 90rpx !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index 055f213..82ff235 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -101,10 +101,6 @@ import {
 	Weixin
 } from 'common/js/wx-jssdk.js';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
@@ -112,9 +108,6 @@ import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 export default {
 	components: {
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_tool/member/address_edit.vue b/pages_tool/member/address_edit.vue
index d028016..cd0fa86 100644
--- a/pages_tool/member/address_edit.vue
+++ b/pages_tool/member/address_edit.vue
@@ -79,14 +79,10 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     import validate from 'common/js/validate.js';
     import Config from '@/common/js/config.js';
 
     export default {
-        components: {
-            pickRegions
-        },
         data() {
             return {
                 formData: {
diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue
index 1976189..356e063 100644
--- a/pages_tool/member/balance.vue
+++ b/pages_tool/member/balance.vue
@@ -72,11 +72,8 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
-	components: { nsLogin, loadingCover },
 	data() {
 		return {
 			balanceInfo: {
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index e0baf95..02c5914 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -50,18 +50,13 @@
 </template>
 
 <script>
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
index 2d5d236..0096af2 100644
--- a/pages_tool/member/card.vue
+++ b/pages_tool/member/card.vue
@@ -5,8 +5,9 @@
 		</view>
 		<view class="banner-container">
 			<view class="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
-				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"/>
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+					mode="aspectFill" />
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill" />
 				<view class="member-desc">
 					<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
 					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
@@ -22,15 +23,18 @@
 						<view class="level-detail">{{ levelInfo.level_name }}</view>
 						<view class="growr-name">{{ levelInfo.level_name }}可享受消费折扣和</view>
 						<view class="growr-value">会员大礼包等权益</view>
-						<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelInfo.remark != ''">
+						<view class="growth-rules font-size-tag" @click="openExplainPopup"
+							v-if="levelInfo.remark != ''">
 							<text class="iconfont icon-wenhao font-size-tag"></text>
 						</view>
-						<button type="default" class="renew-btn" @click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
+						<button type="default" class="renew-btn"
+							@click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
 					</view>
 				</view>
 			</view>
 
-			<view class="card-content" v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
+			<view class="card-content"
+				v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
 				<view class="card-content-head">
 					<view class="line-box">
 						<view class="line right"></view>
@@ -118,113 +122,106 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+
 import scroll from '@/common/js/scroll-view.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
 
-	export default {
-		components: {
-			uniPopup,
-			nsGoodsRecommend,
-			nsLogin
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				isSub: false, // 是否已提交
-				isIphoneX: false,
-				levelId: 0,
-				levelInfo: {
-					bg_color: '#333'
-				}
-			};
-		},
-		onLoad() {
-			//会员卡
-			if (!this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/card');
-				});
-				return;
+export default {
+	mixins: [scroll],
+	data() {
+		return {
+			isSub: false, // 是否已提交
+			isIphoneX: false,
+			levelId: 0,
+			levelInfo: {
+				bg_color: '#333'
 			}
-
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-			this.levelId = this.memberInfo.member_level;
-
-			let levelInfo = this.memberInfo.member_level_info;
-			let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
-			levelInfo.charge_rule_arr = [];
-			Object.keys(charge_rule).forEach(key => {
-				levelInfo.charge_rule_arr.push({
-					key: key,
-					value: charge_rule[key]
-				});
+		};
+	},
+	onLoad() {
+		//会员卡
+		if (!this.storeToken) {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/card');
 			});
-			this.levelInfo = levelInfo;
-		},
-		onShow() {},
-		methods: {
-			headimgError() {
-				this.memberInfo.headimg = this.$util.getDefaultImage().head;
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			openExplainPopup() {
-				this.$refs.explainPopup.open();
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			closeExplainPopup() {
-				this.$refs.explainPopup.close();
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index');
-			return true;
+			return;
 		}
-	};
+
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		this.levelId = this.memberInfo.member_level;
+
+		let levelInfo = this.memberInfo.member_level_info;
+		let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
+		levelInfo.charge_rule_arr = [];
+		Object.keys(charge_rule).forEach(key => {
+			levelInfo.charge_rule_arr.push({
+				key: key,
+				value: charge_rule[key]
+			});
+		});
+		this.levelInfo = levelInfo;
+	},
+	onShow() { },
+	methods: {
+		headimgError() {
+			this.memberInfo.headimg = this.$util.getDefaultImage().head;
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		openExplainPopup() {
+			this.$refs.explainPopup.open();
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		closeExplainPopup() {
+			this.$refs.explainPopup.close();
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 
-	.banner-container .image-container .slide-image {
-		width: calc(100% - 60rpx);
-		height: 360rpx;
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
-	}
+.banner-container .image-container .slide-image {
+	width: calc(100% - 60rpx);
+	height: 360rpx;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+}
 
-	.banner-container .image-container image {
-		background-color: #e3b66b;
-	}
+.banner-container .image-container image {
+	background-color: #e3b66b;
+}
 
-	.banner-container .slide-image .renew-btn {
-		text-align: center;
-		line-height: 56rpx;
-		height: 56rpx;
-		border-radius: $border-radius;
-		width: 160rpx;
-		font-size: $font-size-tag;
-		color: #e3b66b !important;
-		background: #fff;
-		position: absolute;
-		right: 10rpx;
-		bottom: 40rpx;
-		border: none;
-		z-index: 10;
-	}
+.banner-container .slide-image .renew-btn {
+	text-align: center;
+	line-height: 56rpx;
+	height: 56rpx;
+	border-radius: $border-radius;
+	width: 160rpx;
+	font-size: $font-size-tag;
+	color: #e3b66b !important;
+	background: #fff;
+	position: absolute;
+	right: 10rpx;
+	bottom: 40rpx;
+	border: none;
+	z-index: 10;
+}
 </style>
 
 <style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue
index 9597f20..d188504 100644
--- a/pages_tool/member/card_buy.vue
+++ b/pages_tool/member/card_buy.vue
@@ -6,7 +6,8 @@
 			</view>
 			<view class="banner-container">
 				<view class="memberInfo">
-					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+						mode="aspectFill" />
 					<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 					<view class="member-desc">
 						<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
@@ -22,26 +23,27 @@
 					:circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
 					:next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish"
 					:current="curIndex">
-					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
+					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''"
+						v-for="(item, i) in levelList" :key="i">
 						<view class="image-container" :class="[
-								curIndex === 0
-									? i === listLen - 1
-										? 'item-left'
-										: i === 1
+							curIndex === 0
+								? i === listLen - 1
+									? 'item-left'
+									: i === 1
 										? 'item-right'
 										: 'item-center'
-									: curIndex === listLen - 1
+								: curIndex === listLen - 1
 									? i === 0
 										? 'item-right'
 										: i === listLen - 2
-										? 'item-left'
-										: 'item-center'
+											? 'item-left'
+											: 'item-center'
 									: i === curIndex - 1
-									? 'item-left'
-									: i === curIndex + 1
-									? 'item-right'
-									: 'item-center'
-							]">
+										? 'item-left'
+										: i === curIndex + 1
+											? 'item-right'
+											: 'item-center'
+						]">
 							<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat"
 								:style="{
 									transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
@@ -50,14 +52,19 @@
 								}">
 								<view class="bg-border"></view>
 
-								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-								<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']"
+									:src="$util.img(levelList[curIndex]['level_picture'])" />
+								<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
 
 								<view class="info">
-									<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}</view>
-									<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}可享受消费折扣和</view>
-									<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">会员大礼包等权益</view>
-									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelList[curIndex].remark != ''">
+									<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										{{ levelList[curIndex].level_name }}</view>
+									<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
+										levelList[curIndex].level_name }}可享受消费折扣和</view>
+									<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										会员大礼包等权益</view>
+									<view class="growth-rules font-size-tag" @click="openExplainPopup"
+										v-if="levelList[curIndex].remark != ''">
 										<text class="iconfont icon-wenhao font-size-tag"></text>
 									</view>
 								</view>
@@ -78,8 +85,10 @@
 						<view class="clear"></view>
 					</view>
 					<view class="card-time-list">
-						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }" v-for="(item, index) in currCard.charge_rule_arr" :key="index">
-							<view class="card-time-item" :class="{ active: choiceIndex == index }" @click="choice(index)">
+						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }"
+							v-for="(item, index) in currCard.charge_rule_arr" :key="index">
+							<view class="card-time-item" :class="{ active: choiceIndex == index }"
+								@click="choice(index)">
 								<image :src="$util.img('public/uniapp/level/card-icon.png')" mode="widthFix"></image>
 								<view class="time-name">{{ cardType[item.key].name }}</view>
 								<view class="time-price">
@@ -172,7 +181,8 @@
 						</view>
 						<view class="agreement" v-if="agreement">
 							购买既视为同意
-							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title }}》</text>
+							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title
+								}}》</text>
 						</view>
 					</view>
 				</block>
@@ -198,7 +208,8 @@
 				</uni-popup>
 			</view>
 
-			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value" @confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
+			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value"
+				@confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
 		</block>
 		<block v-else><ns-empty text="暂无可开会员卡" :isIndex="false"></ns-empty></block>
 
@@ -209,221 +220,210 @@
 </template>
 
 <script>
-	import scroll from '@/common/js/scroll-view.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsPayment from '@/components/ns-payment/ns-payment.vue';
+import scroll from '@/common/js/scroll-view.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsEmpty,
-			nsLogin,
-			loadingCover,
-			nsPayment
-		},
-		mixins: [scroll],
-		data() {
-			return {
-				isSub: false, // 是否已提交
-				isIphoneX: false,
-				couponPopList: [],
-				curIndex: 0,
-				isDescAnimating: false,
-				scaleX: (634 / 540).toFixed(4),
-				scaleY: (378 / 330).toFixed(4),
-				swiperConfig: {
-					indicatorDots: false,
-					indicatorColor: 'rgba(255, 255, 255, .4)',
-					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-					interval: 3000,
-					duration: 300,
-					circular: false,
-					previousMargin: '58rpx',
-					nextMargin: '58rpx'
+
+export default {
+	mixins: [scroll],
+	data() {
+		return {
+			isSub: false, // 是否已提交
+			isIphoneX: false,
+			couponPopList: [],
+			curIndex: 0,
+			isDescAnimating: false,
+			scaleX: (634 / 540).toFixed(4),
+			scaleY: (378 / 330).toFixed(4),
+			swiperConfig: {
+				indicatorDots: false,
+				indicatorColor: 'rgba(255, 255, 255, .4)',
+				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+				interval: 3000,
+				duration: 300,
+				circular: false,
+				previousMargin: '58rpx',
+				nextMargin: '58rpx'
+			},
+			levelList: [],
+			levelId: 0,
+			cardType: {
+				week: {
+					name: '周卡',
+					unit: '周'
 				},
-				levelList: [],
-				levelId: 0,
-				cardType: {
-					week: {
-						name: '周卡',
-						unit: '周'
-					},
-					month: {
-						name: '月卡',
-						unit: '月'
-					},
-					quarter: {
-						name: '季卡',
-						unit: '季'
-					},
-					year: {
-						name: '年卡',
-						unit: '年'
-					}
+				month: {
+					name: '月卡',
+					unit: '月'
 				},
-				choiceIndex: 0,
-				outTradeNo: '',
-				agreement: null
-			};
-		},
-		computed: {
-			listLen() {
-				return this.levelList.length;
+				quarter: {
+					name: '季卡',
+					unit: '季'
+				},
+				year: {
+					name: '年卡',
+					unit: '年'
+				}
 			},
-			currCard() {
-				if (this.levelList[this.curIndex]) {
-					let card = this.levelList[this.curIndex];
-					let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
-					card.charge_rule_arr = [];
-					Object.keys(charge_rule).forEach(key => {
-						card.charge_rule_arr.push({
-							key: key,
-							value: charge_rule[key]
-						});
+			choiceIndex: 0,
+			outTradeNo: '',
+			agreement: null
+		};
+	},
+	computed: {
+		listLen() {
+			return this.levelList.length;
+		},
+		currCard() {
+			if (this.levelList[this.curIndex]) {
+				let card = this.levelList[this.curIndex];
+				let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
+				card.charge_rule_arr = [];
+				Object.keys(charge_rule).forEach(key => {
+					card.charge_rule_arr.push({
+						key: key,
+						value: charge_rule[key]
 					});
-					return card;
-				}
-			}
-		},
-		onLoad() {
-			//会员卡
-			this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-			if (this.storeToken) {
-				this.getCardList();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/card_buy');
 				});
+				return card;
 			}
-			this.getAgreement();
-		},
-		onShow() {},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.getCardList();
-				}
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				this.curIndex = e.detail.current;
-				this.choiceIndex = 0;
-				this.isDescAnimating = true;
-			},
-			animationfinish(e) {
-				this.isDescAnimating = false;
-			},
-			getCardList() {
-				this.$api.sendRequest({
-					url: '/supermember/api/membercard/lists',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.levelList = res.data;
-							this.levelId = this.memberInfo.member_level;
-							for (let i = 0; i < this.levelList.length; i++) {
-								if (this.levelList[i].level_id == this.levelId) {
-									this.curIndex = i;
-									break;
-								}
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-			choice(index) {
-				this.choiceIndex = index;
-			},
-			/**
-			 * 创建
-			 */
-			create() {
-				if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
-					uni.showModal({
-						title: '提示',
-						content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
-						success: res => {
-							if (res.confirm) {
-								this.$refs.choosePaymentPopup.open();
-							}
-						}
-					});
-				} else {
-					this.$refs.choosePaymentPopup.open();
-				}
-			},
-			/**
-			 * 提交
-			 */
-			toPay() {
-				if (this.isSub) return;
-				this.isSub = true;
-
-				this.$api.sendRequest({
-					url: '/supermember/api/ordercreate/create',
-					data: {
-						level_id: this.currCard.level_id,
-						period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
-					},
-					success: res => {
-						if (res.data && res.code == 0) {
-							this.outTradeNo = res.data.out_trade_no;
-							uni.setStorageSync('paySource', 'membercard');
-							this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-						} else {
-							this.isSub = false;
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			headimgError() {
-				this.memberInfo.headimg = this.$util.getDefaultImage().head;
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			openExplainPopup() {
-				this.$refs.explainPopup.open();
-			},
-			/**
-			 * 打开说明弹出层
-			 */
-			closeExplainPopup() {
-				this.$refs.explainPopup.close();
-			},
-			getAgreement() {
-				this.$api.sendRequest({
-					url: '/supermember/api/membercard/agreement',
-					success: res => {
-						if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
-							this.agreement = res.data;
-						}
-					}
-				});
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index');
-			return true;
 		}
-	};
+	},
+	onLoad() {
+		//会员卡
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+		if (this.storeToken) {
+			this.getCardList();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/card_buy');
+			});
+		}
+		this.getAgreement();
+	},
+	onShow() { },
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.getCardList();
+			}
+		}
+	},
+	methods: {
+		swiperChange(e) {
+			this.curIndex = e.detail.current;
+			this.choiceIndex = 0;
+			this.isDescAnimating = true;
+		},
+		animationfinish(e) {
+			this.isDescAnimating = false;
+		},
+		getCardList() {
+			this.$api.sendRequest({
+				url: '/supermember/api/membercard/lists',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.levelList = res.data;
+						this.levelId = this.memberInfo.member_level;
+						for (let i = 0; i < this.levelList.length; i++) {
+							if (this.levelList[i].level_id == this.levelId) {
+								this.curIndex = i;
+								break;
+							}
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		choice(index) {
+			this.choiceIndex = index;
+		},
+		/**
+		 * 创建
+		 */
+		create() {
+			if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
+				uni.showModal({
+					title: '提示',
+					content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.choosePaymentPopup.open();
+						}
+					}
+				});
+			} else {
+				this.$refs.choosePaymentPopup.open();
+			}
+		},
+		/**
+		 * 提交
+		 */
+		toPay() {
+			if (this.isSub) return;
+			this.isSub = true;
+
+			this.$api.sendRequest({
+				url: '/supermember/api/ordercreate/create',
+				data: {
+					level_id: this.currCard.level_id,
+					period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
+				},
+				success: res => {
+					if (res.data && res.code == 0) {
+						this.outTradeNo = res.data.out_trade_no;
+						uni.setStorageSync('paySource', 'membercard');
+						this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+					} else {
+						this.isSub = false;
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		headimgError() {
+			this.memberInfo.headimg = this.$util.getDefaultImage().head;
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		openExplainPopup() {
+			this.$refs.explainPopup.open();
+		},
+		/**
+		 * 打开说明弹出层
+		 */
+		closeExplainPopup() {
+			this.$refs.explainPopup.close();
+		},
+		getAgreement() {
+			this.$api.sendRequest({
+				url: '/supermember/api/membercard/agreement',
+				success: res => {
+					if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
+						this.agreement = res.data;
+					}
+				}
+			});
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index 5153e8b..66a83a5 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -35,10 +35,7 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
@@ -47,10 +44,6 @@ import collection from './public/js/collection.js';
 
 export default {
 	components: {
-		nsGoodsRecommend,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
index 660888b..62e801e 100644
--- a/pages_tool/member/coupon.vue
+++ b/pages_tool/member/coupon.vue
@@ -70,18 +70,12 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
index 4cf5824..aa48c1e 100644
--- a/pages_tool/member/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -64,9 +64,7 @@
 
 <script>
 var dateList = [];
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
@@ -74,9 +72,6 @@ import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/index.vue b/pages_tool/member/index.vue
index 1cabd7f..2d7d846 100644
--- a/pages_tool/member/index.vue
+++ b/pages_tool/member/index.vue
@@ -74,16 +74,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
 import indexJs from './public/js/index.js';
 
 export default {
-	components: {
-		uniPopup,
-		nsNavbar
-	},
 	mixins: [diyJs, indexJs],
 	methods: {
 
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
index 844b6ae..213b7a4 100644
--- a/pages_tool/member/info.vue
+++ b/pages_tool/member/info.vue
@@ -107,13 +107,9 @@
 </template>
 
 <script>
-	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
 	import info from './public/js/info.js';
 
 	export default {
-		components: {
-			uniNavBar
-		},
 		data() {
 			return {
 				version: ''
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index 6a64810..0d4a2c7 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -157,16 +157,10 @@
 </template>
 
 <script>
-	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
-	import pickRegions from '@/components/pick-regions/pick-regions.vue';
 	import info from './public/js/info.js';
 	import auth from '@/common/js/auth.js';
 
 	export default {
-		components: {
-			uniNavBar,
-			pickRegions
-		},
 		data() {
 			return {};
 		},
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 8321783..8297dcb 100644
--- a/pages_tool/member/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -232,15 +232,7 @@
 
 <script>
 	import inviteFriends from './public/js/invite_friends.js';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
 	export default {
-		components: {
-			nsEmpty,
-			nsLogin,
-			loadingCover
-		},
 		data() {
 			return {
 				inviteList: [],
diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue
index c7e6d1d..e4b7504 100644
--- a/pages_tool/member/level.vue
+++ b/pages_tool/member/level.vue
@@ -168,19 +168,9 @@
 </template>
 
 <script>
-	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
-	import toTop from '@/components/toTop/toTop.vue';
 	import scroll from '@/common/js/scroll-view.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
 
 	export default {
-		components: {
-			nsProgress,
-			toTop,
-			uniPopup
-		},
 		mixins: [scroll],
 		data() {
 			return {
diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue
index 69a684e..d1544e2 100644
--- a/pages_tool/member/level_growth_rules.vue
+++ b/pages_tool/member/level_growth_rules.vue
@@ -43,15 +43,10 @@
 </template>
 
 <script>
-	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
-	import toTop from '@/components/toTop/toTop.vue';
+
 	import scroll from '@/common/js/scroll-view.js';
 
 	export default {
-		components: {
-			nsProgress,
-			toTop
-		},
 		mixins: [scroll],
 		data() {
 			return {
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
index 593b9e1..7f70626 100644
--- a/pages_tool/member/modify_face.vue
+++ b/pages_tool/member/modify_face.vue
@@ -28,7 +28,6 @@
 </template>
 
 <script>
-	import imgCropping from '@/pages_tool/components/img-cropping/cropping.vue';
 
 	export default {
 		data() {
@@ -38,9 +37,6 @@
 				imgurl: ''
 			};
 		},
-		components: {
-			imgCropping
-		},
 		onShow() {
 			if (!this.storeToken) {
 				this.$util.redirectTo(
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
index 67e2774..e3117ad 100644
--- a/pages_tool/member/pay_password.vue
+++ b/pages_tool/member/pay_password.vue
@@ -16,11 +16,7 @@
 </template>
 
 <script>
-	import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 	export default {
-		components: {
-			mypOne
-		},
 		data() {
 			return {
 				isClick: false,
diff --git a/pages_tool/member/point.vue b/pages_tool/member/point.vue
index 3c4ae9d..b8f8d38 100644
--- a/pages_tool/member/point.vue
+++ b/pages_tool/member/point.vue
@@ -75,14 +75,8 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
-	components: {
-		nsLogin,
-		loadingCover
-	},
 	data() {
 		return {
 			pointInfo: {
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index b55dd8c..1502f99 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -45,18 +45,12 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index 0efa35e..6209ba1 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -30,18 +30,12 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup
diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue
index aff6e64..1f2285f 100644
--- a/pages_tool/member/withdrawal_detail.vue
+++ b/pages_tool/member/withdrawal_detail.vue
@@ -53,12 +53,8 @@
 </template>
 
 <script>
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
-	components: {
-		loadingCover
-	},
 	data() {
 		return {
 			id: 0,
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 9d9c465..a9a8ad1 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -29,17 +29,12 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif	
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
index 305ed6e..2c4c92e 100644
--- a/pages_tool/order/activist.vue
+++ b/pages_tool/order/activist.vue
@@ -57,16 +57,11 @@
 <script>
 import refundMethod from './public/js/refundMethod.js';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 
 export default {
 	components: {
-		MescrollUni,
-		nsEmpty,
-		nsLogin,
-		loadingCover
+		MescrollUni
 	},
 	data() {
 		return {
diff --git a/pages_tool/order/evaluate.vue b/pages_tool/order/evaluate.vue
index 1f01bdc..a4be862 100644
--- a/pages_tool/order/evaluate.vue
+++ b/pages_tool/order/evaluate.vue
@@ -71,12 +71,8 @@
 </template>
 
 <script>
-	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
 	import evaluate from './public/js/evaluate.js';
 	export default {
-		components: {
-			sxRate
-		},
 		mixins: [evaluate],
 	};
 </script>
diff --git a/pages_tool/order/refund.vue b/pages_tool/order/refund.vue
index 8d57d4e..7f7e6cb 100644
--- a/pages_tool/order/refund.vue
+++ b/pages_tool/order/refund.vue
@@ -104,11 +104,7 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			order_goods_id: '',
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index deaa3c3..f5812a3 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -94,11 +94,7 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			order_goods_id: '',
diff --git a/pages_tool/order/refund_detail.vue b/pages_tool/order/refund_detail.vue
index b3a7a07..b5793a5 100644
--- a/pages_tool/order/refund_detail.vue
+++ b/pages_tool/order/refund_detail.vue
@@ -148,7 +148,6 @@
 <script>
 import refundMethod from './public/js/refundMethod.js';
 import validate from 'common/js/validate.js';
-import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	data() {
 		return {
@@ -166,9 +165,6 @@ export default {
 			isSub: false
 		};
 	},
-	components: {
-		nsContact
-	},
 	mixins: [refundMethod],
 	onLoad(option) {
 		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 8ca80fd..b4ae5d9 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -25,11 +25,7 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	export default {
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				order_id: '',
diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue
index 72cfdd1..0846451 100644
--- a/pages_tool/pay/cashier.vue
+++ b/pages_tool/pay/cashier.vue
@@ -31,11 +31,9 @@
 
 <script>
 import { Weixin } from 'common/js/wx-jssdk.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 
 export default {
-	components: { nsLogin, nsEmpty },
 	data() {
 		return {
 			payIndex: 0,
diff --git a/pages_tool/recharge/list.vue b/pages_tool/recharge/list.vue
index 1f4eeaa..385c3db 100644
--- a/pages_tool/recharge/list.vue
+++ b/pages_tool/recharge/list.vue
@@ -103,10 +103,8 @@
 </template>
 
 <script>
-import nsPayment from '@/components/ns-payment/ns-payment.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 	export default {
-	components: { nsPayment, loadingCover },
 		data() {
 			return {
 				list: [],
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
index 8b7870e..092d5af 100644
--- a/pages_tool/recharge/order_list.vue
+++ b/pages_tool/recharge/order_list.vue
@@ -40,16 +40,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 
 export default {
-    components: { 
-		nsLogin, 
-		loadingCover, 
-		nsEmpty, 
+    components: {
 		MescrollUni 
 	},
 	data() {
diff --git a/pages_tool/seal/medium/search.vue b/pages_tool/seal/medium/search.vue
index b84606f..cbc1dda 100644
--- a/pages_tool/seal/medium/search.vue
+++ b/pages_tool/seal/medium/search.vue
@@ -33,12 +33,7 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty';
-
 export default {
-  components: {
-    nsEmpty
-  },
   data() {
     return {
       inputValue: "",
diff --git a/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
similarity index 100%
rename from components/uni-badge/uni-badge.vue
rename to uni_modules/uni-badge/components/uni-badge/uni-badge.vue
diff --git a/uni_modules/uni-badge/uni-badge.vue b/uni_modules/uni-badge/uni-badge.vue
new file mode 100644
index 0000000..b0a7521
--- /dev/null
+++ b/uni_modules/uni-badge/uni-badge.vue
@@ -0,0 +1,105 @@
+<template>
+	<text
+		v-if="text"
+		:class="inverted ? 'uni-badge-' + type + ' uni-badge--' + size + ' uni-badge-inverted' : 'uni-badge-' + type + ' uni-badge--' + size"
+		class="uni-badge"
+		@click="onClick()"
+	>
+		{{ text }}
+	</text>
+</template>
+
+<script>
+export default {
+	name: 'UniBadge',
+	props: {
+		type: {
+			type: String,
+			default: 'default'
+		},
+		inverted: {
+			type: Boolean,
+			default: false
+		},
+		text: {
+			type: String,
+			default: ''
+		},
+		size: {
+			// small.normal
+			type: String,
+			default: 'normal'
+		}
+	},
+	methods: {
+		onClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style>
+.uni-badge {
+	font-family: 'Helvetica Neue', Helvetica, sans-serif;
+	box-sizing: border-box;
+	font-size: 24rpx;
+	line-height: 1;
+	display: inline-block;
+	padding: 6rpx 12rpx;
+	color: #333;
+	border-radius: 200rpx;
+	background-color: #e5e5e5;
+}
+
+.uni-badge.uni-badge-inverted {
+	padding: 0 10rpx 0 0;
+	color: #999;
+	background-color: transparent;
+}
+
+.uni-badge-primary {
+	color: #fff;
+	background-color: #007aff;
+}
+
+.uni-badge-primary.uni-badge-inverted {
+	color: #007aff;
+	background-color: transparent;
+}
+
+.uni-badge-success {
+	color: #fff;
+	background-color: #4cd964;
+}
+
+.uni-badge-success.uni-badge-inverted {
+	color: #4cd964;
+	background-color: transparent;
+}
+
+.uni-badge-warning {
+	color: #fff;
+	background-color: #f0ad4e;
+}
+
+.uni-badge-warning.uni-badge-inverted {
+	color: #f0ad4e;
+	background-color: transparent;
+}
+
+.uni-badge-error {
+	color: #fff;
+	background-color: #dd524d;
+}
+
+.uni-badge-error.uni-badge-inverted {
+	color: #dd524d;
+	background-color: transparent;
+}
+
+.uni-badge--small {
+	transform: scale(0.8);
+	transform-origin: center center;
+}
+</style>
diff --git a/pages_tool/components/uni-calendar/calendar.js b/uni_modules/uni-calendar/components/uni-calendar/calendar.js
similarity index 100%
rename from pages_tool/components/uni-calendar/calendar.js
rename to uni_modules/uni-calendar/components/uni-calendar/calendar.js
diff --git a/pages_tool/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
similarity index 100%
rename from pages_tool/components/uni-calendar/uni-calendar-item.vue
rename to uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
diff --git a/pages_tool/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
similarity index 100%
rename from pages_tool/components/uni-calendar/uni-calendar.vue
rename to uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
diff --git a/pages_tool/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
similarity index 100%
rename from pages_tool/components/uni-calendar/util.js
rename to uni_modules/uni-calendar/components/uni-calendar/util.js
diff --git a/components/uni-count-down/uni-count-down.vue b/uni_modules/uni-count-down/components/uni-count-down/uni-count-down.vue
similarity index 95%
rename from components/uni-count-down/uni-count-down.vue
rename to uni_modules/uni-count-down/components/uni-count-down/uni-count-down.vue
index 2bdf21d..333817c 100644
--- a/components/uni-count-down/uni-count-down.vue
+++ b/uni_modules/uni-count-down/components/uni-count-down/uni-count-down.vue
@@ -1,252 +1,252 @@
-<template>
-	<view class="uni-countdown">
-		<view
-			v-if="showDay && d > 0"
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
-			{{ d }}
-		</view>
-		<view v-if="showDay && d > 0" :style="{ color: splitorColor }" class="uni-countdown__splitor day" :class="splitorColorClass">{{ showColon ? '天' : '天' }}</view>
-		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
-			{{ h }}
-		</view>
-		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '时' }}</view>
-		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
-			{{ i }}
-		</view>
-		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '分' }}</view>
-		<view
-			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
-			class="uni-countdown__number "
-			:class="[backgroundColorClass, colorClass, borderColorClass]"
-		>
-			{{ s }}
-		</view>
-		<view v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">秒</view>
-	</view>
-</template>
-<script>
-export default {
-	name: 'UniCountDown',
-	props: {
-		showDay: {
-			type: Boolean,
-			default: true
-		},
-		showColon: {
-			type: Boolean,
-			default: true
-		},
-		backgroundColor: {
-			type: String,
-			default: '#FFFFFF'
-		},
-		backgroundColorClass: {
-			type: String,
-			default: ''
-		},
-		borderColor: {
-			type: String,
-			default: '#000000'
-		},
-		borderColorClass: {
-			type: String,
-			default: ''
-		},
-		color: {
-			type: String,
-			default: '#000000'
-		},
-		colorClass: {
-			type: String,
-			default: ''
-		},
-		splitorColor: {
-			type: String,
-			default: '#000000'
-		},
-		splitorColorClass: {
-			type: String,
-			default: ''
-		},
-		day: {
-			type: [Number, String],
-			default: 0
-		},
-		hour: {
-			type: [Number, String],
-			default: 0
-		},
-		minute: {
-			type: [Number, String],
-			default: 0
-		},
-		second: {
-			type: [Number, String],
-			default: 0
-		}
-	},
-	data() {
-		return {
-			timer: null,
-			d: '00',
-			h: '00',
-			i: '00',
-			s: '00',
-			leftTime: 0,
-			seconds: 0
-		};
-	},
-	mounted: function(e) {
-		this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-		this.countDown();
-		this.timer = setInterval(() => {
-			this.seconds--;
-			if (this.seconds < 0) {
-				this.timeUp();
-				return;
-			}
-			this.countDown();
-		}, 1000);
-	},
-	watch: {
-		day: function(newVal) {
-			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
-			this.timer = setInterval(() => {
-				this.seconds--;
-				if (this.seconds < 0) {
-					this.timeUp();
-					return;
-				}
-				this.countDown();
-			}, 1000);
-		},
-		hour: function(newVal) {
-			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
-			this.timer = setInterval(() => {
-				this.seconds--;
-				if (this.seconds < 0) {
-					this.timeUp();
-					return;
-				}
-				this.countDown();
-			}, 1000);
-		},
-		minute: function(newVal) {
-			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
-			this.timer = setInterval(() => {
-				this.seconds--;
-				if (this.seconds < 0) {
-					this.timeUp();
-					return;
-				}
-				this.countDown();
-			}, 1000);
-		},
-		second: function(newVal) {
-			this.timeUp();
-			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
-			this.countDown();
-			this.timer = setInterval(() => {
-				this.seconds--;
-				if (this.seconds < 0) {
-					this.timeUp();
-					return;
-				}
-				this.countDown();
-			}, 1000);
-		}
-	},
-
-	beforeDestroy() {
-		clearInterval(this.timer);
-	},
-	methods: {
-		toSeconds(day, hours, minutes, seconds) {
-			day = Number(day);
-			hours = Number(hours);
-			minutes = Number(minutes);
-			seconds = Number(seconds);
-			return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds;
-		},
-		timeUp() {
-			clearInterval(this.timer);
-			this.$emit('timeup');
-		},
-		countDown() {
-			let seconds = this.seconds;
-			let [day, hour, minute, second] = [0, 0, 0, 0];
-			if (seconds > 0) {
-				day = Math.floor(seconds / (60 * 60 * 24));
-				hour = Math.floor(seconds / (60 * 60)) - day * 24;
-				minute = Math.floor(seconds / 60) - day * 24 * 60 - hour * 60;
-				second = Math.floor(seconds) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
-			} else {
-				this.timeUp();
-			}
-			if (day < 10) {
-				day = '0' + day;
-			}
-			if (hour < 10) {
-				hour = '0' + hour;
-			}
-			if (minute < 10) {
-				minute = '0' + minute;
-			}
-			if (second < 10) {
-				second = '0' + second;
-			}
-			this.d = day;
-			this.h = hour;
-			this.i = minute;
-			this.s = second;
-		}
-	}
-};
-</script>
-<style lang="scss">
-
-.uni-countdown {
-	padding: 2rpx 0;
-	display: inline-flex;
-	flex-wrap: nowrap;
-	justify-content: center;
-}
-
-.uni-countdown__splitor {
-	justify-content: center;
-	line-height: 44rpx;
-	padding: 0 5rpx;
-	font-size: 24rpx;
-}
-.uni-countdown__splitor.day {
-	line-height: 50rpx;
-}
-
-.uni-countdown__number {
-	line-height: 44rpx;
-	justify-content: center;
-	height: 44rpx;
-	border-radius: 6rpx;
-	margin: 0 5rpx;
-	border: 2rpx solid #000;
-	font-size: 24rpx;
-	padding: 0 10rpx;
-}
-</style>
+<template>
+	<view class="uni-countdown">
+		<view
+			v-if="showDay && d > 0"
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ d }}
+		</view>
+		<view v-if="showDay && d > 0" :style="{ color: splitorColor }" class="uni-countdown__splitor day" :class="splitorColorClass">{{ showColon ? '天' : '天' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ h }}
+		</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '时' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ i }}
+		</view>
+		<view :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">{{ showColon ? ':' : '分' }}</view>
+		<view
+			:style="{ borderColor: borderColor, color: color, background: backgroundColor }"
+			class="uni-countdown__number "
+			:class="[backgroundColorClass, colorClass, borderColorClass]"
+		>
+			{{ s }}
+		</view>
+		<view v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor" :class="splitorColorClass">秒</view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'UniCountDown',
+	props: {
+		showDay: {
+			type: Boolean,
+			default: true
+		},
+		showColon: {
+			type: Boolean,
+			default: true
+		},
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		backgroundColorClass: {
+			type: String,
+			default: ''
+		},
+		borderColor: {
+			type: String,
+			default: '#000000'
+		},
+		borderColorClass: {
+			type: String,
+			default: ''
+		},
+		color: {
+			type: String,
+			default: '#000000'
+		},
+		colorClass: {
+			type: String,
+			default: ''
+		},
+		splitorColor: {
+			type: String,
+			default: '#000000'
+		},
+		splitorColorClass: {
+			type: String,
+			default: ''
+		},
+		day: {
+			type: [Number, String],
+			default: 0
+		},
+		hour: {
+			type: [Number, String],
+			default: 0
+		},
+		minute: {
+			type: [Number, String],
+			default: 0
+		},
+		second: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			timer: null,
+			d: '00',
+			h: '00',
+			i: '00',
+			s: '00',
+			leftTime: 0,
+			seconds: 0
+		};
+	},
+	mounted: function(e) {
+		this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+		this.countDown();
+		this.timer = setInterval(() => {
+			this.seconds--;
+			if (this.seconds < 0) {
+				this.timeUp();
+				return;
+			}
+			this.countDown();
+		}, 1000);
+	},
+	watch: {
+		day: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		hour: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		minute: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		},
+		second: function(newVal) {
+			this.timeUp();
+			this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second);
+			this.countDown();
+			this.timer = setInterval(() => {
+				this.seconds--;
+				if (this.seconds < 0) {
+					this.timeUp();
+					return;
+				}
+				this.countDown();
+			}, 1000);
+		}
+	},
+
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
+	methods: {
+		toSeconds(day, hours, minutes, seconds) {
+			day = Number(day);
+			hours = Number(hours);
+			minutes = Number(minutes);
+			seconds = Number(seconds);
+			return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds;
+		},
+		timeUp() {
+			clearInterval(this.timer);
+			this.$emit('timeup');
+		},
+		countDown() {
+			let seconds = this.seconds;
+			let [day, hour, minute, second] = [0, 0, 0, 0];
+			if (seconds > 0) {
+				day = Math.floor(seconds / (60 * 60 * 24));
+				hour = Math.floor(seconds / (60 * 60)) - day * 24;
+				minute = Math.floor(seconds / 60) - day * 24 * 60 - hour * 60;
+				second = Math.floor(seconds) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
+			} else {
+				this.timeUp();
+			}
+			if (day < 10) {
+				day = '0' + day;
+			}
+			if (hour < 10) {
+				hour = '0' + hour;
+			}
+			if (minute < 10) {
+				minute = '0' + minute;
+			}
+			if (second < 10) {
+				second = '0' + second;
+			}
+			this.d = day;
+			this.h = hour;
+			this.i = minute;
+			this.s = second;
+		}
+	}
+};
+</script>
+<style lang="scss">
+
+.uni-countdown {
+	padding: 2rpx 0;
+	display: inline-flex;
+	flex-wrap: nowrap;
+	justify-content: center;
+}
+
+.uni-countdown__splitor {
+	justify-content: center;
+	line-height: 44rpx;
+	padding: 0 5rpx;
+	font-size: 24rpx;
+}
+.uni-countdown__splitor.day {
+	line-height: 50rpx;
+}
+
+.uni-countdown__number {
+	line-height: 44rpx;
+	justify-content: center;
+	height: 44rpx;
+	border-radius: 6rpx;
+	margin: 0 5rpx;
+	border: 2rpx solid #000;
+	font-size: 24rpx;
+	padding: 0 10rpx;
+}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..401063e
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/changelog.md
@@ -0,0 +1,85 @@
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的 bug
+- 修复 单选赋默认值时，赋值日期未高亮的 bug
+- 修复 赋默认值时，移动端未正确显示时间的 bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的 bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的 bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的 bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的 bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的 bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的 bug
+- 修复 start 和 end 不能动态赋值的 bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的 bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的 bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的 bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的 bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的 bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的 bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的 bug
+- 修复 chang事件触发2次的 bug
+- 修复 分、秒 end 范围错误的 bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/package.json
new file mode 100644
index 0000000..d2959e5
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.2",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..940c0b2
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
similarity index 100%
rename from components/uni-drawer/uni-drawer.vue
rename to uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
diff --git a/components/uni-grid-item/uni-grid-item.vue b/uni_modules/uni-grid-item/components/uni-grid-item/uni-grid-item.vue
similarity index 93%
rename from components/uni-grid-item/uni-grid-item.vue
rename to uni_modules/uni-grid-item/components/uni-grid-item/uni-grid-item.vue
index e7fb018..c0027de 100644
--- a/components/uni-grid-item/uni-grid-item.vue
+++ b/uni_modules/uni-grid-item/components/uni-grid-item/uni-grid-item.vue
@@ -19,12 +19,8 @@
 </template>
 
 <script>
-import uniBadge from '@/components/uni-badge/uni-badge.vue';
 export default {
 	name: 'UniGridItem',
-	components: {
-		uniBadge
-	},
 	props: {
 		// 类型：可选值，dot：圆点；badge：角标；image：图片
 		marker: {
diff --git a/components/uni-grid/uni-grid.vue b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
similarity index 100%
rename from components/uni-grid/uni-grid.vue
rename to uni_modules/uni-grid/components/uni-grid/uni-grid.vue
diff --git a/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
similarity index 95%
rename from components/uni-icons/icons.js
rename to uni_modules/uni-icons/components/uni-icons/icons.js
index 1f5a778..b2a5968 100644
--- a/components/uni-icons/icons.js
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -1,96 +1,96 @@
-export default {
-	'contact': '\ue100',
-	'person': '\ue101',
-	'personadd': '\ue102',
-	'contact-filled': '\ue130',
-	'person-filled': '\ue131',
-	'personadd-filled': '\ue132',
-	'phone': '\ue200',
-	'email': '\ue201',
-	'chatbubble': '\ue202',
-	'chatboxes': '\ue203',
-	'phone-filled': '\ue230',
-	'email-filled': '\ue231',
-	'chatbubble-filled': '\ue232',
-	'chatboxes-filled': '\ue233',
-	'weibo': '\ue260',
-	'weixin': '\ue261',
-	'pengyouquan': '\ue262',
-	'chat': '\ue263',
-	'qq': '\ue264',
-	'videocam': '\ue300',
-	'camera': '\ue301',
-	'mic': '\ue302',
-	'location': '\ue303',
-	'mic-filled': '\ue332',
-	'speech': '\ue332',
-	'location-filled': '\ue333',
-	'micoff': '\ue360',
-	'image': '\ue363',
-	'map': '\ue364',
-	'compose': '\ue400',
-	'trash': '\ue401',
-	'upload': '\ue402',
-	'download': '\ue403',
-	'close': '\ue404',
-	'redo': '\ue405',
-	'undo': '\ue406',
-	'refresh': '\ue407',
-	'star': '\ue408',
-	'plus': '\ue409',
-	'minus': '\ue410',
-	'circle': '\ue411',
-	'checkbox': '\ue411',
-	'close-filled': '\ue434',
-	'clear': '\ue434',
-	'refresh-filled': '\ue437',
-	'star-filled': '\ue438',
-	'plus-filled': '\ue439',
-	'minus-filled': '\ue440',
-	'circle-filled': '\ue441',
-	'checkbox-filled': '\ue442',
-	'closeempty': '\ue460',
-	'refreshempty': '\ue461',
-	'reload': '\ue462',
-	'starhalf': '\ue463',
-	'spinner': '\ue464',
-	'spinner-cycle': '\ue465',
-	'search': '\ue466',
-	'plusempty': '\ue468',
-	'forward': '\ue470',
-	'back': '\ue471',
-	'left-nav': '\ue471',
-	'checkmarkempty': '\ue472',
-	'home': '\ue500',
-	'navigate': '\ue501',
-	'gear': '\ue502',
-	'paperplane': '\ue503',
-	'info': '\ue504',
-	'help': '\ue505',
-	'locked': '\ue506',
-	'more': '\ue507',
-	'flag': '\ue508',
-	'home-filled': '\ue530',
-	'gear-filled': '\ue532',
-	'info-filled': '\ue534',
-	'help-filled': '\ue535',
-	'more-filled': '\ue537',
-	'settings': '\ue560',
-	'list': '\ue562',
-	'bars': '\ue563',
-	'loop': '\ue565',
-	'paperclip': '\ue567',
-	'eye': '\ue568',
-	'arrowup': '\ue580',
-	'arrowdown': '\ue581',
-	'arrowleft': '\ue582',
-	'arrowright': '\ue583',
-	'arrowthinup': '\ue584',
-	'arrowthindown': '\ue585',
-	'arrowthinleft': '\ue586',
-	'arrowthinright': '\ue587',
-	'pulldown': '\ue588',
-	'closefill': '\ue589',
-	'sound': '\ue590',
-	'scan': '\ue612'
+export default {
+	'contact': '\ue100',
+	'person': '\ue101',
+	'personadd': '\ue102',
+	'contact-filled': '\ue130',
+	'person-filled': '\ue131',
+	'personadd-filled': '\ue132',
+	'phone': '\ue200',
+	'email': '\ue201',
+	'chatbubble': '\ue202',
+	'chatboxes': '\ue203',
+	'phone-filled': '\ue230',
+	'email-filled': '\ue231',
+	'chatbubble-filled': '\ue232',
+	'chatboxes-filled': '\ue233',
+	'weibo': '\ue260',
+	'weixin': '\ue261',
+	'pengyouquan': '\ue262',
+	'chat': '\ue263',
+	'qq': '\ue264',
+	'videocam': '\ue300',
+	'camera': '\ue301',
+	'mic': '\ue302',
+	'location': '\ue303',
+	'mic-filled': '\ue332',
+	'speech': '\ue332',
+	'location-filled': '\ue333',
+	'micoff': '\ue360',
+	'image': '\ue363',
+	'map': '\ue364',
+	'compose': '\ue400',
+	'trash': '\ue401',
+	'upload': '\ue402',
+	'download': '\ue403',
+	'close': '\ue404',
+	'redo': '\ue405',
+	'undo': '\ue406',
+	'refresh': '\ue407',
+	'star': '\ue408',
+	'plus': '\ue409',
+	'minus': '\ue410',
+	'circle': '\ue411',
+	'checkbox': '\ue411',
+	'close-filled': '\ue434',
+	'clear': '\ue434',
+	'refresh-filled': '\ue437',
+	'star-filled': '\ue438',
+	'plus-filled': '\ue439',
+	'minus-filled': '\ue440',
+	'circle-filled': '\ue441',
+	'checkbox-filled': '\ue442',
+	'closeempty': '\ue460',
+	'refreshempty': '\ue461',
+	'reload': '\ue462',
+	'starhalf': '\ue463',
+	'spinner': '\ue464',
+	'spinner-cycle': '\ue465',
+	'search': '\ue466',
+	'plusempty': '\ue468',
+	'forward': '\ue470',
+	'back': '\ue471',
+	'left-nav': '\ue471',
+	'checkmarkempty': '\ue472',
+	'home': '\ue500',
+	'navigate': '\ue501',
+	'gear': '\ue502',
+	'paperplane': '\ue503',
+	'info': '\ue504',
+	'help': '\ue505',
+	'locked': '\ue506',
+	'more': '\ue507',
+	'flag': '\ue508',
+	'home-filled': '\ue530',
+	'gear-filled': '\ue532',
+	'info-filled': '\ue534',
+	'help-filled': '\ue535',
+	'more-filled': '\ue537',
+	'settings': '\ue560',
+	'list': '\ue562',
+	'bars': '\ue563',
+	'loop': '\ue565',
+	'paperclip': '\ue567',
+	'eye': '\ue568',
+	'arrowup': '\ue580',
+	'arrowdown': '\ue581',
+	'arrowleft': '\ue582',
+	'arrowright': '\ue583',
+	'arrowthinup': '\ue584',
+	'arrowthindown': '\ue585',
+	'arrowthinleft': '\ue586',
+	'arrowthinright': '\ue587',
+	'pulldown': '\ue588',
+	'closefill': '\ue589',
+	'sound': '\ue590',
+	'scan': '\ue612'
 }
diff --git a/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
similarity index 100%
rename from components/uni-icons/uni-icons.vue
rename to uni_modules/uni-icons/components/uni-icons/uni-icons.vue
diff --git a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
similarity index 91%
rename from pages_tool/components/uni-nav-bar/uni-nav-bar.vue
rename to uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
index 9475ea5..93bca99 100644
--- a/pages_tool/components/uni-nav-bar/uni-nav-bar.vue
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -38,15 +38,9 @@
 </template>
 
 <script>
-import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
-import uniIcons from '@/components/uni-icons/uni-icons.vue';
 
 export default {
 	name: 'UniNavBar',
-	components: {
-		uniStatusBar,
-		uniIcons
-	},
 	props: {
 		title: {
 			type: String,
diff --git a/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
similarity index 100%
rename from components/uni-number-box/uni-number-box.vue
rename to uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
diff --git a/components/uni-popup/uni-popup-sku-new.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-new.vue
similarity index 100%
rename from components/uni-popup/uni-popup-sku-new.vue
rename to uni_modules/uni-popup/components/uni-popup/uni-popup-sku-new.vue
diff --git a/components/uni-popup/uni-popup-sku.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue
similarity index 100%
rename from components/uni-popup/uni-popup-sku.vue
rename to uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue
diff --git a/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
similarity index 100%
rename from components/uni-popup/uni-popup.vue
rename to uni_modules/uni-popup/components/uni-popup/uni-popup.vue
diff --git a/uni_modules/uni-scss/components/uni-scss/changelog.md b/uni_modules/uni-scss/components/uni-scss/changelog.md
new file mode 100644
index 0000000..a58bab7
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/components/uni-scss/index.scss b/uni_modules/uni-scss/components/uni-scss/index.scss
new file mode 100644
index 0000000..5d43f7f
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/components/uni-scss/package.json b/uni_modules/uni-scss/components/uni-scss/package.json
new file mode 100644
index 0000000..4db034b
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/components/uni-scss/readme.md b/uni_modules/uni-scss/components/uni-scss/readme.md
new file mode 100644
index 0000000..8fa518a
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/components/uni-scss/theme.scss b/uni_modules/uni-scss/components/uni-scss/theme.scss
new file mode 100644
index 0000000..20cdf5e
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/components/uni-scss/variables.scss b/uni_modules/uni-scss/components/uni-scss/variables.scss
new file mode 100644
index 0000000..49a89b6
--- /dev/null
+++ b/uni_modules/uni-scss/components/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/pages_tool/components/uni-status-bar/uni-status-bar.vue b/uni_modules/uni-status-bar/components/uni-status-bar/uni-status-bar.vue
similarity index 100%
rename from pages_tool/components/uni-status-bar/uni-status-bar.vue
rename to uni_modules/uni-status-bar/components/uni-status-bar/uni-status-bar.vue
diff --git a/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
similarity index 100%
rename from components/uni-tag/uni-tag.vue
rename to uni_modules/uni-tag/components/uni-tag/uni-tag.vue