miniprogram / volunteer · 提交

转到一个项目

作者 niufei
提交 3075cb82922bf6da37049e11ff9928365c88395a 1 个父辈 566cb261

补充

内嵌 并排对比
正在显示 9 个修改的文件 包含 46 行增加 和 81 行删除
@@ -131,7 +131,6 @@ Page({ @@ -131,7 +131,6 @@ Page({
131 if(status == 3){ 131 if(status == 3){
132 params.refund_reason = that.data.word 132 params.refund_reason = that.data.word
133 } 133 }
134 - console.log(params)  
135 app.post(url, params, head).then((res) => { 134 app.post(url, params, head).then((res) => {
136 wx.showToast({ 135 wx.showToast({
137 title: '操作成功', 136 title: '操作成功',
@@ -208,7 +208,7 @@ @@ -208,7 +208,7 @@
208 </view> 208 </view>
209 <view>上传身份证正面</view> 209 <view>上传身份证正面</view>
210 </view> 210 </view>
211 - <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'></image> 211 + <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}' mode="aspectFill"></image>
212 </view> 212 </view>
213 <view class='apply_idimg' bindtap="{{page_type?'':'uploadImages'}}" data-tem='3'> 213 <view class='apply_idimg' bindtap="{{page_type?'':'uploadImages'}}" data-tem='3'>
214 <view class='apply_idimgmain' wx:if='{{!reverse_card}}'> 214 <view class='apply_idimgmain' wx:if='{{!reverse_card}}'>
@@ -250,4 +250,6 @@ @@ -250,4 +250,6 @@
250 <view class='applybtn yes_applybtn' catchtap='setyes'>确定</view> 250 <view class='applybtn yes_applybtn' catchtap='setyes'>确定</view>
251 </view> 251 </view>
252 </view> 252 </view>
253 -</view>  
  253 +</view>
  254 +
  255 +<view class="kong" style="height:100rpx;" wx:if="{{page_type}}"/>
@@ -57,7 +57,7 @@ Page({ @@ -57,7 +57,7 @@ Page({
57 'XX-Token': wx.getStorageSync('token') 57 'XX-Token': wx.getStorageSync('token')
58 } 58 }
59 let params = { 59 let params = {
60 - id: that.data.info.id, 60 + id: that.data.user_id,
61 status: id 61 status: id
62 } 62 }
63 app.post(url, params, head).then((res) => { 63 app.post(url, params, head).then((res) => {
@@ -387,12 +387,13 @@ Page({ @@ -387,12 +387,13 @@ Page({
387 t_type: true, 387 t_type: true,
388 z_type: true, 388 z_type: true,
389 e_type: true, 389 e_type: true,
390 - page_type: options.type,  
391 - user_id: options.user_id ? options.user_id:null 390 + page_type: options.type
392 }) 391 })
393 } 392 }
394 this.setData({ 393 this.setData({
395 - id: options.id 394 + id: options.id,
  395 + status: options.status ? options.status : null,
  396 + user_id: options.user_id ? options.user_id : null
396 }) 397 })
397 this.get_info(options.id) 398 this.get_info(options.id)
398 }, 399 },
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view class="left"> 19 <view class="left">
20 <image src="/imgs/must.png" /> 工作类型 20 <image src="/imgs/must.png" /> 工作类型
21 </view> 21 </view>
22 - <picker range="{{enroll_arr}}" value="{{type}}" bindchange="change_enroll" disabled="{{page_type == 0 || page_type == 1}}"> 22 + <picker range="{{enroll_arr}}" value="{{type}}" bindchange="change_enroll" disabled="{{status}}">
23 <view class="right"> 23 <view class="right">
24 <text>{{type?type:'请选择'}}</text> 24 <text>{{type?type:'请选择'}}</text>
25 <image src="/imgs/right.png" /> 25 <image src="/imgs/right.png" />
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <view class="left"> 30 <view class="left">
31 <image src="/imgs/must.png" /> 工作内容 31 <image src="/imgs/must.png" /> 工作内容
32 </view> 32 </view>
33 - <picker range="{{check_arr}}" value="{{check_item}}" bindchange="change_check" disabled="{{page_type == 0 || page_type == 1}}"> 33 + <picker range="{{check_arr}}" value="{{check_item}}" bindchange="change_check" disabled="{{status}}">
34 <view class="right" bindtap="show_cover"> 34 <view class="right" bindtap="show_cover">
35 <text>{{check?check:'请选择'}}</text> 35 <text>{{check?check:'请选择'}}</text>
36 <image src="/imgs/right.png" /> 36 <image src="/imgs/right.png" />
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <view class="left"> 45 <view class="left">
46 <image src="/imgs/must.png" /> 参加日期 46 <image src="/imgs/must.png" /> 参加日期
47 </view> 47 </view>
48 - <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="1" disabled="{{page_type == 0 || page_type == 1}}"> 48 + <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="1" disabled="{{status}}">
49 <view class="right"> 49 <view class="right">
50 <text>{{item.date?item.date:'请选择'}}</text> 50 <text>{{item.date?item.date:'请选择'}}</text>
51 <image src="/imgs/right.png" /> 51 <image src="/imgs/right.png" />
@@ -56,14 +56,14 @@ @@ -56,14 +56,14 @@
56 <view class="left"> 56 <view class="left">
57 <image src="/imgs/must.png" /> 参加时间 57 <image src="/imgs/must.png" /> 参加时间
58 </view> 58 </view>
59 - <picker mode="selector" value="{{item.time}}" bindchange="change_time" range="{{time_arr}}" data-index="{{index}}" disabled="{{page_type == 0 || page_type == 1}}"> 59 + <picker mode="selector" value="{{item.time}}" bindchange="change_time" range="{{time_arr}}" data-index="{{index}}" disabled="{{status}}">
60 <view class="right"> 60 <view class="right">
61 <text>{{item.time?item.time:'请选择'}}</text> 61 <text>{{item.time?item.time:'请选择'}}</text>
62 <image src="/imgs/right.png" /> 62 <image src="/imgs/right.png" />
63 </view> 63 </view>
64 </picker> 64 </picker>
65 </view> 65 </view>
66 - <view class="add" bindtap="add_item" data-id="1" wx:if="{{index == t_arr.length -1 && page_type!=0 && page_type!=1}}">+添加</view> 66 + <view class="add" bindtap="add_item" data-id="1" wx:if="{{index == t_arr.length -1 && !status}}">+添加</view>
67 </view> 67 </view>
68 68
69 <view class="info_box" wx:for="{{z_arr}}" wx:key="index"> 69 <view class="info_box" wx:for="{{z_arr}}" wx:key="index">
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <view class="left"> 74 <view class="left">
75 <image src="/imgs/must.png" /> 入住日期 75 <image src="/imgs/must.png" /> 入住日期
76 </view> 76 </view>
77 - <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="2" disabled="{{page_type == 0 || page_type == 1}}"> 77 + <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="2" disabled="{{status}}">
78 <view class="right"> 78 <view class="right">
79 <text>{{item.date?item.date:'请选择'}}</text> 79 <text>{{item.date?item.date:'请选择'}}</text>
80 <image src="/imgs/right.png" /> 80 <image src="/imgs/right.png" />
@@ -83,9 +83,9 @@ @@ -83,9 +83,9 @@
83 </view> 83 </view>
84 <view class="item"> 84 <view class="item">
85 <text>入住人身份证号码</text> 85 <text>入住人身份证号码</text>
86 - <input placeholder="请输入" bindinput="get_card" value="{{item.idcard}}" maxlength="18" data-index="{{index}}" disabled="{{page_type == 0 || page_type == 1}}" /> 86 + <input placeholder="请输入" bindinput="get_card" value="{{item.idcard}}" maxlength="18" data-index="{{index}}" disabled="{{status}}" />
87 </view> 87 </view>
88 - <view class="add" bindtap="add_item" data-id="2" wx:if="{{index == z_arr.length -1 && page_type!=0 && page_type!=1}}">+添加</view> 88 + <view class="add" bindtap="add_item" data-id="2" wx:if="{{index == z_arr.length -1 && !status}}">+添加</view>
89 </view> 89 </view>
90 90
91 <view class="info_box" wx:for="{{e_arr}}" wx:key="index"> 91 <view class="info_box" wx:for="{{e_arr}}" wx:key="index">
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 <view class="left"> 94 <view class="left">
95 <image src="/imgs/must.png" /> 用餐日期 95 <image src="/imgs/must.png" /> 用餐日期
96 </view> 96 </view>
97 - <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="3" disabled="{{page_type == 0 || page_type == 1}}"> 97 + <picker mode="selector" value="{{item.date}}" bindchange="change_date" range="{{date_arr}}" data-index="{{index}}" data-id="3" disabled="{{status}}">
98 <view class="right"> 98 <view class="right">
99 <text>{{item.date?item.date:'请选择'}}</text> 99 <text>{{item.date?item.date:'请选择'}}</text>
100 <image src="/imgs/right.png" /> 100 <image src="/imgs/right.png" />
@@ -105,23 +105,23 @@ @@ -105,23 +105,23 @@
105 <view class="left"> 105 <view class="left">
106 <image src="/imgs/must.png" /> 用餐时间 106 <image src="/imgs/must.png" /> 用餐时间
107 </view> 107 </view>
108 - <picker mode="selector" value="{{item.time}}" bindchange="eat_time" range="{{eat_arr}}" data-index="{{index}}" disabled="{{page_type == 0 || page_type == 1}}"> 108 + <picker mode="selector" value="{{item.time}}" bindchange="eat_time" range="{{eat_arr}}" data-index="{{index}}" disabled="{{status}}">
109 <view class="right"> 109 <view class="right">
110 <text>{{item.time?item.time:'请选择'}}</text> 110 <text>{{item.time?item.time:'请选择'}}</text>
111 <image src="/imgs/right.png" /> 111 <image src="/imgs/right.png" />
112 </view> 112 </view>
113 </picker> 113 </picker>
114 </view> 114 </view>
115 - <view class="add" bindtap="add_item" data-id="3" wx:if="{{index == e_arr.length -1 && page_type!=0 && page_type!=1}}">+添加</view> 115 + <view class="add" bindtap="add_item" data-id="3" wx:if="{{index == e_arr.length -1 && !status}}">+添加</view>
116 </view> 116 </view>
117 117
118 -<view class="submit" bindtap="submit" wx:if="{{page_type!=0 && page_type!=1}}">确认</view> 118 +<view class="submit" bindtap="submit" wx:if="{{!status}}">确认</view>
119 119
120 <view class="btn_box" wx:else> 120 <view class="btn_box" wx:else>
121 - <view class="look_table" catchtap="{{page_type == 1?'look_word':'look_register'}}">{{page_type == 1?'查看工作汇报':'查看注册信息'}}</view> 121 + <view class="look_table" catchtap="{{status == 1 || status == 3?'look_word':'look_register'}}">{{status == 1 || status == 3?'查看工作汇报':'查看注册信息'}}</view>
122 122
123 - <view class="fill_time" catchtap="change_cover" wx:if="{{page_type == 1}}">输入工时</view>  
124 - <view class="two_btn" wx:if="{{page_type == 0 && !two_type}}"> 123 + <view class="fill_time" catchtap="change_cover" wx:if="{{status == 1 || status == 3}}">输入工时</view>
  124 + <view class="two_btn" wx:if="{{status == 0 && !two_type}}">
125 <view catchtap="examine" data-id="2">不通过</view> 125 <view catchtap="examine" data-id="2">不通过</view>
126 <view catchtap="examine" data-id="1">通过</view> 126 <view catchtap="examine" data-id="1">通过</view>
127 </view> 127 </view>
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <view class="cover_box" catchtouchmove="true" wx:if="{{cover_type}}"> 131 <view class="cover_box" catchtouchmove="true" wx:if="{{cover_type}}">
132 <view class="show_box"> 132 <view class="show_box">
133 <view class="s_title">请输入工时</view> 133 <view class="s_title">请输入工时</view>
134 - <input placeholder="请输入..." class="word_area active" value="{{word}}" bindinput="get_word" type="number"/> 134 + <input placeholder="请输入..." class="word_area active" value="{{word}}" bindinput="get_word" type="number" />
135 <view class="submit" catchtap="add_time">确认</view> 135 <view class="submit" catchtap="add_time">确认</view>
136 <image src="/imgs/close.png" class="close" catchtap="change_cover" /> 136 <image src="/imgs/close.png" class="close" catchtap="change_cover" />
137 </view> 137 </view>
@@ -188,7 +188,9 @@ page { @@ -188,7 +188,9 @@ page {
188 188
189 .btn_box { 189 .btn_box {
190 width: 100%; 190 width: 100%;
191 - margin-top: 226rpx; 191 + height: 522rpx;
  192 + padding-top: 226rpx;
  193 + box-sizing: border-box;
192 display: flex; 194 display: flex;
193 flex-wrap: wrap; 195 flex-wrap: wrap;
194 justify-content: center; 196 justify-content: center;
@@ -15,7 +15,7 @@ Page({ @@ -15,7 +15,7 @@ Page({
15 //查看更多报名用户信息（审核端） 15 //查看更多报名用户信息（审核端）
16 look_more(e){ 16 look_more(e){
17 wx.navigateTo({ 17 wx.navigateTo({
18 - url: '/pages/enroll/enroll?type=' + e.currentTarget.dataset.type + '&id=' + this.data.id + '&user_id=' + e.currentTarget.dataset.user_id 18 + url: '/pages/enroll/enroll?status=' + e.currentTarget.dataset.status + '&id=' + this.data.id + '&user_id=' + e.currentTarget.dataset.user_id
19 }) 19 })
20 }, 20 },
21 // 工作内容（管理员） 21 // 工作内容（管理员）
@@ -29,7 +29,6 @@ Page({ @@ -29,7 +29,6 @@ Page({
29 id: that.data.id 29 id: that.data.id
30 } 30 }
31 app.post(url, params, head).then((res) => { 31 app.post(url, params, head).then((res) => {
32 - console.log(res)  
33 that.setData({ 32 that.setData({
34 join_info: res 33 join_info: res
35 }) 34 })
@@ -92,7 +91,7 @@ Page({ @@ -92,7 +91,7 @@ Page({
92 // 编辑报名信息 91 // 编辑报名信息
93 edit_info() { 92 edit_info() {
94 wx.navigateTo({ 93 wx.navigateTo({
95 - url: '/pages/enroll/enroll?id=' + this.data.id + '&type=3' 94 + url: '/pages/enroll/enroll?id=' + this.data.id + '&type=5'
96 }) 95 })
97 }, 96 },
98 get_poster() { 97 get_poster() {
@@ -52,18 +52,17 @@ @@ -52,18 +52,17 @@
52 </view> 52 </view>
53 </view> 53 </view>
54 54
55 -<view class="c_item" wx:if="{{join_info.camera.length>0}}">  
56 - <view class="c_title">摄影（设备自带</view> 55 +<view class="c_item" wx:for="{{join_info}}" wx:key="index">
  56 + <view class="c_title">{{item.title}}</view>
57 <view class="c_box"> 57 <view class="c_box">
58 - <view class="i_info {{join_info.camera.length>3 && index<join_info.camera.length-2?'line':''}}" wx:for="{{join_info.camera}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">  
59 - <image src="{{item.photo}}" mode="aspectFill" />  
60 - <view class="name">李强</view>  
61 - <view class="status" wx:if="{{item.status =='已通过'}}" style="background: #41CD79;">已通过</view>  
62 - <view class="status" wx:else style="background: #F84141;">未通过</view> 58 + <view class="i_info {{item.arr.length>3 && zindex<item.arr.length-1?'line':''}}" wx:for="{{item.arr}}" wx:for-item="zitem" wx:for-index="zindex" wx:key="zindex" data-status="{{zitem.status}}" data-user_id="{{zitem.id}}" bindtap="look_more">
  59 + <image src="{{zitem.photo}}" mode="aspectFill" />
  60 + <view class="name">{{zitem.name}}</view>
  61 + <view class="status {{zitem.status>1?(zitem.status == 2?'bgb':'bga'):'bgc'}}">{{zitem.status>1?(zitem.status == 2?'未通过':'已通过'):'待审核'}}</view>
63 </view> 62 </view>
64 </view> 63 </view>
65 </view> 64 </view>
66 -<view class="c_item" wx:if="{{join_info.photo.length>0}}"> 65 +<!-- <view class="c_item" wx:if="{{join_info.photo.length>0}}">
67 <view class="c_title">摄像（设备自带</view> 66 <view class="c_title">摄像（设备自带</view>
68 <view class="c_box"> 67 <view class="c_box">
69 <view class="i_info {{join_info.photo.length>3 && index<join_info.photo.length-2?'line':''}}" wx:for="{{join_info.photo}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more"> 68 <view class="i_info {{join_info.photo.length>3 && index<join_info.photo.length-2?'line':''}}" wx:for="{{join_info.photo}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">
@@ -74,48 +73,3 @@ @@ -74,48 +73,3 @@
74 </view> 73 </view>
75 </view> 74 </view>
76 </view> 75 </view>
77 -<view class="c_item" wx:if="{{join_info.motorcade.length>0}}">  
78 - <view class="c_title">爱心车队</view>  
79 - <view class="c_box">  
80 - <view class="i_info {{join_info.motorcade.length>3 && index<join_info.motorcade.length-2?'line':''}}" wx:for="{{join_info.motorcade}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">  
81 - <image src="{{item.photo}}" mode="aspectFill" />  
82 - <view class="name">李强</view>  
83 - <view class="status" wx:if="{{item.status =='已通过'}}" style="background: #41CD79;">已通过</view>  
84 - <view class="status" wx:else style="background: #F84141;">未通过</view>  
85 - </view>  
86 - </view>  
87 -</view>  
88 -<view class="c_item" wx:if="{{join_info.question.length>0}}">  
89 - <view class="c_title">线上答疑</view>  
90 - <view class="c_box">  
91 - <view class="i_info {{join_info.question.length>3 && index<join_info.question.length-2?'line':''}}" wx:for="{{join_info.question}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">  
92 - <image src="{{item.photo}}" mode="aspectFill" />  
93 - <view class="name">李强</view>  
94 - <view class="status" wx:if="{{item.status =='已通过'}}" style="background: #41CD79;">已通过</view>  
95 - <view class="status" wx:else style="background: #F84141;">未通过</view>  
96 - </view>  
97 - </view>  
98 -</view>  
99 -<view class="c_item" wx:if="{{join_info.ill.length>0}}">  
100 - <view class="c_title">门诊服务</view>  
101 - <view class="c_box">  
102 - <view class="i_info {{join_info.ill.length>3 && index<join_info.ill.length-2?'line':''}}" wx:for="{{join_info.ill}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">  
103 - <image src="{{item.photo}}" mode="aspectFill" />  
104 - <view class="name">李强</view>  
105 - <view class="status" wx:if="{{item.status =='已通过'}}" style="background: #41CD79;">已通过</view>  
106 - <view class="status" wx:else style="background: #F84141;">未通过</view>  
107 - </view>  
108 - </view>  
109 -</view>  
110 -  
111 -<view class="c_item" wx:if="{{join_info.ill.service>0}}">  
112 - <view class="c_title">现场服务（签到、指引、礼仪等</view>  
113 - <view class="c_box">  
114 - <view class="i_info {{join_info.service.length>3 && index<join_info.service.length-2?'line':''}}" wx:for="{{join_info.service}}" wx:key="index" data-type="{{item.status =='已通过'?'1':0}}" data-user_id="{{item.user_id}}" bindtap="look_more">  
115 - <image src="{{item.photo}}" mode="aspectFill" />  
116 - <view class="name">李强</view>  
117 - <view class="status" wx:if="{{item.status =='已通过'}}" style="background: #41CD79;">已通过</view>  
118 - <view class="status" wx:else style="background: #F84141;">未通过</view>  
119 - </view>  
120 - </view>  
121 -</view>  
@@ -294,3 +294,12 @@ page { @@ -294,3 +294,12 @@ page {
294 border-bottom: 1px solid #e6e6e6; 294 border-bottom: 1px solid #e6e6e6;
295 } 295 }
296 296
  297 +.bga{
  298 + background: #41CD79;
  299 +}
  300 +.bgb{
  301 + background: #F84141;
  302 +}
  303 +.bgc{
  304 + background: #6495ED;
  305 +}
@@ -120,7 +120,6 @@ Page({ @@ -120,7 +120,6 @@ Page({
120 * 生命周期函数--监听页面加载 120 * 生命周期函数--监听页面加载
121 */ 121 */
122 onLoad: function (options) { 122 onLoad: function (options) {
123 - console.log(options)  
124 this.setData({ 123 this.setData({
125 id: options.id, 124 id: options.id,
126 user_id: options.user_id ? options.user_id:null 125 user_id: options.user_id ? options.user_id:null