首次提交项目代码

huakai-app/pageSubPack/api/api.js

@@ -0,0 +1,141 @@
+import request,{get,post,upload} from "./request.js"
+
+
+// =======账号密码登录========
+export const getLoginPassword = (data) =>{
+	return post('/api/resident/auth/loginByPassword',data)
+}
+// 注册新用户获取验证码
+export const getSendCode = (data) =>{
+	return post('/api/resident/auth/sendSmsCode',data)
+}
+// 注册新用户
+export const getRegisterUser = (data) =>{
+	return post('/api/resident/auth/register',data)
+}
+// 短信验证码登录
+export const getLoginBySms = (data) =>{
+	return post('/api/resident/auth/loginBySms',data)
+}
+// 忘记密码接口
+export const getResetPassword = (data) =>{
+	return post('/api/resident/auth/resetPassword',data)
+}
+// =========首页=======
+// 获取bannar图
+export const getBannarList = (data) =>{
+	return get('/resident/banner',data)
+}
+// 首页最新公告
+export const getNoticeLatest = () =>{
+	return get('/api/resident/notice/latest')
+}
+
+// 查询已认证的小区
+export const getVillageList = (data) =>{
+	return get('/api/resident/village/myList', data)
+}
+// 获取当前小区
+export const getCurrentVillage = () =>{
+	return get('/api/resident/village/current')
+}
+// 切换小区
+export const getVillageSwitch = (data)=>{
+	return post('/api/resident/village/switch',data)
+}
+// 首页最新活动列表
+export const getActivitylatest = () =>{
+	return get('/api/resident/activity/latest')
+}
+
+// ========公告列表======
+// 获取公告列表
+export const getNoticeList = (data) =>{
+	return get('/api/resident/notice/list',data)
+}
+// 获取公告详情
+export const getNoticeDetails = (noticeId) =>{
+	return get(`/api/resident/notice/${noticeId}`)
+}
+// =========键开门===============
+// 查询门禁列表
+export const getAccessDevices = (data) =>{
+	return get("/api/resident/access/devices",data)
+}
+// 确认开门
+export const getAccessOpen = (data) =>{
+	return post("/api/resident/access/open",data)
+}
+// ==========活动列表===========
+// 获取活动列表
+export const getActivityList = (data) =>{
+	return get("/api/resident/activity/list",data)
+}
+// 获取活动列表详情
+export const getActivityDetails = (id) =>{
+	return get(`/api/resident/activity/${id}`)
+}
+// 确认报名
+export const confirmResident = (id) =>{
+	return post(`/api/resident/activity/${id}/apply`)
+}
+// 取消报名
+export const cancelActivity = (id) =>{
+	return post(`/api/resident/activity/${id}/cancel`)
+}
+// =========我的活动========
+export const getMyActivityList = (data) =>{
+	return get("/api/resident/activity/my",data)
+}
+// ===========活动实况============
+// 活动实况列表
+export const getActivityLive = (id) =>{
+	return get(`/api/resident/activity/${id}/live`)
+}
+// 添加实况
+export const addActivityLive = (id, data) =>{
+	return post(`/api/resident/activity/${id}/live`, data)
+}
+// 签到
+export const signinActivityLive = (id, data) =>{
+	return post(`/api/resident/activity/${id}/signin`, data)
+}
+// ==============在线报修========
+// 添加报修工单
+export const addQueryRepair = (data) =>{
+	return post("/repairOrder/addRepair",data)
+}
+// 获取公共维修项目列表
+export const getRepairProjectList = (data) =>{
+	return get("/repairOrder/list",data)
+}
+// 获取报修列表
+export const getQueryRepair = (data) =>{
+	return get("/repairOrder/queryRepair",data)
+}
+// 获取房屋列表
+export const getHouseList = (data) =>{
+	return get('/api/resident/my/house/list',data)
+}
+// 报修详情
+export const getRepairDetail = (data) =>{
+	return get('/repairOrder/queryRepairDetail',data)
+}
+// =========访客邀请===========
+// 获取访客列表
+export const getVisitorList = (data) =>{
+	return get('/api/visitor/list',data)
+}
+// 获取详情信息
+export const getVisitorDetail = (id) =>{
+	return get(`/api/visitor/${id}`)
+}
+// 新增访客
+export const addVisitorData = (data) =>{
+	return post("/api/visitor", data)
+}
+
+// 上传单张图片
+export const uploadFile = (filePath) => {
+	return upload(filePath,'/api/resident/file/uploadImage');
+}

huakai-app/pageSubPack/api/apiSub.js

