zly/electricity_bill_calc_wx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂存样式修改

Browse Source
This commit is contained in:
qiaomu 2025-02-27 17:37:12 +08:00
parent 902b4726c6
commit edcaa7701c
25 changed files with 240 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/searchSelectWrapper/index.js Normal file
View File

@ -0,0 +1,28 @@
// components/searchSelectWrapper/index.js
Component({
/**
* 组件的属性列表
*/
properties: {
label: String,
placeholder: String,
text: String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
onSearch() {
this.triggerEvent("search")
}
}
})

6
components/searchSelectWrapper/index.json Normal file
View File

@ -0,0 +1,6 @@
{
"component": true,
"usingComponents": {
"van-icon": "@vant/weapp/icon/index"
}
}

9
components/searchSelectWrapper/index.wxml Normal file
View File

@ -0,0 +1,9 @@
<!--components/searchSelectWrapper/index.wxml-->
<view class="wrapper">
<view> {{ label }} </view>
<view class="content" bind:tap="clickTime" bind:tap="onSearch">
<view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
<view class="text" wx:else> {{text}} </view>
<van-icon name="arrow-down" />
</view>
</view>

22
components/searchSelectWrapper/index.wxss Normal file
View File

@ -0,0 +1,22 @@
/* components/searchSelectWrapper/index.wxss */
.wrapper {
display: flex;
align-items: center;
font-size: 30rpx;
padding: 20rpx;
}
.content {
flex: 1;
margin-left: 30rpx;
margin-right: 30rpx;
display: flex;
padding: 10rpx 20rpx;
border-radius: 12rpx;
border: 1rpx solid #ccc;
background-color: #fff;
}
.text {
flex: 1;
}

2
pages/home/index.wxml
View File

@ -21,7 +21,7 @@
</view>
<view class="login" wx:if="{{!user || !user.id}}" class="notLoginWrapper">
<van-image width="80rpx" height="80rpx" src="/assets/images/defaultAvatar.png" class="defaultAvatar"/>
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
<van-button type="primary" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
</view>
<view class="logined" wx:else>
<avatar text="{{ user.nickName }}" />

1
pages/workBench/components/account/index.js
View File

@ -57,7 +57,6 @@ Component({
})
break;
case "tenement":
console.log('data', data)
this.setData({
tenement: data.id,
tenementName: data.name,

3
pages/workBench/components/account/index.json
View File

@ -14,6 +14,7 @@
"edit-modal": "./components/editModal/index",
"updatePhoneModal": "./components/updatePhoneModal/index",
"van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index"
"van-col": "@vant/weapp/col/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
}
}

45
pages/workBench/components/account/index.wxml
View File

@ -1,31 +1,17 @@
<!--pages/workBench/components/account/index.wxml-->
<view>
<van-field
required
value="{{ parkName }}"
<searchSelectWrapper
label="园区"
placeholder="请选择园区"
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onParkFocus">
选择
</van-button>
</van-field>
<van-field
required
value="{{ tenementName }}"
text="{{ parkName }}"
bind:search="onParkFocus"
/>
<searchSelectWrapper
label="商户"
placeholder="请选择商户"
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
选择
</van-button>
</van-field>
text="{{ tenementName }}"
bind:search="onTenementFocus"
/>
</view>
<van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
<view wx:else>
@ -39,7 +25,9 @@
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<van-col span="8">{{tenementInfo.shortName}}</van-col>
<van-col span="8">
<view style="text-align:center;">{{tenementInfo.shortName}}</view>
</van-col>
<van-col span="16">{{tenementInfo.fullName}}</van-col>
</van-row>
</view>
@ -47,10 +35,13 @@
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 华昌宝能收费 </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 物业代收1 </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 物业代收2 </van-col>
<van-col span="8" wx:else> 物业代收线损 </van-col>
<van-col span="8" wx:if="{{tenementInfo.feeType === 0}}">
<view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}">
<view style="text-align: center;"> 物业代收1 </view> </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}">
<view style="text-align: center;"> 物业代收2 </view> </van-col>
<van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
<van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
</van-row>
</view>

8
pages/workBench/components/account/index.wxss
View File

