关于我们更多页和收藏接口调整，去掉登录页的验证码登录

src/router/index.js

@@ -121,6 +121,11 @@ export const constantRoutes = [
     component: resolve => require(['@/views/result'], resolve),
     name: 'result'
   },
+  {
+    path: '/about',
+    component: resolve => require(['@/views/about'], resolve),
+    name: 'about'
+  },
   {
     path: '/portrait',
     component: resolve => require(['@/views/portrait'], resolve),

src/views/about.vue

@@ -0,0 +1,305 @@
+<template>
+  <!-- 预览弹出层 -->
+  <div class="result_page">
+    <el-backtop target=".result_page" :visibility-height="500"></el-backtop>
+    <headerPage />
+
+    <div class="my_main content p0-100 min_h_285" style="display: flex">
+      <div class="l" style="width: 77%; background-color: #fff; padding: 30px">
+        <h2 style="text-align:center">关于我们</h2>
+        <p style="color:#999;line-height:1.75;text-indent:2em">
+          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
+        </p>
+        <div style="text-align:center">
+          <img src="@/assets/image/03.png" alt="" />
+        </div>
+        <p style="color:#999;line-height:1.75;text-indent:2em">
+          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
+        </p>
+        <div style="text-align:center">
+          <img src="@/assets/image/03.png" alt="" />
+        </div>
+        <p style="color:#999;line-height:1.75;text-indent:2em">
+          合肥嘉策信息技术服务有限公司成立于2018年05月22日，注册地位于安徽省合肥市高新区嶺湖墅76幢508室，法定代表人为时加红。经营范围包括信息系统集成咨询及服务；软件开发、技术服务、技术咨询、技术推广、技术转让；数据分析、加工、处理；基础软件服务；应用软件服务；机器人系统集成设备、工业智能装备及自动化辅助设备研发及销售；计算机设备及配件、计算机耗材用品、网络设备及材料、节能设备的研发和销售。（依法须经批准的项目，经相关部门批准后方可开展经营活动）
+        </p>
+        <div style="text-align:center">
+          <img src="@/assets/image/03.png" alt="" />
+        </div>
+      </div>
+      <div
+        class="r"
+        style="
+          width: 22%;
+          margin-left: 1%;
+          background-color: #fff;
+          padding: 20px 10px;
+        "
+      >
+        <!-- 公告模块 -->
+        <div class="notice">
+          <div class="title">
+            <div>通知公告</div>
+            <router-link target="_blank" :to="{ path: '/notice' }">
+              <div class="pointer" style="color: #999">
+                更多<i class="el-icon-arrow-right"></i>
+              </div>
+            </router-link>
+          </div>
+          <div class="list">
+            <ul>
+              <li
+                class="text_hidden_one pointer"
+                v-for="item in noticeList"
+                :key="item.id"
+              >
+                <router-link
+                  target="_blank"
+                  :to="{
+                    path: '/result',
+                    query: { key: 'policy', id: item.id }
+                  }"
+                >
+                  <span>•</span>{{ item.title }}
+                </router-link>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="my_footer">
+      <div style="height: 4px; background: #ffa32c"></div>
+      <div class="footer_one content">
+        <div class="footer_two">
+          <div class="footer_left">
+            <div class="footer_left_one"></div>
+          </div>
+          <div>
+            <h3>合肥嘉策信息技术服务有限公司</h3>
+            <div>
+              地址：安徽省合肥市高新区黄山路601号科技创新公共服务中心412-414室
+            </div>
+            <div style="margin:15px 0">联系人：小杨老师、小黄老师</div>
+            <div>电话：19805659038、15855136916</div>
+          </div>
+          <div class="footer_right">
+            <div class="item">
+              <img src="@/assets/image/wx02.png" alt="" />
+              <div>嘉策公众号</div>
+            </div>
+            <div class="item">
+              <img src="@/assets/image/qq02.png" alt="" />
+              <div>嘉策QQ群</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="hc_bottom">
+      <div class="content text">
+        <span>CopyRight 2020-2021</span>
+        <span>版权所有 合肥嘉策信息技术服务有限公司</span>
+        <span>皖ICP备45619723号-1</span>
+        <!-- <span>技术支持：安徽商挈智能科技有限公司</span> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  search,
+  getPolicyInfo,
+  getPolicyReadInfo,
+  getInfo,
+  getInfo2,
+  getInfo3
+} from '@/api/search';
+import { getPolicyList, getRead } from '@/api/home/notice';
+import { mapGetters } from 'vuex';
+import { add, cancel } from '@/api/search';
+import Editor from '@/components/Editor';
+import headerPage from './components/header';
+// import headerPage2 from './components/header2';
+export default {
+  components: {
+    Editor,
+    headerPage
+    // headerPage2
+  },
+  data() {
+    return {
+      input: '',
+      type: '',
+      noticeList: [],
+      total: {}
+    };
+  },
+  computed: {
+    ...mapGetters(['token'])
+  },
+  methods: {},
+  created() {
+    let { key, id } = this.$route.query;
+    this.type = key;
+
+    getPolicyList({ pageNum: 1, pageSize: 5 }).then(({ data }) => {
+      this.noticeList = data.list;
+    });
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/.el-dialog__body {
+  padding-top: 0;
+}
+.result_page {
+  height: 100vh;
+  overflow: auto;
+  background-color: #f1f1f1;
+  .info {
+    display: flex;
+    justify-content: space-between;
+  }
+  #text {
+    margin-top: 30px;
+    /deep/.ql-toolbar {
+      display: none;
+    }
+    /deep/.editor {
+      border: 0;
+    }
+    /deep/p {
+      img {
+        max-width: 100%;
+      }
+    }
+  }
+  .my_main {
+    margin: 30px auto;
+    .l {
+      //
+    }
+    .r {
+      .title {
+        display: flex;
+        justify-content: space-between;
+      }
+      .list {
+        ul {
+          padding-left: 0;
+          line-height: 35px;
+          li {
+            color: #999;
+            span {
+              margin-right: 5px;
+            }
+            &:hover {
+              color: #ffa32c;
+            }
+          }
+        }
+      }
+    }
+  }
+  .my_footer {
+    background-color: #eeeeee;
+    .footer_one {
+      p {
+        text-align: center;
+        font-size: 14px;
+        color: #666;
+        span {
+          i {
+            margin-right: 3px;
+            img {
+              vertical-align: middle;
+            }
+          }
+        }
+        span:nth-child(2) {
+          margin-left: 40px;
+        }
+      }
+    }
+    .footer_two {
+      // border-bottom: 1px solid #dcdcdc;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .footer_left {
+        padding: 60px 0;
+        .footer_left_one {
+          width: 392px;
+          height: 63px;
+          background: url(~@/assets/image/02.png) no-repeat left center;
+          background-size: 90% 90%;
+        }
+        .footer_left_two {
+          margin: 10px 0;
+          font-size: 13px;
+          color: #666;
+        }
+        .footer_left_three {
+          font-size: 22px;
+          color: #555;
+        }
+        .footer_left_l {
+          font-size: 18px;
+          color: #333;
+          margin-right: 30px;
+        }
+        .footer_left_r {
+          font-size: 16px;
+          color: #666;
+          i {
+            img {
+              vertical-align: middle;
+            }
+          }
+        }
+      }
+      .footer_right {
+        display: flex;
+        .item:nth-child(1) {
+          font-size: 18px;
+          color: #333;
+          margin-right: 50px;
+          text-align: center;
+        }
+      }
+    }
+    .footer_three {
+      text-align: center;
+      padding: 36px 0;
+      div {
+        font-size: 16px;
+        color: #3394ff;
+        span:nth-child(2) {
+          margin: 0 39px;
+        }
+      }
+      p {
+        font-size: 14px;
+        color: #333;
+      }
+    }
+  }
+  .hc_bottom {
+    width: 100%;
+    height: 35px;
+    text-align: center;
+    line-height: 35px;
+    background: #ccc;
+    .text {
+      color: #777;
+      font-size: 12px;
+      span {
+        margin-right: 15px;
+      }
+    }
+  }
+}
+</style>

