From d52f511aa27dde1478b919881f7aecdefe9fb581 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 3 Jun 2026 16:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=A0cid=EF=BC=9B?=
 =?UTF-8?q?=E6=B3=A8=E6=8E=89=E8=AE=B0=E4=BD=8F=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/App.vue                   | 39 +++++++++++++------
 .../pageSubPack/loginSub/login.vue            |  4 +-
 .../pageSubPack/loginSub/pwd-login.vue        |  7 +++-
 .../pageSubPack/oneClickOpen/oneClickOpen.vue | 11 +++++-
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/wuye-manager-uniapp/App.vue b/wuye-manager-uniapp/App.vue
index b8969b1..75874d1 100644
--- a/wuye-manager-uniapp/App.vue
+++ b/wuye-manager-uniapp/App.vue
@@ -1,15 +1,32 @@
-<script>
-export default {
-  onLaunch: function () {
-    console.log('App Launch')
-  },
-  onShow: function () {
-    console.log('App Show')
-  },
-  onHide: function () {
-    console.log('App Hide')
+<script setup>
+  import { onLaunch } from '@dcloudio/uni-app'
+
+  // 应用启动时执行
+  onLaunch(() => {
+  	console.log('App 启动')
+
+  	// #ifdef APP-PLUS
+  	// 只有 App 平台才获取 CID
+  	getPushCID()
+  	// #endif
+  })
+
+  // 获取 uniPush 2.0 CID
+  function getPushCID() {
+  	uni.getPushClientId({
+  		success: (res) => {
+  			console.log('推送初始化成功')
+  			console.log('CID =', res.cid)
+
+  			// 存起来备用
+  			uni.setStorageSync('push_cid', res.cid)
+  		},
+  		fail: (err) => {
+  			console.error('获取推送 CID 失败', err)
+  		}
+  	})
   }
-}
+
 </script>
 
 <style>
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index 2cc5e2a..e603e05 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -208,10 +208,12 @@ const handleLogin = () => {
     title: '登录中...',
     mask: true
   })
+ const push_cid = uni.getStorageSync('push_cid')
   let params = {
     phone: phoneNumber.value,
     smsCode: verifyCode.value,
-    scene: 'butler_login'
+    scene: 'butler_login',
+    cid:push_cid
   }
   getLoginBySms(params)
     .then(res => {
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 00eb8c2..d4d1f21 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -30,7 +30,7 @@
 		</view>
 
 		<!-- 记住密码 -->
-		<view class="remember-wrap">
+		<view class="remember-wrap" style="display: none;">
 			<view class="remember-item" @click="toggleRemember">
 				<uni-icons type="checkbox-filled" size="18" color="#4D5DFA" v-if="rememberPwd"></uni-icons>
 				<uni-icons type="checkbox" size="18" color="#999" v-else></uni-icons>
@@ -150,9 +150,12 @@
     	  return;
       }
 		  uni.showLoading({ title: '登录中...', mask: true });
+       const push_cid = uni.getStorageSync('push_cid')
+       // console.log('cid',push_cid)
 		 	let params = {
 		 		username:phoneNumber.value,
-		 		password:password.value
+		 		password:password.value,
+        cid:push_cid
 		 	}
 		 	getLoginPassword(params).then(res =>{
 		 		// console.log('33333',res)
diff --git a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
index 3811cbb..7db34d0 100644
--- a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
+++ b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue
@@ -107,7 +107,15 @@ const openDoor = () => {
   const device = doorList.value[selectedDoor.value]
   if (!device) return
 
-  uni.showLoading({ title: '开门中...' })
+  uni.showToast({
+    title: '正在对接硬件中...',
+    icon: 'none'
+  })
+
+
+}
+function getSwitchOpen(){
+  uni.showLoading({ title: '开门中...',mask:true })
   switchOpenDoor({ deviceId: device.id }).then(res => {
     uni.hideLoading()
     if (res.code === 200) {
@@ -119,6 +127,7 @@ const openDoor = () => {
     uni.hideLoading()
     uni.showToast({ title: err.msg || '开门失败', icon: 'none' })
   })
+
 }
 </script>