miniprogram / volunteer · 提交

转到一个项目

作者 王智
提交 497c2114b7162210e90f7f1a0eaa82b032848023 1 个父辈 50ed0a3a

bug

内嵌 并排对比
正在显示 11 个修改的文件 包含 204 行增加 和 108 行删除
... ... @@ -63,14 +63,14 @@ App({
} else if (res.data.code == '40000') {
// if (url == '/index/second/checkTranStatus') {
// wx.showModal({
// title: '提示',
// content: '请先申请成为志愿者',
// showCancel: false,
// })
if (url == '/index/second/checkTranStatus') {
wx.showModal({
title: '提示',
content: '请先申请成为志愿者',
showCancel: false,
})
// } else
} else
if (url == '/index/second/commitAnswer') {
resolve(res.data);
... ...
... ... @@ -234,11 +234,12 @@
<view class='apply_bottom' wx:if="{{!page_type}}">
为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
</view>
<view wx:if="{{status==1}}">
<form wx:if="{{!page_type}}" bindsubmit="submit" report-submit='true' class="apply_btn">
<view wx:if="{{status!==2}}">
<form wx:if="{{!page_type}}" bindsubmit="submit" report-submit='true' class="apply_btn">
<button class="a_btn" form-type="submit" style="">提交</button>
</form>
</view>
<view wx:if="{{status==2}}">
<form wx:if="{{!page_type}}" report-submit='true' class="apply_btn">
<button class="a_btn gray" form-type="submit" style="">提交</button>
... ...
... ... @@ -60,6 +60,12 @@ Page({
finaAnswer: this.data.finaAnswer,
list: this.data.list
})
console.log(this.data.list)
},
// 确认
... ... @@ -70,6 +76,9 @@ Page({
let head = {
'XX-Token': wx.getStorageSync('token')
}
let params = {
class_id: that.data.id,
}
... ... @@ -118,7 +127,7 @@ Page({
} else {
wx.showModal({
title: '提示',
content: '恭喜',
content: '恭喜您全部答对了',
showCancel: false,
success: function (res) {
... ... @@ -127,13 +136,6 @@ Page({
}
}
}).catch((err) => {
console.log(err)
})
... ...
... ... @@ -13,10 +13,8 @@
<image src="/imgs/cuowu-3@2x.png" wx:if='{{item.choose==idx}}'></image>
</block>
</view>
</view>
</radio-group>
</view>
</view>
<view class="shengqin">
... ...
... ... @@ -7,7 +7,8 @@ Page({
data: {
nav: 1,
navs: 1,
list:''
list:'',
datalist:''
},
onLoad: function (options) {
},
... ... @@ -18,7 +19,7 @@ Page({
let that = this;
that.getList();
},
// 列表
//活动列表
getList() {
let that = this;
... ... @@ -39,6 +40,29 @@ Page({
})
},
//完成列表
getListend() {
let that = this;
let url = '/index/second/commitList';
let head = {
'XX-Token': wx.getStorageSync('token')
}
let d = {
status:that.data.nav-1
}
console.log(d)
app.post(url, d, head).then((res) => {
console.log(res)
that.setData({
datalist: res
})
}).catch((err) => {
})
},
... ... @@ -50,6 +74,7 @@ Page({
nav
})
this.getList();
this.getListend()
},
// 导航
bindtype(e) {
... ...
... ... @@ -59,13 +59,13 @@
</view>
<!--待提交报告 -->
<view wx:elif="{{nav==2}}">
<view class="myactive_wrap" wx:for="{{list}}">
<view class="myactive_wrap" wx:for="{{datalist}}">
<view class="myactive_time">
<image src="/imgs/shijian-19.png"></image>{{item.date}}
<image src="/imgs/shijian-19.png"></image>{{item.start_time}}
{{ item.start_clock_time}}-{{item.end_clock_time}}
</view>
<view class="myactive_list">
<image src="{{item.activity.thumbnail}}"></image>
<image src="{{item.thumbnail}}"></image>
<view class="myactive_name">
<view>{{item.activity_name}}</view>
<view class="myactive_gps">
... ... @@ -79,14 +79,14 @@
<!-- 完成的活动 -->
<view wx:elif="{{nav==3}}">
<view class="myactive_wrap" wx:for="{{list}}">
<view class="myactive_wrap" wx:for="{{datalist}}">
<view class="myactive_time">
<image src="/imgs/shijian-19.png"></image>{{item.date}}
<image src="/imgs/shijian-19.png"></image>{{item.start_time}}
{{ item.start_clock_time}}-{{item.end_clock_time}}
</view>
<view class="myactive_list">
<image src="{{item.activity.thumbnail}}"></image>
<image src="{{item.thumbnail}}"></image>
<view class="myactive_name">
<view>{{item.activity_name}}</view>
<view class="myactive_gps">
... ...
... ... @@ -7,7 +7,7 @@
</view>
<view class="my_headitemname">
<view class='word'>{{datalist.user.name}}</view>
<view class="word1">{{datalist.user.status}}（待学习）<image src="/imgs/more_gray.png"></image>
<view class="word1 ">{{datalist.user.status}}<image src="/imgs/more_gray.png"></image>
</view>
<!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->
<view class='star_box'>
... ...
... ... @@ -40,7 +40,18 @@ Page({
},
// 提示
click: function (e) {
this.setData({
hiddenName: !this.data.hiddenName
})
},
getcomfirm() {
wx.navigateTo({
url: '/pages/apply/apply',
})
},
goindex() {
wx.switchTab({
... ...
<!-- <view wx:if='{{datalist==""}}'>
<view wx:if='{{datalist==""}}'>
<view class='resultimg'>
<image src='https://volunteer.cnpu.org/imgs/dengdaishenhe@2x.png'></image>
</view>
... ... @@ -6,101 +6,107 @@
<navigator class='start_btn' url='/pages/apply/apply' hover-class="none">成为志愿者</navigator>
</view>
<view wx:else>
<view wx:if='{{datalist.status=="3"}}'>
<view class='resultimg'>
<image src='https://volunteer.cnpu.org/imgs/kulian@2x.png'></image>
<view class="result_wrap" wx:if='{{datalist.status=="2"}}'>
<view class="result">
<view></view>
审核通过
</view>
<view class='result_txt'>审核未通过</view>
</view>
<view wx:elif='{{datalist.status=="2"}}'>
<view class='resultimg'>
<image src='https://volunteer.cnpu.org/imgs/tongguo@2x.png'></image>
<view class="result_list_wrap">
<view class="result_left" wx:if="{{list.code==2}}">
<view class="circle"></view>
<view class="circle_s"></view>
<view class="circle_line"></view>
</view>
<view class="result_left_red" wx:else>
<view class="circle_red"></view>
<view class="circle_s_red"></view>
<view class="circle_line_red"></view>
</view>
<view class="result_list ">
<view class="">待学习</view>
<view class="">请在“在线培训”页面完成大于5小时的在线学习</view>
</view>
</view>
<view class='result_txt'>审核已通过</view>
</view>
<view wx:else>
<view class='resultimg'>
<image src='https://volunteer.cnpu.org/imgs/dengdaishenhe@2x.png'></image>
<view class="result_list_wrap">
<view class="result_left" wx:if="">
<view class="circle"></view>
<view class="circle_s"></view>
<view class="circle_line"></view>
</view>
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
<view class="circle_line_red"></view>
</view>
<view class="result_list ">
<view class="">实习志愿者</view>
<view class="">请参与志愿者活动，获得10小时工时</view>
</view>
</view>
<view class='result_txt'>待审核</view>
</view>
<view class='start_btn' bindtap='goindex'>返回首页</view>
</view> -->
<view class="result_list_wrap">
<view class="result_left" wx:if="">
<view class="circle"></view>
<view class="circle_s"></view>
</view>
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
</view>
<view class="result_list ">
<view class="">正式志愿者</view>
<view class="">正式成为白求恩志愿者</view>
</view>
<view class="result_wrap" wx:if='{{datalist.status=="2"}}'>
<view class="result">
<view></view>
审核通过
</view>
<view class="result_list_wrap">
<view class="result_left" wx:if="{{list.code==2}}">
<view class="circle"></view>
<view class="circle_s"></view>
<view class="circle_line"></view>
</view>
<view class="result_left_red" wx:else>
<view class="circle_red"></view>
<view class="circle_s_red"></view>
<view class="circle_line_red"></view>
</view>
<view class="result_list ">
<view class="">{{list.remark}}</view>
<view class="">请在“在线培训”页面完成大于5小时的在线学习</view>
<!-- 提示 -->
<view class="tishi_wrap" hidden="{{hiddenName}}">
<view class="tishi">
<view>
<image src="/imgs/hi@2x.png"></image>
欢迎您加入白求恩志愿者队伍！
</view>
<image bindtap="click" style="width:20rpx;height:20rpx;" src="/imgs/tishiclear.png"></image>
</view>
<view class="tishi_text">接下来，您可以在小程序中在线培训学习，也可以 去了解来自全国各地的白求恩志愿者团队和公益活 动！</view>
</view>
</view>
<view class="result_list_wrap">
<view class="result_left" wx:if="">
<view class="circle"></view>
<view class="circle_s"></view>
<view class="circle_line"></view>
</view>
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
<view class="circle_line_red"></view>
</view>
<view class="result_list ">
<view class="">实习志愿者</view>
<view class="">请参与志愿者活动，获得10小时工时</view>
</view>
</view>
<view class="result_list_wrap">
<view class="result_left" wx:if="">
<view class="circle"></view>
<view class="circle_s"></view>
<view class="result_wrap" wx:elif='{{datalist.status=="3"}}'>
<view class="result">
<view></view>
审核未通过
</view>
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
<view class="result_list_wrap">
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
</view>
<view class="result_list ">
<view class="">审核未通过</view>
<view class="">按要求填写实际信息后重新提交审核</view>
</view>
</view>
<view class="result_list ">
<view class="">正式志愿者</view>
<view class="">正式成为白求恩志愿者</view>
</view>
<view wx:else>
<view class='resultimg'>
<image src='https://volunteer.cnpu.org/imgs/dengdaishenhe@2x.png'></image>
</view>
<view class='result_txt'>待审核</view>
<view class='start_btn' bindtap='goindex'>返回首页</view>
</view>
</view>
<view class="result_wrap" wx:if='{{datalist.status=="1"}}'>
<view class="result">
<view></view>
审核未通过
</view>
<view class="result_list_wrap">
<view class="result_left_red">
<view class="circle_red"></view>
<view class="circle_s_red"></view>
</view>
<view class="result_list ">
<view class="">审核未通过</view>
<view class="">按要求填写实际信息后重新提交审核</view>
</view>
</view>
<view class="shengqin" wx:if='{{datalist.status=="3"}}' >
<button bindtap="getcomfirm">重新提交志愿者申请</button>
</view>
\ No newline at end of file
... ...
... ... @@ -169,4 +169,57 @@ page {
color: #7d7e80;
line-height: 40rpx;
}
/* 提示 */
.tishi_wrap {
padding: 24rpx 36rpx;
margin: 0 32rpx;
margin-top: 40rpx;
margin-bottom: 154rpx;
border-radius: 8px;
background-color: #ffffff;
}
.tishi {
display: flex;
align-items: center;
justify-content: space-between;
color:#14ac20 ;
font-size: 30rpx;
}
.tishi image {
width: 28rpx;
height: 28rpx;
margin-right: 8rpx;
}
.tishi_text {
margin-top: 16rpx;
font-size: 28rpx;
color: #7D7E80;
}
/* */
.shengqin {
height: 122rpx;
background-color: #ffffff;
font-size: 32rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
display: flex;
align-items: center;
}
.shengqin button {
width: 622rpx;
height: 88rpx;
color: #ffffff;
border-radius: 22px;
background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
}
\ No newline at end of file
... ...