第四次

src/api/user.js

@@ -1,19 +1,19 @@
 import axios from '@/libs/api.request'
 
-export const login = ({ userName, password }) => {
-  const data = {
-    userName,
-    password
+export const login = ({ loginname, loginpwd }) => {
+  const params = {
+    loginname, 
+    loginpwd
   }
   return axios.request({
-    url: 'login',
-    data,
-    method: 'post'
+    url: 'user/login',
+    params,
+    method: 'POST'
   })
 }
 
 export const getUserInfo = (token) => {
-  return axios.request({
+  return  axios.request({
     url: 'get_info',
     params: {
       token

src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less

@@ -1,4 +1,10 @@
 .custom-bread-crumb{
   display: inline-block;
   vertical-align: top;
+  .custom-title{
+    color: #999;
+    & span{
+      margin: 0 9px;
+    }
+  }
 }

src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="custom-bread-crumb">
     <Breadcrumb :style="{fontSize: `${fontSize}px`}" separator=">">
+      <span class="custom-title">青鸽管家<span>></span></span>
       <BreadcrumbItem v-for="item in list" :to="item.to" :key="`bread-crumb-${item.name}`">
         <common-icon style="margin-right: 4px;" :type="item.icon || ''"/>
         {{ showTitle(item) }}

src/components/main/components/header-bar/header-bar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="header-bar">
-    <sider-trigger :collapsed="collapsed" icon="md-menu" @on-change="handleCollpasedChange"></sider-trigger>
+    <!-- <sider-trigger :collapsed="collapsed" icon="md-menu" @on-change="handleCollpasedChange"></sider-trigger> -->
     <custom-bread-crumb show-icon style="margin-left: 30px;" :list="breadCrumbList"></custom-bread-crumb>
     <div class="custom-content-con">
       <slot></slot>

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

@@ -70,4 +70,7 @@ div /deep/ .ivu-menu-vertical.ivu-menu-light:after{
 }
 div /deep/ .ivu-layout{
   background-color: #EEF5FB;
+}
+div /deep/ .ivu-menu-submenu-title{
+  color: #3D8EFE;
 }

src/components/paste-editor/plugins/placeholder.js

@@ -2,7 +2,7 @@ export default (codemirror) => {
   (function (mod) {
     mod(codemirror)
   })(function (CodeMirror) {
-    CodeMirror.defineOption('placeholder', '', function (cm, val, old) {
+    CodeMirror.defineOption('placeholder', '请输入内容', function (cm, val, old) {
       var prev = old && old !== CodeMirror.Init
       if (val && !prev) {
         cm.on('blur', onBlur)

src/config/index.js

@@ -17,7 +17,7 @@ export default {
    * @description api请求基础路径
    */
   baseUrl: {
-    dev: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/',
+    dev: 'https://aicpapitest.xhkjedu.com/',
     pro: 'https://produce.com'
   },
   /**

src/libs/axios.js

@@ -21,7 +21,7 @@ class HttpRequest {
     const config = {
       baseURL: this.baseUrl,
       headers: {
-        //
+        // 
       }
     }
     return config

src/main.js

@@ -17,7 +17,7 @@ import VOrgTree from 'v-org-tree'
 import 'v-org-tree/dist/v-org-tree.css'
 // 实际打包时应该不引入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/routers.js

@@ -50,7 +50,7 @@ export default [
     path: '/organ',
     name: 'organ',
     meta: {
-      icon: 'md-menu',
+      icon: 'ios-stats',
       title: '分机构统计'
     },
     component: Main,
@@ -59,7 +59,7 @@ export default [
         path: 'organ_admin',
         name: 'organ_admin',
         meta: {
-          icon: 'md-funnel',
+          icon: 'ios-paper',
           title: '分机构管理'
         },
         component: () => import('@/view/organ_admin/organ_admin.vue')
@@ -68,10 +68,10 @@ export default [
         path: 'organ_mon',
         name: 'organ_mon',
         meta: {
-          icon: 'md-funnel',
+          icon: 'ios-paper',
           title: '月报'
         },
-        component: () => import('@/view/multilevel/level-2-1.vue')
+        component: () => import('@/view/organ_admin/info/info.vue')
       }
     ]
   }, 

src/store/module/user.js

@@ -74,15 +74,18 @@ export default {
   },
   actions: {
     // 登录
-    handleLogin ({ commit }, { userName, password }) {
-      userName = userName.trim()
+    handleLogin ({ commit }, { loginname, loginpwd }) {
+      loginname = loginname.trim()
       return new Promise((resolve, reject) => {
         login({
-          userName,
-          password
+          loginname,
+          loginpwd
         }).then(res => {
-          const data = res.data
+          const data = res.data.obj
+          // console.log(data)
           commit('setToken', data.token)
+          commit('setUserName', data.username)
+          commit('setUserId', data.userid)
           resolve()
         }).catch(err => {
           reject(err)
@@ -133,85 +136,85 @@ export default {
       })
     },
     // 获取消息列表，其中包含未读、已读、回收站三个列表
-    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)
-        })
-      })
-    },
-    // 删除一个已读消息到回收站
-    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)
-        })
-      })
-    }
+//     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)
+//         })
+//       })
+//     },
+//     // 还原一个已删除消息到已读消息
+//     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/components/editor/editor.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <editor ref="editor" :value="content" @on-change="handleChange"/>
-    <Button @click="changeContent">修改编辑器内容</Button>
   </div>
 </template>
 
@@ -14,15 +13,12 @@ export default {
   },
   data () {
     return {
-      content: '12312323'
+      content: ''
     }
   },
   methods: {
     handleChange (html, text) {
-      console.log(html, text)
-    },
-    changeContent () {
-      this.$refs.editor.setHtml('<p>powered by wangeditor</p>')
+      console.log(html)
     }
   }
 }

src/view/login/login.less

@@ -9,10 +9,13 @@ input{
     background-image: url("../../assets/login-background.png");
     background-size: 100% 100%;
     background-repeat: no-repeat;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 .login-title{
     text-align: center;
-    margin-top: 149px;
+    // margin-top: 20px;
     font-weight: bold;
     font-size: 23px;
     color: #ffffff;

src/view/login/login.vue

@@ -1,21 +1,23 @@
 <template>
 <!-- 登陆页面背景图 -->
   <div class="login">
-    <div class="login-title">欢迎,登陆青鸽管家!</div>
-    <!-- 登陆板块 -->
-    <div class="login-text">
-      <input type="text" placeholder="用户名" class="login-input user-log" v-model="userName">
-      <input type="text" placeholder="密码" class="login-input key-log" v-model=" password">
-      <div class="radio" @click="remembers">
-        <div class="checkbox">
-          <div class="checkbox-active" v-show="active"></div>
+    <div>
+      <div class="login-title">欢迎,登陆青鸽管家!</div>
+      <!-- 登陆板块 -->
+      <div class="login-text">
+        <input type="text" placeholder="用户名" class="login-input user-log" v-model="userName">
+        <input type="text" placeholder="密码" class="login-input key-log" v-model=" password">
+        <div class="radio" @click="remembers">
+          <div class="checkbox">
+            <div class="checkbox-active" v-show="active"></div>
+          </div>
+          <div>记住密码</div>
+        </div>
+        <button class="login-btn" @click="handleSubmit">登陆</button>
+        <div class="login-register">
+          <div>注册</div>
+          <div>忘记密码</div>
         </div>
-        <div>记住密码</div>
-      </div>
-      <button class="login-btn" @click="handleSubmit">登陆</button>
-      <div class="login-register">
-        <div>注册</div>
-        <div>忘记密码</div>
       </div>
     </div>
   </div>
@@ -27,8 +29,8 @@ export default {
   name: 'login',
   data () {
     return {
-      userName: 'super_admin',
-      password: '',
+      userName: '15238687931',
+      password: '123456',
       active:false
     }
   },
@@ -38,15 +40,16 @@ export default {
       'getUserInfo'
     ]),
     handleSubmit () {
-      var userName=this.userName;
-      var password=this.password;
-      if(!userName){
+      var loginname=this.userName;
+      var loginpwd=this.password;
+      // loginname, loginpwd
+      if(!loginname){
         return;
       };
-      if(!password){
+      if(!loginpwd){
         return;
       }
-      this.handleLogin({ userName, password }).then(res => {
+      this.handleLogin({ loginname, loginpwd }).then(res => {
         this.getUserInfo().then(res => {
           this.$router.push({
             name: this.$config.homeName

src/view/multilevel/level-2-1.vue

@@ -1,8 +0,0 @@
-<template>
-  <div>多级菜单 -> 二级-1</div>
-</template>
-<script>
-export default {
-  name: 'level_2_1'
-}
-</script>

src/view/organ_admin/info/info.less

@@ -0,0 +1,33 @@
+.istop{
+    display: inline-block;
+    width: 200px;
+   margin-left: 20px;
+}
+div /deep/ .ivu-form-item{
+    margin-bottom: 10px;
+}
+.upLoad{
+    margin: 10px 0;
+    display: flex;
+    justify-content: flex-start;
+    .upLoad-div{
+        margin-right: 180px;
+        & span{
+            font-size: 14px;
+            .upLoad-size{
+                margin-left: 16px;
+                font-size: 12px;
+                color: rgb(51,153,255);
+            }
+        }
+        .upLoad-border{
+            margin-top: 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 120px;
+            border: 1px dashed #E9E9E9;
+            border-radius: 6px;
+        }
+    }
+}

src/view/organ_admin/info/info.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <Form label-position="left" :label-width="40">
+        <FormItem label="标题">
+            <Input></Input>
+        </FormItem>
+        <FormItem label="分类">
+          <Select v-model="select" style="width:180px">
+              <Option v-for="(item,index) in selectList" :value="item.id" :key="index">{{ item.title }}</Option>
+          </Select>
+          <div class="istop">
+            <FormItem label="是否置顶"  :label-width="60">
+              <RadioGroup v-model="radio">
+                  <Radio label="notop">不置顶</Radio>
+                  <Radio label="istop">置顶</Radio>
+              </RadioGroup>
+            </FormItem>
+          </div>
+          <div class="istop">
+            <FormItem label="是否广告位"  :label-width="80" inline>
+              <RadioGroup v-model="poster">
+                  <Radio label="noPoster">否</Radio>
+                  <Radio label="isPoster">是</Radio>
+              </RadioGroup>
+            </FormItem>
+          </div>
+        </FormItem>
+        <FormItem label="标签">
+            <Input  style="width:420px"></Input>
+        </FormItem>
+    </Form>
+    <div>
+      <div>
+        <div>咨讯内容</div>
+          <paste-editor></paste-editor>
+      </div>
+    </div>
+    <div class="upLoad">
+      <div class="upLoad-div">
+        <span>封面图<span class="upLoad-size">(建议图片尺寸:840 x 400)</span></span>
+        <Upload class="upLoad-border" :before-upload="handleUpload" action="//jsonplaceholder.typicode.com/posts/" >
+            <div>
+              <Icon type="md-add" size="52" style="color: #3399ff"></Icon>
+            </div>
+        </Upload>
+      </div>
+      <div class="upLoad-div">
+        <span>视频</span>
+        <Upload class="upLoad-border" action="//jsonplaceholder.typicode.com/posts/">
+            <div>
+              <Icon type="md-add" size="52" style="color: #3399ff"></Icon>
+            </div>
+        </Upload>
+      </div>
+    </div>
+    <Button size="large" type="primary">完成</Button>
+    <img :src="logoPreview" alt="">
+  </div>
+</template>
+<script>
+import pasteEditor from "../../components/editor/editor.vue"
+export default {
+  name: 'info',
+  components:{
+    pasteEditor
+  },
+  data(){
+    return {
+      selectList:[
+        {id:1,title:"时事"},
+        {id:2,title:"最新"},
+        {id:3,title:"国家"},
+        {id:4,title:"教育"}
+      ],
+      select:"",
+      radio:"notop",
+      poster:"noPoster",
+      logoPreview:''
+    }
+  },
+  methods:{
+    handleUpload(file){
+      this.file = file
+      const reader = new FileReader()
+      reader.readAsDataURL(file)
+        reader.onload = () => {
+          const _base64 = reader.result
+          this.logoPreview = _base64
+        }
+      return false;
+    }
+  }
+}
+</script>
+<style lang="less">
+  @import './info.less';
+</style>
+

src/view/single-page/home/home.vue

@@ -163,11 +163,11 @@ export default {
         border-bottom:1px solid #EFEFEF;
         margin-top: 34px;
         .index-text{
-            font-size: 26px;
+            font-size: 24px;
             padding: 8px 0;
         }
         .index-details{
-            font-size: 23px;
+            font-size: 20px;
             color: #3DA4FF;
         }
     }