From fe2005d7344ba26ce729fc6d5dca5b8c785bfaf4 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 13 Jan 2022 12:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=9A=E8=AE=AE=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meeting/meeting.js                   | 51 +++++++++++++++++++++-
 pages/meeting/meeting.wxml                 |  2 +-
 pages/signUpPageGuoji/signUpPageGuoji.wxml |  2 +-
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index d881e0e..7dd9204 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -23,7 +23,7 @@ Page({
       order: 'desc'
     },
     // 会议筛选参数
-    meetingStatus: ['可报名', '未开始', '进行中', '已结束'],
+    meetingStatus: ['可报名', '未开始', '进行中', '已结束','已报名'],
     // 会议类型筛选参数
     meetingType: ['工作组会议', '标协会议', '国际研讨会', '其他会议', '分标委会议'],
     meetingTypeList:[
@@ -36,6 +36,7 @@ Page({
       {name:'培训会',value:'8'},
       {name:'宣贯会',value:'9'}
     ],
+  
     // 会议列表数据
     meetingList: [],
     // 下拉框送搜索数据
@@ -45,7 +46,39 @@ Page({
     // 控制月份选择器显示
     visibleDate: false,
     // 是哪个筛选条件
-    index: -1
+    index: -1,
+    meetingTypeText:'',
+  },
+       /*
+    * 会议类型
+    * */
+   initMeetingType(val) {
+    if (val.meetingType) {
+      switch (val.meetingType +'') {
+        case '1':
+          return '工作组会议'
+        case '2':
+          switch (val.tbMeetingType + '') {
+            case '1':
+              return '标协会议-标准宣贯'
+            case '2':
+              return '标协会议-培训会'
+            case '3':
+              return '标协会议-信息交流会'
+          }
+          break
+        case '3':
+          return '国际研讨会'
+        case '4':
+          return '其他会议'
+        case '5':
+          return '分标委会议'
+        case '6':
+          return '理事会会议'
+      }
+    } else {
+      return ''
+    }
   },
   goBack(){
     wx.navigateBack()
@@ -112,6 +145,10 @@ Page({
         'searchParams.meetingStatus': 4,
         'searchParams.meetingSignUpType': 0
       })
+      }else if(e.detail.value == 3){
+        this.setData({
+          'searchParams.meetingSignUpType': 2
+        })
     }
     this.queryMeetingList()
   },
@@ -209,6 +246,16 @@ Page({
           })
         }
         if (res.result.records && res.result.records.length) {
+      
+          if(this.data.meetingList.length > 0){
+            this.data.meetingList.forEach(tt => {
+              tt.meetingTypeText = this.initMeetingType(tt)
+            })
+          }
+          res.result.records.forEach(tt => {
+            tt.meetingTypeText = this.initMeetingType(tt)
+            console.log(tt);
+          })
           this.setData({
             meetingList: [...this.data.meetingList, ...res.result.records]
           })
diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml
index 161f9d4..ef29770 100644
--- a/pages/meeting/meeting.wxml
+++ b/pages/meeting/meeting.wxml
@@ -38,7 +38,7 @@
 		</view>
 		<view class="content-text">
 			<image mode="aspectFill" src="../../assets/images/personnel.png"></image>
-			<text>{{item.meetingType_dictText}}</text>
+			<text>{{  item.meetingTypeText }}</text>
 		</view>
 		<view class="content-text">
 			<image mode="aspectFill" src="../../assets/images/location.png"></image>
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml
index f294ac0..35e76ce 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.wxml
+++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml
@@ -70,7 +70,7 @@
           </view>
           <view>
             <radio-group name='payMode' bindchange="paymentMethodRadioChange">
-              <label class="radio radio-item" wx:for="{{paymentMethodList}}" wx:key="item">
+              <label class="radio radio-item" wx:for="{{paymentMethodList}}" wx:key="item" style="font-size:13px">
                 <radio class="radio-scale" value="{{item.value}}" color="#069F99"/>{{item.name}}
               </label>
             </radio-group>