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

pages_tool/order/activist.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="activist-container">
+	<view :style="themeColor" class="activist-container">
 		<mescroll-uni ref="mescroll" @getData="getListData">
 			<block slot="list">
 				<view class="container">
@@ -59,11 +58,15 @@
 import refundMethod from './public/js/refundMethod.js';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
 	components: {
 		MescrollUni,
-		nsEmpty
+		nsEmpty,
+		nsLogin,
+		loadingCover
 	},
 	data() {
 		return {