From a19326ecc6bd74bd1ba4a083e69ea290c5e37339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E5=AD=A6=E5=9D=A4?= <1107410514@qq.com>
Date: Thu, 3 Oct 2019 21:11:03 +0800
Subject: [PATCH] kun 19/10/3/21:11

---
 src/views/Login.vue            |  80 ++++++++----------
 src/views/Registered.vue       | 135 +++++++++++++++----------------
 src/views/home/HomePage.vue    | 143 ++++++++++++---------------------
 src/views/home/NewsDetails.vue |  67 ++++++++++-----
 src/views/home/NewsList.vue    |  23 +++---
 5 files changed, 207 insertions(+), 241 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index 6cee513..e44b691 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,31 +1,19 @@
 <template>
-  <div class="wrapper"
-       :style="{'background-image':'url('+imgUrl.login+')'}">
+  <div class="wrapper" :style="{'background-image':'url('+imgUrl.login+')'}">
     <div class="box">
       <div class="box-o">
         <h3>歡 迎 登 錄</h3>
         <div class="input">
-          <input type="text"
-                 v-model="postData.account"
-                 name="account"
-                 placeholder="组织名称" />
-          <img class="one"
-               :src="imgUrl.yh"
-               alt />
-          <input type="password"
-                 v-model="postData.password"
-                 name="password"
-                 placeholder="密码" />
-          <img class="two"
-               :src="imgUrl.mm"
-               alt />
+          <input type="text" v-model="account" name="account" placeholder="组织名称" />
+          <img class="one" :src="imgUrl.yh" alt />
+          <input type="password" v-model="password" name="password" placeholder="密码" />
+          <img class="two" :src="imgUrl.mm" alt />
         </div>
         <div class="three">
           <span @click="$jump('registered')">注册</span>
           <span>忘记密码</span>
         </div>
-        <div class="btn"
-             @click="login()">
+        <div class="btn" @click="login()">
           <button type="submit">立即登录</button>
         </div>
       </div>
@@ -37,52 +25,48 @@
 export default {
   components: {},
   props: {},
-  data () {
+  data() {
     return {
       imgUrl: {
         login: require('../../static/img/login.png'),
         yh: require('../../static/img/yh.png'),
         mm: require('../../static/img/mm.png')
       },
-      postData: {
-        account: '',
-        password: ''
-      }
+      account: '',
+      password: ''
     }
   },
   computed: {},
   watch: {},
   methods: {
-    login () {
-      this.postData = {
-        account: this.postData.account,
-        password: this.$md5(this.postData.password)
-      }
-
-      console.log(this.postData)
-
-      this.$http
-        .post('/login', this.postData)
-        .then(res => {
-          if (res.data.errno === 0) {
-            this.$Message.success('登陆成功')
-            this.$router.push('roomInfo')
-            /** 全局存储token */
-            // window.localStorage['token'] = JSON.stringify(res.data.data.token)
-            window.localStorage['token'] = JSON.stringify('shenxuekundetoken')
-          } else {
-            this.$Message.error('登录失败')
-            this.forgetPassword = true
-          }
-        })
+    login() {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/login/login',
+        data: {
+          user: _this.account,
+          password: _this.password
+        }
+      }).then(res => {
+        if (res.data.code === 200) {
+          console.log(res.data)
+          this.$message.success('登陆成功');
+          this.$router.push('/personalZte');
+          //全局存储token
+          window.localStorage["token"] = JSON.stringify(res.data.data.data.id);
+        } else {
+          this.$message.error('请求数据有问题！')
+        }
+      })
         // eslint-disable-next-line handle-callback-err
         .catch(err => {
-          console.log('登录失败')
+          console.log(err)
         })
     }
   },
-  created () {},
-  mounted () {}
+  created() { },
+  mounted() { }
 }
 </script>
 
diff --git a/src/views/Registered.vue b/src/views/Registered.vue
index 9ba94d7..9b9107e 100644
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -3,34 +3,41 @@
     <div class="box">
       <div class="boxx">
         <h3>立 即 注 冊</h3>
-        <form enctype="multipart/form-data" onsubmit="return false">
+        <form
+          enctype="multipart/form-data"
+          action="http://chaoyang.yulongcode.com/api/v1/login/reg"
+          method="post"
+        >
           <!-- 请输入组织名称 pattern
               oninvalid="setCustomValidity('不能为空')"
               oninput="setCustomValidity('')"
           -->
