miniprogram / volunteer · 提交

转到一个项目

作者 王智
提交 603ce8fdbb1707117dc30d18295f63be1002686a 1 个父辈 c34ef1cc

bug

内嵌 并排对比
正在显示 8 个修改的文件 包含 140 行增加 和 48 行删除
... ... @@ -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);
... ...
... ... @@ -9,8 +9,8 @@
<radio value="{{second+','+index+','+idx}}" checked=''>{{second}}</radio>
<block wx:if="{{showAnswer}}">
{{answer[index]}}
<image src="/imgs/zhengque-5.png" wx:if="{{item.answer==idx}}"></image>
<image src="/imgs/cuowu-3.png" wx:if='{{item.choose==idx}}'></image>
<image src="/imgs/zhengque-5@2x.png" wx:if="{{item.answer==idx}}"></image>
<image src="/imgs/cuowu-3@2x.png" wx:if='{{item.choose==idx}}'></image>
</block>
</view>
... ... @@ -41,6 +41,3 @@
</view>
</view> -->
<view class="shengqin">
<button bindtap="getcomfirm">确认</button>
</view>
\ No newline at end of file
... ...
... ... @@ -87,7 +87,6 @@ radio .wx-radio-input.wx-radio-input-checked::before {
-webkit-transform: translate(-50%, -50%) scale(1);
}
/* */
.shengqin {
height: 122rpx;
... ...
... ... @@ -41,23 +41,76 @@ Page({
},
// 我的活动
getMyactive() {
wx.navigateTo({
url: '/pages/myactivity/myactivity',
})
let that = this;
let url = '/index/second/checkTranStatus';
let head = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, {}, head).then((res) => {
console.log(res)
if (res.code == 40000) {
wx.showModal({
title: '提示',
content: '请先成为志愿者'
})
} else {
wx.navigateTo({
url: '/pages/myactivity/myactivity',
})
}
}).catch((err) => {})
},
//我的团队
getMyteam() {
wx.navigateTo({
url: '/pages/myteam/myteam',
})
let that = this;
let url = '/index/second/checkTranStatus';
let head = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, {}, head).then((res) => {
console.log(res)
if (res.code == 40000) {
wx.showModal({
title: '提示',
content: '请先成为志愿者'
})
} else {
wx.navigateTo({
url: '/pages/myteam/myteam',
})
}
}).catch((err) => {})
},
// 我的培训
getMytrain() {
wx.navigateTo({
url: '/pages/mytrain/mytrain',
})
let that = this;
let url = '/index/second/checkTranStatus';
let head = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, {}, head).then((res) => {
console.log(res)
if (res.code == 40000) {
wx.showModal({
title: '提示',
content: '请先成为志愿者'
})
} else {
wx.navigateTo({
url: '/pages/mytrain/mytrain',
})
}
}).catch((err) => {})
},
// 志愿回馈
... ... @@ -86,13 +139,6 @@ Page({
}).catch((err) => {
})
},
// 成为志愿者
... ... @@ -105,9 +151,32 @@ Page({
},
// 电子证件
getCertificate() {
wx.navigateTo({
url: '/pages/mycertificate/mycertificate',
let that = this;
let url = '/index/second/checkTranStatus';
let head = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, {}, head).then((res) => {
console.log(res)
if (res.code == 40000) {
wx.showModal({
title: '提示',
content: '请先成为志愿者'
})
} else {
wx.navigateTo({
url: '/pages/mycertificate/mycertificate',
})
}
}).catch((err) => {
})
},
// 我的地址
... ...
<view class="myteamBox" wx:for="{{list}}" bindtap="getdetail" data-id="{{item.id}}" >
<view class="teamtop">
<image src="/imgs/ac14.png"></image>
... ...
... ... @@ -8,8 +8,9 @@ Page({
data: {
star_num: 3,
datalist: '',
list:''
},
getdatalist() {
let that = this;
let url = 'index/member_center/index';
... ... @@ -26,13 +27,30 @@ Page({
})
},
// 列表
getdatalists() {
let that = this;
let url = '/index/second/myTrain';
let head = {
'XX-Token': wx.getStorageSync('token')
}
app.post(url, {}, head).then((res) => {
console.log(res);
that.setData({
list: res
})
}).catch((err) => {
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let that = this;
this.getdatalist();
that.getdatalist();
that.getdatalists();
},
... ...
... ... @@ -10,20 +10,25 @@
<view class="word1">{{datalist.status}}<image src="/imgs/more_gray.png"></image>
</view>
<view class='star_box'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
wx:if='{{datalist.level>0}}'>
</image>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>1}}'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
wx:if='{{datalist.level>1}}'>
</image>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>2}}'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
wx:if='{{datalist.level>2}}'>
</image>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>3}}'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
wx:if='{{datalist.level>3}}'>
</image>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>4}}'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
wx:if='{{datalist.level>4}}'>
</image>
</view>
</view>
<view class="mystudytime">
<view class="time">{{datalist.work_time}}小时</view>
<view class="time">{{datalist.work_time}}</view>
<view class="mytime">
<image src="/imgs/clock.png"></image>
我的学时
... ... @@ -54,26 +59,22 @@
答题
</view>
<view class="myanswer">
<image src="/imgs/active1.png"></image>
<view class="myanswer" wx:for="{{list.data}}" wx:if="{{item.user_status==1}}">
<image src="{{item.pic}}"></image>
<view class="myanswer_right">
<view class="myanswer_name">
如何做一个志愿者,如何做一个负责人心的志愿者
{{item.title}}
</view>
<view class="myanswer_num">
<view>
10道题
{{item.num}}道题
</view>
<view class="myanswer_end">
完成答题
<image src="/imgs/more.png"></image>
</view>
</view>
</view>
</view>
... ...
... ... @@ -69,8 +69,9 @@ page {
}
.word1 image {
width: 12rpx;
width: 14rpx;
height: 20rpx;
margin-left: 9rpx;
}
.mystudytime {
... ... @@ -115,6 +116,7 @@ page {
.rule {
font-size: 28rpx;
color: #323233;
font-weight: 400;
}
.rule_box {
... ... @@ -126,7 +128,11 @@ page {
font-size: 32rpx;
}
.rule{
line-height:48rpx ;
}
.rule_line {
width: 6rpx;
height: 28rpx;
... ...