From 3fa853cb4c19fe999e67d37da26183e100896697 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Mon, 1 Jun 2026 11:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.claude/settings.local.json               | 12 ++++++-
 property-uniapp-project/App.vue               | 35 +++++--------------
 property-uniapp-project/manifest.json         |  3 +-
 .../pageSubPack/api/api.js                    |  6 +++-
 .../pageSubPack/loginSub/login.vue            | 11 ++++++
 .../pageSubPack/loginSub/pwd-login.vue        |  4 ++-
 6 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/property-uniapp-project/.claude/settings.local.json b/property-uniapp-project/.claude/settings.local.json
index 0cfae51..c73c50b 100644
--- a/property-uniapp-project/.claude/settings.local.json
+++ b/property-uniapp-project/.claude/settings.local.json
@@ -1,7 +1,17 @@
 {
   "permissions": {
     "allow": [
-      "WebFetch(domain:app.apifox.com)"
+      "WebFetch(domain:app.apifox.com)",
+      "Bash(sed -i '545s/.*/\\\\t\\\\t\\\\t.activity-card{\\\\n\\\\t\\\\t\\\\t}\\\\n\\\\t\\\\t\\\\t.uni-card{/' pages/index/index.vue)",
+      "Bash(sed -n '544,549p' pages/index/index.vue)",
+      "Bash(sed -i '548d' pages/index/index.vue)",
+      "Bash(sed -n '544,552p' pages/index/index.vue)",
+      "Bash(cat)",
+      "Bash(python /tmp/notice_edit.py)",
+      "Bash(node *)",
+      "Bash(git checkout *)",
+      "Bash(sed -i '207,213d' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)",
+      "Bash(sed -n '203,213p' D:/wuye-jumin-front/property-uniapp-project/pageSubPack/loginSub/login.vue)"
     ]
   }
 }
diff --git a/property-uniapp-project/App.vue b/property-uniapp-project/App.vue
index 20973b2..dd18548 100644
--- a/property-uniapp-project/App.vue
+++ b/property-uniapp-project/App.vue
@@ -1,16 +1,16 @@
 <script setup>
 	import { onLaunch } from '@dcloudio/uni-app'
-	
+
 	// 应用启动时执行
 	onLaunch(() => {
-	  console.log('App 启动')
-	
-	  // #ifdef APP-PLUS
-	  // 只有 App 平台才获取 CID
-	  getPushCID()
-	  // #endif
+		console.log('App 启动')
+
+		// #ifdef APP-PLUS
+		// 只有 App 平台才获取 CID
+		getPushCID()
+		// #endif
 	})
-	
+
 	// 获取 uniPush 2.0 CID
 	function getPushCID() {
 		uni.getPushClientId({
@@ -20,29 +20,12 @@
 
 				// 存起来备用
 				uni.setStorageSync('push_cid', res.cid)
-
-				// 弹出CID给你看
-				// uni.showModal({
-				// 	title: '你的CID',
-				// 	content: res.cid
-				// })
 			},
 			fail: (err) => {
 				console.error('获取推送 CID 失败', err)
 			}
 		})
 	}
-	// export default {
-	// 	on
-	// 	onShow: function() {
-	// 		// console.log('App Show')
-	// 	},
-	// 	onHide: function() {
-	// 		console.log('App Hide')
-	// 	},
-		
-		
-	// }
 </script>
 
 <style lang="scss">
@@ -64,7 +47,7 @@
 		/* line-height: 1.6 !important; */
 		padding: 0 !important;
 	}
-	
+
 	/* button:after{
 		border-radius:  50px;
 	} */
diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json
index 78f1196..3ccf8e9 100644
--- a/property-uniapp-project/manifest.json
+++ b/property-uniapp-project/manifest.json
@@ -88,7 +88,8 @@
                         "appid" : "",
                         "UniversalLinks" : ""
                     }
-                }
+                },
+                "payment" : {}
             }
         }
     },
diff --git a/property-uniapp-project/pageSubPack/api/api.js b/property-uniapp-project/pageSubPack/api/api.js
index 9a9f54f..acdf2f2 100644
--- a/property-uniapp-project/pageSubPack/api/api.js
+++ b/property-uniapp-project/pageSubPack/api/api.js
@@ -138,4 +138,8 @@ export const addVisitorData = (data) =>{
 // 上传单张图片
 export const uploadFile = (filePath) => {
 	return upload(filePath,'/api/resident/file/uploadImage');
-}
\ No newline at end of file
+}
+// 单推消息推送
+export const getPushSingle = (data) =>{
+	return post("/api/push/single", data)
+}
diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue
index 62eec7a..9f363d4 100644
--- a/property-uniapp-project/pageSubPack/loginSub/login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/login.vue
@@ -186,10 +186,12 @@ const handleLogin = () => {
     return;
   }
    uni.showLoading({ title: '登录中...', mask: true });
+    const push_cid = uni.getStorageSync('push_cid')
   let params = {
 	phone:phoneNumber.value,
 	smsCode:verifyCode.value,
 	scene:'login',
+	cid:push_cid
   }
   getLoginBySms(params).then(res =>{
   	if(res.code === 200){
@@ -204,6 +206,7 @@ const handleLogin = () => {
 			uni.setStorageSync('currentVillageId', currentVillageId);
 			uni.hideLoading();
 			uni.showToast({ title: '登录成功', icon: 'success' });
+
 			setTimeout(() =>{
 				uni.switchTab({ url: '/pages/index/index' });
 			},1500)
@@ -231,6 +234,14 @@ const handleLogin = () => {
  //  	title:"登录成功",
 	// icon:'success'
  //  })
+				// 登录成功后上报推送 CID
+				// #ifdef APP-PLUS
+				const cid = uni.getStorageSync('push_cid')
+				if (cid) {
+					reportPushCID(cid)
+				}
+				// #endif
+
  //  setTimeout(() =>{
 	// uni.switchTab({ url: '/pages/index/index' });  
  //  },1500)
diff --git a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
index 52439eb..b933f33 100644
--- a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
@@ -134,9 +134,11 @@ const handleLogin = () => {
 	  return;
   }
    uni.showLoading({ title: '登录中...', mask: true });
+   const push_cid = uni.getStorageSync('push_cid')
   	let params = {
   		username:phoneNumber.value,
-  		password:password.value
+  		password:password.value,
+		cid:push_cid
   	}
   	getLoginPassword(params).then(res =>{
   		if(res.code === 200){