Skip to content

tjty-app
tjty-app
Commit 92e6eca3 authored by LiZongLin's avatar LiZongLin
Browse files
Options

Merge branch 'dev' of http://gitlab.91isoft.com:90/wyf/tjty-app into dev

parents e3509a05 f8dd7ca1
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 36 deletions
tjty-app/.gitignore
View file @ 92e6eca3
# 忽略 node_modules 目录
/node_modules
/unpackage/dist
/manifest.json
/.idea
/utils
tjty-app/pages_activity/activity/activity.vue
View file @ 92e6eca3
......@@ -92,7 +92,7 @@
created() {
// uni.setStorageSync("title", '赛事活动')
// this.getList()
this.getList()
// this.getList()
},
onShow() {
console.log('onShow')
......@@ -244,10 +244,10 @@
padding-top: 58%;
.activity_font {
font-size: 25rpx;
font-size: 30rpx;
padding-left: 3%;
text-align: left;
line-height: 40rpx;
line-height: 50rpx;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
}
......
tjty-app/pages_course/tjty_course_application/application.vue
View file @ 92e6eca3
......@@ -37,7 +37,7 @@
</view>
<view class="appoint-footer">
<button @click="submitForm">立即预约</button>
<button @click="submitForm" style="color: #FFFFFF;">立即预约</button>
</view>
<uni-popup ref="popup" background-color="#fff" :mask-click="false">
<view class="popup-content-text">
......
tjty-app/pages_my/my/my.vue
View file @ 92e6eca3
<template>
<view>
<view class="head_bg">
<view class="home">
<uni-icons type="back" size="26px" @click="gohome"></uni-icons>
</view>
<view>
<view class="avatar">
<image :src="userInfo.userPortrait"></image>
......@@ -159,6 +162,12 @@
this.getWXUserCode()
}
},
gohome(){
uni.navigateBack({
url:"/pages_home/tjty_home_page/tjty_home_page"
})
},
//退出登录
logout() {
// uni.clearStorageSync();
......@@ -205,9 +214,15 @@
width: 100%;
height: 299px;
position: relative;
overflow-x:hidden;
overflow-x: hidden;
.home{
position: absolute;
z-index: 2;
margin: 8% 0 0 3%;
}
.avatar {
position: absolute;
z-index: 2;
......
tjty-app/pages_my/myActicity/myActivity.vue
View file @ 92e6eca3
......@@ -25,17 +25,17 @@
<view class="info">
<view class="question" style="display: flex;width: 100%; justify-content: space-between;">
<view style="width: 80%;height: 100%;">
<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName}}</view>
<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName}}</view>
</view>
<view style="width: 20%;height: 100%;">
<!-- <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>
<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>
......@@ -56,8 +56,7 @@
</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 @tap="tapPopup" 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>
......@@ -65,6 +64,19 @@
</view>
</view>
<view class="popup" v-show="show">
<view class="popup-info">
<view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:------</view>
<view style="margin-bottom: 20px; margin-left:15px;">家长姓名&nbsp;:------</view>
<view style="margin-bottom: 20px; margin-left:15px;">联系手机&nbsp;:------</view>
<view style="margin-bottom: 20px; margin-left:15px;">孩子姓名&nbsp;:------</view>
<view style="margin-bottom: 20px;">孩子证件号&nbsp;:------</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>
</template>
......@@ -86,6 +98,8 @@
export default {
data() {
return {
show:false,
wechatId: null,
status: 1,
myActivitylist: [],
......@@ -100,8 +114,19 @@
this.wechatId = this.userInfo.wechatId
this.getList(this.wechatId)
// this.getlista(this.wechatId,this.activityId)
},
methods: {
tapPopup() {
this.show = true;
},
// 点击弹窗取消
cancel() {
this.show = false;
},
getList(wechatId) {
getMyActivitySignupByWechatId(wechatId).then(response => {
console.log(response)
......@@ -111,6 +136,15 @@
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) {
if (type === '1') {
console.log('sdsdsds', activityId)
......@@ -126,15 +160,19 @@
})
}
},
goDetail(type, wechatId, activityId) {
if (type === '2') {
getSinInInfo(wechatId, activityId).then(response => {
console.log("jkbnj", response)
this.signInList = response.data
goDetail(type, wechatId, activityId){
if(type==='2'){
// uni.navigateTo({
// 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({
url: `/pages_activity/activity_detail/activity_detail?activityId=${activityId}`
})
......@@ -151,6 +189,8 @@
width: 100%;
height: 100%;
background: #f5f5f5;
position: relative;
overflow-x: hidden;
}
.actions-card {
......@@ -163,14 +203,23 @@
box-shadow: 0px 3px 10px 0px #dddddd;
.image-status {
// position: relative;
// // top: -120rpx;
// left: 82%;
width: 143rpx;
height: 132rpx;
z-index: 4;
}
.image-status {
// position: relative;
// // top: -120rpx;
// left: 82%;
width: 143rpx;
height: 132rpx;
z-index: 4;
}
// :nth-child(1) {
// }
.info {
font-size: 16px;
......@@ -179,7 +228,6 @@
color: #333333;
line-height: 36px;
.question {
// margin-top: 5%;
// margin: 2% 18% 0 5%;
......@@ -238,6 +286,31 @@
// line-height: 38px;
}
//蒙层
.popup {
position: fixed;
left: 0;
right: 0;
top: 0;
height: 100vh;
background-color: rgba(0,0,0,0.6);
z-index: 9998;
}
//弹窗
.popup-info{
position: fixed;
width: 550upx;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
font-size: 30upx;
padding: 40upx;
border-radius: 20upx;
background-color: #fff;
z-index: 9999;
}
.none {
width: 90%;
......
tjty-app/pages_my/my_course/myCourse.vue
View file @ 92e6eca3
......@@ -108,7 +108,8 @@ import { userInfo } from 'os'
width: 100%;
height: 100%;
background: #f5f5f5;
position: relative;
overflow-x: hidden;
}
.mycourse-card{
margin: 22rpx;
......
tjty-app/pages_my/my_faceback/my_faceback.vue
View file @ 92e6eca3
......@@ -14,16 +14,17 @@
</view>
<view v-else class="face_card" v-for="(item,index) in Facelist" :key="index">
<view class="info" >
<view class="item">咨询时间:{{item.createTime}}</view>
<view class="item">姓名:{{item.nickName}}</view>
<view class="item">手机:{{item.phone}}</view>
<view class="item">{{item.createTime}}</view>
<view class="item">姓名&nbsp;:&nbsp;{{item.nickName}}</view>
<view class="item">手机&nbsp;:&nbsp;{{item.phone}}</view>
<!-- <view class="item">咨询问题&nbsp;:&nbsp;</view> -->
</view>
<view class="question"></view>
<view class="question">{{item.consultContent}}</view>
<dividerface></dividerface>
<view class="info">
<view class="item">答复:</view>
</view>
<view class="question">{{item.dispose}}</view>
<view class="question">{{item.replyContent}}</view>
</view>
</view>
......@@ -107,6 +108,7 @@
margin-top: 5%;
margin: 4%;
height: auto;
line-height: 25px;
font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
color: #666666;
......
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