Compare commits

..

No commits in common. "edcaa7701c08ec96b673dcf30cf6907f712b7e33" and "71194fbf1c796c0a26f479399e95a007d0c1e05e" have entirely different histories.

27 changed files with 310 additions and 453 deletions

View File

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

View File

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

View File

@ -1,9 +0,0 @@
<!--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>

View File

@ -1,22 +0,0 @@
/* 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;
}

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="primary" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
</view>
<view class="logined" wx:else>
<avatar text="{{ user.nickName }}" />

View File

@ -19,11 +19,7 @@ Component({
parentName:String,
parentId:String,
},
observers: {
"parentPhone": function (newPhone) {
this.setData({ phone: newPhone })
}
},
/**
* 组件的初始数据
*/

View File

@ -57,6 +57,7 @@ Component({
})
break;
case "tenement":
console.log('data', data)
this.setData({
tenement: data.id,
tenementName: data.name,
@ -102,9 +103,7 @@ Component({
this.handleCancel();
},
onUpdatePhoneConfirm() {
this.setData({ parentPhone: "", phone: "", type: "", title: "" })
this.getTenementInfo();
this.initUserList()
},
async getTenementInfo() {
const { tenement, park } = this.data;
@ -136,12 +135,18 @@ Component({
})
},
handleChangeMain() {
const { tenementInfo = {} } = this.data;
// const { list = [] } = this.data;
// const main = list?.find(item => item.Permissions)
// if (!main) {
// alertInfo("没有主账号")
// return
// }
// console.log("main", main)
this.setData({
updatePhoneVisible: true,
type: "update",
title: "编辑管理员",
parentPhone: tenementInfo.phone,
// phone: main.WechatPhone,
// name: main.WechatUserName,
// id: main.WechatUserID,
})
@ -151,7 +156,6 @@ Component({
updatePhoneVisible: false,
type: "",
phone: "",
parentPhone: "",
name: "",
id: "",
})

View File

@ -12,9 +12,6 @@
"van-radio-group": "@vant/weapp/radio-group/index",
"van-tag": "@vant/weapp/tag/index",
"edit-modal": "./components/editModal/index",
"updatePhoneModal": "./components/updatePhoneModal/index",
"van-row": "@vant/weapp/row/index",
"van-col": "@vant/weapp/col/index",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
"updatePhoneModal": "./components/updatePhoneModal/index"
}
}

View File

@ -1,85 +1,88 @@
<!--pages/workBench/components/account/index.wxml-->
<view>
<searchSelectWrapper
<van-field
required
value="{{ parkName }}"
label="园区"
placeholder="请选择园区"
text="{{ parkName }}"
bind:search="onParkFocus"
/>
<searchSelectWrapper
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 }}"
label="商户"
placeholder="请选择商户"
text="{{ tenementName }}"
bind:search="onTenementFocus"
/>
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
选择
</van-button>
</van-field>
</view>
<van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
<view wx:else>
<van-field
value="{{tenementInfo.fullName}}"
label="商户名称"
readonly
title-width="140rpx"
/>
<van-field
value="{{tenementInfo.shortName}}"
label="商户简称"
readonly
title-width="140rpx"
/>
<van-field
value="{{tenementInfo.phone}}"
label="预留电话"
readonly
title-width="140rpx"
/>
<view class="operateBox">
<van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleAddSon"> 添加子账号 </van-button>
<van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleChangeMain"> 修改主账号 </van-button>
</view>
<view class="customTable">
<view class="customTableTile">
<van-row>
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<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>
</van-col>
<van-col span="24">
<view class="tableTitleRow">
<van-row gutter="5">
<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>
</van-col>
</van-row>
</view>
<view class="customTableContent">
<van-row wx:if="{{list.length}}">
<van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
<block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
<view class="tbody">
<view wx:if="{{list.length}}">
<view class="tableWrapper">
<view class="table">
<view class="thead">
<view class="th" style="width: 70rpx"> 序号 </view>
<view class="th" style="width: 200rpx"> 昵称 </view>
<view class="th" style="width: 300rpx"> 手机号 </view>
<view class="th" style="width: 100rpx"> 操作 </view>
</view>
<view class="tbody">
<van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
<block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
<view class="tr">
<view class="th" style="width: 70rpx"> {{ itemIndex + 1 }} </view>
<view class="th" style="width: 200rpx"> {{ item.WechatUserName }} </view>
<view class="th" style="width: 300rpx"> {{ item.WechatPhone }} </view>
<view class="th" style="width: 100rpx; display: flex;">
<view
class="primaryTextBtn"
bind:tap="handleDelete"
data-id="{{item.WechatUserID}}"
data-name="{{item.WechatUserName}}"
wx:if="{{!item.Permissions}}"
>
<view class="primaryTextBtn" bind:tap="handleDelete" data-id="{{item.WechatUserID}}" data-name="{{item.WechatUserName}}" wx:if="{{!item.Permissions}}">
移除
</view>
<van-tag type="primary" wx:else>管理员</van-tag>
<van-tag type="info" wx:else>管理员</van-tag>
</view>
</view>
</view>
</block>
</van-radio-group>
</van-row>
<empty wx:else bind:refresh="initUserList" />
</block>
</van-radio-group>
</view>
</view>
</view>
</view>
<empty wx:else bind:refresh="initUserList" />
</view>
<search-select
show="{{show}}"
@ -106,7 +109,6 @@
visible="{{updatePhoneVisible}}"
tenement="{{tenement}}"
park="{{park}}"
parentPhone="{{parentPhone}}"
bind:ok="onUpdatePhoneConfirm"
bind:cancel="handleUpdatePhoneCancel"
/>

