Compare commits

...

3 Commits

Author SHA1 Message Date
3e640c3633 修改部分内容 2025-09-02 17:16:59 +08:00
a8312b89d5 Merge branch 'dev' of https://git.archgrid.xyz/zly/electricity_bill_calc_wx into dev 2025-07-30 11:06:57 +08:00
f0dee5bc77 修改登录提示语 2025-07-30 11:05:45 +08:00
7 changed files with 41 additions and 7 deletions

View File

@@ -54,7 +54,7 @@ Page({
this.noPermission() this.noPermission()
return; return;
} }
alertSuccess("注册成功") alertSuccess("登录成功")
const { token, ...user } = data const { token, ...user } = data
wx.setStorageSync('user', user) wx.setStorageSync('user', user)
wx.setStorageSync('token', data?.token) wx.setStorageSync('token', data?.token)

View File

@@ -16,6 +16,26 @@ Page({
list: [], list: [],
page: 1, page: 1,
size: 999, size: 999,
header: [
{ key: 'day', title: '日期', },
{ key: "money", title: '充值金额', renderBody: (item) => {
if (item.type === 1 || item.type === 7) {
return item.topFee
} else if (item.type === 5 || item.type === 6 || item.type === 8) {
return `-${item.topFee}`
} else {
return 0
}
} },
{ key: 'overall', title: '电费', renderBody: (item) => {
if (item.type == 1 || item.type === 5 || item.type === 6 || item.type === 7 || item.type === 8) {
return 0;
} else {
return item.money
}
} },
{ key: 'balance', title: '电表余额' },
],
}, },
/** /**

View File

@@ -6,6 +6,7 @@
"van-tag": "@vant/weapp/tag/index", "van-tag": "@vant/weapp/tag/index",
"van-row": "@vant/weapp/row/index", "van-row": "@vant/weapp/row/index",
"empty": "/components/empty/index", "empty": "/components/empty/index",
"table": "/components/table/table",
"van-col": "@vant/weapp/col/index" "van-col": "@vant/weapp/col/index"
}, },
"navigationStyle": "custom" "navigationStyle": "custom"

View File

@@ -11,7 +11,7 @@
</view> </view>
<view class="customTable" wx:if="{{list.length}}"> <view class="customTable" wx:if="{{list.length}}">
<view class="customTableTile"> <!-- <view class="customTableTile">
<van-row> <van-row>
<van-col span="4"> <van-col span="4">
<view style="text-align: center;"> 日期 </view> <view style="text-align: center;"> 日期 </view>
@@ -50,7 +50,15 @@
</van-row> </van-row>
</view> </view>
</view> </view> -->
<table
header="{{header}}"
list="{{list}}"
border="{{true}}"
topStyle="text-align: center"
bodyStyle="text-align: center"
topColor="rgb(242,248,246)"
/>
</view> </view>
<empty bind:refresh="getList" wx:else /> <empty bind:refresh="getList" wx:else />
</view> </view>

View File

@@ -84,3 +84,8 @@
border-top: 0rpx; border-top: 0rpx;
font-size: 32rpx; font-size: 32rpx;
} }
page {
background-color: var(--transparent-green);
}

View File

@@ -27,8 +27,8 @@
"name": "pages/workBench/index", "name": "pages/workBench/index",
"pathName": "pages/workBench/index", "pathName": "pages/workBench/index",
"query": "", "query": "",
"scene": null, "launchMode": "default",
"launchMode": "default" "scene": null
}, },
{ {
"name": "pages/workBench/index", "name": "pages/workBench/index",

View File

@@ -45,8 +45,8 @@ export function getConfigByEnv() {
switch (envVersion) { switch (envVersion) {
// 开发版 // 开发版
case 'develop': case 'develop':
api = "http://localhost:8000" // api = "http://localhost:8000"
// api = "https://zgd.hbhcbn.com/api3" api = "https://zgd.hbhcbn.com/api3"
// TODO: 发布正式时使用此路径 // TODO: 发布正式时使用此路径
// api = "https://zgd.hbhcbn.com/wxApi" // api = "https://zgd.hbhcbn.com/wxApi"
// api = "http://127.0.0.1:4523/m1/4143821-0-default" // api = "http://127.0.0.1:4523/m1/4143821-0-default"