From 2b06902e25978254f39bef49ed3cf6b1cab1c033 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 26 七月 2024 11:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/changePassword/changePassword.vue |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index 61a81bc..9489408 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -16,7 +16,7 @@
               font-family: cursive;
               font-weight: bold;
             "
-            >涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text
+            >涓浗鍘嗕唬鍖诲浜虹墿鐭ヨ瘑搴�</text
           >
         </view>
         <view></view>
@@ -30,21 +30,24 @@
             justify-content: space-between;
             margin-bottom: 0.47rem;
             align-items: center;
+            padding-top: 0.6rem;
           "
         >
           <!-- <view  style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
           <view class="LoginBg"></view>
           <view
-            
             @click="BacktoLogin"
             style="
               cursor: pointer;
               font-size: 0.14rem;
               color: #244a7b;
               font-weight: normal;
+              position: absolute;
+              left: 0.1rem;
+              top: 0.1rem;
             "
           >
-            杩斿洖
+            < 杩斿洖
           </view>
         </view>
         <el-form
@@ -230,25 +233,29 @@
       // 涔︾睄鏁版嵁
       listData: [
         {
-          name: "涓尰浜虹墿鏁版嵁搴�",
+          name: "鍘嗕唬浜虹墿",
           id: 1
         },
         {
-          name: "涓栧尰鍖诲鏁版嵁搴�",
+          name: "瀹跺浼犳壙",
           id: 2
         },
         {
-          name: "涓尰瀛︽湳娴佹淳",
+          name: "瀛︽湳鍥捐氨",
+          id: 6
+        },
+        {
+          name: "瀛︽湳娴佹淳",
           id: 3
         },
         {
-          name: "涓尰鍦板煙鍖昏氨",
+          name: "鍦板煙鍥捐氨",
           id: 4
         },
-        {
-          name: "涓尰鍖讳簨鍒跺害",
-          id: 5
-        }
+        // {
+        //   name: "涓尰鍖讳簨鍒跺害",
+        //   id: 5
+        // }
       ]
     };
   },
@@ -264,12 +271,8 @@
     this.getElementWidth();
   },
   methods: {
-    // 杩斿洖鐧诲綍
     BacktoLogin() {
-      // uni.redirectTo({
-      // 	url: '/pages/Login/Login'
-      // })
-      uni.navigateBack();
+      this.$router.go(-1);
     },
     getElementWidth() {
       this.$nextTick(() => {
@@ -278,26 +281,25 @@
       });
     },
     // 蹇樿瀵嗙爜
-    async Login2(formName) {
+    Login2(formName) {
       let Obj = {
         username: this.amendDataPass.loginID,
         password: encryptAES(this.amendDataPass.rawPass),
         newPassword: encryptAES(this.amendDataPass.newPass)
       };
-      this.$refs[formName].validate(async (valid) => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           // alert('submit!鎴愬姛');
           getchangePassword(Obj).then((res) => {
             if (res.success == true) {
               this.$message.success('淇敼鎴愬姛');
-              uni.navigateBack();
+              uni.navigateTo({
+                url: "/pages/Login/Login"
+              });
             } else {
               this.$message.error(res.errorText);
             }
           });
-          // uni.redirectTo({ encryptAES
-          // 	url: '/pages/Login/Login'
-          // })
         } else {
           console.log("error submit!!澶辫触");
           return false;

--
Gitblit v1.9.1