登录接口90%+资讯接口70%

package.json

@@ -11,6 +11,7 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
+    "ali-oss": "^6.8.0",
     "axios": "^0.18.0",
     "clipboard": "^2.0.0",
     "codemirror": "^5.38.0",
@@ -27,8 +28,9 @@
     "tree-table-vue": "^1.1.0",
     "v-org-tree": "^1.0.6",
     "vue": "^2.5.10",
+    "vue-cropper": "^0.5.2",
     "vue-i18n": "^7.8.0",
-    "vue-router": "^3.0.1",
+    "vue-router": "^3.0.7",
     "vuedraggable": "^2.16.0",
     "vuex": "^3.0.1",
     "wangeditor": "^3.1.1",

src/api/info.js

@@ -0,0 +1,12 @@
+import axios from '@/libs/api.request'
+export const addInfo = (data) => {
+  // const data = {
+  //   loginname,
+  //   loginpwd
+  // }
+  return axios.request({
+    url: 'https://aicpapitest.xhkjedu.com/newstype/add',
+    method: 'POST',
+    data
+  })
+}

src/api/user.js

@@ -1,27 +1,30 @@
 import axios from '@/libs/api.request'
 
-export const login = ({ userName, password }) => {
-  const data = {
-    userName,
-    password
-  }
+export const login = ({ loginname, loginpwd }) => {
+  // const data = {
+  //   loginname,
+  //   loginpwd
+  // }
   return axios.request({
-    url: 'login',
-    data,
-    method: 'post'
-  })
-}
-
-export const getUserInfo = (token) => {
-  return axios.request({
-    url: 'get_info',
+    url: 'https://aicpapitest.xhkjedu.com/user/login',
+    method: 'POST',
     params: {
-      token
-    },
-    method: 'get'
+      loginname,
+      loginpwd
+    }
   })
 }
 
+// export const getUserInfo = (token) => {
+//   return axios.request({
+//     url: 'get_info',
+//     params: {
+//       token
+//     },
+//     method: 'get'
+//   })
+// }
+
 export const logout = (token) => {
   return axios.request({
     url: 'logout',
@@ -29,56 +32,56 @@ export const logout = (token) => {
   })
 }
 
-export const getUnreadCount = () => {
-  return axios.request({
-    url: 'message/count',
-    method: 'get'
-  })
-}
+// export const getUnreadCount = () => {
+//   return axios.request({
+//     url: 'message/count',
+//     method: 'get'
+//   })
+// }
 
-export const getMessage = () => {
-  return axios.request({
-    url: 'message/init',
-    method: 'get'
-  })
-}
+// export const getMessage = () => {
+//   return axios.request({
+//     url: 'message/init',
+//     method: 'get'
+//   })
+// }
 
-export const getContentByMsgId = msg_id => {
-  return axios.request({
-    url: 'message/content',
-    method: 'get',
-    params: {
-      msg_id
-    }
-  })
-}
+// export const getContentByMsgId = msg_id => {
+//   return axios.request({
+//     url: 'message/content',
+//     method: 'get',
+//     params: {
+//       msg_id
+//     }
+//   })
+// }
 
-export const hasRead = msg_id => {
-  return axios.request({
-    url: 'message/has_read',
-    method: 'post',
-    data: {
-      msg_id
-    }
-  })
-}
+// export const hasRead = msg_id => {
+//   return axios.request({
+//     url: 'message/has_read',
+//     method: 'post',
+//     data: {
+//       msg_id
+//     }
+//   })
+// }
 
-export const removeReaded = msg_id => {
-  return axios.request({
-    url: 'message/remove_readed',
-    method: 'post',
-    data: {
-      msg_id
-    }
-  })
-}
+// export const removeReaded = msg_id => {
+//   return axios.request({
+//     url: 'message/remove_readed',
+//     method: 'post',
+//     data: {
+//       msg_id
+//     }
+//   })
+// }
 
-export const restoreTrash = msg_id => {
-  return axios.request({
-    url: 'message/restore',
-    method: 'post',
-    data: {
-      msg_id
-    }
-  })
-}
+// export const restoreTrash = msg_id => {
+//   return axios.request({
+//     url: 'message/restore',
+//     method: 'post',
+//     data: {
+//       msg_id
+//     }
+//   })
+// }

src/assets/iconfont/iconfont.css

@@ -0,0 +1,21 @@
+@font-face {font-family: "iconfont";
+  src: url('iconfont.eot?t=1590049832161'); /* IE9 */
+  src: url('iconfont.eot?t=1590049832161#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAKYAAsAAAAABkgAAAJLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcApYaQE2AiQDCAsGAAQgBYRtBywbiwXILrBt2JMANbENY7CSLm0QeAPx8LTft3NnZk0lLnhWb3gn8oliFbJYCZRu1TP53f9amz2V0OakicVL4kDSvjJ/xWcHe52UeSRSgRAhNHRy9n+7XLBlHAi0RVKC9LIXQLUB19RPoAepHdDcOikqORJwYNOBduDoyTaSkW8Yu+AFPifQbNyYdvR4cw8Vhb0uEPdcW4dKIaYorNgo1DccLeKlOo3pUfrGi+j78c92NJLUZXbbiRsHC9Y/OWW5VtVcCQhxAjpdh4xVoBBnGnPH5AXj8ppzBdPgWM3BT1UVeMVRXYL9dXZjKxiF6mfSeNpHbUygJLODwMgkeUitrZe7H/fw03zebO3jTbz6+OTzCF9/evzhwUDn/vClE0TUp6BmDf4OrAGq+XMe0RD86Pt6e++/XMDXr1YUqRbDAqBxR/7gh2gGjhRDZ3tS0TSNgWRw0tqEZs2o4FC3v6n2vrOXQqO+ewg0GMuQNZolC7uKOi12Ua/RATRbcTrdogfLi9KEZe8AodMXknZfkHX6IQv7izr9/lGvMzKanYueK1vMx+3aESZdyELjDV0zjpTrk1rcfEv2U6BzXhfxj8SZm8TF+ma5eKKIeIkd2bO9FFGoOA7xCF6jIIgx4dgjU6aOSLKabdxokmlqxiHUHMGIThALMrxBLlMsooLpolb5/C1iexLQcUdHXfkRYRl3frQwNR9AnszRoI5HeSfzzLYkhIIUFguhI1hEAoEYSpoXeYhJTDkTMomVmTNJDTVPt7eGP1DFerAdKZzqLG1vAQAAAA==') format('woff2'),
+  url('iconfont.woff?t=1590049832161') format('woff'),
+  url('iconfont.ttf?t=1590049832161') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1590049832161#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-21:before {
+  content: "\e620";
+}
+

src/assets/iconfont/iconfont.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="21" unicode="&#58912;" d="M128 341.33333300000004h768a42.666667 42.666667 0 0 1 0 85.333334H128a42.666667 42.666667 0 0 1 0-85.333334zM469.333333 768v-768a42.666667 42.666667 0 0 1 85.333334 0V768a42.666667 42.666667 0 0 1-85.333334 0z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

src/components/cropper/index.less

@@ -1,12 +1,13 @@
 .bg{
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC")
+  // background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC")
 }
 .cropper-wrapper{
-  width: 600px;
-  height: 340px;
+  width: 200px;
+  height: 200px;
   .img-box{
-    height: 340px;
-    width: 430px;
+    height: 200px;
+    width: 200px;
+    background: white;
     border: 1px solid #ebebeb;
     display: inline-block;
     .bg;
@@ -25,11 +26,15 @@
       height: 150px !important;
       width: 100% !important;
       overflow: hidden;
-      border: 1px solid #ebebeb;
+      // border: 1px solid #ebebeb;
       .bg;
     }
     .button-box{
       padding: 10px 0 0;
+      .ivu-btn-default {
+        margin-top: -12px;
+        margin-left: -12px;
+      }
     }
   }
 }

