Compare commits

...

10 次程式碼提交

共有 22 個檔案被更改,包括 395 行新增459 行删除
分割檢視
  1. +1
    -1
      app.wxss
  2. 二進制
      image/icon/cancel_icon.png
  3. 二進制
      image/index/icon_index_15.png
  4. 二進制
      image/index/icon_index_16.png
  5. 二進制
      image/index/icon_index_17.png
  6. 二進制
      image/index/icon_index_18.png
  7. 二進制
      image/index/nav_dlzh.png
  8. 二進制
      image/index/nav_jymx.png
  9. 二進制
      image/index/nav_pjqs.png
  10. 二進制
      image/index/nav_pjsy.png
  11. 二進制
      image/index/nav_sztj.png
  12. 二進制
      image/index/nav_zzdz.png
  13. +317
    -317
      pages/index/index.wxml
  14. +24
    -6
      pages/index/index.wxss
  15. +2
    -7
      pages/paymentManager/toPay/toPay.js
  16. +1
    -1
      pages/paymentManager/toPay/toPay.wxml
  17. +14
    -23
      pages/phoneLogin.wxml
  18. +14
    -39
      pages/phoneLogin.wxss
  19. +1
    -9
      pages/user/region/region.js
  20. +11
    -24
      pages/user/region/region.wxml
  21. +8
    -23
      pages/user/region/region.wxss
  22. +2
    -9
      project.private.config.json

+ 1
- 1
app.wxss 查看文件

