fix(组件): 修补组件引用缺失

components-diy/diy-digit.vue

@@ -1,5 +1,5 @@
-<template>
+<template>
-	<view :style="componentStyle">
+	<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">

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 {

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

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

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

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: '专属客服'
 }

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

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

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>

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

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

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-goods-tag">{{
-											<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
+												$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 {

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

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

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

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 {

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

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

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

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
+									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn" style="background: #0054a5;">{{ $lang('call') }}</span>
-										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>
 								</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
+									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn" style="background: #888;">{{ $lang('copy') }}</span>
-										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>
 								</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="请输入您的姓名"
+										<input v-model="Form.realname" class="fui-input" :placeholder="$lang('pleaseEnterName')" value=""></input>
-											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"
+										<input v-model="Form.mobile" class="fui-input" maxlength="11" :placeholder="$lang('pleaseEnterMobile')" type="number"></input>
-											placeholder="请输入您的手机号" 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="请输入留言内容"
+										<textarea class="textarea" v-model="Form.remark" :placeholder="$lang('pleaseEnterMessage')" style="font-size: 28rpx;padding: 10rpx;"></textarea>
-											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 {
+/deep/ .mescroll-totop {
-		right: 27rpx!important; 
+	right: 27rpx !important;
-		/* #ifdef H5 */
+	/* #ifdef H5 */
-		bottom: 120rpx!important;
+	bottom: 120rpx !important;
-		/* #endif */		
+	/* #endif */
-		/* #ifdef MP-WEIXIN */
+	/* #ifdef MP-WEIXIN */
-		bottom: 180rpx!important;
+	bottom: 180rpx !important;
-		/* #endif */
+	/* #endif */
-	}
+}
 </style>

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 {

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

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
+								<view class="img-box" v-for="(again_img, again_index) in item.again_images"
-									class="img-box"
+									:key="again_index" @click="previewEvaluate(index, again_index, 'again_images')">
-									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;
 	}
 }

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 {

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

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

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 {

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 {

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

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 {

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 {
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-		data() {
+import nsLogin from '@/components/ns-login/ns-login.vue';
-			return {
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
-				dataList: []
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-			};
+// #ifdef MP-WEIXIN
-		},
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-		onShow() {
+// #endif	
-			this.setPublicShare();
+export default {
-		},
+	components: {
-		methods: {
+		nsLogin,
-			getData(mescroll) {
+		MescrollUni,
-				this.$api.sendRequest({
+		nsEmpty,
-					url: '/api/notice/page',
+		// #ifdef MP-WEIXIN
-					data: {
+		privacyPopup
-						page_size: mescroll.size,
+		// #endif
-						page: mescroll.num
+	},
-					},
+	data() {
-					success: res => {
+		return {
-						let newArr = [];
+			dataList: []
-						let msg = res.message;
+		};
-						if (res.code == 0 && res.data) {
+	},
-							newArr = res.data.list;
+	onShow() {
-						} else {
+		this.setPublicShare();
-							this.$util.showToast({
+	},
-								title: msg
+	methods: {
-							});
+		getData(mescroll) {
-						}
+			this.$api.sendRequest({
-						mescroll.endSuccess(newArr.length);
+				url: '/api/notice/page',
-						//设置列表数据
+				data: {
-						if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+					page_size: mescroll.size,
-						this.dataList = this.dataList.concat(newArr); //追加新数据
+					page: mescroll.num
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				},
-					},
+				success: res => {
-					fail: res => {
+					let newArr = [];
-						mescroll.endErr();
+					let msg = res.message;
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					if (res.code == 0 && res.data) {
+						newArr = res.data.list;
+					} else {
+						this.$util.showToast({
+							title: msg
+						});
 					}
-				});
+					mescroll.endSuccess(newArr.length);
-			},
+					//设置列表数据
-			jumpDetail(e) {
+					if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
-				this.$util.redirectTo('/pages_tool/notice/detail?notice_id=' + e);
+					this.dataList = this.dataList.concat(newArr); //追加新数据
-			},
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-			// 设置公众号分享
+				},
-			setPublicShare() {
+				fail: res => {
-				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
+					mescroll.endErr();
-				this.$util.setPublicShare({
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					title: '公告',
+				}
-					desc: '',
+			});
-					link: shareUrl,
-					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-				});
-			}
 		},
-		onShareAppMessage(res) {
+		jumpDetail(e) {
-			var title = '公告';
+			this.$util.redirectTo('/pages_tool/notice/detail?notice_id=' + e);
-			var path = '/pages_tool/notice/list';
+		},
-			return {
+		// 设置公众号分享
-				title: title,
+		setPublicShare() {
-				path: path,
+			let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
-				success: res => {},
+			this.$util.setPublicShare({
-				fail: res => {}
+				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 {
+/deep/ .fixed {
-		position: relative;
+	position: relative;
-		top: 0;
+	top: 0;
-	}
+}
 
-	.cart-empty {
+.cart-empty {
-		padding-top: 308rpx;
+	padding-top: 308rpx;
-	}
+}
 
-	.notice-list {
+.notice-list {
-		.notice-item {
+	.notice-item {
-			margin: $margin-updown $margin-both;
+		margin: $margin-updown $margin-both;
-			background: #fff;
+		background: #fff;
-			border-radius: 10rpx;
+		border-radius: 10rpx;
-			padding: 32rpx 34rpx;
+		padding: 32rpx 34rpx;
-			box-sizing: border-box;
+		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 {
+			.title {
-				width: 100%;
+				flex: 6;
-				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;
 				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;
+				text-align: right;
-				padding-bottom: 30rpx;
+				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>

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 {

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,