From 4f831af675bf627f41c03c5bf4ab3f92cb7b7937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=B9?= <>
Date: Mon, 20 Jan 2025 18:46:38 +0800
Subject: [PATCH] .

---
 pages.json                   |  6 ++++--
 pages/mine/pwd/index.vue     | 15 ++++++++++++---
 pages/mine/setting/index.vue | 11 ++++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index 8a31606..ccc9986 100644
--- a/pages.json
+++ b/pages.json
@@ -118,12 +118,14 @@
 		}, {
 			"path": "pages/mine/pwd/index",
 			"style": {
-				"navigationBarTitleText": "修改密码"
+				"navigationBarTitleText": "修改密码",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/mine/setting/index",
 			"style": {
-				"navigationBarTitleText": "应用设置"
+				"navigationBarTitleText": "应用设置",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/mine/help/index",
diff --git a/pages/mine/pwd/index.vue b/pages/mine/pwd/index.vue
index 8246471..8f1893a 100644
--- a/pages/mine/pwd/index.vue
+++ b/pages/mine/pwd/index.vue
@@ -1,16 +1,24 @@
 <template>
+	<!-- 顶部导航栏 -->
+	<custom-nav-bar :left="true" leftText="" @leftClick="" title="修改密码">
+	</custom-nav-bar>
 	<view class="pwd-retrieve-container">
 		<uni-forms ref="form" :value="user" labelWidth="80px">
 			<!-- <uni-forms-item name="oldPassword" label="旧密码">
         <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
       </uni-forms-item> -->
-			<uni-forms-item name="newPassword" label="新密码">
+			<u-form-item label="新密码" prop="newPassword" labelWidth="100px" required>
+				<u--input type="password" v-model="user.newPassword" border="none" placeholder="请输入新密码"></u--input>
+			</u-form-item>
+			<u-line color="#D2D2D2"></u-line>
+			
+			<!-- <uni-forms-item name="newPassword" label="新密码">
 				<uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
-			</uni-forms-item>
+			</uni-forms-item> -->
 			<!-- <uni-forms-item name="confirmPassword" label="确认密码">
         <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
       </uni-forms-item> -->
-			<button type="primary" @click="submit">提交</button>
+			<u-button style="margin-top: 20%;" type="success" size="large" text="提交" @click="submit" />
 		</uni-forms>
 	</view>
 </template>
@@ -95,4 +103,5 @@
 		padding-top: 36rpx;
 		padding: 15px;
 	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue
index a9254ff..a7ac407 100644
--- a/pages/mine/setting/index.vue
+++ b/pages/mine/setting/index.vue
@@ -1,4 +1,7 @@
 <template>
+	<!-- 顶部导航栏 -->
+	<custom-nav-bar :left="true" leftText="" @leftClick="" title="应用设置">
+	</custom-nav-bar>
   <view class="setting-container" :style="{height: `${windowHeight}px`}">
     <view class="menu-list">
       <view class="list-cell list-cell-arrow" @click="handleToPwd">
@@ -21,10 +24,8 @@
       </view>
     </view>
     <view class="cu-list menu">
-      <view class="cu-item item-box">
-        <view class="content text-center" @click="handleLogout">
-          <text class="text-black">退出登录</text>
-        </view>
+      <view class="item-box">
+		  <u-button class="bg-red" type="success" size="large" text="退出登录"  @click="handleLogout"/>
       </view>
     </view>
   </view>
@@ -91,7 +92,7 @@
   }
 
   .item-box {
-    background-color: #FFFFFF;
+   
     margin: 30rpx;
     display: flex;
     flex-direction: row;