From 643acb77f09af86f476132ddfdee6ab89884104a Mon Sep 17 00:00:00 2001
From: ruan <749817500@qq.com>
Date: Sat, 31 Jul 2021 17:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms/src/router/routes.js                |  24 +-
 cms/src/views/ArticleRecommend.vue      |  42 ++-
 cms/src/views/ArticleRecommendthree.vue | 385 ------------------------
 cms/src/views/ArticleRecommendtwo.vue   | 385 ------------------------
 cms/src/views/Index.vue                 |  40 +--
 cms/src/views/UserHome.vue              |  36 +--
 cms/src/views/WALranking.vue            |  38 ++-
 cms/src/views/WARranking.vue            |  32 +-
 cms/src/views/WArecommendation.vue      |  34 ++-
 9 files changed, 136 insertions(+), 880 deletions(-)
 delete mode 100644 cms/src/views/ArticleRecommendthree.vue
 delete mode 100644 cms/src/views/ArticleRecommendtwo.vue

diff --git a/cms/src/router/routes.js b/cms/src/router/routes.js
index 460cd32..c9d2046 100644
--- a/cms/src/router/routes.js
+++ b/cms/src/router/routes.js
@@ -8,13 +8,11 @@ import NewsHotspot from '../views/NewsHotspot.vue'
 import BigBrother from '../views/BigBrother.vue'
 import UnderstandUs from '../views/UnderstandUs.vue'
 import CompanyDynamics from '../views/CompanyDynamics.vue'
-import ArticleRecommendtwo from '../views/ArticleRecommendtwo.vue'
-import ArticleRecommendthree from '../views/ArticleRecommendthree'
 import UserRemove from '../views/UserRemove.vue'
 import Userinfo from '../views/Userinfo.vue'
 import WALranking from '../views/WALranking.vue'
 import WARranking from '../views/WARranking.vue'
-import WArecommendation from '../views/WALranking.vue'
+import WArecommendation from '../views/WArecommendation.vue'
 import Userpwd from '../views/Userpwd.vue'
 
 
@@ -82,26 +80,6 @@ let routes = [
     },
     component: ArticleRecommend
   },
-  {
-    path: '/ArticleRecommendtwo',
-    name: 'ArticleRecommendtwo',
-    meta: {
-      title: '文章推荐二',
-      icon: 'el-icon-phone-outline',
-      hidden: true,
-    },
-    component: ArticleRecommendtwo
-  },
-  {
-    path: '/ArticleRecommendthree',
-    name: 'ArticleRecommendthree',
-    meta: {
-      title: '文章推荐三',
-      icon: 'el-icon-phone-outline',
-      hidden: true,
-    },
-    component: ArticleRecommendthree
-  },
   {
     path: '/NewsHotspot',
     name: 'NewsHotspot',
diff --git a/cms/src/views/ArticleRecommend.vue b/cms/src/views/ArticleRecommend.vue
index a1565ae..55231fd 100644
--- a/cms/src/views/ArticleRecommend.vue
+++ b/cms/src/views/ArticleRecommend.vue
@@ -52,12 +52,12 @@
                 <el-breadcrumb-item>
                   <a href="/"></a>
                 </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }"
+                <el-breadcrumb-item :to="{ path: '/WARranking' }"
                   >一周的阅读排行</el-breadcrumb-item
                 >
                 <div class="more">
                   <li>
-                    <a href="/" style="text-decoration: none">更多</a>
+                    <a href="/WARranking" style="text-decoration: none">更多</a>
                   </li>
                 </div>
               </el-breadcrumb>
@@ -74,12 +74,14 @@
                 <el-breadcrumb-item>
                   <a href="/"></a>
                 </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }"
+                <el-breadcrumb-item :to="{ path: '/WArecommendation' }"
                   >小编的周推</el-breadcrumb-item
                 >
                 <div class="more">
                   <li>
-                    <a href="/" style="text-decoration: none">更多</a>
+                    <a href="/WArecommendation" style="text-decoration: none"
+                      >更多</a
+                    >
                   </li>
                 </div>
               </el-breadcrumb>
@@ -96,12 +98,12 @@
                 <el-breadcrumb-item>
                   <a href="/"></a>
                 </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }"
+                <el-breadcrumb-item :to="{ path: '/WALranking' }"
                   >一周内评论最多</el-breadcrumb-item
                 >
                 <div class="more">
                   <li>
-                    <a href="/" style="text-decoration: none">更多</a>
+                    <a href="/WALranking" style="text-decoration: none">更多</a>
                   </li>
                 </div>
               </el-breadcrumb>
