miniprogram / volunteer · 提交

转到一个项目

作者 王智
提交 f878deba711b500e47660bb6fed425116f597b15 1 个父辈 3c371d4a

bug修改·

内嵌 并排对比
正在显示 19 个修改的文件 包含 221 行增加 和 89 行删除
@@ -63,10 +63,18 @@ App({ @@ -63,10 +63,18 @@ App({
63 63
64 } else if (res.data.code == '40000') { 64 } else if (res.data.code == '40000') {
65 65
66 - 66 + if (url == '/index/second/checkTranStatus') {
  67 + wx.showModal({
  68 + title: '提示',
  69 + content: '请先申请成为志愿者',
  70 + showCancel: false,
  71 + })
  72 +
  73 + } else
  74 +
67 if (url == '/index/second/commitAnswer') { 75 if (url == '/index/second/commitAnswer') {
68 resolve(res.data); 76 resolve(res.data);
69 - } else { 77 + } else {
70 wx.showModal({ 78 wx.showModal({
71 title: '提示', 79 title: '提示',
72 content: res.data.msg, 80 content: res.data.msg,
@@ -77,9 +85,6 @@ App({ @@ -77,9 +85,6 @@ App({
77 }) 85 })
78 } 86 }
79 87
80 -  
81 -  
82 -  
83 } else if (res.data.code == '40005') { 88 } else if (res.data.code == '40005') {
84 wx.showModal({ 89 wx.showModal({
85 title: '提示', 90 title: '提示',
@@ -2,8 +2,8 @@ const app = getApp(); @@ -2,8 +2,8 @@ const app = getApp();
2 Page({ 2 Page({
3 3
4 data: { 4 data: {
5 - list: [],  
6 - array: [], 5 + list: [],//列表
  6 + array: [],//地址
7 index: 1 7 index: 1
8 }, 8 },
9 onLoad: function (options) { 9 onLoad: function (options) {
@@ -21,14 +21,15 @@ Page({ @@ -21,14 +21,15 @@ Page({
21 21
22 onShow: function () { 22 onShow: function () {
23 let that = this; 23 let that = this;
24 - that.getList();  
25 that.get_city(); 24 that.get_city();
26 25
  26 + that.getList();
  27 +
27 }, 28 },
28 29
29 // 选择 30 // 选择
30 bindPickerChange: function (e) { 31 bindPickerChange: function (e) {
31 - console.log('picker发送选择改变，携带值为', e.detail.value) 32 + let that = this;
32 this.setData({ 33 this.setData({
33 index: e.detail.value 34 index: e.detail.value
34 }) 35 })
@@ -44,11 +45,10 @@ Page({ @@ -44,11 +45,10 @@ Page({
44 'XX-Token': wx.getStorageSync('token') 45 'XX-Token': wx.getStorageSync('token')
45 } 46 }
46 let params = { 47 let params = {
47 - city: '天津市' 48 + city: that.data.array[that.data.index]
48 } 49 }
49 - console.log(params)  
50 app.post(url, params, head).then((res) => { 50 app.post(url, params, head).then((res) => {
51 - // console.log(res) 51 + console.log(res)
52 that.setData({ 52 that.setData({
53 list: res 53 list: res
54 }) 54 })
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 11
12 12
13 <view class='new_box'> 13 <view class='new_box'>
14 - <view class='new_cell' data-id="{{list.id}}" bindtap="getDetail">  
15 - <view class='new_cellmain'> 14 + <view class='new_cell' data-id="{{list.id}}" bindtap="getDetail" >
  15 + <view class='new_cellmain' >
16 <view class='new_img'> 16 <view class='new_img'>
17 <image src='{{list.pic}}' mode="aspectFill" /> 17 <image src='{{list.pic}}' mode="aspectFill" />
18 <view class="new_num"> 18 <view class="new_num">
@@ -76,7 +76,7 @@ page { @@ -76,7 +76,7 @@ page {
76 76
77 .new_num { 77 .new_num {
78 padding: 0 16rpx; 78 padding: 0 16rpx;
79 - width: 100%; 79 + /* width: 100%; */
80 height: 46rpx; 80 height: 46rpx;
81 color: #ffffff; 81 color: #ffffff;
82 position: absolute; 82 position: absolute;
@@ -88,7 +88,7 @@ page { @@ -88,7 +88,7 @@ page {
88 } 88 }
89 89
90 .new_num view { 90 .new_num view {
91 - width: 100rpx; 91 + width: 200rpx;
92 92
93 } 93 }
94 94
@@ -75,6 +75,7 @@ Page({ @@ -75,6 +75,7 @@ Page({
75 front_card: '', //身份证正面照 75 front_card: '', //身份证正面照
76 reverse_card: '', //身份证反面照 76 reverse_card: '', //身份证反面照
77 id: '', //用户id, 77 id: '', //用户id,
  78 + status:''//状态
78 }, 79 },
79 80
80 onShow: function () { 81 onShow: function () {
@@ -698,6 +699,7 @@ Page({ @@ -698,6 +699,7 @@ Page({
698 'XX-Token': wx.getStorageSync('token') 699 'XX-Token': wx.getStorageSync('token')
699 } 700 }
700 app.post(url, params, head).then((res) => { 701 app.post(url, params, head).then((res) => {
  702 + console.log(res)
701 let provincearr = that.data.provincearr; 703 let provincearr = that.data.provincearr;
702 let cityarr = that.data.cityarr; 704 let cityarr = that.data.cityarr;
703 let countryarr = that.data.countryarr; 705 let countryarr = that.data.countryarr;
@@ -745,7 +747,8 @@ Page({ @@ -745,7 +747,8 @@ Page({
745 sex: res.sex, 747 sex: res.sex,
746 unit: res.unit, 748 unit: res.unit,
747 urgency_phone: res.urgency_phone, 749 urgency_phone: res.urgency_phone,
748 - type: res.type 750 + type: res.type,
  751 + status:res.status
749 }) 752 })
750 }).catch((err) => { 753 }).catch((err) => {
751 754
@@ -11,7 +11,8 @@ @@ -11,7 +11,8 @@
11 <view class='apply_item'> 11 <view class='apply_item'>
12 <view>姓名</view> 12 <view>姓名</view>
13 <view class='apply_item_input'> 13 <view class='apply_item_input'>
14 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{name}}' disabled="{{page_type}}"></input> 14 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{name}}'
  15 + disabled="{{page_type}}"></input>
15 </view> 16 </view>
16 </view> 17 </view>
17 <picker bindchange="bindsex" range="{{arraysex}}" disabled="{{page_type}}"> 18 <picker bindchange="bindsex" range="{{arraysex}}" disabled="{{page_type}}">
@@ -62,67 +63,78 @@ @@ -62,67 +63,78 @@
62 <view class='apply_item'> 63 <view class='apply_item'>
63 <view>工作单位</view> 64 <view>工作单位</view>
64 <view class='apply_item_input'> 65 <view class='apply_item_input'>
65 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setunit' value='{{unit}}' disabled="{{page_type}}"></input> 66 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setunit' value='{{unit}}'
  67 + disabled="{{page_type}}"></input>
66 </view> 68 </view>
67 </view> 69 </view>
68 <view class='apply_item'> 70 <view class='apply_item'>
69 <view>职务</view> 71 <view>职务</view>
70 <view class='apply_item_input'> 72 <view class='apply_item_input'>
71 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setduty' value='{{duty}}' disabled="{{page_type}}"></input> 73 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setduty' value='{{duty}}'
  74 + disabled="{{page_type}}"></input>
72 </view> 75 </view>
73 </view> 76 </view>
74 <view class='apply_item'> 77 <view class='apply_item'>
75 <view>通讯地址</view> 78 <view>通讯地址</view>
76 <view class='apply_item_input'> 79 <view class='apply_item_input'>
77 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setaddr' value='{{addr}}' disabled="{{page_type}}"></input> 80 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setaddr' value='{{addr}}'
  81 + disabled="{{page_type}}"></input>
78 </view> 82 </view>
79 </view> 83 </view>
80 <view class='apply_item'> 84 <view class='apply_item'>
81 <view>邮编</view> 85 <view>邮编</view>
82 <view class='apply_item_input'> 86 <view class='apply_item_input'>
83 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setpostcode' value='{{postcode}}' disabled="{{page_type}}"></input> 87 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setpostcode' value='{{postcode}}'
  88 + disabled="{{page_type}}"></input>
84 </view> 89 </view>
85 </view> 90 </view>
86 <view class='apply_item'> 91 <view class='apply_item'>
87 <view>就读/毕业院校</view> 92 <view>就读/毕业院校</view>
88 <view class='apply_item_input'> 93 <view class='apply_item_input'>
89 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setschool' value='{{school}}' disabled="{{page_type}}"></input> 94 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setschool' value='{{school}}'
  95 + disabled="{{page_type}}"></input>
90 </view> 96 </view>
91 </view> 97 </view>
92 <view class='apply_item'> 98 <view class='apply_item'>
93 <view>身份证号</view> 99 <view>身份证号</view>
94 <view class='apply_item_input'> 100 <view class='apply_item_input'>
95 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setcard_number' value='{{card_number}}' disabled="{{page_type}}" maxlength="20"></input> 101 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setcard_number' value='{{card_number}}'
  102 + disabled="{{page_type}}" maxlength="20"></input>
96 </view> 103 </view>
97 </view> 104 </view>
98 <view class='apply_item'> 105 <view class='apply_item'>
99 <view>固定电话(选填)</view> 106 <view>固定电话(选填)</view>
100 <view class='apply_item_input'> 107 <view class='apply_item_input'>
101 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone' value='{{fixed_phone}}'></input> 108 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone'
  109 + value='{{fixed_phone}}'></input>
102 </view> 110 </view>
103 </view> 111 </view>
104 <view class='apply_item'> 112 <view class='apply_item'>
105 <view>移动电话</view> 113 <view>移动电话</view>
106 <view class='apply_item_input'> 114 <view class='apply_item_input'>
107 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setmove_phone' value='{{move_phone}}' disabled="{{page_type}}" maxlength="11"></input> 115 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setmove_phone' value='{{move_phone}}'
  116 + disabled="{{page_type}}" maxlength="11"></input>
108 </view> 117 </view>
109 </view> 118 </view>
110 <view class='apply_item'> 119 <view class='apply_item'>
111 <view>电子邮箱</view> 120 <view>电子邮箱</view>
112 <view class='apply_item_input'> 121 <view class='apply_item_input'>
113 - <input placeholder='未填写' placeholder-class='input_p' bindinput='setemail' value='{{email}}' disabled="{{page_type}}"></input> 122 + <input placeholder='未填写' placeholder-class='input_p' bindinput='setemail' value='{{email}}'
  123 + disabled="{{page_type}}"></input>
114 </view> 124 </view>
115 </view> 125 </view>
116 <view class='apply_item big_item'> 126 <view class='apply_item big_item'>
117 <view>紧急联系人及电话</view> 127 <view>紧急联系人及电话</view>
118 <view class='apply_item_input'> 128 <view class='apply_item_input'>
119 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='seturgency_phone' value='{{urgency_phone}}' disabled="{{page_type}}"></input> 129 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='seturgency_phone'
  130 + value='{{urgency_phone}}' disabled="{{page_type}}"></input>
120 </view> 131 </view>
121 </view> 132 </view>
122 <view class='apply_item'> 133 <view class='apply_item'>
123 <view>QQ号码</view> 134 <view>QQ号码</view>
124 <view class='apply_item_input'> 135 <view class='apply_item_input'>
125 - <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setqq' value='{{qq}}' disabled="{{page_type}}"></input> 136 + <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setqq' value='{{qq}}'
  137 + disabled="{{page_type}}"></input>
126 </view> 138 </view>
127 </view> 139 </view>
128 140
@@ -150,7 +162,8 @@ @@ -150,7 +162,8 @@
150 <view>开始时间</view> 162 <view>开始时间</view>
151 <view class='apply_item_input'> 163 <view class='apply_item_input'>
152 <view class='iconfont icon-xiangyou'></view> 164 <view class='iconfont icon-xiangyou'></view>
153 - <view class='apply_itemtxt {{record[apply_nav].record_start_time?"color333":""}}'>{{record[apply_nav].record_start_time?record[apply_nav].record_start_time:'请选择'}}</view> 165 + <view class='apply_itemtxt {{record[apply_nav].record_start_time?"color333":""}}'>
  166 + {{record[apply_nav].record_start_time?record[apply_nav].record_start_time:'请选择'}}</view>
154 </view> 167 </view>
155 </view> 168 </view>
156 </picker> 169 </picker>
@@ -159,32 +172,37 @@ @@ -159,32 +172,37 @@
159 <view>结束时间</view> 172 <view>结束时间</view>
160 <view class='apply_item_input'> 173 <view class='apply_item_input'>
161 <view class='iconfont icon-xiangyou'></view> 174 <view class='iconfont icon-xiangyou'></view>
162 - <view class='apply_itemtxt {{record[apply_nav].record_end_time?"color333":""}}'>{{record[apply_nav].record_end_time?record[apply_nav].record_end_time:'请选择'}}</view> 175 + <view class='apply_itemtxt {{record[apply_nav].record_end_time?"color333":""}}'>
  176 + {{record[apply_nav].record_end_time?record[apply_nav].record_end_time:'请选择'}}</view>
163 </view> 177 </view>
164 </view> 178 </view>
165 </picker> 179 </picker>
166 <view class='apply_item'> 180 <view class='apply_item'>
167 <view>单位名称</view> 181 <view>单位名称</view>
168 <view class='apply_item_input'> 182 <view class='apply_item_input'>
169 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_unit}}' bindinput='setrecordunit' disabled="{{page_type}}"></input> 183 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_unit}}'
  184 + bindinput='setrecordunit' disabled="{{page_type}}"></input>
170 </view> 185 </view>
171 </view> 186 </view>
172 <view class='apply_item'> 187 <view class='apply_item'>
173 <view>职务</view> 188 <view>职务</view>
174 <view class='apply_item_input'> 189 <view class='apply_item_input'>
175 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_duty}}' bindinput='setrecordduty' disabled="{{page_type}}"></input> 190 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_duty}}'
  191 + bindinput='setrecordduty' disabled="{{page_type}}"></input>
176 </view> 192 </view>
177 </view> 193 </view>
178 <view class='apply_item'> 194 <view class='apply_item'>
179 <view>证明人</view> 195 <view>证明人</view>
180 <view class='apply_item_input'> 196 <view class='apply_item_input'>
181 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_name}}' bindinput='setrecordname' disabled="{{page_type}}"></input> 197 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_name}}'
  198 + bindinput='setrecordname' disabled="{{page_type}}"></input>
182 </view> 199 </view>
183 </view> 200 </view>
184 <view class='apply_item'> 201 <view class='apply_item'>
185 <view>证明人电话</view> 202 <view>证明人电话</view>
186 <view class='apply_item_input'> 203 <view class='apply_item_input'>
187 - <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_phone}}' bindinput='setrecordphone' disabled="{{page_type}}"></input> 204 + <input placeholder='未填写' placeholder-class='input_p' value='{{record[apply_nav].record_phone}}'
  205 + bindinput='setrecordphone' disabled="{{page_type}}"></input>
188 </view> 206 </view>
189 </view> 207 </view>
190 </view> 208 </view>
@@ -197,7 +215,8 @@ @@ -197,7 +215,8 @@
197 </view> 215 </view>
198 <view>上传身份证正面</view> 216 <view>上传身份证正面</view>
199 </view> 217 </view>
200 - <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}' mode="aspectFill"></image> 218 + <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'
  219 + mode="aspectFill"></image>
201 </view> 220 </view>
202 <view class='apply_idimg' bindtap="{{page_type?'':'uploadImages'}}" data-tem='3'> 221 <view class='apply_idimg' bindtap="{{page_type?'':'uploadImages'}}" data-tem='3'>
203 <view class='apply_idimgmain' wx:if='{{!reverse_card}}'> 222 <view class='apply_idimgmain' wx:if='{{!reverse_card}}'>
@@ -206,7 +225,8 @@ @@ -206,7 +225,8 @@
206 </view> 225 </view>
207 <view>上传身份证反面</view> 226 <view>上传身份证反面</view>
208 </view> 227 </view>
209 - <image src='{{reverse_card?reverse_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_zhengmian_bg@2x.png"}}'></image> 228 + <image src='{{reverse_card?reverse_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_zhengmian_bg@2x.png"}}'>
  229 + </image>
210 </view> 230 </view>
211 </view> 231 </view>
212 <view class='apply_bottomtitle' wx:if="{{!page_type}}">志愿者申请书 232 <view class='apply_bottomtitle' wx:if="{{!page_type}}">志愿者申请书
@@ -214,18 +234,27 @@ @@ -214,18 +234,27 @@
214 <view class='apply_bottom' wx:if="{{!page_type}}"> 234 <view class='apply_bottom' wx:if="{{!page_type}}">
215 为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。 235 为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
216 </view> 236 </view>
  237 +<view wx:if="{{status==1}}">
  238 + <form wx:if="{{!page_type}}" bindsubmit="submit" report-submit='true' class="apply_btn">
  239 + <button class="a_btn" form-type="submit" style="">提交</button>
  240 + </form>
  241 +</view>
  242 +<view wx:if="{{status==2}}">
  243 + <form wx:if="{{!page_type}}" report-submit='true' class="apply_btn">
  244 + <button class="a_btn gray" form-type="submit" style="">提交</button>
  245 + </form>
  246 +</view>
217 247
218 -<form wx:if="{{!page_type}}" bindsubmit="submit" report-submit='true' class="apply_btn">  
219 - <button class="a_btn" form-type="submit" style="">提交</button>  
220 -</form>  
221 248
222 <!-- 服务区域 --> 249 <!-- 服务区域 -->
223 <view class='apply_vold' wx:if='{{showapply}}'> 250 <view class='apply_vold' wx:if='{{showapply}}'>
224 <view class='pickerview'> 251 <view class='pickerview'>
225 - <picker-view indicator-style="height: 40px;" class='pickerview_top' value="{{confirmvalarr}}" bindchange="bindChange"> 252 + <picker-view indicator-style="height: 40px;" class='pickerview_top' value="{{confirmvalarr}}"
  253 + bindchange="bindChange">
226 <view class='iconfont icon-guanbi1' catchtap='setshowapply_no'></view> 254 <view class='iconfont icon-guanbi1' catchtap='setshowapply_no'></view>
227 <picker-view-column> 255 <picker-view-column>
228 - <view wx:for="{{provincearr}}" wx:key style="line-height: 40px" class='column_view'>{{ item.province_name}}</view> 256 + <view wx:for="{{provincearr}}" wx:key style="line-height: 40px" class='column_view'>{{ item.province_name}}
  257 + </view>
229 </picker-view-column> 258 </picker-view-column>
230 <picker-view-column> 259 <picker-view-column>
231 <view wx:for="{{cityarr}}" wx:key style="line-height: 40px" class='column_view'>{{item.city_name}}</view> 260 <view wx:for="{{cityarr}}" wx:key style="line-height: 40px" class='column_view'>{{item.city_name}}</view>
@@ -217,7 +217,10 @@ @@ -217,7 +217,10 @@
217 justify-content: center; 217 justify-content: center;
218 border-radius: 8rpx; 218 border-radius: 8rpx;
219 } 219 }
  220 +.gray{
  221 + background: #eeeeee;
220 222
  223 +}
221 .color333 { 224 .color333 {
222 color: #333; 225 color: #333;
223 } 226 }
@@ -111,10 +111,10 @@ Page({ @@ -111,10 +111,10 @@ Page({
111 }, 111 },
112 //他人主页 112 //他人主页
113 getother(e) { 113 getother(e) {
114 - var id =e.currentTarget.id 114 + var id = e.currentTarget.id
115 console.log(e) 115 console.log(e)
116 wx.navigateTo({ 116 wx.navigateTo({
117 - url: '/pages/more_other/more_other?id='+id, 117 + url: '/pages/more_other/more_other?id=' + id,
118 }) 118 })
119 119
120 }, 120 },
@@ -15,7 +15,8 @@ page { @@ -15,7 +15,8 @@ page {
15 /* 菜单 */ 15 /* 菜单 */
16 .home_menu { 16 .home_menu {
17 width: 608rpx; 17 width: 608rpx;
18 - margin: 40rpx auto; 18 + margin: 0rpx auto;
  19 + margin-top: 40rpx;
19 display: flex; 20 display: flex;
20 flex-wrap: wrap; 21 flex-wrap: wrap;
21 justify-content: space-between; 22 justify-content: space-between;
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <view class='apply_item'> 49 <view class='apply_item'>
50 <view>地区</view> 50 <view>地区</view>
51 <view class='apply_item_list'> 51 <view class='apply_item_list'>
52 - {{list.address}} 52 + {{list.userInfo.area}}
53 </view> 53 </view>
54 </view> 54 </view>
55 55
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 62
63 <view class="myactive_wrap" wx:for="{{list.userJoin}}"> 63 <view class="myactive_wrap" wx:for="{{list.userJoin}}">
64 <view class="myactive_time"> 64 <view class="myactive_time">
65 - <image src="/imgs/shijian-19.png"></image>{{item.date}}  
66 - {{ item.start_clock_time}}-{{item.end_clock_time}} 65 + <image src="/imgs/shijian-19.png"></image>
  66 + {{ item.start_time_text}}至 {{item.end_time_text}}
67 67
68 </view> 68 </view>
69 <view class="myactive_list"> 69 <view class="myactive_list">
@@ -71,27 +71,29 @@ @@ -71,27 +71,29 @@
71 <view class="myactive_name"> 71 <view class="myactive_name">
72 <view>{{item.activity_name}}</view> 72 <view>{{item.activity_name}}</view>
73 <view class="myactive_gps"> 73 <view class="myactive_gps">
74 - <image src="/imgs/didian-14.png"></image> 获得5小时工时 74 + <image src="/imgs/didian-14.png"></image> {{item.province_name}}
75 </view> 75 </view>
76 </view> 76 </view>
77 </view> 77 </view>
78 </view> 78 </view>
79 </view> 79 </view>
80 <view wx:else> 80 <view wx:else>
81 - <view class="myactive_wrap" wx:for="{{list.team}}">  
82 - <view class="myactive_time">  
83 - <image src="/imgs/shijian-19.png"></image>{{item.date}}  
84 - {{ item.start_clock_time}}-{{item.end_clock_time}}  
85 -  
86 - </view>  
87 - <view class="myactive_list">  
88 - <image src="{{item.pic}}"></image>  
89 - <view class="myactive_name">  
90 - <view>{{item.name}}</view>  
91 - <view class="myactive_gps">  
92 - <image src="/imgs/didian-14.png"></image> 获得5小时工时  
93 - </view> 81 + <view class="myteamBox" wx:for="{{list.team}}" >
  82 + <view class="teamtop">
  83 + <image src="/imgs/ac14.png"></image>
  84 + <view class="teamAddress">{{item.city}}</view>
  85 + <image src="/imgs/ac15.png"></image>
  86 + <view>{{item.people_num}}人</view>
  87 + </view>
  88 + <view class="teambottom">
  89 + <image src="{{item.pic}}"></image>
  90 + <view class="teamright">
  91 + <view class="teamName">{{item.name}}</view>
  92 + <view class="teamTime">
  93 + <view>团队时长：{{item.work_total_time}}小时</view>
  94 + <view>我的时长：{{item.my_time}}小时</view>
94 </view> 95 </view>
95 </view> 96 </view>
96 </view> 97 </view>
  98 +</view>
97 </view> 99 </view>
@@ -98,7 +98,7 @@ page { @@ -98,7 +98,7 @@ page {
98 margin: 0 auto; 98 margin: 0 auto;
99 } 99 }
100 100
101 -/* 团队 */ 101 +/*活动 */
102 .myactive_wrap { 102 .myactive_wrap {
103 margin: 32rpx 24rpx; 103 margin: 32rpx 24rpx;
104 padding: 32rpx 24rpx; 104 padding: 32rpx 24rpx;
@@ -145,3 +145,68 @@ page { @@ -145,3 +145,68 @@ page {
145 height: 28rpx; 145 height: 28rpx;
146 146
147 } 147 }
  148 +/* 团队 */
  149 +/* pages/myteam/myteam.wxss */
  150 +
  151 +page {
  152 + background-color: rgb(240, 240, 240);
  153 +}
  154 +
  155 +.myteamBox {
  156 + margin: 24rpx 32rpx;
  157 + padding: 32rpx 24rpx;
  158 + /* height: 266rpx; */
  159 + background-color: #ffffff;
  160 + border-radius: 7px;
  161 + font-size: 28rpx;
  162 +}
  163 +
  164 +.teamtop {
  165 + display: flex;
  166 + align-items: center;
  167 + color: #FF976A;
  168 +
  169 +}
  170 +
  171 +.teamtop image {
  172 + width: 40rpx;
  173 + height: 40rpx;
  174 +}
  175 +
  176 +.teamAddress {
  177 + margin-right: 44rpx;
  178 +}
  179 +
  180 +.teambottom {
  181 + display: flex;
  182 + margin-top: 24rpx;
  183 +}
  184 +
  185 +.teambottom image {
  186 + width: 182rpx;
  187 + height: 132rpx;
  188 + border-radius: 7px;
  189 + margin-right: 24rpx;
  190 +}
  191 +
  192 +.teamright {
  193 + width: 434rpx;
  194 + display: flex;
  195 + flex-direction: column;
  196 + justify-content: space-between;
  197 +
  198 +}
  199 +
  200 +.teamName {
  201 + font-size: 28rpx;
  202 + font-weight: 600;
  203 + color: #323233;
  204 + text-align: justify;
  205 +}
  206 +
  207 +.teamTime {
  208 + display: flex;
  209 + justify-content: space-between;
  210 + font-size: 24rpx;
  211 + color: #7D7E80;
  212 +}
@@ -24,12 +24,10 @@ Page({ @@ -24,12 +24,10 @@ Page({
24 }) 24 })
25 }, 25 },
26 // 我的个人信息 26 // 我的个人信息
27 - getmy(e) { 27 + getmy() {
28 28
29 - var id =e.currentTarget.dataset.id  
30 - console.log(id)  
31 wx.navigateTo({ 29 wx.navigateTo({
32 - url: '/pages/mydetail/mydetail?id='+id, 30 + url: '/pages/mydetail/mydetail',
33 }) 31 })
34 32
35 33
@@ -64,9 +62,37 @@ Page({ @@ -64,9 +62,37 @@ Page({
64 }, 62 },
65 // 志愿回馈 63 // 志愿回馈
66 getfeedback() { 64 getfeedback() {
67 - wx.navigateTo({  
68 - url: '/pages/myfeedback/myfeedback', 65 + let that = this;
  66 + let url = '/index/second/checkTranStatus';
  67 + let head = {
  68 + 'XX-Token': wx.getStorageSync('token')
  69 + }
  70 + app.post(url, {}, head).then((res) => {
  71 + console.log(res)
  72 + if (res.code == 40000) {
  73 + wx.showModal({
  74 + title: '提示',
  75 + content: '请先成为志愿者'
  76 +
  77 + })
  78 +
  79 + } else {
  80 + wx.navigateTo({
  81 + url: '/pages/myfeedback/myfeedback',
  82 + })
  83 + }
  84 +
  85 +
  86 + }).catch((err) => {
  87 +
69 }) 88 })
  89 +
  90 +
  91 +
  92 +
  93 +
  94 +
  95 +
70 }, 96 },
71 97
72 // 成为志愿者 98 // 成为志愿者
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 <image class="my_headimg" src='/imgs/card.png'></image> 2 <image class="my_headimg" src='/imgs/card.png'></image>
3 <view class='my_headitem' > 3 <view class='my_headitem' >
4 <view class="my_headitemtop"> 4 <view class="my_headitemtop">
5 - <view class='my_headitemimg' bindtap="getmy" data-id="{{datalist.id}}"> 5 + <view class='my_headitemimg' bindtap="getmy" >
6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image> 6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
7 </view> 7 </view>
8 <view class="my_headitemname"> 8 <view class="my_headitemname">
9 <view class='word'>{{datalist.user_nickname}}</view> 9 <view class='word'>{{datalist.user_nickname}}</view>
10 - <view class="word1">{{datalist.status}}（待学习）<image src="/imgs/more_gray.png"></image> 10 + <view class="word1">{{datalist.status}}<image src="/imgs/more_gray.png"></image>
11 </view> 11 </view>
12 <view class='star_box'> 12 <view class='star_box'>
13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'> 13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
@@ -76,6 +76,7 @@ page { @@ -76,6 +76,7 @@ page {
76 .word1 image { 76 .word1 image {
77 width: 12rpx; 77 width: 12rpx;
78 height: 20rpx; 78 height: 20rpx;
  79 + margin-left: 9rpx;
79 } 80 }
80 81
81 .my_activebox { 82 .my_activebox {
@@ -4,19 +4,17 @@ Page({ @@ -4,19 +4,17 @@ Page({
4 4
5 data: { 5 data: {
6 list: '', 6 list: '',
7 - id:'' 7 +
8 }, 8 },
9 9
10 getlist(e) { 10 getlist(e) {
11 let that = this; 11 let that = this;
12 - let url = 'index/member_center/edit'; 12 + let url = 'index/member_center/index';
13 let head = { 13 let head = {
14 'XX-Token': wx.getStorageSync('token') 14 'XX-Token': wx.getStorageSync('token')
15 } 15 }
16 - let params = {  
17 - id: that.data.id  
18 - }  
19 - app.post(url, params, head).then((res) => { 16 +
  17 + app.post(url, '', head).then((res) => {
20 18
21 console.log(res) 19 console.log(res)
22 that.setData({ 20 that.setData({
@@ -41,10 +39,10 @@ Page({ @@ -41,10 +39,10 @@ Page({
41 * 生命周期函数--监听页面加载 39 * 生命周期函数--监听页面加载
42 */ 40 */
43 onLoad: function (options) { 41 onLoad: function (options) {
44 - console.log(options)  
45 - this.setData({  
46 - id: options.id  
47 - }) 42 + // console.log(options)
  43 + // this.setData({
  44 + // id: options.id
  45 + // })
48 }, 46 },
49 47
50 /** 48 /**
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class='apply_item'> 2 <view class='apply_item'>
3 <view>头像</view> 3 <view>头像</view>
4 <view class='apply_item_list'> 4 <view class='apply_item_list'>
5 - <image src="{{list.photo}}"></image> 5 + <image src="{{list.avatar}}"></image>
6 </view> 6 </view>
7 </view> 7 </view>
8 <view class="line"> 8 <view class="line">
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class='apply_item'> 12 <view class='apply_item'>
13 <view>姓名</view> 13 <view>姓名</view>
14 <view class='apply_item_list'> 14 <view class='apply_item_list'>
15 - {{list.name}} 15 + {{list.user_nickname}}
16 </view> 16 </view>
17 </view> 17 </view>
18 <view class="line"> 18 <view class="line">
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <view class='apply_item'> 48 <view class='apply_item'>
49 <view>地区</view> 49 <view>地区</view>
50 <view class='apply_item_list'> 50 <view class='apply_item_list'>
51 - {{list.addr}} 51 + {{list.area}}
52 </view> 52 </view>
53 </view> 53 </view>
54 54
@@ -45,7 +45,7 @@ Page({ @@ -45,7 +45,7 @@ Page({
45 console.log(e) 45 console.log(e)
46 var id = e.currentTarget.dataset.id 46 var id = e.currentTarget.dataset.id
47 wx.navigateTo({ 47 wx.navigateTo({
48 - url: '/pages/Volunteer_detail/Volunteer_detail?id='+id, 48 + url: '/pages/Volunteer_detail/Volunteer_detail?id=' + id,
49 }) 49 })
50 50
51 }, 51 },
1 -<!--pages/mytrain/mytrain.wxml-->  
2 <view class="mytrain"> 1 <view class="mytrain">
3 <image src="/imgs/mytrain.png"></image> 2 <image src="/imgs/mytrain.png"></image>
4 <view class='my_headitem'> 3 <view class='my_headitem'>
@@ -8,9 +7,8 @@ @@ -8,9 +7,8 @@
8 </view> 7 </view>
9 <view class="my_headitemname"> 8 <view class="my_headitemname">
10 <view class='word'>{{datalist.user_nickname}}</view> 9 <view class='word'>{{datalist.user_nickname}}</view>
11 - <view class="word1">志愿者（待学习）<image src="/imgs/more_gray.png"></image> 10 + <view class="word1">{{datalist.status}}<image src="/imgs/more_gray.png"></image>
12 </view> 11 </view>
13 - <!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->  
14 <view class='star_box'> 12 <view class='star_box'>
15 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'> 13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
16 </image> 14 </image>
@@ -25,7 +23,7 @@ @@ -25,7 +23,7 @@
25 </view> 23 </view>
26 </view> 24 </view>
27 <view class="mystudytime"> 25 <view class="mystudytime">
28 - <view class="time"> 50小时</view> 26 + <view class="time">{{datalist.work_time}}小时</view>
29 <view class="mytime"> 27 <view class="mytime">
30 <image src="/imgs/clock.png"></image> 28 <image src="/imgs/clock.png"></image>
31 我的学时 29 我的学时
@@ -74,6 +74,7 @@ page { @@ -74,6 +74,7 @@ page {
74 } 74 }
75 75
76 .mystudytime { 76 .mystudytime {
  77 + text-align: center;
77 margin-left: 86rpx; 78 margin-left: 86rpx;
78 79
79 } 80 }