1

manifest.json

@@ -77,14 +77,13 @@
                     "apple" : {},
                     "weixin" : {
                         "appid" : "wxd6a8954fa7b0f8a0",
-                        "UniversalLinks" : ""
+                        "UniversalLinks" : "https://goosechampion.com/app/"
                     }
                 },
                 "payment" : {
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
-                    },
-                    "appleiap" : {}
+                    }
                 }
             },
             "splashscreen" : {

pages/login/index.vue

@@ -28,7 +28,6 @@
 				<view class="yk-btn" @click="ykBtn"></view>
 				<view class="wx-btn" @click="wxLoginClick"></view>
 				<view class="apple-btn" v-if="showAppleLogin" @click="appleLoginClick"></view>
-				
 			</view>
 		</view>
 		<agree-content-dialog ref="agreeContentDialogRef" :agreeType="agreeType"></agree-content-dialog>
@@ -179,7 +178,6 @@
 			agreeYkDialog.value.handleShow();
 		}
 	}
-
 	const appleLoginClick = () => {
 		uni.login({
 			provider: 'apple',
@@ -187,31 +185,45 @@
 				console.log('loginRes', loginRes);
 				let req = {
 					"apple": true,
-					"code": loginRes
+					"code": loginRes.appleInfo.user
 				}
 				console.log(req);
-				wxLogin(req).then(res => {
-					console.log(res);
-					uni.showLoading({
-						title: '登录中'
-					});
-					setTimeout(() => {
-						cacheManager.set('auth', res.data.loginVo)
-						if (res.data.loginVo.cardId == 0) {
-							uni.redirectTo({
-								url: `/pages/selectGradesTerms/index`
-							})
-							uni.hideLoading();
-						} else {
-							uni.redirectTo({
-								url: `/pages/study/index`
-							})
-							uni.hideLoading();
-						}
-					}, 1000)
-				}).catch((error) => {
-					console.log(error);
-				})
+			console.log(req);
+			wxLogin(req).then(res => {
+				console.log(res);
+				if (!res.data.bind) {
+					console.log('未绑定');
+					cacheManager.set('wxLogin', {
+						bind: res.data.bing
+					})
+					telDialogFlag.value = true;
+					nextTick(() => {
+						telDialogRef.value.getOpenId(res.data.openId);
+					})
+				} else {
+					uni.showLoading({
+						title: '登录中'
+					});
+					setTimeout(() => {
+						cacheManager.set('auth', res.data.loginVo)
+						if (res.data.loginVo.cardId == 0) {
+			
+							uni.redirectTo({
+								url: `/pages/selectGradesTerms/index`
+							})
+							uni.hideLoading();
+						} else {
+			
+							uni.redirectTo({
+								url: `/pages/study/index`
+							})
+							uni.hideLoading();
+						}
+					}, 1000)
+				}
+			}).catch((error) => {
+				console.log(error);
+			})
 			},
 			fail: function(err) {
 				console.log('err.code', err.code);

pages/pay/svip.vue

@@ -68,7 +68,7 @@
 		toast,
 		getUserIdentity
 	} from "@/utils/common";
-	let payType = ref('weixin')
+	let payType = ref('zhifubao')
 	let cardId = ref('')
 	let formPage = ref('')
 	const daoPokeRef = ref(null);