Commit 81ad2859 authored by 刘鑫鹏's avatar 刘鑫鹏

完善页面

parent f8dd7ca1
...@@ -9,3 +9,23 @@ export function getMyActivitySignupByWechatId(wechatId) { ...@@ -9,3 +9,23 @@ export function getMyActivitySignupByWechatId(wechatId) {
method: 'get' method: 'get'
}) })
} }
export function getsignupexam(signupId) {
return request({
url: '/tjt-activity/signupexam/selectByActivitySignupId/' + signupId,
method: 'get'
})
}
export function getsignup(signupId) {
return request({
url: '/tjt-activity/signup/selectByActivitySignupId/' + signupId,
method: 'get'
})
}
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</view> </view>
<view style="display: flex;"> <view style="display: flex;">
<button @tap="tapPopup" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button> <button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
<button @click="goDetail(item.type,wechatId,item.activityId)" <button @click="goDetail(item.type,wechatId,item.activityId)"
style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button> style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
...@@ -64,19 +64,40 @@ ...@@ -64,19 +64,40 @@
</view> </view>
</view> </view>
<view class="popup" v-show="show"> <view class="popup" v-show="showexam" >
<view class="popup-info"> <view class="popup-info">
<view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:------</view> <view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:{{signupexamlist.school}}</view>
<view style="margin-bottom: 20px; margin-left:15px;">家长姓名&nbsp;:------</view> <view style="margin-bottom: 20px; margin-left:15px;">家长姓名&nbsp;:{{signupexamlist.parentName}}</view>
<view style="margin-bottom: 20px; margin-left:15px;">联系手机&nbsp;:------</view> <view style="margin-bottom: 20px; margin-left:15px;">联系手机&nbsp;:{{signupexamlist.phone}}</view>
<view style="margin-bottom: 20px; margin-left:15px;">孩子姓名&nbsp;:------</view> <view style="margin-bottom: 20px; margin-left:15px;">孩子姓名&nbsp;:{{signupexamlist.name}}</view>
<view style="margin-bottom: 20px;">孩子证件号&nbsp;:------</view> <view style="margin-bottom: 20px;">孩子证件号&nbsp;:{{signupexamlist.idCard}}</view>
<view > <view >
<view style="margin: 30% 30px 5% 20px;"><button style="width: 80px;height: 28px;line-height: 24px;" type="default" @tap="cancel"><text style="font-size: 15px;">关闭</text></button></view> <view style="margin: 30% 30px 5% 20px;"><button style="width: 80px;height: 28px;line-height: 24px;" type="default" @tap="cancel"><text style="font-size: 15px;">关闭</text></button></view>
</view> </view>
</view> </view>
</view> </view>
<view class="popup" v-show="show">else
<view class="popup-info">
<view style="margin-bottom: 20px; margin-left:30px;">姓名&nbsp;:&nbsp;{{signuplist.name}}</view>
<view style="margin-bottom: 20px; margin-left:30px;" v-if="signuplist.sex==0">性别&nbsp;:&nbsp;</view>
<view style="margin-bottom: 20px; margin-left:30px;" v-else="signuplist.sex==1">性别&nbsp;:&nbsp;</view>
<view style="margin-bottom: 20px; margin-left:30px;">手机&nbsp;:&nbsp;{{signuplist.phone}}</view>
<view style="margin-bottom: 20px;margin-left:15px;">证件号&nbsp;:&nbsp;{{signuplist.idCard}}</view>
<view style="margin-bottom: 20px;margin-left:30px;">项目&nbsp;:&nbsp;{{signuplist.projectName}}</view>
<view style="margin-bottom: 20px;margin-left:30px;">费用&nbsp;:&nbsp;{{signuplist.projectFee}}</view>
<view style="margin-bottom: 20px;"v-if="signuplist.projectFee==!0">缴费时间&nbsp;:&nbsp;{{signuplist.transactionTime}}</view>
<view >
<view style="margin: 30% 30px 5% 20px;"><button style="width: 80px;height: 28px;line-height: 24px;" type="default" @tap="cancel"><text style="font-size: 15px;">关闭</text></button></view>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -86,11 +107,10 @@ ...@@ -86,11 +107,10 @@
mapState mapState
} from 'vuex' } from 'vuex'
import { import {
getMyActivitySignupByWechatId getMyActivitySignupByWechatId,
getsignupexam,
getsignup,
} from "@/api/myActivity.js"; } from "@/api/myActivity.js";
import {
getSinInInfo
} from "@/api/activity.js";
import { import {
userInfo userInfo
...@@ -98,13 +118,16 @@ ...@@ -98,13 +118,16 @@
export default { export default {
data() { data() {
return { return {
showtime:false,
showexam:false,
show:false, show:false,
wechatId: null, wechatId: null,
status: 1, status: 1,
myActivitylist: [], myActivitylist: [],
total: 0, total: 0,
signInList: [] signInList: [],
signupexamlist:{},
signuplist:{}
} }
}, },
computed: { computed: {
...@@ -118,15 +141,36 @@ ...@@ -118,15 +141,36 @@
}, },
methods: { methods: {
tapPopup() { tapPopup(type,tasSignupId,taseSignupId) {
this.show = true;
if (type === '2'){
this.showexam = true;
getsignupexam(taseSignupId).then(response=>{
this.signupexamlist = response.data
console.log(this.signupexamlist)
})
}else{
this.show=true;
getsignup(tasSignupId).then(response=>{
this.signuplist = response.data
console.log(this.signuplist)
})
}
}, },
// 点击弹窗取消 // 点击弹窗取消
cancel() { cancel() {
this.show = false; this.show = false;
this.showexam=false;
}, },
getList(wechatId) { getList(wechatId) {
getMyActivitySignupByWechatId(wechatId).then(response => { getMyActivitySignupByWechatId(wechatId).then(response => {
console.log(response) console.log(response)
...@@ -136,14 +180,6 @@ ...@@ -136,14 +180,6 @@
console.log(this.total) console.log(this.total)
}); });
}, },
// getlista(wechatId,activityId){
// getSinInInfo(wechatId,activityId).then(response=>{
// console.log("jkbnj",response)
// this.signInList =[...this.signInList, ...response.rows] || []
// })
// },
goActivity(type, wechatId, activityId) { goActivity(type, wechatId, activityId) {
if (type === '1') { if (type === '1') {
...@@ -162,19 +198,13 @@ ...@@ -162,19 +198,13 @@
}, },
goDetail(type, wechatId, activityId){ goDetail(type, wechatId, activityId){
if(type==='2'){ if(type==='2'){
// uni.navigateTo({ uni.navigateTo({
// url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}` url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
// })
getSinInInfo(wechatId,activityId).then(response=>{
console.log("jkbnj",response)
this.signInList =response.data
}) })
} }
else{ else{
uni.navigateTo({ uni.navigateTo({
url: `/pages_activity/activity_detail/activity_detail?activityId=${activityId}` url: `/pages_activity/activity_detail/activity_detail?activity_id=${activityId}`
}) })
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment