2022-7-14

src/SManagement/archives/index.vue

@@ -5,12 +5,14 @@
     </bread-crumbs>
     <div class="header-panl">
       <!--类型选择面板-->
-      <select-panl :titleLists="titleLists" @CurrentSelectType="CurrentSelectType" ref="selectPanl" v-if="tool.checkAuth($route.name,'read')"></select-panl>
+      <!-- <select-panl :titleLists="titleLists" @CurrentSelectType="CurrentSelectType" ref="selectPanl" v-if="tool.checkAuth($route.name,'read')"></select-panl> -->
+      <search @searchActive="searchActive" @clearData="clearData"></search>
       <!--切换最热最新-->
       <hot-new-control @sortTypeChange="sortTypeChange" v-if="tool.checkAuth($route.name,'read')"></hot-new-control>
     </div>
     <!--文件展示-->
-    <file-list :fileData="fileData" @upFileData="upFileData" @statusChange="statusChange" :isCollect="true" v-if="tool.checkAuth($route.name,'read')">
+    <file-list :fileData="fileData" @upFileData="upFileData" @statusChange="statusChange" :isCollect="true"
+      v-if="tool.checkAuth($route.name,'read')">
     </file-list>
 
   </div>
@@ -20,6 +22,7 @@
 import FileList from '@/SManagement/archives/components/FileList'
 import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import HotNewControl from '@/components/hot-new-control/HotNewControl'
+import search from '@/components/search/index'
 import BreadCrumbs from '@/components/bread-crumbs/BreadCrumbs'
 export default {
   name: 'index',
@@ -60,7 +63,7 @@ export default {
         { name: '文本', type: 'txt' },
       ],
       fileData: [],
-      allFileData:[],
+      allFileData: [],
       //当前选择的文件类型
       isType: 'all',
       //当前所在文件夹位置
@@ -73,6 +76,7 @@ export default {
   },
   components: {
     SelectPanl,
+    search,
     FileList,
     HotNewControl,
     BreadCrumbs,
@@ -93,10 +97,17 @@ export default {
         this.total = res.total;
         this.params.content.sort = res.sort
         this.allFileData = this.fileType.fileList(res.data)
-        
-        this.fileData =this.filterFileData(this.allFileData,this.isType)
+        this.fileData = this.filterFileData(this.allFileData, this.isType)
       })
     },
