瀏覽代碼

优化

master
pangdongxu 3 年之前
父節點
當前提交
098bf0d375
共有 8 個檔案被更改,包括 36 行新增29 行删除
  1. +14
    -11
      pages/Bookkeeping/Bookkeeping.wxml
  2. +6
    -10
      pages/Bookkeeping/Bookkeeping.wxss
  3. +1
    -1
      pages/apply/approval/approval.wxml
  4. +3
    -3
      pages/apply/index.wxml
  5. +2
    -2
      pages/apply/paymentTemplate/add/add.wxml
  6. +8
    -0
      pages/apply/paymentTemplate/add/add.wxss
  7. +1
    -1
      pages/drawee/drawee.wxml
  8. +1
    -1
      pages/user/login/login.wxml

+ 14
- 11
pages/Bookkeeping/Bookkeeping.wxml 查看文件

@@ -27,29 +27,30 @@
<van-swipe-cell right-width="{{ 130 }}" class="workflow" wx:for="{{flowListSR}}" wx:key="index" disabled="{{item.checkedStatusText == '待审核' || item.checkedStatusText == '已审核'}}">
<view class="li" data-id="{{item.id}}" bindtap="{{item.checkedStatusText == '待审核' || item.checkedStatusText == '已审核'?'goSee':''}}">
<van-checkbox name="{{item.id}}" disabled="{{item.checkedStatusText == '待审核' || item.checkedStatusText == '已审核'}}" shape="square" checked-color="#2C8E68" style="width: 100%;">
<view style="width: 35%;">
<view style="display: flex;justify-content: space-between;">
<text class="tit">{{item.accountSummary}}</text>
<text class="fj_name">附件{{item.enclosureCount}}</text>
<text class="time">{{item.accountDate}}</text>
</view>

<view style="display: flex;margin-top: 15px;justify-content: space-between;">
<view class="fksr">
<image src="/image/icon/inCome.png" style="width: 16px;height: 14px;margin-right: 5px;"></image>
{{item.incomeTypeText}}
</view>
</view>
<view>
<text class="fj_name">附件{{item.enclosureCount}}</text>
<text class="time">{{item.accountDate}}</text>
</view>
<view style="width: 30%;">
<view class="wtj {{item.checkedStatusText == '未提交' ? 'no':item.checkedStatusText == '待审核' ? 'white':item.checkedStatusText == '已审核' ? 'yes':item.checkedStatusText == '已挂起' ? 'other':''}}">
<!-- <view class="wtj {{item.checkedStatusText == '未提交' ? 'no':item.checkedStatusText == '待审核' ? 'white':item.checkedStatusText == '已审核' ? 'yes':item.checkedStatusText == '已挂起' ? 'other':''}}">
<image src="{{item.checkedStatusText == '未提交' ? '/image/icon/icon_no.png':item.checkedStatusText == '待审核' ? '/image/icon/icon_white.png':item.checkedStatusText == '已审核' ? '/image/icon/icon_yes.png':item.checkedStatusText == '已挂起' ? '/image/icon/icon_other.png':''}}" style="width: 12px;height: 12px;margin-right: 5px;"></image>
{{item.checkedStatusText}}
</view>
</view> -->
<text class="money">¥{{item.jieAmount}}</text>
</view>
</van-checkbox>
</view>
<view slot="right" class="deleteBox">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;background-color: rgb(255,0,0,0.2);">
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
</view>
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;background-color: rgb(252, 154, 85,0.2);">
<image src="../../image/icon/icon_xg.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="goUpdate"></image>
</view>
</view>
@@ -81,8 +82,10 @@
</van-checkbox>
</view>
<view slot="right" class="deleteBox">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;background-color: rgb(255,0,0,0.2);">
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete2"></image>
</view>
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: space-evenly;background-color: rgb(252, 154, 85,0.2);">
<image src="../../image/icon/icon_xg.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="goUpdateZC"></image>
</view>
</view>


+ 6
- 10
pages/Bookkeeping/Bookkeeping.wxss 查看文件

