123

uni_modules/uni-login-page/pages/index/index.vue

@@ -74,11 +74,13 @@
 				}
 			}
 		},
-		onLoad() {
+		onLoad() {
+			//#ifdef APP-PLUS
 			let pages = getCurrentPages();
 			currentPage = pages[pages.length - 1];
 			currentPage.$getAppWebview().setStyle({
 				top:"1000px"
+<<<<<<< HEAD
 			})
 		},
 		onReady() {
@@ -89,6 +91,21 @@
 				})
 			}, 1500);
 		},
+=======
+			})
+			//#endif
+		},
+		onReady() {
+			this.$refs.uniQuickLogin.login('univerify')
+			//#ifdef APP-PLUS
+			setTimeout(() => {
+				currentPage.$getAppWebview().setStyle({
+					top:"0"
+				})
+			}, 1500);
+			//#endif
+		},
+>>>>>>> 148172bb1d4257605d106e690cdf5ab6917c2bb9
 		
 		computed: {
 			canGetShortMsg() {

uni_modules/uni-quick-login/uniCloud/cloudfunctions/user-center/package-lock.json

@@ -11,7 +11,15 @@
 			"version": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
 		},
 		"uni-id": {
-			"version": "file:../../../../uni-id/uniCloud/cloudfunctions/common/uni-id"
+			"version": "file:../../../../uni-id/uniCloud/cloudfunctions/common/uni-id",
+			"requires": {
+				"uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+			},
+			"dependencies": {
+				"uni-config-center": {
+					"version": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+				}
+			}
 		}
 	}
 }