From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/pages/login/login.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/uniapp/pages/login/login.vue b/uniapp/pages/login/login.vue
index 081fffd..c3e3ee0 100644
--- a/uniapp/pages/login/login.vue
+++ b/uniapp/pages/login/login.vue
@@ -40,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>
@@ -77,8 +77,7 @@
showPass: true,
second: 60,
canGetCode: true,
- prevent: true,
- clientid:""
+ prevent: true
};
},
onLoad() {
@@ -96,12 +95,12 @@
},
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) {
//瀵嗙爜鐧诲綍
@@ -123,11 +122,17 @@
}).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 => {
that.login(e.data.userinfo);
if(e.code != 0) return that.$alert(e.msg)
@@ -216,6 +221,8 @@
url: './setPass'
})
} */else {
+ //鏇存柊pushcid
+ getApp().updatePushCid();
uni.switchTab({
url: '../index/index'
})
--
Gitblit v1.9.3