@@ -45,6 +45,7 @@ text{display: block;}
background: #F6F6F6;
align-items: center;
display: flex;
justify-content: center;
}
.workflow .workflow_list{
height: 150rpx;
@@ -83,21 +84,15 @@ text{display: block;}
margin-bottom: 15px;
}
.li{
display: flex;
justify-content: space-between;
width: 100%;
padding: 14px;
}
.li view text{
margin-top: 15px;
}
.li view text:nth-child(1){
margin-top: 0px;
/* margin-top: 15px; */
}
.li .fksr{
display: flex;
align-items: center;
margin-top: 15px;
color: #2C8E68;
/* font-size: 16px; */
}
@@ -125,7 +120,6 @@ text{display: block;}
color: #878787;
}
.li .tit{
font-size: 18px;
color: #444444;
line-height: 25px;
display: -webkit-box;
@@ -133,6 +127,7 @@ text{display: block;}
-webkit-line-clamp: 1;
word-break: break-all;
overflow: hidden;
width: 50%;
}
.li .fj_name{
font-size: 14px;
@@ -142,6 +137,7 @@ text{display: block;}
.li .time{
/* font-size: 14px; */
color: #9B9CAA;
line-height: 25px;
}
.li .money{
font-size: 18px;
@@ -149,8 +145,8 @@ text{display: block;}
text-align: right;
}
.van-checkbox__label {
display: flex;
justify-content: space-between;
/* display: flex;
justify-content: space-between; */
width: 100%;
}



+ 1
- 1
pages/apply/approval/approval.wxml 查看文件

@@ -103,7 +103,7 @@
<view slot="right" class="deleteBox" bindtap='deleteTemplate' data-index="{{index}}" data-id="{{item.id}}">
<view>
<image src="/image/apply/icon_end.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
<text style="display: block;text-align: center;color: #e90000;">禁用</text>
<text style="display: block;text-align: center;color: #e90000;background-color: rgb(255,0,0,0.2);">禁用</text>
</view>
</view>
</van-swipe-cell>


+ 3
- 3
pages/apply/index.wxml 查看文件

@@ -100,14 +100,14 @@
</van-cell-group>
<view slot="right" class="deleteBox">

<view style="flex: 1;height: 100%;display: flex;align-items: center;border-right: 1px solid #eee;justify-content: center;">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;background-color: rgb(252, 154, 85,0.2);">
<view>
<image src="../../image/apply/button_mr.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="getMr"></image>
<text style="display: block;text-align: center;color: #fc9a55;">默认</text>
<text style="display: block;text-align: center;color: rgb(252, 154, 85);">默认</text>
</view>
</view>

<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;background-color: rgb(255,0,0,0.2);">
<view>
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete"></image>
<text style="display: block;text-align: center;color: #e90000;">删除</text>


+ 2
- 2
pages/apply/paymentTemplate/add/add.wxml 查看文件

@@ -188,7 +188,7 @@
/>
</van-popup>
<van-field required wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="form.transfers[{{index}}].showAccount">
<view slot="label">
<view slot="label" style="color: var(--field-label-color,#646566);">
付款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
</view>
</van-field>
@@ -260,7 +260,7 @@
<block wx:else>
<view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
<van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请选择收款方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
<view slot="label">
<view slot="label" style="color: var(--field-label-color,#646566);">
收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
</view>
</van-field>


+ 8
- 0
pages/apply/paymentTemplate/add/add.wxss 查看文件

@@ -67,6 +67,7 @@ text{display: block;}
}
.topBox .van-cell .van-cell__title, .topBox .van-cell .van-cell__value , .topBox .van-cell .van-field__label{
font-size: 15px;
color: #444444;
}
.topBox .van-cell .van-cell__title{
margin-right: 0!important;
@@ -461,3 +462,10 @@ text{display: block;}
.van-collapse .tit_box .top-box .van-cell{
margin-bottom: 15px;
}

.van-field__label {
color: var(--field-label-color,#646566);
}
.van-field__control {
color: var(--field-label-color,#646566)!important;
}

+ 1
- 1
pages/drawee/drawee.wxml 查看文件

@@ -106,7 +106,7 @@
closeOnClickOverlay="{{ true }}"
>
<text style="display: block;text-align: center;color: #2C8E68;margin-top: 10px;">{{bankName}}</text>
<input class="input_tit" placeholder="请输入新的口令" style="width: 90%;margin: 0 auto;margin-top: 25px;margin-bottom: 10px;text-align: center;border: 1px solid #ddd;height: 35px;line-height: 35px;" value="{{password}}" password bindinput="bindNameInput"/>
<input class="input_tit" placeholder="请输入新的口令" style="width: 90%;margin: 0 auto;margin-top: 25px;margin-bottom: 10px;text-align: center;border: 1px solid #ddd;height: 35px;line-height: 35px;" value="{{password}}" bindinput="bindNameInput"/>
<text style="width: 90%;margin: 0 auto;margin-top: 15px;margin-bottom: 10px;font-size: 12px;display: block;color: red;text-align: center;">提示:\n此口令为银农直联平台支付人员权限的验证!\n至少6个字符,必须包括字母、数字和符号</text>
</van-dialog>
<view class="ipXbtn"></view>


+ 1
- 1
pages/user/login/login.wxml 查看文件

@@ -1,7 +1,7 @@

<import src="/templates/global/global"/>
<template is="toast" data="{{...toastData}}"></template>
<view class="container" style="background: url('https://dazu.nongshen.net/api/profile/wechat/container_bg.jpg') center center no-repeat; background-size: 100% auto;">
<view class="container" style="background: url('https://dazu.nongshen.net/api/profile/wechat/container_bg.jpg') center center no-repeat; background-size: 100% 100%;">
<view class="header" style="text-align: center;" >
<!-- <view class="principal">农村事项审批与记账</view>
<view class="instructions">报账简单,操作便捷</view> -->


Loading…
取消
儲存