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 2024-06-24 15:06:24 +08:00
parent 31870c0222
commit 9ca94479fa
11 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/handleLogin/index.js
View File

@ -14,14 +14,18 @@ Page({
parkName: "", parkName: "",
park: "", park: "",
tenementName: "", tenementName: "",
tenement: "" tenement: "",
canBack: true,
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
const { canBack } = options
if (canBack === 'false') {
this.setData({ canBack: false })
}
}, },
onChangeName(e) { onChangeName(e) {
this.setData({ this.setData({

2
pages/handleLogin/index.wxml
View File

@ -1,6 +1,6 @@
<!--pages/handleLogin/index.wxml--> <!--pages/handleLogin/index.wxml-->
<!-- <topbar /> --> <!-- <topbar /> -->
<navigator title="绑定商户" canBack="{{true}}" /> <navigator title="绑定商户" canBack="{{canBack}}" />
<van-tabs> <van-tabs>
<van-tab title="扫码绑定"> <van-tab title="扫码绑定">
<view class="codeContent"> <view class="codeContent">

2
pages/home/index.js
View File

@ -294,7 +294,7 @@ Page({
if (!data?.length) { if (!data?.length) {
alertInfo("尚无信息") alertInfo("尚无信息")
wx.redirectTo({ wx.redirectTo({
url: '/pages/handleLogin/index', url: '/pages/handleLogin/index?back=false',
}) })
return; return;
} }

2
pages/home/index.wxml
View File

@ -24,7 +24,7 @@
<view class="logined" wx:else> <view class="logined" wx:else>
<avatar text="{{ user.nickName }}" /> <avatar text="{{ user.nickName }}" />
<view> <view>
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" custom-style="font-size: 32rpx;" bind:click="chooseTenement">{{tenement.name}} <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button> <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 class="welcome"> 欢迎使用华昌宝能用电管理系统！ </view>
</view> </view>
</view> </view>

4
pages/home/index.wxss
View File

@ -21,6 +21,10 @@
.park { .park {
margin-left: 20rpx; margin-left: 20rpx;
max-width: 200rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }
.parkContent { .parkContent {

2
pages/invoiceDetailContent/index.wxml
View File

@ -56,7 +56,7 @@
title-width="160rpx" title-width="160rpx"
/> />
<van-field <van-field
value="{{detail.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票'}}" value="{{detail.invoice.type === 0 ? '普通发票' : '增值税专用发票'}}"
label="发票类型 :" label="发票类型 :"
readonly readonly
autosize="{{true}}" autosize="{{true}}"

2
pages/invoiceList/components/already/index.wxml
View File

@ -11,7 +11,7 @@
发票内容： {{item.invoice.content}}（{{item.money}}元） 发票内容： {{item.invoice.content}}（{{item.money}}元）
</view> </view>
<view class="invoiceType"> <view class="invoiceType">
发票类型：{{ item.invoice.type === 0 ? '普通电子发票' : '增值税专用电子发票' }} 发票类型：{{ item.invoice.type === 0 ? '普通发票' : '增值税专用发票' }}
</view> </view>
<view class="time"> <view class="time">
{{item.finishTime}} {{item.finishTime}}

8
pages/invoiceList/components/info/index.wxml
View File

@ -23,8 +23,8 @@
border="{{ false }}" border="{{ false }}"
> >
<view slot="input" style="margin-top: -10rpx;"> <view slot="input" style="margin-top: -10rpx;">
<view wx:if="{{detail.type === 0}}"> 普通电子发票 </view> <view wx:if="{{detail.type === 0}}"> 普通发票 </view>
<view wx:elif="{{detail.type === 1}}"> 增值税专用电子发票 </view> <view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
<view wx:else>-</view> <view wx:else>-</view>
</view> </view>
</van-field> </van-field>
@ -141,8 +141,8 @@
> >
<view slot="input" style="margin-top: 16rpx;"> <view slot="input" style="margin-top: 16rpx;">
<van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType"> <van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType">
<van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通电子</van-radio> <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通发票</van-radio>
<van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用电子</van-radio> <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用发票</van-radio>
</van-radio-group> </van-radio-group>
</view> </view>
</van-field> </van-field>

1
pages/invoiceList/components/notyet/index.js
View File

@ -65,7 +65,6 @@ Component({
selectMoney += list[i]?.money; selectMoney += list[i]?.money;
} }
} }
console.log('newSelectList', newSelectList)
this.setData({ this.setData({
// chooseList: newList, // chooseList: newList,
selectList: newSelectList, selectList: newSelectList,

6
pages/invoicing/index.wxml
View File

@ -7,8 +7,8 @@
<view> <view>
<card title="发票类型"> <card title="发票类型">
<van-radio-group disabled="{{true}}" direction="horizontal" slot="content" value="{{detail.type}}"> <van-radio-group disabled="{{true}}" direction="horizontal" slot="content" value="{{detail.type}}">
<van-radio name="{{0}}" icon-size="30rpx" style="font-size: 32rpx;margin-bottom: 20rpx;">普通电子发票</van-radio> <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 32rpx;margin-bottom: 20rpx;">普通发票</van-radio>
<van-radio name="{{1}}" icon-size="30rpx" style="font-size: 32rpx;">增值税专用电子发票</van-radio> <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 32rpx;">增值税专用发票</van-radio>
</van-radio-group> </van-radio-group>
</card> </card>
</view> </view>
@ -120,7 +120,7 @@
border="{{false}}" border="{{false}}"
/> />
<van-field <van-field
value="{{ detail.type === 0 ? '普通电子发票' : '增值税专用电子发票' }}" value="{{ detail.type === 0 ? '普通发票' : '增值税专用发票' }}"
label="发票类型" label="发票类型"
readonly readonly
title-width="132rpx" title-width="132rpx"

8
pages/updateInvoice/index.wxml
View File

@ -24,14 +24,14 @@
> >
<view slot="input" style="margin-top: 16rpx;" wx:if="{{editType === 'edit'}}"> <view slot="input" style="margin-top: 16rpx;" wx:if="{{editType === 'edit'}}">
<van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType"> <van-radio-group direction="horizontal" value="{{formData.type}}" bind:change="onChangeType">
<van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通电子</van-radio> <van-radio name="{{0}}" icon-size="30rpx" style="font-size: 30rpx;margin-bottom: 20rpx;">普通发票</van-radio>
<van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用电子</van-radio> <van-radio name="{{1}}" icon-size="30rpx" style="font-size: 30rpx;">增值税专用发票</van-radio>
</van-radio-group> </van-radio-group>
</view> </view>
<view wx:else slot="input" style="margin-top: -10rpx;"> <view wx:else slot="input" style="margin-top: -10rpx;">
<view wx:if="{{detail.type === 0}}"> 普通电子发票 </view> <view wx:if="{{detail.type === 0}}"> 普通发票 </view>
<view wx:elif="{{detail.type === 1}}"> 增值税专用电子发票 </view> <view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
<view wx:else>-</view> <view wx:else>-</view>
</view> </view>
</van-field> </van-field>