Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/home/component/folder_list.vue

src/assets/svg/folder/invisible.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="84" height="70" viewBox="0 0 84 70"><defs><style>.a,.h{fill:none;}.b{fill:#e9a956;}.c{fill:#3a78f2;}.d{fill:#d9e6ff;}.e{fill:#fff;}.f{fill:url(#a);}.g{fill:#fe6c6c;}.h{stroke:#fff;stroke-miterlimit:10;stroke-width:2px;}.i{stroke:none;}</style><linearGradient id="a" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#f9c98b"/><stop offset="1" stop-color="#ecab56"/></linearGradient></defs><g transform="translate(-733 -455)"><rect class="a" width="70" height="70" transform="translate(733 455)"/><g transform="translate(733 459.48)"><path class="b" d="M-946.836,46.816l-3.426-4.573A5.582,5.582,0,0,0-954.729,40h-20.159a5.626,5.626,0,0,0-5.6,5.651v46.3a5.6,5.6,0,0,0,5.557,5.651h58.886a5.6,5.6,0,0,0,5.556-5.651V52.467a5.6,5.6,0,0,0-5.556-5.651Z" transform="translate(980.488 -40)"/><path class="c" d="M0,0H61.786a0,0,0,0,1,0,0V26.861a6.41,6.41,0,0,1-6.41,6.41H6.41A6.41,6.41,0,0,1,0,26.861V0A0,0,0,0,1,0,0Z" transform="translate(65.893 46.421) rotate(180)"/><path class="d" d="M0,0H61.786a0,0,0,0,1,0,0V26.861a6.41,6.41,0,0,1-6.41,6.41H6.41A6.41,6.41,0,0,1,0,26.861V0A0,0,0,0,1,0,0Z" transform="translate(65.893 50.848) rotate(180)"/><path class="e" d="M0,0H61.786a0,0,0,0,1,0,0V26.861a6.41,6.41,0,0,1-6.41,6.41H6.41A6.41,6.41,0,0,1,0,26.861V0A0,0,0,0,1,0,0Z" transform="translate(65.893 55.001) rotate(180)"/><path class="f" d="M0,9H70V39.5a5.588,5.588,0,0,1-5.6,5.576H5.6A5.588,5.588,0,0,1,0,39.5Z" transform="translate(0 16.52)"/></g><circle class="g" cx="14" cy="14" r="14" transform="translate(789 493)"/><g transform="translate(1940.042 266)"><rect class="e" width="13" height="11" rx="2" transform="translate(-1143.042 238)"/><g class="h" transform="translate(-1141.042 232)"><rect class="i" width="9" height="14" rx="4.5"/><rect class="a" x="1" y="1" width="7" height="12" rx="3.5"/></g></g></g></svg>

src/views/home/component/folder_list.vue

@@ -10,7 +10,7 @@
         <span style="flex: 3">操作</span>
       </div>
       <el-empty v-if="folder && folder.length === 0" description="暂无数据"/>
-      <div v-for="item in folder" :key='item.id' v-else class="flex flex-center border-bottom padding content-sp">
+      <div v-for="item in folder" v-else class="flex flex-center border-bottom padding content-sp">
         <img class="icon" src="../../../assets/svg/folder/see.svg">
         <span style="flex:2">{{ item.folderName }}</span>
         <span style="flex: 1">{{ item.updateTime }}</span>