登录接口+登出100%、资讯接口50%

src/api/info.js

@@ -1,12 +1,23 @@
 import axios from '@/libs/api.request'
+// 添加
 export const addInfo = (data) => {
-  // const data = {
-  //   loginname,
-  //   loginpwd
-  // }
   return axios.request({
-    url: 'https://aicpapitest.xhkjedu.com/newstype/add',
+    url: 'https://aicpapitest.xhkjedu.com/news/add',
     method: 'POST',
     data
   })
 }
+// 获取资讯分类列表
+export const classify = (data) => {
+  return axios.request({
+    url: 'https://aicpapitest.xhkjedu.com/newstype/list',
+    method: 'POST'
+  })
+}
+// 获取资讯标签列表
+export const tagList = (data) => {
+  return axios.request({
+    url: 'https://aicpapitest.xhkjedu.com/newstag/list',
+    method: 'POST'
+  })
+}

src/components/editor/editor.vue

@@ -62,8 +62,8 @@ export default {
     // create这个方法一定要在所有配置项之后调用
     this.editor.create()
     // 如果本地有存储加载本地存储内容
-    let html = this.value || localStorage.editorCache
-    if (html) this.editor.txt.html(html)
+    // let html = this.value || localStorage.editorCache
+    // if (html) this.editor.txt.html(html)
   }
 }
 </script>

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

