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

pages_promotion/point/payment.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="order-container" :class="{ 'safe-area': isIphoneX }">
+	<view class="order-container" :style="themeColor" :class="{ 'safe-area': isIphoneX }">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="payment-navbar" :style="{
 				'padding-top': menuButtonBounding.top + 'px',
@@ -280,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]
 	};
@@ -292,18 +307,18 @@
 <style lang="scss">
 	@import "@/common/css/order_parment.scss";
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background: none;
 		max-height: unset !important;
 		overflow-y: hidden !important;
 	}
 
-	>>>.uni-popup__wrapper {
+	/deep/ .uni-popup__wrapper {
 		border-radius: 20rpx 20rpx 0 0;
 	}
 
-	>>>.uni-popup {
+	/deep/ .uni-popup {
 		z-index: 8;
 	}
 </style>