@@ -116,16 +118,16 @@
                     <span>文章标题</span>
                   </div>
                   <el-badge :value="12" class="item">
-                    <el-button size="small" type="text">点赞数量</el-button>
+                    <span>点赞数量</span>
                   </el-badge>
                   <el-badge :value="3" class="item">
-                    <el-button size="small" type="text">评论数量</el-button>
+                    <span>评论数量</span>
                   </el-badge>
                   <el-badge :value="1" class="item" type="primary">
-                    <el-button size="small" type="text">阅读数量</el-button>
+                    <span>阅读数量</span>
                   </el-badge>
                   <el-badge :value="2" class="item" type="warning">
-                    <el-button size="small" type="text">发布日期</el-button>
+                    <span>发布日期</span>
                   </el-badge>
 
                   <el-dropdown trigger="click">
@@ -150,13 +152,16 @@
             <div>
               <div>
                 <el-card slot="header" class="con-card">
-                  <div v-for="o in 5" :key="o" class="text item">文章内容</div>
+                  <div v-for="o in 4" :key="o" class="text ite">文章内容</div>
                 </el-card>
               </div>
             </div>
             <div>
               <el-button type="button" class="comment">发表评论</el-button>
-              <el-button type="button">点赞评论</el-button>
+              <el-button type="button" class="like">点赞</el-button>
+              <el-button type="button" class="cancle" @click="Return"
+                >返回</el-button
+              >
             </div>
           </el-card>
         </div>
