Merge branch 'master' of http://git.weirui0755.com/jack/parkBigScreen2

src/components/companySummary/talent.vue

@@ -120,8 +120,8 @@ export default {
       let option = {
         title: {
           text: `总金额： ${this.chartData ? this.chartData.totalAmount || 0 : 0}  元`,
-          top: 20,
+          top: '12%',
-          left: 200,
+          left: '45%',
           textStyle: {
             //文字颜色
             color: '#fff',
@@ -129,10 +129,9 @@ export default {
 
         },
         legend: {
-          right: 210,
+          right: '35%',
           orient: 'vertical',
-          top: 60,
+          top: '25%',
-          bottom: 20,
           data: legendData,
           icon: "circle",
           textStyle: {

src/main.js

@@ -14,10 +14,10 @@ import dayjs from 'dayjs'
 import '@/assets/styles/base.scss'
 import '@/assets/styles/common.scss'
 import '@/assets/iconfont/iconfont.css'
-
+import loadingViewerVue from 'loading-view-vue'
+Vue.use(loadingViewerVue)
 Vue.use(vueParticles)
 Vue.use(Vcomp)
-
 Vue.config.productionTip = false
 Vue.prototype.axios = axios
 Vue.prototype.dayjs = dayjs

src/views/Brand.vue

@@ -141,7 +141,6 @@ import { BiApi } from "@/api/form";
 import "@/assets/js/flexible";
 import "@/assets/js/china";
 import countTo from "vue-count-to";
-
 const paramsArr = window.location.href.split('?')
 let authCode = ''
 if (paramsArr.length > 1) {
@@ -203,10 +202,15 @@ export default {
   },
   mounted() {
     if (authCode && typeof +authCode === 'number') {
+      this.$showLoading();
       this.heart();
       setTimeout(() => {
         this.getEchart();
       }, 800);
+      // loading
+            setTimeout(() => {
+        this.$hideLoading();
+      }, 900);
     } else {
       // console.log('授权码为空', authCode);
       alert('授权码为空,请从系统调用页面!')