@@ -67,7 +67,7 @@ contact-button {
top: 30px;
margin-right: 30px;
display: block;
color: #eee;
color: #000000;
text-align: center;
width: 100%;
font-size: 16px;


二進制
image/icon/cancel_icon.png 查看文件

Before After
Width: 52  |  Height: 52  |  Size: 1.7 KiB

二進制
image/index/icon_index_15.png 查看文件

Before After
Width: 44  |  Height: 44  |  Size: 3.2 KiB

二進制
image/index/icon_index_16.png 查看文件

Before After
Width: 44  |  Height: 44  |  Size: 2.7 KiB

二進制
image/index/icon_index_17.png 查看文件

Before After
Width: 44  |  Height: 44  |  Size: 2.7 KiB

二進制
image/index/icon_index_18.png 查看文件

Before After
Width: 44  |  Height: 44  |  Size: 2.8 KiB

二進制
image/index/nav_dlzh.png 查看文件

Before After
Width: 34  |  Height: 36  |  Size: 1.4 KiB

二進制
image/index/nav_jymx.png 查看文件

Before After
Width: 40  |  Height: 34  |  Size: 867 B

二進制
image/index/nav_pjqs.png 查看文件

Before After
Width: 39  |  Height: 33  |  Size: 1.7 KiB

二進制
image/index/nav_pjsy.png 查看文件

Before After
Width: 40  |  Height: 32  |  Size: 898 B

二進制
image/index/nav_sztj.png 查看文件

Before After
Width: 37  |  Height: 35  |  Size: 840 B

二進制
image/index/nav_zzdz.png 查看文件

Before After
Width: 41  |  Height: 35  |  Size: 962 B

+ 317
- 317
pages/index/index.wxml 查看文件

@@ -1,333 +1,333 @@
<view class="container" style="background:url('https://www.nongshen.net/static/wechat/header_bg.png') top center no-repeat; background-size: 100% auto;">
<!--自定义 顶部标题样式和位置-->
<view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
<!--账户信息-->
<view class="information_header">
<navigator url="{{'settle/index?item='+item}}">
<view class="portrait_head">
<image src="/image/index/headImg.png" style="width: 110rpx;height: 110rpx;"></image>
</view>
</navigator>
<view class="information_main">
<view class="name_wrap">
<text class="name">{{userInfoObj.nickName}}</text>
<view class="jobs">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/header_job.png') no-repeat; background-size: 100% 100%;"></view>
{{userInfoObj.roles.length>0?userInfoObj.roles[0].roleName:""}}
</view>
<image style="margin-left: auto;width: 20px;height: 20px;" bindtap="goRegion" src="../../image/icon/icon_address.png" ></image>
</view>
<view class="task_wrap ">
<view class="flex_block">
<!-- <view class="desc">未完成</view> -->
<view class="event" bindtap="pickAddress">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/local.png') no-repeat; background-size: 100% 100%;"></view>
{{ region || "请选择" }}
</view>
</view>
</view>
<view class="task_wrap ">
<view class="flex_block">
<!-- <view class="desc">已完成</view> -->
<view class="event">
<picker bindchange="bindPickerChange" value="{{index}}" range-key="bookName" range="{{bookList}}">
<view class="picker">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/dept.png') no-repeat; background-size: 100% 100%;"></view>
{{array[index]|| bookName}}
</view>
</picker>
</view>
</view>
</view>
<!--自定义 顶部标题样式和位置-->
<view class="top_title" style="height:{{CustomMenuButton.bottom}}px;z-index: 7777;padding-top: {{CustomMenuButton.top}}px;"></view>
<!--账户信息-->
<view class="information_header">
<navigator url="{{'settle/index?item='+item}}">
<view class="portrait_head">
<image src="/image/index/headImg.png" style="width: 110rpx;height: 110rpx;"></image>
</view>
</navigator>
<view class="information_main">
<view class="name_wrap">
<text class="name">{{userInfoObj.nickName}}</text>
<view class="jobs">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/header_job.png') no-repeat; background-size: 100% 100%;"></view>
{{userInfoObj.roles.length>0?userInfoObj.roles[0].roleName:""}}
</view>
<image style="margin-left: auto;width: 20px;height: 20px;" bindtap="goRegion" src="../../image/icon/icon_address.png" ></image>
</view>
<view class="task_wrap ">
<view class="flex_block">
<!-- <view class="desc">未完成</view> -->
<view class="event" bindtap="pickAddress">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/local.png') no-repeat; background-size: 100% 100%;"></view>
{{ region || "请选择" }}
</view>
</view>
</view>
<view class="task_wrap ">
<view class="flex_block">
<!-- <view class="desc">已完成</view> -->
<view class="event">
<picker bindchange="bindPickerChange" value="{{index}}" range-key="bookName" range="{{bookList}}">
<view class="picker">
<view class="icon" style="background:url('https://www.nongshen.net/static/wechat/dept.png') no-repeat; background-size: 100% 100%;"></view>
{{array[index]|| bookName}}
</view>
</picker>
</view>
</view>
</view>

</view>
</view>
<!--主导航-->
<view class="navList_main">
<view class="tab_item" bindtap='swichPayment' hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_01.png" mode="aspectFit"></image>
</view>
<text class="desc">支出申请</text>
</view>
<view class="tab_item" bindtap='swichInCome' hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_02.png" mode="aspectFit"></image>
</view>
<text class="desc">收入登记</text>
</view>
<view class="tab_item" bindtap="swichKeeping" hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
</view>
<text class="desc">记账申请</text>
</view>
<view class="tab_item" data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
</view>
<text class="desc">支付管理</text>
</view>
</view>
<!--子导航功能导航-->
<view class="child_function">
<!-- <view class="flex_block" bindtap="testBtn" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">消息推送</text>
</view> -->
<view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_01.png" mode="aspectFit"></image></view>
<text class="desc">合同信息</text>
</view>
<view class="flex_block" data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_02.png" mode="aspectFit"></image></view>
<text class="desc">固定资产</text>
</view>
<view class="flex_block" data-url="/pages/resources/resources" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_03.png" mode="aspectFit"></image></view>
<text class="desc">资源资产</text>
</view>
<view class="flex_block" data-url="/pages/project/project" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_04.png" mode="aspectFit"></image></view>
<text class="desc">工程项目</text>
</view>
<block wx:if="{{showList}}">
</view>
</view>
<!--主导航-->
<view class="navList_main">
<view class="tab_item" bindtap='swichPayment' hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_01.png" mode="aspectFit"></image>
</view>
<text class="desc">支出申请</text>
</view>
<view class="tab_item" bindtap='swichInCome' hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_02.png" mode="aspectFit"></image>
</view>
<text class="desc">收入登记</text>
</view>
<view class="tab_item" bindtap="swichKeeping" hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
</view>
<text class="desc">记账申请</text>
</view>
<view class="tab_item" data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
<view class="icon">
<image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
</view>
<text class="desc">支付管理</text>
</view>
</view>
<!--子导航功能导航-->
<view class="child_function">
<!-- <view class="flex_block" bindtap="testBtn" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">消息推送</text>
</view> -->
<view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_01.png" mode="aspectFit"></image></view>
<text class="desc">合同信息</text>
</view>
<view class="flex_block" data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_02.png" mode="aspectFit"></image></view>
<text class="desc">固定资产</text>
</view>
<view class="flex_block" data-url="/pages/resources/resources" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_03.png" mode="aspectFit"></image></view>
<text class="desc">资源资产</text>
</view>
<view class="flex_block" data-url="/pages/project/project" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_04.png" mode="aspectFit"></image></view>
<text class="desc">工程项目</text>
</view>
<block wx:if="{{showList}}">

<!-- <view class="flex_block" data-url="/pages/finance/index" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
<text class="desc">财务公开</text>
</view> -->
<!-- <view class="flex_block" data-url="/pages/finance/index" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
<text class="desc">财务公开</text>
</view> -->

<view class="flex_block" data-url="/pages/discussions/list" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
<text class="desc">四议表决</text>
</view>
<view class="flex_block" data-url="/pages/discussions/list" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_05.png" mode="aspectFit"></image></view>
<text class="desc">四议表决</text>
</view>

<view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_06.png" mode="aspectFit"></image></view>
<text class="desc">开户行</text>
</view>
<view class="flex_block" data-url="/pages/payee/list/list" bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
<view class="image"><image class="attribute" src="../../image/index/icon_index_07.png" mode="aspectFit"></image></view>
<text class="desc">收款方</text>
</view>
<view class="flex_block" data-url="/pages/drawee/drawee" bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
<view class="image"><image class="attribute" src="../../image/index/icon_index_08.png" mode="aspectFit"></image></view>
<text class="desc">村账户</text>
</view>
<view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_09.png" mode="aspectFit"></image></view>
<text class="desc">银行汇票</text>
</view>
<view class="flex_block" data-url="/pages/majorEvent/majorEvent" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_10.png" mode="aspectFit"></image></view>
<text class="desc">重大事项</text>
</view>
<view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_06.png" mode="aspectFit"></image></view>
<text class="desc">开户行</text>
</view>
<view class="flex_block" data-url="/pages/payee/list/list" bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
<view class="image"><image class="attribute" src="../../image/index/icon_index_07.png" mode="aspectFit"></image></view>
<text class="desc">收款方</text>
</view>
<view class="flex_block" data-url="/pages/drawee/drawee" bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
<view class="image"><image class="attribute" src="../../image/index/icon_index_08.png" mode="aspectFit"></image></view>
<text class="desc">村账户</text>
</view>
<view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_09.png" mode="aspectFit"></image></view>
<text class="desc">银行汇票</text>
</view>
<view class="flex_block" data-url="/pages/majorEvent/majorEvent" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_10.png" mode="aspectFit"></image></view>
<text class="desc">重大事项</text>
</view>

<view class="flex_block" data-url="/pages/transaction/transaction" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_11.png" mode="aspectFit"></image></view>
<text class="desc">交易明细</text>
</view>
<view class="flex_block" data-url="/pages/transferAccounts/transferAccounts" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_12.png" mode="aspectFit"></image></view>
<text class="desc">转账对账</text>
</view>
<view class="flex_block" data-url="/pages/statistics/statistics" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_13.png" mode="aspectFit"></image></view>
<text class="desc">收支统计</text>
</view>
<view class="flex_block" data-url="/pages/bill/bill" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_14.png" mode="aspectFit"></image></view>
<text class="desc">票据签收</text>
</view>
<!-- <view class="flex_block" data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">支付管理</text>
</view>
<view class="flex_block" data-url="/pages/escrowAccount/escrowAccount" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/nav_dlzh.png" mode="aspectFit"></image></view>
<text class="desc">代管账户</text>
</view>
<view class="flex_block" data-url="/pages/billUse/billUse" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/nav_pjsy.png" mode="aspectFit"></image></view>
<text class="desc">票据使用</text>
</view> -->
<view class="flex_block" data-url="/pages/mainBody/list/list" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">主体名录</text>
</view>
</block>
<view class="flex_block" bindtap="openView" hover-class="btnView">
<view class="image" wx:if="{{showListText == '更多'}}"><image class="attribute" src="../../image/index/nav_ckqb.png" mode="aspectFit"></image></view>
<view class="image" wx:if="{{showListText == '收起'}}"><image class="attribute" src="../../image/index/nav_sqqb.png" mode="aspectFit"></image></view>
<text class="desc">{{showListText}}</text>
</view>
</view>
<!--工作计划-->
<view class="work_plan">
<view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
<view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
<view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已提交<text class="remind">{{yfqNum}}</text></view>
<view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>草稿箱<text class="remind">{{yzdNum}}</text></view>
<!-- <view class="more" bindtap="toList">></view> -->
</view>
<view class="flex_block" data-url="/pages/transaction/transaction" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_11.png" mode="aspectFit"></image></view>
<text class="desc">交易明细</text>
</view>
<view class="flex_block" data-url="/pages/transferAccounts/transferAccounts" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_12.png" mode="aspectFit"></image></view>
<text class="desc">转账对账</text>
</view>
<view class="flex_block" data-url="/pages/statistics/statistics" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_13.png" mode="aspectFit"></image></view>
<text class="desc">收支统计</text>
</view>
<view class="flex_block" data-url="/pages/bill/bill" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/icon_index_14.png" mode="aspectFit"></image></view>
<text class="desc">票据签收</text>
</view>
<!-- <view class="flex_block" data-url="/pages/paymentManager/paymentManager" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">支付管理</text>
</view>
<view class="flex_block" data-url="/pages/escrowAccount/escrowAccount" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/nav_dlzh.png" mode="aspectFit"></image></view>
<text class="desc">代管账户</text>
</view>
<view class="flex_block" data-url="/pages/billUse/billUse" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/nav_pjsy.png" mode="aspectFit"></image></view>
<text class="desc">票据使用</text>
</view> -->
<view class="flex_block" data-url="/pages/mainBody/list/list" bindtap="navigate" hover-class="btnView">
<view class="image"><image class="attribute" src="../../image/index/paymentManager_icon.png" mode="aspectFit"></image></view>
<text class="desc">主体名录</text>
</view>
</block>
<view class="flex_block" bindtap="openView" hover-class="btnView">
<view class="image" wx:if="{{showListText == '更多'}}"><image class="attribute" src="../../image/index/nav_ckqb.png" mode="aspectFit"></image></view>
<view class="image" wx:if="{{showListText == '收起'}}"><image class="attribute" src="../../image/index/nav_sqqb.png" mode="aspectFit"></image></view>
<text class="desc">{{showListText}}</text>
</view>
</view>
<!--工作计划-->
<view class="work_plan">
<view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
<view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
<view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已提交<text class="remind">{{yfqNum}}</text></view>
<view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>草稿箱<text class="remind">{{yzdNum}}</text></view>
<!-- <view class="more" bindtap="toList">></view> -->
</view>

<scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;padding: 0rpx 32.5rpx;" >
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="up" bindtap="gosee">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.auditName}}</view>
</view>
<!-- <view class="state">待审</view> -->
<view class="time">{{item.createTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.data.expenditureAmount}}</view>
</view>
</view>
</view>
<view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="see" bindtap="gosee">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.auditName}}</view>
</view>
<!-- <view class="state">已审</view> -->
<view class="time">{{item.auditTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.data.expenditureAmount}}</view>
</view>
</view>
</view>
<!-- <view class="workflow" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
</view>
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
</view> -->
<!-- {{active}} -->
<van-swipe-cell right-width="{{ item.auditStatus == '1'?'65':0 }}" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" class="workflow">
<!--1-->
<view class="workflow_list" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view style="font-size: 12px;">{{item.paymentStateText}}</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
<view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="rollback">
<view>
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
<text style="display: block;text-align: center;color: #e90000;">撤回</text>
</view>
</view>
</view>
</van-swipe-cell>
<van-swipe-cell right-width="{{ 65 }}" wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" class="workflow">
<!--1-->
<view class="workflow_list" data-id="{{item.id}}" bindtap="godetail">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':'caogao'}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':'草稿'}}</view>
</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
<view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
<view>
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
<text style="display: block;text-align: center;color: #e90000;">删除</text>
</view>
</view>
</view>
</van-swipe-cell>
<scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;padding: 0rpx 32.5rpx;" >
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="up" bindtap="gosee">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.auditName}}</view>
</view>
<!-- <view class="state">待审</view> -->
<view class="time">{{item.createTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.data.expenditureAmount}}</view>
</view>
</view>
</view>
<view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.data.id}}" data-taskId="{{item.id}}" data-business='{{item.formData.activityBusinessType=="35"?"xj":"yh"}}' data-type="see" bindtap="gosee">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.auditName}}</view>
</view>
<!-- <view class="state">已审</view> -->
<view class="time">{{item.auditTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.data.expenditureAmount}}</view>
</view>
</view>
</view>
<!-- <view class="workflow" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
<view class="workflow_list">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
</view>
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
</view> -->
<!-- {{active}} -->
<van-swipe-cell right-width="{{ item.auditStatus == '1'?'65':0 }}" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" class="workflow">
<!--1-->
<view class="workflow_list" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':''}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':''}}</view>
</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view style="font-size: 12px;">{{item.paymentStateText}}</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
<view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="rollback">
<view>
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
<text style="display: block;text-align: center;color: #e90000;">撤回</text>
</view>
</view>
</view>
</van-swipe-cell>
<van-swipe-cell right-width="{{ 65 }}" wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" class="workflow">
<!--1-->
<view class="workflow_list" data-id="{{item.id}}" bindtap="godetail">
<view class="process_intro">
<view class="name">
<view class="name_tit">{{item.remark}}</view>
<view class="{{item.auditStatus == '1'?'in':item.auditStatus == '2'?'disagree':item.auditStatus == '3'?'agree':'caogao'}}">{{item.auditStatus == '1'?'审核中':item.auditStatus == '2'?'已拒绝':item.auditStatus == '3'?'已通过':'草稿'}}</view>
</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}}</text>
</view>
<view class="amount"><text class="unit">¥</text>{{item.expenditureAmount}}</view>
</view>
</view>
<view slot="right" class="deleteBox" style="background-color: rgb(235, 4, 4,0.2);">
<view style="flex: 1;height: 100%;display: flex;align-items: center;justify-content: center;" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
<view>
<image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
<text style="display: block;text-align: center;color: #e90000;">删除</text>
</view>
</view>
</view>
</van-swipe-cell>

