合并分支 'yan' 到 'master'

Yan



查看合并请求 !7

@@ -15,6 +15,7 @@
 		},
 		onLoad(e) {
 			this.type = e.type
+			wx.setNavigationBarTitle({ title: e.type==1?'用户协议':e.type==2?'隐私政策':'' })
 			this.getAgreement()
 		},
 		methods: {

@@ -119,6 +119,7 @@
 			async confirmCancel(){
 				  try {
 				    const res = await logotLogin()
+					this.showCancel =false
 					setTimeout(()=>{
 						toa.success('退出成功')
 					},200)