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

pages_tool/goods/brand.vue

@@ -27,11 +27,25 @@
 	import uniGrid from '@/components/uni-grid/uni-grid.vue';
 	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.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: {
 			uniGrid,
 			uniGridItem,
-			nsAdv
+			nsAdv,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
 		data() {
 			return {