-          <label>
-            <span class="one">
-              <span class="iconfont icon-ren"></span>
-              <span class="iconfont icon-vertical_line"></span>
-            </span>
-            <input
-              class="input"
-              type="text"
-              placeholder="请输入组织名称"
-              v-model="fieldsName.organization_name"
-            />
-            <span class="span1">注：组织名称将用于用户登录</span>
-          </label>
+          <template v-for="(reg,index) in reg.data">
+            <label :key="index">
+              <span :class="index === 0 ? 'one' : 'two'">
+                <span class="iconfont" :class="reg.icon"></span>
+                <span class="iconfont icon-vertical_line"></span>
+              </span>
+              <input
+                class="input"
+                :type="reg.data_type"
+                :placeholder="'请输入'+ reg.notes"
+                :name="reg.name"
+                required
+              />
+              <span v-if="index === 0" class="span1">注：组织名称将用于用户登录</span>
+            </label>
+          </template>
           <!-- 请输入密码 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-suo"></span>
               <span class="iconfont icon-vertical_line"></span>
             </span>
             <input class="input" type="password" placeholder="请输入密码" v-model="fieldsName.password" />
-          </label>
+          </label>-->
           <!-- 请再次输入密码 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-suo"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -41,9 +48,9 @@
               placeholder="请再次输入密码"
               v-model="fieldsName.confirm_password"
             />
-          </label>
+          </label>-->
           <!-- 请输入统一社会信用代码 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <img :src="imgUrl.yy" alt style="width:20px;height:20px;margin-top:0px;" />
               <span class="iconfont icon-vertical_line"></span>
@@ -54,9 +61,9 @@
               placeholder="请输入统一社会信用代码"
               v-model="fieldsName.credit_code"
             />
-          </label>
+          </label>-->
           <!-- 请输入法人代表 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-fuzeren"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -67,9 +74,9 @@
               placeholder="请输入法人代表"
               v-model="fieldsName.legal_representative"
             />
-          </label>
+          </label>-->
           <!-- 请输入单位属性 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-icon-test"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -80,9 +87,9 @@
               placeholder="请输入单位属性"
               v-model="fieldsName.unit_attribute"
             />
-          </label>
+          </label>-->
           <!-- 请输入业务主管单位名称 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-zhuzhuangtu"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -93,9 +100,9 @@
               placeholder="请输入业务主管单位名称"
               v-model="fieldsName.entity_name"
             />
-          </label>
+          </label>-->
           <!-- 请输入负责人姓名 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-renxiang-"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -106,9 +113,9 @@
               placeholder="请输入负责人姓名"
               v-model="fieldsName.charge_name"
             />
-          </label>
+          </label>-->
           <!-- 请输入负责人职务 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-lingdai"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -119,9 +126,9 @@
               placeholder="请输入负责人职务"
               v-model="fieldsName.charge_position"
             />
-          </label>
+          </label>-->
           <!-- 请输入负责人电话 -->
-          <label>
+          <!-- <label>
             <span class="two">
               <span class="iconfont icon-dianhua"></span>
               <span class="iconfont icon-vertical_line"></span>
@@ -132,16 +139,16 @@
               placeholder="请输入负责人电话"
               v-model="fieldsName.charge_phone"
             />
-          </label>
+          </label>-->
           <!-- 管理平台协 -->
-          <label class="label">
-            <input class="checkout" type="checkbox" v-model="fieldsName.agre" />
+          <!-- <label class="label">
+            <input class="checkout" type="checkbox" v-model="agre" />
             <span class="span2">
               我已阅读并接受
               <span class="span3">《管理平台协议》</span>
             </span>
-          </label>
-          <label class="s" @click="registered()">
+          </label>-->
+          <label class="s">
             <input type="submit" class="sub" value="立即注册" />
           </label>
         </form>
