|
@@ -18,8 +18,8 @@
|
|
|
:checked="indexData.isAgreed" />
|
|
|
</checkbox-group>
|
|
|
<view class="agreement-text-box">
|
|
|
- 我已阅读并同意<view class="agreement-text" @click="agreeBtn('yhxy')">《用户协议》</view>和<view @click="agreeBtn('ystk')"
|
|
|
- class="agreement-text">《隐私政策》</view>
|
|
|
+ 我已阅读并同意<view class="agreement-text" @click="agreeBtn('yhxy')">《用户协议》</view>和<view
|
|
|
+ @click="agreeBtn('ystk')" class="agreement-text">《隐私政策》</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="login-btn" @click="getYzmBtn" :class="indexData.telStatus"></view>
|
|
@@ -139,9 +139,9 @@
|
|
|
}
|
|
|
|
|
|
const agreeBtn = (data) => {
|
|
|
- if(data==='yhxy'){
|
|
|
+ if (data === 'yhxy') {
|
|
|
agreeType.value = 'yhxy'
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
agreeType.value = 'ystk'
|
|
|
}
|
|
|
agreeContentDialogRef.value.handleShow();
|
|
@@ -194,7 +194,7 @@
|
|
|
let req = {
|
|
|
"apple": false,
|
|
|
"code": code
|
|
|
- }
|
|
|
+ }
|
|
|
console.log(req);
|
|
|
wxLogin(req).then(res => {
|
|
|
console.log(res);
|
|
@@ -208,16 +208,25 @@
|
|
|
telDialogRef.value.getOpenId(res.data.openId);
|
|
|
})
|
|
|
} else {
|
|
|
- cacheManager.set('auth', res.data.loginVo)
|
|
|
- if (res.data.loginVo.cardId == 0) {
|
|
|
- uni.redirectTo({
|
|
|
- url: `/pages/selectGradesTerms/index`
|
|
|
- })
|
|
|
- } else {
|
|
|
- uni.redirectTo({
|
|
|
- url: `/pages/study/index`
|
|
|
- })
|
|
|
- }
|
|
|
+ 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);
|