Merge branch '20210819' of 123.207.147.179:vue-project/liangXing/frontEnd into 20210819

src/pages/index/Center.vue

@@ -3,7 +3,7 @@
         <div class="survey-content">
             <div class="item" v-for="(g, l) in survey" :key="l">
                 <count-to :endVal="g.value" />
-                <p>{{g.name}}</p>
+                <p>{{g.key}}</p>
             </div>
         </div>
         <div class="china-map-warp">
@@ -34,14 +34,15 @@ export default {
         TitleLine,
         ChinaMap
     },
-
+    props: {
+        centerData: {
+            default: {},
+            type: Object
+        }
+    },
     data () {
         return {
-            survey: [
-                { name: '学员数', value: 31721 },
-                { name: '班级数', value: 105 },
-                { name: '二级协会数', value: 15 }
-            ],
+            survey: [],
             chinaMapConfig: {
                 base: {},
                 seriesData: []
@@ -53,9 +54,15 @@ export default {
 
     mounted () {
         this.getInitChinaMap()
+        this.initSurvey()
     },
 
     methods: {
+        initSurvey () {
+            if (this.centerData && this.centerData.survey && this.centerData.survey.list) {
+                this.survey = this.centerData.survey.list || []
+            }
+        },
         getInitChinaMap () {
             let series = []
             let maps = [['南通', this.chinaDatas]]
@@ -155,7 +162,7 @@ export default {
                             // 根据业务自己拓展要显示的内容
                             let name = params.name
                             if (name === '南通') {
-                                return `<div style="width: 554px;height: 361px;background: url('../../../static/images/index/mapFloatBG.png') no-repeat;"></div>`
+                                return `<div style="width: 554px;height: 361px;background: url(${require('../../../static/images/index/mapFloatBG.png')}) no-repeat;"></div>`
                             } else {
                                 return ''
                             }

src/pages/index/Right.vue

@@ -217,13 +217,13 @@ export default {
             },
             topicList: [
                 {
-                    img: '../../../static/images/index/topic-bg1.png'
+                    img: require('../../../static/images/index/topic-bg1.png')
                 },
                 {
-                    img: '../../../static/images/index/topic-bg1.png'
+                    img: require('../../../static/images/index/topic-bg1.png')
                 },
                 {
-                    img: '../../../static/images/index/topic-bg1.png'
+                    img: require('../../../static/images/index/topic-bg1.png')
                 }
 
             ],
@@ -796,6 +796,7 @@ export default {
               position: absolute;
               top: 40%;
               right: 10px;
+              cursor: pointer;
             }
         } 
     }

src/pages/index/index.vue

@@ -71,6 +71,7 @@ export default {
                 }
                 // 中间数据
                 this.centerData = {
+                    survey: data.p11 || {} // 中间概况数据
                 }
                 // 右侧数据
                 this.rightData = {

src/public/apis/index.js

@@ -4,12 +4,12 @@
 ;(function () {
     // 接口请求域名
     window.domain = {
-        stg: 'http://192.168.0.121:9000/', // 测试环境域名
-        prd: 'http://192.168.0.121:9000/' // 生产环境域名
+        stg: 'http://192.168.0.121:9000', // 测试环境域名
+        prd: '' // 生产环境域名 http://192.168.0.121:9000/
     }
 
     // 接口请求路径
     window.apis = {
-        managePlatform: 'api/page1info'
+        managePlatform: '/api/page1info'
     }
 })()