From fb0656fe14b38aba053c1267042c82fecb89bd4e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 28 Mar 2025 23:15:14 +0800
Subject: [PATCH] update code

---
 pages/index.vue              |  9 +--------
 pages/login.vue              |  8 ++++----
 pages/mine/about/index.vue   |  4 ++--
 pages/mine/avatar/index.vue  | 27 +++++++--------------------
 pages/mine/index.vue         | 11 +----------
 pages/mine/info/edit.vue     |  2 +-
 pages/mine/pwd/index.vue     |  2 +-
 pages/mine/setting/index.vue |  2 +-
 pages/register.vue           | 11 ++---------
 pages/work/index.vue         |  3 +--
 plugins/modal.js             |  6 +++++-
 11 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 63e6dce..791e848 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -7,14 +7,7 @@
   </view>
 </template>
 
-<script>
-  export default {
-    onLoad: function() {
-    }
-  }
-</script>
-
-<style>
+<style scoped>
   .content {
     display: flex;
     flex-direction: column;
diff --git a/pages/login.vue b/pages/login.vue
index 2c86fcc..7ca13c3 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -53,7 +53,7 @@
           username: "admin",
           password: "admin123",
           code: "",
-          uuid: ''
+          uuid: ""
         }
       }
     },
@@ -88,9 +88,9 @@
       // 登录方法
       async handleLogin() {
         if (this.loginForm.username === "") {
-          this.$modal.msgError("请输入您的账号")
+          this.$modal.msgError("请输入账号")
         } else if (this.loginForm.password === "") {
-          this.$modal.msgError("请输入您的密码")
+          this.$modal.msgError("请输入密码")
         } else if (this.loginForm.code === "" && this.captchaEnabled) {
           this.$modal.msgError("请输入验证码")
         } else {
@@ -120,7 +120,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #ffffff;
   }
diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue
index c782762..baffb0d 100644
--- a/pages/mine/about/index.vue
+++ b/pages/mine/about/index.vue
@@ -38,7 +38,7 @@
     </view>
 
     <view class="copyright">
-      <view>Copyright &copy; 2022 ruoyi.vip All Rights Reserved.</view>
+      <view>Copyright &copy; 2025 ruoyi.vip All Rights Reserved.</view>
     </view>
   </view>
 </template>
@@ -54,7 +54,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #f8f8f8;
   }
diff --git a/pages/mine/avatar/index.vue b/pages/mine/avatar/index.vue
index fc69473..75848b0 100644
--- a/pages/mine/avatar/index.vue
+++ b/pages/mine/avatar/index.vue
@@ -332,20 +332,7 @@
 	}
 </script>
 
-<style>
-	/* pages/uni-cropper/index.wxss */
-
-	.uni-content-info {
-		/* position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		display: block;
-		align-items: center;
-		flex-direction: column; */
-	}
-
+<style scoped>
 	.cropper-config {
 		padding: 20rpx 40rpx;
 	}
@@ -382,8 +369,8 @@
 		image-orientation: 0deg !important;
 		margin: 0 auto;
 	}
-	/* 移动图片效果 */
 
+	/* 移动图片效果 */
 	.uni-cropper-drag-box {
 		position: absolute;
 		top: 0;
@@ -394,8 +381,8 @@
 		background: rgba(0, 0, 0, 0.6);
 		z-index: 1;
 	}
-	/* 内部的信息 */
 
+	/* 内部的信息 */
 	.uni-corpper-crop-box {
 		position: absolute;
 		background: rgba(255, 255, 255, 0.3);
@@ -411,8 +398,8 @@
 		outline: 1rpx solid #69f;
 		outline-color: rgba(102, 153, 255, .75)
 	}
-	/* 横向虚线 */
 
+	/* 横向虚线 */
 	.uni-cropper-dashed-h {
 		position: absolute;
 		top: 33.33333333%;
@@ -422,8 +409,8 @@
 		border-top: 1rpx dashed rgba(255, 255, 255, 0.5);
 		border-bottom: 1rpx dashed rgba(255, 255, 255, 0.5);
 	}
-	/* 纵向虚线 */
 
+	/* 纵向虚线 */
 	.uni-cropper-dashed-v {
 		position: absolute;
 		left: 33.33333333%;
@@ -433,8 +420,8 @@
 		border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
 		border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
 	}
-	/* 四个方向的线  为了之后的拖动事件*/
 
+	/* 四个方向的线  为了之后的拖动事件*/
 	.uni-cropper-line-t {
 		position: absolute;
 		display: block;
@@ -615,8 +602,8 @@
 		margin-top: -3rpx;
 		cursor: n-resize;
 	}
-	/* 裁剪框预览内容 */
 
+	/* 裁剪框预览内容 */
 	.uni-cropper-viewer {
 		position: relative;
 		width: 100%;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index c4b75b6..0ba4a59 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -77,8 +77,6 @@
 </template>
 
 <script>
-  import storage from '@/utils/storage'
-  
   export default {
     data() {
       return {
@@ -110,13 +108,6 @@
       handleToAvatar() {
         this.$tab.navigateTo('/pages/mine/avatar/index')
       },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index')
-          })
-        })
-      },
       handleHelp() {
         this.$tab.navigateTo('/pages/mine/help/index')
       },
@@ -133,7 +124,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #f5f6f7;
   }
diff --git a/pages/mine/info/edit.vue b/pages/mine/info/edit.vue
index 6b28e1d..2b4240b 100644
--- a/pages/mine/info/edit.vue
+++ b/pages/mine/info/edit.vue
@@ -91,7 +91,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #ffffff;
   }
diff --git a/pages/mine/pwd/index.vue b/pages/mine/pwd/index.vue
index 9b96230..766416f 100644
--- a/pages/mine/pwd/index.vue
+++ b/pages/mine/pwd/index.vue
@@ -73,7 +73,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #ffffff;
   }
diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue
index a005d8e..6f31200 100644
--- a/pages/mine/setting/index.vue
+++ b/pages/mine/setting/index.vue
@@ -49,7 +49,7 @@
       },
       handleLogout() {
         this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
+          this.$store.dispatch('LogOut').then(() => {}).finally(()=>{
             this.$tab.reLaunch('/pages/index')
           })
         })
diff --git a/pages/register.vue b/pages/register.vue
index 61e6d5c..52760fe 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -49,7 +49,7 @@
           password: "",
           confirmPassword: "",
           code: "",
-          uuid: ''
+          uuid: ""
         }
       }
     },
@@ -106,19 +106,12 @@
             this.getCode()
           }
         })
-      },
-      // 注册成功后，处理函数
-      registerSuccess(result) {
-        // 设置用户信息
-        this.$store.dispatch('GetInfo').then(res => {
-          this.$tab.reLaunch('/pages/index')
-        })
       }
     }
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   page {
     background-color: #ffffff;
   }
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 225be97..fed7f1d 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -106,7 +106,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   /* #ifndef APP-NVUE */
   page {
     display: flex;
@@ -121,7 +121,6 @@
     font-size: 14px;
     line-height: inherit;
   }
-
   /* #endif */
 
   .text {
diff --git a/plugins/modal.js b/plugins/modal.js
index ae8cae8..eb0825b 100644
--- a/plugins/modal.js
+++ b/plugins/modal.js
@@ -69,6 +69,10 @@ export default {
   },
   // 关闭遮罩层
   closeLoading() {
-    uni.hideLoading()
+    try {
+        uni.hideLoading()
+    } catch (e) {
+        console.log(e)
+    }
   }
 }