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

pages/index/index.vue

@@ -14,7 +14,7 @@
 					</view>
 				</view>
 				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
-				}}</view>
+					}}</view>
 			</view>
 
 			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
@@ -148,25 +148,29 @@
 </template>
 
 <script>
-
-
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 import diyJs from '@/common/js/diy.js';
+import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
+
 import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		hoverNav: () => import('@/components/hover-nav/hover-nav.vue'),
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
-		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
-		toTop: () => import('@/components/toTop/toTop.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
+		uniPopup,
+		nsNavbar,
+		toTop,
+		nsLogin,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		privacyPopup
 		// #endif
 	},
-	mixins: [diyJs, scroll, indexJs],
+	mixins: [diyJs, scroll, indexJs]
 };
 </script>
 
@@ -213,8 +217,12 @@ export default {
 	font-size: 60rpx;
 }
 </style>
-
 <style scoped>
+.swiper /deep/ .uni-swiper-dots-horizontal {
+	left: 40%;
+	bottom: 40px
+}
+
 .wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none !important;
 }
@@ -222,15 +230,8 @@ export default {
 .choose-store>>>.goodslist-uni-popup-box {
 	width: 80%;
 }
-</style>
 
-<style lang="scss" scoped>
-.swiper /deep/ .uni-swiper-dots-horizontal {
-	left: 40%;
-	bottom: 40px
-}
-
-/deep/ .diy-index-page .uni-popup .uni-popup__wrapper-box {
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
 }