diff --git a/app.json b/app.json
index a9cdc5d..3a815d0 100644
--- a/app.json
+++ b/app.json
@@ -1,12 +1,12 @@
{
"pages": [
"pages/home/index",
+ "pages/rechargeRecord/index",
"pages/invoiceList/index",
"pages/member/index",
"pages/login/index",
"pages/handleLogin/index",
"pages/my/index",
- "pages/rechargeRecord/index",
"pages/waitApprove/index",
"pages/apply/index",
"pages/qrCode/index",
diff --git a/pages/home/index.js b/pages/home/index.js
index 6d55951..21b2ce7 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -3,6 +3,7 @@ import { getOwnTenementList } from "../../service/tenement";
import { alertInfo } from "../../utils/index";
import request from '../../utils/request';
import { getDot } from "../../utils/system";
+import { getUserInfo } from "../../service/user"
const { OK } = request;
// pages/home/index.js
Page({
@@ -79,7 +80,7 @@ Page({
})
break;
case "tenement":
- const currentTenement = this.data.tenement;
+ // const currentTenement = this.data.tenement;
// if (value.id === currentTenement?.id) {
// this.setData({ show: false })
// return
@@ -97,7 +98,7 @@ Page({
},
async handleGetMeterDetail(meterCode) {
const { tenement } = this.data;
- const { code, message, data } = await getMeterDetail({ tenement, code: meterCode });
+ const { code, message, data } = await getMeterDetail({ tenement: tenement?.id, code: meterCode });
if (code !== OK) {
alertInfo(message);
return;
@@ -177,15 +178,17 @@ Page({
})
},
async setUser() {
- // const result = await getUserInfo();
- // if (result.code !== OK) {
- // alertInfo(result.message)
- // return;
- // }
- // this.setData({ user: result.data })
- // wx.setStorageSync('user', result.data)
- const user = wx.getStorageSync('user')
- this.setData({ user: user })
+ const result = await getUserInfo();
+ if (result.code !== OK) {
+ // alertInfo(result.message)
+ const user = wx.getStorageSync('user')
+ this.setData({ user: user })
+ return;
+ }
+ this.setData({ user: result.data })
+ wx.setStorageSync('user', result.data)
+ // const user = wx.getStorageSync('user')
+ // this.setData({ user: user })
},
async getAllList() {
const { code, message, data } = await getOwnTenementList()
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 38c21f1..8d5cbf4 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -24,7 +24,7 @@
- {{user.tenement.name}}
+ {{tenement.name}}
欢迎使用华昌宝能用电管理系统!
diff --git a/pages/my/index.js b/pages/my/index.js
index dbe15a2..fe3641b 100644
--- a/pages/my/index.js
+++ b/pages/my/index.js
@@ -73,6 +73,12 @@ Page({
dot
})
},
+ logout() {
+ wx.clearStorageSync()
+ wx.switchTab({
+ url: '/pages/home/index',
+ })
+ },
bindTenement() {
wx.navigateTo({
url: '/pages/handleLogin/index',
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index 6a2cd09..ffa3b95 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -16,6 +16,7 @@
+