调整一键登录自定义授权页以及隐私协议页面

(cherry picked from commit 9a6056d7)

pages/API/get-univerify-manager/full-webview-page.uvue

 <template>
-	<view class="background">
-		<view class="container">
-      <view class="nav">
-        <text class="left_icon" @click="onBack()">{{backIcon}}</text>
-      </view>
-			<web-view class="web_container" :src="url"></web-view>
-		</view>
-	</view>
+  <view class="background">
+    <view class="container">
+      <view class="nav">
+        <view class="left_content">
+          <text class="left_icon" @click="onBack()">{{backIcon}}</text>
+        </view>
+
+        <view class="title_content">
+          <text class="title">{{title}}</text>
+        </view>
+
+      </view>
+      <web-view class="web_container" :src="url"></web-view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				url: '',
-        backIcon:'\ue601'
-			}
-		},
-		onLoad(options : OnLoadOptions) {
-			this.url = options["url"] as string;
-		},
-		methods: {
-			onBack(){
-        console.log('click onback');
-				uni.closeDialogPage({
-				  dialogPage: this.$page,
-				  animationType:'slide-out-right',
-				  success(res) {
-				    console.log('closeThisDialog success', res)
-				  },
-				  fail(err) {
-				    console.log('closeThisDialog fail', err)
-				  }
-				})
-			}
-		}
-	}
+  export default {
+    data() {
+      return {
+        url: '',
+        title: '',
+        animationType: 'slide-out-bottom',
+        backIcon: '\ue601'
+      }
+    },
+    onLoad(options : OnLoadOptions) {
+      this.url = options["url"] as string;
+      this.title = options["title"] as string;
+      this.animationType = options["animationType"] as string;
+    },
+    methods: {
+      onBack() {
+        uni.closeDialogPage({
+          dialogPage: this.$page,
+          animationType: this.animationType,
+          success(res) {
+            console.log('closeThisDialog success', res)
+          },
+          fail(err) {
+            console.log('closeThisDialog fail', err)
+          }
+        })
+      }
+    }
+  }
 </script>
 
 <style>
-	.background {
+  .background {
     background-color: #007aff;
-		width: 100%;
-		height: 100%;
-	}
-  .nav{
-    height: 45px;
-    width: 100%;
-    position: relative;
-    flex-direction: row;
-    justify-content: space-between;
-    height: 45px;
-  }
-  .left_icon{
+    width: 100%;
+    height: 100%;
+  }
+
+  .nav {
+    height: 45px;
+    width: 100%;
+    position: relative;
+    flex-direction: row;
+    justify-content: space-between;
+    height: 45px;
+  }
+
+  .left_content {
+    justify-content: center;
+    align-items: center;
+    width: 40px;
+    height: 100%;
+  }
+
+  .left_icon {
+    color: white;
+    top: 5px;
+    height: 100%;
+    font-family: uni-icon;
+    font-size: 26px;
+  }
+
+  .title_content {
+    position: absolute;
+    height: 100%;
+    top: 0;
+    bottom: 0;
+    left: 45px;
+    right: 45px;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .title {
     color: white;
-    top: 5px;
-    left: 15px;
-    justify-content: center;
-    align-items: center;
-    width: 40px;
-    height: 100%;
-    font-family: uni-icon;
-    font-size: 26px;
+    font-size: 17px;
+  }
+
+  .container {
+    padding-top: var(--status-bar-height);
+    width: 100%;
+    position: absolute;
+    height: 100%;
   }
-	.container{
-    padding-top: var(--status-bar-height);
-    width: 100%;
-    position: absolute;
-    height: 100%;
-	}
-	.web_container{
-    background-color: #f1f1f1;
-    padding-top: 10px;
-		flex: 1;
-		width: 100%;
-	}
 
+  .web_container {
+    background-color: #f1f1f1;
+    padding-top: 10px;
+    flex: 1;
+    width: 100%;
+  }
 </style>

pages/API/get-univerify-manager/univerify-custom-page.uvue

@@ -9,7 +9,7 @@
       </view>
       <button id="login-button" class="login-button" @click="loginIn">本机号码一键登录</button>
       <view class="privacy">
-        <checkbox id="privacy-checkbox" class="privacy-checkbox" ref="privacy-checkbox" :checked="true"></checkbox>
+        <checkbox id="privacy-checkbox" class="privacy-checkbox" ref="privacy-checkbox" :checked="false"></checkbox>
         <text class="privacy-normal-text">登录即同意</text>
         <text id="privacy-text" class="privacy-text" @click="openLink">{{privacyName}}</text>
       </view>
@@ -51,10 +51,10 @@
         })
       },
       openLink() {
-        let url = '/pages/API/get-univerify-manager/full-webview-page?url=' + this.privacyUrl;
+        let url = '/pages/API/get-univerify-manager/full-webview-page?url=' + this.privacyUrl + '&title=' + this.privacyName + '&animationType=slide-out-bottom';
         uni.openDialogPage({
           url: url,
-          animationType: 'slide-in-right',
+          animationType: 'slide-in-bottom',
           success(res) {
             console.log("打开隐私协议");
           },
@@ -81,14 +81,19 @@
             console.log(res);
             this.takePhoneNumber(res.accessToken, res.openId);
           },
-          fail: (error : LoginFail) => {
-            console.error("login fail => " + error);
+          fail: (error : LoginFail) => {
             if (error.errCode == 40001){
               uni.showToast({
               	title:"请同意服务条款",
                 icon:'none',
               	duration:2000
               })
+            }else if(error.errCode == 40002){
+              uni.showToast({
+              	title:"授权页不符合规范",
+                icon:'none',
+              	duration:2000
+              })
             }else{
                const errorMsg = JSON.parseObject(error.cause?.cause?.message ?? "")?.getString("errorDesc") ?? error.errMsg;
                uni.showToast({
@@ -96,11 +101,7 @@
                  icon:'none',
                	duration:2000
                })
-               // uni.showModal({
-               //   title: '登录失败',
-               //   content: errorMsg,
-               //   showCancel: false
-               // });
+
             }
           }
         })