From eac9ec7c83b65aa62675ccbc167e6dbb22f62228 Mon Sep 17 00:00:00 2001
From: guzhenfu <867124018@mslife.com>
Date: Sun, 27 Mar 2022 10:15:42 +0800
Subject: [PATCH 1/3] update code

---
 src/index.less         |  4 ++--
 src/view/about.vue     |  2 +-
 src/view/exchange.vue  |  2 +-
 src/view/km.vue        |  2 +-
 src/view/main/main.vue |  2 +-
 src/view/overview.vue  | 18 ++++++++----------
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/index.less b/src/index.less
index 60794e2..c34b32c 100755
--- a/src/index.less
+++ b/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;
diff --git a/src/view/about.vue b/src/view/about.vue
index d2a5c50..3d0c961 100755
--- a/src/view/about.vue
+++ b/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>
diff --git a/src/view/exchange.vue b/src/view/exchange.vue
index 90e6525..6d1f80f 100755
--- a/src/view/exchange.vue
+++ b/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>
diff --git a/src/view/km.vue b/src/view/km.vue
index 1568c67..d0bc0d7 100755
--- a/src/view/km.vue
+++ b/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>
diff --git a/src/view/main/main.vue b/src/view/main/main.vue
index 8773446..855f229 100755
--- a/src/view/main/main.vue
+++ b/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>
diff --git a/src/view/overview.vue b/src/view/overview.vue
index 6452e1b..fe14c8d 100755
--- a/src/view/overview.vue
+++ b/src/view/overview.vue
@@ -2,7 +2,7 @@
   <div>
     <el-carousel trigger="click" height="400px">
       <el-carousel-item v-for="(item,index) in lunBoList" :key="index">
-        <img :src="item.aboutImg"/>
+        <img :src="item.aboutImgUrl"/>
       </el-carousel-item>
     </el-carousel>
     <el-main style="width: 960px;margin: 0 auto">
@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="12"><div class="grid-content bg-purple-light"></div>
           <el-card class="box-card" shadow="never" style="margin: 0 10px; position: relative;" :body-style="{ padding: '0px',height:'418px' }">
-            <img :src="imgObj.aboutImg"/>
+            <img :src="imgObj.aboutImgUrl"/>
             <div class="img_info">
                 <span class="img_text">{{imgObj.title}}</span>
             </div>
@@ -48,7 +48,7 @@
               </div>
               <h2>{{hangDamic.title}}</h2>
               <p v-html="hangDamic.content"></p>
-              <img :src="hangDamic.aboutImg" style="border-radius: 10px;margin: 10px 0" width="100%"/>
+              <img :src="hangDamic.aboutImgUrl" style="border-radius: 10px;margin: 10px 0" width="100%"/>
             </el-card>
           </el-col>
           <el-col :span="12">
@@ -81,7 +81,7 @@
             :body-style="{ padding: '0px 20px' }">
               <h2>{{item.title}}</h2>
               <p v-html="item.content"></p>
-              <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%"/>
             </el-card>
           </el-col>
           <el-col :span="8">
@@ -98,7 +98,7 @@
             :body-style="{ padding: '0px 20px' }">
               <h2>{{item.title}}</h2>
               <p v-html="item.content"></p>
-              <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%"/>
             </el-card>
           </el-col>
           <el-col :span="8">
@@ -115,7 +115,7 @@
             :body-style="{ padding: '0px 20px' }">
               <h2>{{item.title}}</h2>
               <p v-html="item.content"></p>
-              <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%"/>
             </el-card>
           </el-col>
         </el-row>
@@ -170,7 +170,7 @@
                     <span class="time">{{item.title}}</span>
                 </h2>
                 <p v-html="item.content"></p>
-                <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%"/>
               </div>
             </el-card>
           </el-col>
@@ -186,7 +186,7 @@
                     <span class="time">{{item.title}}</span>
                 </h2>
                 <p v-html="item.content"></p>
-                <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%"/>
               </div>
             </el-card>
           </el-col>
@@ -321,8 +321,6 @@ export default {
                   }else if(weizhi == "N"){
                       // 轮播
                       this.lunBoList = res.data.records
-                      console.log(JSON.stringify(this.hezuoList))
-                      console.log(id)
                   }
               }
           }

From 652755bfb241a6389e0deb43f106245da7e99ecd Mon Sep 17 00:00:00 2001
From: guzhenfu <867124018@mslife.com>
Date: Sun, 27 Mar 2022 11:17:55 +0800
Subject: [PATCH 2/3] update code

---
 src/view/overview.vue    | 2 +-
 src/view/vip-service.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/overview.vue b/src/view/overview.vue
index fe14c8d..29aaebf 100755
--- a/src/view/overview.vue
+++ b/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">
               {{index+1}}、{{o.title}}
diff --git a/src/view/vip-service.vue b/src/view/vip-service.vue
index 7d8ecea..8e51b31 100644
--- a/src/view/vip-service.vue
+++ b/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"

From 6792da2335e2ba1e514af4665a4dbde17a66d4ec Mon Sep 17 00:00:00 2001
From: guzhenfu <867124018@mslife.com>
Date: Sun, 27 Mar 2022 11:19:19 +0800
Subject: [PATCH 3/3] update code

---
 src/view/overview.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/view/overview.vue b/src/view/overview.vue
index e4ddffa..53d6fb3 100755
--- a/src/view/overview.vue
+++ b/src/view/overview.vue
@@ -340,11 +340,6 @@ export default {
                   }else if(weizhi == "N"){
                       // 轮播
                       this.lunBoList = res.data.records
-<<<<<<< HEAD
-=======
-                      console.log(JSON.stringify(this.lunBoList))
-                      console.log(id)
->>>>>>> e30a98a1e8fa5d15bcac9b801b3c04b02c6dba55
                   }
               }
           }