Skip to content

tjty-app
tjty-app
Commit 8c8ce8f6 authored by 刘鑫鹏's avatar 刘鑫鹏
Browse files
Options

修改了一些bug

parent 45048482
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 121 deletions
tjty-app/pages_activity/activity_signInExam/acvity_signInExam.vue 0 → 100644
View file @ 8c8ce8f6
<template>
<view>
<!-- 报名信息 -->
<view v-for="(item,index) in signInList ">
<view class="signIn-info">
<view class="signIn-body"><text>家长姓名:<text style="display: block;float: right;margin-right: 20rpx;">{{item.name}}</text></text></view>
<view class="signIn-body"><text>参赛人员:<text style="display: block;float: right;margin-right: 20rpx;">{{item.sex==='0'?'男':'女'}}</text></text></view>
<view class="signIn-body"><text>联系方式:<text style="display: block;float: right;margin-right: 20rpx;">{{item.phone}}</text></text></view>
<view class="signIn-body"><text>证件号码:<text style="display: block;float: right;margin-right: 20rpx;">{{item.idCard}}</text></text></view>
</view>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import {
getSinInInfo
} from "@/api/activity.js";
export default {
data() {
return {
activityId: null,
signInExamList: []
}
},
computed: {
...mapState('m_user', ['userInfo']),
...mapState('m_user', ['token'])
},
onLoad(options) {
},
methods:{
getInfo(wechatId,activityId) {
getSinInInfo(wechatId,activityId).then(response=>{
console.log(response)
this.signInExamList = response.data
})
}
}
}
</script>
<style lang="scss">
.signIn-info{
margin: 30rpx;
height: 660rpx;
width: 706rpx;
background: #ffffff;
border-radius: 16px;
box-shadow: 0rpx 6rpx 20rpx 0rpx #dddddd;
.signIn-body{
margin-left: 16rpx;
text-align: left;
line-height: 60rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
}
}
</style>
tjty-app/pages_course/tjty_course_appointment/appointment.vue
View file @ 8c8ce8f6
......@@ -83,6 +83,7 @@
.appoint{
width: 100%;
height: 100%;
overflow-x:hidden;
}
.appoint-card{
......
tjty-app/pages_my/my/my.vue
View file @ 8c8ce8f6
......@@ -206,6 +206,7 @@
width: 100%;
height: 299px;
position: relative;
overflow-x:hidden;
.avatar {
......
tjty-app/pages_my/myActicity/myActivity.vue
View file @ 8c8ce8f6
......@@ -3,155 +3,167 @@
<view v-if="myActivitylist.length == 0">
<view class="none">
<view class="none-ima">
<image style="width: 90%;height: 90%;margin: 288rpx 118rpx 0 118rpx;" src="../../static/content_pic_wushuju@3x.png"></image>
<image style="width: 90%;height: 90%;margin: 288rpx 118rpx 0 118rpx;"
src="../../static/content_pic_wushuju@3x.png"></image>
<view style="font-size: 16px;
width: 600rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400;
margin: 40rpx 0 0 160rpx;
color: #666666;">很抱歉，您还没有报名参赛</view>
<view style="font-size: 16px;
<view style="font-size: 16px;
width: 500rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400;
margin: 40rpx 0 0 200rpx;
color: #666666;">快来看看<text style="color: #3b7cde;">赛事活动</text>吧!</view>
</view>
</view>
</view>
<view v-else class="actions-card" v-for="(item,index) in myActivitylist" :key="index">
<view class="info" >
<view class="question"><text>{{item.activityName}}</text></view>
<dividerface></dividerface>
<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view></view>
<view class="item" style="display: flex">报名时间:<view class="time">{{item.activityTime}}</view></view>
<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">{{item.activityTime}}</view></view>
<view class="item1" >
<view >
<image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png"
v-if="item.activityStatus==='0'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
v-else-if="item.activityStatus==='1'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else></image>
<!-- <button style="width: 111px;
height: 30px;
background: #3b7cde;
border-radius: 15px;
line-height: 25px;
display: block;
float: right;" @click="goActivity(item.type,wechatId,item.activityId)">
<text style="font-size: 14px;color: #ffffff;font-family: Source Han Sans CN, Source Han Sans CN-Regular;">报名详情</text>
</button> -->
<view v-else class="actions-card" v-for="(item,index) in myActivitylist" :key="index">
<view class="info">
<view class="question">
<text>{{item.activityName}}</text>
<view class="item1">
<image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png"
v-if="item.activityStatus==='0'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
v-else-if="item.activityStatus==='1'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else>
</image>
</view>
</view>
<dividerface></dividerface>
<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view>
</view>
<view class="item" style="display: flex">报名时间:<view class="time">
{{item.taseCreateTime||item.tasCreateTime}}
</view>
</view>
<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">
{{item.tasName||item.taseName}}
</view>
</view>
<view style="display: flex;">
<button @click="goActivity(item.type,wechatId,item.activityId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
<button @click="goDetail(item.type,wechatId,item.activityId)"
style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
</view>
</view>
<view style="display: flex;">
<button style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
<button @click="goActivity(item.type,wechatId,item.activityId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
</view>
</view>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import {getMyActivitySignupByWechatId} from "@/api/myActivity.js";
import { userInfo } from 'os';
import {
getMyActivitySignupByWechatId
} from "@/api/myActivity.js";
import {
userInfo
} from 'os';
export default {
data(){
return{
wechatId:null,
status:1,
myActivitylist:[],
total:0,
data() {
return {
wechatId: null,
status: 1,
myActivitylist: [],
total: 0,
}
},
computed: {
...mapState('m_user', ['userInfo']),
},
onLoad() {
this.wechatId=this.userInfo.wechatId
this.wechatId = this.userInfo.wechatId
this.getList(this.wechatId)
},
methods:{
methods: {
getList(wechatId) {
getMyActivitySignupByWechatId(wechatId).then(response => {
console.log(response)
this.myActivitylist = [...this.myActivitylist,...response.rows]||[]
console.log(this.myActivitylist)
this.total = response.total ||[];
console.log(this.total)
});
getMyActivitySignupByWechatId(wechatId).then(response => {
console.log(response)
this.myActivitylist = [...this.myActivitylist, ...response.rows] || []
console.log(this.myActivitylist)
this.total = response.total || [];
console.log(this.total)
});
},
goActivity(type,wechatId,activityId){
if(type==='1'){
console.log('sdsdsds',activityId)
goActivity(type, wechatId, activityId) {
if (type === '1') {
console.log('sdsdsds', activityId)
uni.navigateTo({
url:'/pages_activity/activity_signInDetail/activity_signInDetail?wechat_id='+ wechatId +'&activity_id=' + activityId
url: '/pages_activity/activity_signInDetail/activity_signInDetail?wechat_id=' + wechatId +
'&activity_id=' + activityId
})
} else {
uni.navigateTo({
url:`/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
})
}
} else {
uni.navigateTo({
url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
})
}
},
goDetail(type, wechatId, activityId){
if(type==='2'){
uni.navigateTo({
url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
})
}
else{
uni.navigateTo({
url: `/pages_activity/activity_detail/activity_detail?activityId=${activityId}`
})
}
},
}
}
</script>
<style lang="scss" scoped>
.actions{
.actions {
width: 100%;
height: 100%;
background: #f5f5f5;
}
.actions-card{
margin:3% 2% 0 2% ;
width: 96%;
min-height: 440rpx;
height: auto;
background: #ffffff;
border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd;
.image-status {
// justify-content: end;
position: absolute;
padding-left: 75%;
top: 10px;
width: 120rpx;
height: 120rpx;
z-index: 9;
// margin-left: 128rpx;
}
.info{
.actions-card {
margin: 3% 2% 0 2%;
width: 96%;
min-height: 440rpx;
height: auto;
background: #ffffff;
border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd;
// :nth-child(1) {
// }
.info {
font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400;
color: #333333;
line-height: 36px;
.item {
padding: 3% 4%;
width: 400px;
......@@ -164,16 +176,28 @@ import { userInfo } from 'os';
color: #333333;
line-height: 36px;
}
.item1 {
padding: 5% 5%;
font-size: 35rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 200;
color: #333333;
// padding: 5% 5%;
// font-size: 35rpx;
// font-family: Source Han Sans CN, Source Han Sans CN-Regular;
// font-weight: 200;
// color: #333333;
.image-status {
position: relative;
top: -60rpx;
left: 98%;
width: 120rpx;
height: 120rpx;
z-index: 9;
}
}
}
.question{
.question {
margin-top: 5%;
margin: 2% 15% 0 5%;
min-height: 72px;
......@@ -181,11 +205,12 @@ import { userInfo } from 'os';
line-height: 30px;
font-size: 18px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
}
}
.time{
.time {
font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
color: #666666;
......@@ -193,22 +218,20 @@ import { userInfo } from 'os';
// line-height: 38px;
}
.none{
.none {
width: 90%;
margin:5% 5% 0 5%;
margin: 5% 5% 0 5%;
height: 1300rpx;
background: #ffffff;
border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd;
.none-ima{
box-shadow: 0px 3px 10px 0px #dddddd;
.none-ima {
width: 472rpx;
height: 334rpx;
}
}
</style>
\ No newline at end of file
</style>
tjty-app/utils/request.js
View file @ 8c8ce8f6
......@@ -3,11 +3,11 @@ import store from '@/store/store.js'
const url_all = {
// 'DEV': 'http://192.168.1.161:8080', // 开发
'DEV': 'http://192.168.0.99:8080',
// 'DEV': 'http://192.168.0.99:8080',
// DEV: "http://116.205.136.218:8088/api", //线上服务
// 'DEV': 'http://127.0.0.1:8080', // 开发
// 'DEV': 'http://192.168.1.11:8080'
// 'DEV': 'https://www.aiwanyundong.com/api/'
// 'DEV': 'http://localhost:8080', // 开发
'DEV': 'http://192.168.0.97:8080'
// 'DEV': 'https://www.aiwanyundong.com/api/'
};
let BASEURL = url_all["DEV"];
......
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