src/views/home/account.vue

@@ -20,7 +20,7 @@
         <div class="list_icon password"></div>
         <span class="list_info">
           <span class="text">修改密码</span>
-          <span class="phone">忘记密码时可通过手机验证码登录</span>
+          <span class="phone">修改账户登录密码</span>
         </span>
       </div>
       <el-button type="primary" size="small" @click="openDialog('修改密码')"
@@ -28,14 +28,23 @@
       >
     </div>
     <!-- :close-on-click-modal="false" -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
+    <el-dialog
+      :title="title"
+      v-if="dialogVisible"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
       <el-form ref="form" :model="form" :rules="formRules" label-width="100px">
         <el-form-item
           label="新手机号"
           prop="username"
           v-if="title == '修改登录手机号'"
         >
-          <el-input v-model.trim="form.username"></el-input>
+          <el-input
+            v-model.trim="form.username"
+            maxlength="11"
+            show-word-limit
+          ></el-input>
         </el-form-item>
         <el-form-item
           prop="code"
@@ -65,6 +74,13 @@
             <span v-show="!show" class="count">({{ count }}s)</span>
           </el-button>
         </el-form-item>
+        <el-form-item
+          label="原密码"
+          prop="oldPassword"
+          v-if="title == '修改密码'"
+        >
+          <el-input v-model.trim="form.oldPassword" show-password></el-input>
+        </el-form-item>
         <el-form-item
           label="新登录密码"
           prop="password"
