From a63b2f61c3e49053d905d57e526976d08ffb7a36 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 Aug 2021 17:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=97=E6=84=BF=E8=80=85?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BB=84=E7=BB=87=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/joinVolunteerOrg/joinVolunteerOrg.js |  8 +++-----
 .../joinVolunteerOrg/joinVolunteerOrg.wxml     | 10 +++++-----
 .../joinVolunteerOrg/joinVolunteerOrg.wxss     | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.js b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.js
index 2a71ad0..1f7e1f3 100644
--- a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.js
+++ b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.js
@@ -10,7 +10,6 @@ Page({
     introduceInfo: '',
 
     volunteerOrgNames: '', // 组织名称
-    stateName: '', // 审核状态名称
     state: '', // 审核状态
     reason: '', // 审核理由
     lock: false, // 防止重复点击
@@ -62,10 +61,9 @@ Page({
             realName: res.data.realName,
             idCard: res.data.idCard,
             mobile: res.data.mobile,
-            volunteerOrgIds: res.data.volunteerOrgIds,
+            volunteerOrgIds: res.data.volunteerOrgIds || [],
             introduceInfo: res.data.introduceInfo,
-            volunteerOrgNames: res.data.volunteerOrgNames,
-            stateName: res.data.stateName,
+            volunteerOrgNames: res.data.volunteerOrgNames || [],
             state: res.data.state,
             reason: res.data.reason
           })
@@ -115,7 +113,7 @@ Page({
     }
     api.applyVolunteer(params).then(res => {
       if (res.code == 0 && res.msg == 'success') {
-        this.showToast('组织申请已提交')
+        this.showToast('提交成功')
         setTimeout(() => {
           wx.navigateBack()
           this.setData({
diff --git a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxml b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxml
index 8f729bc..644f4cf 100644
--- a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxml
+++ b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxml
@@ -37,12 +37,12 @@
             <view class="label">自我介绍</view>
             <textarea class="value" placeholder="请输入自我介绍，不超过100个字" maxlength="100" value="{{introduceInfo}}" bindinput="onInputValue" data-code="introduceInfo"></textarea>
         </view>
-        <view class="data-form-item" wx:if="{{state != ''}}">
-            <view class="item-label">审核状态</view>
-            <view class="item-value"> {{stateName}} </view>
+        <view class="data-form-item sub-item" wx:if="{{state != ''}}">
+            <view class="item-label sub-label">审核状态</view>
+            <view class="item-value state-{{state}}"> {{state == '0' ? '审核中' : state == '5' ? '未通过' : '已通过'}} </view>
         </view>
-        <view class="data-form-item"  wx:if="{{state && reason}}">
-            <view class="item-label">审核理由</view>
+        <view class="data-form-item sub-item"  wx:if="{{state=='5' && reason}}">
+            <view class="item-label sub-label">未通过原因</view>
             <view class="item-value"> {{reason}} </view>
         </view>
     </view>
diff --git a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxss b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxss
index 526af65..8f348d0 100644
--- a/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxss
+++ b/epdc-resident-mp-yushan/subpages/heart/pages/joinVolunteerOrg/joinVolunteerOrg.wxss
@@ -9,6 +9,11 @@
     height: 110rpx;
     border-bottom: 1px solid #eee;
 }
+.sub-item {
+    border-bottom: none;
+    font-size: 28rpx;
+    height: 60rpx;
+}
 .introduce {
     display: flex;
     height: 320rpx;
@@ -17,6 +22,7 @@
     padding-top: 20rpx;
     box-sizing: border-box;
     border-bottom: 1px solid #eee;
+    margin-bottom: 10rpx;
 }
 .introduce .label {
     width: 150rpx;
@@ -34,6 +40,9 @@
     font-size: 32rpx;
     color: #333333;
 }
+.sub-item .sub-label {
+    font-size: 28rpx;
+}
 .data-form-item .item-value {
     width: 500rpx;
 }
@@ -46,6 +55,15 @@
 .data-form-item .item-value .placeholder {
     color: #666666;
 }
+.data-form-item .state-0 {
+    color: #ffae00;
+}
+.data-form-item .state-5 {
+    color: #d42f11;
+}
+.data-form-item .state-10 {
+    color: #109c5b;
+}
 .data-form-item .item-select {
     width: 50rpx;
     height: 100%;