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 @@ ...@@ -83,6 +83,7 @@
.appoint{ .appoint{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x:hidden;
} }
.appoint-card{ .appoint-card{
......
tjty-app/pages_my/my/my.vue
View file @ 8c8ce8f6
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
width: 100%; width: 100%;
height: 299px; height: 299px;
position: relative; position: relative;
overflow-x:hidden;
.avatar { .avatar {
......
tjty-app/pages_my/myActicity/myActivity.vue
View file @ 8c8ce8f6
...@@ -3,155 +3,167 @@ ...@@ -3,155 +3,167 @@
<view v-if="myActivitylist.length == 0"> <view v-if="myActivitylist.length == 0">
<view class="none"> <view class="none">
<view class="none-ima"> <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; <view style="font-size: 16px;
width: 600rpx; width: 600rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400; font-weight: 400;
margin: 40rpx 0 0 160rpx; margin: 40rpx 0 0 160rpx;
color: #666666;">很抱歉，您还没有报名参赛</view> color: #666666;">很抱歉，您还没有报名参赛</view>
<view style="font-size: 16px; <view style="font-size: 16px;
width: 500rpx; width: 500rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400; font-weight: 400;
margin: 40rpx 0 0 200rpx; margin: 40rpx 0 0 200rpx;
color: #666666;">快来看看<text style="color: #3b7cde;">赛事活动</text>吧!</view> color: #666666;">快来看看<text style="color: #3b7cde;">赛事活动</text>吧!</view>
</view> </view>
</view> </view>
</view> </view>
<view v-else class="actions-card" v-for="(item,index) in myActivitylist" :key="index"> <view v-else class="actions-card" v-for="(item,index) in myActivitylist" :key="index">
<view class="info" > <view class="info">
<view class="question"><text>{{item.activityName}}</text></view> <view class="question">
<text>{{item.activityName}}</text>
<dividerface></dividerface> <view class="item1">
<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view></view> <image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png"
<view class="item" style="display: flex">报名时间:<view class="time">{{item.activityTime}}</view></view> v-if="item.activityStatus==='0'"></image>
<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">{{item.activityTime}}</view></view> <image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
<view class="item1" > v-else-if="item.activityStatus==='1'"></image>
<view > <image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else>
<image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png" </image>
v-if="item.activityStatus==='0'"></image> </view>
<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png" </view>
v-else-if="item.activityStatus==='1'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else></image> <dividerface></dividerface>
<!-- <button style="width: 111px; <view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view>
height: 30px; </view>
background: #3b7cde; <view class="item" style="display: flex">报名时间:<view class="time">
border-radius: 15px; {{item.taseCreateTime||item.tasCreateTime}}
line-height: 25px; </view>
display: block; </view>
float: right;" @click="goActivity(item.type,wechatId,item.activityId)"> <view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">
<text style="font-size: 14px;color: #ffffff;font-family: Source Han Sans CN, Source Han Sans CN-Regular;">报名详情</text> {{item.tasName||item.taseName}}
</button> --> </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>
<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>
</view> </view>
</view>
</template> </template>
<script> <script>
import { import {
mapState mapState
} from 'vuex' } from 'vuex'
import {getMyActivitySignupByWechatId} from "@/api/myActivity.js"; import {
import { userInfo } from 'os'; getMyActivitySignupByWechatId
} from "@/api/myActivity.js";
import {
userInfo
} from 'os';
export default { export default {
data(){ data() {
return{ return {
wechatId:null, wechatId: null,
status:1, status: 1,
myActivitylist:[], myActivitylist: [],
total:0, total: 0,
} }
}, },
computed: { computed: {
...mapState('m_user', ['userInfo']), ...mapState('m_user', ['userInfo']),
}, },
onLoad() { onLoad() {
this.wechatId=this.userInfo.wechatId this.wechatId = this.userInfo.wechatId
this.getList(this.wechatId) this.getList(this.wechatId)
}, },
methods:{ methods: {
getList(wechatId) { getList(wechatId) {
getMyActivitySignupByWechatId(wechatId).then(response => { getMyActivitySignupByWechatId(wechatId).then(response => {
console.log(response) console.log(response)
this.myActivitylist = [...this.myActivitylist,...response.rows]||[] this.myActivitylist = [...this.myActivitylist, ...response.rows] || []
console.log(this.myActivitylist) console.log(this.myActivitylist)
this.total = response.total ||[]; this.total = response.total || [];
console.log(this.total) console.log(this.total)
}); });
}, },
goActivity(type,wechatId,activityId){ goActivity(type, wechatId, activityId) {
if(type==='1'){ if (type === '1') {
console.log('sdsdsds',activityId) console.log('sdsdsds', activityId)
uni.navigateTo({ 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 { } else {
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}`
}) })
} }
},
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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.actions{ .actions {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f5f5f5; background: #f5f5f5;
} }
.actions-card{
margin:3% 2% 0 2% ; .actions-card {
width: 96%; margin: 3% 2% 0 2%;
min-height: 440rpx; width: 96%;
height: auto; min-height: 440rpx;
background: #ffffff; height: auto;
border-radius: 16px; background: #ffffff;
box-shadow: 0px 3px 10px 0px #dddddd; border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd;
.image-status {
// justify-content: end;
position: absolute;
padding-left: 75%;
top: 10px; // :nth-child(1) {
width: 120rpx;
height: 120rpx;
z-index: 9; // }
// margin-left: 128rpx;
} .info {
.info{
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 36px; line-height: 36px;
.item { .item {
padding: 3% 4%; padding: 3% 4%;
width: 400px; width: 400px;
...@@ -164,16 +176,28 @@ import { userInfo } from 'os'; ...@@ -164,16 +176,28 @@ import { userInfo } from 'os';
color: #333333; color: #333333;
line-height: 36px; line-height: 36px;
} }
.item1 { .item1 {
padding: 5% 5%; // padding: 5% 5%;
font-size: 35rpx; // font-size: 35rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; // font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 200; // font-weight: 200;
color: #333333; // color: #333333;
.image-status {
position: relative;
top: -60rpx;
left: 98%;
width: 120rpx;
height: 120rpx;
z-index: 9;
}
} }
} }
.question{
.question {
margin-top: 5%; margin-top: 5%;
margin: 2% 15% 0 5%; margin: 2% 15% 0 5%;
min-height: 72px; min-height: 72px;
...@@ -181,11 +205,12 @@ import { userInfo } from 'os'; ...@@ -181,11 +205,12 @@ import { userInfo } from 'os';
line-height: 30px; line-height: 30px;
font-size: 18px; font-size: 18px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
} }
} }
.time{
.time {
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
color: #666666; color: #666666;
...@@ -193,22 +218,20 @@ import { userInfo } from 'os'; ...@@ -193,22 +218,20 @@ import { userInfo } from 'os';
// line-height: 38px; // line-height: 38px;
} }
.none{
.none {
width: 90%; width: 90%;
margin:5% 5% 0 5%; margin: 5% 5% 0 5%;
height: 1300rpx; height: 1300rpx;
background: #ffffff; background: #ffffff;
border-radius: 16px; border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd; box-shadow: 0px 3px 10px 0px #dddddd;
.none-ima{
.none-ima {
width: 472rpx; width: 472rpx;
height: 334rpx; height: 334rpx;
} }
} }
</style>
</style>
\ No newline at end of file
tjty-app/utils/request.js
View file @ 8c8ce8f6
...@@ -3,11 +3,11 @@ import store from '@/store/store.js' ...@@ -3,11 +3,11 @@ import store from '@/store/store.js'
const url_all = { const url_all = {
// 'DEV': 'http://192.168.1.161:8080', // 开发 // '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://116.205.136.218:8088/api", //线上服务
// 'DEV': 'http://127.0.0.1:8080', // 开发 // 'DEV': 'http://localhost:8080', // 开发
// 'DEV': 'http://192.168.1.11:8080' 'DEV': 'http://192.168.0.97:8080'
// 'DEV': 'https://www.aiwanyundong.com/api/' // 'DEV': 'https://www.aiwanyundong.com/api/'
}; };
let BASEURL = url_all["DEV"]; 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