+    searchActive (txt) {
+      this.params.content.where.condition = txt
+      this.getFileList()
+    },
+    clearData () {
+      this.params.content.where.condition = ''
+      this.getFileList()
+    },
     //监听文件夹单击事件
     upFileData (parentid, name, id) {
       this.params.content.parentid = id
@@ -112,7 +123,7 @@ export default {
     //监听类型选择组件发出的更改事件
     CurrentSelectType (type) {
       this.isType = type
-      this.fileData = this.filterFileData(this.allFileData,type)
+      this.fileData = this.filterFileData(this.allFileData, type)
     },
     //面包屑发出的事件
     async BreadCrumbsChange (index) {
@@ -131,7 +142,7 @@ export default {
     },
     //监听最热组件变化
     sortTypeChange (name) {
-      for(let i=0;i<this.params.content.sort.length;i++) {
+      for (let i = 0; i < this.params.content.sort.length; i++) {
         this.params.content.sort[i].sorted = this.params.content.sort[i].sortname == name ? 1 : 0
       }
       this.getFileList()

src/SManagement/archives_ad/index.vue

@@ -63,7 +63,7 @@ export default {
       list: [],
       //分类列表
       selectList: [],
-      total: 20,
+      total: 0,
       //当前查看的素材
       currentFile: ''
     };

src/SManagement/archives_admag/index.vue

@@ -79,7 +79,7 @@ export default {
       list: [],
       //分类列表
       selectList: [],
-      total: 20,
+      total: 0,
       //当前查看的素材
       currentFile: ''
     };

src/SManagement/archives_sc/index.vue

@@ -4,18 +4,21 @@
       <div class="left">
         <!--分类选择器-->
         <category-select label="课程分类" @changeSelect="changeSelect" :selectList="selectList"
-          :prop="{value:'sat_courseware_classid',label:'classname'}" v-if="tool.checkAuth($route.name,'read')"></category-select>
+          :prop="{value:'sat_courseware_classid',label:'classname'}" v-if="tool.checkAuth($route.name,'read')">
+        </category-select>
         <!--搜索-->
         <search @searchActive="searchActive" @clearData="clearData" v-if="tool.checkAuth($route.name,'read')"></search>
       </div>
       <!--最新最热切换-->
-      <hot-new-control :sortType='param.content.where.sorttype' @sortTypeChange="sortTypeChange" v-if="tool.checkAuth($route.name,'read')"></hot-new-control>
+      <hot-new-control :sortType='param.content.where.sorttype' @sortTypeChange="sortTypeChange"
+        v-if="tool.checkAuth($route.name,'read')"></hot-new-control>
     </div>
     <!--课件列表-->
     <div class="file" v-if="list.length != 0 && tool.checkAuth($route.name,'read')">
       <div class="file-item" v-for="(item,index) in list" :key="index" @click="itemClick(item)">
         <div class="top">
-          <img :src="item.cover" alt="">
+          <el-image style="width: 100%; height: 100%" :src="item.cover || require('@/assets/video.png')" fit="fill">
+          </el-image>
         </div>
         <div class="bottom">
           <p class="title">{{item.title}}</p>
@@ -30,7 +33,8 @@
       @pageChange="pageChange">
     </pagination>
     <!--课程详情-->
-    <detail ref="detail" :currentSelectFile="currentSelectFile" v-if="currentSelectFile && tool.checkAuth($route.name,'read')"></detail>
+    <detail ref="detail" :currentSelectFile="currentSelectFile"
+      v-if="currentSelectFile && tool.checkAuth($route.name,'read')"></detail>
   </div>
 </template>
 
@@ -105,7 +109,7 @@ export default {
         this.total = res.total
         this.list = res.data
         console.log(this.list);
-        
+
         this.param.content.sort = res.sort
       })
     },
@@ -160,6 +164,9 @@ export default {
 </script>
 
 <style scoped>
+*{
+  box-sizing: border-box;
+}
 .normal-card {
   min-height: 100%;
   box-sizing: border-box;
@@ -207,7 +214,7 @@ export default {
   border-top-left-radius: 4px;
 }
 .normal-card .file .file-item .bottom {
-  padding: 10px 20px 16px 16px;
+  padding: 10px 18px 10px 16px;
 }
 .normal-card .file .file-item .bottom .title {
   font-size: 14px;
@@ -239,8 +246,8 @@ export default {
 }
 .normal-card .el-pagination {
   position: absolute;
-  right: 16px;
   bottom: 0;
+  right: 16px;
 }
 .select {
   margin-left: 20px;

src/SManagement/archives_upload/index.vue

@@ -155,7 +155,7 @@ export default {
                 this.uploadCacheData.status = '完成'
                 this.$notify({
                   title: '提示',
-                  message: '上传成功',
+                  message: '操作成功',
                   type: 'success'
                 })
                 this.insertCoursewareauth();

src/SManagement/archivesmag/index.vue

@@ -5,9 +5,10 @@
                   @BreadCrumbsChange="BreadCrumbsChange"></bread-crumbs>
     <div class="header-panl">
       <!--类型选择面板-->
-      <select-panl :titleLists="titleLists"
+      <!-- <select-panl :titleLists="titleLists"
                    @CurrentSelectType="CurrentSelectType"
-                   ref="selectPanl" v-if="tool.checkAuth($route.name,'read')"></select-panl>
+                   ref="selectPanl" v-if="tool.checkAuth($route.name,'read')"></select-panl> -->
+      <search @searchActive="searchActive" @clearData="clearData"></search>
       <!--切换最热最新-->
       <hot-new-control :sortType= 'params.content.where.sorttype'
                        @sortTypeChange="sortTypeChange" v-if="tool.checkAuth($route.name,'read')"></hot-new-control>
@@ -27,7 +28,7 @@ import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import HotNewControl from '@/components/hot-new-control/HotNewControl'
 import BreadCrumbs from '@/components/bread-crumbs/BreadCrumbs'
 import Drawer from '@/SManagement/archives/components/Drawer'
-
+import search from '@/components/search/index'
 import matchingFileType from '@/utils/matchingFeilType'
 export default {
   name: 'index',
@@ -82,6 +83,7 @@ export default {
   },
   components: {
     SelectPanl,
+    search,
     FileList,
     HotNewControl,
     BreadCrumbs,
@@ -104,6 +106,14 @@ export default {
         this.fileData = matchingFileType.fileList(res.data)
       })
     },
+    searchActive (txt) {
+      this.params.content.where.condition = txt
+      this.getFileList()
+    },
+    clearData () {
+      this.params.content.where.condition = ''
+      this.getFileList()
+    },
     //监听文件单击事件
      upFileData(parentid,name,id) {
       this.params.content.parentid = id
@@ -114,7 +124,6 @@ export default {
         filename:name,
         id: id
       })      
-      
     },
     //监听类型选择组件发出的更改事件
     CurrentSelectType(type) {

src/SManagement/notice/index.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="normal-card">
     <search @searchActive="searchActive" @clearData="clearData" v-if="tool.checkAuth($route.name,'read')"></search>
-    <list :list="list" v-if="tool.checkAuth($route.name,'read')"></list>
-    <pagination :total="total"
-                :pageSize="param.content.pageSize"
-                :currentPage="param.content.pageNumber"
-                @pageChange="pageChange">
-    </pagination>
+    <div class="content">
+      <list :list="list" v-if="tool.checkAuth($route.name,'read')"></list>
+      <div class="page">
+        <pagination :total="total"
+                    :pageSize="param.content.pageSize"
+                    :currentPage="param.content.pageNumber"
+                    @pageChange="pageChange">
+        </pagination>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -92,11 +96,15 @@ export default {
   width: 320px;
   height: 36px;
 }
-
-.normal-card .el-pagination {
-  position: absolute;
-  right: 16px;
-  bottom: 0;
+.normal-card .content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  min-height: calc(100vh - 130px);
+}
+.normal-card .content .page {
+  margin: 16px 30px;
+  display: flex;
+  flex-direction: row-reverse;
 }
-
 </style>

src/SManagement/orderclue/components/export.vue

@@ -5,38 +5,31 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils'
 export default {
-  props:['tablecols','param','excelTitle'],
   data () {
-    return {}
+    return {
+      param: {
+          "classname": "saletool.orderclue.web.orderclue",
+          "method": "selectList",
+          "content": {
+              "isAll":true,
+              "pageNumber": 1,
+              "pageSize": 20,
+              "where": {
+                "condition": "",
+                "status": ""
+              }
+          }
+      }
+    }
   },
   methods:{
-    async submit () {
-      let data = {}
-      data = JSON.parse(JSON.stringify(this.param))
-
-      data.content.isAll = true
-      console.log(data,this.param)
-      const res = await this.$api.requested(data)
-      let table = JSON.parse(JSON.stringify(this.tablecols))
-      table.forEach((e,index) => {
-        // 由于表格数据结构问题这里需要判断一下
-        if (e.title === '省市县') {
-          table[index].title = '省'
-          table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
+    submit () {
+      this.$api.requested(this.param).then( res => {
+        if( res.code == 1) {
+          window.open(res.data[0].url,'_self')
         }
-        if(e.title == '序号') {
-          table.splice(index,1)
-        }
-      });
-      let hd = table.map(e=>{
-        return e.title
-      })
-      let ft = table.map(e=>{
-        return e.columnname
       })
-      this.tool.exportExcel(hd,ft,res.data,this.excelTitle)
     }
   }
 }

src/SManagement/orderclue/components/list.vue

@@ -2,7 +2,7 @@
   <div class="normal-card">
     <Header>
       <add @updataList="updataList" v-if="tool.checkAuth($route.name,'insert')"></add>
-      <export-btn :tablecols="tablecols" :param="param" excelTitle="线索池数据表" v-if="tool.checkAuth($route.name,'download')"></export-btn>
+      <export-btn v-if="tool.checkAuth($route.name,'download')"></export-btn>
       <move type="more" :data="checkboxArr" @updataList="getList()" v-show="checkboxArr.length >= 1"></move>
     </Header>
     <div class="select" v-if="tool.checkAuth($route.name,'read')">
@@ -21,7 +21,7 @@
     <table1 :layout="tablecols" :custom="true" :checkbox="true" :data="list"
         :height="tableHieght" @checkboxCallBack="checkboxCallBack" v-if="tool.checkAuth($route.name,'read')">
         <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname == 'index'" style="display:flex;align-items: center;">
+            <div v-if="scope.column.columnname == 'rowindex'" style="display:flex;align-items: center;">
               <p>{{ scope.column.data[scope.column.columnname] }}</p>
               <span :class="scope.column.data.isTeam == '总部' ? 'all-team' : 'team'">{{ scope.column.data.isTeam }}</span>
             </div>
@@ -34,7 +34,7 @@
             <p v-else>{{ scope.column.data[scope.column.columnname] }}</p>
         </template>
         <template v-slot:opreation="scope">
-          <div class="handle" v-if="tool.checkAuth($route.name,'update')">
+          <div class="handle">
             <slot name="detail" :data="scope"></slot>
             <slot name="edit" :data="scope"></slot>
             <slot name="goUp" :data="scope"></slot>
@@ -74,11 +74,12 @@ export default {
           "classname": "saletool.orderclue.web.orderclue",
           "method": "selectList",
           "content": {
+              "isAll":false,
               "pageNumber": 1,
               "pageSize": 20,
               "where": {
-                  "condition": "",
-                  "status": ""
+                "condition": "",
+                "status": ""
               }
           }
       },
@@ -142,8 +143,6 @@ export default {
   },
   mounted() {
     this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols;
-    console.log(this.tablecols);
-    
   }
 };
 </script>

src/SManagement/orderclue/index.vue

@@ -2,16 +2,22 @@
   <div class="orderclue">
     <list ref="list">
       <template v-slot:detail="scope">
-          <p @click="detail(scope.data)">详情</p>
+          <p @click="detail(scope.data)" v-if="tool.checkAuth($route.name,'read')">详情</p>
       </template>
       <template v-slot:edit="scope">
-          <edit :data="scope.data" @updataList="updataList" v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></edit>
+          <edit :data="scope.data" 
+                @updataList="updataList" 
+                v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'update')"></edit>
       </template>
       <template v-slot:goUp="scope">
-        <follow :data="scope.data" @updataList="updataList" v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></follow>
+        <follow :data="scope.data" 
+                @updataList="updataList" 
+                v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'follow')"></follow>
       </template>
       <template v-slot:move="scope">
-        <move :data="[scope.data.data.sat_orderclueid]" @updataList="updataList" v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中'"></move>
+        <move :data="[scope.data.data.sat_orderclueid]" 
+              @updataList="updataList" 
+              v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'handleMove')"></move>
       </template>
     </list>
   </div>

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -97,7 +97,7 @@ export default {
   box-sizing: border-box;
 }
   .normal-card .title {
-    font-size: 14px;
+    font-size: 16px;
     color: #000000;
     font-weight: bold;
   }
@@ -114,7 +114,7 @@ export default {
     font-size: 14px;
   }
   .normal-card .detail .content {
-    margin: 10px 16px 16px 16px;
+    margin: 10px 0 16px 0;
     background: #F2F2F2;
     padding: 16px;
     border-radius: 5px;

src/SManagement/orderclue_detail/index.vue

@@ -5,33 +5,31 @@
       <follow :data="{data:detail}" @getDetail="getDetail" position="detail"></follow>
     </Header>
     <div class="normal-card">
-      <p class="title">线索信息</p>
-      <div class="info">
-        <p><span>序号:</span>{{detail.sat_orderclueid}}</p>
-        <p><span>手机号:</span>{{detail.phonenumber}}</p>
-        <p><span>地址:</span>{{detail.addres}}</p>
-        <p><span>来源:</span>{{detail.cluesource}}</p>
-        <p><span>状态:</span>{{detail.status}}</p>
-        <p><span>客户名称:</span>{{detail.name}}</p>
-        <p><span>省市县:</span>{{detail.province}}、{{detail.city}}、{{detail.county}}</p>
-        <p><span>备注:</span>{{detail.notes}}</p>
-        <p><span>负责人:</span>{{detail.agentname}}</p>
-      </div>
+      <el-descriptions :column="5" title="线索信息">
+        <el-descriptions-item label="序号">{{detail.sat_orderclueid}}</el-descriptions-item>
+        <el-descriptions-item label="手机号">{{detail.phonenumber}}</el-descriptions-item>
+        <el-descriptions-item label="地址">{{detail.addres}}</el-descriptions-item>
+        <el-descriptions-item label="来源">{{detail.cluesource}}</el-descriptions-item>
+        <el-descriptions-item label="状态"><span :style="{'color':statusStyle[detail.status]}">{{detail.status}}</span></el-descriptions-item>
+        <el-descriptions-item label="客户名称">{{detail.name}}</el-descriptions-item>
+        <el-descriptions-item label="省市县">{{detail.province}}、{{detail.city}}、{{detail.county}}</el-descriptions-item>
+        <el-descriptions-item label="备注">{{detail.notes}}</el-descriptions-item>
+        <el-descriptions-item label="负责人">{{detail.agentname}}</el-descriptions-item>
+      </el-descriptions>
     </div>
     <div class="normal-card">
-      <p class="title">系统信息</p>
-      <div class="info">
-        <p><span>创建人:</span>{{detail.createBy}}</p>
-        <p><span>分配人:</span>{{detail.assignedBy}}</p>
-        <p><span>最近跟进人:</span>{{detail.followBy}}</p>
-        <p><span>转移人:</span>{{detail.changeBy}}</p>
-        <p><span>最近编辑人:</span>{{detail.editBy}}</p>
-        <p><span>创建时间:</span>{{detail.createDate}}</p>
-        <p><span>分配时间:</span>{{detail.assignedDate}}</p>
-        <p><span>最近跟进时间:</span>{{detail.followDate}}</p>
-        <p><span>最近转移时间:</span>{{detail.changeDate}}</p>
-        <p><span>最近编辑时间:</span>{{detail.editDate}}</p>
-      </div>
+      <el-descriptions :column="5" title="系统信息">
+        <el-descriptions-item label="创建人">{{detail.createBy}}</el-descriptions-item>
+        <el-descriptions-item label="分配人">{{detail.assignedBy}}</el-descriptions-item>
+        <el-descriptions-item label="最近跟进人">{{detail.followBy}}</el-descriptions-item>
+        <el-descriptions-item label="转移人">{{detail.changeBy}}</el-descriptions-item>
+        <el-descriptions-item label="最近编辑人">{{detail.editBy}}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{detail.createDate}}</el-descriptions-item>
+        <el-descriptions-item label="分配时间">{{detail.assignedDate}}</el-descriptions-item>
+        <el-descriptions-item label="最近跟进时间">{{detail.followDate}}</el-descriptions-item>
+        <el-descriptions-item label="最近转移时间">{{detail.changeDate}}</el-descriptions-item>
+        <el-descriptions-item label="最近编辑时间">{{detail.editDate}}</el-descriptions-item>
+      </el-descriptions>
     </div>
     <follow-detail ref="followDetatil"></follow-detail>
   </div>
@@ -53,6 +51,14 @@ export default {
             "sat_orderclueid": 0
         }
       },
+      statusStyle: {
+        '待跟进':'#FA8C16',
+        '跟进中':'#52C41A',
+        '丢单':'#FF3B30',
+        '无效':'#999999',
+        '已成交':'#333333',
+        '已过期':'#999999'
+      },
       detail: ''
     };
   },
@@ -87,7 +93,7 @@ export default {
     margin-bottom: 10px;
   }
   .normal-card .title {
-    font-size: 14px;
+    font-size: 16px;
     font-weight: bold;
     color: #000000;
     margin-bottom: 25px;
@@ -100,7 +106,7 @@ export default {
   .normal-card .info p {
     margin-right: 50px;
     margin-bottom: 15px;
-    font-size: 13px;
+    font-size: 14px;
   }
   .normal-card .info p span {
     margin-right: 15px;

src/SManagement/submitedit_more/index.vue

@@ -82,13 +82,12 @@ export default {
 }
 .normal-card {
   min-height: 100%;
-  padding: 18px 20px 10px 10px;
+  padding: 18px 20px 30px 10px;
   position: relative;
 }
-
-/deep/ .el-pagination {
+.el-pagination {
   position: absolute;
-  bottom: 0;
   right: 16px;
+  bottom: 0;
 }
 </style>

src/SManagement/submitedit_one/index.vue

@@ -86,13 +86,12 @@ export default {
 }
 .normal-card {
   min-height: 100%;
-  padding: 18px 20px 10px 10px;
+  padding: 18px 20px 30px 10px;
   position: relative;
 }
-
-/deep/ .el-pagination {
+.el-pagination {
   position: absolute;
-  bottom: 0;
   right: 16px;
+  bottom: 0;
 }
 </style>

src/SManagement/user/role-edit/RoleEdit.vue

@@ -87,14 +87,14 @@ export default {
               if(res.code == 1) {
                 this.$notify({
                   title:'提示',
-                  message:'编辑成功',
+                  message:'操作成功',
                   type:'success'
                 })
                 this.$router.back()
               } else {
                 this.$notify({
                   title:'提示',
-                  message:'编辑失败',
+                  message:'操作失败',
                   type:'warning'
                 })
               }
@@ -114,14 +114,14 @@ export default {
                   if(res.code == 1) {
                     this.$notify({
                       title:'提示',
-                      message:'新建成功',
+                      message:'操作成功',
                       type:'success'
                     })
                     this.$router.back()
                   } else {
                     this.$notify({
                       title:'提示',
-                      message:'新建失败',
+                      message:'操作失败',
                       type:'warning'
                     })
                   }

src/SManagement/user/role-edit/components/RolePowerSelect.vue

@@ -117,6 +117,8 @@ export default {
   watch: {
   },
   created () {
+    console.log(this.$root);
+    
     this.getAllHavePower()
   },
   mounted () {

src/components/table/index.vue

@@ -50,7 +50,7 @@ export default {
       this.$emit('checkboxCallBack',val)      
     },
     isCheck(row,rowIndex) {
-      if(row.status == '待跟进' || row.status == '待分配') {
+      if(row.status == '待跟进' || row.status == '跟进中') {
         return true
       } else {
         return false

src/router/HManagement.js

@@ -112,169 +112,170 @@ const HManagement = [
       keeproute:true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/saler/modules/saler_detail.vue')
-  }, {
-    path: '/add_agent',
-    name: 'salermag',
-    meta: {
-      title: '新建经销商',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/add_agent.vue')
-  }, {
-    path: '/edit_agent',
-    name: 'salermag',
-    meta: {
-      title: '编辑经销商',
-      ast_nav: true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/edit_agent.vue')
-  }, {
-    path: '/agent_detail',
-    name: 'salermag',
-    meta: {
-      title: '经销商详情',
-      ast_nav: true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/agent_detail.vue')
-  }, {
-    path: '/notice_mag_list',
-    name: 'noticemag',
-    meta: {
-      title: '通告管理',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/index.vue')
-  },{
-    path: '/notice_add',
-    name: 'noticemag',
-    meta: {
-      title: '编辑通告',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/add_notice.vue')
-  },{
-    path: '/notice_edit',
-    name: 'noticemag',
-    meta: {
-      title: '编辑通告',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/edit_notice.vue')
-  },{
-    path: '/noticeclass',
-    name: 'noticeclass',
-    meta: {
-      title: '通告板块',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/pate/index.vue')
-  },{
-    path: '/notice_analysis',
-    name: 'noticemag',
-    meta: {
-      title: '数据分析',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/dataAnalysis/index.vue')
-  },{
-    path: '/submit_mag',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
-  },{
-    path: '/submit_add',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add.vue')
-  },{
-    path: '/submit_edit',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_edit.vue')
-  },{
-    path: '/submit_detail',
-    name: 'submit_mag',
-    meta: {
-      title: '提报明细',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/content.vue')
-  },{
-    path: '/submit_statistics',
-    name: 'submit_mag',
-    meta: {
-      title: '数据分析',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/dataAnalysis/index.vue')
-  },{
-    path: '/archvies_mag',
-    name: 'archvies_mag',
-    meta: {
-      title: ' 营销物料',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archvies_mag/index.vue')
-  },{
-    path: '/archives_scmag',
-    name: 'archives_scmag',
-    meta: {
-      title: '商学院管理',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
-  }, {
-    path: '/archives_scadd',
-    name: 'archives_scmag',
-    meta: {
-      title: '编辑课程',
-      ast_nav: true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
-  }, {
-    path: '/archives_scedit',
-    name: 'archives_scmag',
-    meta: {
-      title: '编辑课程',
-      ast_nav: true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
-  },{
-    path: '/archives_scdetails',
-    name: 'archives_scmag',
-    meta: {
-      title: '课程详情',
-      ast_nav:true,
-      keeproute:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
-  },{
-    path: '/archives_scclass',
-    name: 'archives_scclass',
-    meta: {
-      title: '课程分类',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
-  },{
+  },
+  // }, {
+  //   path: '/add_agent',
+  //   name: 'salermag',
+  //   meta: {
+  //     title: '新建经销商',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/add_agent.vue')
+  // }, {
+  //   path: '/edit_agent',
+  //   name: 'salermag',
+  //   meta: {
+  //     title: '编辑经销商',
+  //     ast_nav: true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/edit_agent.vue')
+  // }, {
+  //   path: '/agent_detail',
+  //   name: 'salermag',
+  //   meta: {
+  //     title: '经销商详情',
+  //     ast_nav: true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/agent_detail.vue')
+  // }, {
+  //   path: '/notice_mag_list',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '通告管理',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/index.vue')
+  // },{
+  //   path: '/notice_add',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '编辑通告',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/add_notice.vue')
+  // },{
+  //   path: '/notice_edit',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '编辑通告',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/edit_notice.vue')
+  // },{
+  //   path: '/noticeclass',
+  //   name: 'noticeclass',
+  //   meta: {
+  //     title: '通告板块',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/pate/index.vue')
+  // },{
+  //   path: '/notice_analysis',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '数据分析',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/dataAnalysis/index.vue')
+  // },{
+  //   path: '/submit_mag',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
+  // },{
+  //   path: '/submit_add',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add.vue')
+  // },{
+  //   path: '/submit_edit',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_edit.vue')
+  // },{
+  //   path: '/submit_detail',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报明细',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/content.vue')
+  // },{
+  //   path: '/submit_statistics',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '数据分析',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/dataAnalysis/index.vue')
+  // },{
+  //   path: '/archvies_mag',
+  //   name: 'archvies_mag',
+  //   meta: {
+  //     title: ' 营销物料',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archvies_mag/index.vue')
+  // },{
+  //   path: '/archives_scmag',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '商学院管理',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
+  // }, {
+  //   path: '/archives_scadd',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '编辑课程',
+  //     ast_nav: true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
+  // }, {
+  //   path: '/archives_scedit',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '编辑课程',
+  //     ast_nav: true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
+  // },{
+  //   path: '/archives_scdetails',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '课程详情',
+  //     ast_nav:true,
+  //     keeproute:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
+  // },{
+  //   path: '/archives_scclass',
+  //   name: 'archives_scclass',
+  //   meta: {
+  //     title: '课程分类',
+  //     ast_nav:true
+  //   },
+    // component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
+  {
     path: '/archives_sc_analysis',
     name: 'archives_scmag',
     meta: {

src/views/login/login.vue

@@ -79,7 +79,7 @@ export default {
       },
       loginForm:{
         // phonenumber:'13732579910'
-        phonenumber:'17757302858'
+        phonenumber:'13712345678'
       },
       activeName:'first',
       checked:false,

src/views/message/index.vue

@@ -6,15 +6,10 @@
       <div @click="selectFun('应用')"
         :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">应用消息</div>
     </div>
-    <div class="content">
-      <list :list="list"></list>
-      <div class="page">
-        <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber"
-          @pageChange="pageChange">
-        </pagination>
-      </div>
-    </div>
-    
+    <list :list="list"></list>
+    <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber"
+      @pageChange="pageChange">
+    </pagination>
   </div>
 </template>
 
@@ -34,7 +29,7 @@ export default {
         "content": {
           "nocache": true,
           "pageNumber": 1,
-          "pageSize": 4,
+          "pageSize": 10,
           "type": ''
         }
       },
@@ -82,7 +77,7 @@ export default {
   min-height: 100%;
   margin: 0 auto;
   background: #ffffff;
-  padding-top: 30px;
+  padding: 30px 0 60px 0;
   position: relative;
 }
 .message .select {
@@ -110,16 +105,9 @@ export default {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
-.content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  min-height: calc(100vh - 230px);
-}
-.page {
-  margin-top: 15px;
-  padding-right: 30px;
-  display: flex;
-  flex-direction: row-reverse;
+/deep/.el-pagination {
+  position: absolute;
+  right: 16px;
+  bottom: 0;
 }
 </style>