fix

src/api/recycle/index.js

@@ -1,18 +1,18 @@
 import fetch from '../fetch.js'
 
 export default {
-    /**
+  /**
      * 回收站相关借口
      * @returns {Promise<unknown>}
      */
-    recycleList() { //回收站列表
-        return fetch('/blade-project-manage/recyclebin/v1/list')
-    },
-    recycleBack(params) { //恢复文件
-        return fetch('/blade-project-manage/recyclebin/v1/back', params)
-    },
-    recycleRemove(params) { //删除
-        return fetch('/blade-project-manage/recyclebin/v1/remove', params, 'post')
-    },
+  recycleList (params) { // 回收站列表
+    return fetch('/blade-project-manage/recyclebin/v1/list', params)
+  },
+  recycleBack (params) { // 恢复文件
+    return fetch('/blade-project-manage/recyclebin/v1/back', params)
+  },
+  recycleRemove (params) { // 删除
+    return fetch('/blade-project-manage/recyclebin/v1/remove', params, 'post')
+  }
 
 }

src/layout/top.vue

@@ -16,7 +16,7 @@
               <el-avatar class='mr-10' :size="30" :src="user.info.avatarUrl && user.info.avatarUrl.length > 0 ?  user.info.avatarUrl : 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'" />
               <el-dropdown @command='dropDown'>
                 <span class="flex flex-center">
-                  {{user.info.nikeName}} / {{user.info.deptName}}
+                  {{user.info.name}} / {{user.info.deptName}}
                   <el-icon class="el-icon--right">
                     <arrow-down />
                   </el-icon>
@@ -60,7 +60,7 @@ export default {
     },
     dropDown (res) {
       if (res === 'info') {
-        this.$message.success('个人中心')
+        this.$router.push('/user')
       } else if (res === 'logout') {
         this.$api.login.logout().then(res => {
           if (res.success === 'true') {

src/views/database/component/list.vue

@@ -111,9 +111,11 @@ export default {
     },
     currentChange (currentPage) {
       this.page.current = currentPage
+      this.refreshChange()
     },
     sizeChange (pageSize) {
       this.page.size = pageSize
+      this.refreshChange()
     },
     refreshChange () {
       this.onLoad(this.page, this.query)

src/views/home/component/folder_info.vue

@@ -19,11 +19,13 @@
     <div style="background-color: #E4E4E4;height: 10px;width: 100%;margin-left: -10px"></div>
     <!------tab------>
     <div class="flex flex-center mt-15">
-      <div class="flex flex-center" style="flex: 3.8">
+      <div class="flex flex-center" style="flex: 3.9">
         <div v-for="(item,index) in folderType" :key='item.id' class="flex flex-center tab">
-          <div :class="active === index ? 'tab-active' : ''"
-               @click="change(index,item.dictKey)">{{ item.dictValue }}
-          </div>
+          <el-badge :value='item.fileChildrenNumber' :hidden='item.fileChildrenNumber === 0'>
+            <div :class="active === index ? 'tab-active' : ''"
+                 @click="change(index,item.dictKey)">{{ item.dictValue }}
+            </div>
+          </el-badge>
         </div>
       </div>
       <div class="flex flex-center mr-5 " style="flex: 1.2">
@@ -171,7 +173,6 @@ export default {
       })
     },
     changePage (page) {
-      console.log(page)
       this.page.current = page
       this.getFolderList()
     }
@@ -181,7 +182,7 @@ export default {
 
 <style lang="scss" scoped>
 .tab {
-  width: 130px;
+  width: 150px;
   height: 38px;
   background-color: #EDF0F3;
   padding: 2px 10px;

src/views/recycle/index.vue

@@ -33,6 +33,11 @@ export default {
       loading: false,
       data: [],
       form: {},
+      page: {
+        size: 10,
+        current: 1,
+        total: 10
+      },
       option: {
         calcHeight: 30,
         refreshBtn: false,
@@ -91,23 +96,17 @@ export default {
             label: '删除人',
             prop: 'createUserName'
           }]
-      },
-      page: {
-        size: 10,
-        current: 1,
-        total: 0
       }
     }
   },
   methods: {
     onLoad () {
       this.loading = true
-      this.$api.recycle.recycleList().then(res => {
+      this.$api.recycle.recycleList(this.page).then(res => {
         this.loading = false
         if (res.code === 200) {
           this.data = res.data.records
           this.page.total = res.data.total
-          this.loading = false
         }
       })
     },
@@ -131,13 +130,14 @@ export default {
       }
     },
     currentChange (currentPage) {
-      this.page.currentPage = currentPage
+      this.page.current = currentPage
+      this.refreshChange()
     },
     sizeChange (pageSize) {
-      this.page.pageSize = pageSize
+      this.page.size = pageSize
     },
     refreshChange () {
-      this.onLoad(this.page, this.query)
+      this.onLoad()
     },
     rowDel (row) {
       this.$confirm('确定彻底删除所选择的文件?', {

src/views/user/index.vue

@@ -1,32 +1,47 @@
 <template>
-  <div class='full-width full-height flex flex-col flex-justify-start'>
-    <div>
-      <el-button @click='push'>设置</el-button>
+  <basic-container class='mt-10'>
+    <el-avatar class='mt-20' :size='150' :src='user.info.avatarUrl'></el-avatar>
+    <div class='bold font-30'>{{ user.info.name }}</div>
+    <div class='bold font-24 mt-10'>{{ user.info.deptName }}</div>
+    <div class='mt-20 font-18 lines-height-15'>
+      <div>绑定电话：{{ user.info.phone }}</div>
+      <div>注册时间：{{ user.info.createTime }}</div>
     </div>
-    <avue-crud
-      :option="option"
-      :data="list"
-      ref="crud"
-      v-model="form"
-      :before-open="beforeOpen"
-      @row-del="rowDel"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
-      @on-load="onLoad">
-    </avue-crud>
-  </div>
+    <div class='mt-20 flex flex-center '>
+      <div class='mr-20'>
+        <img class='icon'
+             src='https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/db94c8a6a7ec46f7a3b32b20a5da3844.jpg'/>
+        <div class='font-18 bold'>梧桐研究院</div>
+      </div>
+      <div class='ml-20'>
+        <img class='icon'
+             src='https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/23fcdf89312f4c969eeb636d1adf9adc.jpg'/>
+        <div class='font-18 bold'>梧桐树云平台</div>
+      </div>
+    </div>
+    <div class='mt-20 grey-6'>微信扫一扫 随时掌握项目动态</div>
+  </basic-container>
 </template>
 
 <route>
-  {
-    meta: { keepAlive: true }
-  }
+{
+  name: '个人中心',
+  meta: { keepAlive: true }
+}
 </route>
 
 <script>
 
+import BasicContainer from '@/components/basic-container/main.vue'
+import { useStore } from '@/store/user.js'
+
 export default {
   name: 'index',
+  components: { BasicContainer },
+  setup () {
+    const user = useStore()
+    return { user }
+  },
   data () {
     return {
       list: [],
@@ -140,5 +155,8 @@ export default {
 </script>
 
 <style scoped>
-
+.icon {
+  width: 180px;
+  height: 180px
+}
 </style>