View File

@ -46,30 +46,4 @@
}
.primaryTextBtn {
color: #1989fa;
}
.customTable {
margin: 20rpx;
font-size: 32rpx;
}
.customTableTile {
background-color: var(--light-green);
box-sizing: border-box;
}
.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;
}
}

View File

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

View File

@ -28,25 +28,6 @@
</van-field>
<view>
<view wx:if="{{list.length}}">
<view class="operate" wx:if="{{status === 2}}">
<view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
<van-button
type="info"
size="small"
style="margin-right: 30rpx;"
bind:click="handleApprove"
data-status="0"
disabled="{{!record}}"
> 同意 </van-button>
<van-button
size="small"
bind:click="handleClear"
disabled="{{!record}}"
bind:click="handleApprove"
data-status="1"
> 拒绝 </van-button>
</view>
</view>
<view class="tableWrapper">
<view class="table">
<view class="thead">
@ -84,7 +65,25 @@
</view>
<empty bind:refresh="init" wx:else />
<view class="operate" wx:if="{{status === 2}}">
<view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
<van-button
type="info"
size="small"
style="margin-right: 30rpx;"
bind:click="handleApprove"
data-status="0"
disabled="{{!record}}"
> 同意 </van-button>
<van-button
size="small"
bind:click="handleClear"
disabled="{{!record}}"
bind:click="handleApprove"
data-status="1"
> 拒绝 </van-button>
</view>
</view>
</view>

View File

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

View File

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

View File

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

View File

@ -1,19 +1,9 @@
<!--pages/workBench/components/recharge/index.wxml-->
<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>
<segmented
list="{{segmentedList}}"
active="{{active}}"
bind:change="handleChange"
/>
<approve status="{{2}}" wx:if="{{active === 0}}" />
<approve status="{{1}}" wx:if="{{active === 1}}" />

View File

@ -1,27 +1 @@
/* 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;
}
/* pages/workBench/components/recharge/index.wxss */

View File

