diff --git a/pages/add/add.wxss b/pages/add/add.wxss
index cb19886..3231e61 100644
--- a/pages/add/add.wxss
+++ b/pages/add/add.wxss
@@ -195,7 +195,7 @@
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
z-index: 999;
- max-height: 80vh;
+ max-height: 50vh;
display: flex;
flex-direction: column;
}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9a679dd..46f4463 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -34,7 +34,7 @@
- {{item.categoryName}}
+ {{item.classificationName}}
{{item.useDate}}
diff --git a/pages/login/login.js b/pages/login/login.js
index dc5fa51..58e63c3 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -95,13 +95,13 @@ Page({
});
wx.request({
- url: 'http://localhost:48080/admin-api/system/auth/login', // 仅为示例,并非真实的接口地址
+ url: 'http://192.168.250.38:48080/app-api/member/auth/login', // 仅为示例,并非真实的接口地址
method: 'POST', // 请求方法,可以是 GET, POST, PUT, DELETE 等
data: {
- "tenantName": "芋道源码",
- "username": account,
- "password": password,
- "rememberMe": true
+ mobile: account,
+ // 账号
+ password: password
+ // 密码
},
header: {
'Tenant-Id':1,
diff --git a/pages/profile/profile.js b/pages/profile/profile.js
index ac2f5f9..d4d2d1d 100644
--- a/pages/profile/profile.js
+++ b/pages/profile/profile.js
@@ -1,3 +1,4 @@
+const request = require('../utils/request')
Page({
data: {
totalRecords: 0,
@@ -134,12 +135,29 @@ Page({
});
},
- outLogin() {
+ async outLogin() {
wx.showModal({
- title: '关于简易记账',
- content: '简易记账是一款简单实用的记账工具,帮助你记录和管理个人财务。',
- showCancel: false,
- confirmText: '我知道了'
+ title: '确认退出',
+ content: '是否确认退出?',
+ cancelText: '取消',
+ confirmText: '确认',
+ success: async (res) => {
+ if (res.confirm) {
+
+ const ress=await request.post('/app-api/member/auth/logout')
+ console.log('resss:',ress)
+ if(ress.code==0){
+ wx.showToast({
+ title: '退出登录成功',
+ icon: 'success',
+ duration: 2000
+ });
+ wx.redirectTo({
+ url: `/pages/login/login`
+ })
+ }
+ }
+ }
});
}
diff --git a/pages/profile/profile.wxml b/pages/profile/profile.wxml
index 4caa26c..99978fe 100644
--- a/pages/profile/profile.wxml
+++ b/pages/profile/profile.wxml
@@ -55,7 +55,7 @@
-
+
diff --git a/pages/utils/request.js b/pages/utils/request.js
index 80de07a..6c3bac6 100644
--- a/pages/utils/request.js
+++ b/pages/utils/request.js
@@ -1,7 +1,7 @@
/**
* 封装微信小程序请求,自动处理token
*/
-const baseUrl='http://localhost:48080'
+const baseUrl='http://192.168.250.38:48080'
const request = (url, options = {}) => {
// 返回Promise,方便使用async/await