Merge branch 'master' of https://gitee.com/dcloud/base-app

manifest.json

@@ -16,9 +16,9 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {},
             "Share" : {},
-            "Fingerprint" : {}
+            "Fingerprint" : {},
+            "OAuth" : {}
         },
         "distribute" : {
             "android" : {
@@ -50,7 +50,10 @@
                         }
                     },
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:uniapp.dcloud.io" ]
+                        "com.apple.developer.associated-domains" : [
+                            "applinks:uniapp.dcloud.io",
+                            "applinks:static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com"
+                        ]
                     }
                 },
                 "privacyDescription" : {
@@ -63,17 +66,22 @@
                     "weixin" : {
                         "appid" : "wx0411fa6a39d61297",
                         "appsecret" : "",
-                        "UniversalLinks" : "https://uniapp.dcloud.io/ulink-catgame/"
+                        "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00"
                     },
                     "univerify" : {}
                 },
                 "share" : {
                     "weixin" : {
                         "appid" : "wx0411fa6a39d61297",
-                        "UniversalLinks" : "https://uniapp.dcloud.io/ulink-catgame/"
+                        "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00",
+                        "_spaceID" : "7827e38b-7f40-4421-bca7-58331dcddc00"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00"
                     }
                 },
-                "payment" : {},
                 "ad" : {}
             }
         }

pages/list/list.vue

@@ -18,7 +18,20 @@
 			};
 		},
 		onShow(options) {
-			this.searchText = getApp().globalData.searchText;
+			this.searchText = getApp().globalData.searchText;
+			
+			plus.oauth.getServices(services=>{
+				console.log(services);
+				services.forEach(item=>{
+					if(item.id=='qq'){
+						item.authorize(e=>{
+							console.log(e);
+						},e=>{
+							console.log(e);
+						})
+					}
+				})
+			})
 		},
 		/**
 		 * 下拉刷新回调函数

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

@@ -19,9 +19,9 @@
 					</uni-forms-item>
 					<button class="send-btn-box" :disabled="!canGetShortMsg" :type="canGetShortMsg?'primary':'default'"
 						@click="sendShortMsg">获取短信验证码</button>
-				</uni-forms>
-				
-				<!-- tip -->
+				</uni-forms>
+
+				<!-- tip -->
 				<text class="tip-text">未注册的手机号验证通过后将自动注册</text>
 
 				<!-- 其他登录方式 -->
@@ -99,10 +99,36 @@
 				if (!this.canGetShortMsg) return;
 				/**
 				 * 发送验证吗
-				 */
-				// 发送成功后跳转页面
-				uni.navigateTo({
-					url:'./phone-code?phoneNumber='+this.formData.phone+'&phoneArea='+this.currenPhoneArea
+				 */
+				uni.showLoading();
+				uniCloud.callFunction({
+					"name": "user",
+					"data": {
+						"action": "sendSmsCode",
+						"params": {
+							"mobile": this.formData.phone,
+							"type": "login"
+						}
+					},
+					success: (e) => {
+						console.log(e);
+						uni.showToast({
+							title: JSON.stringify(e.result),
+							icon: 'none'
+						});
+						uni.navigateTo({
+							url:'./phone-code?phoneNumber='+this.formData.phone+'&phoneArea='+this.currenPhoneArea
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+					},
+					fail: (err) => {
+						console.log(err);
+					},
+					complete: () => {
+						uni.hideLoading()
+					}
 				})
 			},
 			/**
@@ -140,4 +166,4 @@
 		border-right: 1rpx solid #d7d9d8;
 		/* #endif */
 	}
-</style>
+</style>

uni_modules/uni-quick-login/uniCloud/cloudfunctions/user/index.js

@@ -16,7 +16,7 @@ class User {
 					data:{ access_token,openid}
 				});
 				return userinfo_res.data//根据access_token,openid得到userinfo
-				//检查是否已经注册...
+				//检查是否已经注册...待续...
 				break;
 			case 'univerify':
 				return uniID.loginByUniverify({access_token,openid})