From 844d4974d6c293c81b7c2eb8c25ae3754b42056e Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Mon, 13 Mar 2023 09:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidPrivacy.json |  2 +-
 manifest.json       |  7 ++++---
 pages/my/my.vue     | 22 ++++++++++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/androidPrivacy.json b/androidPrivacy.json
index 4608ecb..31d7da1 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,5 +1,5 @@
 {
-    "version" : "6",
+    "version" : "7",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
     "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"http://lxwx.h5.njrenzhou.cn/#/pages/my/richText?id=1\">《用户协议》</a>和<a href=\"http://lxwx.h5.njrenzhou.cn/#/pages/my/richText?id=2\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
diff --git a/manifest.json b/manifest.json
index ae04fb3..c68bf98 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "留学万象",
     "appid" : "__UNI__CF90E01",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "2.0.0",
+    "versionCode" : 200,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -55,7 +55,8 @@
                     "NSPhotoLibraryUsageDescription" : "修改头像功能",
                     "NSCameraUsageDescription" : "修改头像功能支持拍照"
                 },
-                "dSYMs" : false
+                "dSYMs" : false,
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 85d8e31..55a3008 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -41,7 +41,12 @@
 				</view>
 			</view>
 		</view>
-		<view class="codeBtn" @click="layoutHandle" color="#0076F6" v-if="isLogin">退出登录</view>
+		<!--  -->
+		<view style="display:flex" v-if="isLogin">
+			<view class="codeBtn" @click="layoutHandle" color="#0076F6" >退出登录</view>
+			<view class="codeBtn" @click="existHandle" color="#0076F6" >注销账户</view>
+		</view>
+		<u-modal :show="show" title="提示" confirmText="关闭" :content='content' @confirm="confirmHandle"></u-modal>
 	</view>
 </view>
 </template>
@@ -53,6 +58,7 @@
 	export default {
 		data() {
 			return {
+				show:false,
 				myList:[
 					{pic:require("static/m1.png"),title:'我的收藏'},
 					{pic:require("static/m2.png"),title:'浏览历史'},
@@ -62,15 +68,22 @@
 				src:require("static/avatar.png"),
 				userInfo:{},
 				isLogin:false,
-				source:'phone'
+				source:'phone',
+				content:'正在审核中……'
 			};
 		},
 		methods:{
+			confirmHandle(){
+				this.show=false
+			},
 			goEditInfo(){
 				uni.navigateTo({
 					url:'/pages/my/editInfo'
 				})
 			},
+			existHandle(){
+				this.show=true
+			},
 			goDetails(item){
 				if(item.title=='设置'){
 					uni.navigateTo({
@@ -217,8 +230,9 @@
 		}
 	}
 	.codeBtn{
-		width:80%;
-		margin:50upx auto 0 auto;
+		// width:80%;
+		flex:1;
+		margin:50upx 20upx;
 		background: #0076F6;
 		border-radius: 50upx;
 		font-size: 30upx;