From b44e169dd8a6e0f15d3788970176922e96aec6e1 Mon Sep 17 00:00:00 2001
From: zhao_js <349234519@qq.com>
Date: 星期三, 15 十一月 2023 09:55:33 +0800
Subject: [PATCH] no message

---
 uniapp/pages/login/login.vue |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/uniapp/pages/login/login.vue b/uniapp/pages/login/login.vue
index 09cb9e6..c5e2c1d 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 v-if="issh" 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)"/>
 					鐧婚檰浠h〃宸茶缁嗛槄璇诲苟鍚屾剰<text @click="goPage('agreement')">銆婄敤鎴峰崗璁��</text>鍜�<text @click="goPage('policy')">銆婇殣绉佹斂绛栥��</text>
@@ -66,6 +66,7 @@
 		},
 		data() {
 			return {
+				issh:false,
 				ifPasslogin: false,
 				pass: '',
 				phone: '',
@@ -77,12 +78,11 @@
 				showPass: true,
 				second: 60,
 				canGetCode: true,
-				prevent: true,
-				clientid:""
+				prevent: true
 			};
 		},
 		onLoad() {
-
+			this.shShow();
 		},
 		methods: {
 			...mapMutations(['login']),
@@ -94,14 +94,35 @@
 			changeread(e){
 				this.isread = e.target.value
 			},
+			shShow()
+			{
+				var that=this;
+				this.$u.api.comminInt({}).then(e => {
+					console.log(e)
+					that.hasshow=true;
+					// #ifdef APP-PLUS
+					if (plus.os.name == 'iOS') {
+						if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+							console.log('1')
+							that.issh=true;
+						} else {
+							console.log(0)
+							that.issh=false;
+						}
+					}
+					// #endif
+				}).catch(function(err) {
+					console.log(err);
+				})
+			},
 			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 +144,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)
@@ -211,11 +238,13 @@
 							url: './setInviteCode'
 						})
 					}
-					else if (e.data.userinfo.isPwd == 'N') {
+					/* else if (e.data.userinfo.isPwd == 'N') {
 						uni.redirectTo({
 							url: './setPass'
 						})
-					} else {
+					} */else {
+						//鏇存柊pushcid
+						getApp().updatePushCid();
 						uni.switchTab({
 							url: '../index/index'
 						})

--
Gitblit v1.9.3