修改首页获取商户,发票选商户没反应的问题,,新增退出登录
This commit is contained in:
@@ -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()
|
||||
|
@@ -24,7 +24,7 @@
|
||||
<view class="logined" wx:else>
|
||||
<avatar text="{{ user.nickName }}" />
|
||||
<view>
|
||||
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="chooseTenement">{{user.tenement.name}} <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
|
||||
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="chooseTenement">{{tenement.name}} <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
|
||||
<view class="welcome"> 欢迎使用华昌宝能用电管理系统! </view>
|
||||
</view>
|
||||
</view>
|
||||
|
Reference in New Issue
Block a user