From 70f5b82bc3fceafac2faf470280876b0eca6fac8 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 13 七月 2023 09:40:23 +0800
Subject: [PATCH] no message
---
uniapp/pages/login/login.vue | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/uniapp/pages/login/login.vue b/uniapp/pages/login/login.vue
index 50fdbff..c3e3ee0 100644
--- a/uniapp/pages/login/login.vue
+++ b/uniapp/pages/login/login.vue
@@ -23,7 +23,6 @@
</view>
</view>
</view>
-
<view class="input-container colCen" v-else>
<view class="outSidebox rowCenBet" data-type='pass' :class="selectedInput=='code'?'outSidebox-active':''">
<input @focus="changeType" @blur="cleanActive" data-type='code' type="number" v-model="code" placeholder="璇疯緭鍏ラ獙璇佺爜"
@@ -41,9 +40,9 @@
</view>
<view class="bottom-fixed colCen">
- <view class="verification-Code" @click="changeWay()">
+ <!-- <view class="verification-Code" @click="changeWay()">
{{ifPasslogin?'楠岃瘉鐮�':'瀵嗙爜'}}鐧诲綍
- </view>
+ </view> -->
<view class="explain-text rowCen">
<switch type="checkbox" @change="changeread" :checked='isread' style="transform:scale(0.6)"/>
鐧婚檰浠ｈ〃宸茶缁嗛槄璇诲苟鍚屾剰<text @click="goPage('agreement')">銆婄敤鎴峰崗璁��</text>鍜�<text @click="goPage('policy')">銆婇殣绉佹斂绛栥��</text>
@@ -78,8 +77,7 @@
showPass: true,
second: 60,
canGetCode: true,
- prevent: true,
- clientid:""
+ prevent: true
};
},
onLoad() {
@@ -97,14 +95,15 @@
},
dologin() {
var that = this;
- // #ifdef APP-PLUS
- plus.push.getClientInfoAsync((info) => {
- that.clientid = info["clientid"];
- });
- // #endif
-
+ let clientInfo = uni.getStorageSync('clientInfo');
+ var pushCid="";
+ if(clientInfo&&clientInfo.clientid)
+ {
+ pushCid=clientInfo.clientid;
+ }
if(this.isread){
if (this.ifPasslogin) {
+ //瀵嗙爜鐧诲綍
var param = {
account: this.phone,
password: this.pass,
@@ -112,23 +111,33 @@
}
this.$u.api.login(param).then(e => {
if(e.code != 0) return that.$alert(e.msg)
- that.login(e.data.userinfo);
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
that.$alert('鐧诲綍鎴愬姛')
setTimeout(function(){
uni.switchTab({
url: '../index/index'
});
- },1000)
+ },1000) */
}).catch(function (err) {
})
} else {
+ let strsr={
+ mobile: this.phone,
+ captcha: this.code,
+ pushCid:pushCid
+ };
+ console.log(strsr)
+ //楠岃瘉鐮佺櫥褰�
this.$u.api.mobileLogin({
mobile: this.phone,
captcha: this.code,
- push_cid:this.clientid
+ pushCid:pushCid
}).then(e => {
- if(e.code != 0) return that.$alert(e.msg)
that.login(e.data.userinfo);
+ if(e.code != 0) return that.$alert(e.msg)
+ this.targetToIndex(e);
+ /* that.login(e.data.userinfo);
utils.setCache('userInfo', e.data.userinfo)
getApp().globalData.userInfo = e.data.userinfo
that.$alert('鐧诲綍鎴愬姛')
@@ -142,7 +151,7 @@
url: '../index/index'
})
}
- },1000)
+ },1000) */
}).catch(function (err) {
})
@@ -190,6 +199,36 @@
});
}
},
+
+ targetToIndex(e)
+ {
+ var that = this;
+
+ that.login(e.data.userinfo);
+ utils.setCache('userInfo', e.data.userinfo)
+ getApp().globalData.userInfo = e.data.userinfo
+ that.$alert('鐧诲綍鎴愬姛')
+ setTimeout(function(){
+ console.log(e.data.userinfo)
+ if(!e.data.userinfo.invitation_code)
+ {
+ uni.redirectTo({
+ url: './setInviteCode'
+ })
+ }
+ /* else if (e.data.userinfo.isPwd == 'N') {
+ uni.redirectTo({
+ url: './setPass'
+ })
+ } */else {
+ //鏇存柊pushcid
+ getApp().updatePushCid();
+ uni.switchTab({
+ url: '../index/index'
+ })
+ }
+ },1000)
+ },
showPassfnc() {
this.showPass = !this.showPass
--
Gitblit v1.9.3