revert: 所有代码与custom/common分支同

components/common-payment/common-payment.vue

@@ -636,19 +636,28 @@
 <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: () => import('@/components/ns-select-time/ns-select-time.vue'),
-			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-			nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+			nsSelectTime,
+			nsLogin,
+			MescrollUni,
+			loadingCover,
+			nsEmpty,
 			// #ifdef MP-WEIXIN
-			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+			privacyPopup
 			// #endif
 		},
 		props: {

components/common-payment/payment.js

@@ -1,4 +1,4 @@
-import htmlParser from '@/common/js/html-parser.js';
+import htmlParser from '@/common/js/html-parser';
 
 export default {
 	options: {
@@ -922,7 +922,7 @@ export default {
 		payClose() {
 			// 更新购物车数量
 			this.$store.dispatch('getCartNumber');
-			this.$util.redirectTo('/pages_order/detail/detail', {
+			this.$util.redirectTo('/pages_order/detail', {
 				order_id: this.$refs.choosePaymentPopup.payInfo.order_id
 			}, 'redirectTo');
 		},