From fc1d38eb382ad84f228e138f0164987f66caa0e5 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Fri, 15 Apr 2022 16:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   |   5 +
 pages/index/index.wxml |   7 +-
 pages/index/index.wxss | 208 +++++++++++++++++++++++------------------
 utils/util.js          |   2 +-
 4 files changed, 126 insertions(+), 96 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 4d01682..96ec31a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -476,4 +476,9 @@ Page({
         url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid,
       })
     },
+    goUpdate(e){
+      wx.navigateTo({
+        url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
+      })
+    },
 })
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d3fe2bf..591d2c5 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -136,9 +136,12 @@
         </view>
         <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id">
             <!--1-->
-            <view class="workflow_list">
+            <view class="workflow_list" data-id="{{item.id}}" bindtap="{{tem.status == '1'?'in':item.status == '2'?'goUpdate':item.status == '3'?'agree':''}}">
                 <view class="process_intro">
-                    <view class="name">{{item.submitter}}</view>
+                    <view class="name">
+                      <view class="name_tit">{{item.submitter}}</view>
+                      <view class="{{item.status == '1'?'in':item.status == '2'?'disagree':item.status == '3'?'agree':''}}">{{item.status == '1'?'审核中':item.status == '2'?'已拒绝':item.status == '3'?'已通过':''}}</view>
+                    </view>
                     <!-- <view class="state">已发起</view> -->
                     <view class="time">{{item.submitDate}}</view>
                 </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index a2ea4e3..658e029 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -239,9 +239,15 @@
 }
 
 .workflow .process_intro .name{
-  width: 324rpx;
+  width: 390rpx;
   font-size: 34rpx;
   margin-right: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+  width: 290rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -294,95 +300,111 @@
   font-size: 26rpx;
 }
 
-/* <view class="workflow_list">
-                <view class="process_intro">
-                    <view class="name">啊啊啊啊啊啊啊啊啊啊</view>
-                    <view class="state">待审</view>
-                    <view class="time">2021-1-26</view>
-                </view>
-                <view class="process_pay">
-                    <view class="describe">银行转账</view>
-                    <view class="amount">￥-2600.00</view>
-                </view>
-            </view>  */
-            .textLimit{
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-            }
-            .btn{
-              width: 100%;
-              height:90rpx;
-              padding:0 24rpx;
-              box-sizing:border-box;
-              line-height: 90rpx;
-              text-align: center;
-              display: flex;
-              background:rgba(255,255,255,.8);
-              justify-content: space-between;
-            }
-            .address-item {
-              min-height: 98rpx;
-              display: flex;
-              justify-content: flex-start;
-              align-items: center;
-              border-bottom: 1px solid #f1f1f1;
-              padding: 0 32rpx
-            }
-            
-            .item-title {
-              width: 140rpx;
-              color: #4d4c4c;
-              font-size: 28rpx;
-              height: 98rpx;
-              line-height: 98rpx;
-            }
-            .item-content {
-              width: 520rpx;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              font-size: 28rpx;
-              height: 98rpx;
-              line-height: 98rpx;
-              color: #4d4c4c;
-            }
-            /* 地区级联选择器 */
-            
-            .picker-view {
-              width: 100%;
-              display: flex;
-              background-color: #fff;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-              bottom: 0rpx;
-              left: 0rpx;
-            }
-            
-            .picker-item {
-              line-height: 70rpx;
-              margin-left: 5rpx;
-              margin-right: 5rpx;
-              text-align: center;
-            }
-            
-            .picker-view__pane {
-              height: 100rpx;
-              width: 100%;
-              padding: 20rpx 32rpx;
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-              box-sizing: border-box;
-            }
-            
-            .picker-view__pane text{
-              color: #00cc88;
-              font-size: 30rpx;
-            }
-            
-            .pick-view__group {
-              width: 96%;
-              height: 450rpx;
-            }
\ No newline at end of file
+.textLimit{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.btn{
+  width: 100%;
+  height:90rpx;
+  padding:0 24rpx;
+  box-sizing:border-box;
+  line-height: 90rpx;
+  text-align: center;
+  display: flex;
+  background:rgba(255,255,255,.8);
+  justify-content: space-between;
+}
+.address-item {
+  min-height: 98rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  border-bottom: 1px solid #f1f1f1;
+  padding: 0 32rpx
+}
+
+.item-title {
+  width: 140rpx;
+  color: #4d4c4c;
+  font-size: 28rpx;
+  height: 98rpx;
+  line-height: 98rpx;
+}
+.item-content {
+  width: 520rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 28rpx;
+  height: 98rpx;
+  line-height: 98rpx;
+  color: #4d4c4c;
+}
+/* 地区级联选择器 */
+
+.picker-view {
+  width: 100%;
+  display: flex;
+  background-color: #fff;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  bottom: 0rpx;
+  left: 0rpx;
+}
+
+.picker-item {
+  line-height: 70rpx;
+  margin-left: 5rpx;
+  margin-right: 5rpx;
+  text-align: center;
+}
+
+.picker-view__pane {
+  height: 100rpx;
+  width: 100%;
+  padding: 20rpx 32rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+}
+
+.picker-view__pane text{
+  color: #00cc88;
+  font-size: 30rpx;
+}
+
+.pick-view__group {
+  width: 96%;
+  height: 450rpx;
+}
+.agree{
+  background-color: rgba(92, 174, 119, 0.1);
+  color:#5CAE77 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+.in{
+  background-color: rgba(245, 163, 39, 0.1);
+  color:#F5A327 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+.disagree{
+  background-color: rgba(233, 0, 0, 0.1);
+  color:#E90000 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 1ee5c99..138e9f6 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -118,7 +118,7 @@ function httpRequest(url, data, {
 	wx.request({
 		url,
     	data: finalData,
-		method:data.method?data.method:'POST',
+		method:data.method,
 		timeout: 60000,
 		header: {
       'Authorization':'Bearer '+getApp().globalData.userInfo.token