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

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

components/hover-nav/hover-nav.vue

@@ -67,7 +67,7 @@ export default {
 		this.kefuimg = this.$util.getDefaultImage().kefu
 		this.phoneimg = this.$util.getDefaultImage().phone
 		this.pageCount = getCurrentPages().length;
-
+		
 		// 从店铺信息中获取相关信息
 		uni.getStorage({
 			key: 'shopInfo',
@@ -80,8 +80,7 @@ export default {
 				// 从店铺信息中获取是否启用语言切换
 				this.isLanguageSwitchEnabled = e.data.ischina;
 			}
-		})
-
+		})			
 	},
 	computed: {
 		currentLangDisplayName() {
@@ -203,6 +202,7 @@ export default {
 		margin: 14rpx 0;
 		transition: 0.1s;
 		background: #c6251b;
+		// background: var(--hover-nav-bg-color);
 		color: #fff;
 		border-radius: 40rpx;
 		width: 80rpx;