@@ -77,8 +93,8 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -106,7 +122,12 @@ export default {
         username: [
           { required: true, trigger: 'blur', message: '手机号不能为空' }
         ],
-        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }]
+        oldPassword: [
+          { required: true, trigger: 'blur', message: '原密码不能为空' }
+        ],
+        password: [
+          { required: true, trigger: 'blur', message: '新密码不能为空' }
+        ]
       }
     };
   },
@@ -145,18 +166,26 @@ export default {
         }
       });
     },
-    submitForm() {
-      if (this.title == '修改密码') {
-        if (this.form.password !== this.password)
-          return this.msgError('新旧密码不一致');
-      }
-      updateInfo(this.form).then(({ message }) => {
-        this.msgSuccess(message);
-        // store.commit('SET_NAME', this.form.username);
-        // this.dialogVisible = false;
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/';
-        });
+    resetForm(formName) {
+      this.dialogVisible = false;
+      this.$refs[formName].resetFields();
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          if (this.title == '修改密码') {
+            if (this.form.password !== this.password)
+              return this.msgError('新旧密码不一致');
+          }
+          updateInfo(this.form).then(({ message }) => {
+            this.msgSuccess(message);
+            // store.commit('SET_NAME', this.form.username);
+            // this.dialogVisible = false;
+            this.$store.dispatch('LogOut').then(() => {
+              location.href = '/';
+            });
+          });
+        }
       });
 
       // if(this.title=='修改登录手机号'){

src/views/home/home.vue

@@ -357,9 +357,17 @@
                 合肥嘉策信息技术服务有限公司于2018年05月2日成立。法定代表人时加红，公司经营范围包括：信息系统集成咨询...
               </p>
             </div>
-            <router-link to="">
+            <!-- <router-link
+              target="_blank"
+              :to="{
+                path: '/about'
+              }"
+            >
               <el-button type="warning">更多</el-button>
-            </router-link>
+            </router-link> -->
+            <el-button type="warning" @click="handlePageAbout()"
+              >更多</el-button
+            >
           </div>
         </div>
       </div>
@@ -437,6 +445,9 @@ export default {
     };
   },
   methods: {
+    handlePageAbout() {
+      return alert('请提供更多信息，以图文格式展示！！！');
+    },
     // 政策列表
     handleClick(tab, event) {
       getPolicy(this.queryParams).then(({ data }) => {

src/views/home/ollection.vue

@@ -19,7 +19,8 @@
           </h4>
           <div class="info">
             <div>来源：{{ item.source }}</div>
-            <div>发布：{{ parseTime(item.textDate, '{y}-{m}-{d}') }}</div>
+            <div>发布：{{ parseTime(item.listDate, '{y}-{m}-{d}') }}</div>
+            <!-- <div>发布：{{ parseTime(item.textDate, '{y}-{m}-{d}') }}</div> -->
           </div>
         </div>
         <div>

src/views/login.vue

@@ -14,7 +14,11 @@
         >
           <div class="m-title">
             <div>
-              欢迎登录<i class="el-icon-sort" @click="status = false"></i>
+              欢迎登录<i
+                class="el-icon-sort"
+                @click="status = false"
+                v-show="checkShow"
+              ></i>
             </div>
           </div>
           <el-form
@@ -277,6 +281,7 @@ export default {
   name: 'Login',
   data() {
     return {
+      checkShow: true,
       dialogVisible: false,
       mode: true,
       TIME_COUNT: 60,
@@ -354,6 +359,7 @@ export default {
       }
     },
     changeMethod(flag) {
+      this.checkShow = flag;
       this.mode = flag;
       this.loginForm.password = '';
     },
@@ -440,15 +446,16 @@ export default {
               });
           } else {
             // 验证码登录
-            this.$store
-              .dispatch('Register', this.loginForm)
-              .then(() => {
-                this.$router.push({ path: this.redirect || '/' });
-                // this.$router.go(-1);
-              })
-              .catch(() => {
-                this.loading = false;
-              });
+            debugger;
+            // this.$store
+            //   .dispatch('Register', this.loginForm)
+            //   .then(() => {
+            //     this.$router.push({ path: this.redirect || '/' });
+            //     // this.$router.go(-1);
+            //   })
+            //   .catch(() => {
+            //     this.loading = false;
+            //   });
           }
         }
       });
@@ -461,7 +468,7 @@ export default {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          // 验证码登录
+          // 注册
           this.$store
             .dispatch('Register', this.registerForm)
             .then(() => {
@@ -660,7 +667,7 @@ $loginForm: 383px;
   color: #209cff;
 }
 .el-dialog {
-  height: 700px;
+  max-height: 700px;
   overflow: auto;
 }
 </style>