@@ -154,53 +161,43 @@
 export default {
   components: {},
   props: {},
-  data () {
+  data() {
     return {
       imgUrl: {
         registered: require('../../static/img/registered.png'),
         yy: require('../../static/img/yy.png')
       },
-      fieldsName: []
+      fieldsName: [],
+      reg: []
     }
   },
   computed: {},
   watch: {},
   methods: {
-
-    registered () {
+    getData() {
       let _this = this
-      if (this.fieldsName.organization_name === undefined) {
-        alert('组织名称不可为空')
-      } else if (this.fieldsName.password === undefined) {
-        alert('密码不可为空')
-      } else if (this.fieldsName.confirm_password === undefined) {
-        alert('请输入确认密码')
-      } else {
-        console.log(_this.fieldsName, 111)
-
-        this.$http({
-          method: 'post',
-          url: 'v1/login/reg',
-          data: {
-            FieldsName: _this.fieldsName
-          }
+      this.$http({
+        method: 'get',
+        url: 'v1/login/reg-fields',
+        params: {}
+      }).then(res => {
+        if (res.data.code === 200) {
+          _this.reg = res.data
+          console.log(res.data)
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
         })
-          .then(res => {
-            if (res.data.code === 200) {
-              _this.$Message.success('注册成功！')
-            } else {
-              _this.$Message.error('注册失败！')
-            }
-          })
-          // eslint-disable-next-line handle-callback-err
-          .catch(err => {
-            console.log(err, 555)
-          })
-      }
     }
   },
-  created () { },
-  mounted () { }
+  created() {
+    this.getData()
+  },
+  mounted() { }
 }
 </script>
 
diff --git a/src/views/home/HomePage.vue b/src/views/home/HomePage.vue
index ff54fd9..959df04 100644
--- a/src/views/home/HomePage.vue
+++ b/src/views/home/HomePage.vue
@@ -32,7 +32,7 @@
           <!-- 列表显示 -->
           <ul>
             <template v-for="(notice,index) in bgData.notice">
-              <li :key="index" v-if="index < 8">
+              <li :key="index" v-if="index < 8" @click="$jParams('newsDetails',{id:notice.id})">
                 <a href="javascript:void(0);">
                   <span>{{notice.title}}</span>
                   <time>[{{notice.created_at}}]</time>
@@ -53,12 +53,12 @@
                 <img class="o" :src="imgUrl.dh" alt />
                 <span>区域化党建</span>
               </div>
-              <span @click="$jump('newsList')">更多>></span>
+              <span @click="$jParams('newsList',{type:4})">更多>></span>
             </div>
             <ul class="ult">
-              <template v-for="(item,index) in mmData">
-                <li :key="index" v-if="index < 3" @click="$jump('newsDetails')">
-                  <a href="javascript:void(0);">{{item.text}}</a>
+              <template v-for="(build,index) in bgData.build">
+                <li :key="index" v-if="index < 3" @click="$jParams('newsDetails',{id:build.id})">
+                  <a href="javascript:void(0);">{{build.text}}</a>
                 </li>
               </template>
             </ul>
@@ -70,15 +70,13 @@
               <span @click="$jump('informationQuery')">更多>></span>
             </div>
             <div class="p">
-              <div class="text">
-                <p>
-                  党的建设即马克思主义建党理论同党的建设实践的统一，马克思主义党的学说的应用。
-                  党的建设包括三个方面的含义：
-                  <br />一是研究党的建设的理论科学；
-                  <br />二是在马克思主义党的学说指导下所进行的党的建设的实践活动；
-                  <br />三是作为理论原则与实际行动两者中介的约法规章。
-                </p>
-              </div>
+              <ul class="ult">
+                <template v-for="(party,index) in bgData.party">
+                  <li :key="index" v-if="index < 3" @click="$jump('informationQuery')">
+                    <a href="javascript:void(0);">{{party.party_name}}</a>
+                  </li>
+                </template>
+              </ul>
               <div class="img" @click="$jump('applyFor')">
                 <div class="img-box">
                   <img :src="imgUrl.wjx" alt />
@@ -98,7 +96,7 @@
             </div>
             <ul class="ulo">
               <template v-for="(battle,index) in bgData.battle">
-                <li :key="index" v-if="index<9" @click="$jump('newsDetails')">
+                <li :key="index" v-if="index<9" @click="$jParams('newsDetails',{id:battle.id})">
                   <a href="javascript:void(0);">{{battle.title}}</a>
                 </li>
               </template>
@@ -115,7 +113,11 @@
             </div>
             <ul class="ult">
               <template v-for="(organization,index) in bgData.organization">
-                <li :key="index" v-if="index < 9" @click="$jump('newsDetails')">
+                <li
+                  :key="index"
+                  v-if="index < 9"
+                  @click="$jParams('newsDetails',{id:organization.id})"
+                >
                   <a href="javascript:void(0);">{{organization.title}}</a>
                 </li>
               </template>
@@ -127,12 +129,12 @@
       <div class="container-three">
         <p class="title">@书记</p>
         <div class="box-list">
-          <template v-for="(item,index) in sData">
+          <template v-for="(contact,index) in bgData.contact">
             <div class="list" :key="index" v-if="index<3">
-              <img :src="item.img" alt />
+              <img :src="contact.thumb" alt />
               <div class="wen-ben">
-                <h3>{{item.title}}</h3>
-                <p>{{item.text}}</p>
+                <h3>{{contact.society_name}}</h3>
+                <p>{{contact.content}}</p>
               </div>
             </div>
           </template>
@@ -205,66 +207,6 @@ export default {
         right: require("../../../static/img/right.png"),
         left: require("../../../static/img/left.png")
       },
-      mmData: [
-        { text: "贵安新区拟对部分社会组织进行注销登记", time: "2019-3-14" },
-        { text: "四平市民政局以服务平台促社会组织发展", time: "2019-3-14" },
-        {
-          text:
-            "淮北市开展2019年度市级社会组织评淮北市开展2019年度市级社会组织评",
-          time: "2019-3-14"
-        },
-        {
-          text:
-            "佛山市民政局通报2018年度市级社会佛山市民政局通报2018年度市级社会",
-          time: "2019-3-14"
-        },
-        {
-          text:
-            "社会组织唱响《我和我的祖国》献礼新社会组织唱响《我和我的祖国》献礼新",
-          time: "2019-3-14"
-        },
-        {
-          text:
-            "市民政局与市体育总会召开协调会专项市民政局与市体育总会召开协调会专项",
-          time: "2019-3-14"
-        },
-        {
-          text:
-            '民政部立项中央财政支持"促进肝健康民政部立项中央财政支持"促进肝健康',
-          time: "2019-3-14"
-        },
-        {
-          text:
-            "静海区召开社会组织参与扶贫帮困活动静海区召开社会组织参与扶贫帮困活动",
-          time: "2019-3-14"
-        }
-      ],
-      sData: [
-        {
-          img: require("../../../static/img/img0.png"),
-          title: "信访人对信访事项处理意见不服的,怎么办?",
-          text:
-            "活动策划是提高市场占有率的有效行为，一份可执行、可操作、创意突出的活动策划案，可有效提升企业的知名度及品牌美誉度。活动策划案是相对于市场策划案而言，严格说它们同属市场策划的兄弟分支，活动策划、..."
-        },
-        {
-          img: require("../../../static/img/img1.png"),
-          title: "信访人对信访事项处理意见不服的,怎么办?",
-          text:
-            "活动策划是提高市场占有率的有效行为，一份可执行、可操作、创意突出的活动策划案，可有效提升企业的知名度及品牌美誉度。活动策划案是相对于市场策划案而言，严格说它们同属市场策划的兄弟分支，活动策划、..."
-        },
-        {
-          img: require("../../../static/img/img2.png"),
-          title: "信访人对信访事项处理意见不服的,怎么办?",
-          text:
-            "活动策划是提高市场占有率的有效行为，一份可执行、可操作、创意突出的活动策划案，可有效提升企业的知名度及品牌美誉度。活动策划案是相对于市场策划案而言，严格说它们同属市场策划的兄弟分支，活动策划、..."
-        },
-        {
-          img: require("../../../static/img/img0.png"),
-          title: "信访人对信访事项处理意见不服的,怎么办?",
-          text:
-            "活动策划是提高市场占有率的有效行为，一份可执行、可操作、创意突出的活动策划案，可有效提升企业的知名度及品牌美誉度。活动策划案是相对于市场策划案而言，严格说它们同属市场策划的兄弟分支，活动策划、..."
-        }
-      ],
       bgData: []
     };
   },
@@ -320,7 +262,7 @@ export default {
         if (res.data.code === 200) {
           _this.bgData = res.data.data
         } else {
-          _this.$Message.error('请求数据有问题！')
+          _this.$message.error('请求数据有问题！')
         }
       })
         // eslint-disable-next-line handle-callback-err
@@ -535,14 +477,14 @@ export default {
     /** THREE */
     .container-three {
       width: 100%;
-      height: 848px;
+      // height: 848px;
       padding: 0 40px;
       box-sizing: border-box;
       margin-top: 59px;
 
       .box-list {
         width: 100%;
-        height: 794px;
+        // height: 794px;
         background-color: #ffffff;
         box-sizing: border-box;
         padding: 0 60px 0 8px;
@@ -718,23 +660,42 @@ export default {
               }
             }
 
-            .text {
-              width: 309px;
-              height: 127px;
+            .ult {
+              li {
+                a {
+                  color: #333333;
+                }
 
-              p {
-                width: 309px;
-                height: 92px;
-                overflow: hidden;
                 font-family: "MicrosoftYaHei";
                 font-size: 16px;
                 font-weight: normal;
                 font-stretch: normal;
                 line-height: 33px;
                 letter-spacing: 0px;
-                color: #333333;
+                overflow: hidden;
+                -o-text-overflow: clip;
+                text-overflow: clip;
+                white-space: nowrap;
               }
             }
+
+            //   .text {
+            //     width: 309px;
+            //     height: 127px;
+
+            //     p {
+            //       width: 309px;
+            //       height: 92px;
+            //       overflow: hidden;
+            //       font-family: "MicrosoftYaHei";
+            //       font-size: 16px;
+            //       font-weight: normal;
+            //       font-stretch: normal;
+            //       line-height: 33px;
+            //       letter-spacing: 0px;
+            //       color: #333333;
+            //     }
+            //   }
           }
 
           .top-p {
diff --git a/src/views/home/NewsDetails.vue b/src/views/home/NewsDetails.vue
index 8d95be0..3d02988 100644
--- a/src/views/home/NewsDetails.vue
+++ b/src/views/home/NewsDetails.vue
@@ -5,41 +5,35 @@
       <div class="left">
         <dl>
           <dt>
-            <img class="one"
-                 :src="imgUrl.img5"
-                 alt />
-            <span @click="collection()"
-                  class="iconfont icon-changyongtubiao-mianxing-"
-                  :class="coll ? 'colorTrue' : 'colorFalse'"></span>
+            <img class="one" :src="bgData.cover" alt />
+            <span
+              @click="collection()"
+              class="iconfont icon-changyongtubiao-mianxing-"
+              :class="coll ? 'colorTrue' : 'colorFalse'"
+            ></span>
           </dt>
           <dd>
-            <span class="d-o">因势而谋书写能源转型发展大文章</span>
+            <span class="d-o">{{bgData.title}}</span>
           </dd>
           <dd>
             <span class="d-b">
-              来源:央视网
+              来源:{{bgData.author}}
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              发布时间:2019-08-08
+              发布时间:{{bgData.created_at}}
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              浏览量:11123
+              浏览量:{{bgData.view}}
             </span>
           </dd>
         </dl>
-        <div class="text">
-          <p>近日,国家能源局召开党组中心组学习(扩大)会议,专题学习《习近平新时代中国特色社会主义思想学习纲要》中关于“掌握马克思主义思想方法和工作方法”重要论述扎实推进国家能源局“不忘初心、牢记使命”主题教育。马克思主义思想方法和工作方法是我们党的看家本领。落实‘四个革命、一个合作’能源安全新战略,构建清洁低碳、安全高效的能源体系任务艰巨而繁重,迫切需要我们掌握科学的世界观和方法论,树立科学的思想方法和工作方法。”国家能源局党组书记、局长章建华开门见山,强调了把马克思主义的科学方法和工作方法贯穿能源发展全过程的重要意义坚持实事求是在调查硏究中找准问题在革命建设改革各个历史时期,中国共产党运用马克思主义世界观和方法论,系统、具体、历史地分析中国社会运动及其发展规律,在实践过程中形成了实事求是、问题导向等一系列科学的思想方法和工作方法。</p>
-          <p>习近平总书记关于掌握马克思主义思想方法和工作方法的重要论述,是马克思主义世界观和方法论在当代中国的具体运用我国仍处于并将长期处于社会主义初级阶段,是最大的国情和实际。“我们开展各项工作,要一切从实际出发,牢牢立足这个最大国情和实际,不要超越阶段。从能源来,我国‘富煤少油缺气’的资源禀赋,决定了煤炭在较长一个时期內作为我国主体能源的地位不会发玍变化,这就要求我们坚持从煤炭资源丰富旳国情岀发,切实抓好煤炭清洁高效利用。”章建华说对此,国家能源局党组成员、副局长刘宝华也指岀,煤炭资源的清洁开发和利用,是保障能源安全旳基石。“近些年我们在煤电领堿实施以大代小,老小机组拆除近亿千瓦,极大地提髙了煤电发电的整体质量,能效大幅提升,污染大幅下降。在煤炭领堿实施产能置换政策,对提髙效率、降低成本、提升安全水平也发挥了决定性的作用。”实际工作中的问题则需要通过调査研究来发现和解决。主题教育开展以来,国家能源局党组高度重视调查研究工作,在中央第二十指导组的指导下,局党组和40个基层党组织结合职责任务,有针对性地确定调研课题118个,局领导和各部门各单位主要负责同志带头深入一线接地气、搞调研。坚持理想信念在服务人民中担当履责正如章建华所说,马克思主乂的世界观、人生观、价值观与方法论是有机统一的,方法论的背后是党性修养、是价值追求、是品格境界。掌握马克思主义的思想方法和工作方法必须知行合一,植于心、践于行。共产党员必须把理想信念植于心,树牢“四个意识”,坚定“四个自信”,坚决做到“两个维护”,自觉把对党忠诚体现到对党的信仰忠诚上,体现到对党组织忠诚上</p>
-        </div>
+        <div class="text" v-html="bgData.content">{{bgData.content}}</div>
       </div>
       <div class="right">
         <h3>热点新闻</h3>
         <div>
           <template v-for="(item,index) in list">
-            <dl :key="index"
-                v-if="index < 4"
-                @click="$jump('newsDetails')">
+            <dl :key="index" v-if="index < 4" @click="$jump('newsDetails')">
               <dt>
-                <img :src="imgUrl.img4"
-                     alt />
+                <img :src="imgUrl.img4" alt />
               </dt>
               <dd>
                 <span class="dd">活动策划是提高市场占有率的有效行为</span>
@@ -76,18 +70,47 @@ export default {
         img5: require("../../../static/img/img5.png"),
         wjx: require("../../../static/img/wjx.png")
       },
-      list: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+      list: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+      bgData: []
     };
   },
   computed: {},
   watch: {},
   methods: {
     collection() {
+      if (!localStorage.token) {
+        alert('请先登录~')
+        return;
+      }
       this.coll = !this.coll;
+    },
+    getData(id) {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/article/details',
+        data: {
+          id: id
+        }
+      }).then(res => {
+        if (res.data.code === 200) {
+          _this.bgData = res.data.data.data
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
     }
   },
-  created() {},
-  mounted() {}
+  created() {
+    let id = this.$route.params.id
+    let type = this.$route.params.type
+    this.getData(id)
+  },
+  mounted() { }
 };
 </script>
 
diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue
index 9875fbc..3515fcf 100644
--- a/src/views/home/NewsList.vue
+++ b/src/views/home/NewsList.vue
@@ -3,14 +3,14 @@
     <header-nav :index_num="index_num"></header-nav>
     <div id="box">
       <template v-for="(info,index) in bgData.info">
-        <div id="news" :key="index" @click="$jump('newsDetails')">
+        <div id="news" :key="index" @click="$jParams('newsDetails',{id:info.id,type:getType})">
           <div class="news-box">
-            <img :src="info.cover" alt />
+            <img :src="info.cover" />
             <section>
               <h3>{{info.title}}</h3>
               <aside>
-                <span>来源:央视网</span>
-                <span>发布时间:{{info.created_at}}</span>
+                <span>来源:{{info.author}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <span>发布时间:{{info.created_at}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <span>浏览量:{{info.view}}</span>
               </aside>
               <p>{{info.content}}</p>
@@ -63,7 +63,6 @@ export default {
   },
   methods: {
     getData() {
-      console.log(this.getType)
       let _this = this
       this.$http({
         method: 'get',
@@ -78,7 +77,7 @@ export default {
           _this.totalCount = _this.bgData.allNum
           _this.pageSize = _this.bgData.info.length
         } else {
-          _this.$Message.error('请求数据有问题！')
+          _this.$message.error('请求数据有问题！')
         }
       })
         // eslint-disable-next-line handle-callback-err
@@ -100,19 +99,21 @@ export default {
   created() {
     this.getType = this.$route.params.type
     this.currentPage = Number(localStorage.getItem("pagination")) || 1;
-    this.getType = Number(localStorage.getItem("getType")) || this.getType;
+    this.getType = this.getType || Number(localStorage.getItem("getType"));
     this.handleCurrentChange(this.currentPage);
     this.getData()
 
   },
   beforeUpdate() {
     localStorage.setItem('pagination', this.currentPage)
-    localStorage.setItem('getType',this.getType)
+    localStorage.setItem('getType', this.getType)
   },
   beforeDestroy() {
-    localStorage.clear()
+    // localStorage.clear()
+    localStorage.setItem('pagination', this.currentPage)
+    localStorage.setItem('getType', this.getType)
   },
-  mounted() {}
+  mounted() { }
 };
 </script>
 
@@ -164,7 +165,7 @@ export default {
         }
 
         aside {
-          width: 434px;
+          // width: 434px;
           height: 17px;
           font-family: "MicrosoftYaHei";
           font-size: 16px;