Merge pull request #37 from sweida/dev

Dev

Author: sweida

package.json

@@ -9,24 +9,24 @@
     "build:sit": "vue-cli-service build --mode sit",
     "predeploy": "npm run build",
     "deploy": "gh-pages -d dist",
+    "deploy:push": "gh-pages -d dist",
     "predeploy:sit": "npm run build:sit",
     "deploy:sit": "gh-pages -d dist --branch sit",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "axios": "^0.21.2",
-    "element-ui": "^2.4.5",
+    "axios": "^1.6.8",
+    "core-js": "^2.6.5",
     "gh-pages": "^2.0.1",
     "highlight.js": "^10.4.1",
     "iview": "^3.0.1",
     "mavon-editor": "^2.8.2",
+    "vue": "2.7.16",
     "vue-fragment": "^1.6.0",
     "vue-marked": "^0.1.1",
     "vue-router": "^3.0.1",
     "vue-savedata": "^2.0.2",
-    "vuex": "^3.0.1",
-    "core-js": "^2.6.5",
-    "vue": "^2.6.10"
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.11.0",

src/modules/index/api/article.js

@@ -7,7 +7,7 @@ export function ArticleDetial (data) {
     // baseURL: baseURL.host,
     url: '/apis/article',
     method: 'post',
-    data: data
+    data
   })
 }
 
@@ -17,7 +17,7 @@ export function ArticleList (data) {
     // baseURL: baseURL.host,
     url: '/apis/article/list',
     method: 'post',
-    data: data
+    data
   })
 }
 
@@ -27,7 +27,17 @@ export function ArticleLike (data) {
     // baseURL: baseURL.host,
     url: '/apis/article/like',
     method: 'post',
-    data: data
+    data
+  })
+}
+
+// 技能skill
+export function getClassify (data) {
+  return request({
+    // baseURL: baseURL.host,
+    url: '/apis/article/classify',
+    method: 'get',
+    data
   })
 }
 
@@ -37,6 +47,7 @@ export function TagList (data) {
     // baseURL: baseURL.host,
     url: '/apis/tag/list',
     method: 'post',
-    data: data
+    data
   })
 }
+

src/modules/index/api/comment.js

