From 40b623e932978337216470b46b275d9e4c10583b Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Mon, 29 Nov 2021 17:12:47 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=96=B0=E5=A2=9E=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B4=A6=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20-=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E7=AD=BE=E5=88=B0=E4=B8=8D=E8=BF=9E?=
 =?UTF-8?q?=E7=BB=AD7=E5=A4=A9=EF=BC=8C=E4=B9=9F=E8=8E=B7=E5=BE=9760?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                  |  3 ++
 package.json                                  |  2 +-
 .../settings/deactivate/deactivate.vue        | 37 +++++++++++++++----
 uni_modules/uni-id-cf/changelog.md            |  2 +
 uni_modules/uni-id-cf/package.json            |  2 +-
 .../cloudfunctions/uni-id-cf/index.js         |  4 ++
 uni_modules/uni-sign-in/changelog.md          |  2 +
 uni_modules/uni-sign-in/package.json          |  2 +-
 .../cloudfunctions/common/sign-in/index.js    |  2 +-
 .../uni-clientDB-actions/signIn.js            |  2 +-
 10 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/changelog.md b/changelog.md
index 69f778c4..9575c32e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+## 1.1.24（2021-11-29）
+- 新增注销用户账号的功能
+- 修复在某些情况下，签到不连续7天，也获得60积分的问题
 ## 1.1.23（2021-11-20）
 - 使用`uni.getUniverifyManager`优化一键登陆中，点击第三方登陆的逻辑：未勾选隐私政策时，toast提醒并阻止了一键登陆界面的close
 - 新增支持看激励视频广告签到
diff --git a/package.json b/package.json
index 8fb97e9f..400a80b3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.1.23",
+	"version": "1.1.24",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
diff --git a/pages/ucenter/settings/deactivate/deactivate.vue b/pages/ucenter/settings/deactivate/deactivate.vue
index 8a23c54d..e88cf44b 100644
--- a/pages/ucenter/settings/deactivate/deactivate.vue
+++ b/pages/ucenter/settings/deactivate/deactivate.vue
@@ -22,6 +22,9 @@
 </template>
 
 <script>
+	import {
+		mapMutations
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -32,12 +35,11 @@
 			uni.setNavigationBarTitle({
 				title: this.$t('deactivate.navigationBarTitle')
 			})
-			uni.showModal({
-				content: '该功能暂未完全开发完成，敬请期待！',
-				showCancel: false
-			});
 		},
 		methods: {
+			...mapMutations({
+				logout: 'user/logout'
+			}),
 			cancel(){
 				uni.navigateBack()
 			},
@@ -46,10 +48,29 @@
 					content: '已经仔细阅读注销提示，知晓可能带来的后果，并确认要注销',
 					complete: (e) => {
 						if(e.confirm){
-							uni.showToast({
-								title: '该功能暂未开发完成',
-								icon: 'none'
-							});
+							uniCloud.callFunction({
+								name:'uni-id-cf',
+								data:{
+									"action":"closeAccount"
+								},
+								complete: (e) => {
+									console.log(e);
+									if(e.result.code === 0){
+										uni.showToast({
+											title: '注销成功'
+										});
+										this.logout();
+										uni.navigateTo({
+											url:"/pages/ucenter/login-page/index/index"
+										})
+									}else{
+										uni.showToast({
+											icon:'error',
+											title: e.result.errMsg
+										});
+									}
+								}
+							})
 						}else{
 							uni.navigateBack()
 						}
diff --git a/uni_modules/uni-id-cf/changelog.md b/uni_modules/uni-id-cf/changelog.md
index 0b22d646..634254e9 100644
--- a/uni_modules/uni-id-cf/changelog.md
+++ b/uni_modules/uni-id-cf/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.8（2021-11-29）
+新增	`closeAccount`注销账号
 ## 1.0.7（2021-10-20）
 新增bindMobileByMpWeixin，一键获取微信绑定的手机号
 ## 1.0.6（2021-09-23）
diff --git a/uni_modules/uni-id-cf/package.json b/uni_modules/uni-id-cf/package.json
index f376744e..21af924d 100644
--- a/uni_modules/uni-id-cf/package.json
+++ b/uni_modules/uni-id-cf/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-id-cf",
   "displayName": "uni-id-cf",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "uni-id-cf",
   "keywords": [
     "uni-id-cf",
diff --git a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
index 8c118468..fd9b97fc 100644
--- a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
+++ b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
@@ -443,6 +443,10 @@ exports.main = async (event, context) => {
 					uid: params.uid
 				})
 			}
+			break;
+		case 'closeAccount':
+			console.log(params.uid,'-----------------------');
+			res = await uniID.closeAccount({uid:params.uid});
 			break;
 
 			// =========================== admin api start =========================
diff --git a/uni_modules/uni-sign-in/changelog.md b/uni_modules/uni-sign-in/changelog.md
index f0e4087d..d390a4e0 100644
--- a/uni_modules/uni-sign-in/changelog.md
+++ b/uni_modules/uni-sign-in/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.4（2021-11-29）
+修复在某些情况下，签到不连续7天，也获得60积分的问题
 ## 1.0.3（2021-11-20）
 新增支持看激励视频广告签到
 ## 1.0.2（2021-08-25）
diff --git a/uni_modules/uni-sign-in/package.json b/uni_modules/uni-sign-in/package.json
index 28d0116b..e3b767e8 100644
--- a/uni_modules/uni-sign-in/package.json
+++ b/uni_modules/uni-sign-in/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-sign-in",
   "displayName": "签到插件 - 提升用户粘性，流量变现",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "培养用户习惯，提升用户粘性，支持广告流量变现的签到得积分功能",
   "keywords": [
     "uni-sign-in",
diff --git a/uni_modules/uni-sign-in/uniCloud/cloudfunctions/common/sign-in/index.js b/uni_modules/uni-sign-in/uniCloud/cloudfunctions/common/sign-in/index.js
index 14991e43..6cc645fc 100644
--- a/uni_modules/uni-sign-in/uniCloud/cloudfunctions/common/sign-in/index.js
+++ b/uni_modules/uni-sign-in/uniCloud/cloudfunctions/common/sign-in/index.js
@@ -74,7 +74,7 @@ module.exports = async function({user_id,ip}) {
 		});
 	}
 	//给加积分
-	let score = n == 7 ? 60 : 10 //如果是第七天就多加50分，也就是60分
+	let score = n+days.length==14?60:10 //如果连续签到7天就多加50分，也就是60分
 	balance += score
 	let addScores = await scoresTable.add({
 		user_id,
diff --git a/uni_modules/uni-sign-in/uniCloud/cloudfunctions/uni-clientDB-actions/signIn.js b/uni_modules/uni-sign-in/uniCloud/cloudfunctions/uni-clientDB-actions/signIn.js
index 0bd8ad53..adf56bc3 100644
--- a/uni_modules/uni-sign-in/uniCloud/cloudfunctions/uni-clientDB-actions/signIn.js
+++ b/uni_modules/uni-sign-in/uniCloud/cloudfunctions/uni-clientDB-actions/signIn.js
@@ -62,7 +62,7 @@ module.exports = {
 				console.log({setIsDeleteRes});
 			}
 			//给加积分
-			let score = n==7?60:10 //如果是第七天就多加50分，也就是60分
+			let score = n+days.length==14?60:10 //如果连续签到7天就多加50分，也就是60分
 			balance += score
 			let addScores = await scoresTable.add({
 				user_id:state.auth.uid,
-- 
GitLab