@ -60,10 +60,16 @@
.tableTitleRow {
padding: 16rpx;
font-weight: 700;
}
.tableRow {
padding: 16rpx;
border: 1rpx solid #ccc;
border-top: 0rpx;
}
}
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}

3
pages/workBench/components/recharge/components/approve/index.json
View File

@ -10,6 +10,7 @@
"empty": "/components/empty/index",
"van-radio": "@vant/weapp/radio/index",
"van-radio-group": "@vant/weapp/radio-group/index",
"van-dialog": "@vant/weapp/dialog/index"
"van-dialog": "@vant/weapp/dialog/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
}
}

3
pages/workBench/components/recharge/components/reharge/index.json
View File

@ -4,6 +4,7 @@
"van-popup": "@vant/weapp/popup/index",
"search-select": "/components/searchSelect/index",
"van-field": "@vant/weapp/field/index",
"van-button": "@vant/weapp/button/index"
"van-button": "@vant/weapp/button/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
}
}

6
pages/workBench/components/recharge/index.js
View File

@ -22,11 +22,11 @@ Component({
* 组件的方法列表
*/
methods: {
handleChange(e) {
changeQueryType(e) {
console.log("change", e)
const { index } = e.detail;
const { type } = e.currentTarget.dataset;
this.setData({
active: index
active: type
})
},

4
pages/workBench/components/recharge/index.json
View File

@ -4,6 +4,8 @@
"van-button": "@vant/weapp/button/index",
"segmented": "/components/Segmented/index",
"recharge": "./components/reharge/index",
"approve": "./components/approve/index"
"approve": "./components/approve/index",
"van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index"
}
}

20
pages/workBench/components/recharge/index.wxml
View File

@ -1,10 +1,18 @@
<!--pages/workBench/components/recharge/index.wxml-->
<view style="margin-top: 20rpx;">
<segmented
list="{{segmentedList}}"
active="{{active}}"
bind:change="handleChange"
/>
<view style="">
<view class="typeQuery">
<van-row>
<van-col span="8">
<view class="typeQueryText" style="color: {{active === 0 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{0}}"> 待审核 </view>
</van-col>
<van-col span="8">
<view class="typeQueryText" style="color: {{active === 1 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{1}}"> 已审核 </view>
</van-col>
<van-col span="8">
<view class="typeQueryText" style="color: {{active === 2 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{2}}"> 充值 </view>
</van-col>
</van-row>
</view>
</view>
<approve status="{{2}}" wx:if="{{active === 0}}" />

28
pages/workBench/components/recharge/index.wxss
View File

@ -1 +1,27 @@
/* pages/workBench/components/recharge/index.wxss */
/* pages/workBench/components/recharge/index.wxss */
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}
.query {
margin: 20rpx 0rpx;
}
.typeQueryText {
text-align: center;
padding: 20rpx;
background-color: var(--light-green);
font-size: 32rpx;
}
.select {
border: 1rpx solid #ccc;
padding: 12rpx;
border-radius: 12rpx;
flex: 1;
display: flex;
justify-content: space-between;
font-size: 30rpx;
}

5
pages/workBench/components/record/index.js
View File

@ -46,7 +46,6 @@ Component({
})
},
onConfirm(e) {
console.log('e', e)
const { data, type } = e.detail;
const that = this;
switch(type) {
@ -61,7 +60,9 @@ Component({
meterName: data.address,
meter: data.id,
}, () => {
that.init();
loadingFunc(async () => {
await that.init();
})
})
break;
}

3
pages/workBench/components/record/index.json
View File

@ -12,6 +12,7 @@
"van-radio-group": "@vant/weapp/radio-group/index",
"van-tag": "@vant/weapp/tag/index",
"van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index"
"van-col": "@vant/weapp/col/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
}
}

68
pages/workBench/components/record/index.wxml
View File