@@ -229,6 +234,9 @@ export default {
     onSubmit() {
       console.log("submit!");
     },
+    Return() {
+      this.$router.push("/UserHome");
+    },
   },
   mounted() {
     // 首次加载时,需要调用一次
@@ -339,6 +347,9 @@ body > .el-container {
 .comment {
   float: left;
 }
+.like {
+  float: left;
+}
 
 /* 周排行 */
 .box-cardright {
@@ -368,8 +379,11 @@ body > .el-container {
 }
 
 .item {
-  margin-top: 10px;
-  margin-right: 70px;
+  margin-top: 30px;
+  margin-right: 5%;
+  margin-left: 5%;
+  width: 9%;
+  font-size: 10px;
 }
 
 /* 头像 */
diff --git a/cms/src/views/ArticleRecommendthree.vue b/cms/src/views/ArticleRecommendthree.vue
deleted file mode 100644
index f29f0fe..0000000
--- a/cms/src/views/ArticleRecommendthree.vue
+++ /dev/null
@@ -1,385 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <!-- 头部 -->
-      <el-header>
-        <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" class="avatar"></el-avatar>
-        <i class="el-dropdown-link">用户的名</i>
-
-        <span>梦创科技有限公司</span>
-      </el-header>
-      <!-- 轮播图 -->
-      <el-main class="slideshow">
-        <div>
-          <el-carousel :interval="4000" type="card" height="200px">
-            <el-carousel-item v-for="item in imagesbox" :key="item.id">
-              <img :src="item.idView" class="image" />
-            </el-carousel-item>
-          </el-carousel>
-        </div>
-
-        <div>
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="搜索">
-              <el-input v-model="formInline.user" placeholder="请输入关键词"></el-input>
-            </el-form-item>
-
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit">查询</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-main>
-      <!-- 文章缩略图等内容 -->
-
-      <el-main class="content">
-        <div class="smallmain">
-          <div class="ranking">
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">一周的阅读排行</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">小编的周推</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">一周内评论最多</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-          </div>
-
-          <el-card class="box-cardone">
-            <div class="demo-image">
-              <div>
-                <el-card class="box-card">
-                  <div slot="header" class="clearfix">
-                    <span>文章标题</span>
-                  </div>
-                  <el-badge :value="12" class="item">
-                    <el-button size="small" type="text">点赞数量</el-button>
-                  </el-badge>
-                  <el-badge :value="3" class="item">
-                    <el-button size="small" type="text">评论数量</el-button>
-                  </el-badge>
-                  <el-badge :value="1" class="item" type="primary">
-                    <el-button size="small" type="text">阅读数量</el-button>
-                  </el-badge>
-                  <el-badge :value="2" class="item" type="warning">
-                    <el-button size="small" type="text">发布日期</el-button>
-                  </el-badge>
-
-                  <el-dropdown trigger="click">
-                    <span class="el-dropdown-link">
-                      点我查看
-                      <i class="el-icon-caret-bottom el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item class="clearfix">
-                        评论
-                        <el-badge class="mark" :value="12" />
-                      </el-dropdown-item>
-                      <el-dropdown-item class="clearfix">
-                        回复
-                        <el-badge class="mark" :value="3" />
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </el-card>
-              </div>
-            </div>
-            <div>
-              <div>
-                <el-card slot="header" class="con-card">
-                  <div v-for="o in 4" :key="o" class="text item">文章内容</div>
-                </el-card>
-              </div>
-            </div>
-            <div>
-              <el-button type="button" class="comment">发表评论</el-button>
-              <el-button type="button">点赞评论</el-button>
-            </div>
-          </el-card>
-        </div>
-      </el-main>
-      <!-- 二维码 -->
-      <el-main class="richScan">
-        <div>
-          <img :src="img1Url" />
-          <img :src="img2Url" />
-          <img :src="img3Url" />
-        </div>
-      </el-main>
-
-      <!-- 备案号 -->
-      <el-footer>
-        <div>
-          <div class="bom">豫ICP备2020035100号</div>
-          <div class="bim">
-            <img src="../assets/备案图标(1).png" alt />
-            <a
-              target="_blank"
-              href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=41142202000050"
-              style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"
-            >
-              <p style="float:left;margin: 0px 0px 0px 5px; color:#939393;">豫公网安备 41142202000050号</p>
-            </a>
-          </div>
-        </div>
-      </el-footer>
-    </el-container>
-  </div>
-</template>
-
-<script >
-export default {
-  name: "Banner",
-  data() {
-    return {
-      // 二维码图片
-      img1Url: require("../assets/123.png"),
-      img2Url: require("../assets/112.png"),
-      img3Url: require("../assets/111.png"),
-      // 图片地址数组
-      imagesbox: [
-        { id: 0, idView: require("@/assets/1.jpg") },
-        { id: 1, idView: require("@/assets/2.jpg") },
-        { id: 2, idView: require("@/assets/3.jpg") },
-        { id: 3, idView: require("@/assets/4.jpg") },
-        { id: 4, idView: require("@/assets/5.jpg") },
-        { id: 5, idView: require("@/assets/6.jpg") }
-      ],
-      formInline: {
-        user: "",
-        region: ""
-      }
-    };
-  },
-  methods: {
-    setSize: function() {
-      // 通过浏览器宽度(图片宽度)计算高度
-      this.bannerHeight = (400 / 1920) * this.screenWidth;
-    },
-    onSubmit() {
-      console.log("submit!");
-    }
-  },
-  mounted() {
-    // 首次加载时,需要调用一次
-    this.screenWidth = window.innerWidth;
-    this.setSize();
-    // 窗口大小发生改变时,调用一次
-    window.onresize = () => {
-      this.screenWidth = window.innerWidth;
-      this.setSize();
-    };
-  }
-};
-</script>
-
-<style scoped>
-.el-header {
-  background-color: #b3c0d1;
-  color: #333;
-  text-align: center;
-  line-height: 60px;
-}
-.el-footer {
-  background-color: #b3c0d1;
-  color: #333;
-  text-align: center;
-  line-height: 30px;
-}
-
-.slideshow {
-  text-align: center;
-  background-color: skyblue;
-}
-
-.el-aside {
-  background-color: #d3dce6;
-  color: #333;
-  text-align: center;
-  line-height: 200px;
-}
-
-/* 去除main下面的滚动条 */
-.el-main {
-  overflow: hidden;
-}
-
-.content {
-  background-color: white;
-  color: #333;
-  min-height: calc(100vh - 120px);
-  padding:0px;
-}
-
-.richScan {
-  text-align: center;
-}
-
-body > .el-container {
-  margin-bottom: 40px;
-}
-
-.el-container:nth-child(5) .el-aside,
-.el-container:nth-child(6) .el-aside {
-  line-height: 260px;
-}
-
-.el-container:nth-child(7) .el-aside {
-  line-height: 320px;
-}
-.el-button {
-  float: right;
-}
-.el-carousel__item h3 {
-  color: #475669;
-  font-size: 14px;
-  opacity: 0.75;
-  line-height: 200px;
-  margin: 0;
-}
-
-.el-carousel__item:nth-child(2n) {
-  background-color: #99a9bf;
-}
-
-.el-carousel__item:nth-child(2n + 1) {
-  background-color: #d3dce6;
-}
-
-/* Main宽度 */
-.box-cardone {
-  width: 65%;
-  height: 600px;
-}
-/* 文章标题卡片 */
-.articletext {
-  font-size: 14px;
-}
-
-/* 文章标题简介卡片 */
-.box-card {
-  height: 160px;
-  width: 100%;
-}
-/* 文章内容卡片 */
-.con-card {
-  width: 100%;
-  /* height: 400px; */
-}
-.comment {
-  float: left;
-}
-
-/* 周排行 */
-.box-cardright {
-  width: 100%;
-  height: 200px;
-}
-
-/* 给阅读排行加上>> */
-.more li::marker {
-  content: ">>";
-  color: black;
-}
-/* 使a链接变成黑色 */
-.more a:link,
-.more a:visited {
-  color: black;
-}
-/* 排行榜居中 */
-.el-breadcrumb {
-  text-align: center;
-}
-
-.ranking {
-  height: 606px;
-  width: 34%;
-  float: right;
-}
-
-.item {
-  margin-top: 10px;
-  margin-right: 70px;
-}
-
-/* 头像 */
-.el-avatar {
-  float: left;
-}
-/* 用户名 */
-.el-dropdown-link {
-  float: left;
-}
-/* 图片百分比 */
-.image {
-  width: 100%;
-  height: 100%;
-}
-
-/* 备案号 */
-.bom {
-  text-align: center;
-}
-.bim{
-  background-color:#b3c0d1 ;
-}
-
-/* 用户名和头像设置 */
-.el-dropdown-link{
-  float: left;
-}
-.avatar{
-  float: left;
-}
-</style>
\ No newline at end of file
diff --git a/cms/src/views/ArticleRecommendtwo.vue b/cms/src/views/ArticleRecommendtwo.vue
deleted file mode 100644
index f29f0fe..0000000
--- a/cms/src/views/ArticleRecommendtwo.vue
+++ /dev/null
@@ -1,385 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <!-- 头部 -->
-      <el-header>
-        <el-avatar src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" class="avatar"></el-avatar>
-        <i class="el-dropdown-link">用户的名</i>
-
-        <span>梦创科技有限公司</span>
-      </el-header>
-      <!-- 轮播图 -->
-      <el-main class="slideshow">
-        <div>
-          <el-carousel :interval="4000" type="card" height="200px">
-            <el-carousel-item v-for="item in imagesbox" :key="item.id">
-              <img :src="item.idView" class="image" />
-            </el-carousel-item>
-          </el-carousel>
-        </div>
-
-        <div>
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="搜索">
-              <el-input v-model="formInline.user" placeholder="请输入关键词"></el-input>
-            </el-form-item>
-
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit">查询</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-main>
-      <!-- 文章缩略图等内容 -->
-
-      <el-main class="content">
-        <div class="smallmain">
-          <div class="ranking">
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">一周的阅读排行</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">小编的周推</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-
-            <el-card class="box-cardright">
-              <el-breadcrumb separator>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item>
-                  <a href="/"></a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">一周内评论最多</el-breadcrumb-item>
-                <div class="more">
-                  <li>
-                    <a href="/" style="text-decoration: none">更多</a>
-                  </li>
-                </div>
-              </el-breadcrumb>
-            </el-card>
-          </div>
-
-          <el-card class="box-cardone">
-            <div class="demo-image">
-              <div>
-                <el-card class="box-card">
-                  <div slot="header" class="clearfix">
-                    <span>文章标题</span>
-                  </div>
-                  <el-badge :value="12" class="item">
-                    <el-button size="small" type="text">点赞数量</el-button>
-                  </el-badge>
-                  <el-badge :value="3" class="item">
-                    <el-button size="small" type="text">评论数量</el-button>
-                  </el-badge>
-                  <el-badge :value="1" class="item" type="primary">
-                    <el-button size="small" type="text">阅读数量</el-button>
-                  </el-badge>
-                  <el-badge :value="2" class="item" type="warning">
-                    <el-button size="small" type="text">发布日期</el-button>
-                  </el-badge>
-
-                  <el-dropdown trigger="click">
-                    <span class="el-dropdown-link">
-                      点我查看
-                      <i class="el-icon-caret-bottom el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item class="clearfix">
-                        评论
-                        <el-badge class="mark" :value="12" />
-                      </el-dropdown-item>
-                      <el-dropdown-item class="clearfix">
-                        回复
-                        <el-badge class="mark" :value="3" />
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </el-card>
-              </div>
-            </div>
-            <div>
-              <div>
-                <el-card slot="header" class="con-card">
-                  <div v-for="o in 4" :key="o" class="text item">文章内容</div>
-                </el-card>
-              </div>
-            </div>
-            <div>
-              <el-button type="button" class="comment">发表评论</el-button>
-              <el-button type="button">点赞评论</el-button>
-            </div>
-          </el-card>
-        </div>
-      </el-main>
-      <!-- 二维码 -->
-      <el-main class="richScan">
-        <div>
-          <img :src="img1Url" />
-          <img :src="img2Url" />
-          <img :src="img3Url" />
-        </div>
-      </el-main>
-
-      <!-- 备案号 -->
-      <el-footer>
-        <div>
-          <div class="bom">豫ICP备2020035100号</div>
-          <div class="bim">
-            <img src="../assets/备案图标(1).png" alt />
-            <a
-              target="_blank"
-              href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=41142202000050"
-              style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"
-            >
-              <p style="float:left;margin: 0px 0px 0px 5px; color:#939393;">豫公网安备 41142202000050号</p>
-            </a>
-          </div>
-        </div>
-      </el-footer>
-    </el-container>
-  </div>
-</template>
-
-<script >
-export default {
-  name: "Banner",
-  data() {
-    return {
-      // 二维码图片
-      img1Url: require("../assets/123.png"),
-      img2Url: require("../assets/112.png"),
-      img3Url: require("../assets/111.png"),
-      // 图片地址数组
-      imagesbox: [
-        { id: 0, idView: require("@/assets/1.jpg") },
-        { id: 1, idView: require("@/assets/2.jpg") },
-        { id: 2, idView: require("@/assets/3.jpg") },
-        { id: 3, idView: require("@/assets/4.jpg") },
-        { id: 4, idView: require("@/assets/5.jpg") },
-        { id: 5, idView: require("@/assets/6.jpg") }
-      ],
-      formInline: {
-        user: "",
-        region: ""
-      }
-    };
-  },
-  methods: {
-    setSize: function() {
-      // 通过浏览器宽度(图片宽度)计算高度
-      this.bannerHeight = (400 / 1920) * this.screenWidth;
-    },
-    onSubmit() {
-      console.log("submit!");
-    }
-  },
-  mounted() {
-    // 首次加载时,需要调用一次
-    this.screenWidth = window.innerWidth;
-    this.setSize();
-    // 窗口大小发生改变时,调用一次
-    window.onresize = () => {
-      this.screenWidth = window.innerWidth;
-      this.setSize();
-    };
-  }
-};
-</script>
-
-<style scoped>
-.el-header {
-  background-color: #b3c0d1;
-  color: #333;
-  text-align: center;
-  line-height: 60px;
-}
-.el-footer {
-  background-color: #b3c0d1;
-  color: #333;
-  text-align: center;
-  line-height: 30px;
-}
-
-.slideshow {
-  text-align: center;
-  background-color: skyblue;
-}
-
-.el-aside {
-  background-color: #d3dce6;
-  color: #333;
-  text-align: center;
-  line-height: 200px;
-}
-
-/* 去除main下面的滚动条 */
-.el-main {
-  overflow: hidden;
-}
-
-.content {
-  background-color: white;
-  color: #333;
-  min-height: calc(100vh - 120px);
-  padding:0px;
-}
-
-.richScan {
-  text-align: center;
-}
-
-body > .el-container {
-  margin-bottom: 40px;
-}
-
-.el-container:nth-child(5) .el-aside,
-.el-container:nth-child(6) .el-aside {
-  line-height: 260px;
-}
-
-.el-container:nth-child(7) .el-aside {
-  line-height: 320px;
-}
-.el-button {
-  float: right;
-}
-.el-carousel__item h3 {
-  color: #475669;
-  font-size: 14px;
-  opacity: 0.75;
-  line-height: 200px;
-  margin: 0;
-}
-
-.el-carousel__item:nth-child(2n) {
-  background-color: #99a9bf;
-}
-
-.el-carousel__item:nth-child(2n + 1) {
-  background-color: #d3dce6;
-}
-
-/* Main宽度 */
-.box-cardone {
-  width: 65%;
-  height: 600px;
-}
-/* 文章标题卡片 */
-.articletext {
-  font-size: 14px;
-}
-
-/* 文章标题简介卡片 */
-.box-card {
-  height: 160px;
-  width: 100%;
-}
-/* 文章内容卡片 */
-.con-card {
-  width: 100%;
-  /* height: 400px; */
-}
-.comment {
-  float: left;
-}
-
-/* 周排行 */
-.box-cardright {
-  width: 100%;
-  height: 200px;
-}
-
-/* 给阅读排行加上>> */
-.more li::marker {
-  content: ">>";
-  color: black;
-}
-/* 使a链接变成黑色 */
-.more a:link,
-.more a:visited {
-  color: black;
-}
-/* 排行榜居中 */
-.el-breadcrumb {
-  text-align: center;
-}
-
-.ranking {
-  height: 606px;
-  width: 34%;
-  float: right;
-}
-
-.item {
-  margin-top: 10px;
-  margin-right: 70px;
-}
-
-/* 头像 */
-.el-avatar {
-  float: left;
-}
-/* 用户名 */
-.el-dropdown-link {
-  float: left;
-}
-/* 图片百分比 */
-.image {
-  width: 100%;
-  height: 100%;
-}
-
-/* 备案号 */
-.bom {
-  text-align: center;
-}
-.bim{
-  background-color:#b3c0d1 ;
-}
-
-/* 用户名和头像设置 */
-.el-dropdown-link{
-  float: left;
-}
-.avatar{
-  float: left;
-}
-</style>
\ No newline at end of file
diff --git a/cms/src/views/Index.vue b/cms/src/views/Index.vue
index 9415ef7..16cadcf 100644
--- a/cms/src/views/Index.vue
+++ b/cms/src/views/Index.vue
@@ -149,16 +149,16 @@
                   <div class="articletext">文章简介</div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">                     
-                      <el-button size="small" type="text">点赞数量</el-button>                      
+                      <span>点赞数量</span>                      
                     </el-badge>
                     <el-badge :value="3" class="item">
-                      <el-button size="small" type="text">评论数量</el-button>
+                      <span>评论数量</span>
                     </el-badge>
                     <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small" type="text">阅读数量</el-button>
+                      <span>阅读数量</span>
                     </el-badge>
                     <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small" type="text">发布日期</el-button>
+                      <span>发布日期</span>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -199,16 +199,17 @@
                   <div class="articletext">文章简介</div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">
-                      <el-button size="small" type="text">点赞数量</el-button>
+                      <span>点赞数量</span>
+                      
                     </el-badge>
                     <el-badge :value="3" class="item">
-                      <el-button size="small" type="text">评论数量</el-button>
+                      <span>评论数量</span>
                     </el-badge>
                     <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small" type="text">阅读数量</el-button>
+                      <span>阅读数量</span>
                     </el-badge>
                     <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small" type="text">发布日期</el-button>
+                      <span>发布日期</span>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -249,16 +250,16 @@
                   <div class="articletext" type="text">文章简介</div>
                   <div class="quantity">
                   <el-badge :value="12" class="item">
-                    <el-button size="small" type="text">点赞数量</el-button>
+                     <span>点赞数量</span>
                   </el-badge>
                   <el-badge :value="3" class="item">
-                    <el-button size="small" type="text">评论数量</el-button>
+                    <span>评论数量</span>
                   </el-badge>
                   <el-badge :value="1" class="item" type="primary">
-                    <el-button size="small" type="text">阅读数量</el-button>
+                    <span>阅读数量</span>
                   </el-badge>
                   <el-badge :value="2" class="item" type="warning">
-                    <el-button size="small" type="text">发布日期</el-button>
+                    <span>发布日期</span>
                   </el-badge>
 
                   <el-dropdown trigger="click">
@@ -381,10 +382,10 @@ export default {
       this.$router.push("/ArticleRecommend")
     },
     Phototwo(){
-      this.$router.push("/ArticleRecommendtwo")
+      this.$router.push("/ArticleRecommend")
     },
     Photothree(){
-      this.$router.push("/ArticleRecommendthree")
+      this.$router.push("/ArticleRecommend")
     }
   },
   mounted() {
@@ -490,11 +491,12 @@ body > .el-container {
   width: 100%;
   height: 50px;
 }
-.item {
-  margin-top: 10px;
-  margin-right: 4%;
-  margin-left: 6%;
-  width: 10%;
+.item{
+  margin-top: 30px;
+  margin-right: 3%;
+  margin-left: 7%;
+  width: 11%;
+  font-size: 10px;
 }
 
 /* 鼠标动文章标题简介卡片 */
diff --git a/cms/src/views/UserHome.vue b/cms/src/views/UserHome.vue
index 1fbe308..ae4e175 100644
--- a/cms/src/views/UserHome.vue
+++ b/cms/src/views/UserHome.vue
@@ -153,16 +153,16 @@
                   <div class="articletext">文章简介</div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">
-                      <el-button size="small">点赞数量</el-button>
+                       <span>点赞数量</span>
                     </el-badge>
                     <el-badge :value="3" class="item">
-                      <el-button size="small">评论数量</el-button>
+                      <span>评论数量</span>
                     </el-badge>
-                    <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small">阅读数量</el-button>
+                    <el-badge :value="1" class="item" type="primary">               
+                      <span>阅读数量</span>
                     </el-badge>
                     <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small">发布日期</el-button>
+                      <span>发布日期</span>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -203,16 +203,16 @@
                   <div class="articletext">文章简介</div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">
-                      <el-button size="small">点赞数量</el-button>
+                     <span>点赞数量</span>
                     </el-badge>
                     <el-badge :value="3" class="item">
-                      <el-button size="small">评论数量</el-button>
+                      <span>评论数量</span>
                     </el-badge>
                     <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small">阅读数量</el-button>
+                      <span>阅读数量</span>
                     </el-badge>
                     <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small">发布日期</el-button>
+                      <span>发布日期</span>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -253,16 +253,16 @@
                   <div class="articletext">文章简介</div>
                   <div class="quantity">
                   <el-badge :value="12" class="item">
-                    <el-button size="small">点赞数量</el-button>
+                    <span>点赞数量</span>
                   </el-badge>
                   <el-badge :value="3" class="item">
-                    <el-button size="small">评论数量</el-button>
+                    <span>评论数量</span>
                   </el-badge>
                   <el-badge :value="1" class="item" type="primary">
-                    <el-button size="small">阅读数量</el-button>
+                    <span>阅读数量</span>
                   </el-badge>
                   <el-badge :value="2" class="item" type="warning">
-                    <el-button size="small">发布日期</el-button>
+                    <span>发布日期</span>
                   </el-badge>
 
                   <el-dropdown trigger="click">
@@ -385,10 +385,10 @@ export default {
       this.$router.push("/ArticleRecommend")
     },
     Phototwo(){
-      this.$router.push("/ArticleRecommendtwo")
+      this.$router.push("/ArticleRecommend")
     },
     Photothree(){
-      this.$router.push("/ArticleRecommendthree")
+      this.$router.push("/ArticleRecommend")
     }
   },
   mounted() {
@@ -494,10 +494,12 @@ body > .el-container {
   height: 50px;
 }
 .item {
-  margin-top: 10px;
+  margin-top: 30px;
   margin-right: 3%;
   margin-left: 7%;
-  width: 10%;
+  width: 11%;
+  font-size: 10px;
+  
 }
 
 /* 鼠标动文章标题简介卡片 */
diff --git a/cms/src/views/WALranking.vue b/cms/src/views/WALranking.vue
index c5ceff3..b530f01 100644
--- a/cms/src/views/WALranking.vue
+++ b/cms/src/views/WALranking.vue
@@ -16,6 +16,9 @@
             <el-form-item>
               <el-button type="primary" @click="onSubmit">查询</el-button>
             </el-form-item>
+            <div class="cancle">
+                <el-button type="info" @click="Return">返回</el-button>
+              </div>
           </el-form>
         </div>
         </el-card>
@@ -39,24 +42,24 @@
                   </div>
                   <div>
                 <el-card slot="header" class="con-card">
-                  <div v-for="o in 6" :key="o" >文章内容</div>
+                 <div v-for="o in 6" :key="o">文章内容</div>
                 </el-card>
               </div>
-                  <div class="quantity">
-                    <el-badge :value="12" class="item">
-                      <el-button size="small" type="text">点赞数量</el-button>
-                    </el-badge>
+              <div class="quantity">
+                <el-badge :value="12" class="item">
+                  <p>点赞数量</p>
+                </el-badge>
 
-                    <el-badge :value="3" class="item">
-                      <el-button size="small" type="text">评论数量</el-button>
-                    </el-badge>
+                <el-badge :value="3" class="item">
+                  <p>评论数量</p>
+                </el-badge>
 
-                    <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small" type="text">阅读数量</el-button>
-                    </el-badge>
+                <el-badge :value="1" class="item" type="primary">
+                  <p>阅读数量</p>
+                </el-badge>
 
-                    <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small" type="text">发布日期</el-button>
+                <el-badge :value="2" class="item" type="warning">
+                  <p>发布日期</p>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -105,6 +108,9 @@ export default {
     onSubmit() {
       console.log("submit!");
     },
+    Return() {
+      this.$router.go(-1);
+    },
   },
 };
 </script>
@@ -155,10 +161,14 @@ export default {
   margin-top: 10px;
 }
 .item {
-  margin-top: 10px;
+  margin-top: 40px;
   margin-right: 7%;
   margin-left: 3%;
   width: 10%;
+  font-size: 10px;
+}
+.cancle {
+  float: right;
 }
 
 
diff --git a/cms/src/views/WARranking.vue b/cms/src/views/WARranking.vue
index 6a7a31d..281a722 100644
--- a/cms/src/views/WARranking.vue
+++ b/cms/src/views/WARranking.vue
@@ -16,6 +16,9 @@
             <el-form-item>
               <el-button type="primary" @click="onSubmit">查询</el-button>
             </el-form-item>
+            <div class="cancle">
+                <el-button type="info" @click="Return">返回</el-button>
+              </div>
           </el-form>
         </div>
         </el-card>
@@ -44,19 +47,19 @@
               </div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">
-                      <el-button size="small" type="text">点赞数量</el-button>
-                    </el-badge>
+                      <p>点赞数量</p>
+                </el-badge>
 
-                    <el-badge :value="3" class="item">
-                      <el-button size="small" type="text">评论数量</el-button>
-                    </el-badge>
+                <el-badge :value="3" class="item">
+                  <span>评论数量</span>
+                </el-badge>
 
-                    <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small" type="text">阅读数量</el-button>
-                    </el-badge>
+                <el-badge :value="1" class="item" type="primary">
+                  <span>阅读数量</span>
+                </el-badge>
 
-                    <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small" type="text">发布日期</el-button>
+                <el-badge :value="2" class="item" type="warning">
+                  <span>发布日期</span>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -105,6 +108,9 @@ export default {
     onSubmit() {
       console.log("submit!");
     },
+    Return() {
+      this.$router.go(-1);
+    },
   },
 };
 </script>
@@ -155,10 +161,14 @@ export default {
   margin-top: 10px;
 }
 .item {
-  margin-top: 10px;
+  margin-top: 40px;
   margin-right: 7%;
   margin-left: 3%;
   width: 10%;
+  font-size: 10px;
+}
+.cancle {
+  float: right;
 }
 
 
diff --git a/cms/src/views/WArecommendation.vue b/cms/src/views/WArecommendation.vue
index 4efc04a..91fec73 100644
--- a/cms/src/views/WArecommendation.vue
+++ b/cms/src/views/WArecommendation.vue
@@ -16,6 +16,9 @@
             <el-form-item>
               <el-button type="primary" @click="onSubmit">查询</el-button>
             </el-form-item>
+            <div class="cancle">
+                  <el-button type="info" @click="Return">返回</el-button>
+                </div>
           </el-form>
         </div>
         </el-card>
@@ -44,16 +47,16 @@
               </div>
                   <div class="quantity">
                     <el-badge :value="12" class="item">
-                      <el-button size="small" type="text">点赞数量</el-button>
-                    </el-badge>
-                    <el-badge :value="3" class="item">
-                      <el-button size="small" type="text">评论数量</el-button>
-                    </el-badge>
-                    <el-badge :value="1" class="item" type="primary">
-                      <el-button size="small" type="text">阅读数量</el-button>
-                    </el-badge>
-                    <el-badge :value="2" class="item" type="warning">
-                      <el-button size="small" type="text">发布日期</el-button>
+                      <p>点赞数量</p>
+                </el-badge>
+                <el-badge :value="3" class="item">
+                  <p>评论数量</p>
+                </el-badge>
+                <el-badge :value="1" class="item" type="primary">
+                  <p>阅读数量</p>
+                </el-badge>
+                <el-badge :value="2" class="item" type="warning">
+                  <p>发布日期</p>
                     </el-badge>
 
                     <el-dropdown trigger="click">
@@ -102,6 +105,9 @@ export default {
     onSubmit() {
       console.log("submit!");
     },
+    Return() {
+      this.$router.go(-1);
+    },
   },
 };
 </script>
@@ -141,7 +147,7 @@ export default {
 }
 .smallmain{
     margin-left: 250px;
-    width: 800px;
+    width: 1000px;
 }
 
 /* 按钮设置 */
@@ -151,10 +157,14 @@ export default {
   margin-top: 10px;
 }
 .item {
-  margin-top: 10px;
+  margin-top: 40px;
   margin-right: 7%;
   margin-left: 3%;
   width: 10%;
+  font-size: 10px;
+}
+.cancle {
+  float: right;
 }
 
 
-- 
Gitee