Merge branch 'develop_lyb' into develop

src/components/sideMenu.vue

@@ -100,7 +100,7 @@ export default {
 
 <template>
   <div class=" flex flex-col justify-between h-100vh">
-    <div class="aside">
+    <div class="aside !pb-50px">
       <div class="user-info">
         <div class="head-photo"><p>{{ userName | avant() }}</p></div>
         <div class="info">
@@ -152,7 +152,7 @@ export default {
         </el-menu-item>
       </el-menu>
     </div>
-    <div @click="logout()" class="py-10px w-full bg-[#F6F7F9] flex items-center cursor-pointer"><Logout class="ml-27px" /><span class="ml-11px text-14px text-[#232A40] font-bold">Log out</span></div>
+    <div @click="logout()" class="py-10px w-243px bg-[#F6F7F9] flex items-center cursor-pointer fixed bottom-0"><Logout class="ml-27px" /><span class="ml-11px text-14px text-[#232A40] font-bold">Log out</span></div>
   </div>
 </template>
 

src/views/Device.vue

@@ -221,7 +221,7 @@ export default {
         </select>
         <select v-model="status" class="w-140px ml-16px" :class="{ '!text-[#232A40]': status !== '' }">
           <option value="" selected>Staus</option>
-          <option value="0" selected>Unactivated</option>
+          <!-- <option value="0" selected>Unactivated</option> -->
           <option value="1" selected>Ativated</option>
           <option value="5" selected>Canceled</option>
           <option value="4" selected>Expired</option>

src/views/TeamManagement/ManageMember/AddManageMember.vue

@@ -78,10 +78,16 @@ export default {
           if(res.data.code === 200){
             this.$message({
               duration: 5000,
-              message: 'Add Success!',
+              message: 'Add Successfully',
               type: "success",
             })
             this.$router.push({name:'ManageMember'})
+          }else{
+            this.$message({
+              duration: 5000,
+              message: 'Add Failed',
+              type: "error",
+            })
           }
         })
       }

src/views/VolumeCancel.vue

@@ -32,7 +32,13 @@ export default {
             message: 'Cancel Successfully',
             type: "success",
           })
-          $this.$router.push({ name: 'licenseManage' })
+          this.$router.push({ name: 'licenseManage' })
+        } else{
+          this.$message({
+            duration: 5000,
+            message: 'Cancel Failed',
+            type: "error",
+          })
         }
       })
     },