Compare commits

..

No commits in common. "14dad0a50685af7c1dc39848f22f351e326f1a57" and "9ca94479fa98821b4286dd7fe39c82961c161571" have entirely different histories.

5 changed files with 26 additions and 80 deletions

View File

@ -68,7 +68,7 @@ Page({
return
}
if (!phone) {
alertInfo("请输入预留手机号")
alertInfo("请输入联系人手机号")
return
}
if (!name) {

View File

@ -25,8 +25,8 @@
<van-field
required
value="{{ phone }}"
label="预留手机号"
placeholder="请输入预留手机号"
label="联系人手机号"
placeholder="请输入联系人手机号"
border="{{ true }}"
bind:change="onChangePhone"
/>

View File

@ -24,10 +24,7 @@
<view class="logined" wx:else>
<avatar text="{{ user.nickName }}" />
<view>
<view class="company" bind:tap="chooseTenement">
<view class="companyName"> {{tenement.name}} </view>
<van-icon name="arrow-down" style="margin-left: 16rpx;" />
</view>
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" custom-style="font-size: 32rpx; max-width:300rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" bind:click="chooseTenement">{{tenement.name}} <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
<view class="welcome"> 欢迎使用华昌宝能用电管理系统! </view>
</view>
</view>

View File

@ -41,24 +41,10 @@
align-items: center;
}
.loginBtn, .company {
.loginBtn {
margin-left: 30rpx;
}
.company {
font-size: 32rpx;
display: flex;
color: #fff;
}
.companyName {
max-width:300rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.rechargeWrapper {
background: linear-gradient(to bottom, var(--middle-green), #fff );
overflow: hidden;

View File

@ -17,45 +17,25 @@
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
type="textarea"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="普通发票"
wx:if="{{detail.type === 0}}"
/>
<van-field
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="增值税专用发票"
wx:elif="{{detail.type === 1}}"
/>
<van-field
label="发票类型"
readonly="{{true}}"
autosize="{{true}}"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="-"
wx:elif="{{detail.type === 1}}"
/>
>
<view slot="input" style="margin-top: -10rpx;">
<view wx:if="{{detail.type === 0}}"> 普通发票 </view>
<view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
<view wx:else>-</view>
</view>
</van-field>
<van-field
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
type="textarea"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="企业单位"
wx:if="{{detail.headerType === 0}}"
>
<view
slot="input"
@ -66,36 +46,13 @@
<view wx:else>-</view>
</view>
</van-field>
<van-field
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="个人/非企业单位"
wx:elif="{{detail.headerType === 1}}"
/>
<van-field
label="抬头类型"
readonly="{{true}}"
autosize="{{true}}"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ false }}"
value="个人/非企业单位"
wx:else
/>
<van-field
value="{{detail.name || '-'}}"
label="发票抬头"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{true}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ false }}"
>
@ -107,7 +64,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
>
@ -119,7 +76,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
>
@ -132,7 +89,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@ -146,7 +103,7 @@
custom-style="padding-left: 0; padding-right: 0; height: auto;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@ -161,7 +118,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@ -177,6 +134,7 @@
<van-field
label="发票类型"
autosize="{{true}}"
type="textarea"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ true }}"
@ -191,6 +149,7 @@
<van-field
label="抬头类型"
autosize="{{true}}"
type="textarea"
custom-style="padding-left: 0; padding-right: 0;"
title-width="132rpx"
border="{{ true }}"
@ -271,6 +230,8 @@
data-name="address"
/>
<van-field
value="{{formData.remark}}"
label="备注"
@ -297,6 +258,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
@ -326,6 +288,7 @@
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"