@ -1,38 +1,24 @@
<!--pages/workBench/components/record/index.wxml-->
<van-field
value="{{ parkName }}"
<searchSelectWrapper
label="园区"
placeholder="请选择园区"
label="园区"
readonly
border="{{ false }}"
use-button-slot
title-width="100rpx"
>
<van-button slot="button" size="small" type="info" bind:click="onParkFocus">
选择
</van-button>
</van-field>
text="{{parkName}}"
bind:search="onParkFocus"
/>
<van-empty wx:if="{{!park}}" description="选择园区后查看" />
<view wx:else>
<van-field
value="{{ meterName }}"
<searchSelectWrapper
label="电表"
placeholder="请选择电表"
label="电表"
readonly
border="{{ false }}"
use-button-slot
title-width="100rpx"
>
<van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
选择
</van-button>
</van-field>
text="{{meterName}}"
bind:search="onMeterFocus"
/>
<van-empty wx:if="{{!meter}}" description="选择电表后查看" />
<view>
<view wx:else>
<view wx:if="{{list.length}}">
<view class="operate">
<view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
<view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
<van-button
type="info"
size="small"
@ -46,7 +32,9 @@
<view class="customTable" wx:for="{{list}}" wx:key="id">
<view class="customTableTile">
<van-row>
<van-col span="8">{{item.tenement.shortName}}</van-col>
<van-col span="8">
<view style="text-align: center;"> {{item.tenement.shortName}} </view>
</van-col>
<van-col span="16">{{item.tenement.name}}</van-col>
</van-row>
</view>
@ -55,9 +43,12 @@
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<van-col span="8" wx:if="{{item.type === 0}}">商户电表</van-col>
<van-col span="8" wx:elif="{{item.type === 2}}">公摊电表</van-col>
<van-col span="8" wx:else>园区电表</van-col>
<van-col span="8" wx:if="{{item.type === 0}}">
<view style="text-align: center;"> 商户电表 </view></van-col>
<van-col span="8" wx:elif="{{item.type === 2}}">
<view style="text-align: center;"> 公摊电表 </view></van-col>
<van-col span="8" wx:else>
<view style="text-align: center;"> 园区电表 </view></van-col>
<van-col span="16">表号：{{item.meterNo}}</van-col>
</van-row>
</view>
@ -65,7 +56,9 @@
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<van-col span="8">{{item.address}}</van-col>
<van-col span="8">
<view style="text-align: center;"> {{item.address}} </view>
</van-col>
<van-col span="16">SN：{{item.meterSn}}</van-col>
</van-row>
</view>
@ -73,7 +66,9 @@
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<van-col span="8">{{item.amount}}</van-col>
<van-col span="8">
<view style="text-align: center;"> 表字：{{item.amount}} </view>
</van-col>
<van-col span="16">余额：{{item.money}}</van-col>
</van-row>
</view>
@ -81,10 +76,11 @@
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<van-col span="8" wx:if="{{item.onPosition === 0}}">合闸</van-col>
<van-col span="8" wx:else>拉闸</van-col>
<van-col span="8" wx:if="{{item.canConnect}}">在线</van-col>
<van-col span="8" wx:else>失联</van-col>
<van-col span="8" wx:if="{{item.onPosition === 0}}">
<view style="text-align: center;">合闸</view> </van-col>
<van-col span="8" wx:else><view style="text-align: center;">拉闸</view> </van-col>
<van-col span="8" wx:if="{{item.canConnect}}"><view style="text-align: center;">在线</view> </van-col>
<van-col span="8" wx:else><view style="text-align: center;">失联</view> </van-col>
</van-row>
</view>
</van-col>

6
pages/workBench/components/record/index.wxss
View File

@ -48,6 +48,7 @@
background-color: var(--light-green);
padding: 16rpx;
box-sizing: border-box;
font-weight: 700;
}
.tableRow {
@ -55,3 +56,8 @@
border: 1rpx solid #ccc;
border-top: 0rpx;
}
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}

3
pages/workBench/components/tenement/components/bindMeter/index.js
View File