<van-empty wx:if="{{todoNum == '0' && active=='1'}}" description="暂无待办数据" />
<van-empty wx:if="{{todoNum == '0' && active=='1'}}" description="暂无待办数据" />

<van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />
<van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />

<van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已提交数据" />
<van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已提交数据" />

<van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无草稿箱数据" />
</scroll-view>
<pop-up visible="{{visible}}" onClose="closePopUp">
<view slot="content">
<view class="picker-view">
<view class="picker-view__pane">
<text catchtap="cityCancel">取消</text>
<text catchtap="citySure">确定</text>
</view>
<picker-view class="pick-view__group" bindchange="cityChange" bindpickstart="chooseStart" bindpickend="chooseEnd" value="{{value}}">
<picker-view-column indicator-class="item_active">
<view wx:for="{{provinces}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
<picker-view-column>
<view wx:for="{{citys}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
<picker-view-column>
<view wx:for="{{areas}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
</picker-view>
</view>
</view>
</pop-up>
<van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无草稿箱数据" />
</scroll-view>
<pop-up visible="{{visible}}" onClose="closePopUp">
<view slot="content">
<view class="picker-view">
<view class="picker-view__pane">
<text catchtap="cityCancel">取消</text>
<text catchtap="citySure">确定</text>
</view>
<picker-view class="pick-view__group" bindchange="cityChange" bindpickstart="chooseStart" bindpickend="chooseEnd" value="{{value}}">
<picker-view-column indicator-class="item_active">
<view wx:for="{{provinces}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
<picker-view-column>
<view wx:for="{{citys}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
<picker-view-column>
<view wx:for="{{areas}}" class="picker-item" wx:key="index">{{item.label}}</view>
</picker-view-column>
</picker-view>
</view>
</view>
</pop-up>
</view>

