diff --git a/wuye-manager-uniapp/api/api.js b/wuye-manager-uniapp/api/api.js
index 553e6ea..8c78c1a 100644
--- a/wuye-manager-uniapp/api/api.js
+++ b/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) => {
- return upload(filePath,'/resource/oss/upload');
+export const uploadFile = (filePath, fileName) => {
+ return upload(filePath, '/api/butler/file/uploadImage', fileName);
}
// 查询一键开门
diff --git a/wuye-manager-uniapp/api/request.js b/wuye-manager-uniapp/api/request.js
index 40906da..1706abb 100644
--- a/wuye-manager-uniapp/api/request.js
+++ b/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('')
}
diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
index fb2e47c..a76d443 100644
--- a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
@@ -150,14 +150,15 @@ const uploadImages = async () => {
continue
}
try {
- const res = await uploadFile(path)
- // 根据后端实际返回结构调整字段名
- uploadedUrls.push(res.url || '')
+ // 从路径中提取文件名
+ const fileName = path.substring(path.lastIndexOf('/') + 1)
+ const res = await uploadFile(path, fileName)
+ uploadedUrls.push(res?.url || '')
} catch (err) {
- uni.showToast({
- title:err.msg || '图片上传失败',
- icon:'error'
- })
+ uni.showToast({
+ title: err.msg || '图片上传失败',
+ icon: 'error'
+ })
}
}
return uploadedUrls
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 3ee8be0..00eb8c2 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -29,6 +29,15 @@
+
+
+
+
+
+ 记住密码
+
+
+
@@ -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) {
- // 存当前绑定的小区ID，0 表示未绑定
- // const currentVillageId = res.data.currentVillageId || 0;
- // uni.setStorageSync('currentVillageId', currentVillageId);
- }
+ // if(res.data) {
+ // // 存当前绑定的小区ID，0 表示未绑定
+ // // const currentVillageId = res.data.currentVillageId || 0;
+ // // 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;
}
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
index 3bb83b3..be40c4b 100644
--- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
+++ b/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;
-}
-.type-tabs > .type-tab-item:not(:last-child) {
- margin-right: 20rpx;
+ /* gap: 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 {
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change-password.vue b/wuye-manager-uniapp/pageSubPack/setting/change-password.vue
index 94b775e..25a2371 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change-password.vue
+++ b/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;
}
/* 密码规则提示 */
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue b/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
index 9b3e16d..c134b50 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
+++ b/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;
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 2ef4422..0f98373 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -5,142 +5,148 @@
-
-
-
-
- 首页
-
-
-