Merge remote-tracking branch 'origin/master'

src/index.less

@@ -186,8 +186,8 @@ body {
   font-weight: 900;
   position: absolute;
   margin-right: 100px;
-  left: -40px;
-  top: 6px;
+  left: -100px;
+  top: 0px;
   text-align: center;
   line-height: 50px;
   width: 100px;

src/view/about.vue

@@ -22,7 +22,7 @@
           <el-row>
             <el-col :span="12" v-for="(item, index) in dataList" :key="index" >
               <el-card class="box-card" shadow="never" style="margin: 0 10px" :body-style="{ padding: '0px'}">
-                <img :src="item.aboutImg" style="border-radius: 10px;margin: 10px 0 10px 0;height: 100%;width: 100%"/>
+                <img :src="item.aboutImgUrl" style="border-radius: 10px;margin: 10px 0 10px 0;height: 100%;width: 100%"/>
               <p style="color: #333">{{item.title}}</p>
               </el-card>
             </el-col>

src/view/exchange.vue

@@ -28,7 +28,7 @@
             <li style="padding: 10px;border-bottom: 1px solid #eee;margin: 5px 0;height: 120px" 
             v-for="(item,index) in dataList" :key="index">
               <img style="float: left;width: 100px;height: 100px;border-radius: 8px" 
-                :src="item.aboutImg"/>
+                :src="item.aboutImgUrl"/>
               <div style="margin-left: 120px;">
                 <h3 style="color:#333333;">{{item.title}}</h3>
                 <p style="color: #999" v-html="item.content"></p>

src/view/km.vue

@@ -24,7 +24,7 @@
           <el-row>
             <el-col :span="6" v-for="(item,index) in dataList" :key="index" >
               <el-card class="box-card" shadow="never" style="margin: 0 10px" :body-style="{ padding: '0px' }">
-                <img :src="item.aboutImg" style="border-radius: 10px;margin: 10px 0" width="100%"/>
+                <img :src="item.aboutImgUrl" style="border-radius: 10px;margin: 10px 0" width="100%"/>
               <p style="color: #333">{{item.title}}</p>
               </el-card>
             </el-col>

src/view/main/main.vue

@@ -3,7 +3,7 @@
     <el-header class="header linear">
       <el-menu :default-active="activeIndex" mode="horizontal" style="position: relative;padding-left: 100px;width: 960px;text-align: center;margin: 0 auto;border: none;background: transparent;overflow: visible">
         <div class="logo">
-            <img src="../../assets/images/logo.jpg" style="width: 180px; height: 40px;">
+            <img src="../../assets/images/logo.jpg" style="width: 260px; height: 60px;">
         </div>
         <el-menu-item index="1"><router-link to="/overview">首页</router-link></el-menu-item>
         <el-menu-item index="2"><router-link to="/about">关于我们</router-link></el-menu-item>

src/view/overview.vue

@@ -11,7 +11,7 @@
           <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
             <div slot="header">
               <span><el-divider direction="vertical"></el-divider>重要信息</span>
-              <el-button style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+              <!-- <el-button style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</el-button> -->
             </div>
             <div v-for="(o, index) in importList" :key="index" class="text item">
               <router-link :to='"/detail?id="+o.id'>{{index+1}}、{{o.title}}</router-link>
@@ -340,8 +340,6 @@ export default {
                   }else if(weizhi == "N"){
                       // 轮播
                       this.lunBoList = res.data.records
-                      console.log(JSON.stringify(this.lunBoList))
-                      console.log(id)
                   }
               }
           }

src/view/vip-service.vue

@@ -32,7 +32,7 @@ import { ChartBar } from '_c/charts';
             <el-table
               :data="tableData"
               border
-              style="width: 100%; height: 200px;">
+              style="width: 100%; ">
               <el-table-column
                 type="index"
                 align="center"