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

pages_tool/index/diy.vue

@@ -56,21 +56,15 @@
 </template>
 
 <script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
 import microPageJs from './public/js/diy.js';
 
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
-		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif			
+		uniPopup,
+		nsNavbar
 	},
 	mixins: [diyJs, microPageJs]
 };
@@ -85,17 +79,14 @@ export default {
 	background: none !important;
 }
 
-.choose-store>>>.goodslist-uni-popup-box {
-	width: 80%;
-}
-</style>
-
-<style lang="scss" scoped>
-	
 /deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
+
 /deep/ .placeholder {
 	height: 0;
 }
@@ -110,4 +101,4 @@ export default {
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
-</style>
+</style>