From 67ee898c5aa4ca69b27c787662da8bbacdd55864 Mon Sep 17 00:00:00 2001
From: JING <leirance@live.com>
Date: Thu, 18 Jul 2024 18:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |  3 ++-
 pages/user/account/logout.vue | 48 +++++++++++++++++++++++++++++++----
 pages/user/index.vue          |  9 +++++++
 uni.scss                      | 10 ++++++++
 4 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/pages.json b/pages.json
index 5a9a75f..c321ea0 100644
--- a/pages.json
+++ b/pages.json
@@ -68,7 +68,8 @@
         	"path" : "pages/user/account/logout",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "注销账号"
+        		"navigationBarTitleText" : "注销账号",
+				"navigationStyle": "custom"
         	}
         }
        
diff --git a/pages/user/account/logout.vue b/pages/user/account/logout.vue
index 3256662..0d919b6 100644
--- a/pages/user/account/logout.vue
+++ b/pages/user/account/logout.vue
@@ -1,5 +1,34 @@
 <template>
 	<view class="container">
+		 <u-navbar
+		            leftText="返回"
+		            :title="title"
+					:placeholder="true"
+					:autoBack="true"
+					bgColor="transparent"
+		        >
+		            <view
+		                class="u-nav-slot"
+		                slot="left"
+		            >
+		                <u-icon
+		                    name="arrow-left"
+		                    size="19"
+							color="#000000"
+		                ></u-icon>
+		                <u-line
+		                    direction="column"
+		                    :hairline="false"
+		                    length="16"
+		                    margin="0 8px"
+		                ></u-line>
+		                <u-icon
+		                    name="home"
+		                    size="20"
+							color="#000000"
+		                ></u-icon>
+		            </view>
+		</u-navbar>
 		<u-parse :content="content" :tagStyle="style"></u-parse>
 		
 		<view class="btnBox" @click="logout">
@@ -15,8 +44,8 @@
 							是否确认注销账号？
 						</view>
 						<view class="popupBtn">
-							<view class="sbtnBox a1">取消</view>
-							<view class="sbtnBox a2">确认</view>
+							<view class="sbtnBox a1" @click="close">取消</view>
+							<view class="sbtnBox a2" @click="yes">确认</view>
 						</view>
 		            </view>
 		</u-popup>
@@ -27,6 +56,7 @@
 	export default {
 		data() {
 			return {
+				
 				content: `<h3>你正在申请注销合成照相馆的账号</h3>
 						 <p>1.账户注销后该账户账户下的全部数据将被删除，包括但不限于面部档案，写真等</p>
 						 <p>2.正在创建或已付费但未生成完毕的内容，都将马上停止并销毁。</p>
@@ -39,7 +69,8 @@
 							span: 'font-size: 24rpx'
 					 },
 				//弹窗
-				show: false,	
+				show: false,
+				title:"注销账号",
 			}
 		},
 		methods: {
@@ -54,12 +85,18 @@
 			   this.show = false;
 
 			},
+			yes(){
+				this.close();
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
-.container{padding: 20rpx 20rpx; height: auto; background-color: #F5F6FB;}
+page{
+			background: linear-gradient( 180deg, #D1DAFF 0%, rgba(209,218,255,0.6) 46%, rgba(254,254,255,0) 100%);
+}
+.container{padding: 20rpx 20rpx; height: auto;}
 .btnBox{
 	width: 400rpx;
 	height: 88rpx;
@@ -82,7 +119,7 @@
 .popupTop{
 	width: 600rpx;
 	height: 140rpx;
-	background: linear-gradient(to bottom, #D3D5FF 30%, #FFFFFF 70%);
+	background: linear-gradient(to bottom, #D3D5FF 20%, #FFFFFF 50%);
 	border-radius: 24rpx 24rpx 0rpx 0rpx;
 	line-height: 140rpx;
 	text-align: center;
@@ -113,6 +150,7 @@
 	border: 2rpx solid #4D94FF;
 	text-align: center;
 	border-radius: 44rpx;
+	
 }
 
 .a1{
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 14b6695..f25a279 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,5 +1,14 @@
 <template>
 	<view>
+	<!-- 	<u-navbar
+		            leftText="返回"
+		            title="个人中心"
+					:placeholder="true"
+					:autoBack="true"
+					bgColor="transparent"
+		        >
+		            <view slot="left"> </view>
+		</u-navbar> -->
 		<view class="header">
 			<image class='background' src="/static/img/user/topbg.png" mode="aspectFill"></image>
 			<view class="userInfo">
diff --git a/uni.scss b/uni.scss
index 7cb2f8b..b2420da 100644
--- a/uni.scss
+++ b/uni.scss
@@ -76,3 +76,13 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
 
 page{background-color: #F5F6FB;}
+.u-nav-slot {
+		display:flex;
+		align-items: center;
+		justify-content: space-between;
+		border: 1rpx solid #dadbde;
+		border-radius: 200rpx;
+		padding: 6rpx 14rpx;
+		opacity: 0.8;
+		background-color: #FFFFFF;
+	}