@@ -0,0 +1,37 @@
+import request from "utils/httpIndex";
+
+// 获取评论
+export function CommentList (data) {
+  return request({
+    url: '/apis/comment/read',
+    method: 'post',
+    data
+  })
+}
+
+// 提交评论
+export function CommentAdd (data) {
+  return request({
+    url: '/apis/comment/add',
+    method: 'post',
+    data
+  })
+}
+
+// 删除评论
+export function CommentDelete (data) {
+  return request({
+    url: '/apis/comment/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 个人留言
+export function CommentPerson (data) {
+  return request({
+    url: '/apis/comment/person',
+    method: 'post',
+    data
+  })
+}

src/modules/index/api/common.js

@@ -1,72 +1,31 @@
 import request from "utils/httpIndex";
 import baseURL from "./baseUrlConfig";
 
-export function GetAd (data) {
-  return request({
-    // baseURL: baseURL.host,
-    url: '/apis/ad',
-    method: 'post',
-    data: data
-  })
-}
 
-// 友链
-export function LinkList (data) {
+export function getWebInfo (data) {
   return request({
     // baseURL: baseURL.host,
-    url: '/apis/link/list',
-    method: 'post',
-    data: data
-  })
-}
-
-// 留言列表
-export function MessageList (data) {
-  return request({
-    // baseURL: baseURL.host,
-    url: '/apis/message/list',
-    method: 'post',
-    data: data
+    url: '/apis/webinfo/read',
+    method: 'get',
+    data
   })
 }
 
-// 新增留言
-export function MessageAdd (data) {
+export function getAd (data) {
   return request({
     // baseURL: baseURL.host,
-    url: '/apis/message/add',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除留言
-export function MessageDelete (data) {
-  return request({
-    // baseURL: baseURL.host,
-    url: '/apis/message/delete',
-    method: 'post',
-    data: data
-  })
-}
-
-// 回复留言
-export function MessageReply (data) {
-  return request({
-    // baseURL: baseURL.host,
-    url: '/apis/message/reply',
+    url: '/apis/ad',
     method: 'post',
-    data: data
+    data
   })
 }
 
-// 删除回复
-export function MessageReplyDelete (data) {
+// 友链
+export function LinkList (data) {
   return request({
     // baseURL: baseURL.host,
-    url: '/apis/message/reply/delete',
+    url: '/apis/link/list',
     method: 'post',
-    data: data
+    data
   })
 }
-

src/modules/index/api/index.js

@@ -1,17 +1,41 @@
 
 export { 
-  GetAd,
+  getAd,
   LinkList,
-  MessageList, 
-  MessageAdd,
-  MessageDelete,
-  MessageReply,
-  MessageReplyDelete,
+  getWebInfo,
 } from './common'
 
 export {
   ArticleDetial,
   ArticleList,
   ArticleLike,
   TagList,
+  getClassify,
 } from './article'
+
+export {
+  CommentList,
+  CommentAdd,
+  CommentDelete,
+  CommentPerson,
+} from './comment'
+
+export {
+  MessageList,
+  MessageAdd,
+  MessageDelete,
+  MessageReply,
+  MessageReplyDelete,
+  MessagePerson,
+} from'./message'
+
+export {
+  getUserInfo,
+  Login,
+  Signup,
+  ResetPassword,
+  SendEmail,
+  CheckCaptcha,
+} from './user'
+
+

src/modules/index/api/message.js

@@ -0,0 +1,56 @@
+import request from "utils/httpIndex";
+import baseURL from "./baseUrlConfig";
+
+// 留言列表
+export function MessageList (data) {
+  return request({
+    url: '/apis/message/list',
+    method: 'post',
+    data
+  })
+}
+
+// 新增留言
+export function MessageAdd (data) {
+  return request({
+    url: '/apis/message/add',
+    method: 'post',
+    data
+  })
+}
+
+// 删除留言
+export function MessageDelete (data) {
+  return request({
+    url: '/apis/message/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 回复留言
+export function MessageReply (data) {
+  return request({
+    url: '/apis/message/reply',
+    method: 'post',
+    data
+  })
+}
+
+// 删除回复
+export function MessageReplyDelete (data) {
+  return request({
+    url: '/apis/message/reply/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 个人留言
+export function MessagePerson (data) {
+  return request({
+    url: '/apis/message/person',
+    method: 'post',
+    data
+  })
+}

src/modules/index/api/user.js

@@ -0,0 +1,51 @@
+import request from "utils/httpIndex";
+
+export function Login (data) {
+  return request({
+    url: '/apis/login',
+    method: 'post',
+    data
+  })
+}
+
+export function Signup (data) {
+  return request({
+    url: '/apis/signup',
+    method: 'post',
+    data
+  })
+}
+
+export function getUserInfo (data) {
+  return request({
+    url: '/apis/user/info',
+    method: 'get',
+    data
+  })
+}
+
+// 修改密码
+export function ResetPassword (data) {
+  return request({
+    url: '/apis/user/resetpassword',
+    method: 'post',
+    data
+  })
+}
+
+export function SendEmail (data) {
+  return request({
+    url: '/apis/user/send_email',
+    method: 'post',
+    data
+  })
+}
+
+export function CheckCaptcha (data) {
+  return request({
+    url: '/apis/user/check_captcha',
+    method: 'post',
+    data
+  })
+}
+

src/modules/index/components/headnav.vue

@@ -74,7 +74,7 @@
 
           <template v-if="user">
             <li>
-              <img :src="`${avatarUrl}?seed=${user.id || 'false'}`" alt="avatar" />
+              <img class="user-img" :src="`${avatarUrl}?seed=${user.id || 'false'}`" alt="avatar" />
               {{ user.name }}
               <Icon type="md-arrow-dropdown" />
             </li>
@@ -338,7 +338,7 @@ export default {
 
 @media screen and (max-width: 750px)
   .header
-    .footer-bg, .menu
+    .menu
       display none
   .nav-bg, .nav-content
     display block

src/modules/index/components/skills.vue

@@ -65,7 +65,7 @@ export default {
     }, 
     // 获取所有分类
     getClassify() {
-      this.$get('/apis/article/classify').then(res => {
+      this.$api.getClassify().then(res => {
         this.classifys = res.data
       }).catch(err =>{})
     }