From c589bfe63198b23437331992a405f830ca2fa43c Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 24 Feb 2022 14:28:01 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9A=20-=20=E4=BF=AE=E5=A4=8D=E5=BD=93?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=9C=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=AA=8C=E8=AF=81=E7=A0=81=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BE=AE=E4=BF=A1=E7=99=BB=E9=99=86=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E2=80=9C=E4=BD=A0=E6=9C=AA=E5=90=8C=E6=84=8F=E9=9A=90?=
 =?UTF-8?q?=E7=A7=81=E6=94=BF=E7=AD=96=E5=8D=8F=E8=AE=AE=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                  |   3 +
 common/appInit.js                             |   5 +
 components/refreshBox/refreshBox.nvue         |   2 +-
 manifest.json                                 |   8 +-
 package.json                                  |   2 +-
 .../login-page/phone-code/phone-code.vue      |   4 +-
 .../opendb-news-articles-detail.schema.json   | 122 ------------------
 7 files changed, 14 insertions(+), 132 deletions(-)
 delete mode 100644 uniCloud-aliyun/database/opendb-news-articles-detail.schema.json

diff --git a/changelog.md b/changelog.md
index 5a38725..58e7f25 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+## 1.1.32（2022-02-24）
+- 删除多余文件：`uniCloud/database/opendb-news-articles-detail.schema.json`
+- 修复当用户选择验证码登陆方式，在输入验证码页面，点击微信登陆时报“你未同意隐私政策协议”的问题
 ## 1.1.31（2022-02-16）
 修复微信小程序端，修改绑定的手机号码时表单验证不正常的问题
 ## 1.1.30（2022-01-26）
diff --git a/common/appInit.js b/common/appInit.js
index ffddd6e..88ec09d 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -183,6 +183,11 @@ export default async function() {
 						},
 						fail() {
 							callBack(false)
+						},
+						complete(){
+							// #ifdef MP-WEIXIN
+							uni.hideToast()
+							// #endif
 						}
 					});
 				})
diff --git a/components/refreshBox/refreshBox.nvue b/components/refreshBox/refreshBox.nvue
index f41c25c..1165d06 100644
--- a/components/refreshBox/refreshBox.nvue
+++ b/components/refreshBox/refreshBox.nvue
@@ -23,7 +23,7 @@
 				}
 			},
 			refresh(){
-				console.log('refresh');
+				// console.log('refresh');
 				this.showRefresh = true
 				this.state = 2
 				this.$emit('refresh')
diff --git a/manifest.json b/manifest.json
index 882d35b..00e10a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,9 +59,9 @@
       },
       "Geolocation": {
       },
-      "Push": {
-      },
       "Bluetooth": {
+      },
+      "Push": {
       }
     },
     "distribute": {
@@ -112,10 +112,6 @@
           }
         },
         "ad": {
-          "gdt": {
-          },
-          "csj": {
-          }
         },
         "share": {
           "weixin": {
diff --git a/package.json b/package.json
index 0c11b19..0ae89b2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.1.31",
+	"version": "1.1.32",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue
index aca1de5..163011c 100644
--- a/pages/ucenter/login-page/phone-code/phone-code.vue
+++ b/pages/ucenter/login-page/phone-code/phone-code.vue
@@ -13,8 +13,8 @@
 			</uni-easyinput>
 			<button class="send-btn" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
 				@click="submit">{{$t('common.login')}}</button>
-		</uni-forms>
-		<uni-quick-login></uni-quick-login>
+		</uni-forms>
+		<uni-quick-login agree></uni-quick-login>
 	</view>
 </template>
 <script>
diff --git a/uniCloud-aliyun/database/opendb-news-articles-detail.schema.json b/uniCloud-aliyun/database/opendb-news-articles-detail.schema.json
deleted file mode 100644
index 9207107..0000000
--- a/uniCloud-aliyun/database/opendb-news-articles-detail.schema.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-	"bsonType": "object",
-	"permission": {
-		"create": "auth.uid != null",
-		"delete": "doc.user_id == auth.uid",
-		"read": true,
-		"update": "doc.user_id == auth.uid"
-	},
-	"properties": {
-		"_id": {
-			"description": "存储文档 ID（用户 ID），系统自动生成"
-		},
-		"article_status": {
-			"bsonType": "int",
-			"description": "文章状态：0 草稿箱 1 已发布",
-			"maximum": 1,
-			"minimum": 0
-		},
-		"avatar": {
-			"bsonType": "string",
-			"description": "缩略图地址",
-			"label": "封面大图"
-		},
-		"category_id": {
-			"bsonType": "string",
-			"description": "分类 id，参考`uni-news-categories`表"
-		},
-		"comment_count": {
-			"bsonType": "int",
-			"description": "评论数量",
-			"permission": {
-				"write": false
-			}
-		},
-		"comment_status": {
-			"bsonType": "int",
-			"description": "评论状态：0 关闭  1 开放",
-			"maximum": 1,
-			"minimum": 0
-		},
-		"content": {
-			"bsonType": "string",
-			"description": "文章内容",
-			"label": "文章内容"
-		},
-		"excerpt": {
-			"bsonType": "string",
-			"description": "文章摘录",
-			"label": "摘要"
-		},
-		"is_essence": {
-			"bsonType": "bool",
-			"description": "阅读加精",
-			"permission": {
-				"write": false
-			}
-		},
-		"is_sticky": {
-			"bsonType": "bool",
-			"description": "是否置顶",
-			"permission": {
-				"write": false
-			}
-		},
-		"last_comment_user_id": {
-			"bsonType": "string",
-			"description": "最后回复用户 id，参考`uni-id-users` 表"
-		},
-		"last_modify_date": {
-			"bsonType": "timestamp",
-			"description": "最后修改时间"
-		},
-		"last_modify_ip": {
-			"bsonType": "string",
-			"description": "最后修改时 IP 地址"
-		},
-		"like_count": {
-			"bsonType": "int",
-			"description": "喜欢数、点赞数",
-			"permission": {
-				"write": false
-			}
-		},
-		"mode": {
-			"bsonType": "number",
-			"description": "排版显示模式"
-		},
-		"publish_date": {
-			"bsonType": "timestamp",
-			"defaultValue": {
-				"$env": "now"
-			},
-			"description": "发表时间"
-		},
-		"publish_ip": {
-			"bsonType": "string",
-			"description": "发表时 IP 地址",
-			"forceDefaultValue": {
-				"$env": "clientIP"
-			}
-		},
-		"title": {
-			"bsonType": "string",
-			"description": "标题",
-			"label": "标题"
-		},
-		"user_id": {
-			"bsonType": "string",
-			"description": "文章作者ID， 参考`uni-id-users` 表"
-		},
-		"view_count": {
-			"bsonType": "int",
-			"description": "阅读数量",
-			"permission": {
-				"write": false
-			}
-		}
-	},
-	"required": ["user_id", "title", "content", "article_status", "view_count", "like_count", "is_sticky", "is_essence",
-		"comment_status", "comment_count", "mode"
-	]
-}
-- 
GitLab