@ -46,6 +46,7 @@ Component({
})
},
onConfirm(e) {
console.log('e', e)
const { data, type } = e.detail;
const that = this;
switch(type) {
@ -60,9 +61,7 @@ Component({
meterName: data.address,
meter: data.id,
}, () => {
loadingFunc(async () => {
await that.init();
})
that.init();
})
break;
}
@ -123,10 +122,11 @@ Component({
},
async handleMeterSwitchOn() {
const that = this;
const { meter, meterName } = this.data;
const { meter, list } = this.data;
const item = list.find(ele => ele.id === meter)
wx.showModal({
title: '提示',
content: `您确认要对${meterName || 当前电表}进行合闸吗?`,
content: `您确认要对${item?.address || 当前电表}进行合闸吗?`,
complete: async (res) => {
if (res.cancel) {
@ -149,10 +149,11 @@ Component({
},
async handleMeterSwitchOff() {
const that = this;
const { meter, meterName } = this.data;
const { meter, list } = this.data;
const item = list.find(ele => ele.id === meter)
wx.showModal({
title: '提示',
content: `您确认要对${meterName || 当前电表}进行拉闸吗?`,
content: `您确认要对${item?.address || 当前电表}进行拉闸吗?`,
complete: async (res) => {
if (res.cancel) {
return;

View File

@ -10,9 +10,6 @@
"empty": "/components/empty/index",
"van-radio": "@vant/weapp/radio/index",
"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",
"searchSelectWrapper": "/components/searchSelectWrapper/index"
"van-tag": "@vant/weapp/tag/index"
}
}

View File

@ -1,97 +1,142 @@
<!--pages/workBench/components/record/index.wxml-->
<searchSelectWrapper
label="园区"
<van-field
value="{{ parkName }}"
placeholder="请选择园区"
text="{{parkName}}"
bind:search="onParkFocus"
/>
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>
<van-empty wx:if="{{!park}}" description="选择园区后查看" />
<view wx:else>
<searchSelectWrapper
label="电表"
<van-field
value="{{ meterName }}"
placeholder="请选择电表"
text="{{meterName}}"
bind:search="onMeterFocus"
/>
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>
<van-empty wx:if="{{!meter}}" description="选择电表后查看" />
<view wx:else>
<view>
<view wx:if="{{list.length}}">
<view class="operate">
<view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
<van-button
type="info"
size="small"
style="margin-right: 30rpx;"
bind:click="handleMeterSwitchOn"
disabled="{{!meter}}"
> 合闸 </van-button>
<van-button size="small" bind:click="handleClear" disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
<van-radio-group value="{{ radio }}" bind:change="onChangeSelectMeter">
<view class="classWrapper" wx:for="{{list}}" wx:key="id">
<van-field
value="{{item.tenement.name}}"
label="商户名称"
readonly
title-width="140rpx"
/>
<van-field
value="商户电表"
label="电表类型"
readonly
wx:if="{{item.type === 0}}"
title-width="140rpx"
/>
<van-field
value="公摊电表"
label="电表类型"
readonly
wx:if="{{item.type === 2}}"
title-width="140rpx"
/>
<van-field
value="园区电表"
label="电表类型"
readonly
wx:else
title-width="140rpx"
/>
<van-field
value="{{item.meterNo}}"
label="表号"
readonly
title-width="140rpx"
/>
<van-field
value="{{item.address}}"
label="表计地址"
readonly
title-width="140rpx"
/>
<van-field
value="{{item.meterSn}}"
label="SN"
readonly
title-width="140rpx"
/>
<van-field
value="{{item.amount}}"
label="表字"
readonly
title-width="140rpx"
/>
<van-field
value="{{item.money}}"
label="电表余额"
readonly
title-width="140rpx"
/>
<van-field
value="合闸"
label="合闸状态"
readonly
wx:if="{{item.onPosition === 0}}"
title-width="140rpx"
/>
<van-field
value="拉闸"
label="合闸状态"
readonly
wx:else
title-width="140rpx"
/>
<van-field
value="在线"
label="在线状态"
readonly
wx:if="{{item.canConnect}}"
title-width="140rpx"
/>
<van-field
value="失联"
label="在线状态"
readonly
wx:else
title-width="140rpx"
/>
</view>
</view>
<view class="customTable" wx:for="{{list}}" wx:key="id">
<view class="customTableTile">
<van-row>
<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>
<view class="customTableContent">
<van-row >
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<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>
</van-col>
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<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>
</van-col>
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<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>
</van-col>
<van-col span="24">
<view class="tableRow">
<van-row gutter="5">
<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>
</van-row>
</view>
</view>
</van-radio-group>
</view>
<empty bind:refresh="init" wx:else />
<view class="operate">
<view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
<van-button
type="info"
size="small"
style="margin-right: 30rpx;"
bind:click="handleMeterSwitchOn"
disabled="{{!meter}}"
> 合闸 </van-button>
<van-button size="small" bind:click="handleClear" disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
</view>
</view>
</view>
</view>

View File

@ -39,25 +39,3 @@
word-break: break-all;
text-align: center;
}
.customTable {
margin: 20rpx;
}
.customTableTile {
background-color: var(--light-green);
padding: 16rpx;
box-sizing: border-box;
font-weight: 700;
}
.tableRow {
padding: 16rpx;
border: 1rpx solid #ccc;
border-top: 0rpx;
}
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}

View File

@ -66,12 +66,11 @@ 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.address,
meterName: data.name,
show: false,
})
break;

View File

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

View File

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

View File

@ -1,17 +1,31 @@
<!--pages/workBench/components/tenement/index.wxml-->
<view>
<searchSelectWrapper
<van-field
required
value="{{ parkName }}"
label="园区"
placeholder="请选择园区"
text="{{ parkName }}"
bind:search="onParkFocus"
/>
<searchSelectWrapper
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 }}"
label="商户"
placeholder="请选择商户"
text="{{ tenementName }}"
bind:search="onTenementFocus"
/>
border="{{ true }}"
readonly
use-button-slot
>
<van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
选择
</van-button>
</van-field>
</view>
<view style="display: flex; align-items: center;margin: 20rpx">
<view wx:if="{{tenement}}">
@ -32,54 +46,39 @@
</view>
<van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
<view wx:else>
<view class="customTable">
<view class="customTableTile">
<van-row>
<van-col span="24">
<view class="tableTitleRow">
<view class="tbody">
<van-field
value="{{tenementInfo.fullName}}"
label="商户名称"
readonly
title-width="140rpx"
/>
<van-field
value="{{tenementInfo.shortName}}"
label="商户简称"
readonly
title-width="140rpx"
/>
<van-field
value="{{tenementInfo.phone}}"
label="预留电话"
readonly
title-width="140rpx"
/>
<view wx:if="{{meterList.length}}">
<view class="tableWrapper">
<view class="table">
<view class="thead">
<view class="th" style="width: 250rpx"> 电表地址 </view>
<view class="th" style="width: 250rpx"> SN </view>
<view class="th" style="width: 200rpx"> 操作 </view>
</view>
<view class="tbody">
<van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
<block wx:for="{{meterList}}" wx:for-index="itemIndex" wx:key="item">
<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">
<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> -->
</view>
</van-col>
</van-row>
</view>
<view class="customTableContent">
<van-row>
<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 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: 250rpx"> {{ item.address }} </view>
<view class="th" style="width: 250rpx"> {{ item.meterSn }} </view>
<view class="th" style="width: 200rpx">
<view
class="primaryTextBtn"
@ -91,11 +90,12 @@
</view>
</view>
</view>
</view>
</block>
</van-radio-group>
</van-row>
</block>
</van-radio-group>
</view>
</view>
</view>
</view>
</view>
<search-select
@ -103,7 +103,6 @@
title="{{title}}"
type="{{type}}"
park="{{park}}"
isBack="{{true}}"
bindconfirm="onConfirm"
bindcancel="onCancel"
/>

View File

@ -23,9 +23,13 @@
}
.tbody {
width: 890rpx;
}
.tbody .tr {
padding: 20rpx;
box-sizing: border-box;
border-bottom: 1rpx solid #EEEEEE;
display: flex;
align-items: center;
flex-wrap: nowrap;
@ -38,33 +42,4 @@
.primaryTextBtn {
color: #1989fa;
}
.customTable {
margin: 20rpx;
font-size: 32rpx;
}
.customTableTile {
background-color: var(--light-green);
box-sizing: border-box;
font-weight: 700;
}
.tableTitleRow {
padding: 16rpx;
}
.tableRow {
padding: 16rpx;
border: 1rpx solid #ccc;
border-top: 0rpx;
font-size: 32rpx;
}
page {
background-color: rgb(228,240,236);
font-size: 32rpx;
}
}

View File

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