@ -66,11 +66,12 @@ Component({
onConfirm(e) {
const { type, data } = e.detail;
const that = this;
console.log("e.deail", e.detail)
switch(type) {
case "meter":
this.setData({
meter: data.id,
meterName: data.name,
meterName: data.address,
show: false,
})
break;

3
pages/workBench/components/tenement/index.js
View File

@ -92,7 +92,8 @@ Component({
this.setData({
kaihuVisible: true,
editType: "add",
title: "开户"
title: "开户",
defaultValue: { feeType: 0, feeTypeName: "华昌宝能收费" }
})
},
startUpdateInfo() {

3
pages/workBench/components/tenement/index.json
View File

@ -9,6 +9,7 @@
"bindMeter": "./components/bindMeter/index",
"unBindMeter": "./components/unBindMeter/index",
"van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index"
"van-col": "@vant/weapp/col/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
}
}

71
pages/workBench/components/tenement/index.wxml
View File

@ -1,31 +1,17 @@
<!--pages/workBench/components/tenement/index.wxml-->
<view>
<van-field
required
value="{{ parkName }}"
<searchSelectWrapper
label="园区"
placeholder="请选择园区"
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onParkFocus">
选择
</van-button>
</van-field>
<van-field
required
value="{{ tenementName }}"
text="{{ parkName }}"
bind:search="onParkFocus"
/>
<searchSelectWrapper
label="商户"
placeholder="请选择商户"
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
选择
</van-button>
</van-field>
text="{{ tenementName }}"
bind:search="onTenementFocus"
/>
</view>
<view style="display: flex; align-items: center;margin: 20rpx">
<view wx:if="{{tenement}}">
@ -51,21 +37,35 @@
<van-row>
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<van-col span="8">{{tenementInfo.shortName}}</van-col>
<van-col span="16">{{tenementInfo.fullName}}</van-col>
</van-row>
<view class="tbody">
<view class="tr">
<view class="th" style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
<view> {{tenementInfo.fullName}} </view>
</view>
</view>
</view>
</van-col>
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 华昌宝能收费 </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 物业代收1 </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 物业代收2 </van-col>
<van-col span="8" wx:else> 物业代收线损 </van-col>
<view class="tbody">
<view class="tr">
<view wx:if="{{tenementInfo.feeType === 0}}" class="th" style="width: 250rpx;text-align: center;"> 华昌宝能收费 </view>
<view wx:if="{{tenementInfo.feeType === 1}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收1 </view>
<view wx:if="{{tenementInfo.feeType === 2}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收2 </view>
<view wx:if="{{tenementInfo.feeType === 3}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收线损 </view>
<view> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
</view>
</view>
<!-- <van-row gutter="5">
<van-col span="8">
<view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}">
<view style="text-align: center;"> 物业代收1 </view> </van-col>
<van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}">
<view style="text-align: center;"> 物业代收2 </view> </van-col>
<van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
<van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
</van-row>
</van-row> -->
</view>
</van-col>
@ -77,9 +77,9 @@
<van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
<block wx:for="{{meterList}}" wx:for-index="itemIndex" wx:key="item">
<view class="tbody">
<view class="tr">
<view class="th" style="width: 250rpx"> {{ item.address }} </view>
<view class="th" style="width: 250rpx"> {{ item.meterSn }} </view>
<view class="tr tableRow">
<view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.address }} </view>
<view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.meterSn }} </view>
<view class="th" style="width: 200rpx">
<view
class="primaryTextBtn"
@ -103,6 +103,7 @@
title="{{title}}"
type="{{type}}"
park="{{park}}"
isBack="{{true}}"
bindconfirm="onConfirm"
bindcancel="onCancel"
/>

16
pages/workBench/components/tenement/index.wxss
View File

@ -23,13 +23,9 @@
}
.tbody {
width: 890rpx;
}
.tbody .tr {
padding: 20rpx;
border-bottom: 1rpx solid #EEEEEE;
box-sizing: border-box;
display: flex;
align-items: center;
flex-wrap: nowrap;
@ -53,6 +49,7 @@
.customTableTile {
background-color: var(--light-green);
box-sizing: border-box;
font-weight: 700;
}
.tableTitleRow {
@ -60,7 +57,14 @@
}
.tableRow {
padding: 16rpx;
border: 1rpx solid #ccc;
border-top: 0rpx;
}
font-size: 32rpx;
}
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}

2
pages/workBench/index.js
View File

@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
active: 3
active: 1,
},
/**