fix

src/api/login/index.js

@@ -24,5 +24,8 @@ export default {
      */
   logout () {
     return fetch('/blade-auth/oauth/logout')
+  },
+  getUserInfo () {
+    return fetch('//blade-project-manage/other/v1/getUserInfo')
   }
 }

src/layout/top.vue

@@ -13,10 +13,10 @@
         <el-col :span='12'>
           <div class='flex-child-average flex-justify-end flex padding-right '>
             <div class='padding flex flex-align-center'>
-              <el-avatar class='mr-10' :size="30" src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png" />
+              <el-avatar class='mr-10' :size="30" :src="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.user_name}}
+                  {{user.info.nikeName}} / ({{user.info.typeName}})
                   <el-icon class="el-icon--right">
                     <arrow-down />
                   </el-icon>

src/page/login.vue

@@ -140,9 +140,8 @@ export default {
               this.$message.error(res.error_description)
               this.init()
             } else {
-              // 保存信息
-              this.user.setUserInfo(res)
               setToken(res.access_token)
+              this.getInfo()
               this.$router.replace('/')
             }
           })
@@ -154,6 +153,19 @@ export default {
     loginAdmin () {
       this.form.name = 'admin'
       this.form.pass = 'admin'
+    },
+    getInfo () {
+      this.$api.login.getUserInfo().then(res => {
+        if (res.code === 200) {
+          // 保存信息
+          if (res.data.type === 3) {
+            res.data.typeName = '机构'
+          } else {
+            res.data.typeName = '服务商'
+          }
+          this.user.setUserInfo(res.data)
+        }
+      })
     }
   }
 }

src/views/home/component/folder_list.vue

@@ -11,8 +11,9 @@
       </div>
 
       <el-empty v-if="folder && folder.length === 0" description="暂无数据"/>
-      <div v-for="item in folder" v-else class="flex flex-center border-bottom padding content-sp">
-        <img v-if="item.isAccess === 3" class="icon" src="../../../assets/svg/folder/see.svg">
+      <div v-for="item in folder" :key='item.id' v-else class="flex flex-center border-bottom padding content-sp">
+        <img v-if="item.isAccess === 1" class="icon" src="../../../assets/svg/folder/see.svg">
+        <img v-else-if="item.isAccess === 2" class="icon" src="../../../assets/svg/folder/edit.svg">
         <img v-else class="icon" src="../../../assets/svg/folder/invisible.svg">
         <span style="flex:2">{{ item.folderName }}</span>
         <span style="flex: 1">{{ item.updateTime }}</span>
@@ -61,9 +62,9 @@
           <div class='flex flex-align-center mb-10 flex-justify-between border-bottom'>
             <div class='bold'>相关操作</div>
             <el-radio-group v-model="check">
-              <el-radio label="1" size="large">全部不可见</el-radio>
-              <el-radio label="2" size="large">全部可见</el-radio>
-              <el-radio label="3" size="large">全部可下载</el-radio>
+              <el-radio label="3" size="large">全部不可查看</el-radio>
+              <el-radio label="1" size="large">全部可见</el-radio>
+              <el-radio label="2" size="large">全部可编辑</el-radio>
             </el-radio-group>
           </div>
           <div v-for='(item,index) in fileData.records' :key='item'>