@@ -0,0 +1,225 @@
+import request, {
+	get,
+	post,
+	deleteMethod,
+	putMethod
+} from "./request.js"
+
+// 字典
+export const getSystemDictData = (data) => {
+	return get('/system/dict/data/list', data)
+}
+
+// =======公告列表========
+export const getResidentNoticeList = (data) => {
+	return get('/api/resident/notice/list', data)
+}
+// 我的房屋列表
+export const getMyHouseList = (data) => {
+	return get('/api/resident/my/house/list', data)
+}
+// 提交房屋注册认证申请
+export const myHouseApply = (data) => {
+	return post('/api/resident/my/house/apply', data)
+}
+// 查询小区列表
+export const getVillageList = (data) => {
+	return get('/api/resident/village/list', data)
+} // 查询楼栋列表
+export const getHouseBuildings = (data) => {
+	return get('/api/resident/house/buildings', data)
+}
+// 查询单元列表
+export const getHouseUnits = (data) => {
+	return get('/api/resident/house/units', data)
+}
+// 查询楼层列表
+export const getHouseFloors = (data) => {
+	return get('/api/resident/house/floors', data)
+}
+// 查询户号列表
+export const getHouseHouses = (data) => {
+	return get('/api/resident/house/houses', data)
+}
+// 房屋绑定手机获取验证码
+export const getHouseAuthSendSmsCode = (data) => {
+	return post('/api/resident/auth/sendSmsCode', data)
+}
+// 房屋详情
+export const getMyHouseDetail = (data) => {
+	return get(`/api/resident/my/house/${data.id}`, data)
+}
+// 删除房屋
+export const deleteMyHouse = (data) => {
+	return deleteMethod(`/api/resident/my/house/${data.id}`, data)
+}
+// 设置默认房屋
+export const setMyHouseDefault = (data) => {
+	return post(`/api/resident/my/house/default`, data)
+}
+// 获取当前用户登录信息
+export const getUserProfile = (data) => {
+	return get(`/api/resident/user/profile`, data)
+}
+// 发送新手机号验证码
+export const getAuthSendSmsCode = (data) => {
+	return post(`/api/resident/auth/sendSmsCode`, data)
+}
+// 更改手机号
+export const getUserChangePhone = (data) => {
+	return post(`/api/resident/user/changePhone`, data)
+}
+// 获取消息通知开关
+export const getUserNotify = (data) => {
+	return get(`/api/resident/user/notify`, data)
+}
+// 更新消息通知开关
+export const changeUserNotify = (data) => {
+	return post(`/api/resident/user/notify`, data)
+} // 修改密码(需登录)
+export const authChangePassword = (data) => {
+	return post(`/api/resident/auth/changePassword`, data)
+} // 退出登录
+export const authLogout = (data) => {
+	return post(`/api/resident/auth/logout`, data)
+}
+// 编辑房屋
+export const upDateMyHouse = (data) => {
+	return putMethod(`/api/resident/my/house/${data.id}`, data)
+
+}
+
+//  =========问卷调查=========
+// 问卷列表
+export const getQuestionnaireList = (data) => {
+	return get('/api/resident/questionnaire/list',data)
+}
+// 问卷详情
+export const getQuestionnaireDetail = (data) => {
+	return get('/api/resident/questionnaire/myAnswers',data)
+}
+// 提交问卷
+export const submitQuestionnair = (id,data) => {
+	return post(`/api/resident/questionnaire/${id}/submit`, data)
+}
+// =====投诉意见=======
+// 获取投诉类型
+export const getComplainType = () => {
+	return get('/complain/getComplainType')
+}
+// 获取投诉列表
+export const getComplainList = (data) => {
+	return get('/complain/getComplainList',data)
+}
+// 提交投诉建议
+export const addComplain = (data) => {
+	return post('/complain/add',data)
+}
+// 投诉详情
+export const getComplainDetail = (data) => {
+	return get('/complain/detail',data)
+}
+// 联系物业
+export const getManagePhoneData = (data) => {
+	return get('/api/manage/banner/getManagePhone',data)
+}
+
+// 修改身份证照片
+export const uploadFileUploadImage = (data) => {
+	return post(`/api/resident/file/uploadImage`, data)
+}
+
+// 水电表
+export const getTopUpSelectByResident = (data) => {
+	console.log(data);
+	return get(`/api/topUp/selectByResident/${data.residentUserId}`, data)
+}
+// 绑定设备
+export const getTopUpBindDevice = (data) => {
+	return post(`/api/topUp/bindDevice/${data.deviceCode}/${data.residentUserId}/${data.openid}/${data.deviceType}`,
+		data)
+}
+// 充值调用
+// /${data.rechargeAmount}/${data.type}/${data.deviceCode}
+export const getTopUp = (data) => {
+	return post(`/api/topUp`, data)
+}
+export const getopenIdByCode = (data) => {
+	return get(`/api/topUp/getOpenIdByCode?code=${data.code}`, data)
+}
+
+// 微信支付调用
+export const getToWxPay = (data) => {
+	return post(`/api/topUp/wxPay/${data.orderId}/${data.openid}`, data)
+}
+// 缴费记录查询
+export const getTopupRecordWithStat = (data) => {
+	return get(
+		`/api/topUp/topupRecordWithStat?residentUserId=${data.residentUserId}&pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
+		data)
+}
+export const postInsertOpenId = (data) => {
+	return post(`/api/resident/auth/insertOpenId`, data)
+}
+export const postSubscribeAuth = (data) => {
+	return post(`/api/wx/subscribeAuth/auth`, data)
+}
+
+// 添加车辆
+export const postCar = (data) => {
+	return post(`/api/resident/car`, data)
+}
+// 修改车辆
+export const putCar = (data) => {
+	return putMethod(`/api/resident/car`, data)
+}
+
+// 获取车辆列表
+export const getMyCarList = (data) => {
+	return get(`/api/resident/car/myList`, data)
+}
+// 获取车位列表
+export const getCarList = (data) => {
+	return get(`/api/resident/car/list`, data)
+}
+// 获取车辆详细信息
+export const getCarDetail = (data) => {
+	return get(`/api/resident/car/${data.id}`, data)
+}
+// 删除车辆信息
+export const deleteCar = (data) => {
+	return deleteMethod(`/api/resident/car/${data.carId}`, data)
+}
+// 获取用户车位绑定列表
+export const getUserParkingSpaceList = (data) => {
+	return get(`/api/resident/car/parking/list`, data)
+}
+
+// 获取区域列表
+export const getResidentCarAreaManageAreaListByVillageId = (data) => {
+	return get(`/ResidentCarAreaManage/areaListByVillageId`, data)
+}
+// 根据区域id获得车位列表
+export const getResidentCarAreaManageParkingListByAreaId = (data) => {
+	return get(`/ResidentCarAreaManage/parkingListByAreaId`, data)
+}
+// 绑定车位
+export const postCarBind = (data) => {
+	return post(`/api/resident/car/bind`, data)
+}
+// 获取用户下车位绑定信息
+// export const getCarList = (data) => {
+// 	return get(`/api/resident/car/list`, data)
+// }
+// 删除车位
+export const deleteParking = (data) => {
+	return deleteMethod(`/ResidentCarAreaManage/parking/${data.parkingId}`, data)
+}
+// 车位详情
+export const getParkingDetail = (data) => {
+	return get(`/api/resident/car/parking/detail/${data.id}`, data)
+}
+// 解绑车辆
+export const rebindCar = (data) => {
+	return post(`/ResidentCarAreaManage/rebind`, data)
+}

huakai-app/pageSubPack/api/auth.js

@@ -0,0 +1,85 @@
+/**
+ * 登录状态管理工具
+ * 仅在用户点击需要身份认证的功能时才要求登录
+ */
+
+/**
+ * 检查用户是否已登录
+ * @returns {boolean} true 已登录，false 未登录
+ */
+export function isLoggedIn() {
+  const token = uni.getStorageSync('token');
+  return !!token;
+}
+
+/**
+ * 要求登录 — 未登录时跳转登录页，已登录直接执行回调
+ * 登录页提供返回/取消按钮，用户可拒绝登录
+ *
+ * @param {Object} options
+ * @param {Function} [options.onLoggedIn] - 已登录或登录成功后执行的回调
+ * @param {string} [options.title] - 展示给用户的提示标题（为什么需要登录）
+ * @param {Function} [options.onCancel] - 用户取消登录后的回调
+ */
+export function requireAuth({ onLoggedIn, title, onCancel } = {}) {
+  if (isLoggedIn()) {
+    if (onLoggedIn) onLoggedIn();
+    return;
+  }
+
+  // 弹窗询问用户是否去登录，用户可拒绝（"暂不"）
+  const tipTitle = title ? `"${title}"需要登录` : '该功能需要登录';
+  uni.showModal({
+    title: '提示',
+    content: `${tipTitle}，是否去登录？`,
+    confirmText: '去登录',
+    cancelText: '暂不',
+    success: (modalRes) => {
+      if (modalRes.confirm) {
+        // 用户点击"去登录"
+        uni.setStorageSync('pendingAuthCallback', {
+          time: Date.now(),
+          title: title || ''
+        });
+
+        uni.navigateTo({
+          url: '/pageSubPack/loginSub/pwd-login',
+          events: {
+            loginSuccess: () => {
+              if (onLoggedIn) onLoggedIn();
+              uni.removeStorageSync('pendingAuthCallback');
+            }
+          }
+        });
+      } else {
+        // 用户点击"暂不"，留在当前页
+        if (onCancel) onCancel();
+      }
+    }
+  });
+}
+
+/**
+ * 清除登录状态
+ */
+export function clearLoginState() {
+  uni.removeStorageSync('token');
+  uni.removeStorageSync('userId');
+  uni.removeStorageSync('currentVillageId');
+  uni.removeStorageSync('pendingAuthCallback');
+}
+
+/**
+ * 保存登录成功后的 token 和用户信息
+ * @param {Object} data - 登录接口返回的 data
+ */
+export function saveLoginData(data) {
+  if (data.token) {
+    uni.setStorageSync('token', data.token);
+  }
+  if (data.userId) {
+    uni.setStorageSync('userId', data.userId);
+  }
+  const currentVillageId = data.currentVillageId || 0;
+  uni.setStorageSync('currentVillageId', currentVillageId);
+}

huakai-app/pageSubPack/api/request.js

@@ -0,0 +1,113 @@
+let baseUrl = '';
+if (process.env.NODE_ENV === 'development') {
+	// baseUrl = 'https://wuyeapi.ckdzkj.com'; // 开发环境
+	baseUrl = "https://wuyeapi.bugtc.com"
+} else {
+	baseUrl = 'https://wuyeapi.bugtc.com'; // 生产环境
+}
+
+/**
+ * 显示接口错误提示（自动处理长消息截断问题）
+ * @param {string|Object} msg - 错误消息或含 msg 字段的错误对象
+ */
+export function showApiError(msg) {
+	const message = typeof msg === 'string' ? msg : (msg.msg || msg.message || '请求失败');
+	uni.showToast({ title: message || '请求失败', icon: 'error', duration: 2000 });
+}
+
+export default function request(url, data = {}, method = "GET") {
+	return new Promise((resolve, reject) => {
+		uni.showLoading({
+			title: '请求中...',
+			mask: true
+		});
+
+		uni.request({
+			url: baseUrl + url,
+			data: data,
+			method: method,
+			header: {
+				"Authorization": "Bearer " + (uni.getStorageSync("token") || ''),
+				"clientid": "resident",
+				'content-type': 'application/json'
+			},
+			success: (res) => {
+				uni.hideLoading();
+
+				// HTTP 失败
+				if (res.statusCode !== 200) {
+					reject({ msg: `请求异常 ${res.statusCode}`, code: res.statusCode });
+					return;
+				}
+
+				const resData = res.data || {};
+
+				// token 过期 — 清除登录态，提示用户，但不强制跳转（用户可继续浏览非敏感页面）
+				if (resData.code === 401) {
+					uni.showToast({ title: '登录已过期，请重新登录', icon: 'none', duration: 2000 });
+					uni.removeStorageSync('token');
+					uni.removeStorageSync('userId');
+					// 使用 navigateTo 而非 reLaunch，用户可通过返回按钮退出登录页
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pageSubPack/loginSub/pwd-login',
+							fail: () => {
+								// 如果 navigateTo 失败（如页面栈满），则用 reLaunch
+								uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' });
+							}
+						});
+					}, 1500);
+					reject({ msg: '登录过期', code: 401 });
+					return;
+				}
+
+				// 成功
+				if (resData.code === 200) {
+					resolve(resData);
+				}
+				// 业务失败（code === 500 统一 showToast 展示完整 msg）
+				else {
+					if (resData.code === 500 && resData.msg) {
+						uni.showToast({ title: resData.msg, icon: 'error', duration: 2500 });
+					}
+					reject({ msg: resData.msg || '请求失败', code: resData.code, data: resData });
+				}
+			},
+			fail: (err) => {
+				uni.hideLoading();
+				reject({ msg: '网络异常', code: -1, raw: err });
+			}
+		});
+	});
+}
+
+export const get = (url, data = {}) => request(url, data, 'GET');
+export const post = (url, data) => request(url, data, 'POST');
+export const deleteMethod = (url, data) => request(url, data, 'DELETE');
+export const putMethod = (url, data) => request(url, data, 'PUT');
+
+// 上传
+export const upload = (filePath, url) => {
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: baseUrl + url,
+			filePath: filePath,
+			name: 'file',
+			header: {
+				"Authorization": "Bearer " + (uni.getStorageSync("token") || ''),
+				"clientid": "resident"
+			},
+			success: (res) => {
+				try {
+						const data = JSON.parse(res.data);
+						resolve(data.data || ''); // 直接返回图片地址
+					} catch (e) {
+						resolve('');
+					}
+			},
+			fail: (err) => {
+				reject(err);
+			}
+		});
+	});
+};

huakai-app/pageSubPack/api/useImageUpload.js

@@ -0,0 +1,190 @@
+// 服务器地址（与 request.js 保持一致）
+const baseUrl = 'http://192.168.0.239:8080';
+
+/**
+ * 图片上传 Hook
+ * 支持 uniapp 和微信小程序
+ * 解决编辑回显后重新上传的问题
+ */
+
+import { reactive } from 'vue'
+
+/**
+ * @param {Object} options 配置
+ * @param {string} options.uploadUrl - 上传接口地址
+ * @param {string} options.fileKey - 上传文件的字段名，默认 'file'
+ * @returns {Object}
+ */
+export function useImageUpload(options = {}) {
+	const {
+		uploadUrl = '/api/resident/file/uploadImage',
+		fileKey = 'file'
+	} = options
+
+	// 使用 reactive 对象存储所有状态
+	const state = reactive({
+		// 当前显示的图片（前端展示用，支持 base64/blob URL/网络URL）
+		previewUrl: '',
+		// 服务器返回的 URL（提交时使用）
+		serverUrl: '',
+		// 临时的文件路径（重新上传时用）
+		tempFilePath: null,
+		// 上传状态
+		uploading: false
+	})
+
+	/**
+	 * 设置回显图片（编辑时从后端获取）
+	 * @param {string} url - 后端返回的图片URL
+	 */
+	const setPreviewUrl = (url) => {
+		if (url) {
+			// 确保 url 是字符串
+			const urlStr = typeof url === 'string' ? url : (url?.url || String(url))
+			state.previewUrl = urlStr
+			state.serverUrl = urlStr
+			state.tempFilePath = null // 重置临时文件，表示没有重新上传
+		}
+	}
+
+	/**
+	 * 选择图片并预览（不上传）
+	 * @returns {Promise<string>} 返回临时文件路径
+	 */
+	const chooseImage = () => {
+		return new Promise((resolve, reject) => {
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				sourceType: ['camera', 'album'],
+				success: (res) => {
+					const path = res.tempFilePaths?.[0]
+					if (!path) {
+						reject(new Error('选择图片失败'))
+						return
+					}
+					// 确保 path 是字符串
+					const pathStr = typeof path === 'string' ? path : String(path)
+					// 设置预览
+					state.previewUrl = pathStr
+					// 记录临时文件路径
+					state.tempFilePath = pathStr
+					// 置空服务器URL，等实际上传后再获取
+					state.serverUrl = ''
+					resolve(pathStr)
+				},
+				fail: (err) => {
+					reject(err)
+				}
+			})
+		})
+	}
+
+	/**
+	 * 上传图片到服务器
+	 * @returns {Promise<Object>} 返回 { url: string }
+	 */
+	const uploadImage = () => {
+		// 如果没有新选择临时文件，直接返回已有的服务器URL
+		if (!state.tempFilePath) {
+			return Promise.resolve({ url: state.serverUrl })
+		}
+
+		// 如果已经有服务器URL且没有重新选择，也直接返回
+		if (state.serverUrl && !state.tempFilePath) {
+			return Promise.resolve({ url: state.serverUrl })
+		}
+
+		state.uploading = true
+
+		return new Promise((resolve, reject) => {
+			// 确保 filePath 是字符串
+			const filePath = state.tempFilePath
+			if (!filePath || typeof filePath !== 'string') {
+				state.uploading = false
+				reject(new Error('文件路径无效'))
+				return
+			}
+			uni.uploadFile({
+				url: baseUrl + uploadUrl,
+				filePath: filePath,
+				name: fileKey,
+				header: {
+					'Authorization': 'Bearer ' + (uni.getStorageSync('token') || ''),
+					'clientid': 'resident'
+				},
+				success: (res) => {
+					try {
+						const data = JSON.parse(res.data)
+						if (data.code === 200 && data.data) {
+							// 更新服务器URL（确保存的是字符串）
+							const url = typeof data.data === 'string' ? data.data : (data.data?.url || '')
+							state.serverUrl = url
+							// 清空临时文件
+							state.tempFilePath = null
+							resolve({ url })
+						} else {
+							uni.showToast({
+								title: data.msg || '上传失败',
+								icon: 'none'
+							})
+							reject(new Error(data.msg || '上传失败'))
+						}
+					} catch (e) {
+						uni.showToast({
+							title: '上传失败',
+							icon: 'none'
+						})
+						reject(e)
+					}
+				},
+				fail: (err) => {
+					uni.showToast({
+						title: err.message || '上传失败',
+						icon: 'none'
+					})
+					reject(err)
+				},
+				complete: () => {
+					state.uploading = false
+				}
+			})
+		})
+	}
+
+	/**
+	 * 获取最终可提交的URL
+	 * 如果有新上传的图片，先上传再返回URL
+	 * 如果没有新上传，直接返回已有的服务器URL
+	 * @returns {Promise<Object>}
+	 */
+	const getSubmitUrl = async () => {
+		// 如果重新选择了新图片，先上传
+		if (state.tempFilePath) {
+			return await uploadImage()
+		}
+		// 否则返回已有的服务器URL
+		return { url: state.serverUrl }
+	}
+
+	/**
+	 * 重置状态
+	 */
+	const reset = () => {
+		state.previewUrl = ''
+		state.serverUrl = ''
+		state.tempFilePath = null
+		state.uploading = false
+	}
+
+	// 返回 reactive state 和方法
+	// state 作为 reactive 对象，在模板中通过 idCardFrontUpload.state.previewUrl 访问
+	return {
+		state,
+		setPreviewUrl,
+		chooseImage,
+		uploadImage,
+		getSubmitUrl,
+		reset
+	}
+}

huakai-app/pageSubPack/loginSub/change-pwd.vue

@@ -0,0 +1,207 @@
+<template>
+  <view class="reset-pwd-page">
+	  <view class="status_bar"></view>
+    <!-- 顶部导航栏 -->
+    <view class="nav-bar">
+      <uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
+      <view class="nav-title">修改密码</view>
+    </view>
+
+    <!-- 密码提示 -->
+    <view class="pwd-tips">密码为 6-16 位，需同时包含字母和数字</view>
+
+    <!-- 新密码输入框 -->
+    <view class="input-item">
+		<uni-easyinput  class="input-content"  type="password" v-model="newPassword"
+			placeholder="请输入密码" :inputBorder="false"  :placeholderStyle="placeholderStyle">
+		 </uni-easyinput>
+    </view>
+
+    <!-- 确认密码输入框 -->
+    <view class="input-item">
+		<uni-easyinput  class="input-content"  type="password" v-model="confirmPassword"
+					placeholder="请再次输入密码" :inputBorder="false"  :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+    </view>
+
+    <!-- 确定按钮 -->
+    <button 
+      class="confirm-btn" 
+	  :disabled="!canConfirm"
+      @click="handleConfirm"
+    >
+      确定
+    </button>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import {onLoad,onShow} from '@dcloudio/uni-app'
+import{getResetPassword} from '../api/api.js'
+import { showApiError } from '../api/request.js'
+
+
+// ========== 响应式数据 ==========
+// 新密码
+const newPassword = ref('');
+// 确认密码
+const confirmPassword = ref('');
+const placeholderStyle = ref('font-size:24rpx')
+// 定义接收上一页传来的参数
+const phone = ref('');
+const smsCode = ref('');
+
+// ========== 计算属性 ==========
+// 是否可点击确定按钮（密码格式正确 + 两次输入一致）
+const canConfirm = computed(() => {
+  // 密码格式规则：6-16位任意字符
+  const pwdReg = /^(?=.*[a-zA-Z])(?=.*\d).{6,16}$/;
+  // 校验条件：新密码符合格式 + 确认密码和新密码一致 + 均不为空
+  return pwdReg.test(newPassword.value) 
+    && newPassword.value === confirmPassword.value 
+    && newPassword.value && confirmPassword.value;
+});
+
+// ========== 方法 ==========
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack();
+};
+onShow(() => {
+  // 从缓存读取参数
+  const params = uni.getStorageSync('tempChangePwdParams') || {}; 
+  //  赋值
+  phone.value = params.phoneNumber
+  smsCode.value = params.verifyCode 
+  // 用完删除缓存（避免下次跳转读取旧值）
+  uni.removeStorageSync('tempChangePwdParams');
+});
+
+// 检查表单状态（实时更新按钮状态）
+const checkForm = () => {};
+
+// 处理确定按钮点击（修改密码逻辑）
+const handleConfirm = () => {
+  if (!canConfirm.value) return
+  let params = {
+	  phone:phone.value,
+	  smsCode:smsCode.value,
+	  newPassword:newPassword.value,
+	  confirmPassword:confirmPassword.value,
+	  scene:'reset'
+  }
+  getResetPassword(params).then(res =>{
+	if(res.code === 200){
+	  	//uni.setStorageSync('token', res.token); // 假设后端返回token字段
+	  	uni.showToast({ title: '修改成功', icon: 'success' });
+		setTimeout(() =>{
+			uni.navigateTo({ url: '/pageSubPack/loginSub/pwd-login' });
+		},1500)
+	  	
+	}
+	// else {
+	//  	uni.showToast({ title: "修改失败", icon: 'error' });
+	//}  
+  }).catch(err =>{
+	  	  showApiError(err)
+  })
+
+  
+};
+</script>
+
+<style scoped>
+/* 页面容器 */
+.reset-pwd-page {
+  padding: 20rpx 40rpx 40rpx;
+  min-height: 100vh;
+  background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF );
+}
+.status_bar{
+	width: 100%;
+	height: 46px;
+}
+
+/* 顶部导航栏 */
+.nav-bar {
+  display: flex;
+  align-items: center;
+  height: 88rpx;
+  margin-bottom: 60rpx;
+}
+
+.nav-title {
+  flex: 1;
+  text-align: center;
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #333;
+}
+
+/* 输入框通用样式 */
+.input-item {
+  background-color: #fff;
+  border-radius: 40rpx;
+  padding: 0 30rpx;
+  height: 88rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  display: flex;
+  align-items: center;
+}
+
+/* 输入框内容 */
+.input-content {
+  flex: 1;
+  font-size: 32rpx;
+  color: #333;
+  height: 100%;
+}
+
+/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+.input-content :deep(.uni-easyinput__content) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  background-color: transparent !important;
+}
+
+.input-content :deep(.uni-easyinput__content-input) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  line-height: 88rpx;
+}
+
+/* 密码提示 */
+.pwd-tips {
+  font-size: 24rpx;
+  color: #999;
+  margin-bottom: 20rpx;
+  padding-left: 10rpx;
+}
+
+/* 确定按钮 */
+.confirm-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  margin-top: 20rpx;
+  margin-top: 66rpx;
+}
+
+/* 确定按钮禁用状态 */
+.confirm-btn:disabled {
+  background-color: #99c8ff;
+  color: #fff;
+}
+/* 禁用按钮边框 */
+button:after{
+	border-radius:  8px;
+}
+</style>

huakai-app/pageSubPack/loginSub/forget-pwd.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="forget-page">
+		<view class="status_bar"></view>
+		<view class="nav-bar">
+		  <uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
+		  <view class="nav-title">忘记密码</view>
+		</view>
+		<!-- 手机号输入框 -->
+		<view class="input-item">
+		  <view class="input-icon">
+			  <image src="http://47.104.199.163:9090/images/login/phone.png" mode="" style="height: 100%;width: 100%;"></image>
+		  </view>
+		  <uni-easyinput  class="input-content"  type="number" v-model="phoneNumber"  trim="all"
+		  	  	   placeholder="请输入手机号" :inputBorder="false" maxlength="11"  :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+		</view>
+		<!-- 验证码输入 + 获取验证码按钮 -->
+		<view class="input-item verify-item">
+		  <view class="input-icon">
+			  <image src="http://47.104.199.163:9090/images/login/code.png" mode="" style="height: 100%;width: 100%;"></image>
+		    <!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+		  </view>
+		  <uni-easyinput  class="input-content verify-input"  type="number" v-model="verifyCode"  trim="all"
+		  	  	   placeholder="请输入验证码" :inputBorder="false" maxlength="6"  :placeholderStyle="placeholderStyle">
+		  		</uni-easyinput>
+		  <button 
+		    class="get-verify-btn" 
+		    :disabled="!canGetVerify || countDown > 0"
+		    @click="getVerifyCode"
+		  >
+		    {{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+		  </button>
+		</view>
+		<!-- 下一步 -->
+		<button 
+		  class="forget-btn" 
+		  :disabled="!canRegister"
+		  @click="handleNext"
+		>
+		  下一步
+		</button>
+		
+	</view>
+</template>
+<script setup>
+import { ref, computed, onUnmounted } from 'vue';	
+import {getSendCode} from '../api/api.js'
+import { showApiError } from '../api/request.js'
+
+// ====响应式数据======
+const phoneNumber = ref('')
+const verifyCode = ref('')
+
+const countDown = ref(0)
+let timer = null;
+const placeholderStyle = ref('font-size:24rpx')
+
+// ========== 计算属性 ==========
+// 是否可获取验证码（手机号格式正确）
+const canGetVerify = computed(() => {
+  const phoneReg = /^1[3-9]\d{9}$/;
+  return phoneReg.test(phoneNumber.value);
+});
+
+// 获取验证码
+const getVerifyCode = () => {
+  if (!canGetVerify.value) return;
+  let params = {
+  	  phone:phoneNumber.value,
+  	  scene:'reset'
+  }
+  getSendCode(params).then(res =>{
+  	  if(res.code === 200){
+  		 uni.showToast({
+  		   title: '验证码已发送',
+  		   icon: 'success'
+  		 }); 
+		// 开始60秒倒计时
+		countDown.value = 60;
+		timer = setInterval(() => {
+		  countDown.value--;
+		  if (countDown.value <= 0) {
+		    clearInterval(timer);
+		    timer = null;
+		  }
+		}, 1000); 
+  		
+  	  // }else{
+  		 // uni.showToast({
+  		   // title: '验证码发送失败',
+  		   // icon: 'error'
+  		 // }); 
+  	  }
+  }).catch(err =>{
+	  	  showApiError(err)
+  })
+
+  
+};
+// 是否下一步
+const canRegister = computed(() => {
+  const phoneReg = /^1[3-9]\d{9}$/; // 手机号11位
+  const verifyReg = /^\d{6}$/; // 验证码6位
+
+  return phoneReg.test(phoneNumber.value) 
+    && verifyReg.test(verifyCode.value) 
+});
+// 下一步
+const handleNext = () =>{
+	  //  把参数存到本地缓存
+	uni.setStorageSync('tempChangePwdParams', {
+	    phoneNumber:phoneNumber.value,
+	    verifyCode: verifyCode.value
+	  });
+	  if(!canRegister.value){
+		  uni.showToast({ title: '请输入',icon: 'error'});
+		  return
+	  }
+	uni.navigateTo({
+	    url: '/pageSubPack/loginSub/change-pwd'
+	});
+}
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack();
+};
+	
+</script>
+<style scoped>
+.forget-page{
+	padding: 20rpx 40rpx 40rpx;
+	min-height: 100vh;
+	background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF );
+}	
+.status_bar{
+	width: 100%;
+	height: 46px;
+}
+/* 顶部导航栏 */
+.nav-bar {
+  display: flex;
+  align-items: center;
+  /* height: 88rpx; */
+  margin-bottom: 70rpx;
+}
+
+.nav-title {
+  flex: 1;
+  text-align: center;
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #333;
+  margin-right: 100rpx;
+}
+/* 输入框通用样式 */
+.input-item {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 40rpx;
+  padding: 0 30rpx;
+  height: 88rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 验证码输入项特殊布局 */
+.verify-item {
+  position: relative;
+  padding-right: 220rpx;
+}
+
+/* 输入框图标 */
+.input-icon {
+  margin-right: 20rpx;
+  color: #999;
+  width: 50rpx;
+  height: 50rpx;
+}
+
+/* 输入框内容 */
+.input-content {
+  flex: 1;
+  font-size: 32rpx;
+  color: #333;
+  height: 100%;
+}
+
+/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+.input-content :deep(.uni-easyinput__content) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  background-color: transparent !important;
+}
+
+.input-content :deep(.uni-easyinput__content-input) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  line-height: 88rpx;
+}
+
+.verify-input {
+  padding-right: 20rpx;
+}
+/* 获取验证码按钮 */
+.get-verify-btn {
+  position: absolute;
+  right: 10rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 200rpx;
+  height: 70rpx;
+  line-height: 70rpx;
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 35rpx;
+  font-size: 28rpx;
+  padding: 0;
+  margin: 0;
+}
+
+.get-verify-btn:disabled {
+  background-color: #ccc;
+  color: #fff;
+}
+.get-verify-btn::after{
+	border-radius: 50px;
+}
+/* 下一步按钮 */
+.forget-btn{
+	width: 100%;
+	height: 88rpx;
+	line-height: 88rpx;
+	background-color: #007aff;
+	color: #fff;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	margin-bottom: 40rpx;
+	margin-top: 66rpx;
+}
+.forget-btn:disabled{
+	background-color: #99c8ff;
+	color: #fff;
+}
+/* 禁用按钮边框 */
+.forget-btn:after{
+	border-radius:  8px;
+}
+
+	
+</style>

huakai-app/pageSubPack/loginSub/login.vue

@@ -0,0 +1,403 @@
+<template>
+  <view class="login-page">
+	  <view class="status_bar"></view>
+    <!-- 自定义导航栏：返回按钮 — 用户可拒绝登录 -->
+    <view class="custom-nav">
+      <view class="back-btn" @click="handleCancel">
+        <uni-icons type="arrow-left" size="24" color="#333"></uni-icons>
+        <text class="back-text">返回</text>
+      </view>
+    </view>
+    <!-- 登录标题 -->
+    <view class="login-title">手机验证码登录</view>
+
+    <!-- 手机号输入框 -->
+    <view class="input-item">
+      <view class="input-icon">
+        <!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
+		<image src="https://wuyeadmin.bugtc.com/images/login/phone.png" mode="" style="height: 100%;width: 100%;"></image>
+      </view>
+	   <uni-easyinput  class="input-content"  type="number" v-model="phoneNumber"
+	  	   placeholder="请输入手机号" :inputBorder="false" maxlength="11"  :placeholderStyle="placeholderStyle">
+	  	   </uni-easyinput>
+    </view>
+
+    <!-- 验证码输入框 + 获取验证码按钮 -->
+    <view class="input-item verify-item">
+      <view class="input-icon">
+		<image src="https://wuyeadmin.bugtc.com/images/login/code.png" mode="" style="height: 100%;width: 100%;"></image>
+      </view>
+	  <uni-easyinput  class="input-content verify-input"  type="number" v-model="verifyCode"
+	  	  	   placeholder="请输入验证码" :inputBorder="false" maxlength="6"  :placeholderStyle="placeholderStyle">
+		</uni-easyinput>
+      <button
+        class="get-verify-btn"
+        :disabled="!canGetVerify || countDown > 0"
+        @click="getVerifyCode"
+      >
+        {{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+      </button>
+    </view>
+
+    <!-- 协议勾选 -->
+    <view class="agreement-item" >
+		<view @click="toggleAgreement">
+			<uni-icons
+			  type="checkbox-filled"
+			  size="24"
+			  color="#007aff"
+			  v-if="agreeAgreement"
+			></uni-icons>
+			<uni-icons
+			  type="checkbox"
+			  size="24"
+			  color="#999"
+			  v-else
+			></uni-icons>
+		</view>
+      <text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意<text class="agreePrivacy" @click.stop="goToPrivacy">《用户隐私政策》</text></text>
+    </view>
+
+    <!-- 登录按钮 -->
+    <button
+      class="login-btn"
+      @click="handleLogin"
+    >
+      登录
+    </button>
+
+    <!-- 底部链接 -->
+    <view class="bottom-link">
+      <navigator class="link-item" url="/pageSubPack/loginSub/pwd-login">账号密码登录</navigator>
+      <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onUnmounted } from 'vue';
+import {getLoginBySms,getSendCode} from '../api/api.js'
+import { showApiError } from '../api/request.js'
+import { saveLoginData } from '../api/auth.js'
+
+// ========== 响应式数据 ==========
+// 手机号
+const phoneNumber = ref('');
+// 验证码
+const verifyCode = ref('');
+const placeholderStyle = ref('font-size:24rpx')
+// 是否同意协议
+const agreeAgreement = ref(false); // 默认不勾选
+// 倒计时（秒）
+const countDown = ref(0);
+// 定时器
+let timer = null;
+
+// ========== 计算属性 ==========
+// 是否可以获取验证码（手机号格式正确）
+const canGetVerify = computed(() => {
+  // 手机号正则：11位数字，以1开头
+  const phoneReg = /^1[3-9]\d{9}$/;
+  return phoneReg.test(phoneNumber.value);
+});
+
+// 是否可以登录（手机号+验证码+协议都满足）
+const canLogin = computed(() => {
+  const phoneReg = /^1[3-9]\d{9}$/;
+  const verifyReg = /^\d{6}$/;
+  return phoneReg.test(phoneNumber.value) && verifyReg.test(verifyCode.value) && agreeAgreement.value;
+});
+
+// ========== 方法 ==========
+// 用户取消登录 — 返回上一页
+const handleCancel = () => {
+  const pages = getCurrentPages();
+  if (pages.length > 1) {
+    uni.navigateBack();
+  } else {
+    uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+  }
+};
+
+// 检查表单状态
+const checkForm = () => {
+  // 无需额外逻辑，计算属性已实时监听
+};
+
+// 切换协议勾选状态
+const toggleAgreement = () => {
+  agreeAgreement.value = !agreeAgreement.value;
+};
+// 跳转隐私协议
+const goToPrivacy = () => {
+  uni.navigateTo({
+    url:'/pageSubPack/loginSub/privacy',
+  })
+}
+
+// 获取验证码
+const getVerifyCode = () => {
+  if (!canGetVerify.value) return;
+  let params = {
+  	  phone:phoneNumber.value,
+  	  scene:'login'
+  }
+  uni.showLoading({ title: '发送中...', mask: true });
+  getSendCode(params).then(res =>{
+  	  if(res.code === 200){
+		  uni.hideLoading();
+  		 uni.showToast({
+  		   title: '验证码已发送',
+  		   icon: 'success'
+  		 });
+		 // 开始60秒倒计时
+		 countDown.value = 60;
+		 timer = setInterval(() => {
+		   countDown.value--;
+		   if (countDown.value <= 0) {
+		     clearInterval(timer);
+		     timer = null;
+		   }
+		 }, 1000);
+	  }
+  }).catch(err => {
+    showApiError(err)
+  })
+
+};
+
+// 登录处理
+const handleLogin = () => {
+  if (!phoneNumber.value) {
+    uni.showToast({ title: '请输入手机号', icon: 'none' });
+    return;
+  }
+  if (!/^1[3-9]\d{9}$/.test(phoneNumber.value)) {
+    uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+    return;
+  }
+  if (!verifyCode.value) {
+    uni.showToast({ title: '请输入验证码', icon: 'none' });
+    return;
+  }
+  if (!/^\d{6}$/.test(verifyCode.value)) {
+    uni.showToast({ title: '验证码为 6 位数字', icon: 'none' });
+    return;
+  }
+  if (!agreeAgreement.value) {
+    uni.showToast({ title: '请勾选协议', icon: 'none' });
+    return;
+  }
+   uni.showLoading({ title: '登录中...', mask: true });
+  let params = {
+	phone:phoneNumber.value,
+	smsCode:verifyCode.value,
+	scene:'login',
+  }
+  getLoginBySms(params).then(res =>{
+  	if(res.code === 200){
+		if(res.data){
+			saveLoginData(res.data);
+			uni.hideLoading();
+			uni.showToast({ title: '登录成功', icon: 'success' });
+			setTimeout(() =>{
+				// 登录成功后返回来源页
+				uni.navigateBack({
+					fail: () => {
+						uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+					}
+				});
+			},1500)
+		}
+  	}
+
+  }).catch(err => {
+		showApiError(err)
+	})
+
+  uni.hideLoading()
+};
+
+// ========== 生命周期 ==========
+// 页面卸载时清除定时器
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+  }
+});
+</script>
+
+<style scoped>
+/* 页面容器 */
+.login-page {
+  padding: 80rpx 40rpx 40rpx;
+  /* background-color: #f8f9fa; */
+  min-height: 100vh;
+  background: repeating-linear-gradient(to bottom, #E2F0FF, #F6FAFF );
+}
+  .status_bar {
+	 height: var(--status-bar-height, 88rpx);
+	 width: 100%;
+	}
+
+/* ===== 自定义导航：返回/取消按钮 ===== */
+.custom-nav {
+  margin-bottom: 20rpx;
+}
+.back-btn {
+  display: inline-flex;
+  align-items: center;
+  padding: 10rpx 20rpx;
+  background: rgba(255,255,255,0.9);
+  border-radius: 30rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
+}
+.back-text {
+  font-size: 28rpx;
+  color: #333;
+  margin-left: 6rpx;
+}
+
+/* 登录标题 */
+.login-title {
+  font-size: 52rpx;
+  font-weight: 600;
+  color: #333;
+  text-align: center;
+  margin-bottom: 80rpx;
+}
+
+/* 输入框项 */
+.input-item {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 40rpx;
+  padding: 0 30rpx;
+  height: 88rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 验证码输入项（特殊布局） */
+.verify-item {
+  position: relative;
+  padding-right: 220rpx;
+}
+
+/* 输入框图标 */
+.input-icon {
+	width: 50rpx;
+	height: 50rpx;
+  margin-right: 20rpx;
+  color: #999;
+}
+
+/* 输入框内容 */
+.input-content {
+  flex: 1;
+  font-size: 32rpx;
+  color: #333;
+  height: 100%;
+}
+
+/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+.input-content :deep(.uni-easyinput__content) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  background-color: transparent !important;
+}
+
+.input-content :deep(.uni-easyinput__content-input) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  line-height: 88rpx;
+}
+
+/* 验证码输入框 */
+.verify-input {
+  padding-right: 20rpx;
+}
+
+/* 获取验证码按钮 */
+.get-verify-btn {
+  position: absolute;
+  right: 10rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 200rpx;
+  height: 70rpx;
+  line-height: 70rpx;
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 35rpx;
+  font-size: 28rpx;
+  padding: 0;
+  margin: 0;
+}
+
+/* 获取验证码按钮禁用状态 */
+.get-verify-btn:disabled {
+  background-color: #ccc;
+  color: #fff;
+  border-radius: 50px;
+}
+.get-verify-btn::after{
+	border-radius: 50px;
+}
+
+/* 协议勾选项 */
+.agreement-item {
+  display: flex;
+  align-items: center;
+  margin: 70rpx 0 28rpx 0;
+  padding-left: 10rpx;
+}
+
+/* 协议文本 */
+.agreement-text {
+  font-size: 24rpx;
+  color: #666;
+  margin-left: 10rpx;
+}
+.agreePrivacy{
+	color: #2F77FD;
+}
+/* 登录按钮 */
+.login-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  margin-bottom: 60rpx;
+}
+
+/* 登录按钮禁用状态 */
+.login-btn:disabled {
+  background-color: #99c8ff;
+  color: #fff;
+}
+/* 禁用按钮边框 */
+button:after{
+	border-radius:  8px;
+}
+
+/* 底部链接 */
+.bottom-link {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20rpx;
+}
+
+/* 链接项 */
+.link-item {
+  font-size: 28rpx;
+  color: #007aff;
+  text-decoration: none;
+}
+</style>

huakai-app/pageSubPack/loginSub/privacy.vue

@@ -0,0 +1,169 @@
+<template>
+  <view class="privacy-page">
+    
+    <!-- 协议内容 -->
+    <scroll-view class="privacy-content" scroll-y>
+      <view class="content-wrap">
+        <view class="title">隐私政策</view>
+        
+        <view class="section">
+          <!-- <view class="section-title">一、适用范围</view> -->
+          <view class="section-text">
+			  欢迎使用我们的产品/服务（以下统称“服务”）。我们高度重视用户隐私保护，
+			  致力于为您提供安全、可靠的服务体验。本隐私政策旨在向您说明我们如何收集、使用、存储、保护您的个人信息，
+			  以及您享有的相关权利。请您在使用我们的服务前，仔细阅读并理解本政策全部内容，
+			  一旦您使用我们的服务，即视为您同意本政策的所有条款。
+			   一、我们收集的个人信息 为了向您提供更优质、个性化的服务，我们会根据服务功能的需要，收集您主动提供或在使用服务过程中产生的个人信息，
+			   具体如下： （一）您主动提供的信息 账户注册信息：当您注册我们的账户时，您可能需要提供姓名、手机号码、电子邮箱、密码等信息，用于身份验证、账户登录及找回。
+				服务相关信息：根据您使用的具体服务，您可能需要提供相关补充信息（如使用客服咨询服务时，提供问题描述及相关凭证；使用交易类服务时，提供收货地址、支付相关信息等）。
+				 自愿提交的信息：您主动向我们反馈的意见、建议，或参与我们的问卷调查、活动时提交的相关信息。
+				 若您通过第三方平台（如微信、支付宝、QQ等）登录我们的服务，我们会根据您的授权，
+				 从第三方获取您的相关账户信息（如昵称、头像），用于完成登录及账户绑定，
+				 我们不会获取第三方平台的其他未授权信息。
+          
+          </view>
+        </view>
+
+      </view>
+    </scroll-view>
+	    <!-- 底部同意按钮（新增） -->
+	  <!--  <view class="agree-btn-wrap" v-if="needAgree">
+	      <button class="agree-btn" @click="agreePrivacy">同意隐私政策</button>
+	    </view> -->
+  </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app';
+
+// 返回上一页
+// const navigateBack = () => {
+//   uni.navigateBack({
+//     delta: 1
+//   });
+// };
+// 页面加载
+// onLoad((options) => {
+//   // 判断是否需要同意
+//   if (options.needAgree === '1') {
+//     needAgree.value = true;
+//   }
+// });
+
+// 返回上一页
+// const goToBack = () => {
+//   uni.navigateBack({
+//     delta: 1
+//   });
+// };
+
+// 同意隐私政策（新增）
+// const agreePrivacy = () => {
+//   // #ifdef MP-WEIXIN
+//   wx.requirePrivacyAuthorize({
+//     success: () => {
+//       uni.showToast({
+//         title: '已同意隐私政策',
+//         icon: 'success'
+//       });
+//       // 记录授权状态（可选，存入本地缓存）
+//       uni.setStorageSync('privacyAgreed', true);
+//       navigateBack();
+//     },
+//     fail: () => {
+//       uni.showToast({
+//         title: '授权失败',
+//         icon: 'none'
+//       });
+//     }
+//   });
+//   // #endif
+  
+//   // 非微信小程序直接标记同意
+//   // #ifndef MP-WEIXIN
+//   uni.setStorageSync('privacyAgreed', true);
+//   uni.showToast({
+//     title: '已同意隐私政策',
+//     icon: 'success'
+//   });
+//   navigateBack();
+//   // #endif
+// };
+</script>
+
+<style scoped>
+.privacy-page {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+}
+
+/* 导航栏 */
+.nav-bar {
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #eee;
+}
+.nav-back {
+  display: flex;
+  align-items: center;
+}
+.back-text {
+  font-size: 30rpx;
+  color: #333;
+  margin-left: 10rpx;
+}
+.nav-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-left: 60rpx;
+}
+
+/* 协议内容 */
+.privacy-content {
+  height: calc(100vh - 88rpx);
+}
+.content-wrap {
+  padding: 30rpx;
+}
+.title {
+  font-size: 28rpx;
+  font-weight: 600;
+  text-align: center;
+  margin-bottom: 40rpx;
+  color: #333;
+}
+.section {
+  margin-bottom: 30rpx;
+  padding: 0 20rpx;
+}
+.section-title {
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+.section-text {
+  font-size: 28rpx;
+  line-height: 1.6;
+  color: #666;
+}
+/* 同意按钮样式（新增） */
+.agree-btn-wrap {
+  padding: 20rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  border-top: 1rpx solid #eee;
+}
+.agree-btn {
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 8rpx;
+  height: 88rpx;
+  font-size: 32rpx;
+}
+</style>

huakai-app/pageSubPack/loginSub/pwd-login.vue

@@ -0,0 +1,320 @@
+<template>
+  <view class="login-page">
+	  <view class="status_bar"></view>
+    <!-- 自定义导航栏：返回按钮 — 用户可拒绝登录 -->
+    <view class="custom-nav">
+      <view class="back-btn" @click="handleCancel">
+        <uni-icons type="arrow-left" size="24" color="#333"></uni-icons>
+        <text class="back-text">返回</text>
+      </view>
+    </view>
+    <!-- 标题 -->
+    <view class="login-title">账号密码登录</view>
+
+    <!-- 手机号输入框 -->
+    <view class="input-item">
+      <view class="input-icon">
+        <!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
+		<image src="https://wuyeadmin.bugtc.com/images/login/phone.png" mode="" style="height: 100%;width: 100%;"></image>
+      </view>
+	  <uni-easyinput  class="input-content"  type="text" v-model="phoneNumber"
+	   placeholder="请输入帐号" :inputBorder="false"  :placeholderStyle="placeholderStyle">
+	   </uni-easyinput>
+    </view>
+
+    <!-- 密码输入框 -->
+    <view class="input-item">
+      <view class="input-icon">
+        <!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+		<image src="https://wuyeadmin.bugtc.com/images/login/password.png" mode="" style="height: 100%;width: 100%;"></image>
+      </view>
+	  <uni-easyinput  class="input-content"  type="password" v-model="password"
+	   placeholder="请输入密码" :inputBorder="false"  :placeholderStyle="placeholderStyle">
+	   </uni-easyinput>
+
+    </view>
+
+    <!-- 协议勾选 + 忘记密码 -->
+    <view class="agreement-wrap">
+      <view class="agreement-item">
+		  <view @click="toggleAgreement">
+			 <uni-icons
+			   type="checkbox-filled"
+			   size="24"
+			   color="#007aff"
+			   v-if="agreeAgreement"
+			 ></uni-icons>
+			 <uni-icons
+			   type="checkbox"
+			   size="24"
+			   color="#999"
+			   v-else
+			 ></uni-icons>
+		  </view>
+
+        <text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
+			<text  class="agreePrivacy" @click.stop="goToPrivacy">《用户隐私政策》</text>
+		</text>
+      </view>
+      <navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
+    </view>
+
+    <!-- 登录按钮 -->
+    <button
+      class="login-btn"
+      @click="handleLogin"
+    >
+      登录
+    </button>
+
+    <!-- 底部链接 -->
+    <view class="bottom-link">
+      <navigator class="link-item" url="/pageSubPack/loginSub/login">验证码登录</navigator>
+      <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import {onLoad} from "@dcloudio/uni-app"
+import {getLoginPassword} from '../api/api.js'
+import { showApiError } from '../api/request.js'
+import { saveLoginData } from '../api/auth.js'
+
+// 响应式数据
+const phoneNumber = ref('');
+const password = ref('');
+const agreeAgreement = ref(false); // 默认勾选
+const placeholderStyle = ref('font-size:24rpx')
+
+
+// 计算属性：是否可登录（帐号+密码+协议都满足）
+const canLogin = computed(() => {
+  const phoneReg = /^[a-zA-Z0-9_-]{4,16}$/; // 4-16位
+  const pwdReg = /^.{6,16}$/; // 密码6-16位
+  return phoneReg.test(phoneNumber.value) && pwdReg.test(password.value) && agreeAgreement.value;
+});
+
+// 切换协议勾选
+const toggleAgreement = () => {
+  agreeAgreement.value = !agreeAgreement.value;
+};
+
+// 跳转隐私协议
+const goToPrivacy = () => {
+  uni.navigateTo({
+    url:'/pageSubPack/loginSub/privacy',
+  })
+}
+
+// 检查表单
+const checkForm = () => {};
+
+// 用户取消登录 — 返回上一页
+const handleCancel = () => {
+  const pages = getCurrentPages();
+  if (pages.length > 1) {
+    uni.navigateBack();
+  } else {
+    uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+  }
+};
+
+
+onLoad(() =>{
+});
+
+// 登录逻辑
+const handleLogin = () => {
+
+  if (!phoneNumber.value) {
+		uni.showToast({ title: '请输入账号', icon: 'none' });
+		return;
+  }
+  if (phoneNumber.value.length < 4 || phoneNumber.value.length > 16) {
+		uni.showToast({ title: '账号长度需为 4-16 位', icon: 'none' });
+		return;
+  }
+  if (!password.value) {
+		uni.showToast({ title: '请输入密码', icon: 'none' });
+		return;
+  }
+  if (password.value.length < 6) {
+		uni.showToast({ title: '密码至少输入 6 位', icon: 'none' });
+		return;
+  }
+  if (password.value.length > 16) {
+		uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
+		return;
+  }
+  if(!agreeAgreement.value){
+	  uni.showToast({ title: '请勾选协议', icon: 'none' });
+	  return;
+  }
+   uni.showLoading({ title: '登录中...', mask: true });
+  	let params = {
+  		username:phoneNumber.value,
+  		password:password.value
+  	}
+  	getLoginPassword(params).then(res =>{
+  		if(res.code === 200){
+  			saveLoginData(res.data);
+			uni.hideLoading();
+			uni.showToast({ title: '登录成功', icon: 'success' });
+			setTimeout(() =>{
+				// 登录成功后返回来源页
+				uni.navigateBack({
+					fail: () => {
+						uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+					}
+				});
+			},1000)
+  		}
+
+  	}).catch(err => {
+		// console.log(err)
+				showApiError(err)
+	})
+
+};
+</script>
+
+<style scoped>
+.login-page {
+  padding: 80rpx 40rpx 40rpx;
+  /* background-color: #f8f9fa; */
+  min-height: 100vh;
+   background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF );
+}
+ .status_bar {
+	 height: var(--status-bar-height, 88rpx);
+	 width: 100%;
+	}
+
+/* ===== 自定义导航：返回/取消按钮 ===== */
+.custom-nav {
+  margin-bottom: 20rpx;
+}
+.back-btn {
+  display: inline-flex;
+  align-items: center;
+  padding: 10rpx 20rpx;
+  background: rgba(255,255,255,0.9);
+  border-radius: 30rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
+}
+.back-text {
+  font-size: 28rpx;
+  color: #333;
+  margin-left: 6rpx;
+}
+
+.login-title {
+  font-size: 52rpx;
+  font-weight: 600;
+  color: #333;
+  text-align: center;
+  margin-bottom: 80rpx;
+}
+
+.input-item {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 40rpx;
+  padding: 0 30rpx;
+  height: 88rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+.input-icon {
+  margin-right: 20rpx;
+  width: 50rpx;
+  height: 50rpx;
+}
+
+.input-content {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333;
+  height: 100%;
+}
+
+/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+.input-content :deep(.uni-easyinput__content) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  background-color: transparent !important;
+}
+
+.input-content :deep(.uni-easyinput__content-input) {
+  height: 100% !important;
+  min-height: unset !important;
+  padding: 0 !important;
+  line-height: 88rpx;
+}
+
+.agreement-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 70rpx 0 28rpx 0;
+  padding: 0 10rpx;
+}
+
+.agreement-item {
+  display: flex;
+  align-items: center;
+}
+
+.agreement-text {
+  font-size: 24rpx;
+  color: #666;
+  margin-left: 10rpx;
+}
+.agreePrivacy{
+	color: #2F77FD;
+}
+
+.forget-pwd {
+  font-size: 24rpx;
+  color: #666;
+  text-decoration: none;
+}
+
+.login-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  margin-bottom: 60rpx;
+}
+
+.login-btn:disabled {
+  background-color: #99c8ff;
+  color: #fff;
+
+}
+/* 禁用按钮边框 */
+button:after{
+	border-radius:  8px;
+}
+
+.bottom-link {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 20rpx;
+}
+
+.link-item {
+  font-size: 28rpx;
+  color: #007aff;
+  text-decoration: none;
+}
+</style>

huakai-app/pageSubPack/loginSub/register-new-user.vue

@@ -0,0 +1,450 @@
+<template>
+	<view class="register-page">
+		<view class="status_bar"></view>
+		<!-- 顶部导航 -->
+		<view class="nav-bar">
+			<uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
+			<view class="nav-title">注册</view>
+		</view>
+
+		<!-- 注册标题 -->
+		<view class="register-title">注册用户</view>
+
+		<!-- 手机号输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<image src="https://wuyeadmin.bugtc.com/images/login/phone.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+			</view>
+			<uni-easyinput class="input-content" type="number" v-model="phoneNumber" placeholder="请输入手机号"
+				:inputBorder="false" maxlength="11" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+		</view>
+
+		<!-- 验证码输入 + 获取验证码按钮 -->
+		<view class="input-item verify-item">
+			<view class="input-icon">
+				<image src="https://wuyeadmin.bugtc.com/images/login/code.png" mode="" style="height: 100%;width: 100%;">
+				</image>
+				<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+			</view>
+			<uni-easyinput class="input-content verify-input" type="number" v-model="verifyCode" placeholder="请输入验证码"
+				:inputBorder="false" maxlength="6" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+
+			<button class="get-verify-btn" :disabled="!canGetVerify || countDown > 0" @click="getVerifyCode">
+				{{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+			</button>
+		</view>
+
+		<!-- 账号输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<image src="https://wuyeadmin.bugtc.com/images/login/account.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+				<!-- <uni-icons type="person" size="24" color="#999"></uni-icons> -->
+			</view>
+			<uni-easyinput class="input-content" type="text" v-model="account" placeholder="请输入账号" :inputBorder="false"
+				:placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+
+		</view>
+
+		<!-- 密码输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<image src="https://wuyeadmin.bugtc.com/images/login/password.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+				<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+			</view>
+			<uni-easyinput class="input-content" type="password" v-model="password" placeholder="请输入密码"
+				:inputBorder="false" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+
+		</view>
+		<!-- 协议勾选 -->
+		<view class="agreement-item">
+			<view @click="toggleAgreement">
+				<uni-icons type="checkbox-filled" size="24" color="#007aff" v-if="agreeAgreement"></uni-icons>
+				<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
+			</view>
+			<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意<text
+					class="agreePrivacy">《用户隐私政策》</text></text>
+		</view>
+
+
+		<!-- 立即注册按钮 -->
+		<button class="register-btn" @click="handleRegister">
+			立即注册
+		</button>
+
+		<!-- 跳转登录链接 -->
+		<view class="login-link">
+			<navigator class="link-item" url="/pageSubPack/loginSub/login">已有账号，去登录</navigator>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		computed,
+		onUnmounted
+	} from 'vue';
+	import {
+		getRegisterUser,
+		getSendCode
+	} from '../api/api.js'
+
+	// ========== 响应式数据 ==========
+	// 表单数据
+import { showApiError } from '../api/request.js'
+	const phoneNumber = ref('');
+	const verifyCode = ref('');
+	const account = ref('');
+	const password = ref('');
+	const placeholderStyle = ref('font-size:24rpx')
+	// 协议勾选
+	const agreeAgreement = ref(false);
+	// 验证码倒计时
+	const countDown = ref(0);
+	let timer = null;
+
+	// ========== 计算属性 ==========
+	// 是否可获取验证码（手机号格式正确）
+	const canGetVerify = computed(() => {
+		const phoneReg = /^1[3-9]\d{9}$/;
+		return phoneReg.test(phoneNumber.value);
+	});
+
+	// 是否可注册（所有表单项+协议都满足）
+	const canRegister = computed(() => {
+		const phoneReg = /^1[3-9]\d{9}$/; // 手机号11位
+		const verifyReg = /^\d{6}$/; // 验证码6位
+		const accountReg = /^.{4,20}$/; // 账号4-20位
+		const pwdReg = /^.{6,16}$/; // 密码6-16位
+
+		return phoneReg.test(phoneNumber.value) &&
+			verifyReg.test(verifyCode.value) &&
+			accountReg.test(account.value) &&
+			pwdReg.test(password.value) &&
+			agreeAgreement.value;
+	});
+
+	// ========== 方法 ==========
+	// 返回上一页
+	const goBack = () => {
+		uni.navigateBack();
+	};
+
+	// 切换协议勾选状态
+	const toggleAgreement = () => {
+		agreeAgreement.value = !agreeAgreement.value;
+	};
+	// 跳转隐私协议
+	const goToPrivacy = () => {
+		uni.navigateTo({
+			url: '/pageSubPack/loginSub/privacy',
+		})
+	}
+	// 检查表单状态（实时更新按钮状态）
+	const checkForm = () => {};
+
+
+	// 获取验证码
+	const getVerifyCode = () => {
+		if (!canGetVerify.value) return;
+		let params = {
+			phone: phoneNumber.value,
+			scene: 'register'
+		}
+		getSendCode(params).then(res => {
+			if (res.code === 200) {
+				uni.showToast({
+					title: '验证码已发送',
+					icon: 'success'
+				});
+				// 开始60秒倒计时
+				countDown.value = 60;
+				timer = setInterval(() => {
+					countDown.value--;
+					if (countDown.value <= 0) {
+						clearInterval(timer);
+						timer = null;
+					}
+				}, 1000);
+
+			// } else {
+				// uni.showToast({
+					// title: '验证码发送失败',
+					// icon: 'error'
+				// });
+			}
+		}).catch(err => {
+						showApiError(err)
+		})
+
+
+	};
+
+	// 处理注册逻辑
+	const handleRegister = () => {
+		if (!phoneNumber.value) {
+			uni.showToast({ title: '请输入手机号', icon: 'none' });
+			return;
+		}
+		if (!/^1[3-9]\d{9}$/.test(phoneNumber.value)) {
+			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+			return;
+		}
+		if (!verifyCode.value) {
+			uni.showToast({ title: '请输入验证码', icon: 'none' });
+			return;
+		}
+		if (!/^\d{6}$/.test(verifyCode.value)) {
+			uni.showToast({ title: '验证码为 6 位数字', icon: 'none' });
+			return;
+		}
+		if (!account.value) {
+			uni.showToast({ title: '请输入账号', icon: 'none' });
+			return;
+		}
+		if (account.value.length < 4 || account.value.length > 20) {
+			uni.showToast({ title: '账号长度需为 4-20 位', icon: 'none' });
+			return;
+		}
+		if (!password.value) {
+			uni.showToast({ title: '请输入密码', icon: 'none' });
+			return;
+		}
+		if (password.value.length < 6) {
+			uni.showToast({ title: '密码至少输入 6 位', icon: 'none' });
+			return;
+		}
+		if (password.value.length > 16) {
+			uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
+			return;
+		}
+		if (!agreeAgreement.value) {
+			uni.showToast({ title: '请勾选协议', icon: 'none' });
+			return;
+		}
+		uni.showLoading({
+			title: '注册中...',
+			mask: true
+		});
+		let params = {
+			phone: phoneNumber.value,
+			smsCode: verifyCode.value,
+			username: account.value,
+			password: password.value
+		}
+		getRegisterUser(params).then(res => {
+			if (res.code === 200) {
+				uni.hideLoading();
+				uni.showToast({
+					title: '注册成功',
+					icon: 'success'
+				});
+				setTimeout(() => {
+					uni.redirectTo({
+						url: '/pageSubPack/loginSub/pwd-login'
+					});
+				}, 1500);
+
+			// } else {
+				// uni.showToast({
+					// title: '注册失败',
+					// icon: 'error'
+				// });
+			}
+		}).catch((err) => {
+						showApiError(err)
+		})
+		// 注册成功后跳转到登录页
+		// uni.redirectTo({
+		//   url: '/pages/login/pwd-login'
+		// });
+
+		// setTimeout(() => { 
+
+		// }, 1500);
+	};
+
+	// ========== 生命周期 ==========
+	// 页面卸载时清除定时器
+	onUnmounted(() => {
+		if (timer) {
+			clearInterval(timer);
+		}
+	});
+</script>
+
+<style scoped>
+	/* 页面容器 */
+	.register-page {
+		padding: 20rpx 40rpx 40rpx;
+		/* background-color: #f8f9fa; */
+		min-height: 100vh;
+		background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF);
+	}
+
+	.status_bar {
+		height: 46px;
+		width: 100%;
+	}
+
+	/* 顶部导航栏 */
+	.nav-bar {
+		display: flex;
+		align-items: center;
+		/* height: 88rpx; */
+		margin-bottom: 70rpx;
+	}
+
+	.nav-title {
+		flex: 1;
+		text-align: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #333;
+		margin-right: 100rpx;
+	}
+
+	/* 注册标题 */
+	.register-title {
+		font-size: 40rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 60rpx;
+	}
+
+	/* 输入框通用样式 */
+	.input-item {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 40rpx;
+		padding: 0 30rpx;
+		height: 88rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	/* 验证码输入项特殊布局 */
+	.verify-item {
+		position: relative;
+		padding-right: 220rpx;
+	}
+
+	/* 输入框图标 */
+	.input-icon {
+		margin-right: 20rpx;
+		color: #999;
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	/* 输入框内容 */
+	.input-content {
+		flex: 1;
+		font-size: 32rpx;
+		color: #333;
+		height: 100%;
+	}
+
+	/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+	.input-content :deep(.uni-easyinput__content) {
+		height: 100% !important;
+		min-height: unset !important;
+		padding: 0 !important;
+		background-color: transparent !important;
+	}
+
+	.input-content :deep(.uni-easyinput__content-input) {
+		height: 100% !important;
+		min-height: unset !important;
+		padding: 0 !important;
+		line-height: 88rpx;
+	}
+
+	.verify-input {
+		padding-right: 20rpx;
+	}
+
+	/* 获取验证码按钮 */
+	.get-verify-btn {
+		position: absolute;
+		right: 10rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 200rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		background-color: #007aff;
+		color: #fff;
+		border-radius: 35rpx;
+		font-size: 26rpx;
+		padding: 0;
+		margin: 0;
+	}
+
+	.get-verify-btn:disabled {
+		background-color: #ccc;
+		color: #fff;
+	}
+
+	.get-verify-btn::after {
+		border-radius: 50px;
+	}
+
+	/* 协议勾选项 */
+	.agreement-item {
+		display: flex;
+		align-items: center;
+		margin: 70rpx 0 28rpx 0;
+		padding-left: 10rpx;
+	}
+
+	.agreement-text {
+		font-size: 24rpx;
+		color: #666;
+		margin-left: 10rpx;
+	}
+
+	.agreePrivacy {
+		color: #2F77FD;
+	}
+
+	/* 立即注册按钮 */
+	.register-btn {
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		background-color: #007aff;
+		color: #fff;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		margin-bottom: 40rpx;
+	}
+
+	button:after {
+		border-radius: 8px;
+	}
+
+	.register-btn:disabled {
+		background-color: #99c8ff;
+		color: #fff;
+	}
+
+	/* 跳转登录链接 */
+	.login-link {
+		text-align: center;
+	}
+
+	.link-item {
+		font-size: 28rpx;
+		color: #007aff;
+		text-decoration: none;
+	}
+</style>

huakai-app/pageSubPack/payment-list/addHydropower.vue

@@ -0,0 +1,545 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
+			:border="false">
+		</uni-nav-bar>
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+			<view class="card-box">
+				<!-- 头部水表标题+水滴图标 -->
+				<view class="card-header">
+					<image class="iconStyle"
+						:src="paymentType=='水表'?'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png':'https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png'">
+					</image>
+					<text class="card-title">{{paymentType}}</text>
+				</view>
+				<!-- 分割线 -->
+				<view class="line"></view>
+				<view class="input-item">
+					<view class="input-label">缴费单位</view>
+					<text class="company-name">花开物业</text>
+				</view>
+				<!-- 分割线 -->
+				<view class="line"></view>
+				<!-- 设备号输入项 -->
+				<view class="input-item">
+					<view class="input-label">缴费设备号</view>
+					<view class="input-wrap">
+						<!-- 输入框 -->
+						<input class="input" placeholder="请输入设备号" placeholder-class="input-placeholder"
+							v-model="deviceNo" />
+						<!-- 右边扫码图标 text标签直接用 双端不乱码 -->
+						<image class="scanTheCodeIconStyle"
+							src="https://wuyeadmin.bugtc.com/images/propertyImgs/scanTheCodeIcon.png" @click="scanCode">
+						</image>
+					</view>
+				</view>
+
+				<!-- 底部分割线 -->
+				<view class="line"></view>
+			</view>
+
+
+			<!-- 底部协议和提交按钮 -->
+			<view class="bottom-area">
+				<!-- <view class="agreement">
+					<checkbox-group @change="handleAgreeChange">
+						<checkbox :checked="isAgree" />
+					</checkbox-group>
+					<text class="agreement-text">我已阅并同意</text>
+					<text class="agreement-link" @click="handleProtocol">《协议链接》</text>
+				</view> -->
+
+
+				<button class="submit-btn" @click="goPay">
+					提交
+				</button>
+			</view>
+
+
+
+
+
+
+
+
+		</scroll-view>
+
+
+	</view>
+
+
+
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	import {
+		getTopUpBindDevice,
+		getopenIdByCode
+	} from '/pageSubPack/api/apiSub.js'
+import { showApiError } from '/pageSubPack/api/request.js'
+
+	// 响应式数据
+	const paymentType = ref(uni.getStorageSync('addPaymentType'))
+	const deviceNo = ref('')
+	const isAgree = ref(false)
+	// 生命周期
+	onMounted(() => {})
+
+	// 扫码
+	const scanCode = async () => {
+		try {
+			uni.showLoading({
+				title: '扫码中...',
+				mask: true
+			})
+
+			const res = await uni.scanCode({
+				onlyFromCamera: false,
+				scanType: ['qrCode', 'barCode']
+			})
+
+			// 扫码成功，赋值
+			deviceNo.value = res.result
+			uni.hideLoading()
+			uni.showToast({
+				title: '扫码成功',
+				icon: 'success'
+			})
+		} catch (err) {
+			uni.hideLoading()
+			console.log('扫码失败', err)
+			uni.showToast({
+				title: '扫码取消/失败',
+				icon: 'none'
+			})
+		}
+	}
+
+	// 提交缴费
+	const goPay = async () => {
+		if (!deviceNo.value) {
+			uni.showToast({
+				title: '请输入设备号',
+				icon: 'none'
+			})
+			return
+		}
+
+		uni.showModal({
+			title: '确认提交',
+			content: '确认要提交吗?',
+			success: async (res) => {
+				if (res.confirm) {
+					uni.showLoading({
+						title: '提交中...',
+						mask: true
+					})
+
+					try {
+						// // 获取 openid
+						// const loginRes = await wx.login()
+						// if (!loginRes.code) {
+						// 	uni.hideLoading()
+						// 	uni.showToast({
+						// 		title: '登录失败',
+						// 		icon: 'none'
+						// 	})
+						// 	return
+						// }
+						// // 用 code 换 openid
+						// const openIdRes = await getopenIdByCode({
+						// 	code: loginRes.code
+						// })
+						// if (openIdRes.code !== 200 || !openIdRes.data) {
+						// 	uni.hideLoading()
+						// 	uni.showToast({
+						// 		title: '获取openid失败',
+						// 		icon: 'none'
+						// 	})
+						// 	return
+						// }
+						const openid = uni.getStorageSync('openid')
+						await getTopUpBindDevice({
+							deviceType: paymentType.value=='水表'?'2':'1',
+							deviceCode: deviceNo.value,
+							openid: openid,
+							residentUserId: uni.getStorageSync('userId')
+						})
+						uni.hideLoading()
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success'
+						})
+						setTimeout(() => {
+							goNext()
+						}, 1500)
+					} catch (err) {
+						uni.hideLoading()
+						showApiError(err)
+						console.error('绑定设备失败：', err)
+					}
+				}
+			}
+		})
+	}
+
+
+
+	// 跳转成功页
+	const goNext = () => {
+		uni.redirectTo({
+			url: '/pageSubPack/payment-list/addPaymentSuccess'
+		})
+	}
+
+	// 返回
+	const goBack = () => {
+		uni.switchTab({
+			url: '/pages/paymentIndex/paymentIndex'
+		})
+	}
+</script>
+<style lang="scss">
+	page {
+		background: #f2f1f6;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		/* 关键：占满屏幕高度 */
+		background-color: #f9f9f9;
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		padding: 0px 40rpx;
+		box-sizing: border-box;
+	}
+
+
+	/* 白色卡片容器 */
+	.card-box {
+		background: #ffffff;
+		border-radius: 24rpx;
+		padding: 32rpx;
+	}
+
+	/* 头部水表标题 */
+	.card-header {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		margin-bottom: 32rpx;
+	}
+
+	.iconStyle {
+		width: 88rpx;
+		height: 88rpx;
+	}
+
+	.scanTheCodeIconStyle {
+		width: 48rpx;
+		height: 48rpx;
+		padding-left: 20rpx;
+	}
+
+	.water-icon {
+		font-size: 32rpx;
+	}
+
+	.card-title {
+		font-size: 32rpx;
+		color: #333;
+		font-weight: 500;
+	}
+
+	/* 分割线 */
+	.line {
+		width: 100%;
+		height: 1rpx;
+		background: #eeeeee;
+	}
+
+	/* 输入项整体 */
+	.input-item {
+		padding: 32rpx 0;
+	}
+
+	.input-label {
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 24rpx;
+	}
+
+	/* 输入框+扫码图标横向布局 */
+	.input-wrap {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.input {
+		flex: 1;
+		font-size: 32rpx;
+		color: #333;
+	}
+
+	/* 占位符样式 */
+	.input-placeholder {
+		color: #cccccc;
+	}
+
+
+
+	/* 底部协议+按钮区域 */
+	.bottom-area {
+		margin-top: 60rpx;
+		padding: 0 10rpx;
+	}
+
+	/* 协议勾选 */
+	.agree-item {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.radio-box {
+		width: 36rpx;
+		height: 36rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.radio-icon {
+		font-size: 32rpx;
+		color: #999;
+	}
+
+	.agree-text {
+		font-size: 28rpx;
+		color: #666;
+	}
+
+	.agree-link {
+		font-size: 28rpx;
+		color: #007aff;
+	}
+
+	/* 立即缴费按钮 */
+	.pay-btn {
+		width: 100%;
+		height: 96rpx;
+		background: #007aff;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.pay-text {
+		font-size: 36rpx;
+		color: #ffffff;
+	}
+
+	/* 白色卡片容器 */
+	.card-box {
+		background: #ffffff;
+		border-radius: 24rpx;
+		padding: 32rpx;
+	}
+
+	/* 头部水表标题 */
+	.card-header {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		margin-bottom: 32rpx;
+	}
+
+	.water-icon {
+		font-size: 48rpx;
+	}
+
+	.card-title {
+		font-size: 36rpx;
+		color: #333;
+		font-weight: 500;
+	}
+
+	/* 分割线 */
+	.line {
+		width: 100%;
+		height: 1rpx;
+		background: #eeeeee;
+	}
+
+	/* 输入项整体 */
+	.input-item {
+		padding: 32rpx 0;
+	}
+
+	.input-label {
+		font-size: 32rpx;
+		color: #333;
+		margin-bottom: 24rpx;
+	}
+
+	/* 输入框+扫码图标横向布局 */
+	.input-wrap {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.input {
+		flex: 1;
+		font-size: 32rpx;
+		color: #333;
+	}
+
+	/* 占位符样式 */
+	.input-placeholder {
+		color: #cccccc;
+	}
+
+	/* 右边扫码图标 text标签直接用 双端不乱码 */
+	.scan-icon {
+		font-size: 40rpx;
+		color: #999;
+		padding-left: 20rpx;
+	}
+
+	/* 底部协议+按钮区域 */
+	.bottom-area {
+		margin-top: 60rpx;
+		padding: 0 10rpx;
+	}
+
+	/* 协议勾选 */
+	.agree-item {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.radio-box {
+		width: 36rpx;
+		height: 36rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.radio-icon {
+		font-size: 32rpx;
+		color: #999;
+	}
+
+	.agree-text {
+		font-size: 28rpx;
+		color: #666;
+	}
+
+	.agree-link {
+		font-size: 28rpx;
+		color: #007aff;
+	}
+
+	/* 立即缴费按钮 */
+	.pay-btn {
+		width: 100%;
+		height: 96rpx;
+		background: #007aff;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.pay-text {
+		font-size: 36rpx;
+		color: #ffffff;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+
+	/* 底部区域 */
+	.bottom-area {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.agreement {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.agreement checkbox {
+		transform: scale(0.8);
+		margin-right: 10rpx;
+	}
+
+	.agreement-text {
+		font-size: 24rpx;
+		color: #333;
+	}
+
+	.agreement-link {
+		font-size: 28rpx;
+		color: #4080ff;
+		margin-left: 10rpx;
+	}
+
+	.submit-btn {
+		width: 100%;
+		height: 90rpx;
+		line-height: 90rpx;
+		background-color: #4080ff;
+		color: #fff;
+		border-radius: 10rpx;
+		font-size: 36rpx;
+		font-weight: 500;
+		border: none;
+		outline: none;
+	}
+
+	.submit-btn[disabled] {
+		background-color: #a0c4ff;
+		color: #fff;
+		opacity: 0.7;
+	}
+</style>

huakai-app/pageSubPack/payment-list/addPayment.vue

@@ -0,0 +1,522 @@
+ <template>
+ 	<view class="contentStyle" style="">
+ 		<view class="status-bar"></view>
+ 		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
+ 			:border="false">
+ 		</uni-nav-bar>
+
+
+ 		<!-- 表单区域 -->
+ 		<scroll-view class="page" scroll-y="true">
+ 			<view class="container">
+ 				<!-- 顶部蓝色标题栏 -->
+ 				<view class="header-card">
+ 					<view class="header-icon">
+ 						<image class="iconStyle"
+ 							:src="paymentType=='燃气'?'https://wuyeadmin.bugtc.com/images/propertyImgs/gas.png':'https://wuyeadmin.bugtc.com/images/propertyImgs/heating.png'">
+ 							></image>
+ 					</view>
+ 					<text class="header-title">{{paymentType+'费'}}</text>
+ 				</view>
+
+ 				<!-- 缴费信息卡片 -->
+ 				<view class="info-card">
+ 					<view class="form-item" @click="goToChange()">
+ 						<text class="label">缴费单位</text>
+ 						<text class="company-name">XXXXXXXX有限公司</text>
+ 					</view>
+
+ 					<view class="form-item">
+ 						<text class="label">缴费单位</text>
+ 						<view class="input-wrapper">
+ 							<input type="number" placeholder="请输入户号" class="input-field" v-model="userNo" />
+ 							<text class="help-link" @click="showPopup = true">如何获取户号?</text>
+ 						</view>
+ 					</view>
+ 				</view>
+
+
+ 			</view>
+
+
+
+ 			<!-- 快速获取户号 底部弹窗 -->
+ 			<view v-if="showPopup" class="popup-mask" @click="showPopup = false">
+ 				<view class="popup-content" @click.stop>
+ 					<view class="popup-header">
+ 						<text class="popup-title">快速获取户号</text>
+ 						<text class="popup-close" @click="showPopup = false">×</text>
+ 					</view>
+ 					<view class="popup-list">
+ 						<view class="popup-item">
+ 							<view class="item-number">1</view>
+ 							<view class="item-content">
+ 								<text class="item-title">查看缴费通知单</text>
+ 								<text class="item-desc">在纸质缴费/催费通知单上查找户号。</text>
+ 							</view>
+ 						</view>
+ 						<view class="popup-item">
+ 							<view class="item-number">2</view>
+ 							<view class="item-content">
+ 								<text class="item-title">查询通知短信</text>
+ 								<text class="item-desc">搜索手机由缴费单位发送的催缴短信，短信中包含户号</text>
+ 							</view>
+ 						</view>
+ 					</view>
+ 				</view>
+ 			</view>
+
+
+ 		</scroll-view>
+ 		<!-- 底部协议和立即缴费按钮 -->
+ 		<view class="bottom-area">
+ 			<view class="agreement">
+ 				<checkbox-group @change="handleAgreeChange">
+ 					<checkbox :checked="isAgree" />
+ 				</checkbox-group>
+ 				<text class="agreement-text">我已阅并同意</text>
+ 				<text class="agreement-link" @click="handleProtocol">《协议链接》</text>
+ 			</view>
+ 			<button class="submit-btn" @click="handleSubmit">
+ 				立即缴费
+ 			</button>
+ 		</view>
+ 	</view>
+
+
+
+ </template>
+
+ <script setup>
+ 	import {
+ 		ref,
+ 		onMounted,
+ 		computed
+
+ 	} from 'vue'
+ 	import {
+ 		onShow,
+ 		onReady,
+ 		onReachBottom,
+ 		onLoad,
+ 		onUnload,
+ 		onPullDownRefresh
+ 	} from '@dcloudio/uni-app'
+ 	// 响应式数据
+ 	const statusBarHeight = ref(20)
+ 	const paymentType = ref(uni.getStorageSync('addPaymentType'))
+ 	const userNo = ref('')
+ 	const isAgree = ref(false)
+ 	const showPopup = ref(false)
+
+ 	// 生命周期
+ 	onShow(() => {})
+ 	onMounted(() => {})
+ 	onReady(() => {
+ 		// nextTick 用法
+ 		// nextTick(() => {})
+ 	})
+
+ 	// 勾选协议
+ 	const handleAgreeChange = (e) => {
+ 		isAgree.value = e.detail.value.length > 0
+ 	}
+
+ 	// 协议链接点击
+ 	const handleProtocol = () => {
+ 		uni.navigateTo({})
+ 	}
+
+ 	// 提交
+ 	const handleSubmit = () => {
+ 		if (!userNo.value) {
+ 			uni.showToast({
+ 				title: '请输入户号',
+ 				icon: 'none'
+ 			})
+ 			return
+ 		}
+
+ 		if (!isAgree.value) {
+ 			uni.showToast({
+ 				title: '请先同意协议',
+ 				icon: 'none'
+ 			})
+ 			return
+ 		}
+
+ 		uni.showModal({
+ 			title: '确认提交',
+ 			content: '确认要提交吗?',
+ 			success: (res) => {
+ 				if (res.confirm) {
+ 					uni.showLoading({
+ 						title: '提交中...',
+ 						mask: true
+ 					})
+
+ 					setTimeout(() => {
+ 						uni.showToast({
+ 							title: '提交成功',
+ 							icon: 'success'
+ 						})
+ 					}, 1000)
+
+ 					setTimeout(() => {
+ 						uni.hideLoading()
+ 						goNext()
+ 					}, 2500)
+ 				}
+ 			}
+ 		})
+ 	}
+
+ 	// 跳转成功页
+ 	const goNext = () => {
+ 		uni.redirectTo({
+ 			url: '/pageSubPack/payment-list/addPaymentSuccess'
+ 		})
+ 	}
+
+ 	// 切换（注释保留）
+ 	const goToChange = () => {
+ 		// uni.redirectTo({
+ 		//   url: '/pageSubPack/payment-list/selectPaymentEntity'
+ 		// })
+ 	}
+
+ 	// 返回
+ 	const goBack = () => {
+ 		uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+ 	}
+ </script>
+ <style lang="scss">
+ 	page {
+ 		background: #f9f9f9;
+ 	}
+ </style>
+
+ <style scoped>
+ 	.contentStyle {
+ 		display: flex;
+ 		flex-direction: column;
+ 		height: 100vh;
+ 		/* 关键：占满屏幕高度 */
+ 		background-color: #f9f9f9;
+ 	}
+
+ 	.page {
+ 		flex: 1;
+ 		overflow-y: auto;
+ 		padding: 0px 40rpx;
+ 		box-sizing: border-box;
+ 	}
+
+ 	.container {
+ 		border-radius: 10rpx;
+ 	}
+
+ 	/* 顶部标题栏 */
+ 	.header-card {
+ 		background: #fff;
+ 		padding: 30rpx;
+ 		display: flex;
+ 		align-items: center;
+ 		border-bottom: 2rpx solid #ededed;
+
+ 	}
+
+ 	.header-icon {
+ 		width: 56rpx;
+ 		height: 56rpx;
+ 		background-color: #fff;
+ 		border-radius: 50%;
+ 		display: flex;
+ 		align-items: center;
+ 		justify-content: center;
+ 		margin-right: 20rpx;
+
+ 	}
+
+ 	.iconStyle {
+ 		width: 100%;
+ 		height: 100%;
+ 	}
+
+ 	.icon-fire {
+ 		font-size: 32rpx;
+ 		color: #4080ff;
+ 	}
+
+ 	.header-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 	}
+
+ 	/* 信息卡片 */
+ 	.info-card {
+ 		background-color: #fff;
+ 		border-radius: 10rpx;
+ 		/* padding: 30rpx; */
+ 		margin-bottom: 40rpx;
+ 	}
+
+ 	.form-item {
+ 		/* margin-bottom: 40rpx; */
+ 		border-bottom: 2rpx solid #ededed;
+ 		padding: 30rpx;
+ 	}
+
+ 	.form-item:last-child {
+ 		margin-bottom: 0;
+ 	}
+
+ 	.label {
+ 		display: block;
+ 		font-size: 28rpx;
+ 		color: #222;
+ 		margin-bottom: 20rpx;
+ 	}
+
+ 	.company-name {
+ 		display: block;
+ 		font-size: 32rpx;
+ 		color: #333;
+ 		font-weight: 600;
+ 	}
+
+ 	.input-wrapper {
+ 		display: flex;
+ 		align-items: center;
+ 		justify-content: space-between;
+ 	}
+
+ 	.input-field {
+ 		flex: 1;
+ 		font-size: 32rpx;
+ 		color: #333;
+ 		padding: 10rpx 0;
+ 		border: none;
+ 		outline: none;
+ 	}
+
+ 	.input-field::placeholder {
+ 		color: #ccc;
+ 	}
+
+ 	.help-link {
+ 		font-size: 28rpx;
+ 		color: #4080ff;
+ 		white-space: nowrap;
+ 		margin-left: 20rpx;
+ 	}
+
+ 	/* 底部区域 */
+ 	.bottom-area {
+ 		position: fixed;
+ 		bottom: 0;
+ 		left: 0;
+ 		right: 0;
+ 		padding: 30rpx;
+ 		box-sizing: border-box;
+ 	}
+
+ 	.agreement {
+ 		display: flex;
+ 		align-items: center;
+ 		margin-bottom: 20rpx;
+ 	}
+
+ 	.agreement checkbox {
+ 		transform: scale(0.8);
+ 		margin-right: 10rpx;
+ 	}
+
+ 	.agreement-text {
+ 		font-size: 24rpx;
+ 		color: #333;
+ 	}
+
+ 	.agreement-link {
+ 		font-size: 28rpx;
+ 		color: #4080ff;
+ 		margin-left: 10rpx;
+ 	}
+
+ 	.submit-btn {
+ 		width: 100%;
+ 		height: 90rpx;
+ 		line-height: 90rpx;
+ 		background-color: #4080ff;
+ 		color: #fff;
+ 		border-radius: 10rpx;
+ 		font-size: 36rpx;
+ 		font-weight: 500;
+ 		border: none;
+ 		outline: none;
+ 	}
+
+ 	.submit-btn[disabled] {
+ 		background-color: #a0c4ff;
+ 		color: #fff;
+ 		opacity: 0.7;
+ 	}
+
+ 	/* 弹窗遮罩层 */
+ 	.popup-mask {
+ 		position: fixed;
+ 		top: 0;
+ 		left: 0;
+ 		right: 0;
+ 		bottom: 0;
+ 		background-color: rgba(0, 0, 0, 0.5);
+ 		z-index: 999;
+ 		display: flex;
+ 		align-items: flex-end;
+ 	}
+
+ 	/* 弹窗内容 */
+ 	.popup-content {
+ 		width: 100%;
+ 		background-color: #fff;
+ 		border-radius: 20rpx 20rpx 0 0;
+ 		padding: 30rpx 40rpx 60rpx;
+ 		box-sizing: border-box;
+ 		animation: slideUp 0.3s ease-out;
+ 	}
+
+ 	/* 弹窗标题栏 */
+ 	.popup-header {
+ 		display: flex;
+ 		align-items: center;
+ 		justify-content: space-between;
+ 		margin-bottom: 40rpx;
+ 	}
+
+ 	.popup-title {
+ 		font-size: 32rpx;
+ 		line-height: 60rpx;
+ 		font-weight: bold;
+ 		color: #333;
+ 		width: 100%;
+ 		display: flex;
+ 		/* align-items: center; */
+ 		justify-content: space-evenly;
+ 		border-bottom: 2rpx solid #ebebeb;
+ 	}
+
+ 	.popup-close {
+ 		font-size: 48rpx;
+ 		color: #999;
+ 		line-height: 1;
+ 	}
+
+ 	/* 弹窗列表 */
+ 	.popup-list {
+ 		padding: 0 10rpx;
+
+ 	}
+
+ 	.popup-item {
+ 		display: flex;
+ 		align-items: flex-start;
+ 		margin-bottom: 40rpx;
+ 	}
+
+ 	.popup-item:last-child {
+ 		margin-bottom: 0;
+ 	}
+
+ 	.item-number {
+ 		width: 40rpx;
+ 		height: 40rpx;
+ 		line-height: 40rpx;
+ 		text-align: center;
+ 		border: 2rpx solid #4080ff;
+ 		border-radius: 6rpx;
+ 		font-size: 28rpx;
+ 		font-weight: bold;
+ 		color: #4080ff;
+ 		margin-right: 20rpx;
+ 		flex-shrink: 0;
+ 	}
+
+ 	.item-content {
+ 		flex: 1;
+ 		display: flex;
+ 		flex-direction: column;
+ 	}
+
+ 	.item-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		color: #333;
+ 		margin-bottom: 16rpx;
+ 	}
+
+ 	.item-desc {
+ 		font-size: 28rpx;
+ 		color: #666;
+ 		line-height: 1.5;
+ 	}
+
+ 	/* 弹窗动画 */
+ 	/* @keyframes slideUp {
+ 		from {
+ 			transform: translateY(100%);
+ 		}
+
+ 		to {
+ 			transform: translateY(0);
+ 		}
+ 	} */
+
+ 	/* 成功提示弹窗 */
+ 	.toast-mask {
+ 		position: fixed;
+ 		top: 0;
+ 		left: 0;
+ 		right: 0;
+ 		bottom: 0;
+ 		display: flex;
+ 		align-items: center;
+ 		justify-content: center;
+ 		background-color: transparent;
+ 		z-index: 9999;
+ 	}
+
+ 	.toast-content {
+ 		background-color: rgba(0, 0, 0, 0.8);
+ 		padding: 40rpx 60rpx;
+ 		border-radius: 8rpx;
+ 		display: flex;
+ 		flex-direction: column;
+ 		align-items: center;
+ 		justify-content: center;
+ 	}
+
+ 	.toast-icon {
+ 		width: 60rpx;
+ 		height: 60rpx;
+ 		line-height: 60rpx;
+ 		border-radius: 50%;
+ 		background-color: #fff;
+ 		color: #1677ff;
+ 		font-size: 40rpx;
+ 		font-weight: bold;
+ 		margin-bottom: 20rpx;
+ 		display: flex;
+ 		align-items: center;
+ 		justify-content: center;
+ 	}
+
+ 	.toast-text {
+ 		color: #fff;
+ 		font-size: 28rpx;
+ 	}
+
+ 	.status-bar {
+ 		width: 100vw;
+ 		height: 46px;
+ 	}
+ </style>

huakai-app/pageSubPack/payment-list/addPaymentSuccess.vue

@@ -0,0 +1,160 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar :title="'新增'+paymentType+'缴费'" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
+			:border="false">
+		</uni-nav-bar>
+
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+			<view class="container">
+				<!-- 成功图标 -->
+				<view class="success-icon">
+					<text class="icon-check">✓</text>
+				</view>
+
+				<!-- 主标题 -->
+				<view class="title">绑定成功</view>
+
+				<!-- 提示文案 -->
+				<view class="desc">
+					恭喜您绑定成功，费用将在24小时内更新，<br>
+					请您按时查看，避免造成费用欠费
+				</view>
+
+				<!-- 操作按钮 -->
+				<view class="btn-wrap">
+					<button class="btn-back" @click="goBack">返回生活缴费</button>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	// 响应式数据
+	const statusBarHeight = ref(20)
+	const paymentType = ref(uni.getStorageSync('addPaymentType'))
+
+	// 生命周期
+	onShow(() => {})
+	onMounted(() => {})
+	onReady(() => {})
+
+	// 方法
+	const goBack = () => {
+		uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #f9f9f9;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background-color: #f9f9f9;
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		padding: 0px 40rpx;
+		box-sizing: border-box;
+	}
+</style>
+
+<style scoped>
+	/* 全局容器 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	/* 成功图标 */
+	.success-icon {
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 50%;
+		background-color: #1677ff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 200rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.icon-check {
+		color: #fff;
+		font-size: 130rpx;
+		font-weight: bold;
+		line-height: 1;
+	}
+
+	/* 主标题 */
+	.title {
+		font-size: 44rpx;
+		font-weight: bold;
+		color: #000;
+		margin-bottom: 40rpx;
+	}
+
+	/* 提示文案 */
+	.desc {
+		font-size: 32rpx;
+		color: #666;
+		line-height: 1.6;
+		text-align: center;
+		margin-bottom: 150rpx;
+	}
+
+	/* 按钮容器 */
+	.btn-wrap {
+		width: 100%;
+	}
+
+	/* 返回按钮 */
+	.btn-back {
+		width: 100%;
+		height: 96rpx;
+		line-height: 96rpx;
+		background-color: #1677ff;
+		color: #fff;
+		font-size: 36rpx;
+		border-radius: 8rpx;
+		border: none;
+		padding: 0;
+		margin: 0;
+	}
+
+	/* 按钮默认样式重置（解决uni-app button默认样式问题） */
+	.btn-back::after {
+		border: none;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+</style>

huakai-app/pageSubPack/payment-list/arrearsPayment.vue

@@ -0,0 +1,790 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar :title="paymentItem.type || '缴费'" left-icon="left" @clickLeft="goBack"
+			backgroundColor="transparent" :border="false">
+		</uni-nav-bar>
+
+
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+
+			<view class="container">
+				<!-- 1. 缴费详情 -->
+				<view v-if="currentStep === 1" class="pay-page">
+					<!-- 物业费缴费 -->
+					<!-- 金额展示 -->
+					<view class="amount-section" v-if="outstandingPayment">
+						<text class="amount-text"
+							:class="{ 'outstandingPaymentClass':outstandingPayment }">{{outstandingPayment?'-¥'+payAmount:'¥'+payAmount}}</text>
+					</view>
+					<view class="amount-section" v-else>
+						<text class="amount-text paymentClass">{{'¥'+payAmount}}</text>
+					</view>
+					<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view>
+					<!-- 缴费信息 -->
+					<view class="info-section" style="">
+
+						<view>
+
+							<view class="info-item">
+								<text class="info-label">户号</text>
+								<text class="info-value">{{ paymentItem.deviceCode || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">户主</text>
+								<text class="info-value">{{ paymentItem.name || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">地址</text>
+								<text class="info-value">{{ paymentItem.fullAddress || '-' }}</text>
+							</view>
+							<!-- <view style="border-bottom: 2rpx solid #c7c7c7;padding-bottom:20rpx;"></view> -->
+							<!-- 缴费金额输入 -->
+							<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view>
+							<view class="input-section" style="display: flex;">
+								<text class="amount-input" style="width: auto;margin: 0rpx 20rpx;">¥</text>
+								<input type="digit" v-model="payNum" class="amount-input" placeholder="点击输入缴费金额">
+								</input>
+							</view>
+							<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view>
+							<view class="arrears-row" v-if="outstandingPayment==true">
+								<text class="arrears-text">当前欠费金额¥{{ arrearsAmount }}元</text>
+								<text class="auto-fill-btn" @click="handleAutoFill">点击自动填入</text>
+							</view>
+							<view class="arrears-row" v-if="outstandingPayment==false">
+								<text class="arrears-text">暂未查询到欠费</text>
+							</view>
+						</view>
+					</view>
+
+				</view>
+
+				<!-- 2. 缴费成功页 -->
+				<view class="container" v-if="currentStep==2">
+					<!-- 成功图标 -->
+					<view class="success-icon">
+						<text class="icon-check">✓</text>
+					</view>
+
+					<!-- 主标题 -->
+					<view class="title">缴费成功</view>
+
+					<!-- 提示文案 -->
+					<view class="desc">
+						成功缴纳{{ paymentItem.type || '' }}费用 ¥{{ payNum || payAmount }}元
+					</view>
+
+
+				</view>
+			</view>
+
+
+		</scroll-view>
+		<!-- 立即缴费按钮 -->
+		<view class="btn-section" v-if="currentStep === 1">
+			<button class="pay-btn" @click="handlePay">立即缴费</button>
+		</view>
+		<!-- 返回按钮 -->
+		<view class="btn-section" v-if="currentStep === 2">
+			<button class="pay-btn" @click="handleBackToList">返回生活缴费</button>
+		</view>
+	</view>
+
+
+
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	import {
+		getTopUp,
+		getToWxPay,
+		getopenIdByCode,
+		postSubscribeAuth
+	} from '/pageSubPack/api/apiSub.js'
+
+	// 响应式数据
+	const statusBarHeight = ref(20)
+	const outstandingPayment = ref(true)
+	const storageValue = uni.getStorageSync('arrearsPayment')
+	const paymentItem = reactive(typeof storageValue === 'object' && storageValue !== null ? storageValue : {})
+	const currentStep = ref(1)
+	const payAmount = ref('0.00')
+	const arrearsAmount = ref('0.00')
+	const payNum = ref('')
+
+	// 页面加载时初始化数据
+	onLoad(() => {
+		initPaymentData()
+		checkAllSubscribeStatus()
+	})
+
+	// 初始化缴费数据
+	const initPaymentData = () => {
+		if (paymentItem) {
+			arrearsAmount.value = Math.abs(paymentItem.balance || 0).toFixed(2)
+			payAmount.value = Math.abs(paymentItem.balance || 0)
+			outstandingPayment.value = paymentItem.balance < 0
+		}
+	}
+
+	// 自动填充欠费金额
+	const handleAutoFill = () => {
+		payNum.value = arrearsAmount.value
+		uni.vibrateShort({
+			type: 'light'
+		})
+	}
+
+	// 返回
+	const goBack = () => {
+		uni.switchTab({
+			url: '/pages/paymentIndex/paymentIndex'
+		});
+	}
+
+	// 立即缴费
+	const handlePay = () => {
+		if (!payNum.value || Number(payNum.value) <= 0) {
+			uni.showToast({
+				title: '请输入正确的缴费金额',
+				icon: 'none'
+			})
+			return
+		}
+		requestPayOrder()
+	}
+	// 统一下单后后端返回的支付参数
+	const payInfo = ref({
+		appId: '', // 公众号/小程序ID
+		timeStamp: '', // 时间戳
+		nonceStr: '', // 随机串
+		package: '', // 数据包 如 prepay_id=xxx
+		signType: 'MD5', // 签名方式
+		paySign: '' // 签名
+	})
+
+	// 1. 先请求后端接口生成预支付订单
+	const requestPayOrder = async () => {
+		try {
+			uni.showLoading({
+				title: '发起支付中'
+			})
+
+			// // 获取 openid
+			// const loginRes = await wx.login()
+			// if (!loginRes.code) {
+			// 	uni.hideLoading()
+			// 	uni.showToast({
+			// 		title: '登录失败',
+			// 		icon: 'none'
+			// 	})
+			// 	return
+			// }
+			// // 用 code 换 openid
+			// const openIdRes = await getopenIdByCode({
+			// 	code: loginRes.code
+			// })
+			// if (openIdRes.code !== 200 || !openIdRes.data) {
+			// 	uni.hideLoading()
+			// 	uni.showToast({
+			// 		title: '获取openid失败',
+			// 		icon: 'none'
+			// 	})
+			// 	return
+			// }
+			// const openid = openIdRes.data
+			const openid = uni.getStorageSync('openid')
+
+			// 调用充值接口创建订单
+			console.log('1111111111', paymentItem);
+			const topUpRes = await getTopUp({
+				residentUserId: uni.getStorageSync('userId'),
+				rechargeAmount: payNum.value,
+				money: payNum.value || payAmount.value,
+				deviceCode: paymentItem.deviceCode,
+				// type: paymentItem.type == '水表' ? '2' : paymentItem.type == '电表' ? '1' : ''
+				type:'2'
+			})
+			uni.hideLoading()
+
+			const topUpData = topUpRes
+			console.log(topUpData);
+			if (topUpData.code !== 200) {
+				uni.showToast({
+					title: topUpData.msg || '下单失败',
+					icon: 'none'
+				})
+				return
+			}
+
+			// 调用微信支付接口获取支付参数
+			const payRes = await getToWxPay({
+				orderId: topUpData.data.orderId,
+				openid: openid,
+				// rechargeAmount: payNum.value || payAmount.value,
+				// type: paymentItem.type == '水表' ? '2' : paymentItem.type == '电表' ? '1' : ''
+			})
+
+			if (payRes.code !== 200) {
+				uni.showToast({
+					title: payRes.msg || '获取支付参数失败',
+					icon: 'none'
+				})
+				return
+			}
+			const payData = payRes.data
+			console.log('payData', payData);
+			// 赋值支付参数
+			payInfo.value = {
+				appId: payData.appId,
+				timeStamp: payData.timeStamp,
+				nonceStr: payData.nonceStr,
+				package: payData.package.startsWith('prepay_id=') ? payData.package : 'prepay_id=' + payData
+					.package,
+				signType: payData.signType,
+				paySign: payData.paySign
+			}
+
+			// 2. 调起微信支付
+			wx.requestPayment({
+				...payInfo.value,
+				success(res) {
+					console.log('支付成功', res)
+					currentStep.value = 2
+				},
+				fail(err) {
+					console.log('支付失败', err)
+					uni.showToast({
+						title: '支付取消或失败',
+						icon: 'none'
+					})
+				}
+			})
+			handleWaterElecSubscribe()
+
+		} catch (err) {
+			uni.hideLoading()
+			console.log('请求异常', err)
+			showApiError(err)
+		}
+	}
+
+	// 【双模板ID】你提供的 水表+电表 催缴模板
+	const TEMPLATE_IDS = {
+		water: 'DowYnoGKNtl_eYycRCq-nt7DAoFjH7aVcGUQciZl1v0',
+		elec: 'PE7Neemv0z77JnBIPmb-Qg2Q3pJSUDGaILCryFCxmaw'
+	}
+	// 转成数组（微信API要求）
+	const TEMPLATE_ID_ARRAY = Object.values(TEMPLATE_IDS)
+
+
+	// 1. 检测 水表+电表 订阅状态
+	const checkAllSubscribeStatus = () => {
+		uni.getSetting({
+			withSubscriptions: true,
+			success: (res) => {
+				const itemSettings = res.subscriptionsSetting?.itemSettings || {}
+				console.log('水表订阅状态：', itemSettings[TEMPLATE_IDS.water])
+				console.log('电表订阅状态：', itemSettings[TEMPLATE_IDS.elec])
+			}
+		})
+	}
+
+	// 2. 点击开启订阅（主方法）
+	const handleWaterElecSubscribe = () => {
+		uni.getSetting({
+			withSubscriptions: true,
+			success: (res) => {
+				const itemSettings = res.subscriptionsSetting?.itemSettings || {}
+				const waterStatus = itemSettings[TEMPLATE_IDS.water]
+				const elecStatus = itemSettings[TEMPLATE_IDS.elec]
+
+				// 如果任意一个被永久拒绝 → 引导去设置
+				if ((waterStatus === 'reject' || waterStatus === 'ban') ||
+					(elecStatus === 'reject' || elecStatus === 'ban')) {
+					uni.showModal({
+						title: '开启消息通知',
+						content: '请前往设置页打开水表/电表提醒开关',
+						confirmText: '去设置',
+						success: (modalRes) => {
+							if (modalRes.confirm) uni.openSetting()
+						}
+					})
+					return
+				}
+
+				// 正常弹出授权框
+				requestMultiSubscribe()
+			}
+		})
+	}
+
+	// 3. 调用微信授权（根据类型传对应模板）
+	const requestMultiSubscribe = () => {
+		const tmplIds = paymentItem.type == '水表' ? [TEMPLATE_IDS.water] : paymentItem.type == '电表' ? [TEMPLATE_IDS.elec] : TEMPLATE_ID_ARRAY
+		uni.requestSubscribeMessage({
+			tmplIds: tmplIds,
+			success: async (res) => {
+				console.log('双模板授权结果：', res)
+
+				let successCount = 0
+				// 水表授权成功
+				if (res[TEMPLATE_IDS.water] === 'accept') successCount++
+				// 电表授权成功
+				if (res[TEMPLATE_IDS.elec] === 'accept') successCount++
+
+				if (successCount > 0) {
+					uni.showToast({
+						title: `已开启${successCount}项提醒`,
+						icon: 'success'
+					})
+					// 保存用户openid到后端
+					await saveUserSubscribe()
+				} else {
+					uni.showToast({
+						title: '已取消授权',
+						icon: 'none'
+					})
+				}
+			},
+			fail: () => {
+				uni.showToast({
+					title: '授权失败',
+					icon: 'none'
+				})
+			}
+		})
+	}
+
+	// 4. 传给后端：保存订阅信息
+	const saveUserSubscribe = async () => {
+
+		const res = await postSubscribeAuth({
+			openid: uni.getStorageSync('openid'),
+			templateIds: paymentItem.type == '水表' ? [TEMPLATE_IDS.water] : paymentItem.type == '电表' ? [TEMPLATE_IDS.elec] : TEMPLATE_ID_ARRAY,
+			// deviceCode: paymentItem.deviceCode,
+			// deviceType: paymentItem.type == '水表' ? '2' : paymentItem.type == '电表' ? '1' : ''
+		})
+		if (res.data == 200) {
+			console.log('111111111111111：', res)
+		} else {
+			uni.showToast({
+				title: `${res.msg}`,
+				icon: 'none'
+			})
+		}
+
+
+	}
+
+	// 返回缴费列表
+	const handleBackToList = () => {
+		uni.switchTab({
+			url: '/pages/paymentIndex/paymentIndex'
+		});
+	}
+</script>
+<style lang="scss">
+	page {
+		background-color: #f9f9f9;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		/* 关键：占满屏幕高度 */
+		background-color: #f9f9f9;
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		padding: 0px 40rpx;
+		box-sizing: border-box;
+		background-color: #
+			/* fff */
+		;
+	}
+
+
+	/* 1. 物业费详情页 */
+	.pay-page {
+		width: 100%;
+		/* min-height: 100vh; */
+		/* background-color: #fff; */
+	}
+
+	.amount-section {
+		padding: 60rpx 0;
+		text-align: center;
+	}
+
+	.amount-text {
+		font-size: 56rpx;
+		font-weight: 600;
+	}
+
+	.outstandingPaymentClass {
+		color: #E34D59;
+	}
+
+	.paymentClass {
+		color: #00aaff;
+	}
+
+	.info-section {
+		padding-top: 20rpx;
+		/* margin-bottom: 40rpx; */
+
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 80rpx;
+	}
+
+	.info-label {
+		font-size: 30rpx;
+		color: #666;
+	}
+
+	.info-value {
+		font-size: 30rpx;
+		color: #333;
+		font-weight: 600;
+	}
+
+	.info-payAmountItem {
+		height: 100rpx;
+		line-height: 100rpx;
+		margin-bottom: 60rpx;
+	}
+
+	.info-payAmount {
+		font-size: 50rpx;
+		color: #333;
+		font-weight: 600;
+
+	}
+
+	.input-section {
+		/* padding: 030rpx; */
+
+	}
+
+	.amount-input {
+		width: 100%;
+		height: 100rpx;
+		font-size: 32rpx;
+		line-height: 100rpx;
+		border: none;
+		outline: none;
+		margin-right: 10rpx;
+	}
+
+	.btn-section {
+		padding: 20rpx 30rpx 40rpx;
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.pay-btn {
+		width: 100%;
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #007aff;
+		color: #fff;
+		border-radius: 16rpx;
+		font-size: 32rpx;
+		border: none;
+		outline: none;
+	}
+
+	/* 2. 支付密码弹窗 */
+	.modal-overlay {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 999;
+		display: flex;
+		align-items: flex-end;
+
+	}
+
+	.password-modal {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 24rpx 24rpx 0 0;
+		padding-bottom: 40rpx;
+	}
+
+	.modal-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 100rpx;
+		padding: 0 30rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.close-icon {
+		font-size: 44rpx;
+		width: 80rpx;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.modal-title {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #000;
+	}
+
+	.header-right {
+		width: 80rpx;
+	}
+
+	.pay-info {
+		padding: 40rpx 30rpx;
+		text-align: center;
+	}
+
+	.merchant-name {
+		display: block;
+		font-size: 32rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+	}
+
+	.pay-amount {
+		font-size: 64rpx;
+		font-weight: 500;
+		color: #000;
+	}
+
+	.pay-way {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.way-label {
+		font-size: 30rpx;
+		color: #666;
+	}
+
+	.way-content {
+		display: flex;
+		align-items: center;
+	}
+
+	.bank-icon {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 6rpx;
+	}
+
+	.bank-name {
+		font-size: 30rpx;
+		color: #333;
+		margin-right: 16rpx;
+	}
+
+	.arrow-icon {
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	/* 银行卡列表 */
+	.bank-list {
+		padding: 030rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.bank-item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		border-bottom: 2rpx solid #f5f5f5;
+	}
+
+	.bank-item:last-child {
+		border-bottom: none;
+	}
+
+	.bank-item-icon {
+		width: 48rpx;
+		height: 48rpx;
+		margin-right: 20rpx;
+	}
+
+	.bank-item-name {
+		flex: 1;
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.check-icon {
+		font-size: 36rpx;
+		color: #007aff;
+	}
+
+	/* 密码输入框 */
+	.password-input {
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 30rpx;
+	}
+
+	.password-item {
+		width: 100rpx;
+		height: 100rpx;
+		/* border: 2rpx solid #dcdcdc; */
+		background-color: #efefef;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.password-dot {
+		width: 24rpx;
+		height: 24rpx;
+		background-color: #000;
+		border-radius: 50%;
+	}
+
+	/* 数字键盘 */
+	.keyboard {
+		width: 100%;
+	}
+
+	.keyboard-row {
+		display: flex;
+	}
+
+	.keyboard-item {
+		flex: 1;
+		height: 54px;
+		line-height: 54px;
+		text-align: center;
+		font-size: 48rpx;
+		color: #000;
+		border: 2rpx solid #f0f0f0;
+		background-color: #fff;
+	}
+
+	.keyboard-item:active {
+		background-color: #e5e5e5;
+	}
+
+	.keyboard-item.empty {
+		background-color: #f5f5f5;
+		border: none;
+	}
+
+	.keyboard-item.delete {
+		background-color: #f5f5f5;
+		border: none;
+	}
+
+	/* 3. 缴费成功页 */
+	/* 全局容器 */
+	.container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	/* 成功图标 */
+	.success-icon {
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 50%;
+		background-color: #1677ff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 200rpx;
+		margin-bottom: 60rpx;
+	}
+
+	.icon-check {
+		color: #fff;
+		font-size: 130rpx;
+		font-weight: bold;
+		line-height: 1;
+	}
+
+	/* 主标题 */
+	.title {
+		font-size: 40rpx;
+		font-weight: bold;
+		color: #000;
+		margin-bottom: 20rpx;
+	}
+
+	/* 提示文案 */
+	.desc {
+		font-size: 32rpx;
+		color: #666;
+		line-height: 1.6;
+		text-align: center;
+		margin-bottom: 150rpx;
+	}
+
+	/*  核心：欠费金额行样式 */
+	.arrears-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		/* padding:30rpx; */
+		margin-bottom: 60rpx;
+	}
+
+	.arrears-text {
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.auto-fill-btn {
+		font-size: 28rpx;
+		color: #007aff;
+		/* 蓝色，匹配设计图 */
+		font-weight: 500;
+		padding: 10rpx 0;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+</style>

huakai-app/pageSubPack/payment-list/noArrearsPayment.vue

@@ -0,0 +1,482 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar :title="arrearsPayment" left-icon="left" @clickLeft="goBack" backgroundColor="transparent"
+			:border="false">
+		</uni-nav-bar>
+
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+			<view class="container">
+				<!-- 1. 物业费详情页 -->
+				<view class="pay-page">
+					<!-- 未欠费 -->
+					 <!-- v-if="arrearsPayment=='暖气费'" -->
+					<view class="no-arrears-section">
+						<image src="https://wuyeadmin.bugtc.com/images/propertyImgs/noArrears.png"
+							class="background-image-style"></image>
+						<text class="noArrearsText">暂未查到欠费</text>
+						<view class="recordText">
+							<text>{{'最近充值：'+paymentItem.LastRechargeTime || '-'}}</text>
+							<text class="lineStyle">{{'|'}}</text>
+							<text>{{'充值金额：'+paymentItem.LastRechargeAmount+'元' || '-'}}</text>
+						</view>
+					</view>
+					<!-- <view>
+						<view class="amount-section">
+							<text class="amount-text">{{'¥'+ Math.abs(paymentItem.balance || 0).toFixed(2)}}</text>
+						</view>
+						<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view>
+					</view> -->
+					<!-- 缴费信息 -->
+					<view class="info-section" style="">
+						<view v-if="arrearsPayment=='物业费'">
+							<view class="info-item">
+								<text class="info-label">户名</text>
+								<text
+									class="info-value">{{paymentItem.villageName+ paymentItem.fullAddress || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">户主</text>
+								<text class="info-value">{{ paymentItem.name || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">缴费单位</text>
+								<text class="info-value">花开物业</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">可用余额</text>
+								<text class="info-value">{{ Math.abs(paymentItem.balance || 0).toFixed(2) }}元</text>
+							</view>
+						</view>
+						<view v-else>
+							<view class="info-item">
+								<text class="info-label">房屋</text>
+								<text class="info-value">{{ paymentItem.fullAddress || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">户号</text>
+								<text class="info-value">{{ paymentItem.deviceCode || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">户主</text>
+								<text class="info-value">{{ paymentItem.name || '-' }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">缴费单位</text>
+								<text class="info-value">花开物业</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">可用余额</text>
+								<text class="info-value">{{ Math.abs(paymentItem.balance || 0).toFixed(2) }}元</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	// 响应式数据
+	const statusBarHeight = ref(20)
+	const paymentItem = reactive(uni.getStorageSync('arrearsPayment') || {})
+	const arrearsPayment = computed(() => paymentItem.type || '缴费')
+
+	// 生命周期
+	onShow(() => {})
+	onMounted(() => {})
+	onReady(() => {})
+
+	// 方法
+	const goBack = () => {
+		uni.switchTab({
+			url: '/pages/paymentIndex/paymentIndex'
+		});
+	}
+
+	// 以下为原代码保留的方法（未使用但保持功能完整）
+	const handlePay = () => {}
+	const closePasswordModal = () => {}
+	const selectBank = () => {}
+	const inputPassword = () => {}
+	const deletePassword = () => {}
+	const handleConfirmPay = () => {}
+	const handleBackToList = () => {}
+</script>
+
+<style lang="scss">
+	page {
+		background: #f9f9f9;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background-color: #f9f9f9;
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		padding: 0px 40rpx;
+		box-sizing: border-box;
+	}
+
+	.pay-page {
+		width: 100%;
+	}
+
+	.amount-section {
+		padding: 60rpx 0;
+		text-align: center;
+	}
+
+	.no-arrears-section {
+		padding: 30rpx 0;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		color: #999999;
+	}
+
+	.amount-text {
+		font-size: 56rpx;
+		font-weight: 600;
+		color: #007aff;
+	}
+
+	.background-image-style {
+		width: 466rpx;
+		height: 250rpx;
+		margin-bottom: 140rpx;
+	}
+
+	.noArrearsText {
+		padding-bottom: 50rpx;
+		width: 100%;
+		border-bottom: 2rpx solid #ededed;
+	}
+
+	.recordText {
+		font-size: 24rpx;
+		color: #222;
+		margin-top: 20rpx;
+		font-weight: 600;
+	}
+
+	.lineStyle {
+		margin: 0rpx 30rpx;
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 80rpx;
+	}
+
+	.info-label {
+		font-size: 30rpx;
+		color: #666;
+	}
+
+	.info-value {
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.info-payAmountItem {
+		height: 100rpx;
+		line-height: 100rpx;
+		margin-bottom: 60rpx;
+	}
+
+	.info-payAmount {
+		font-size: 50rpx;
+		color: #333;
+		font-weight: 600;
+	}
+
+	.input-section {
+		padding: 0 30rpx;
+		margin-bottom: 60rpx;
+	}
+
+	.amount-input {
+		width: 100%;
+		height: 100rpx;
+		font-size: 48rpx;
+		border: none;
+		outline: none;
+	}
+
+	.btn-section {
+		padding: 0 30rpx;
+	}
+
+	.pay-btn {
+		width: 100%;
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #007aff;
+		color: #fff;
+		border-radius: 16rpx;
+		font-size: 32rpx;
+		border: none;
+		outline: none;
+	}
+
+	.modal-overlay {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 999;
+		display: flex;
+		align-items: flex-end;
+	}
+
+	.password-modal {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 24rpx 24rpx 0 0;
+		padding-bottom: 40rpx;
+	}
+
+	.modal-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 100rpx;
+		padding: 0 30rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.close-icon {
+		font-size: 44rpx;
+		width: 80rpx;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.modal-title {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #000;
+	}
+
+	.header-right {
+		width: 80rpx;
+	}
+
+	.pay-info {
+		padding: 40rpx 30rpx;
+		text-align: center;
+	}
+
+	.merchant-name {
+		display: block;
+		font-size: 32rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+	}
+
+	.pay-amount {
+		font-size: 64rpx;
+		font-weight: 500;
+		color: #000;
+	}
+
+	.pay-way {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.way-label {
+		font-size: 30rpx;
+		color: #666;
+	}
+
+	.way-content {
+		display: flex;
+		align-items: center;
+	}
+
+	.bank-icon {
+		width: 32rpx;
+		height: 32rpx;
+		margin-right: 6rpx;
+	}
+
+	.bank-name {
+		font-size: 30rpx;
+		color: #333;
+		margin-right: 16rpx;
+	}
+
+	.arrow-icon {
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.bank-list {
+		padding: 0 30rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.bank-item {
+		display: flex;
+		align-items: center;
+		height: 100rpx;
+		border-bottom: 2rpx solid #f5f5f5;
+	}
+
+	.bank-item:last-child {
+		border-bottom: none;
+	}
+
+	.bank-item-icon {
+		width: 48rpx;
+		height: 48rpx;
+		margin-right: 20rpx;
+	}
+
+	.bank-item-name {
+		flex: 1;
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.check-icon {
+		font-size: 36rpx;
+		color: #007aff;
+	}
+
+	.password-input {
+		display: flex;
+		justify-content: space-between;
+		padding: 40rpx 30rpx;
+	}
+
+	.password-item {
+		width: 100rpx;
+		height: 100rpx;
+		background-color: #efefef;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.password-dot {
+		width: 24rpx;
+		height: 24rpx;
+		background-color: #000;
+		border-radius: 50%;
+	}
+
+	.keyboard {
+		width: 100%;
+	}
+
+	.keyboard-row {
+		display: flex;
+	}
+
+	.keyboard-item {
+		flex: 1;
+		height: 54px;
+		line-height: 54px;
+		text-align: center;
+		font-size: 48rpx;
+		color: #000;
+		border: 2rpx solid #f0f0f0;
+		background-color: #fff;
+	}
+
+	.keyboard-item:active {
+		background-color: #e5e5e5;
+	}
+
+	.keyboard-item.empty {
+		background-color: #f5f5f5;
+		border: none;
+	}
+
+	.keyboard-item.delete {
+		background-color: #f5f5f5;
+		border: none;
+	}
+
+	.success-page {
+		width: 100%;
+		min-height: 100vh;
+		background-color: #fff;
+		text-align: center;
+	}
+
+	.icon-box {
+		display: flex;
+		justify-content: center;
+		width: 100vw;
+		height: 1100rpx;
+		padding: 60rpx 0px;
+	}
+
+	.success-icon {
+		margin-bottom: 40rpx;
+		width: 100px;
+		height: 100px;
+		font-size: 80px;
+		color: #007aff;
+		background-color: #007aff;
+		color: #fff;
+		border-radius: 50%;
+	}
+
+	.success-text {
+		font-size: 40rpx;
+		font-weight: 600;
+		color: #000;
+		margin-bottom: 20rpx;
+	}
+
+	.success-desc {
+		font-size: 30rpx;
+		color: #999;
+		margin-bottom: 100rpx;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+</style>

huakai-app/pageSubPack/payment-list/paymentRecord.vue

@@ -0,0 +1,397 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar title="缴费记录" left-icon="left" @clickLeft="goBack" backgroundColor="transparent" :border="false">
+		</uni-nav-bar>
+
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+
+			<!-- 累计缴费 -->
+			<view class="total-box">
+				<view class="top-box">
+					<view class="total-title">累计缴费</view>
+					<view class="total-price">¥{{ totalAmount }}</view>
+				</view>
+
+				<view class="chart-box">
+					<view v-if="chartData.length === 0" class="empty-state">
+						<uni-icons type="info" size="60" color="#ccc"></uni-icons>
+						<text class="empty-text">
+							{{ '暂无数据'}}
+						</text>
+					</view>
+					<!-- 循环6个月柱状图 -->
+					<view class="chart-item" v-for="(item,index) in chartData" :key="index">
+						<!-- 柱子顶部金额文字 -->
+						<view class="chart-label">{{ item.price }}元</view>
+						<!-- 柱状图柱子 -->
+						<view class="chart-bar" :style="{ height: barHeight(item.price) }"></view>
+						<!-- 底部月份文字 -->
+						<view class="chart-month">{{ item.month }}</view>
+					</view>
+				</view>
+
+			</view>
+
+			<!-- 缴费明细 -->
+			<view class="list-wrapper">
+				<!-- 按月份分组渲染 -->
+				<view v-if="monthGroups.length === 0" class="empty-state">
+					<uni-icons type="info" size="60" color="#ccc"></uni-icons>
+					<text class="empty-text">
+						{{ '暂无数据'}}
+					</text>
+				</view>
+				<view class="month-group" v-for="(item, idx) in monthGroups" :key="idx">
+					<view class="month-title">
+						{{ item.month }}月 缴费 ¥{{ item.total }}元
+					</view>
+
+					<view class="item-list">
+						<view class="bill-item" v-for="bill in item.list" :key="bill.id">
+							<view class="bill-icon">
+								<image class="iconStyle" src="https://wuyeadmin.bugtc.com/images/propertyImgs/water.png"
+									v-if="bill.name=='水表'"></image>
+								<image class="iconStyle" src="https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png"
+									v-if="bill.name=='电表'"></image>
+				
+							</view>
+							<view class="bill-info">
+								<view class="name">{{ bill.name }}</view>
+								<view class="account">{{ bill.account }}</view>
+							</view>
+							<view class="bill-price">-{{ bill.amount }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	import {
+		getTopupRecordWithStat
+	} from '/pageSubPack/api/apiSub.js'
+	// 响应式数据
+	const statusBarHeight = ref(20)
+	const pageNum = ref(1)
+	const pageSize = ref(10)
+	const totalAmount = ref('0.00')
+	const chartData = ref([])
+	const maxPrice = ref(100)
+	const barMaxHeight = ref(300)
+
+	const billList = ref([])
+
+	// 图标映射
+	const iconMap = {
+		'水表': 'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png',
+		'电表': 'https://wuyeadmin.bugtc.com/images/propertyImgs/electric.png',
+		'物业费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/property.png',
+		'暖气费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/heating.png',
+		'燃气费': 'https://wuyeadmin.bugtc.com/images/propertyImgs/gas.png'
+	}
+
+	// 获取缴费记录
+	const getRecords = async () => {
+		try {
+			const res = await getTopupRecordWithStat({
+				residentUserId: uni.getStorageSync('userId'),
+				pageNum: pageNum.value,
+				pageSize: pageSize.value
+			})
+			if (res.code === 200) {
+				const records = res.data.records || []
+				// 转换记录格式
+				billList.value = records.map(item => ({
+					id: item.id,
+					month: item.rechargeTime && item.rechargeTime.split('-')[1] ? parseInt(item.rechargeTime.split('-')[1], 10) : 1,
+					name: item.type == 1 ? '电表' : item.type == 2 ? '水表' : '',
+					account: item.deviceCode || '-',
+					amount: Number(item.rechargeAmount) || 0,
+					icon: iconMap[item.type == 1 ? '电表' : item.type == 2 ? '水表' : ''] || 'https://wuyeadmin.bugtc.com/images/propertyImgs/water.png'
+				}))
+				// 累计缴费金额
+				const total = records.reduce((sum, item) => sum + (Number(item.rechargeAmount) || 0), 0)
+				totalAmount.value = total.toFixed(2)
+				// 更新图表数据（根据 records 计算最近6个月）
+				updateChartData()
+			}
+		} catch (err) {
+			console.error('获取缴费记录失败', err)
+		}
+	}
+
+	// 更新图表数据（根据 records 计算最近6个月）
+	const updateChartData = () => {
+		// 按月份汇总金额
+		const monthTotal = {}
+		billList.value.forEach(bill => {
+			const monthKey = bill.month
+			if (!monthTotal[monthKey]) {
+				monthTotal[monthKey] = 0
+			}
+			monthTotal[monthKey] += bill.amount
+		})
+		// 取最近6个月（当前月往前）
+		const now = new Date()
+		const currentMonth = now.getMonth() + 1 // 1-12
+		const currentYear = now.getFullYear()
+		const months = []
+		for (let i = 0; i < 6; i++) {
+			let month = currentMonth - i
+			let year = currentYear
+			if (month <= 0) {
+				month += 12
+				year -= 1
+			}
+			months.push({
+				month,
+				year
+			})
+		}
+		chartData.value = months.map((m, i) => ({
+			month: (m.year + '').slice(-2) + '年' + m.month + '月',
+			year: m.year,
+			sortMonth: m.year * 12 + m.month,
+			price: monthTotal[m.month] || 0,
+			index: i
+		})).sort((a, b) => a.sortMonth - b.sortMonth)
+		const prices = chartData.value.map(c => c.price)
+		maxPrice.value = Math.max(...prices, 100)
+	}
+
+	// 计算属性 —— 月份分组
+	const monthGroups = computed(() => {
+		let map = {}
+		billList.value.forEach(bill => {
+			if (!map[bill.month]) {
+				map[bill.month] = {
+					month: bill.month,
+					total: 0,
+					list: []
+				}
+			}
+			map[bill.month].list.push(bill)
+			map[bill.month].total += bill.amount
+		})
+		return Object.values(map).sort((a, b) => b.month - a.month)
+	})
+
+	// 生命周期
+	onShow(() => {})
+	onMounted(() => {})
+	onLoad(() => {
+		getRecords()
+	})
+	onReady(() => {})
+
+	// 方法
+	const barHeight = (price) => {
+		const height = (price / maxPrice.value) * barMaxHeight.value
+		return `${height}rpx`
+	}
+
+	const goBack = () => {
+		uni.switchTab({
+			url: '/pages/paymentIndex/paymentIndex'
+		});
+	}
+</script>
+
+<style lang="scss">
+	page {
+		// background: #f2f1f6;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background: linear-gradient(to left bottom, #e2efff 0%, #f9f9f9 50%);
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		padding: 0px 40rpx;
+		box-sizing: border-box;
+	}
+
+	.total-box {
+		margin-bottom: 30rpx;
+	}
+
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 100rpx 0;
+		color: #ccc;
+	}
+
+	.empty-text {
+		font-size: 32rpx;
+		color: #999;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.top-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.total-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+
+	.total-price {
+		font-size: 48rpx;
+		font-weight: bold;
+		margin-top: 10rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.chart-canvas {
+		width: calc(100vw - 60rpx);
+		height: 30vh;
+	}
+
+	.list-wrapper {
+		padding: 10rpx 0rpx;
+	}
+
+	.month-group {
+		border-bottom: 2rpx solid #f2f2f2;
+		padding: 30rpx;
+		background-color: #fff;
+		margin-bottom: 30rpx;
+		border-radius: 10rpx;
+	}
+
+	.month-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		margin-bottom: 30rpx;
+	}
+
+	.bill-item {
+		display: flex;
+		align-items: center;
+		margin-bottom: 30rpx;
+		padding-bottom: 30rpx;
+		border-bottom: 1px solid #ebebeb;
+	}
+
+	.bill-item:last-child {
+		border-bottom: none;
+		margin-bottom: 0rpx;
+		padding-bottom: 0rpx;
+	}
+
+	.bill-icon {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #4080FF;
+		margin-right: 24rpx;
+		font-size: 36rpx;
+	}
+
+	.iconStyle {
+		width: 100%;
+		height: 100%;
+	}
+
+	.bill-info {
+		flex: 1;
+	}
+
+	.name {
+		font-size: 28rpx;
+		color: #333;
+		font-weight: 600;
+	}
+
+	.account {
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 8rpx;
+	}
+
+	.bill-price {
+		font-size: 32rpx;
+		color: #333;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+</style>
+
+<style scoped>
+	.chart-box {
+		width: 100%;
+		height: 444rpx;
+		display: flex;
+		align-items: flex-end;
+		justify-content: space-around;
+		box-sizing: border-box;
+	}
+
+	.chart-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: flex-end;
+		width: 120rpx;
+		font-size: 24rpx;
+	}
+
+	.chart-label {
+		font-size: 32rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+	}
+
+	.chart-bar {
+		width: 40rpx;
+		background: #3388ff;
+		border-radius: 40rpx 40rpx 0 0;
+	}
+
+	.chart-month {
+		font-size: 26rpx;
+		color: #666;
+		margin-top: 24rpx;
+	}
+</style>

huakai-app/pageSubPack/payment-list/selectPaymentEntity.vue

@@ -0,0 +1,376 @@
+<template>
+	<view class="contentStyle" style="">
+		<view class="status-bar"></view>
+		<uni-nav-bar title="选择缴费单位" left-icon="left" @clickLeft="goBack" backgroundColor="transparent" :border="false">
+		</uni-nav-bar>
+
+		<!-- 表单区域 -->
+		<scroll-view class="page" scroll-y="true">
+			<!-- 城市 + 搜索 -->
+			<view class="search-section">
+				<!-- 城市选择器 -->
+				<uni-data-picker placeholder="选择省市" popup-title="选择省市" :localdata="alladdress"
+					field="code as value, value as text" orderby="value asc" :step-searh="true" self-field="code"
+					parent-field="code" @change="onchange" v-model="cityValue" class="city-picker">
+					<view class="city-select">
+						<text class="city-text ellipsis">{{ selectedCity }}</text>
+						<text class="arrow-icon"></text>
+					</view>
+				</uni-data-picker>
+
+				<!-- 搜索框 -->
+				<view class="search-box">
+					<input class="search-input" v-model="searchKey" placeholder="请输入缴费单位名称"
+						placeholder-class="input-placeholder" @input="onSearch" />
+					<uni-icons type="search" size="20" color="#999" />
+				</view>
+			</view>
+
+			<view v-if="filterList.length === 0" class="empty-state">
+				<uni-icons type="info" size="60" color="#ccc"></uni-icons>
+				<text class="empty-text">{{ '暂无数据' }}</text>
+			</view>
+
+			<view v-for="item in filterList">
+				<view class="group-title">{{item.name}}</view>
+				<view class="item" v-for="itemChild in item.children" :key="itemChild.id"
+					@click="selectItem(itemChild)">
+					{{ itemChild.name }}
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed
+
+	} from 'vue'
+	import {
+		onShow,
+		onReady,
+		onReachBottom,
+		onLoad,
+		onUnload,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+
+	// 响应式数据
+	const selectedCity = ref('选择城市')
+	const cityValue = ref('')
+	const alladdress = ref([{
+		text: "北京市",
+		value: "110000000000",
+		children: [{
+			text: "市辖区",
+			value: "110100000000",
+			children: [{
+					text: "东城区",
+					value: "110101000000"
+				},
+				{
+					text: "西城区",
+					value: "110102000000"
+				},
+				{
+					text: "朝阳区",
+					value: "110105000000"
+				},
+				{
+					text: "丰台区",
+					value: "110106000000"
+				},
+				{
+					text: "石景山区",
+					value: "110107000000"
+				},
+				{
+					text: "海淀区",
+					value: "110108000000"
+				},
+				{
+					text: "门头沟区",
+					value: "110109000000"
+				},
+				{
+					text: "房山区",
+					value: "110111000000"
+				},
+				{
+					text: "通州区",
+					value: "110112000000"
+				},
+				{
+					text: "顺义区",
+					value: "110113000000"
+				},
+				{
+					text: "昌平区",
+					value: "110114000000"
+				},
+				{
+					text: "大兴区",
+					value: "110115000000"
+				},
+				{
+					text: "怀柔区",
+					value: "110116000000"
+				},
+				{
+					text: "平谷区",
+					value: "110117000000"
+				},
+				{
+					text: "密云区",
+					value: "110118000000"
+				},
+				{
+					text: "延庆区",
+					value: "110119000000"
+				}
+			]
+		}]
+	}])
+
+	const searchKey = ref('')
+	const statusBarHeight = ref(20)
+	const showPicker = ref(false)
+	const keyword = ref('')
+
+	const companyList = ref([{
+			id: 7,
+			name: '官方机构',
+			children: [{
+					id: 1,
+					name: "XX市燃气集团有限公司"
+				},
+				{
+					id: 2,
+					name: "XX市供水有限公司"
+				},
+				{
+					id: 3,
+					name: "XX供电服务中心"
+				},
+				{
+					id: 4,
+					name: "XX新能源服务公司"
+				},
+				{
+					id: 5,
+					name: "XX公共事业缴费中心"
+				},
+				{
+					id: 6,
+					name: "XX综合能源服务站"
+				}
+			]
+		},
+		{
+			id: 8,
+			name: '非智享日照提供的服务单位',
+			children: [{
+					id: 9,
+					name: "XX市燃气集团有限公司"
+				},
+				{
+					id: 10,
+					name: "XX能源集团"
+				}
+			]
+		}
+	])
+
+	// 计算属性：搜索过滤
+	const filterList = computed(() => {
+		if (!searchKey.value) return companyList.value
+		const key = searchKey.value.trim().toLowerCase()
+
+		return companyList.value.filter(group => {
+			const hasChild = group.children.some(child =>
+				child.name.toLowerCase().includes(key)
+			)
+			const groupMatch = group.name.toLowerCase().includes(key)
+			return hasChild || groupMatch
+		}).map(group => {
+			return {
+				...group,
+				children: group.children.filter(child =>
+					child.name.toLowerCase().includes(key)
+				)
+			}
+		})
+	})
+
+	// 生命周期
+	onShow(() => {})
+	onMounted(() => {})
+	onReady(() => {})
+
+	// 方法
+	const selectItem = (item) => {
+		console.log(item)
+		uni.redirectTo({
+			url: '/pageSubPack/payment-list/addPayment'
+		})
+	}
+
+	const onchange = (e) => {
+		console.log('选中text数组:', e.detail.value)
+		const arr = e.detail.value
+		let city = ''
+		if (arr[1].text === '市辖区') {
+			city = arr[0].text
+		} else {
+			city = arr[1].text
+		}
+		selectedCity.value = city
+	}
+
+	const onSearch = () => {}
+
+	const goBack = () => {
+		uni.switchTab({ url: '/pages/paymentIndex/paymentIndex' });
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #f9f9f9;
+	}
+</style>
+
+<style scoped>
+	.contentStyle {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		background-color: #f9f9f9;
+	}
+
+	.page {
+		flex: 1;
+		overflow-y: auto;
+		box-sizing: border-box;
+		background-color: #fff;
+	}
+
+	.search-section {
+		background-color: #fff;
+		padding: 20rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.city-picker {
+		display: block;
+		width: auto;
+	}
+
+	.city-select {
+		display: flex;
+		align-items: center;
+		padding: 8rpx 0;
+		cursor: pointer;
+		width: 80px;
+		height: 70rpx;
+	}
+
+	.ellipsis {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.city-text {
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #000000;
+		line-height: 1;
+	}
+
+	.arrow-icon {
+		width: 0;
+		height: 0;
+		border-left: 10rpx solid transparent;
+		border-right: 10rpx solid transparent;
+		border-top: 16rpx solid #333333;
+		margin-top: 4rpx;
+	}
+
+	.search-box {
+		display: flex;
+		width: 100%;
+		align-items: center;
+		background-color: #f3f4f6;
+		border-radius: 20rpx;
+		padding: 0 30rpx;
+		margin: 10rpx 0px 0px 10rpx;
+		height: 70rpx;
+	}
+
+	.search-input {
+		flex: 1;
+		height: 100%;
+		font-size: 30rpx;
+		border: none;
+		background: transparent;
+	}
+
+	.input-placeholder {
+		color: #999;
+		font-size: 30rpx;
+	}
+
+	.search-icon {
+		font-size: 36rpx;
+		color: #999;
+	}
+
+	.group-title {
+		padding: 20rpx 40rpx;
+		font-size: 28rpx;
+		color: #666;
+		background-color: #f3f3f3;
+	}
+
+	.item {
+		background: #fff;
+		padding: 20rpx 40rpx;
+		font-size: 28rpx;
+		border-bottom: 2rpx solid #f2f2f2;
+	}
+
+	.item:active {
+		background: #f2f2f2;
+	}
+
+	::v-deep .selected-item {
+		margin-left: 10rpx !important;
+		margin-right: 10rpx !important;
+	}
+
+	.status-bar {
+		width: 100vw;
+		height: 46px;
+	}
+
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 100rpx 0;
+		color: #ccc;
+	}
+
+	.empty-text {
+		font-size: 32rpx;
+		color: #999;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+	}
+</style>