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

pages_tool/pay/cashier.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="cashier">
+	<view class="cashier" :style="themeColor">
 		<block v-if="payInfo">
 			<block v-if="payInfo.pay_status == 0">
 				<text class="content">{{ payInfo.pay_body }}</text>
@@ -31,11 +30,11 @@
 </template>
 
 <script>
-import { Weixin } from 'common/js/wx-jssdk.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-
-export default {
+import { Weixin } from 'common/js/wx-jssdk.js';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
+export default {
 	components: { nsLogin, nsEmpty },
 	data() {
 		return {