diff --git a/wuye-manager-uniapp/api/api.js b/wuye-manager-uniapp/api/api.js
index 8901ee0..9e400f9 100644
--- a/wuye-manager-uniapp/api/api.js
+++ b/wuye-manager-uniapp/api/api.js
@@ -3,21 +3,17 @@ import request,{get,post} from "./request.js"
// =======账号密码登录========
export const getLoginPassword = (data) =>{
- return post('/api/resident/auth/loginByPassword',data)
+ return post('/api/butler/auth/loginByPassword',data)
}
-// 注册新用户获取验证码
+// 获取验证码
export const getSendCode = (data) =>{
- return post('/api/resident/auth/sendSmsCode',data)
+ return post('/api/butler/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)
+ return post('/api/butler/auth/loginBySms',data)
}
// 忘记密码接口
export const getResetPassword = (data) =>{
- return post('/api/resident/auth/resetPassword',data)
+ return post('/api/butler/auth/forgetPassword',data)
}
diff --git a/wuye-manager-uniapp/api/request.js b/wuye-manager-uniapp/api/request.js
index 37d6624..d4443af 100644
--- a/wuye-manager-uniapp/api/request.js
+++ b/wuye-manager-uniapp/api/request.js
@@ -1,7 +1,7 @@
-let baseUrl = '';
+let baseUrl = '';
if (process.env.NODE_ENV === 'development') {
- baseUrl = 'http://192.168.0.224:8080'; // 开发环境
+ baseUrl = 'http://192.168.0.239:8080'; // 开发环境
} else {
baseUrl = 'http://192.168.1.224:8080'; // 生产环境
}
@@ -32,7 +32,7 @@ export default function request(url, data = {}, method = "GET") {
const errMsg = `请求失败（${res.statusCode}）`;
uni.showToast({ title: errMsg, icon: "none", duration: 2000 });
reject(errMsg);
- return;
+ return;
}
// 处理业务状态码（后端返回的data里）
diff --git a/wuye-manager-uniapp/manifest.json b/wuye-manager-uniapp/manifest.json
index 036bc38..ad33078 100644
--- a/wuye-manager-uniapp/manifest.json
+++ b/wuye-manager-uniapp/manifest.json
@@ -51,7 +51,8 @@
/* 小程序特有相关 */
"mp-weixin": {
"appid": "wx4a49ad94e2b25927",
- "usingComponents": true
+ "usingComponents": true,
+ "lazyCodeLoading":"requiredComponents"
},
"mp-alipay": {
"usingComponents": true
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/change-pwd.vue b/wuye-manager-uniapp/pageSubPack/loginSub/change-pwd.vue
index 214046d..e37ee97 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/change-pwd.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/change-pwd.vue
@@ -89,7 +89,7 @@ const handleConfirm = () => {
}
getResetPassword(params).then(res =>{
if(res.code === 200){
- //uni.setStorageSync('token', res.token); // 假设后端返回token字段
+ //uni.setStorageSync('token', res.token); // 后端返回token字段
uni.showToast({ title: '修改成功', icon: 'success' });
setTimeout(() =>{
uni.navigateTo({ url: '/pageSubPack/loginSub/pwd-login' });
@@ -100,7 +100,7 @@ const handleConfirm = () => {
}
}).catch(err =>{
uni.showToast({
- title: '网络异常',
+ title: err.msg,
icon: 'error'
});
})
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index 94d9a89..953d470 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -50,7 +50,7 @@
账号密码登录
- 注册新用户
+
@@ -120,7 +120,7 @@
if (!canGetVerify.value) return;
let params = {
phone: phoneNumber.value,
- scene: 'login'
+ scene: 'butler_login'
}
uni.showLoading({
title: '发送中...',
@@ -150,7 +150,7 @@
}
}).catch(err => {
uni.showToast({
- title: '网络异常',
+ title: err.msg,
icon: 'error'
});
})
@@ -166,8 +166,8 @@
});
let params = {
phone: phoneNumber.value,
- smsCode: '123456',
- scene: 'login',
+ smsCode: verifyCode.value,
+ scene: 'butler_login',
}
getLoginBySms(params).then(res => {
if (res.code === 200) {
@@ -206,7 +206,7 @@
}).catch(err => {
uni.showToast({
- title: '网络异常，请重试',
+ title: err.msg,
icon: 'error'
});
})
@@ -342,7 +342,7 @@
color: #fff;
border-radius: 8rpx;
font-size: 28rpx;
- margin-bottom: 60rpx;
+ margin-bottom: 40rpx;
}
/* 登录按钮禁用状态 */
@@ -360,7 +360,7 @@
/* 底部链接 */
.bottom-link {
display: flex;
- justify-content: space-between;
+ justify-content: center;
padding: 0 20rpx;
}
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 3987788..8d17e11 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -51,7 +51,7 @@
验证码登录
- 注册新用户
+
@@ -104,67 +104,56 @@
// 登录逻辑
const handleLogin = () => {
- // if (!canLogin.value) {
- // uni.showToast({ title: '请输入账号和密码', icon: 'none' });
- // return
- // }
+ if (!canLogin.value) {
+ uni.showToast({ title: '请输入账号和密码', icon: 'none' });
+ return
+ }
- // if (!phoneNumber.value) {
- // uni.showToast({ title: '请输入账号', icon: 'none' });
- // return;
- // }
- // if (!password.value) {
- // uni.showToast({ title: '请输入密码', 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 =>{
- // console.log('33333',res)
- // 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);
- // }
- // uni.hideLoading();
- // uni.showToast({ title: '登录成功', icon: 'success' });
- // setTimeout(() =>{
- // uni.switchTab({
- // url: '/pages/index/index'
- // },1000);
- // })
- // }else{
- // uni.showToast({ title: res.msg, icon: 'error' });
- // }
+ if (!phoneNumber.value) {
+ uni.showToast({ title: '请输入账号', icon: 'none' });
+ return;
+ }
+ if (!password.value) {
+ uni.showToast({ title: '请输入密码', 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 =>{
+ // console.log('33333',res)
+ 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);
+ }
+ uni.hideLoading();
+ uni.showToast({ title: '登录成功', icon: 'success' });
+ setTimeout(() =>{
+ uni.switchTab({
+ url: '/pages/index/index'
+ },1000);
+ })
+ }else{
+ uni.showToast({ title: res.msg, icon: 'error' });
+ }
- // }).catch(err => {
- // uni.showToast({
- // title: '网络异常',
- // icon: 'error'
- // });
- // })
+ }).catch(err => {
+ uni.showToast({
+ title: err.msg,
+ icon: 'error'
+ });
+ })
- // 测试
- uni.showLoading({
- title: '登录中...',
- mask: true
- });
- setTimeout(() => {
- uni.switchTab({
- url: '/pages/index/index'
- });
- }, 1500);
- uni.hideLoading()
};
@@ -253,7 +242,7 @@
color: #fff;
border-radius: 8rpx;
font-size: 28rpx;
- margin-bottom: 60rpx;
+ margin-bottom: 40rpx;
}
.login-btn:disabled {
@@ -270,7 +259,7 @@
.bottom-link {
display: flex;
- justify-content: space-between;
+ justify-content: center;
padding: 0 20rpx;
}
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/register-new-user.vue b/wuye-manager-uniapp/pageSubPack/loginSub/register-new-user.vue
deleted file mode 100644
index cfe6eb2..0000000
--- a/wuye-manager-uniapp/pageSubPack/loginSub/register-new-user.vue
+++ /dev/null
@@ -1,393 +0,0 @@
-
-
-
-
-
-
- 注册
-
-
-
- 注册用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 我已阅读并同意
- 《用户隐私政策》
-
-
-
-
-
-
-
-
- 已有账号，去登录
-
-
-
-
-
-
-
diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
index 2784236..b2a7c75 100644
--- a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
+++ b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
@@ -65,7 +65,7 @@
@@ -318,7 +318,7 @@
.search-input-wrapper {
flex: 1;
- background-color: #f8f8f8;
+ background-color: #f3f3f3;
border-radius: 10rpx;
padding: 0 20rpx;
display: flex;
@@ -341,6 +341,7 @@
.placeholder {
color: #999;
font-size: 28rpx;
+ text-align: center;
}
.clear-icon {
@@ -373,14 +374,14 @@
.community-item {
background-color: #fff;
- border-radius: 12rpx;
+ /* border-radius: 12rpx; */
padding: 30rpx;
margin-bottom: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
- box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
- transition: all 0.2s;
+ /* box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05); */
+ /* transition: all 0.2s; */
}
.community-item.active {
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue
index 1eb64a1..54a4474 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue
+++ b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue
@@ -172,7 +172,7 @@ const handleConfirm = () => {
uni.showLoading({ title: '修改中...' });
setTimeout(() =>{
uni.navigateTo({
- url:'/pageSubPack/setting/setting'
+ url:`/pageSubPack/setting/setting?newPassword=${confirmPassword.value}`
})
})
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue b/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
index a37f9ec..31fd165 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
+++ b/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
@@ -113,11 +113,16 @@ const handleConfirm = () =>{
uni.showToast({ title: '请输入',icon: 'error'});
return
}
+ setTimeout(()=>{
+ uni.navigateTo({
+ url:"/pageSubPack/setting/setting"
+ })
+ })
}
// 返回上一页
-const goBack = () => {
- uni.navigateBack();
-};
+// const goBack = () => {
+// uni.navigateBack();
+// };
\ No newline at end of file
+
diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json
index 5ad0c11..0fc287b 100644
--- a/wuye-manager-uniapp/pages.json
+++ b/wuye-manager-uniapp/pages.json
@@ -43,13 +43,6 @@
"navigationBarTitleText": "用户隐私协议"
}
},
- {
- "path": "register-new-user",
- "style": {
- "navigationBarTitleText": "注册新用户",
- "navigationStyle": "custom"
- }
- },
{
"path": "forget-pwd",
"style": {
diff --git a/wuye-manager-uniapp/pages/guide/guide.vue b/wuye-manager-uniapp/pages/guide/guide.vue
index 0befac9..791919a 100644
--- a/wuye-manager-uniapp/pages/guide/guide.vue
+++ b/wuye-manager-uniapp/pages/guide/guide.vue
@@ -116,7 +116,7 @@ const handleBtnClick = () => {
box-sizing: border-box;
}
.status_bar {
- height: 115px;
+ height: 140px;
width: 100%;
}
/* 滑动容器 */
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 51e8dfd..6350ee6 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -260,7 +260,7 @@ const clickItem = (index) => {
position: relative;
top: 110px;
left: 0;
- padding: 40rpx;
+ padding: 20rpx 40rpx;
}
.swiper-box {
@@ -280,11 +280,11 @@ const clickItem = (index) => {
.inspectionClass {
position: relative;
- top: 107px;
+ top: 111px;
left: 0;
margin: 0 40rpx;
background: linear-gradient(to right, #7b87fa, #4d5dfa);
- border-radius: 25rpx;
+ border-radius: 16rpx;
box-sizing: border-box;
padding: 30rpx;
}
@@ -375,7 +375,7 @@ const clickItem = (index) => {
.function-container {
background-color: #ffffff;
- border-radius: 8rpx;
+ border-radius: 16rpx;
padding: 30rpx 20rpx;
box-sizing: border-box;
position: relative;
diff --git a/wuye-manager-uniapp/static/bannar1.png b/wuye-manager-uniapp/static/bannar1.png
deleted file mode 100644
index be2a3da..0000000
Binary files a/wuye-manager-uniapp/static/bannar1.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/bannar2.png b/wuye-manager-uniapp/static/bannar2.png
deleted file mode 100644
index ddf1cfd..0000000
Binary files a/wuye-manager-uniapp/static/bannar2.png and /dev/null differ
diff --git a/wuye-manager-uniapp/static/imgs/adress.png b/wuye-manager-uniapp/static/imgs/adress.png
index 60a31e6..4821e98 100644
Binary files a/wuye-manager-uniapp/static/imgs/adress.png and b/wuye-manager-uniapp/static/imgs/adress.png differ
diff --git a/wuye-manager-uniapp/static/logo.png b/wuye-manager-uniapp/static/logo.png
deleted file mode 100644
index b5771e2..0000000
Binary files a/wuye-manager-uniapp/static/logo.png and /dev/null differ