@@ -111,7 +112,7 @@ import VueQr from 'vue-qr/src/packages/vue-qr.vue'
 
 export default {
   name: 'file_list',
-  components: {mainButton, uploadFile, item1, VueQr},
+  components: { mainButton, uploadFile, item1, VueQr },
   props: {
     folder: Array,
     total: String,
@@ -120,7 +121,7 @@ export default {
       default: 0
     }
   },
-  data() {
+  data () {
     return {
       show: false,
       authorizeShow: false,
@@ -139,41 +140,41 @@ export default {
     }
   },
   methods: {
-    fileView(item) {
+    fileView (item) {
       if (this.type === 0) {
         this.$router.push({
           path: '/home/files',
-          query: {id: item.fileFolderId}
+          query: { id: item.fileFolderId }
         })
       } else {
         this.$router.push({
           path: '/home/his_files',
-          query: {id: item.id}
+          query: { id: item.id }
         })
       }
     },
-    uploadFiles(item) {
+    uploadFiles (item) {
       this.currentRow = item
       this.show = true
     },
-    folderRemove(item) {
+    folderRemove (item) {
       this.$confirm('确认是否删除该文件夹及所包含的文件？', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
-          .then(() => {
-            this.$api.project.folderRemove({ids: item.fileFolderId}).then(res => {
-              if (res.code === 200) {
-                this.$message.success(res.msg)
-                this.$emit('delFolder')
-              } else {
-                this.$message.error(res.msg)
-              }
-            })
+        .then(() => {
+          this.$api.project.folderRemove({ ids: item.fileFolderId }).then(res => {
+            if (res.code === 200) {
+              this.$message.success(res.msg)
+              this.$emit('delFolder')
+            } else {
+              this.$message.error(res.msg)
+            }
           })
+        })
     },
-    success(res) {
+    success (res) {
       this.fileList = res.fileList.map(res => {
         const item = {}
         item.title = res.response.data.originalFileName
@@ -191,14 +192,13 @@ export default {
         this.saveLibrary(sub)
       })
     },
-    saveLibrary(sub) {
-      const data = {category: 4, content: ''}
+    saveLibrary (sub) {
+      const data = { category: 4, content: '' }
       this.$api.common.submit(Object.assign(sub, data)).then(res => {
         if (res.code === 200) {
           this.saveCount++
           this.libraryList.push(res.data.id)
           if (this.saveCount === this.fileList.length) {
-            console.log(this.fileList.length + 'ddjdjfyydju')
             this.saveCount = 0
             this.addFile()
           }
@@ -207,7 +207,7 @@ export default {
         }
       })
     },
-    addFile() {
+    addFile () {
       this.$api.project.fileAdd(this.fileList).then(res => {
         if (res.code === 200) {
           this.show = false
@@ -219,9 +219,9 @@ export default {
         }
       })
     },
-    getFileList(item) {
+    getFileList (item) {
       this.currentRow = item
-      this.$api.project.fileList({folderId: item.fileFolderId}).then(res => {
+      this.$api.project.fileList({ folderId: item.fileFolderId }).then(res => {
         if (res.code === 200) {
           this.authorizeShow = true
           this.fileData = res.data
@@ -235,24 +235,25 @@ export default {
         }
       })
     },
-    initCode() {
+    initCode () {
       if (this.authorizeDate.length === 0) {
         this.$message.error('请设置授权时间')
         return
       }
       this.startTime = this.authorizeDate[0]
       this.endTime = this.authorizeDate[1]
+      console.log(this.fileData.records)
       const tmps = this.fileData.records.map(sub => {
-        const item = {fileId: sub.id, startTime: this.startTime, endTime: this.endTime, status: sub.type}
+        const item = { fileId: sub.id, startTime: this.startTime, endTime: this.endTime, status: sub.type }
         return item
       })
       const folder = [{
         folderId: this.currentRow.fileFolderId,
         startTime: this.startTime,
         endTime: this.endTime,
-        status: this.type
+        status: this.check
       }]
-      this.$api.project.initCode({files: tmps, folders: folder}).then(res => {
+      this.$api.project.initCode({ files: tmps, folders: folder }).then(res => {
         if (res.code === 200) {
           this.qrCodeText = 'https://dev.wutongresearch.club/apply?id=' + res.data.qrcode.qrcodeId
           this.qrCodeShow = true
@@ -261,7 +262,7 @@ export default {
         }
       })
     },
-    change(res) {
+    change (res) {
       this.fileData[res.index] = res
     }
   }

src/views/home/component/item1.vue

@@ -4,9 +4,9 @@
     <div class='flex-child-average'>{{item.updateTime}}</div>
     <div class='flex-child-average'>
       <el-radio-group v-model="check" @change='change'>
-        <el-radio label="3" size="large">不可见</el-radio>
+        <el-radio label="3" size="large">不可查看</el-radio>
         <el-radio label="1" size="large">可见</el-radio>
-        <el-radio label="2" size="large">可下载</el-radio>
+        <el-radio label="2" size="large">可编辑</el-radio>
       </el-radio-group>
     </div>
   </div>