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

pages_tool/member/coupon.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :class="isIphoneX ? 'iphone-x' : ''">
+	<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
 		<view class="cf-container color-line-border" v-if="storeToken">
 			<view class="tab">
 				<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
@@ -75,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 {