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/wxlogin.vue |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 5a53652..092e5d0 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -113,12 +113,20 @@
 			},
 			doMobileLogin(mobRes)
 			{
+				//浠庣紦瀛樿幏鍙朿id
+				let clientInfo = uni.getStorageSync('clientInfo');
+				let pushCid='';
+				if(clientInfo&&clientInfo.clientid)
+				{
+					pushCid=clientInfo.clientid
+				}
 				var that=this;
 				uniCloud.callFunction({
 				  name: 'getPhoneNumber', // 浣犵殑浜戝嚱鏁板悕绉�
 				  data: {
 				    'access_token': mobRes.access_token, // 瀹㈡埛绔竴閿櫥褰曟帴鍙h繑鍥炵殑access_token
-				    'openid': mobRes.openid // 瀹㈡埛绔竴閿櫥褰曟帴鍙h繑鍥炵殑openid
+				    'openid': mobRes.openid, // 瀹㈡埛绔竴閿櫥褰曟帴鍙h繑鍥炵殑openid
+					'pushCid':pushCid//app鎺ㄩ�乧id
 				  }
 				}).then(res => {
 					console.log(res)
@@ -207,6 +215,8 @@
 							url: './setPass'
 						})
 					} */ else {
+						//鏇存柊pushcid
+						getApp().updatePushCid();
 						uni.switchTab({
 							url: '../index/index'
 						})

--
Gitblit v1.9.3