Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/api/api.js

@@ -1,4 +1,4 @@
-import request,{get,post} from "./request.js"
+import request,{get,post,upload} from "./request.js"
 
 
 // =======账号密码登录========
@@ -65,8 +65,8 @@ export const addRepairList = (data) =>{
 	return post('/manage/repair/order',data)
 }
 // 上传图片
-export const uploadFile = (filePath) => {
+export const uploadFile = (filePath, fileName) => {
-	return upload(filePath,'/resource/oss/upload');
+	return upload(filePath, '/api/butler/file/uploadImage', fileName);
 }
 
 // 查询一键开门

wuye-manager-uniapp/api/request.js

@@ -81,20 +81,21 @@ export const put = (url, data) => request(url, data, 'PUT')
 // export const putMethod = (url, data) => request(url, data, 'PUT');
 
 // 上传
-export const upload = (filePath, url) => {
+export const upload = (filePath, url, fileName) => {
   return new Promise((resolve, reject) => {
-    uni.uploadFile({
+    const uploadTask = uni.uploadFile({
       url: baseUrl + url,
       filePath: filePath,
       name: 'file',
+      fileName: fileName,
       header: {
         Authorization: 'Bearer ' + (uni.getStorageSync('token') || ''),
-        clientid: 'resident'
+        clientid: 'butler'
       },
       success: res => {
         try {
           const data = JSON.parse(res.data)
-          resolve(data.data || '') // 直接返回图片地址
+          resolve(data.data || '')
         } catch (e) {
           resolve('')
         }

wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue

@@ -150,13 +150,14 @@ const uploadImages = async () => {
       continue
     }
     try {
-      const res = await uploadFile(path)
+      // 从路径中提取文件名
-      // 根据后端实际返回结构调整字段名
+      const fileName = path.substring(path.lastIndexOf('/') + 1)
-      uploadedUrls.push(res.url || '')
+      const res = await uploadFile(path, fileName)
+      uploadedUrls.push(res?.url || '')
     } catch (err) {
       uni.showToast({
-	  	title:err.msg || '图片上传失败',
+        title: err.msg || '图片上传失败',
-		 icon:'error'
+        icon: 'error'
       })
     }
   }

wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue

@@ -29,6 +29,15 @@
 
 		</view>
 
+		<!-- 记住密码 -->
+		<view class="remember-wrap">
+			<view class="remember-item" @click="toggleRemember">
+				<uni-icons type="checkbox-filled" size="18" color="#4D5DFA" v-if="rememberPwd"></uni-icons>
+				<uni-icons type="checkbox" size="18" color="#999" v-else></uni-icons>
+				<text class="remember-text">记住密码</text>
+			</view>
+		</view>
+
 		<!-- 协议勾选 + 忘记密码 -->
 		<view class="agreement-wrap">
 			<view class="agreement-item">
@@ -72,6 +81,7 @@
 	const phoneNumber = ref('');
 	const password = ref('');
 	const agreeAgreement = ref(false); // 默认勾选
+	const rememberPwd = ref(false);
 	const placeholderStyle = ref('font-size:24rpx')
 	// 控制点击变色
 	// const isClicked = ref(false)
@@ -87,6 +97,10 @@
 	const toggleAgreement = () => {
 		agreeAgreement.value = !agreeAgreement.value;
 	};
+	// 切换记住密码
+	const toggleRemember = () => {
+		rememberPwd.value = !rememberPwd.value;
+	};
 	// 跳转隐私协议
 	const goToPrivacy = () => {
 
@@ -100,7 +114,14 @@
 	const checkForm = () => {};
 
 
-	onLoad(() => {});
+	onLoad(() => {
+		const savedPhone = uni.getStorageSync('rememberPhone');
+		const savedPwd = uni.getStorageSync('rememberPassword');
+		const savedRemember = uni.getStorageSync('rememberPwd');
+		if (savedPhone) phoneNumber.value = savedPhone;
+		if (savedPwd) password.value = savedPwd;
+		if (savedRemember) rememberPwd.value = savedRemember;
+	});
 
 	// 登录逻辑
 	const handleLogin = () => {
@@ -138,12 +159,21 @@
 		 		if(res.code === 200){
 		 			uni.setStorageSync('token', res.data.token);
 				// 存用户ID
-				if(res.data) {
+				// if(res.data) {
-					// 存当前绑定的小区ID，0 表示未绑定
+				// 	// 存当前绑定的小区ID，0 表示未绑定
-					// const currentVillageId = res.data.currentVillageId || 0;
+				// 	// const currentVillageId = res.data.currentVillageId || 0;
-					// uni.setStorageSync('currentVillageId', currentVillageId);
+				// 	// uni.setStorageSync('currentVillageId', currentVillageId);
-				}
+				// }
 				uni.hideLoading();
+				if (rememberPwd.value) {
+					uni.setStorageSync('rememberPhone', phoneNumber.value);
+					uni.setStorageSync('rememberPassword', password.value);
+					uni.setStorageSync('rememberPwd', true);
+				} else {
+					uni.removeStorageSync('rememberPhone');
+					uni.removeStorageSync('rememberPassword');
+					uni.removeStorageSync('rememberPwd');
+				}
 				uni.showToast({ title: '登录成功', icon: 'success' });
 				setTimeout(() =>{
 					uni.switchTab({
@@ -228,11 +258,29 @@
 		font-size: 28rpx;
 	}
 
+	.remember-wrap {
+		display: flex;
+		align-items: center;
+		margin: 20rpx 0 0 0;
+		padding: 0 10rpx;
+	}
+
+	.remember-item {
+		display: flex;
+		align-items: center;
+	}
+
+	.remember-text {
+		font-size: 24rpx;
+		color: #666;
+		margin-left: 10rpx;
+	}
+
 	.agreement-wrap {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin: 70rpx 0 28rpx 0;
+		margin: 40rpx 0 28rpx 0;
 		padding: 0 10rpx;
 	}
 

wuye-manager-uniapp/pageSubPack/report-record/report-record.vue

@@ -301,13 +301,10 @@ onReady(() => {
 .type-tabs {
   display: flex;
   /* background-color: #fff; */
-  padding: 20rpx 0rpx;
+  padding: 20rpx 40rpx;
   margin-top: 10rpx;
   justify-content: flex-start;
-  margin: 0rpx 40rpx;
+  /* gap: 20rpx; */
-}
-.type-tabs > .type-tab-item:not(:last-child) {
-  margin-right: 20rpx;
 }
 
 .type-tab-item {
@@ -316,6 +313,7 @@ onReady(() => {
   color: #999;
   border: 2rpx solid #999;
   border-radius: 198rpx;
+  margin: 0 16rpx 0 0;
 }
 
 .type-tab-item.active {

wuye-manager-uniapp/pageSubPack/setting/change-password.vue

@@ -192,7 +192,9 @@ const handleConfirm = () => {
   flex: 1;
   font-size: 32rpx;
   color: #333;
-  height: 100%;
+  /* height: 100%; */
+  display: flex;
+  align-items: center;
 }
 
 /* 密码规则提示 */

wuye-manager-uniapp/pageSubPack/setting/change-phone.vue

@@ -210,7 +210,8 @@ const handleConfirm = () => {
   flex: 1;
   font-size: 32rpx;
   color: #333;
-  height: 100%;
+  display: flex;
+  align-items: center;
 }
 .verify-input {
   padding-right: 20rpx;

wuye-manager-uniapp/pages/index/index.vue

@@ -5,6 +5,8 @@
 
     <!-- 页面内容区 -->
     <view class="page-content">
+      <!-- 粘性顶部区域（状态栏 + 导航栏 + 小区选择） -->
+      <view class="sticky-header">
         <!-- 状态栏占位 -->
         <view class="status_bar" :style="{ height: statusBarHeight + 'px' }"></view>
         <!-- 导航栏 -->
@@ -31,7 +33,10 @@
             </view>
           </view>
         </view>
+      </view>
 
+      <!-- 可滚动内容区 -->
+      <view class="scroll-content">
         <!-- banner -->
         <view class="bannarClass">
           <uni-swiper-dot
@@ -146,11 +151,12 @@
         </view>
       </view>
     </view>
+  </view>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import { onLoad, onUnload } from '@dcloudio/uni-app'
+import { onLoad, onUnload ,onShow} from '@dcloudio/uni-app'
 import {
   getCurrentVillage,
   getTodayInspection,
@@ -297,13 +303,16 @@ const slelctHomeData = data => {
   getNoticeData()
   getInspectionData()
 }
+onShow(()=>{
+   getbannarData()
+})
 
 onLoad(() => {
   uni.$on('confirm', slelctHomeData)
   // 优先调用接口获取当前小区，失败时再读缓存
   currentVillageData()
   getInspectionData()
-  getbannarData()
+  // getbannarData()
 })
 
 onUnload(() => {
@@ -326,13 +335,13 @@ const onSwiperChange = e => {
   position: relative;
 }
 
-/* 顶部渐变背景 */
+/* 顶部渐变背景 - 增加高度确保覆盖粘性头部区域 */
 .bg-gradient {
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
-  height: 400rpx;
+  height: 600rpx;
   background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb);
   z-index: 0;
 }
@@ -344,6 +353,19 @@ const onSwiperChange = e => {
   padding: 0 40rpx 40rpx;
 }
 
+/* 粘性头部区域 - 滚动时固定在顶部 */
+.sticky-header {
+  position: sticky;
+  top: 0;
+  z-index: 100;
+  /* 与顶部渐变背景一致，保证滚动时视觉效果连贯 */
+  background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb);
+  margin: 0 -40rpx; /* 抵消父容器内边距，使背景完全延伸 */
+  padding: 0 40rpx;
+  /* 可选：添加轻微阴影增强层次感 */
+  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.02);
+}
+
 .status_bar {
   width: 100%;
 }
@@ -407,6 +429,12 @@ const onSwiperChange = e => {
   }
 }
 
+/* 可滚动内容区域 */
+.scroll-content {
+  /* 确保内部元素正常布局 */
+  width: 100%;
+}
+
 .bannarClass {
   padding: 20rpx 0;
 }