src/components/cropper/index.vue

@@ -4,14 +4,14 @@
       <img class="cropper-image" :id="imgId" alt="">
     </div>
     <div class="right-con">
-      <div v-if="preview" class="preview-box" :id="previewId"></div>
+      <!-- <div v-if="preview" class="preview-box" :id="previewId"></div> -->
       <div class="button-box">
         <slot>
           <Upload action="image/upload" :before-upload="beforeUpload">
-            <Button style="width: 150px;" type="primary">上传图片</Button>
+            <Button icon="ivu-icon ivu-icon- iconfont icon-21"  style="width: 220px;height:220px" ></Button>
           </Upload>
         </slot>
-        <div v-show="insideSrc">
+        <!-- <div v-show="insideSrc">
           <Button type="primary" @click="rotate">
             <Icon type="md-refresh" :size="18"/>
           </Button>
@@ -40,7 +40,7 @@
             <Icon type="md-arrow-round-forward" :size="18"/>
           </Button>
           <Button style="width: 150px;margin-top: 10px;" type="primary" @click="crop">{{ cropButtonText }}</Button>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -73,7 +73,8 @@ export default {
   data () {
     return {
       cropper: null,
-      insideSrc: ''
+      insideSrc: '',
+      file: ''
     }
   },
   computed: {
@@ -96,6 +97,8 @@ export default {
     beforeUpload (file) {
       const reader = new FileReader()
       reader.readAsDataURL(file)
+      console.log(file)
+      this.file = file
       reader.onload = (event) => {
         this.insideSrc = event.srcElement.result
       }

src/components/login-form/login-form.vue

@@ -1,22 +1,22 @@
 <template>
 <div>
   <div class="formLine">
-    <form ref="loginForm" :model="loginForm" :rules="rules">
-      <div class='formElement'>
+    <Form ref="loginForm" :model="form" :rules="rules">
+      <Form-item  class='formElement' prop='loginname'>
         <!-- <img width="15px" src="../../assets/img/User.png" alt="" /> -->
-        <input style="padding-left:50px;" id="userName" type="text" v-model="loginForm.userName" placeholder="用户名" autocomplete="off">
-      </div>
-      <div class="formElement">
+        <input style="padding-left:50px;" id="userName" type="text" v-model="form.loginname" placeholder="用户名" autocomplete="off" />
+      </Form-item>
+      <Form-item  class="formElement"  prop='loginpwd'>
         <!-- <img src="../../assets/img/Key.png" alt="" /> -->
-        <input  style="padding-left:50px"  id="password" type="password" v-model="loginForm.password" placeholder="密码" autocomplete="off">
-      </div>
+        <input  style="padding-left:50px"  id="password" type="password" v-model="form.loginpwd" placeholder="密码" autocomplete="off">
+      </Form-item>
       <div class="formOther">
         <Checkbox v-model="single">记住密码</Checkbox>
       </div>
       <div class="formOther">
        <Button @click="handleSubmit" type="primary" long>登录</Button>
       </div>
-    </form>
+    </Form>
   </div>
    <div class="bottom">
             <a>注册</a>
@@ -28,7 +28,7 @@
 export default {
   name: 'LoginForm',
   props: {
-    userNameRules: {
+    loginnameRules: {
       type: Array,
       default: () => {
         return [
@@ -36,7 +36,7 @@ export default {
         ]
       }
     },
-    passwordRules: {
+    loginpwdRules: {
       type: Array,
       default: () => {
         return [
@@ -48,9 +48,9 @@ export default {
   data () {
     return {
       single: false,
-      loginForm: {
-        userName: 'super_admin',
-        password: '0000'
+      form: {
+        loginname: '13140197098',
+        loginpwd: '123456'
       }
     }
   },
@@ -64,32 +64,38 @@ export default {
   },
   methods: {
     handleSubmit () {
-      console.log(this.$refs.loginForm)
+      // console.log(this.$refs.loginForm)
       // this.$router.push('home')
-      // this.$refs.loginForm.validate((valid) => {
-      //   if (valid) {
-      this.$emit('on-success-valid', {
-        userName: this.loginForm.userName,
-        password: this.loginForm.password
+      this.$refs.loginForm.validate((valid) => {
+        // console.log(valid)
+        if (valid) {
+          this.$emit('on-success-valid', {
+            loginname: this.form.loginname,
+            loginpwd: this.form.loginpwd
+          })
+        }
       })
-      //   }
-      // })
     }
   }
 }
 </script>
 <style lang='less' scoped>
+// #userName>.ivu-form-item-content{
+//   width: 290px!important;
+// }
 #userName{
   background: url(../../assets/img/User.png) no-repeat left center;
   background-size: 20px 20px;
   background-position: 15px;
   height: 40px;
+  width: 295px;
 
 }
 #password{
   background: url(../../assets/img/Key.png) no-repeat left center;
   background-size: 20px 20px;
   background-position: 15px;
+  width: 295px;
 
 }
 .formLine{
@@ -100,7 +106,8 @@ export default {
     height: 40px;
     display: flex;
     align-items: center;
-    margin-bottom: 15px;
+    margin-bottom: 22px;
+
     input{
       border:none;
       width: 100%;

src/components/main/components/navbar/index.vue

@@ -41,7 +41,7 @@ export default {
   props: {
     userAvatar: {
       type: String,
-      default: ''
+      default: 'https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png'
     }
   },
   methods: {

src/components/main/components/side-menu/side-menu.less

@@ -5,6 +5,11 @@
   .ivu-menu-item,.ivu-menu-submenu{
     color: #3D8EFE;
   }
+  .ivu-menu-vertical .ivu-menu-submenu-title-icon{
+    position: absolute;
+    top: 50%;
+    right: -4px;
+  }
   .ivu-menu-submenu>.ivu-menu>.ivu-menu-item{
     color: grey;
   }
@@ -71,10 +76,10 @@
         width: 100%;
       }
       .ivu-tooltip-popper .ivu-tooltip-content{
-        .ivu-tooltip-arrow{
+        // .ivu-tooltip-arrow{
           // border-right-color: #fff;
           // border-right-color:blue;
-        }
+        // }
         .ivu-tooltip-inner{
           background: #fff;
           color: #495060;

src/components/main/main.vue

@@ -186,7 +186,7 @@ export default {
       })
     }
     // 获取未读消息条数
-    this.getUnreadMessageCount()
+    // this.getUnreadMessageCount()
   }
 }
 </script>

src/components/picture/index.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <div class="demo-upload-list" v-for="(item,index) in uploadList" :key='index'>
+      ![](item.url)
+      <div class="demo-upload-list-cover">
+        <Icon type="ios-trash-outline" @click.native="handleRemove(item)"></Icon>
+      </div>
+    </div>
+    <Upload ref="upload" :show-upload-list="false" :format="['jpg','jpeg','png']" :max-size="2048" :before-upload="handleBeforeUpload" :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" type="drag" action="//jsonplaceholder.typicode.com/posts/" style="display: inline-block;width:58px;">
+      <div style="width: 58px;height:58px;line-height: 58px;">
+        <Icon type="camera" size="20"></Icon>
+      </div>
+    </Upload>
+  </div>
+</template>
+<script>
+export default {
+  methods: {
+    data () {
+      return {
+        uploadList: []
+      }
+    },
+    handleBeforeUpload (file) {
+    // 创建一个 FileReader 对象
+      let reader = new FileReader()
+      // readAsDataURL 方法用于读取指定 Blob 或 File 的内容
+      // 当读操作完成，readyState 变为 DONE，loadend 被触发，此时 result 属性包含数据：URL（以 base64 编码的字符串表示文件的数据）
+      // 读取文件作为 URL 可访问地址
+      reader.readAsDataURL(file)
+
+      const _this = this
+      reader.onloadend = function (e) {
+        file.url = reader.result
+        console.log(file.url)
+        this.$emit('imgSrc', file.url)
+
+        _this.uploadList.push(file)
+      }
+    },
+    handleRemove (file) {
+      this.uploadList.splice(this.uploadList.indexOf(file), 1)
+    },
+    handleFormatError (file) {
+      this.$Notice.warning({
+        title: '文件格式不正确',
+        desc: '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
+      })
+    },
+    handleMaxSize (file) {
+      this.$Notice.warning({
+        title: '超出文件大小限制',
+        desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.demo-upload-list {
+  display: inline-block;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  position: relative;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
+  margin-right: 4px;
+}
+
+.demo-upload-list img {
+  width: 100%;
+  height: 100%;
+}
+
+.demo-upload-list-cover {
+  display: none;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, .6);
+}
+
+.demo-upload-list:hover .demo-upload-list-cover {
+  display: block;
+}
+
+.demo-upload-list-cover i {
+  color: #fff;
+  font-size: 20px;
+  cursor: pointer;
+  margin: 0 2px;
+}
+
+.ivu-icon {
+  line-height: 58px;
+}
+</style>

src/config/index.js

@@ -17,8 +17,8 @@ export default {
    * @description api请求基础路径
    */
   baseUrl: {
-    dev: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/',
-    pro: 'https://produce.com'
+    dev: 'https://aicpapitest.xhkjedu.com',
+    pro: 'https://api2.xhkjedu.com/mock/7'
   },
   /**
    * @description 默认打开的首页的路由name值，默认为home

src/libs/api.request.js

@@ -3,4 +3,5 @@ import config from '@/config'
 const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro
 
 const axios = new HttpRequest(baseUrl)
+
 export default axios

src/libs/axios.js

@@ -19,11 +19,16 @@ class HttpRequest {
   }
   getInsideConfig () {
     const config = {
-      baseURL: this.baseUrl,
-      headers: {
-        //
+      // baseURL: this.baseUrl,
+      'Header': {
+        'Content-Type': 'application/x-www-form-urlencoded'
       }
+      // 'cookie': [],
+      // 'token': '',
+      // 'device': 'web',
+      // 'uid': '1'
     }
+    // console.log(config)
     return config
   }
   destroy (url) {

src/libs/store.js

@@ -0,0 +1,115 @@
+// import { validatenull } from '@/utils/validate'
+// import website from '@/config/website'
+
+// const keyName = website.key + '-'
+/**
+ * 存储localStorage
+ */
+export const setStore = (params = {}) => {
+  let {
+    name,
+    content,
+    type
+  } = params
+  let obj = {
+    dataType: typeof (content),
+    content: content,
+    type: type,
+    datetime: new Date().getTime()
+  }
+  if (type) window.sessionStorage.setItem(name, JSON.stringify(obj))
+  else window.localStorage.setItem(name, JSON.stringify(obj))
+}
+
+/**
+ * 获取localStorage
+ */
+// export const getStore = (params = {}) => {
+//   let {
+//     name,
+//     debug
+//   } = params
+//   name = keyName + name
+//   let obj = {}
+//   let content
+//   obj = window.sessionStorage.getItem(name)
+//   if (validatenull(obj)) obj = window.localStorage.getItem(name)
+//   if (validatenull(obj)) return
+//   try {
+//     obj = JSON.parse(obj)
+//   } catch {
+//     return obj
+//   }
+//   if (debug) {
+//     return obj
+//   }
+//   if (obj.dataType === 'string') {
+//     content = obj.content
+//   } else if (obj.dataType === 'number') {
+//     content = Number(obj.content)
+//   } else if (obj.dataType === 'boolean') {
+//     content = this.eval(obj.content)
+//   } else if (obj.dataType === 'object') {
+//     content = obj.content
+//   }
+//   return content
+// }
+
+/**
+ * 删除localStorage
+ */
+export const removeStore = (params = {}) => {
+  let {
+    name,
+    type
+  } = params
+  // name = keyName + name
+  if (type) {
+    window.sessionStorage.removeItem(name)
+  } else {
+    window.localStorage.removeItem(name)
+  }
+}
+
+/**
+ * 获取全部localStorage
+ */
+export const getAllStore = (params = {}) => {
+  let list = []
+  let {
+    type
+  } = params
+  if (type) {
+    for (let i = 0; i <= window.sessionStorage.length; i++) {
+      list.push({
+        name: window.sessionStorage.key(i),
+        content: getStore({
+          name: window.sessionStorage.key(i),
+          type: 'session'
+        })
+      })
+    }
+  } else {
+    for (let i = 0; i <= window.localStorage.length; i++) {
+      list.push({
+        name: window.localStorage.key(i),
+        content: getStore({
+          name: window.localStorage.key(i)
+        })
+      })
+    }
+  }
+  return list
+}
+
+/**
+ * 清空全部localStorage
+ */
+export const clearStore = (params = {}) => {
+  let { type } = params
+  if (type) {
+    window.sessionStorage.clear()
+  } else {
+    window.localStorage.clear()
+  }
+}

src/libs/util.js

@@ -144,11 +144,13 @@ export const getHomeRoute = (routers, homeName = 'home') => {
  * @description 如果该newRoute已经存在则不再添加
  */
 export const getNewTagList = (list, newRoute) => {
+  // ---------------------------------------------
   const { name, path, meta } = newRoute
   let newList = [...list]
   if (newList.findIndex(item => item.name === name) >= 0) return newList
   else newList.push({ name, path, meta })
   return newList
+  // ------------------------------
 }
 
 /**

src/locale/lang/en-US.js

@@ -43,5 +43,6 @@ export default {
   tree_table_page: 'Tree Table',
   org_tree_page: 'Org Tree',
   drag_drawer_page: 'Draggable Drawer',
-  tree_select_page: 'Tree Selector'
+  tree_select_page: 'Tree Selector',
+  Information: 'Information'
 }

src/locale/lang/zh-CN.js

@@ -43,5 +43,6 @@ export default {
   tree_table_page: '树状表格',
   org_tree_page: '组织结构树',
   drag_drawer_page: '可拖动抽屉',
-  tree_select_page: '树状下拉选择器'
+  tree_select_page: '树状下拉选择器',
+  Information: '资讯'
 }

src/main.js

@@ -12,15 +12,28 @@ import { directive as clickOutside } from 'v-click-outside-x'
 import installPlugin from '@/plugin'
 import './index.less'
 import '@/assets/icons/iconfont.css'
+import '@/assets/iconfont/iconfont.css'
+// import Vue from 'vue'
+import VueCropper from 'vue-cropper'
+
 import TreeTable from 'tree-table-vue'
 import VOrgTree from 'v-org-tree'
 import 'v-org-tree/dist/v-org-tree.css'
 import echarts from 'echarts'
-Vue.prototype.$echarts = echarts
+Vue.use(VueCropper)
 
+// 路由问题/
+// import Router from 'vue-router'
+Vue.prototype.$echarts = echarts
+// const routerPush = Router.prototype.push
+// Router.prototype.push = function push (location) {
+//   return routerPush.call(this, location).catch(error => error)
+// }
 // 实际打包时应该不引入mock
 /* eslint-disable */
-if (process.env.NODE_ENV !== 'production') require('@/mock')
+// -----------------------------------------------------------------------
+// if (process.env.NODE_ENV !== 'production') require('@/mock')
+// ------------------------------------------------------------------------
 
 Vue.use(iView, {
   i18n: (key, value) => i18n.t(key, value)

src/mock/index.js

@@ -5,7 +5,7 @@ import { getMessageInit, getContentByMsgId, hasRead, removeReaded, restoreTrash,
 
 // 配置Ajax请求延时，可用来测试网络延迟大时项目中一些效果
 Mock.setup({
-  timeout: 1000
+  timeout: 0
 })
 
 // 登录相关和获取用户信息

src/router/index.js

@@ -7,7 +7,12 @@ import { setToken, getToken, canTurnTo, setTitle } from '@/libs/util'
 import config from '@/config'
 const { homeName } = config
 
+// const routerPush = Router.prototype.push
+// Router.prototype.push = function push (location) {
+//   return routerPush.call(this, location).catch(error => console.log(error))
+// }
 Vue.use(Router)
+
 const router = new Router({
   routes,
   mode: 'history'
@@ -39,15 +44,15 @@ router.beforeEach((to, from, next) => {
     if (store.state.user.hasGetInfo) {
       turnTo(to, store.state.user.access, next)
     } else {
-      store.dispatch('getUserInfo').then(user => {
-        // 拉取用户信息，通过用户权限和跳转的页面的name来判断是否有权限访问;access必须是一个数组，如：['super_admin'] ['super_admin', 'admin']
+      // store.dispatch('getUserInfo').then(user => {
+      if (store.state.userInfo) {
         turnTo(to, user.access, next)
-      }).catch(() => {
+      } else {
         setToken('')
         next({
           name: 'login'
         })
-      })
+      }
     }
   }
 })

src/router/routers.js

@@ -1,6 +1,19 @@
 import Main from '@/components/main'
-// import parentView from '@/components/parent-view'
 
+// import Vue from 'vue'
+// import VueRouter from 'vue-router'
+// Vue.use(VueRouter)
+// import parentView from '@/components/parent-view'
+// const routerMethods = ['push', 'replace']
+// routerMethods.forEach(method => {
+//   const originalCall = VueRouter.prototype[method]
+//   VueRouter.prototype[method] = function (location, onResolve, onReject) {
+//     if (onResolve || onReject) {
+//       return originalCall.call(this, location, onResolve, onReject)
+//     }
+//     return originalCall.call(this, location).catch(err => err)
+//   }
+// })
 /**
  * iview-admin中meta除了原生参数外可配置的参数:
  * meta: {
@@ -16,6 +29,10 @@ import Main from '@/components/main'
  *  beforeCloseName: (-) 设置该字段，则在关闭当前tab页时会去'@/router/before-close.js'里寻找该字段名对应的方法，作为关闭前的钩子函数
  * }
  */
+// const routerPush = VueRouter.prototype.push
+// VueRouter.prototype.push = function push (location) {
+//   return routerPush.call(this, location).catch(error => error)
+// }
 
 export default [
   {
@@ -30,7 +47,7 @@ export default [
   {
     path: '/',
     name: '_home',
-    redirect: '/home',
+    redirect: 'home',
     component: Main,
     meta: {
       // hideInMenu: true,
@@ -86,8 +103,27 @@ export default [
           icon: 'md-trending-up',
           title: '学员管理'
         },
-        component: () => import('@/view/manager/student.vue')
+        component: () => import('@/view/manager/student/student.vue')
       },
+      {
+        path: 'Information',
+        name: 'Information',
+        meta: {
+          icon: 'ios-create',
+          title: '资讯'
+        },
+        // component: () => import('@/view/components/editor/editor.vue')
+        component: () => import('@/view/manager/Information/index.vue')
+      }
+      // {
+      //   path: 'editor_page',
+      //   name: 'editor_page',
+      //   meta: {
+      //     icon: 'ios-create',
+      //     title: '富文本编辑器'
+      //   },
+      //   component: () => import('@/view/components/editor/editor.vue')
+      // }
       // {
       //   path: 'tree_select_page',
       //   name: 'tree_select_page',
@@ -97,15 +133,15 @@ export default [
       //   },
       //   component: () => import('@/view/components/tree-select/index.vue')
       // },
-      {
-        path: 'count_to_page',
-        name: 'count_to_page',
-        meta: {
-          icon: 'md-trending-up',
-          title: '招生管理'
-        },
-        component: () => import('@/view/components/count-to/count-to.vue')
-      }
+      // {
+      //   path: 'count_to_page',
+      //   name: 'count_to_page',
+      //   meta: {
+      //     icon: 'md-trending-up',
+      //     title: '招生管理'
+      //   },
+      //   component: () => import('@/view/components/count-to/count-to.vue')
+      // }
       // {
       //   path: 'drag_list_page',
       //   name: 'drag_list_page',
@@ -197,7 +233,7 @@ export default [
       //   component: () => import('@/view/components/icons/icons.vue')
       // }
     ]
-  },
+  }
   // {
   //   path: '/update',
   //   name: 'update',
@@ -227,132 +263,132 @@ export default [
   //     }
   //   ]
   // },
-  {
-    path: '/excel',
-    name: 'excel',
-    meta: {
-      icon: 'ios-stats',
-      title: '统计信息'
-    },
-    component: Main,
-    children: [
-      {
-        path: 'upload-excel',
-        name: 'upload-excel',
-        meta: {
-          icon: 'md-add',
-          title: '月报'
-        },
-        component: () => import('@/view/excel/upload-excel.vue')
-      },
-      {
-        path: 'export-excel',
-        name: 'export-excel',
-        meta: {
-          icon: 'md-download',
-          title: '日报'
-        },
-        component: () => import('@/view/excel/export-excel.vue')
-      }
-    ]
-  },
-  {
-    path: '/tools_methods',
-    name: 'tools_methods',
-    meta: {
-      hideInBread: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'tools_methods_page',
-        name: 'tools_methods_page',
-        meta: {
-          icon: 'ios-hammer',
-          title: '工具方法',
-          beforeCloseName: 'before_close_normal'
-        },
-        component: () => import('@/view/tools-methods/tools-methods.vue')
-      }
-    ]
-  },
-  {
-    path: '/i18n',
-    name: 'i18n',
-    meta: {
-      hideInBread: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'i18n_page',
-        name: 'i18n_page',
-        meta: {
-          icon: 'md-planet',
-          title: 'i18n - {{ i18n_page }}'
-        },
-        component: () => import('@/view/i18n/i18n-page.vue')
-      }
-    ]
-  },
-  {
-    path: '/error_store',
-    name: 'error_store',
-    meta: {
-      hideInBread: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'error_store_page',
-        name: 'error_store_page',
-        meta: {
-          icon: 'ios-bug',
-          title: '错误收集'
-        },
-        component: () => import('@/view/error-store/error-store.vue')
-      }
-    ]
-  },
-  {
-    path: '/error_logger',
-    name: 'error_logger',
-    meta: {
-      hideInBread: true,
-      hideInMenu: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'error_logger_page',
-        name: 'error_logger_page',
-        meta: {
-          icon: 'ios-bug',
-          title: '错误收集'
-        },
-        component: () => import('@/view/single-page/error-logger.vue')
-      }
-    ]
-  },
-  {
-    path: '/directive',
-    name: 'directive',
-    meta: {
-      hideInBread: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'directive_page',
-        name: 'directive_page',
-        meta: {
-          icon: 'ios-navigate',
-          title: '指令'
-        },
-        component: () => import('@/view/directive/directive.vue')
-      }
-    ]
-  },
+  // {
+  //   path: '/excel',
+  //   name: 'excel',
+  //   meta: {
+  //     icon: 'ios-stats',
+  //     title: '统计信息'
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'upload-excel',
+  //       name: 'upload-excel',
+  //       meta: {
+  //         icon: 'md-add',
+  //         title: '月报'
+  //       },
+  //       component: () => import('@/view/excel/upload-excel.vue')
+  //     },
+  //     {
+  //       path: 'export-excel',
+  //       name: 'export-excel',
+  //       meta: {
+  //         icon: 'md-download',
+  //         title: '日报'
+  //       },
+  //       component: () => import('@/view/excel/export-excel.vue')
+  //     }
+  //   ]
+  // }
+  // {
+  //   path: '/tools_methods',
+  //   name: 'tools_methods',
+  //   meta: {
+  //     hideInBread: true
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'tools_methods_page',
+  //       name: 'tools_methods_page',
+  //       meta: {
+  //         icon: 'ios-hammer',
+  //         title: '工具方法',
+  //         beforeCloseName: 'before_close_normal'
+  //       },
+  //       component: () => import('@/view/tools-methods/tools-methods.vue')
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/i18n',
+  //   name: 'i18n',
+  //   meta: {
+  //     hideInBread: true
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'i18n_page',
+  //       name: 'i18n_page',
+  //       meta: {
+  //         icon: 'md-planet',
+  //         title: 'i18n - {{ i18n_page }}'
+  //       },
+  //       component: () => import('@/view/i18n/i18n-page.vue')
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/error_store',
+  //   name: 'error_store',
+  //   meta: {
+  //     hideInBread: true
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'error_store_page',
+  //       name: 'error_store_page',
+  //       meta: {
+  //         icon: 'ios-bug',
+  //         title: '错误收集'
+  //       },
+  //       component: () => import('@/view/error-store/error-store.vue')
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/error_logger',
+  //   name: 'error_logger',
+  //   meta: {
+  //     hideInBread: true,
+  //     hideInMenu: true
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'error_logger_page',
+  //       name: 'error_logger_page',
+  //       meta: {
+  //         icon: 'ios-bug',
+  //         title: '错误收集'
+  //       },
+  //       component: () => import('@/view/single-page/error-logger.vue')
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/directive',
+  //   name: 'directive',
+  //   meta: {
+  //     hideInBread: true
+  //   },
+  //   component: Main,
+  //   children: [
+  //     {
+  //       path: 'directive_page',
+  //       name: 'directive_page',
+  //       meta: {
+  //         icon: 'ios-navigate',
+  //         title: '指令'
+  //       },
+  //       component: () => import('@/view/directive/directive.vue')
+  //     }
+  //   ]
+  // },
   // {
   //   path: '/multilevel',
   //   name: 'multilevel',
@@ -413,59 +449,59 @@ export default [
   //     }
   //   ]
   // },
-  {
-    path: '/argu',
-    name: 'argu',
-    meta: {
-      hideInMenu: true
-    },
-    component: Main,
-    children: [
-      {
-        path: 'params/:id',
-        name: 'params',
-        meta: {
-          icon: 'md-flower',
-          title: route => `{{ params }}-${route.params.id}`,
-          notCache: true,
-          beforeCloseName: 'before_close_normal'
-        },
-        component: () => import('@/view/argu-page/params.vue')
-      },
-      {
-        path: 'query',
-        name: 'query',
-        meta: {
-          icon: 'md-flower',
-          title: route => `{{ query }}-${route.query.id}`,
-          notCache: true
-        },
-        component: () => import('@/view/argu-page/query.vue')
-      }
-    ]
-  },
-  {
-    path: '/401',
-    name: 'error_401',
-    meta: {
-      hideInMenu: true
-    },
-    component: () => import('@/view/error-page/401.vue')
-  },
-  {
-    path: '/500',
-    name: 'error_500',
-    meta: {
-      hideInMenu: true
-    },
-    component: () => import('@/view/error-page/500.vue')
-  },
-  {
-    path: '*',
-    name: 'error_404',
-    meta: {
-      hideInMenu: true
-    },
-    component: () => import('@/view/error-page/404.vue')
-  }
+//   {
+//     path: '/argu',
+//     name: 'argu',
+//     meta: {
+//       hideInMenu: true
+//     },
+//     component: Main,
+//     children: [
+//       {
+//         path: 'params/:id',
+//         name: 'params',
+//         meta: {
+//           icon: 'md-flower',
+//           title: route => `{{ params }}-${route.params.id}`,
+//           notCache: true,
+//           beforeCloseName: 'before_close_normal'
+//         },
+//         component: () => import('@/view/argu-page/params.vue')
+//       },
+//       {
+//         path: 'query',
+//         name: 'query',
+//         meta: {
+//           icon: 'md-flower',
+//           title: route => `{{ query }}-${route.query.id}`,
+//           notCache: true
+//         },
+//         component: () => import('@/view/argu-page/query.vue')
+//       }
+//     ]
+//   },
+//   {
+//     path: '/401',
+//     name: 'error_401',
+//     meta: {
+//       hideInMenu: true
+//     },
+//     component: () => import('@/view/error-page/401.vue')
+//   },
+//   {
+//     path: '/500',
+//     name: 'error_500',
+//     meta: {
+//       hideInMenu: true
+//     },
+//     component: () => import('@/view/error-page/500.vue')
+//   },
+//   {
+//     path: '*',
+//     name: 'error_404',
+//     meta: {
+//       hideInMenu: true
+//     },
+//     component: () => import('@/view/error-page/404.vue')
+//   }
 ]

src/store/module/user.js

@@ -1,15 +1,15 @@
 import {
-  login,
-  logout,
-  getUserInfo,
-  getMessage,
-  getContentByMsgId,
-  hasRead,
-  removeReaded,
-  restoreTrash,
-  getUnreadCount
+  login
+  // logout,
+  // getMessage,
+  // getContentByMsgId,
+  // hasRead,
+  // removeReaded,
+  // restoreTrash,
+  // getUnreadCount
 } from '@/api/user'
 import { setToken, getToken } from '@/libs/util'
+import { setStore } from '@/libs/store'
 
 export default {
   state: {
@@ -42,6 +42,10 @@ export default {
       state.token = token
       setToken(token)
     },
+    setUserInfo (state, userInfo) {
+      state.userInfo = userInfo
+      setStore({ name: 'userInfo', content: state.userInfo })
+    },
     setHasGetInfo (state, status) {
       state.hasGetInfo = status
     },
@@ -74,16 +78,23 @@ export default {
   },
   actions: {
     // 登录
-    handleLogin ({ commit }, { userName, password }) {
-      userName = userName.trim()
+    handleLogin ({ commit }, { loginname, loginpwd }) {
+      // userName = loginname.trim()
+      // loginname = loginname
+      // console.log(loginname, loginpwd)
       return new Promise((resolve, reject) => {
+        // console.log(loginname, loginpwd)
         login({
-          userName,
-          password
+          loginname,
+          loginpwd
         }).then(res => {
-          const data = res.data
+          // console.log(res)
+          const data = res.data.obj[0]
           commit('setToken', data.token)
-          resolve()
+          commit('setUserInfo', data)
+          commit('setHasGetInfo', true)
+
+          resolve(res)
         }).catch(err => {
           reject(err)
         })
@@ -111,11 +122,13 @@ export default {
         try {
           getUserInfo(state.token).then(res => {
             const data = res.data
-            commit('setAvatar', data.avatar)
-            commit('setUserName', data.name)
-            commit('setUserId', data.user_id)
-            commit('setAccess', data.access)
-            commit('setHasGetInfo', true)
+            // --------------------------------------------
+            // commit('setAvatar', data.avatar)
+            // commit('setUserName', data.name)
+            // commit('setUserId', data.user_id)
+            // commit('setAccess', data.access)
+            // commit('setHasGetInfo', true)
+            // ---------------------------------------------------
             resolve(data)
           }).catch(err => {
             reject(err)

src/view/login/login.vue

@@ -19,6 +19,8 @@
 <script>
 import LoginForm from '_c/login-form'
 import { mapActions } from 'vuex'
+// import { initRouter } from '@/libs/router-util'
+
 export default {
   components: {
     LoginForm
@@ -28,14 +30,30 @@ export default {
       'handleLogin',
       'getUserInfo'
     ]),
-    handleSubmit ({ userName, password }) {
-      this.handleLogin({ userName, password }).then(res => {
-        this.getUserInfo().then(res => {
-          this.$router.push({
-            name: this.$config.homeName
-          })
+    handleSubmit (e) {
+      // var time = new Date().getTime()
+      // console.log(time)
+      // var _self = this
+      // let login = e.loginname
+      const { loginname, loginpwd } = e
+      this.handleLogin({ loginname, loginpwd }).then(res => {
+        // console.log(res)
+        // initRouter()
+        console.log(this.$config.homeName)
+        this.$router.push({
+          name: this.$config.homeName
         })
+
+        // var time2 = new Date().getTime()
+        // console.log(time2)
+        // this.getUserInfo().then(res => {
+        // console.log(res)
+        // var time3 = new Date().getTime()
+        // console.log(time3)
       })
+      // })
+      // var time2 = new Date().getTime()
+      // console.log(time2)
     }
   }
 }

src/view/manager/Information/index.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class='wrap'>
+    <h3>资讯管理</h3>
+    <div class="infoContent">
+       <i-form :model="form" :label-width="80">
+          <Form-item label="标题">
+              <i-input v-model="formItem.title" placeholder="请输入资讯标题"></i-input>
+          </Form-item>
+          <Form-item label="分类" class="classify" prop='ntypename'>
+              <i-select v-model="form.ntypename" placeholder="请选择资讯分类">
+                  <i-option value="beijing">北京市</i-option>
+                  <i-option value="shanghai">上海市</i-option>
+                  <i-option value="shenzhen">深圳市</i-option>
+              </i-select>
+          </Form-item>
+           <Form-item label="是否置顶" class="radio" prop='ntypeorder'>
+              <Radio-group  v-model="form.ntypeorder">
+                <Radio label='0'><span>否</span> </Radio>
+                <Radio   label='1'><span>是</span> </Radio>
+              </Radio-group>
+          </Form-item>
+          <Form-item label="是否广告位" class="radio" style="margin-left:30px">
+              <Radio-group :model.sync="formItem.adSlot">
+                <Radio value="0" label='否'></Radio>
+                <Radio value="1"  label='是'></Radio>
+            </Radio-group>
+          </Form-item>
+          <Form-item label="标签" >
+              <i-input :value.sync="formItem.tag" placeholder="请输入标签"></i-input>
+          </Form-item>
+          <Form-item label="资讯内容" >
+            <editor ref="editor" :value="formItem.content" @on-change="handleChange"/>
+          </Form-item>
+          <Form-item label="封面图" >
+            <div class="upload">
+                <Upload v-if="flag" ref="upload" :show-upload-list="false" :format="['jpg','jpeg','png']" :max-size="2048" :before-upload="handleBeforeUpload" :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" type="drag" action="//jsonplaceholder.typicode.com/posts/" style="display: inline-block;width:58px;">
+                  <div style="width: 58px;height:58px;line-height: 58px;">
+                    <i  class="ivu-icon ivu-icon- iconfont icon-21"></i>
+                  </div>
+                </Upload>
+                 <img style="height:200px;width:200px" v-else :src="uploadImg" alt="">
+                <!-- <Upload
+                  multiple
+                  action="//jsonplaceholder.typicode.com/posts/">
+                  <i-button type="ghost" icon="ivu-icon ivu-icon- iconfont icon-21"></i-button>
+              </Upload> -->
+            </div>
+          </Form-item>
+          <Form-item >
+           <Button @click="submit" type="primary" middle>提交</Button>
+          </Form-item>
+       </i-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import Editor from '_c/editor'
+import store from '@/store'
+
+// import Cropper from '@/components/picture/index.vue'
+import { addInfo } from '@/api/info.js'
+
+export default {
+  components: {
+    Editor
+    // Cropper
+  },
+  data () {
+    return {
+      exampleImageSrc: '',
+      uploadImg: '',
+      flag: true,
+      form: {
+        ntypename: '',
+        ntypeorder: 1,
+        createid: ''
+      },
+      formItem: {
+        title: '',
+        classify: '',
+        top: '0',
+        adSlot: '0',
+        tag: '',
+        content: ''
+      }
+    }
+  },
+  mounted () {
+    // console.log(store.state.user.userInfo)
+    this.form.createid = store.state.user.userInfo.edid
+  },
+  methods: {
+    // ---------------------------------------------------------------
+    handleBeforeUpload (file) {
+    // 创建一个 FileReader 对象
+      let reader = new FileReader()
+      // readAsDataURL 方法用于读取指定 Blob 或 File 的内容
+      // 当读操作完成，readyState 变为 DONE，loadend 被触发，此时 result 属性包含数据：URL（以 base64 编码的字符串表示文件的数据）
+      // 读取文件作为 URL 可访问地址
+      reader.readAsDataURL(file)
+
+      const _this = this
+      reader.onloadend = function (e) {
+        file.url = reader.result
+        console.log(file.url)
+        _this.uploadImg = file.url
+        _this.flag = false
+      }
+    },
+    handleFormatError (file) {
+      this.$Notice.warning({
+        title: '文件格式不正确',
+        desc: '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
+      })
+    },
+    handleMaxSize (file) {
+      this.$Notice.warning({
+        title: '超出文件大小限制',
+        desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+      })
+    },
+    // ------------------------------------------------------------------
+    // handleImg (e) {
+    //   console.log(e)
+    // },
+    handleChange (e) {
+      console.log(e)
+    },
+    submit () {
+      console.log(this.form)
+      addInfo(this.formItem).then(res => {
+        console.log(res)
+      })
+    },
+    handleCroped (blob) {
+      const formData = new FormData()
+      formData.append('croppedImg', blob)
+      uploadImg(formData).then(() => {
+        this.$Message.success('Upload success~')
+      })
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+.wrap{
+  padding: 0;
+  h3{
+    background: #ffffff;
+    padding: 10px;
+    border-bottom: 10px solid #F5F7F9;
+  }
+  .infoContent{
+    padding: 20px;
+    .classify{
+      display: inline-block;
+      width: 500px;
+    }
+    .radio{
+            display: inline-block;
+
+    }
+    .upload{
+      height: 200px;
+      width: 200px;
+      border:1px solid grey;
+      .ivu-upload{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .ivu-btn-ghost{
+        width: 200px;
+        height: 200px;
+        color: #3D8EFE;
+        font-size: 40px;
+        border: none;
+      }
+      .icon-21:before {
+        font-size: 40px;
+      }
+    }
+
+  }
+}
+</style>