@@ -67,7 +67,7 @@ export default {
       // console.log(this.$refs.loginForm)
       // this.$router.push('home')
       this.$refs.loginForm.validate((valid) => {
-        // console.log(valid)
+        console.log(valid)
         if (valid) {
           this.$emit('on-success-valid', {
             loginname: this.form.loginname,

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

@@ -18,24 +18,24 @@
         <div class="drop">
            <Dropdown  @on-click="handleClick">
             <a href="javascript:void(0)">
-                SHAW-小岩
+               {{userInfo.username}}
             </a>
             <Dropdown-menu slot="list">
                 <Dropdown-item>修改密码</Dropdown-item>
                 <Dropdown-item>修改信息</Dropdown-item>
                 <Dropdown-item>机构信息</Dropdown-item>
-                <Dropdown-item name="logout">退出登录</Dropdown-item>
+                <Dropdown-item name="loginout">退出登录</Dropdown-item>
 
                 </Dropdown-menu>
           </Dropdown>
         </div>
-        <a href="#" @click="logout">退出</a>
+        <a href="#" @click="loginout">退出</a>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { mapActions } from 'vuex'
+// import { mapActions } from 'vuex'
 
 export default {
   props: {
@@ -44,21 +44,35 @@ export default {
       default: 'https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png'
     }
   },
+  data () {
+    return {
+      userInfo: ''
+    }
+  },
+  mounted () {
+    this.userInfo = JSON.parse(localStorage.getItem('userInfo')).content
+    // console.log(this.userInfo)
+  },
   methods: {
-    ...mapActions([
-      'handleLogOut'
-    ]),
-    logout () {
-      this.$Message.error('您已被登出！')
-      this.handleLogOut().then(() => {
-        this.$router.push({
-          name: 'login'
-        })
+    // ...mapActions([
+    //   'handleLogOut'
+    // ]),
+    loginout () {
+      this.$store.dispatch('handleLogOut').then(() => {
+        this.$router.push({ path: '/login' })
       })
     },
+    // logout () {
+    //   this.$Message.error('您已被登出！')
+    //   this.handleLogOut().then(() => {
+    //     this.$router.push({
+    //       name: 'login'
+    //     })
+    //   })
+    // },
     handleClick (name) {
       switch (name) {
-        case 'logout': this.logout()
+        case 'loginout': this.loginout()
           break
         case 'message': this.message()
           break

src/config/index.js

@@ -18,7 +18,7 @@ export default {
    */
   baseUrl: {
     dev: 'https://aicpapitest.xhkjedu.com',
-    pro: 'https://api2.xhkjedu.com/mock/7'
+    pro: 'https://aicpapitest.xhkjedu.com'
   },
   /**
    * @description 默认打开的首页的路由name值，默认为home

src/libs/axios.js

@@ -1,5 +1,7 @@
 import axios from 'axios'
 import store from '@/store'
+import { getToken } from '@/libs/util'
+
 // import { Spin } from 'iview'
 const addErrorLog = errorInfo => {
   const { statusText, status, request: { responseURL } } = errorInfo
@@ -18,16 +20,19 @@ class HttpRequest {
     this.queue = {}
   }
   getInsideConfig () {
+    // if (getToken()) {
     const config = {
       // baseURL: this.baseUrl,
       'Header': {
         'Content-Type': 'application/x-www-form-urlencoded'
-      }
+      },
       // 'cookie': [],
-      // 'token': '',
-      // 'device': 'web',
-      // 'uid': '1'
+      'token': getToken(),
+      'device': 'web',
+      'uid': '1'
     }
+    // }
+
     // console.log(config)
     return config
   }
@@ -44,6 +49,7 @@ class HttpRequest {
       if (!Object.keys(this.queue).length) {
         // Spin.show() // 不建议开启，因为界面不友好
       }
+      // console.log(config)
       this.queue[url] = true
       return config
     }, error => {

src/libs/util.js

@@ -2,12 +2,14 @@ import Cookies from 'js-cookie'
 // cookie保存的天数
 import config from '@/config'
 import { forEach, hasOneOf, objEqual } from '@/libs/tools'
-const { title, cookieExpires, useI18n } = config
+// const { title, cookieExpires, useI18n } = config
+const { title, useI18n } = config
 
 export const TOKEN_KEY = 'token'
 
 export const setToken = (token) => {
-  Cookies.set(TOKEN_KEY, token, { expires: cookieExpires || 1 })
+  // Cookies.set(TOKEN_KEY, token, { expires: cookieExpires || 1 })
+  Cookies.set(TOKEN_KEY, token)
 }
 
 export const getToken = () => {
@@ -15,7 +17,9 @@ export const getToken = () => {
   if (token) return token
   else return false
 }
-
+export const removeToken = () => {
+  return Cookies.remove(TOKEN_KEY)
+}
 export const hasChild = (item) => {
   return item.children && item.children.length !== 0
 }

src/locale/lang/zh-CN.js

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

src/router/index.js

@@ -45,8 +45,10 @@ router.beforeEach((to, from, next) => {
       turnTo(to, store.state.user.access, next)
     } else {
       // store.dispatch('getUserInfo').then(user => {
-      if (store.state.userInfo) {
-        turnTo(to, user.access, next)
+      // console.log(token)
+      if (token && to.name !== LOGIN_PAGE_NAME) {
+        // turnTo(to, user.access, next)
+        next()
       } else {
         setToken('')
         next({

src/router/routers.js

@@ -110,7 +110,7 @@ export default [
         name: 'Information',
         meta: {
           icon: 'ios-create',
-          title: '资讯'
+          title: '资讯管理'
         },
         // component: () => import('@/view/components/editor/editor.vue')
         component: () => import('@/view/manager/Information/index.vue')

src/store/module/user.js

@@ -1,6 +1,6 @@
 import {
   login
-  // logout,
+  // logout
   // getMessage,
   // getContentByMsgId,
   // hasRead,
@@ -8,7 +8,7 @@ import {
   // restoreTrash,
   // getUnreadCount
 } from '@/api/user'
-import { setToken, getToken } from '@/libs/util'
+import { setToken, getToken, removeToken } from '@/libs/util'
 import { setStore } from '@/libs/store'
 
 export default {
@@ -41,6 +41,7 @@ export default {
     setToken (state, token) {
       state.token = token
       setToken(token)
+      // console.log(token)
     },
     setUserInfo (state, userInfo) {
       state.userInfo = userInfo
@@ -71,11 +72,11 @@ export default {
       state[to].unshift(msgItem)
     }
   },
-  getters: {
-    messageUnreadCount: state => state.messageUnreadList.length,
-    messageReadedCount: state => state.messageReadedList.length,
-    messageTrashCount: state => state.messageTrashList.length
-  },
+  // getters: {
+  //   messageUnreadCount: state => state.messageUnreadList.length,
+  //   messageReadedCount: state => state.messageReadedList.length,
+  //   messageTrashCount: state => state.messageTrashList.length
+  // },
   actions: {
     // 登录
     handleLogin ({ commit }, { loginname, loginpwd }) {
@@ -103,128 +104,131 @@ export default {
     // 退出登录
     handleLogOut ({ state, commit }) {
       return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('setToken', '')
-          commit('setAccess', [])
-          resolve()
-        }).catch(err => {
-          reject(err)
-        })
+        // logout(state.token).then(() => {
+        commit('setToken', '')
+        removeToken()
+        state.token = ''
+        // console.log(state.token)
+        // commit('setAccess', [])
+        resolve()
+        // }).catch(err => {
+        //   reject(err)
+        // })
         // 如果你的退出登录无需请求接口，则可以直接使用下面三行代码而无需使用logout调用接口
         // commit('setToken', '')
         // commit('setAccess', [])
         // resolve()
       })
-    },
+    }
     // 获取用户相关信息
-    getUserInfo ({ state, commit }) {
-      return new Promise((resolve, reject) => {
-        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)
-            // ---------------------------------------------------
-            resolve(data)
-          }).catch(err => {
-            reject(err)
-          })
-        } catch (error) {
-          reject(error)
-        }
-      })
-    },
+    // getUserInfo ({ state, commit }) {
+    //   return new Promise((resolve, reject) => {
+    //     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)
+    // ---------------------------------------------------
+    //         resolve(data)
+    //       }).catch(err => {
+    //         reject(err)
+    //       })
+    //     } catch (error) {
+    //       reject(error)
+    //     }
+    //   })
+    // },
     // 此方法用来获取未读消息条数，接口只返回数值，不返回消息列表
-    getUnreadMessageCount ({ state, commit }) {
-      getUnreadCount().then(res => {
-        const { data } = res
-        commit('setMessageCount', data)
-      })
-    },
+    // getUnreadMessageCount ({ state, commit }) {
+    //   getUnreadCount().then(res => {
+    //     const { data } = res
+    //     commit('setMessageCount', data)
+    //   })
+    // },
     // 获取消息列表，其中包含未读、已读、回收站三个列表
-    getMessageList ({ state, commit }) {
-      return new Promise((resolve, reject) => {
-        getMessage().then(res => {
-          const { unread, readed, trash } = res.data
-          commit('setMessageUnreadList', unread.sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
-          commit('setMessageReadedList', readed.map(_ => {
-            _.loading = false
-            return _
-          }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
-          commit('setMessageTrashList', trash.map(_ => {
-            _.loading = false
-            return _
-          }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+    // getMessageList ({ state, commit }) {
+    //   return new Promise((resolve, reject) => {
+    //     getMessage().then(res => {
+    //       const { unread, readed, trash } = res.data
+    //       commit('setMessageUnreadList', unread.sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
+    //       commit('setMessageReadedList', readed.map(_ => {
+    //         _.loading = false
+    //         return _
+    //       }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
+    //       commit('setMessageTrashList', trash.map(_ => {
+    //         _.loading = false
+    //         return _
+    //       }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time)))
+    //       resolve()
+    //     }).catch(error => {
+    //       reject(error)
+    //     })
+    //   })
+    // },
     // 根据当前点击的消息的id获取内容
-    getContentByMsgId ({ state, commit }, { msg_id }) {
-      return new Promise((resolve, reject) => {
-        let contentItem = state.messageContentStore[msg_id]
-        if (contentItem) {
-          resolve(contentItem)
-        } else {
-          getContentByMsgId(msg_id).then(res => {
-            const content = res.data
-            commit('updateMessageContentStore', { msg_id, content })
-            resolve(content)
-          })
-        }
-      })
-    },
+    // getContentByMsgId ({ state, commit }, { msg_id }) {
+    //   return new Promise((resolve, reject) => {
+    //     let contentItem = state.messageContentStore[msg_id]
+    //     if (contentItem) {
+    //       resolve(contentItem)
+    //     } else {
+    //       getContentByMsgId(msg_id).then(res => {
+    //         const content = res.data
+    //         commit('updateMessageContentStore', { msg_id, content })
+    //         resolve(content)
+    //       })
+    //     }
+    //   })
+    // },
     // 把一个未读消息标记为已读
-    hasRead ({ state, commit }, { msg_id }) {
-      return new Promise((resolve, reject) => {
-        hasRead(msg_id).then(() => {
-          commit('moveMsg', {
-            from: 'messageUnreadList',
-            to: 'messageReadedList',
-            msg_id
-          })
-          commit('setMessageCount', state.unreadCount - 1)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+    // hasRead ({ state, commit }, { msg_id }) {
+    //   return new Promise((resolve, reject) => {
+    //     hasRead(msg_id).then(() => {
+    //       commit('moveMsg', {
+    //         from: 'messageUnreadList',
+    //         to: 'messageReadedList',
+    //         msg_id
+    //       })
+    //       commit('setMessageCount', state.unreadCount - 1)
+    //       resolve()
+    //     }).catch(error => {
+    //       reject(error)
+    //     })
+    //   })
+    // },
     // 删除一个已读消息到回收站
-    removeReaded ({ commit }, { msg_id }) {
-      return new Promise((resolve, reject) => {
-        removeReaded(msg_id).then(() => {
-          commit('moveMsg', {
-            from: 'messageReadedList',
-            to: 'messageTrashList',
-            msg_id
-          })
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+    // removeReaded ({ commit }, { msg_id }) {
+    //   return new Promise((resolve, reject) => {
+    //     removeReaded(msg_id).then(() => {
+    //       commit('moveMsg', {
+    //         from: 'messageReadedList',
+    //         to: 'messageTrashList',
+    //         msg_id
+    //       })
+    //       resolve()
+    //     }).catch(error => {
+    //       reject(error)
+    //     })
+    //   })
+    // },
     // 还原一个已删除消息到已读消息
-    restoreTrash ({ commit }, { msg_id }) {
-      return new Promise((resolve, reject) => {
-        restoreTrash(msg_id).then(() => {
-          commit('moveMsg', {
-            from: 'messageTrashList',
-            to: 'messageReadedList',
-            msg_id
-          })
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
+    // restoreTrash ({ commit }, { msg_id }) {
+    //   return new Promise((resolve, reject) => {
+    //     restoreTrash(msg_id).then(() => {
+    //       commit('moveMsg', {
+    //         from: 'messageTrashList',
+    //         to: 'messageReadedList',
+    //         msg_id
+    //       })
+    //       resolve()
+    //     }).catch(error => {
+    //       reject(error)
+    //     })
+    //   })
+    // }
   }
 }

src/view/login/login.vue

@@ -39,7 +39,7 @@ export default {
       this.handleLogin({ loginname, loginpwd }).then(res => {
         // console.log(res)
         // initRouter()
-        console.log(this.$config.homeName)
+        // console.log(this.$config.homeName)
         this.$router.push({
           name: this.$config.homeName
         })

src/view/manager/Information/index.vue

@@ -4,61 +4,68 @@
     <div class="infoContent">
        <i-form :model="form" :label-width="80">
           <Form-item label="标题">
-              <i-input v-model="formItem.title" placeholder="请输入资讯标题"></i-input>
+              <i-input v-model="form.ntitle" 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>
+          <Form-item label="分类" class="classify" prop='ntypeid'>
+              <i-select v-model="form.ntypeid" placeholder="请选择资讯分类">
+                  <i-option v-for="item in classifyList" :key="item.ntypeid" :value="item.ntypeid">{{item.ntypename}}</i-option>
               </i-select>
           </Form-item>
-           <Form-item label="是否置顶" class="radio" prop='top'>
-              <Radio-group  v-model="formItem.top">
-                <Radio label='0'><span>否</span> </Radio>
-                <Radio   label='1'><span>是</span> </Radio>
+           <Form-item label="是否置顶"  class="radio" prop=' nistop'>
+              <Radio-group  v-model="form.nistop">
+                <Radio label='0'><span>不置顶</span> </Radio>
+                <Radio   label='1'><span>置顶</span> </Radio>
               </Radio-group>
           </Form-item>
-          <Form-item label="排序" class="radio" prop='ntypeorder'>
-               <div class="order">
-                  <i-button type='text'><i  class="ivu-icon ivu-icon- iconfont icon-21"></i></i-button>
-                   <i-input v-model="form.order" ></i-input>
-                  <i-button type='text'><i  class="ivu-icon ivu-icon- iconfont icon-jianhao"></i></i-button>
-               </div>
+          <Form-item  v-if="form.nistop==='1'" label="排序" class="radio radioOrder" prop=' norder'>
+               <!-- <div class="order"> -->
+                  <!-- <div class="btn" @click="calc(-1)"><i  class="ivu-icon ivu-icon- iconfont icon-jianhao"></i></div> -->
+            <i-input v-model="form.norder" style="text-align:center"  class="numInput">
+               <i-button slot="prepend" @click='calc(-1)' icon='ivu-icon ivu-icon- iconfont icon-jianhao' ></i-button>
+               <i-button slot="append" @click='calc(1)' icon='ivu-icon ivu-icon- iconfont  icon-21'></i-button>
+            </i-input>
+                  <!-- <div class="btn" @click="calc(1)"><i  class="ivu-icon ivu-icon- iconfont icon-21 "></i></div> -->
+               <!-- </div> -->
           </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>
+          <Form-item label="是否广告位" class="radio" prop='nlevel'>
+              <Radio-group v-model="form.nlevel">
+                <Radio  label='0'>否</Radio>
+                <Radio   label='1'>是</Radio>
             </Radio-group>
           </Form-item>
           <Form-item label="标签" >
-              <i-input :value.sync="formItem.tag" placeholder="请输入标签"></i-input>
+            <i-select style="width:460px" :model.sync="form.ntagname" multiple @on-change="updatePermission" >
+                <i-option v-for="item in labelList" :key="item.ntagid" :value="item.ntagname" :label='item.ntagname'>{{ item.ntagname }}</i-option>
+            </i-select>
+              <!-- <i-input :value.sync="form.ntagname" placeholder="请输入标签"></i-input> -->
           </Form-item>
           <Form-item class="labelTop">
-            <p style="font-size:14px">资讯内容</p>
-            <editor ref="editor" :value="formItem.content" @on-change="handleChange"/>
+            <p style="font-size:12px">资讯内容</p>
+            <editor ref="editor" :value="form.ncontent" @on-change="handleChange"/>
           </Form-item>
           <Form-item class="imgVideo labelTop" >
             <p>封面图<span>(建议尺寸：840X400)</span></p>
             <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;">
+                <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=''>
                   <div style="width: 200px;height:200px;line-height: 200px;">
-                    <i  class="ivu-icon ivu-icon- iconfont icon-21"></i>
+                    <i style="color:#3D8EFE" class="ivu-icon ivu-icon- iconfont icon-21"></i>
                   </div>
                 </Upload>
-                 <img style="height:200px;width:200px" v-else :src="uploadImg" alt="">
+                 <img style="height:150px;width:150px" v-if="!flagImg" :src="imgCover" alt="">
             </div>
           </Form-item>
            <Form-item class="imgVideo" style="margin-left:200px">
              <p>视频</p>
             <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;">
+                <Upload  ref="upload" :show-upload-list="false" :format="['mp4','avi',]" :max-size="2048" :before-upload="handleBeforeUpload2" :on-format-error="handleFormatError2" :on-exceeded-size="handleMaxSize2" type="drag" action=''>
                   <div style="width: 200px;height:200px;line-height: 200px;">
-                    <i  class="ivu-icon ivu-icon- iconfont icon-21"></i>
+                    <i  style="color:#3D8EFE" class="ivu-icon ivu-icon- iconfont icon-21"></i>
                   </div>
                 </Upload>
-                 <img style="height:200px;width:200px" v-else :src="uploadVideo" alt="">
+                    <div class="videoFile" v-if="!flagVideo" >
+                      <img src="../../../assets/img/video.png" alt="">
+                    <video style="height:200px;width:200px"  :src="form.nvideo" autoplay alt="" />
+                    </div>
             </div>
           </Form-item>
           <Form-item class="submitBtn">
@@ -71,10 +78,10 @@
 
 <script>
 import Editor from '_c/editor'
-import store from '@/store'
+// import store from '@/store'
 
 // import Cropper from '@/components/picture/index.vue'
-import { addInfo } from '@/api/info.js'
+import { addInfo, classify, tagList } from '@/api/info.js'
 
 export default {
   components: {
@@ -83,30 +90,62 @@ export default {
   },
   data () {
     return {
-      exampleImageSrc: '',
-      uploadImg: '',
-      flag: true,
+      classifyList: [],
+      imgCover: '',
+      labelList: [],
+      flagImg: true,
+      flagVideo: true,
+      userInfo: {},
       form: {
-        ntypename: '',
-        ntypeorder: 1,
-        createid: ''
-      },
-      formItem: {
-        title: '',
-        classify: '',
-        top: '0',
-        adSlot: '0',
-        tag: '',
-        content: ''
+        ntitle: '',
+        ncontent: '',
+        ncontxt: '',
+        ncover: '',
+        nvideo: '',
+        nvsize: '',
+        nvsuffix: '',
+        ntypeid: '',
+        norder: 1,
+        nistop: '0',
+        nlevel: '',
+        edid: '',
+        schoolid: '',
+        createid: '',
+        ntagname: undefined
       }
     }
   },
   mounted () {
-    // console.log(store.state.user.userInfo)
-    this.form.createid = store.state.user.userInfo.edid
+    this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
+    // console.log(this.userInfo.content)
+    this.form.schoolid = this.userInfo.content.schoolid
+    this.form.edid = this.userInfo.content.edid
+    this.form.nlevel = this.userInfo.content.schoolstate
+    this.form.createid = this.userInfo.content.userid
+    // console.log(this.form)
+    // 获取分类列表
+    classify().then(res => {
+      // console.log(res.data.obj)
+      this.classifyList = res.data.obj
+    })
+    // 获取标签；列表
+    tagList().then(res => {
+      // console.log(res.data.obj)
+
+      this.labelList = res.data.obj
+    })
   },
   methods: {
-    // ---------------------------------------------------------------
+    // 将标签内容格式化
+    updatePermission (e) {
+      // console.log(e)
+      this.form.ntagname = JSON.stringify({ ...e })
+    },
+    // 排序
+    calc (num) {
+      this.form.norder = Number(this.form.norder) + Number(num)
+    },
+    // 上传图片
     handleBeforeUpload (file) {
     // 创建一个 FileReader 对象
       let reader = new FileReader()
@@ -114,13 +153,15 @@ export default {
       // 当读操作完成，readyState 变为 DONE，loadend 被触发，此时 result 属性包含数据：URL（以 base64 编码的字符串表示文件的数据）
       // 读取文件作为 URL 可访问地址
       reader.readAsDataURL(file)
+      this.form.ncover = file.name
 
       const _this = this
       reader.onloadend = function (e) {
         file.url = reader.result
-        console.log(file.url)
-        _this.uploadImg = file.url
-        _this.flag = false
+        // console.log(file.url)
+        // console.log(_this.base64ToFile(file, file.url))
+        _this.imgCover = file.url
+        _this.flagImg = false
       }
     },
     handleFormatError (file) {
@@ -135,25 +176,56 @@ export default {
         desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
       })
     },
-    // ------------------------------------------------------------------
-    // handleImg (e) {
-    //   console.log(e)
-    // },
+    // 上传视频
+    handleBeforeUpload2 (file) {
+    // 创建一个 FileReader 对象
+      let reader = new FileReader()
+      // readAsDataURL 方法用于读取指定 Blob 或 File 的内容
+      // 当读操作完成，readyState 变为 DONE，loadend 被触发，此时 result 属性包含数据：URL（以 base64 编码的字符串表示文件的数据）
+      // 读取文件作为 URL 可访问地址
+      reader.readAsDataURL(file)
+      // console.log(file)
+      this.form.nvideo = file.name
+      this.form.nvsuffix = file.name.split('.')[1]
+      // console.log(this.form.nvsuffix[1])
+      const _this = this
+      reader.onloadend = function (e) {
+        file.url = reader.result
+        // console.log(file.url)
+        // _this.form.nvideo = file.url
+        // console.log(_this.extname(file))
+
+        var size = file.size
+        _this.form.nvsize = size
+        _this.flagVideo = false
+        _this.flag = false
+      }
+    },
+    handleFormatError2 (file) {
+      this.$Notice.warning({
+        title: '文件格式不正确',
+        desc: '文件 ' + file.name + ' 格式不正确，请上传 mp4 或 avi 格式的图片。'
+      })
+      this.flagVideo = true
+    },
+    handleMaxSize2 (file) {
+      this.$Notice.warning({
+        title: '超出文件大小限制',
+        desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+      })
+    },
+    // 获取资讯内容
     handleChange (e) {
       console.log(e)
+      this.form.ncontent = e
+      this.form.ncontxt = e.replace(/<[^>]+>/g, '')
     },
+    // 添加
     submit () {
       console.log(this.form)
-      addInfo(this.formItem).then(res => {
+      addInfo(this.form).then(res => {
         console.log(res)
       })
-    },
-    handleCroped (blob) {
-      const formData = new FormData()
-      formData.append('croppedImg', blob)
-      uploadImg(formData).then(() => {
-        this.$Message.success('Upload success~')
-      })
     }
   }
 
@@ -172,46 +244,60 @@ export default {
     }
   }
   .infoContent{
-    padding: 20px 0 20px 10px;
+    padding: 20px 10px 20px 10px;
+    background: white;
+    .ivu-input-group .ivu-input, .ivu-input-group .ivu-input-inner-container {
+    width: 100%;
+    float: left;
+    margin-bottom: 0;
+    position: relative;
+    z-index: 2;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+   .ivu-form .ivu-form-item-label {
+      font-size: 12px!important;
+    }
     .classify{
       display: inline-block;
-      width: 500px;
+      width: 300px;
     }
     .submitBtn{
       display: flex;
       justify-content: center;
       margin-top:60px;
     }
+    .radioOrder{
+      margin-left: -35px;
+      margin-right: 20px;
+    }
     .radio{
       display: inline-block;
-      .order{
-        border: 1px solid grey;
-        height: 32px;
-        .ivu-btn-text{
-          float: left;
-          width: 20px;
-          // border: 1px solid grey;
-          display: flex;
-          justify-content: center;
-          border-radius: none;
-        }
-        .ivu-input-wrapper-default{
-          width: 40px;
-          height: 32px;
-          float: left;
-          border-radius: none;
-        }
+      .ivu-input-group {
+        width: 110px;
       }
-
-    }
-    .ivu-form-item-label{
-      font-size: 14px!important;
+      .ivu-btn-icon-only{
+        height: 34px;
+        width: 30px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        // line-height: 20px;
+      }
+      // .ivu-input {
+      //   height: 35px;
+      //   width: 80px!important;
+      // }
     }
+
     .labelTop{
       margin-left: -40px;
     }
     .imgVideo{
       display: inline-block;
+      position: relative;
       p{
         font-size: 16px;
         span{
@@ -220,6 +306,13 @@ export default {
           color: #3D8EFE;
         }
       }
+      img{
+        position: absolute;
+        top: 60px;
+        left: 25px;
+        z-index: 999;
+
+      }
     }
     .upload{
       height: 200px;
@@ -242,6 +335,23 @@ export default {
       .icon-21:before {
         font-size: 40px;
       }
+      .videoFile{
+        // border: 1px solid grey;
+         height: 200px;
+        width: 200px;
+        position: relative;
+           img{
+        height: 120px;
+        position: absolute;
+        top: -200px;
+        left: -55px;
+        width: 150px;
+        margin-left: 80px;
+        margin-top: 40px;
+        z-index: 999;
+        }
+
+      }
     }
 
   }