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-03-03 16:54:40 +08:00
parent 5fbd34d9f8
commit d58436ef5f
15 changed files with 200 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
assets/images/tihuan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 434 KiB

24
components/searchSelectWrapper/index.js
View File

@ -7,14 +7,23 @@ Component({
properties: { properties: {
label: String, label: String,
placeholder: String, placeholder: String,
text: String text: String,
fieldType: {
type: String,
value: "text"
},
type: {
type: String,
value: "select"
}
}, },
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
keyword: "",
text: "",
}, },
/** /**
@ -23,6 +32,17 @@ Component({
methods: { methods: {
onSearch() { onSearch() {
this.triggerEvent("search") this.triggerEvent("search")
},
onChangeKeyword(e) {
this.setData({ keyword: e.detail });
},
onChangeText(e) {
this.setData({ text: e.detail });
this.triggerEvent("changeText", e.detail)
},
onSearchKeyword() {
this.triggerEvent("searchKeyword", this.data.keyword)
this.setData({ keyword: "" })
} }
} }
}) })

4
components/searchSelectWrapper/index.json
View File

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

30
components/searchSelectWrapper/index.wxml
View File

@ -1,9 +1,35 @@
<!--components/searchSelectWrapper/index.wxml--> <!--components/searchSelectWrapper/index.wxml-->
<view class="wrapper"> <view class="wrapper" wx:if="{{type === 'select'}}">
<view> {{ label }} </view> <view class="label"> {{ label }} </view>
<view class="content" bind:tap="clickTime" bind:tap="onSearch"> <view class="content" bind:tap="clickTime" bind:tap="onSearch">
<view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view> <view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
<view class="text" wx:else> {{text}} </view> <view class="text" wx:else> {{text}} </view>
<van-icon name="arrow-down" /> <van-icon name="arrow-down" />
</view> </view>
</view>
<view class="wrapper" wx:if="{{type === 'inputSearch'}}">
<view class="label"> {{ label }} </view>
<view class="inputContent" bind:tap="clickTime">
<van-field
value="{{ value }}"
placeholder="{{placeholder}}"
border="{{ false }}"
bind:change="onChangeKeyword"
custom-style="padding: 0;font-size: 30rpx;line-height: 32rpx;"
/>
</view>
<van-button type="info" size="small" bind:click="onSearchKeyword"> 搜索 </van-button>
</view>
<view class="wrapper" wx:if="{{type === 'input'}}">
<view class="label"> {{ label }} </view>
<view class="inputContent" bind:tap="clickTime">
<van-field
value="{{ value }}"
placeholder="{{placeholder}}"
border="{{ false }}"
type="fieldType"
bind:change="onChangeText"
custom-style="padding: 0;font-size: 30rpx;line-height: 32rpx;"
/>
</view>
</view> </view>

15
components/searchSelectWrapper/index.wxss
View File

@ -16,7 +16,22 @@
border: 1rpx solid #ccc; border: 1rpx solid #ccc;
background-color: #fff; background-color: #fff;
} }
.inputContent {
flex: 1;
margin-left: 30rpx;
margin-right: 30rpx;
display: flex;
padding: 0 20rpx;
border-radius: 12rpx;
border: 1rpx solid #ccc;
background-color: #fff;
}
.text { .text {
flex: 1; flex: 1;
}
.label {
width: 120rpx;
} }

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

@ -15,6 +15,7 @@
"updatePhoneModal": "./components/updatePhoneModal/index", "updatePhoneModal": "./components/updatePhoneModal/index",
"van-row": "@vant/weapp/row/index", "van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index", "van-col": "@vant/weapp/col/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index" "searchSelectWrapper": "/components/searchSelectWrapper/index",
"van-image": "@vant/weapp/image/index"
} }
} }

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

@ -84,7 +84,7 @@
data-id="{{item.WechatUserID}}" data-id="{{item.WechatUserID}}"
data-name="{{item.WechatUserName}}" data-name="{{item.WechatUserName}}"
> >
移除 <van-image width="40rpx" height="40rpx" src="/assets/images/stop.png" />
</view> </view>
<view <view
class="primaryTextBtn" class="primaryTextBtn"
@ -93,7 +93,7 @@
data-name="{{item.WechatUserName}}" data-name="{{item.WechatUserName}}"
style="margin-left: 16rpx;" style="margin-left: 16rpx;"
> >
设为管理 <van-image width="40rpx" height="40rpx" src="/assets/images/tihuan.png" />
</view> </view>
</view> </view>

10
pages/workBench/components/recharge/components/approve/index.js
View File

@ -53,6 +53,16 @@ Component({
}) })
this.onCancel(); this.onCancel();
}, },
onSearchKeyword(e) {
const that = this;
that.setData({
keyword: e.detail
}, () => {
loadingFunc(async () => {
await that.init();
})
})
},
onChangeKeyword(e) { onChangeKeyword(e) {
this.setData({ keywordTemp: e.detail }) this.setData({ keywordTemp: e.detail })
}, },

36
pages/workBench/components/recharge/components/approve/index.wxml
View File

@ -1,31 +1,18 @@
<!--pages/workBench/components/recharge/components/waitApprove/index.wxml--> <!--pages/workBench/components/recharge/components/waitApprove/index.wxml-->
<van-field <searchSelectWrapper
value="{{ parkName }}" label="园区"
placeholder="请选择园区" placeholder="请选择园区"
label="园区" text="{{parkName}}"
readonly bind:search="onParkFocus"
border="{{ false }}" />
use-button-slot
title-width="100rpx"
>
<van-button slot="button" size="small" type="info" bind:click="onParkFocus">
选择
</van-button>
</van-field>
<van-field <searchSelectWrapper
value="{{ keyword }}" label="关键字"
placeholder="请输入关键字" placeholder="请输入关键字"
label="关键字" text="{{meterName}}"
border="{{ false }}" bind:searchKeyword="onSearchKeyword"
use-button-slot type="inputSearch"
bind:change="onChangeKeyword" />
title-width="100rpx"
>
<van-button slot="button" size="small" type="info" bind:click="onSearch">
搜索
</van-button>
</van-field>
<view> <view>
<view wx:if="{{list.length}}"> <view wx:if="{{list.length}}">
<view class="operate" wx:if="{{status === 2}}"> <view class="operate" wx:if="{{status === 2}}">
@ -87,7 +74,6 @@
</view> </view>
<search-select <search-select
show="{{show}}" show="{{show}}"
title="{{title}}" title="{{title}}"

1
pages/workBench/components/recharge/components/reharge/index.js
View File

@ -32,7 +32,6 @@ Component({
type: 'park' type: 'park'
}) })
}, },
onMeterFocus() { onMeterFocus() {
const { park } = this.data; const { park } = this.data;
if (!park) { if (!park) {

85
pages/workBench/components/recharge/components/reharge/index.wxml
View File

@ -1,68 +1,37 @@
<!--pages/workBench/components/recharge/components/reharge/index.wxml--> <!--pages/workBench/components/recharge/components/reharge/index.wxml-->
<van-cell-group> <van-cell-group>
<van-field <searchSelectWrapper
value="{{ parkName }}" label="园区"
placeholder="请选择园区" placeholder="请选择园区"
label="园区" text="{{parkName}}"
readonly bind:search="onParkFocus"
border="{{ false }}" />
use-button-slot
title-width="70rpx" <searchSelectWrapper
> label="电表"
<van-button slot="button" size="small" type="info" bind:click="onParkFocus">
选择
</van-button>
</van-field>
<van-field
value="{{ meterName }}"
placeholder="请选择电表" placeholder="请选择电表"
label="电表" text="{{meterName}}"
readonly bind:search="onMeterFocus"
border="{{ false }}" />
use-button-slot <searchSelectWrapper
title-width="70rpx" label="金额"
>
<van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
选择
</van-button>
</van-field>
<van-field
value="{{ money }}"
placeholder="请输入金额" placeholder="请输入金额"
label="金额" text="{{meterName}}"
type="number" fieldType="number"
border="{{ false }}" type="input"
use-button-slot bind:changeText="onChangeMoney"
title-width="70rpx" />
bind:change="onChangeMoney" <searchSelectWrapper
> label="付款方式"
</van-field>
<van-field
value="{{ payName }}"
placeholder="请选择付款方式" placeholder="请选择付款方式"
label="付款方式" text="{{payName}}"
readonly bind:search="onPayFocus"
border="{{ false }}" />
use-button-slot <searchSelectWrapper
title-width="140rpx" label="凭证"
>
<van-button
slot="button"
size="small"
type="info"
bind:click="onPayFocus"
>
选择
</van-button>
</van-field>
<van-field
value="{{ voucherNo }}"
placeholder="请输入凭证" placeholder="请输入凭证"
label="凭证" type="input"
border="{{ false }}" bind:changeText="onChangeVoucherNo"
use-button-slot
title-width="70rpx"
bind:change="onChangeVoucherNo"
/> />
</van-cell-group> </van-cell-group>

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

@ -6,93 +6,88 @@
bind:search="onParkFocus" bind:search="onParkFocus"
/> />
<van-empty wx:if="{{!park}}" description="选择园区后查看" /> <searchSelectWrapper
label="电表"
placeholder="请选择电表"
text="{{meterName}}"
bind:search="onMeterFocus"
/>
<van-empty wx:if="{{!meter}}" description="选择电表后查看" />
<view wx:else> <view wx:else>
<searchSelectWrapper <view wx:if="{{list.length}}">
label="电表" <view class="operate">
placeholder="请选择电表" <view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
text="{{meterName}}" <van-button
bind:search="onMeterFocus" type="info"
/> size="small"
<van-empty wx:if="{{!meter}}" description="选择电表后查看" /> style="margin-right: 30rpx;"
<view wx:else> bind:click="handleMeterSwitchOn"
<view wx:if="{{list.length}}"> disabled="{{!meter}}"
<view class="operate"> > 合闸 </van-button>
<view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;"> <van-button size="small" bind:click="handleClear" disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
<van-button </view>
type="info" </view>
size="small" <view class="customTable" wx:for="{{list}}" wx:key="id">
style="margin-right: 30rpx;" <view class="customTableTile">
bind:click="handleMeterSwitchOn" <van-row>
disabled="{{!meter}}" <van-col span="8">
> 合闸 </van-button> <view style="text-align: center;"> {{item.tenement.shortName}} </view>
<van-button size="small" bind:click="handleClear" disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button> </van-col>
</view> <van-col span="16"><view style="margin-left: 16rpx;">{{item.tenement.name}}</view> </van-col>
</view> </van-row>
<view class="customTable" wx:for="{{list}}" wx:key="id"> </view>
<view class="customTableTile"> <view class="customTableContent">
<van-row> <van-row >
<van-col span="8"> <van-col span="24">
<view style="text-align: center;"> {{item.tenement.shortName}} </view> <view class="tableRow">
</van-col> <van-row gutter="5">
<van-col span="16"><view style="margin-left: 16rpx;">{{item.tenement.name}}</view> </van-col> <van-col span="8" wx:if="{{item.type === 0}}">
</van-row> <view style="text-align: center;border-right: 1rpx solid #ccc;"> 商户电表 </view></van-col>
</view> <van-col span="8" wx:elif="{{item.type === 2}}">
<view class="customTableContent"> <view style="text-align: center;border-right: 1rpx solid #ccc;"> 公摊电表 </view></van-col>
<van-row > <van-col span="8" wx:else>
<van-col span="24"> <view style="text-align: center;border-right: 1rpx solid #ccc;"> 园区电表 </view></van-col>
<view class="tableRow"> <van-col span="16">表号：{{item.meterNo}}</van-col>
<van-row gutter="5"> </van-row>
<van-col span="8" wx:if="{{item.type === 0}}"> </view>
<view style="text-align: center;border-right: 1rpx solid #ccc;"> 商户电表 </view></van-col> </van-col>
<van-col span="8" wx:elif="{{item.type === 2}}"> <van-col span="24">
<view style="text-align: center;border-right: 1rpx solid #ccc;"> 公摊电表 </view></van-col> <view class="tableRow">
<van-col span="8" wx:else> <van-row gutter="5">
<view style="text-align: center;border-right: 1rpx solid #ccc;"> 园区电表 </view></van-col> <van-col span="8">
<van-col span="16">表号：{{item.meterNo}}</van-col> <view style="text-align: center;border-right: 1rpx solid #ccc;"> {{item.address}} </view>
</van-row> </van-col>
</view> <van-col span="16">SN：{{item.meterSn}}</van-col>
</van-col> </van-row>
<van-col span="24"> </view>
<view class="tableRow"> </van-col>
<van-row gutter="5"> <van-col span="24">
<van-col span="8"> <view class="tableRow">
<view style="text-align: center;border-right: 1rpx solid #ccc;"> {{item.address}} </view> <van-row gutter="5">
</van-col> <van-col span="8">
<van-col span="16">SN：{{item.meterSn}}</van-col> <view style="text-align: center;border-right: 1rpx solid #ccc;"> 表字：{{item.amount}} </view>
</van-row> </van-col>
</view> <van-col span="16">余额：{{item.money}}</van-col>
</van-col> </van-row>
<van-col span="24"> </view>
<view class="tableRow"> </van-col>
<van-row gutter="5"> <van-col span="24">
<van-col span="8"> <view class="tableRow">
<view style="text-align: center;border-right: 1rpx solid #ccc;"> 表字：{{item.amount}} </view> <van-row gutter="5">
</van-col> <van-col span="8" wx:if="{{item.onPosition === 0}}">
<van-col span="16">余额：{{item.money}}</van-col> <view style="text-align: center;border-right: 1rpx solid #ccc;">合闸</view> </van-col>
</van-row> <van-col span="8" wx:else><view style="text-align: center;border-right: 1rpx solid #ccc;">拉闸</view> </van-col>
</view> <van-col span="8" wx:if="{{item.canConnect}}"><view style="text-align: center;">在线</view> </van-col>
</van-col> <van-col span="8" wx:else><view style="text-align: center;">失联</view> </van-col>
<van-col span="24"> </van-row>
<view class="tableRow"> </view>
<van-row gutter="5"> </van-col>
<van-col span="8" wx:if="{{item.onPosition === 0}}"> </van-row>
<view style="text-align: center;border-right: 1rpx solid #ccc;">合闸</view> </van-col>
<van-col span="8" wx:else><view style="text-align: center;border-right: 1rpx solid #ccc;">拉闸</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>
</van-row>
</view>
</view> </view>
</view> </view>
<empty bind:refresh="init" wx:else />
</view> </view>
<empty bind:refresh="init" wx:else />
</view> </view>
<search-select <search-select

2
pages/workBench/index.js
View File

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

1
service/meter.js
View File

@ -27,6 +27,7 @@ export const getParkSimpleMeterList = async function({park = "", keyword = "", p
return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`); return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`);
} }
// 获取商户下的电表，后台 // 获取商户下的电表，后台
export const getBackTenementMeters = async function(park, tenement) { export const getBackTenementMeters = async function(park, tenement) {
return await GET(`/vx/getWorkMeterDetails?park=${park}&tenement=${tenement}`); return await GET(`/vx/getWorkMeterDetails?park=${park}&tenement=${tenement}`);