<wxs module="float">
var float = function(money){
return parseFloat(money).toFixed(2)
}
module.exports.float = float;
var float = function(money){
return parseFloat(money).toFixed(2)
}
module.exports.float = float;
</wxs>

+ 24
- 6
pages/index/index.wxss 查看文件

@@ -40,11 +40,10 @@
.information_header .name_wrap .jobs{
margin-left: 18rpx;
/* width: 155rpx; */
height: 40rpx;
background: #5bae75;
border:2rpx solid #2c8e68;
height: 50rpx;
background: linear-gradient( 97deg, #73DE7E 0%, #0EAF63 100%);
color: #fff;
border-radius: 40rpx;
border-radius: 10rpx;
display: flex;
font-size: 28rpx;
justify-content: center;
@@ -154,11 +153,30 @@
font-size: 26rpx;
}

.child_function{
.title{
display: flex;
justify-content: space-between;
margin: 35rpx 20rpx 0;
}
.title text{
flex: 1;
background-color: #ffffff;
display: flex;
align-items: flex-end;
border-radius: 24rpx 0 0 0;
font-size: 2vh;
font-weight: bold;
padding-left: 5%;
}
.title image{
width: 45%;
}
.child_function{
margin: 0 20rpx 0;
display: flex;
flex-wrap: wrap;
align-content:space-between;
padding: 20px 0;
}
.child_function .flex_block{
display: flex;
@@ -185,7 +203,7 @@
}

.work_plan{
padding: 40rpx 32.5rpx 30rpx;
padding: 0rpx 32.5rpx 30rpx;
display: flex;
justify-content: space-between;
}


+ 2
- 7
pages/paymentManager/toPay/toPay.js 查看文件

@@ -111,13 +111,8 @@ Page({
confirmText: '确定',
success: function (e) {
//非建行
// if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){
// UTIL.showToastNoneIcon("请输入验证码!");
// }else{
// _this.setData({'showPopup':true})
// }
if(_this.data.data.accountPassword==null||_this.data.data.accountPassword.length<1){
UTIL.showToastNoneIcon("请输入支付口令!");
if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){
UTIL.showToastNoneIcon("请输入验证码!");
}else{
_this.setData({'showPopup':true})
}


+ 1
- 1
pages/paymentManager/toPay/toPay.wxml 查看文件

@@ -57,7 +57,7 @@

<view wx:if="{{data.doubleConfirmationStatus != 'Y' || !(data.doubleConfirmationUser == '' || data.doubleConfirmationUser == null)}}">
<view style="padding:10px;width:90%;border:1px solid #ddd;border-radius: 5px;line-height: 16px;background-color: #FFF;margin-left:5%;margin-top: 20px;" wx:if="{{data.bankType == '1' || data.bankType == '2' || data.bankType == '3' || data.bankType == '5' || data.bankType == '9' || data.bankType == '10' || data.bankType == '18'}}">
<input placeholder="请输入口令" value="{{data.accountPassword}}" bindinput="bindNewInput" data-name="data.accountPassword"/>
<input type="number" placeholder="请输入口令" value="{{data.accountPassword}}" bindinput="bindNewInput" data-name="data.accountPassword"/>
</view>
<view style="padding:10px;width:90%;border:1px solid #ddd;border-radius: 5px;line-height: 16px;background-color: #FFF;margin-left:5%;margin-top: 20px;position:relative;" wx:else>
<input type="number" placeholder="输入验证码" value="{{data.alternateField1}}" bindinput="bindNewInput" data-name="data.alternateField1"/>


+ 14
- 23
pages/phoneLogin.wxml 查看文件

@@ -1,44 +1,35 @@
<!--pages/phoneLogin.wxml-->
<import src="/templates/global/global"/>
<template is="toast" data="{{...toastData}}"></template>

<image src="/image/login/login_bg.png" style="width: 100%;position: absolute;z-index: -1;" mode="widthFix" bindtap='goLogin'></image>
<view class="container">
<view class="container" style="background: url('https://www.nongshen.net/static/wechat/container_bg.jpg') center center no-repeat; background-size: 100% 100%;">
<view style="position: absolute;left:2.5%;top:{{isIPX?'57px':'32px'}};display: flex;align-items: center;" bindtap="back">
<image src="/image/icon/cancel_icon2.png" style="width: 25px;height: 25px;"></image>
<image src="/image/icon/cancel_icon.png" style="width: 35px;height: 35px;"></image>
</view>
<view class="header" style="text-align: center;" >
<view class="principal">账户密码登录</view>
<image src="/image/login/login_icon.png" style="width: 60%;position: relative;left: 10%;" mode="widthFix"></image>
<!-- <view class="principal">农村事项审批与记账</view>
<view class="instructions">报账简单,操作便捷</view> -->
<image src="/image/login/login_text.png" style="width: 80%;margin: 0 auto;" mode="widthFix"></image>
</view>
<view class="quick-login">
<view class="quick-login" style="bottom:{{isIPhoneX?'6vh':'10vh'}}">

<view class="filed_box">
<van-field value="{{ formData.username }}" bind:change="onChange" placeholder="请输入账号" required data-value="formData.username" label-width="auto">
<view slot="left-icon">
<image src="/image/icon/input_name.png" style="width: 15px;vertical-align: middle;margin-right: 10px;" mode="widthFix"/>
</view>
</van-field>
</view>
<view class="filed_box">
<van-field value="{{ formData.password }}" type="password" bind:change="onChange" placeholder="请输入密码" required data-value="formData.password" label-width="auto">
<view slot="left-icon">
<image src="/image/icon/input_password.png" style="width: 15px;vertical-align: middle;margin-right: 10px;" mode="widthFix"/>
</view>
</van-field>
</view>
<view style="display: flex;">
<view class="filed_box" style="margin-bottom: 0;">
<van-field value="{{ formData.code }}" bind:change="onChange" placeholder="请输入验证码" required data-value="formData.code" label-width="auto">
<view slot="left-icon">
<image src="/image/icon/input_yzm.png" style="width: 15px;vertical-align: middle;margin-right: 10px;" mode="widthFix"/>
</view>
</van-field>
</view>
<view style="flex: 1;border-radius: 50vh;overflow: hidden;margin-left: 15px;">
<image src="{{codeUrl}}" style="width: 100%;transform: scale(1.3);position: relative;top: 6px;" mode="widthFix" bind:tap="getCode"/>
</view>
</view>
<van-field value="{{ formData.code }}" bind:change="onChange" placeholder="请输入验证码" required data-value="formData.code" label-width="auto">
<view slot="left-icon">
<image src="/image/icon/input_yzm.png" style="width: 15px;vertical-align: middle;margin-right: 10px;" mode="widthFix"/>
</view>
<view slot="button">
<image src="{{codeUrl}}" style="width: 70px;vertical-align: middle;" mode="widthFix" bind:tap="getCode"/>
</view>
</van-field>

<view class="bottom">
<view class="btn2" bindtap="onSubmit">登录</view>


+ 14
- 39
pages/phoneLogin.wxss 查看文件

@@ -1,7 +1,4 @@
/* pages/phoneLogin.wxss */
page{
background-color: #ffffff;
}
.bottom{
width: 100%;
margin: 0 auto;
@@ -19,16 +16,10 @@ page{
}

.bottom .btn2{
width: 80vw;
height: 6.17vh;
background: linear-gradient( 90deg, #2FE398 0%, #1BCF84 39%, #0ABD73 77%, #00B268 100%);
margin:1vh auto 0;
border-radius: 6.17vh;
text-align: center;
line-height: 6.17vh;
font-size: 2.21vh;
color: #ffffff;
padding: 0;
border: 1px solid transparent;
padding: 8px 0px;
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
color: #fff;
}

.container{
@@ -36,22 +27,17 @@ page{
height: 100vh;
}
.container .header{
padding-top: 5.24vh;
padding-top: 25.24vh;
height: 36.94vh;
display: flex;
align-items: center;
justify-content: space-between;
padding-left: 20px;
}

.container .header .principal{
height: 6.15vh;
line-height: 6.15vh;
margin-bottom: 0.61vh;
text-align: left;
font-size: 2.92vh;
color: #000000;
font-weight: bold;
text-align: center;
font-size: 4.92vh;
color: #2c7339;
}

.container .header .instructions{
@@ -62,29 +48,18 @@ page{
color: #2c7339;
}
.container .quick-login{
/* position: fixed; */
width: calc(100% - 40px);
position: fixed;
width: 80%;
left: 10%;
background-color: #fff;
border-radius: 30px;
border-radius: 10px;
overflow: hidden;
padding: 20px 20px 0;
margin: 0 auto;
position: relative;
top: -8vh;
box-shadow: 10px 10px 10px rgba(0, 0, 0, 0.1);
padding: 30px 20px 0;
}
.van-field__body {
/* border-bottom: 1px solid #dddddd; */
}
.filed_box{
background-color: #F6F6F6;
padding: 5px;
border-radius: 50vh;
margin-bottom: 15px;
}
.van-cell {
background-color: transparent!important;
}

.container .quick-login .key-login{
width: 89vw;
height: 5.17vh;


+ 1
- 9
pages/user/region/region.js 查看文件

@@ -10,8 +10,7 @@ Page({
data: {
isIPX: app.globalData.isIPX,
activeNames: ['1'],
nowDress:'',
identity:'bzy'
nowDress:''
},

/**
@@ -46,13 +45,6 @@ Page({
url: '../login/login',
})
},
identityChange(e){
const type = e.currentTarget.dataset.type;
wx.setStorageSync('identity', type);
this.setData({
identity: type,
});
},
/**
* 生命周期函数--监听页面初次渲染完成
*/


+ 11
- 24
pages/user/region/region.wxml 查看文件

@@ -3,18 +3,6 @@
<image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
<text style="top:{{isIPX?'54px':'30px'}};">选择城市</text>
</view>
<!--
<view class="top_win" style="margin-top:{{isIPX?'103px':'74px'}};">
<view class="top flex">
<text>您的身份</text>
</view>
<view class="nowDress2 {{identity == 'bzy' ? 'active' : ''}}" data-type="bzy" bind:tap="identityChange">
<text>报账员</text>
</view>
<view class="nowDress2 {{identity == 'spy' ? 'active' : ''}}" data-type="spy" bind:tap="identityChange">
<text>审批员</text>
</view>
</view> -->

<view class="top_win" style="margin-top:{{isIPX?'103px':'74px'}};">
<view class="top flex">
@@ -27,16 +15,15 @@
<view class="nowDress">
<text>{{nowDress == '' ? '暂未选择':nowDress}}</text>
</view>
<van-index-bar highlight-color="#2C8E68" sticky sticky-offset-top="{{isIPX?'88':'64'}}">
<van-collapse value="{{ activeNames }}" bind:change="onChange">
<view class="list_bar" wx:for="{{list}}" wx:key="index">
<van-index-anchor index="{{item.name}}" />
<van-collapse-item title="{{cldItem.name}}" wx:for="{{item.value}}" wx:for-index="childrenIndex" wx:for-item="cldItem" wx:key="childrenIndex">
<view style="display: flex; flex-wrap: wrap;width: 100%;">
<text class="list_bar_text" wx:for="{{cldItem.subset}}" wx:for-index="dressIndex" wx:for-item="dressItem" wx:key="dressIndex" data-url="{{dressItem.url}}" data-name="{{dressItem.name}}" data-parentname="{{cldItem.name}}" bindtap="goChangeUrl">{{dressItem.name}}</text>
</view>
</van-collapse-item>
</view>
</van-collapse>
</van-index-bar>
</view>

<van-index-bar highlight-color="#2C8E68" sticky sticky-offset-top="{{isIPX?'88':'64'}}">
<van-collapse value="{{ activeNames }}" bind:change="onChange">
<view class="list_bar" wx:for="{{list}}" wx:key="index">
<van-index-anchor index="{{item.name}}" />
<van-collapse-item title="{{cldItem.name}}" wx:for="{{item.value}}" wx:for-index="childrenIndex" wx:for-item="cldItem" wx:key="childrenIndex">
<text class="list_bar_text" wx:for="{{cldItem.subset}}" wx:for-index="dressIndex" wx:for-item="dressItem" wx:key="dressIndex" data-url="{{dressItem.url}}" data-name="{{dressItem.name}}" data-parentname="{{cldItem.name}}" bindtap="goChangeUrl">{{dressItem.name}}</text>
</van-collapse-item>
</view>
</van-collapse>
</van-index-bar>

+ 8
- 23
pages/user/region/region.wxss 查看文件

@@ -1,6 +1,6 @@
/* pages/user/region/region.wxss */
page{
background: #F6F6F6;
background-color: #ffffff;
}
text{
display: block;
@@ -11,11 +11,9 @@ text{
justify-content: space-between;
}
.top_win{
width: 96%;
width: 90%;
margin: 0 auto;
background: #ffffff;
padding: 4%;
border-radius: 15px;
border-bottom: 1px dashed #DCDCDC;
}
.top{
margin: 0 auto 15px;
@@ -37,31 +35,18 @@ text{
background: url("https://www.nongshen.net/static/wechat/local.png") no-repeat 15px center;
margin-bottom: 15px;
}
.nowDress2{
.list_bar .list_bar_text{
border: 1px solid #2C8E68;
width: auto;
display: inline-block;
padding: 5px 20px 5px 20px;
border-radius: 50px;
color: #333333;
margin-bottom: 15px;
margin-right: 15px;
}
.nowDress2.active{
background: linear-gradient( 92deg, #2FE398 0%, #00B268 100%);
border-color: transparent;
color: #ffffff;
}
.list_bar .list_bar_text{
border: 1px solid #2C8E68;
display: block;
width: 22%;
padding: 5px 0;
padding: 5px 20px;
border-radius: 50px;
color: #333333;
margin-bottom: 15px;
margin-right: 3%;
text-align: center;
}
.list_bar .list_bar_text:nth-child(4n){
margin-right: 0%;
}
.van-collapse-item__content {
display: flex;


+ 2
- 9
project.private.config.json 查看文件

@@ -5,19 +5,12 @@
"condition": {
"miniprogram": {
"list": [
{
"name": "pages/paymentManager/paymentManager",
"pathName": "pages/paymentManager/toPay/toPay",
"query": "",
"scene": null,
"launchMode": "default"
},
{
"name": "报账员首页",
"pathName": "pages/index/index_bzy",
"query": "",
"launchMode": "default",
"scene": null
"scene": null,
"launchMode": "default"
},
{
"name": "pages/phoneLogin",


Loading…
取消
儲存