diff --git a/components-diy/diy-digit.vue b/components-diy/diy-digit.vue
index 0deb2a2..4a51a91 100644
--- a/components-diy/diy-digit.vue
+++ b/components-diy/diy-digit.vue
@@ -1,5 +1,5 @@
-<template>
-	<view :style="componentStyle">
+<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'">
 			<view class="uni-scroll-view-content">
diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue
index 9ac7eb9..466d481 100644
--- a/components-diy/diy-index-page.vue
+++ b/components-diy/diy-index-page.vue
@@ -170,6 +170,7 @@
 
 <script>
 import nsLoading from '@/components/ns-loading/ns-loading.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -190,7 +191,8 @@ export default {
 	},
 	mixins: [DiyMinx],
 	components: {
-		nsLoading
+		nsLoading,
+		MescrollUni
 	},
 	data() {
 		return {
diff --git a/components-diy/diy-listmenu.vue b/components-diy/diy-listmenu.vue
index e14e3ae..f07440a 100644
--- a/components-diy/diy-listmenu.vue
+++ b/components-diy/diy-listmenu.vue
@@ -1,5 +1,5 @@
 <template>
-	<view data-component-name="diy-picture" class="diy-picture" :style="style">
+	<view data-component-name="diy-listmenu" class="diy-listmenu" :style="style">
 		<view class="fui-cell-group">
 			<!--     <image mode="widthFix" style="width: 100%;" :src="$util.img(item.imageUrl)"></image> -->
 
diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index 51fac55..81960cb 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -636,11 +636,30 @@
 <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/lang/en-us/contact/contact.js b/lang/en-us/contact/contact.js
index 6ade10d..a27c572 100644
--- a/lang/en-us/contact/contact.js
+++ b/lang/en-us/contact/contact.js
@@ -1,4 +1,18 @@
 export const lang = {
 	//title为每个页面的标题
-	title: 'Electronic Card'
+	title: 'Electronic Card',
+	onlineMessage: 'Online Message',
+	call: 'One-click Call',
+	copy: 'Copy',
+	copyFailed: 'Copy Failed',
+	copySuccess: 'Copy Success',
+	oneClickNavigation: 'One-click Navigation',
+	name: 'Name',
+	contactInfo: 'Contact Info',
+	messageContent: 'Message Content',
+	pleaseEnterName: 'Please enter your name',
+	pleaseEnterMobile: 'Please enter your phone number',
+	pleaseEnterMessage: 'Please enter your message',
+	submit: 'Submit',
+	exclusiveCustomerService: 'Exclusive Customer Service'
 }
diff --git a/lang/zh-cn/contact/contact.js b/lang/zh-cn/contact/contact.js
index d2c2592..14121e4 100644
--- a/lang/zh-cn/contact/contact.js
+++ b/lang/zh-cn/contact/contact.js
@@ -1,4 +1,18 @@
 export const lang = {
 	//title为每个页面的标题
-	title: '电子名片'
+	title: '电子名片',
+	onlineMessage: '在线留言',
+	call: '一键拨打',
+	copy: '复制',
+	copyFailed: '复制失败',
+	copySuccess: '复制成功',
+	oneClickNavigation: '一键导航',
+	name: '姓名',
+	contactInfo: '联系方式',
+	messageContent: '留言内容',
+	pleaseEnterName: '请输入您的姓名',
+	pleaseEnterMobile: '请输入您的手机号',
+	pleaseEnterMessage: '请输入留言内容',
+	submit: '提交',
+	exclusiveCustomerService: '专属客服'
 }
diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue
index a086582..dbd75d2 100644
--- a/pages_promotion/fenxiao/bill.vue
+++ b/pages_promotion/fenxiao/bill.vue
@@ -22,6 +22,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
+
 export default {
 	data() {
 		return {
@@ -29,6 +37,15 @@ export default {
 			showEmpty: true
 		};
 	},
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	onShow() {
 		setTimeout( () => {
 			if (!this.addonIsExist.fenxiao) {
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
index 2a6bb03..a3f6786 100644
--- a/pages_promotion/fenxiao/child_fenxiao.vue
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -2,23 +2,27 @@
 	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" class="member-point" :size="8" v-if="storeToken">
 			<block slot="list">
-				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0"
+					@click="toFenxiaoOrder(item)">
 					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
-						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)"
+							mode="aspectFill"></image>
 						<image v-else :src="$util.getDefaultImage().head"></image>
 						<view class="member-info">
 							<view class="member-name">
 								<view class="left">
 									<view class="flex-box">
 										<view class="name">{{ item.nickname }}</view>
-										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{ item.level_name }}</view>
+										<view v-if="item.level_name" class="title  color-base-border color-base-text">{{
+											item.level_name }}</view>
 									</view>
-									<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+									<view class="color-tip font-size-goods-tag">加入时间：{{
+										$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
 								</view>
 								<view class="consume-info">
 									<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text> 人</view>
 									<view><text>{{ item.order_num }}</text> 单</view>
-									<view><text>{{ item.order_money|moneyFormat }}</text> 元</view>
+									<view><text>{{ item.order_money | moneyFormat }}</text> 元</view>
 								</view>
 							</view>
 						</view>
@@ -36,6 +40,13 @@
 </template>
 
 <script>
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
@@ -45,9 +56,18 @@ export default {
 			emptyShow: false,
 		};
 	},
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},	
 	mixins: [fenxiaoWords],
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -58,7 +78,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -114,7 +134,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
@@ -179,7 +199,7 @@ export default {
 			height: 90rpx;
 			border-radius: 50%;
 		}
-		
+
 		.member-info {
 			flex: 1;
 			padding-left: $padding;
@@ -197,7 +217,7 @@ export default {
 				.left {
 					width: 0;
 					flex: 1;
-					
+
 					.flex-box {
 						display: flex;
 						align-items: center;
@@ -224,14 +244,14 @@ export default {
 						color: #fff;
 					}
 				}
-				
+
 				.consume-info {
 					text-align: right;
-					
+
 					text {
 						margin-right: 6rpx;
 					}
-					
+
 					view {
 						line-height: 1.5;
 						font-size: 24rpx;
@@ -268,6 +288,7 @@ export default {
 			flex-direction: row-reverse;
 		}
 	}
+
 	.order-box-btn {
 		display: inline-block;
 		line-height: 56rpx;
@@ -281,6 +302,7 @@ export default {
 		border-radius: $border-radius;
 		margin-top: 30rpx;
 	}
+
 	.li-box.active {
 		border: none;
 	}
diff --git a/pages_promotion/fenxiao/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
index 5edb4b9..ef3f20c 100644
--- a/pages_promotion/fenxiao/goods_list.vue
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -132,10 +132,26 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
 import list from './public/js/goods_list.js';
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	mixins: [list, fenxiaoWords]
 };
 </script>
diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue
index 9c63c8a..36e0a17 100644
--- a/pages_promotion/fenxiao/order.vue
+++ b/pages_promotion/fenxiao/order.vue
@@ -79,8 +79,24 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	data() {
 		return {
 			category: [
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
index 28d7cbd..6a134eb 100644
--- a/pages_promotion/fenxiao/ranking_list.vue
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -97,7 +97,25 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
+
+	
 	export default {
+		components: {
+			nsLogin,
+			MescrollUni,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
+		},	
 		data() {
 			return {
 				list: [],
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index bbdded9..36927b5 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -3,26 +3,31 @@
 		<mescroll-uni ref="mescroll" @getData="getData" top="20" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
+						@click="toDetail(orderItem.fenxiao_order_id)">
 						<view class="order-header">
 							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
 							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-green"
+								v-else-if="orderItem.is_settlement == 1">已结算</text>
 							<text class="status-name color-text-orange" v-else>待结算</text>
 						</view>
 
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })"
+										@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
 										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
 										<view>
 											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
+											<text class="price-color font-size-goods-tag">{{
+												$lang('common.currencySymbol') }}</text>
+											<text class="price-color font-size-toolbar">{{ orderItem.commission
+												}}</text>
 										</view>
 									</view>
 									<view class="goods-sub-section">
@@ -56,7 +61,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false" v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
+				<view class="cart-empty"><ns-empty text="暂无订单" :isIndex="false"
+						v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
 			</view>
 		</mescroll-uni>
 
@@ -66,9 +72,25 @@
 </template>
 
 <script>
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	data() {
 		return {
 			orderList: [],
@@ -87,7 +109,7 @@ export default {
 		}
 	},
 	onShow() {
-		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '订单');
 	},
 	methods: {
 		//获得列表数据
@@ -140,9 +162,11 @@ export default {
 
 <style lang="scss">
 @import './public/css/order.scss';
+
 .goods-wraps {
 	align-items: center;
 }
+
 .goods_list .order-item .order-body .goods-wraps .goods-img,
 .goods_list .order-item .order-body .goods-wraps .goods-info,
 .goods_list .order-item .order-footers {
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index 476b5f5..87d9a47 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -2,14 +2,19 @@
 	<view :style="themeColor">
 		<view class="team-cate" v-if="storeToken && levelNum > 1">
 			<block v-for="(item, index) in levelList" :key="index">
-				<view class="cate-li" :class="{ 'active color-base-text color-base-border': currentLevel == item.level }" @click="selectLevel(item.level)">{{ item.name }}</view>
+				<view class="cate-li"
+					:class="{ 'active color-base-text color-base-border': currentLevel == item.level }"
+					@click="selectLevel(item.level)">{{ item.name }}</view>
 			</block>
 		</view>
-		<mescroll-uni ref="mescroll" @getData="getData" :top="levelNum > 1 ? 90 : 0" class="member-point" :size="8" v-if="storeToken">
+		<mescroll-uni ref="mescroll" @getData="getData" :top="levelNum > 1 ? 90 : 0" class="member-point" :size="8"
+			v-if="storeToken">
 			<block slot="list">
-				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0" @click="toFenxiaoOrder(item)">
+				<view class="team-li" v-for="(item, index) in teamList" :key="index" v-if="teamList.length != 0"
+					@click="toFenxiaoOrder(item)">
 					<view class="li-box" :class="{ active: index + 1 == teamList.length }">
-						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)" mode="aspectFill"></image>
+						<image v-if="item.headimg" :src="$util.img(item.headimg)" @error="imageError(index)"
+							mode="aspectFill"></image>
 						<image v-else :src="$util.getDefaultImage().head"></image>
 						<view class="member-info">
 							<view class="member-name">
@@ -17,9 +22,11 @@
 									<view class="left">
 										<view class="flex-box">
 											<view class="name">{{ item.nickname }}</view>
-											<view class="title  color-base-border color-base-text">{{ fenxiaoWords.fenxiao_name }}</view>
+											<view class="title  color-base-border color-base-text">{{
+												fenxiaoWords.fenxiao_name }}</view>
 										</view>
-										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{
+											$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
 									</view>
 									<view class="consume-info">
 										<view>
@@ -43,7 +50,8 @@
 												<text>{{ item.nickname }}</text>
 											</view>
 										</view>
-										<view class="color-tip font-size-goods-tag">加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
+										<view class="color-tip font-size-goods-tag">加入时间：{{
+											$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
 									</view>
 									<view class="consume-info">
 										<view>
@@ -64,7 +72,8 @@
 						</view>
 					</view>
 				</view>
-				<block v-if="teamList.length == 0 && emptyShow"><ns-empty text="暂无数据" :isIndex="false"></ns-empty></block>
+				<block v-if="teamList.length == 0 && emptyShow"><ns-empty text="暂无数据" :isIndex="false"></ns-empty>
+				</block>
 			</block>
 		</mescroll-uni>
 
@@ -74,8 +83,24 @@
 </template>
 
 <script>
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	data() {
 		return {
 			levelList: [
@@ -96,7 +121,7 @@ export default {
 	},
 	mixins: [fenxiaoWords],
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -107,7 +132,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
 		if (this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team);
 		this.getFenXiaoLevel();
@@ -173,7 +198,7 @@ export default {
 			let res = await this.$api.sendRequest({
 				url: '/fenxiao/api/config/basics',
 				async: false,
-				success: res => {}
+				success: res => { }
 			});
 			if (res.code == 0 && res.data) {
 				this.levelNum = res.data.level;
@@ -181,7 +206,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
@@ -334,6 +359,7 @@ export default {
 			flex-direction: row-reverse;
 		}
 	}
+
 	.order-box-btn {
 		display: inline-block;
 		line-height: 56rpx;
@@ -347,6 +373,7 @@ export default {
 		border-radius: $border-radius;
 		margin-top: 30rpx;
 	}
+
 	.li-box.active {
 		border: none;
 	}
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 81d49f1..60812fd 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -30,9 +30,25 @@
 	</view>
 </template>
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
+	components: {
+		nsLogin,
+		MescrollUni,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},			
 	data() {
 		return {
 			withdrawState: {
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index 6db52d6..c0a454c 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -293,13 +293,27 @@
 	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
+			nsGoodsSkuIndex,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		data() {
 			return {};
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index 76c92e5..fa3ce71 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -115,11 +115,25 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
 	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
 
 	export default {
 		components: {
 			uniDrawer,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		data() {
 			return {
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index f4a0385..66b6a83 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -83,7 +83,24 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif	
+		
 	export default {
+		components: {
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
+		},	
 		data() {
 			return {
 				orderList: [],
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
index 6bdf975..2f722a1 100644
--- a/pages_promotion/point/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -279,10 +279,26 @@
 <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		
 
 	export default {
 		components: {
 			uniPopup,
+			nsSelectTime,
+			nsLogin,
+			MescrollUni,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		mixins: [payment]
 	};
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index 6dac144..bcbbb96 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -34,6 +34,14 @@
 
 <script>
 	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif	
+	
 	export default {
 		data() {
 			return {
@@ -41,7 +49,14 @@
 			};
 		},
 		components: {
-			nsAdv
+			nsAdv,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		onShow() {
 			this.setPublicShare();
diff --git a/pages_tool/contact/contact.vue b/pages_tool/contact/contact.vue
index 35747a1..47a76d5 100644
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue
@@ -10,7 +10,7 @@
 							style="background: #1daa39;width: 100%;border-radius: 10rpx;">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
 							</view>
 						</view>
 					</view>
@@ -22,19 +22,20 @@
 							<button class="bl bor" hoverClass="none" openType="contact" sessionFrom="weapp"
 								showMessageCard="true" style="margin: 0;">
 								<image mode="heightFix" :src="$util.img('public/static/img/kefu.png')"></image>
-								<view class="name bl line1">专属客服</view>
+								<view class="name bl line1">{{ $lang('exclusiveCustomerService') }}</view>
 							</button>
 						</view>
 						<view @click="tapMessage" class="view_li w50_li  text-center">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">在线留言</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
 							</view>
 						</view>
 					</view>
 					<!-- #endif -->
 
-					<view class="view_ul_100" v-for="(item, index) in dataList" :key="index" style="margin-bottom: 20rpx;">
+					<view class="view_ul_100" v-for="(item, index) in dataList" :key="index"
+						style="margin-bottom: 20rpx;">
 
 						<view class="bl clearfix bor bg-white"
 							:style="{ backgroundImage: ' url(' + $util.img(personnel_bg) + ')', backgroundSize: '100% 100%' }">
@@ -50,10 +51,7 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/boda.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.mobile }}</view>
-									<view
-										style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)"
-										@click="Tel(item.mobile)"><span
-											style="background: #0054a5;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">一键拨打</span>
+									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn" style="background: #0054a5;">{{ $lang('call') }}</span>
 									</view>
 								</view>
 								<view class="contact_name"
@@ -61,10 +59,7 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/emall.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.email }}</view>
-									<view
-										style="margin-top: 0rpx;margin-left: 10rpx;font-size: 26rpx;color:rgba(71,71,71,.79)"
-										@click="tomap()"><span
-											style="background: #888;color:#fff;padding: 10rpx 30rpx;font-size: 24rpx;border-radius: 50rpx;">立即导航</span>
+									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn" style="background: #888;">{{ $lang('copy') }}</span>
 									</view>
 								</view>
 							</view>
@@ -89,7 +84,7 @@
 						:longitude="shop.longitude" :latitude="shop.latitude" show-location>
 						<cover-view
 							style="position:absolute;right:10px;bottom:30rpx;z-index:9;background:#4d83ff;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;"
-							@click="tomap"><cover-view style="font-size:24rpx">一键导航</cover-view>
+							@click="tomap"><cover-view style="font-size:24rpx">{{ $lang('oneClickNavigation') }}</cover-view>
 						</cover-view>
 					</map>
 				</view>
@@ -109,44 +104,41 @@
 			<uni-popup ref="informationPopup" type="bottom" @change="change">
 				<view class="liuyan-popup-layer popup-layer">
 					<view class="head-wrap" @click="closeinformationPopup()">
-						<text>在线留言</text>
+						<text>{{ $lang('onlineMessage') }}</text>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<scroll-view scroll-y class="liuyan-body">
 						<view style="padding: 0 30rpx;">
 							<view class="fui-cell-group">
 								<view class="fui-cell  ">
-									<view class="fui-cell-label ">姓名</view>
+									<view class="fui-cell-label ">{{ $lang('name') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.realname" class="fui-input" placeholder="请输入您的姓名"
-											value=""></input>
+										<input v-model="Form.realname" class="fui-input" :placeholder="$lang('pleaseEnterName')" value=""></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
-									<view class="fui-cell-label">联系方式</view>
+									<view class="fui-cell-label">{{ $lang('contactInfo') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.mobile" class="fui-input" maxlength="11"
-											placeholder="请输入您的手机号" type="number"></input>
+										<input v-model="Form.mobile" class="fui-input" maxlength="11" :placeholder="$lang('pleaseEnterMobile')" type="number"></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
-									<view class="fui-cell-label" style="position: absolute;top:10px">留言内容</view>
+									<view class="fui-cell-label" style="position: absolute;top:10px">{{ $lang('messageContent') }}</view>
 									<view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
 										<!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
-										<textarea class="textarea" v-model="Form.remark" placeholder="请输入留言内容"
-											style="font-size: 28rpx;padding: 10rpx;"></textarea>
+										<textarea class="textarea" v-model="Form.remark" :placeholder="$lang('pleaseEnterMessage')" style="font-size: 28rpx;padding: 10rpx;"></textarea>
 									</view>
 								</view>
 							</view>
 						</view>
 					</scroll-view>
-					<view class="button-box"><button type="primary" @click="save()">提交</button></view>
+					<view class="button-box"><button type="primary" @click="save()">{{ $lang('submit') }}</button></view>
 				</view>
 			</uni-popup>
 		</view>
 		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 		<hover-nav></hover-nav>
-		<diy-bottom-nav></diy-bottom-nav>		
+		<diy-bottom-nav></diy-bottom-nav>
 	</view>
 </template>
 
@@ -272,18 +264,23 @@ export default {
 		copy(text) {
 			uni.setClipboardData({
 				data: text,
-				success: function () {
+				success: () => {
 					console.log('复制成功');
 					// 可以添加用户友好的提示，例如使用uni.showToast提示复制成功
 					uni.showToast({
-						title: '复制成功',
+						title: this.$lang('copySuccess'),
 						icon: 'success',
 						duration: 2000
 					});
 				},
-				fail: function () {
+				fail: (err) => {
 					console.log('复制失败');
 					// 可以添加错误处理或用户友好的提示
+					uni.showToast({
+						title:  err.message || err.errMsg || this.$lang('copyFailed'),
+						icon: 'none',
+						duration: 2000
+					});
 				}
 			});
 		},
@@ -291,7 +288,7 @@ export default {
 			uni.openLocation({
 				latitude: parseFloat(this.shop.latitude),
 				longitude: parseFloat(this.shop.longitude),
-				name: "一键导航",
+				name: this.$lang('oneClickNavigation'),
 			})
 		}
 	}
@@ -546,6 +543,27 @@ image {
 	padding-left: 0rpx;
 }
 
+.btn-container {
+	white-space: nowrap;
+	min-width: 140rpx;
+	width: max-content;
+	margin-top: 0rpx;
+	margin-left: 10rpx;
+	font-size: 26rpx;
+	color: rgba(71, 71, 71, .79);
+	text-align: center;
+}
+
+.contact-btn {
+	color: #fff;
+	padding: 6rpx 30rpx;
+	font-size: 24rpx;
+	border-radius: 50rpx;
+	min-width: 100rpx;
+	display: inline-block;
+	text-align: center;
+}
+
 .contact_name image {
 	opacity: .79;
 	width: 30rpx;
@@ -563,17 +581,16 @@ image {
 	width: 90rpx;
 	z-index: 9999;
 }
-
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .mescroll-totop {
-		right: 27rpx!important; 
-		/* #ifdef H5 */
-		bottom: 120rpx!important;
-		/* #endif */		
-		/* #ifdef MP-WEIXIN */
-		bottom: 180rpx!important;
-		/* #endif */
-	}
+/deep/ .mescroll-totop {
+	right: 27rpx !important;
+	/* #ifdef H5 */
+	bottom: 120rpx !important;
+	/* #endif */
+	/* #ifdef MP-WEIXIN */
+	bottom: 180rpx !important;
+	/* #endif */
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/goods/brand.vue b/pages_tool/goods/brand.vue
index 33e5334..1865f85 100644
--- a/pages_tool/goods/brand.vue
+++ b/pages_tool/goods/brand.vue
@@ -27,11 +27,25 @@
 	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
+			nsAdv,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		data() {
 			return {
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index f69c79a..2b332ba 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -70,7 +70,23 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
 	export default {
+		components: {
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
+		},
 		data() {
 			return {
 				list: [],
diff --git a/pages_tool/goods/evaluate.vue b/pages_tool/goods/evaluate.vue
index 2c4059b..19ea5bc 100644
--- a/pages_tool/goods/evaluate.vue
+++ b/pages_tool/goods/evaluate.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="goods-evaluate" :style="themeColor">
 		<view class="evaluate-tab">
-			<view v-for="(item, index) in evaluateList" :key="index" :class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
+			<view v-for="(item, index) in evaluateList" :key="index"
+				:class="evaluateTab == item.value ? 'active-tab' : ''" @click="onEvaluateTab(item.value)">
 				{{ item.name }}({{ item.count }})
 			</view>
 		</view>
@@ -11,26 +12,32 @@
 					<view class="evaluator">
 						<view>
 							<view class="evaluator-face">
-								<image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="imageError(index)" mode="aspectFill" />
+								<image v-if="item.member_headimg" :src="$util.img(item.member_headimg)"
+									@error="imageError(index)" mode="aspectFill" />
 								<image v-else :src="$util.getDefaultImage().head" mode="aspectFill" />
 							</view>
 
 							<view class="evaluator-info">
 								<view class="evaluator-info-left">
-									<view class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
+									<view 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] }}
 									</view>
 									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</view>
+									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time)
+										}}</view>
+								</view>
+								<view class="evaluator-xing">
+									<xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
 								</view>
-								<view class="evaluator-xing"><xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent></view>
 							</view>
 						</view>
 					</view>
 					<view class="cont">{{ 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')">
+							<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>
@@ -46,12 +53,8 @@
 						<view class="cont">{{ item.again_content }}</view>
 						<scroll-view scroll-x="true">
 							<view class="evaluate-img" v-if="item.again_images.length > 0">
-								<view
-									class="img-box"
-									v-for="(again_img, again_index) in item.again_images"
-									:key="again_index"
-									@click="previewEvaluate(index, again_index, 'again_images')"
-								>
+								<view class="img-box" v-for="(again_img, again_index) in item.again_images"
+									:key="again_index" @click="previewEvaluate(index, again_index, 'again_images')">
 									<image :src="$util.img(again_img)" mode="aspectFill"></image>
 								</view>
 							</view>
@@ -71,9 +74,26 @@
 </template>
 
 <script>
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
+
 import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
 export default {
-	components: { xiaoStarComponent },
+	components: {
+		xiaoStarComponent,
+		MescrollUni,
+		nsLogin,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
 	data() {
 		return {
 			goodsId: 0,
@@ -198,11 +218,13 @@ export default {
 			padding: 8rpx 30rpx;
 			font-size: 24rpx;
 		}
+
 		.active-tab {
 			background-color: $base-color;
 			color: #fff;
 		}
 	}
+
 	.evaluate-item {
 		margin: $margin-updown $margin-both;
 		padding: $margin-both;
@@ -210,7 +232,7 @@ export default {
 		border-radius: 10rpx;
 
 		.evaluator {
-			& > view {
+			&>view {
 				display: flex;
 				align-items: center;
 			}
@@ -243,6 +265,7 @@ export default {
 					// margin-top: 14rpx;
 					line-height: 1;
 				}
+
 				.evaluator-info-left {
 					display: flex;
 					align-items: center;
@@ -318,7 +341,7 @@ export default {
 				float: right;
 			}
 
-			& + .cont {
+			&+.cont {
 				margin: 18rpx 0 0;
 			}
 		}
@@ -330,7 +353,7 @@ export default {
 	color: #000;
 	line-height: 1;
 
-	& + .cont {
+	&+.cont {
 		margin-top: 10rpx !important;
 	}
 }
diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue
index 62d5118..6fa4744 100644
--- a/pages_tool/member/account.vue
+++ b/pages_tool/member/account.vue
@@ -65,12 +65,20 @@
 	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
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		data() {
 			return {
diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue
index de20a1d..055f213 100644
--- a/pages_tool/member/address.vue
+++ b/pages_tool/member/address.vue
@@ -10,7 +10,8 @@
 									<view class="address-top-info">
 										<view class="address-name">{{ item.name }}</view>
 										<view class="address-tel">{{ item.mobile }}</view>
-										<view class="address-status" v-if="localType == 2 && item.local_data">{{ item.local_data }}</view>
+										<view class="address-status" v-if="localType == 2 && item.local_data">{{
+											item.local_data }}</view>
 									</view>
 									<view class="address-info">{{ item.full_address }}{{ item.address }}</view>
 								</view>
@@ -33,14 +34,16 @@
 							</view>
 
 							<view class="address-item-bottom">
-								<view class="address-default" @click="setDefault(item.id,item.is_default)">
+								<view class="address-default" @click="setDefault(item.id, item.is_default)">
 									<text class="default" v-if="localType == 2 && item.local_data">设为默认地址</text>
 									<text class="default" v-else>设为默认地址</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="address-btn">
-									<text class="delete" v-if="item.is_default != 1" @click="deleteAddress(item.id, item.is_default)">
+									<text class="delete" v-if="item.is_default != 1"
+										@click="deleteAddress(item.id, item.is_default)">
 										<text class="iconfont icon-icon7"></text>
 									</text>
 								</view>
@@ -50,16 +53,21 @@
 					</template>
 
 					<view v-if="addressList.length == 0 && showEmpty" class="empty-box">
-						<image :src="$util.img('public/uniapp/member/address/empty.png')" mode="widthFix"/>
+						<image :src="$util.img('public/uniapp/member/address/empty.png')" mode="widthFix" />
 						<view class="tips">暂无收货地址，请添加</view>
 
-						<button type="primary" class="add-address" @click="addAddress('add')">{{ $lang('newAddAddress') }}</button>
+						<button type="primary" class="add-address" @click="addAddress('add')">{{ $lang('newAddAddress')
+						}}</button>
 
 						<!-- #ifdef H5 -->
-						<button type="primary" class="get-address" @click="getChooseAddress()" v-if="$util.isWeiXin() && local != 1">{{ $lang('getAddress') }}</button>
+						<button type="primary" class="get-address" @click="getChooseAddress()"
+							v-if="$util.isWeiXin() && local != 1">{{
+								$lang('getAddress') }}</button>
 						<!-- #endif -->
 						<!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO -->
-						<button type="primary" class="get-address" @click="getChooseAddress()" v-if="local != 1">{{ $lang('getAddress') }}</button>
+						<button type="primary" class="get-address" @click="getChooseAddress()" v-if="local != 1">{{
+							$lang('getAddress')
+						}}</button>
 						<!-- #endif -->
 					</view>
 				</view>
@@ -73,7 +81,9 @@
 			</view>
 			<!-- #endif -->
 			<!-- #ifdef H5 -->
-			<button type="primary" class="add-address" @click="getChooseAddress()" v-if="$util.isWeiXin() && local != 1">{{ $lang('getAddress') }}</button>
+			<button type="primary" class="add-address" @click="getChooseAddress()"
+				v-if="$util.isWeiXin() && local != 1">{{
+					$lang('getAddress') }}</button>
 			<!-- #endif -->
 			<button type="primary" class="add-address" @click="addAddress('add')">
 				<text class="iconfont icon-add1"></text>
@@ -87,520 +97,529 @@
 </template>
 
 <script>
-	import {
-		Weixin
-	} from 'common/js/wx-jssdk.js';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import {
+	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';
 
-	export default {
-		components: {
-			MescrollUni,
-			nsLogin,
-			loadingCover
-		},
-		data() {
-			return {
-				addressList: [],
-				back: '', // 返回页
-				redirect: 'redirectTo', // 跳转方式
-				isIndex: false,
-				showEmpty: false,
-				local: 0, //定位是否显示
-				localType: 1,
-			};
-		},
-		onLoad(option) {
-			if (option.back) {
-				this.back = option.back;
-				uni.setStorageSync('addressBack', option.back);
-			} else {
-				if (uni.getStorageSync('addressBack')) {
-					this.back = uni.getStorageSync('addressBack');
-					uni.removeStorageSync('addressBack');
-				}
-			}
-			if (option.redirect) this.redirect = option.redirect;
-			if (option.local) this.local = option.local;
-			if (option.type) this.localType = option.type;
-		},
-		onShow() {
-			uni.removeStorageSync('addressInfo');
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
-			if (this.storeToken) {
-				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_tool/member/address');
-				});
-			}
-		},
-		methods: {
-			getListData(mescroll) {
-				let storeId = 0;
-				let delivery = uni.getStorageSync('delivery');
-				if (delivery && delivery.delivery_type == 'local') {
-					storeId = delivery.store_id || 0;
-				}
-				this.showEmpty = false;
-				this.$api.sendRequest({
-					url: '/api/memberaddress/page',
-					data: {
-						page: mescroll.num,
-						page_size: mescroll.size,
-						type: this.localType,
-						store_id: storeId
-					},
-					success: res => {
-						this.showEmpty = true;
-						let newArr = [];
-						let msg = res.message;
-						if (res.code == 0 && res.data) {
-							newArr = res.data.list;
-						} else {
-							this.$util.showToast({
-								title: msg
-							});
-						}
-						mescroll.endSuccess(newArr.length);
-						//设置列表数据
-						if (mescroll.num == 1) this.addressList = []; //如果是第一页需手动制空列表
-						this.addressList = this.addressList.concat(newArr); //追加新数据
-						this.$forceUpdate();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				});
-			},
-
-			/* 地址跳转 */
-			addAddress(type, id) {
-				let data = {
-					type: this.localType
-				};
-				if (type == 'edit') data.id = id;
-				if (this.back) data.back = this.back;
-
-				this.$util.redirectTo('/pages_tool/member/address_edit', data);
-			},
-			/* 删除地址信息 */
-			deleteAddress(id, is_default) {
-				uni.showModal({
-					title: '操作提示',
-					content: '确定要删除该地址吗？',
-					success: res => {
-						if (res.confirm) {
-							if (is_default == 1) {
-								this.$util.showToast({
-									title: '默认地址，不能删除'
-								});
-								return;
-							}
-							this.$api.sendRequest({
-								url: '/api/memberaddress/delete',
-								data: {
-									id: id
-								},
-								success: res => {
-									if (res.code == 0) {
-										this.$util.showToast({
-											title: '删除成功'
-										});
-									} else {
-										this.$util.showToast({
-											title: '删除失败'
-										});
-									}
-									this.$refs.mescroll.refresh();
-								},
-								fail: res => {
-									mescroll.endErr();
-								}
-							});
-						}
-					}
-				});
-			},
-			setDefault(id, is_default) {
-				if (is_default == 1) return;
-				this.$api.sendRequest({
-					url: '/api/memberaddress/setdefault',
-					data: {
-						id
-					},
-					success: res => {
-						if (res.data > 0) {
-							this.$refs.mescroll.refresh();
-							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, 'redirectTo');
-							} else {
-								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
-								this.addressList = [];
-								this.$refs.mescroll.refresh();
-								this.$util.showToast({
-									title: '修改默认地址成功'
-								});
-							}
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			},
-			/**
-			 * 一键获取地址
-			 */
-			getChooseAddress() {
-				// #ifdef H5
-				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 => {
-							if (jssdkRes.code == 0) {
-								var wxJS = new Weixin();
-								wxJS.init(jssdkRes.data);
-								wxJS.openAddress(res => {
-									if (res.errMsg == 'openAddress:ok') {
-										this.saveAddress({
-											name: res.userName, // 收货人姓名,
-											mobile: res.telNumber, // 手机号
-											province: res.provinceName, // 省
-											city: res.cityName, // 市
-											district: res.countryName, // 县
-											address: res.detailInfo, // 详细地址
-											full_address: res.provinceName + '-' + res.cityName + '-' + res.countryName,
-											is_default: 1
-										});
-									} else {
-										this.$util.showToast({
-											title: res.errMsg == 'openAddress:function not implement' ? 'PC端微信不支持一键获取地址' : res.errMsg
-										});
-									}
-								});
-							} else {
-								this.$util.showToast({
-									title: jssdkRes.message
-								});
-							}
-						}
-					});
-				}
-				// #endif
-
-				// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO
-				uni.chooseAddress({
-					success: res => {
-						if (res.errMsg == 'chooseAddress:ok') {
-							this.saveAddress({
-								name: res.userName, // 收货人姓名,
-								mobile: res.telNumber, // 手机号
-								province: res.provinceName, // 省
-								city: res.cityName, // 市
-								district: res.countyName, // 县
-								address: res.detailInfo, // 详细地址
-								full_address: res.provinceName + '-' + res.cityName + '-' + res.countyName,
-								is_default: 1
-							});
-						} else {
-							this.$util.showToast({
-								title: res.errMsg
-							});
-						}
-					},
-					fail: res => {
-						console.log('fail', res);
-					}
-				});
-				// #endif
-			},
-			/**
-			 * 保存微信地址
-			 * @param {Object} params
-			 */
-			saveAddress(params) {
-				this.$api.sendRequest({
-					url: '/api/memberaddress/addthreeparties',
-					data: params,
-					success: res => {
-						if (res.code >= 0) {
-
-							if (this.back != '') {
-								this.$util.redirectTo(this.back, {}, 'redirectTo');
-							} else {
-								this.$refs.mescroll.refresh();
-							}
-
-						} else {
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					}
-				});
-			}
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.$refs.mescroll.refresh();
-				}
+export default {
+	components: {
+		MescrollUni,
+		nsLogin,
+		loadingCover,
+		nsEmpty,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+		return {
+			addressList: [],
+			back: '', // 返回页
+			redirect: 'redirectTo', // 跳转方式
+			isIndex: false,
+			showEmpty: false,
+			local: 0, //定位是否显示
+			localType: 1,
+		};
+	},
+	onLoad(option) {
+		if (option.back) {
+			this.back = option.back;
+			uni.setStorageSync('addressBack', option.back);
+		} else {
+			if (uni.getStorageSync('addressBack')) {
+				this.back = uni.getStorageSync('addressBack');
+				uni.removeStorageSync('addressBack');
 			}
 		}
-	};
+		if (option.redirect) this.redirect = option.redirect;
+		if (option.local) this.local = option.local;
+		if (option.type) this.localType = option.type;
+	},
+	onShow() {
+		uni.removeStorageSync('addressInfo');
+
+		if (this.storeToken) {
+			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_tool/member/address');
+			});
+		}
+	},
+	methods: {
+		getListData(mescroll) {
+			let storeId = 0;
+			let delivery = uni.getStorageSync('delivery');
+			if (delivery && delivery.delivery_type == 'local') {
+				storeId = delivery.store_id || 0;
+			}
+			this.showEmpty = false;
+			this.$api.sendRequest({
+				url: '/api/memberaddress/page',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					type: this.localType,
+					store_id: storeId
+				},
+				success: res => {
+					this.showEmpty = true;
+					let newArr = [];
+					let msg = res.message;
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
+					}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.addressList = []; //如果是第一页需手动制空列表
+					this.addressList = this.addressList.concat(newArr); //追加新数据
+					this.$forceUpdate();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+
+		/* 地址跳转 */
+		addAddress(type, id) {
+			let data = {
+				type: this.localType
+			};
+			if (type == 'edit') data.id = id;
+			if (this.back) data.back = this.back;
+
+			this.$util.redirectTo('/pages_tool/member/address_edit', data);
+		},
+		/* 删除地址信息 */
+		deleteAddress(id, is_default) {
+			uni.showModal({
+				title: '操作提示',
+				content: '确定要删除该地址吗？',
+				success: res => {
+					if (res.confirm) {
+						if (is_default == 1) {
+							this.$util.showToast({
+								title: '默认地址，不能删除'
+							});
+							return;
+						}
+						this.$api.sendRequest({
+							url: '/api/memberaddress/delete',
+							data: {
+								id: id
+							},
+							success: res => {
+								if (res.code == 0) {
+									this.$util.showToast({
+										title: '删除成功'
+									});
+								} else {
+									this.$util.showToast({
+										title: '删除失败'
+									});
+								}
+								this.$refs.mescroll.refresh();
+							},
+							fail: res => {
+								mescroll.endErr();
+							}
+						});
+					}
+				}
+			});
+		},
+		setDefault(id, is_default) {
+			if (is_default == 1) return;
+			this.$api.sendRequest({
+				url: '/api/memberaddress/setdefault',
+				data: {
+					id
+				},
+				success: res => {
+					if (res.data > 0) {
+						this.$refs.mescroll.refresh();
+						if (this.back != '') {
+							this.$util.redirectTo(this.back, {}, 'redirectTo');
+						} else {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+							this.addressList = [];
+							this.$refs.mescroll.refresh();
+							this.$util.showToast({
+								title: '修改默认地址成功'
+							});
+						}
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		},
+		/**
+		 * 一键获取地址
+		 */
+		getChooseAddress() {
+			// #ifdef H5
+			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 => {
+						if (jssdkRes.code == 0) {
+							var wxJS = new Weixin();
+							wxJS.init(jssdkRes.data);
+							wxJS.openAddress(res => {
+								if (res.errMsg == 'openAddress:ok') {
+									this.saveAddress({
+										name: res.userName, // 收货人姓名,
+										mobile: res.telNumber, // 手机号
+										province: res.provinceName, // 省
+										city: res.cityName, // 市
+										district: res.countryName, // 县
+										address: res.detailInfo, // 详细地址
+										full_address: res.provinceName + '-' + res.cityName + '-' + res.countryName,
+										is_default: 1
+									});
+								} else {
+									this.$util.showToast({
+										title: res.errMsg == 'openAddress:function not implement' ? 'PC端微信不支持一键获取地址' : res.errMsg
+									});
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: jssdkRes.message
+							});
+						}
+					}
+				});
+			}
+			// #endif
+
+			// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO
+			uni.chooseAddress({
+				success: res => {
+					if (res.errMsg == 'chooseAddress:ok') {
+						this.saveAddress({
+							name: res.userName, // 收货人姓名,
+							mobile: res.telNumber, // 手机号
+							province: res.provinceName, // 省
+							city: res.cityName, // 市
+							district: res.countyName, // 县
+							address: res.detailInfo, // 详细地址
+							full_address: res.provinceName + '-' + res.cityName + '-' + res.countyName,
+							is_default: 1
+						});
+					} else {
+						this.$util.showToast({
+							title: res.errMsg
+						});
+					}
+				},
+				fail: res => {
+					console.log('fail', res);
+				}
+			});
+			// #endif
+		},
+		/**
+		 * 保存微信地址
+		 * @param {Object} params
+		 */
+		saveAddress(params) {
+			this.$api.sendRequest({
+				url: '/api/memberaddress/addthreeparties',
+				data: params,
+				success: res => {
+					if (res.code >= 0) {
+
+						if (this.back != '') {
+							this.$util.redirectTo(this.back, {}, 'redirectTo');
+						} else {
+							this.$refs.mescroll.refresh();
+						}
+
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				}
+			});
+		}
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.$refs.mescroll.refresh();
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
+
+.cart-empty {
+	padding-top: 208rpx !important;
+}
+
+.address-list {
+	width: 100%;
+	height: 100%;
+	padding-bottom: 40rpx;
+
+	.local {
+		display: flex;
+		align-items: center;
+		margin: $margin-updown $margin-both;
+		background-color: #fff;
+		padding: 30rpx;
+		border-radius: $border-radius;
+
+		text {
+			margin-right: 10rpx;
+		}
 	}
 
-	.cart-empty {
-		padding-top: 208rpx !important;
-	}
+	.address-item {
+		margin: $padding 0 0;
+		display: flex;
+		flex-direction: column;
+		background-color: #ffffff;
+		padding: 24rpx 30rpx;
+		box-sizing: border-box;
+		border-radius: 0;
 
-	.address-list {
-		width: 100%;
-		height: 100%;
-		padding-bottom: 40rpx;
-
-		.local {
+		.address-item-top {
 			display: flex;
+			flex-direction: row;
+			border-bottom: 1rpx solid $color-line;
+			justify-content: space-between;
 			align-items: center;
-			margin: $margin-updown $margin-both;
-			background-color: #fff;
-			padding: 30rpx;
-			border-radius: $border-radius;
 
-			text {
-				margin-right: 10rpx;
+			.address-item-left {
+				display: flex;
+				flex-direction: column;
+				width: calc(100% - 100rpx);
+			}
+
+			.address-item-edit {
+				color: #999;
+				font-size: 24rpx;
+				width: 100rpx;
+				text-align: right;
+			}
+
+			.address-top-info {
+				display: flex;
+				justify-content: flex-start;
+				position: relative;
+
+				.address-name {
+					color: #333333;
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+
+				.address-tel {
+					color: #333333;
+					font-size: 30rpx;
+					margin-left: 26rpx;
+					font-weight: bold;
+				}
+
+				.address-status {
+					color: #f00;
+					font-size: $font-size-base;
+					position: absolute;
+					right: 0;
+				}
+			}
+
+			.address-info {
+				font-size: 26rpx;
+				color: #888888;
+				margin-top: 10rpx;
+				margin-bottom: 28rpx;
 			}
 		}
 
-		.address-item {
-			margin: $padding 0 0;
+		.address-item-bottom {
 			display: flex;
-			flex-direction: column;
-			background-color: #ffffff;
-			padding: 24rpx 30rpx;
-			box-sizing: border-box;
-			border-radius: 0;
+			justify-content: space-between;
+			padding-top: 24rpx;
 
-			.address-item-top {
+			.address-default {
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				line-height: 1;
+				color: #666666;
+
+				.default {}
+
+				.iconfont {
+					line-height: 1;
+				}
+			}
+
+			.address-btn {
+				font-size: $font-size-base;
+				line-height: 1;
 				display: flex;
-				flex-direction: row;
-				border-bottom: 1rpx solid $color-line;
-				justify-content: space-between;
 				align-items: center;
 
-				.address-item-left {
-					display: flex;
-					flex-direction: column;
-					width: calc(100% - 100rpx);
-				}
-
-				.address-item-edit {
-					color: #999;
-					font-size: 24rpx;
-					width: 100rpx;
-					text-align: right;
-				}
-
-				.address-top-info {
-					display: flex;
-					justify-content: flex-start;
-					position: relative;
-
-					.address-name {
-						color: #333333;
+				.edit {
+					text {
+						vertical-align: center;
+						margin-right: 10rpx;
 						font-size: 30rpx;
-						font-weight: bold;
-					}
-
-					.address-tel {
-						color: #333333;
-						font-size: 30rpx;
-						margin-left: 26rpx;
-						font-weight: bold;
-					}
-
-					.address-status {
-						color: #f00;
-						font-size: $font-size-base;
-						position: absolute;
-						right: 0;
 					}
 				}
 
-				.address-info {
-					font-size: 26rpx;
-					color: #888888;
-					margin-top: 10rpx;
-					margin-bottom: 28rpx;
-				}
-			}
-
-			.address-item-bottom {
-				display: flex;
-				justify-content: space-between;
-				padding-top: 24rpx;
-
-				.address-default {
-					display: flex;
+				.delete {
+					background: #F1F1F1;
+					justify-content: center;
 					align-items: center;
-					font-size: 24rpx;
-					line-height: 1;
-					color: #666666;
+					border-radius: 50%;
+					padding: 10rpx;
+					text-align: center;
+					width: 48rpx;
+					height: 48rpx;
+					box-sizing: border-box;
 
-					.default {}
-
-					.iconfont {
-						line-height: 1;
-					}
-				}
-
-				.address-btn {
-					font-size: $font-size-base;
-					line-height: 1;
-					display: flex;
-					align-items: center;
-
-					.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;
 					}
 				}
 			}
 		}
 	}
+}
 
-	.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;
+.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-address {
-			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;
-			}
-		}
-	}
-
-	.wx-add {
-		margin-top: 30rpx;
-		margin-bottom: 30rpx;
-		text-align: center;
-		border-radius: 80rpx;
+	.add-address {
 		height: 80rpx;
 		line-height: 80rpx;
-		background-color: var(--main-color);
-		border: 2rpx solid var(--main-color);
-		color: #FFFFFF;
+		border-radius: 80rpx;
+		margin: 30rpx 0 30rpx;
+		font-size: $font-size-toolbar;
+
+		text {
+			margin-right: 10rpx;
+			font-size: $font-size-base;
+		}
+	}
+}
+
+.wx-add {
+	margin-top: 30rpx;
+	margin-bottom: 30rpx;
+	text-align: center;
+	border-radius: 80rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	background-color: var(--main-color);
+	border: 2rpx solid var(--main-color);
+	color: #FFFFFF;
+	font-size: $font-size-toolbar;
+}
+
+.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-address,
+	.add-address {
+		width: 50%;
+		height: 78rpx;
+		line-height: 78rpx;
+		border-radius: 78rpx;
+		margin-top: 50rpx;
+
 		font-size: $font-size-toolbar;
 	}
 
-	.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-address,
-		.add-address {
-			width: 50%;
-			height: 78rpx;
-			line-height: 78rpx;
-			border-radius: 78rpx;
-			margin-top: 50rpx;
-
-			font-size: $font-size-toolbar;
-		}
-
-		.get-address {
-			width: 50%;
-			border: 2rpx solid $base-color;
-			margin-top: 20rpx;
-			box-sizing: border-box;
-		}
+	.get-address {
+		width: 50%;
+		border: 2rpx solid $base-color;
+		margin-top: 20rpx;
+		box-sizing: border-box;
 	}
+}
 
-	.mescroll-downwarp+.empty-box {
-		height: calc(100vh - 260rpx);
-	}
+.mescroll-downwarp+.empty-box {
+	height: calc(100vh - 260rpx);
+}
 </style>
 <style>
-	.address-item>>>.uni-switch-wrapper .uni-switch-input {
-		height: 48rpx !important;
-		width: 88rpx !important;
-	}
+.address-item>>>.uni-switch-wrapper .uni-switch-input {
+	height: 48rpx !important;
+	width: 88rpx !important;
+}
 
-	.address-item>>>.uni-switch-wrapper .uni-switch-input:after {
-		height: 44rpx !important;
-		width: 44rpx !important;
-	}
+.address-item>>>.uni-switch-wrapper .uni-switch-input:after {
+	height: 44rpx !important;
+	width: 44rpx !important;
+}
 
-	.address-item>>>.uni-switch-wrapper .uni-switch-input:before {
-		background-color: #EDEDED !important;
-		height: 44rpx !important;
-		width: 90rpx !important;
-	}
+.address-item>>>.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/balance_detail.vue b/pages_tool/member/balance_detail.vue
index 3beed6a..e0baf95 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -54,12 +54,18 @@
 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
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 		data() {
 			const currentDate = this.getDate({
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index 635973a..5153e8b 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -40,6 +40,9 @@ import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 import nsLogin from '@/components/ns-login/ns-login.vue';
 import loadingCover from '@/components/loading-cover/loading-cover.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 import collection from './public/js/collection.js';
 
 export default {
@@ -48,7 +51,10 @@ export default {
 		nsEmpty,
 		nsLogin,
 		loadingCover,
-		MescrollUni
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 		mixins: [collection],
 		data() {
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
index c87b1cf..660888b 100644
--- a/pages_tool/member/coupon.vue
+++ b/pages_tool/member/coupon.vue
@@ -74,12 +74,18 @@ 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
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 	data() {
 			return {
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
index c36be5c..4cf5824 100644
--- a/pages_tool/member/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -68,13 +68,19 @@ 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
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 	data() {
 		return {
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index 35d9ec9..b55dd8c 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -49,12 +49,18 @@ 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
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 	data() {
 		const currentDate = this.getDate({
diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue
index 32acbdd..0efa35e 100644
--- a/pages_tool/member/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -34,12 +34,18 @@ 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
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
 	},
 	data() {
 		return {
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 87d1548..9d9c465 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -3,7 +3,8 @@
 		<mescroll-uni @getData="getData" ref="mescroll">
 			<block slot="list">
 				<view class="notice-list" v-if="dataList.length">
-					<view class="notice-item" @click="jumpDetail(item.id)" v-for="(item, index) in dataList" :key="index">
+					<view class="notice-item" @click="jumpDetail(item.id)" v-for="(item, index) in dataList"
+						:key="index">
 						<view class="title-info">
 							<view class="title">
 								<text v-if="item.is_top == 1" class="color-base-bg tag">置顶</text>
@@ -27,152 +28,167 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				dataList: []
-			};
-		},
-		onShow() {
-			this.setPublicShare();
-		},
-		methods: {
-			getData(mescroll) {
-				this.$api.sendRequest({
-					url: '/api/notice/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); //追加新数据
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					},
-					fail: res => {
-						mescroll.endErr();
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+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
+	},
+	data() {
+		return {
+			dataList: []
+		};
+	},
+	onShow() {
+		this.setPublicShare();
+	},
+	methods: {
+		getData(mescroll) {
+			this.$api.sendRequest({
+				url: '/api/notice/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
+						});
 					}
-				});
-			},
-			jumpDetail(e) {
-				this.$util.redirectTo('/pages_tool/notice/detail?notice_id=' + e);
-			},
-			// 设置公众号分享
-			setPublicShare() {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
-				this.$util.setPublicShare({
-					title: '公告',
-					desc: '',
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
+					mescroll.endSuccess(newArr.length);
+					//设置列表数据
+					if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					this.dataList = this.dataList.concat(newArr); //追加新数据
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
 		},
-		onShareAppMessage(res) {
-			var title = '公告';
-			var path = '/pages_tool/notice/list';
-			return {
-				title: title,
-				path: path,
-				success: res => {},
-				fail: res => {}
-			};
+		jumpDetail(e) {
+			this.$util.redirectTo('/pages_tool/notice/detail?notice_id=' + e);
+		},
+		// 设置公众号分享
+		setPublicShare() {
+			let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
+			this.$util.setPublicShare({
+				title: '公告',
+				desc: '',
+				link: shareUrl,
+				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+			});
 		}
-	};
+	},
+	onShareAppMessage(res) {
+		var title = '公告';
+		var path = '/pages_tool/notice/list';
+		return {
+			title: title,
+			path: path,
+			success: res => { },
+			fail: res => { }
+		};
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .fixed {
-		position: relative;
-		top: 0;
-	}
+/deep/ .fixed {
+	position: relative;
+	top: 0;
+}
 
-	.cart-empty {
-		padding-top: 308rpx;
-	}
+.cart-empty {
+	padding-top: 308rpx;
+}
 
-	.notice-list {
-		.notice-item {
-			margin: $margin-updown $margin-both;
-			background: #fff;
-			border-radius: 10rpx;
-			padding: 32rpx 34rpx;
-			box-sizing: border-box;
+.notice-list {
+	.notice-item {
+		margin: $margin-updown $margin-both;
+		background: #fff;
+		border-radius: 10rpx;
+		padding: 32rpx 34rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+
+		.title-info {
+			width: 100%;
 			display: flex;
-			flex-direction: column;
+			justify-content: space-between;
 			align-items: center;
-			line-height: 1;
+			overflow: hidden;
 
-			.title-info {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				overflow: hidden;
-
-				.title {
-					flex: 6;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					display: flex;
-					align-items: center;
-
-					.txt {
-						color: #000;
-						font-size: $font-size-base;
-					}
-
-					.tag {
-						font-size: 22rpx;
-						color: #ffffff;
-						line-height: 28rpx;
-						border-radius: 6rpx;
-						padding: 2rpx 6rpx;
-						margin-right: 10rpx;
-					}
-				}
-
-				.release-time {
-					flex: 2;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					margin-left: 20rpx;
-					color: $color-tip;
-					text-align: right;
-					font-size: $font-size-tag;
-				}
-
-				.iconfont {
-					color: $color-tip;
-					font-size: $font-size-tag;
-				}
-			}
-
-			.content {
-				margin-top: 10rpx;
-				display: inline-block;
-				white-space: nowrap;
+			.title {
+				flex: 6;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				width: 100%;
+				white-space: nowrap;
+				display: flex;
+				align-items: center;
+
+				.txt {
+					color: #000;
+					font-size: $font-size-base;
+				}
+
+				.tag {
+					font-size: 22rpx;
+					color: #ffffff;
+					line-height: 28rpx;
+					border-radius: 6rpx;
+					padding: 2rpx 6rpx;
+					margin-right: 10rpx;
+				}
+			}
+
+			.release-time {
+				flex: 2;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				margin-left: 20rpx;
 				color: $color-tip;
-				font-size: $font-size-goods-tag;
-				padding-bottom: 30rpx;
+				text-align: right;
+				font-size: $font-size-tag;
+			}
+
+			.iconfont {
+				color: $color-tip;
+				font-size: $font-size-tag;
 			}
 		}
+
+		.content {
+			margin-top: 10rpx;
+			display: inline-block;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 100%;
+			color: $color-tip;
+			font-size: $font-size-goods-tag;
+			padding-bottom: 30rpx;
+		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
index 2dbcaaa..305ed6e 100644
--- a/pages_tool/order/activist.vue
+++ b/pages_tool/order/activist.vue
@@ -58,11 +58,15 @@
 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
+		nsEmpty,
+		nsLogin,
+		loadingCover
 	},
 	data() {
 		return {
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
index c59cb8d..8b7870e 100644
--- a/pages_tool/recharge/order_list.vue
+++ b/pages_tool/recharge/order_list.vue
@@ -44,6 +44,7 @@ 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,