chore(代码合并): 代码从Custom/common分支合并

pages_tool/member/account.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">
 				<view class="nc-info-list-content">
@@ -66,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 {