Commit 7caa1d8c authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

parents 4aca0cfa d47b364c
......@@ -16,7 +16,7 @@
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 3" />
<van-icon name="star" v-for="(s,index) in 3" :key="index"/>
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
......@@ -28,7 +28,7 @@
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 1" />
<van-icon name="star" v-for="(s,index) in 1" :key="index"/>
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
......@@ -40,7 +40,7 @@
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 1" />
<van-icon name="star" v-for="(s,index) in 1" :key="index"/>
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
......
<template>
<view class="jobDetailsComponents-box">
<view class="jobDetailsComponents activeTwo flex">
<view class="jobDetailsComponents-time-box flex">
<view class="jobDetailsComponents-time flex">
<view></view>
<text>潇潇</text>
</view>
<view class="jobDetailsComponents-line">
<view class="jobDetailsComponents-point"></view>
</view>
</view>
<view class="jobDetailsComponents-center-box">
<view class="jobDetailsComponents-center flex">
<view class="jobDetailsComponents-left flex">
<view class="operation-state flex">
<view class="operation-state-img"></view>
<view class="operation-state-text">未批阅</view>
</view>
<view class="operation-name">2022-05-22</view>
</view>
<view class="jobDetailsComponents-right flex">
<view class="homework-score flex">
<view class="homework-score-title">
得分 <text>86</text>
</view>
</view>
<view class="homework-score flex">
<view class="homework-score-title">
得分率 <text>86</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="jobDetailsComponents activeOne flex">
<view class="jobDetailsComponents-time-box flex">
<view class="jobDetailsComponents-time flex">
<view></view>
<text>潇潇</text>
</view>
<view class="jobDetailsComponents-line">
<view class="jobDetailsComponents-point"></view>
</view>
</view>
<view class="jobDetailsComponents-center-box">
<view class="jobDetailsComponents-center flex">
<view class="jobDetailsComponents-left flex">
<view class="operation-state flex">
<view class="operation-state-img"></view>
<view class="operation-state-text">批阅</view>
</view>
<view class="operation-name">2022-05-22</view>
</view>
<view class="jobDetailsComponents-right flex">
<view class="homework-score flex">
<view class="homework-score-title">
得分 <text>86</text>
</view>
</view>
<view class="homework-score flex">
<view class="homework-score-title">
得分率 <text>86</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {
reactive,
toRefs,
onMounted,
getCurrentInstance,
inject
} from "vue";
export default {
props: {
},
components: {},
setup() {
let data = reactive({
obj: {
Name: '',
Photo: '',
},
showPhone: false,
showLogin: true, //多次点击
});
let methods = {
}
return {
...toRefs(data),
...methods
};
},
};
</script>
<style scoped>
.homework-score-title text{
font-size: 46rpx;
font-weight: 800;
font-style: italic;
padding: 0 10rpx 0 17rpx;
}
.homework-score-title{
color: #282828;
font-size: 20rpx;
font-weight: 400;
letter-spacing: 1px;
}
.homework-score:first-child{
margin-right: 16rpx;
}
.homework-score{
align-items: center;
justify-content: space-between;
}
.jobDetailsComponents-right{
height: 88rpx;
background: #FCEEEF;
padding: 0 22rpx;
border-radius: 25rpx;
justify-content: space-between;
flex-shrink: 0;
}
.operation-state-text{
font-size: 20rpx;
letter-spacing: 2px;
}
.jobDetailsComponents.activeThree .operation-state-img{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_480.png')no-repeat;
background-size: 22rpx 22rpx;
}
.jobDetailsComponents.activeTwo .operation-state-img{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_781.png')no-repeat;
background-size: 22rpx 22rpx;
}
.jobDetailsComponents.activeOne .operation-state-img{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_44.png')no-repeat;
background-size: 22rpx 22rpx;
}
.operation-state-img{
width: 22rpx;
height: 22rpx;
margin-right: 9rpx;
margin-top: 4rpx;
}
.operation-state{
font-size: 20rpx;
white-space: nowrap;
color: #282828;
}
.operation-name{
font-size: 16rpx;
letter-spacing: 1px;
font-weight: 500;
color: #C2BCBA;
}
.jobDetailsComponents-left{
justify-content: space-between;
align-items: center;
margin-bottom: 17rpx;
}
.jobDetailsComponents-center{
flex-direction: column;
}
.jobDetailsComponents-center-box{
flex-grow: 1;
border-radius: 30rpx;
padding: 17rpx 26rpx 23rpx 21rpx;
margin-bottom: 40rpx;
background: #FFFFFF;
box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
border-radius: 20px;
}
.jobDetailsComponents.activeThree .jobDetailsComponents-point{
background: #C1C1C1;
}
.jobDetailsComponents.activeTwo .jobDetailsComponents-point{
background: #282828;
}
.jobDetailsComponents.activeOne .jobDetailsComponents-point{
background: #C81727;
box-shadow: 0px 0px 12px 0px rgba(200, 23, 39, 0.46);
}
.jobDetailsComponents .jobDetailsComponents-point{
width: 19rpx;
height: 19rpx;
position: absolute;
top: 20rpx;
left: -13rpx;
border-radius: 50%;
border: 3px solid #FFFFFF;
box-shadow: 0px 0px 12px 0px rgba(255, 255, 255, 0.46);
}
.jobDetailsComponents-line{
width: 4rpx;
height: 100%;
background: #F1F1F1;
margin-left: 46rpx;
margin-right: 46rpx;
position: relative;
}
.jobDetailsComponents-time text{
font-size: 20rpx;
font-weight: bold;
white-space: nowrap;
margin-top: 18rpx;
margin-left: 4rpx;
}
.jobDetailsComponents-time{
color: #282828;
font-size: 36rpx;
font-weight: bold;
letter-spacing: 1rpx;
}
.jobDetailsComponents-time-box{
}
.jobDetailsComponents{
justify-content: space-between;
padding: 0 50rpx;
}
</style>
......@@ -70,7 +70,7 @@
let methods = {
JobDetails(){
uni.reLaunch({
url: '/pages/index/workSituation'
url: '/pages/index/jobDetails'
});
}
}
......
......@@ -14,6 +14,12 @@
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/index/jobDetails",
"style": {
"navigationStyle": "custom"
}
},{
"path": "pages/index/workSituation",
"style": {
......
<template>
<view class="jobDetails-box">
<navbar class="navbarSticky" bg="#F6F6F6">
<view class="jobDetails-header-box">
<van-icon class="jobDetails-header-left" name="arrow-left" @click="back"/>
<text class="jobDetails-header-title">作业情况</text>
</view>
</navbar>
<view class="jobDetails-content">
<view class="jobDetails-content-header">
<view class="jobDetails-conten-title flex">
<text>成都2022科学益智L4 -05乐思会</text>
<view>高一作业11</view>
</view>
<view class="jobDetails-num-box flex">
<view class="jobDetails-num flex">
<text>学生数</text>
<view>15</view>
</view>
<view class="jobDetails-num flex">
<text>已提交</text>
<view>12</view>
</view>
<view class="jobDetails-num flex">
<text>已批阅</text>
<view>10</view>
</view>
<view class="jobDetails-num flex">
<text>优秀</text>
<view>5</view>
</view>
</view>
</view>
<view class="index-student-information">
<jobDetailsComponents></jobDetailsComponents>
</view>
</view>
</view>
</template>
<script>
import jobDetailsComponents from '@/components/index/scoreDetails/jobDetailsComponents'
import {
reactive,
toRefs,
onMounted,
getCurrentInstance,
inject
} from "vue";
export default {
props: {
},
components: {
jobDetailsComponents
},
setup() {
let data = reactive({
obj: {
Name: '',
Photo: '',
},
showPhone: false,
showLogin: true, //多次点击
});
let methods = {
back(){
uni.reLaunch({
url: '/pages/index/workSituation'
});
}
}
return {
...toRefs(data),
...methods
};
}
};
</script>
<style scoped>
.index-student-information{
min-height: 800rpx;
background: #FFFFFF;
border-radius: 50rpx 50rpx 0 0;
padding: 71rpx 0 30rpx 0;
}
.jobDetails-num view{
font-size: 36rpx;
font-weight: 800;
font-style: italic;
margin-top: 15rpx;
}
.jobDetails-num text{
font-size: 20rpx;
font-weight: 400;
}
.jobDetails-num{
flex-direction: column;
color: #CE8086;
}
.jobDetails-num-box{
justify-content: space-between;
padding: 70rpx 100rpx 35rpx 100rpx;
}
.jobDetails-conten-title view{
font-size: 50rpx;
font-weight: 800;
}
.jobDetails-conten-title text{
font-size: 36rpx;
font-weight: 400;
margin-bottom: 10rpx;
}
.jobDetails-conten-title{
padding: 50rpx 50rpx 0 50rpx;
flex-direction: column;
color: #282828;
letter-spacing: 1rpx;
}
.jobDetails-content-header{
}
.jobDetails-content{
position: relative;
z-index: 2;
}
.jobDetails-box{
background: #FCEEEF;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 0;
}
.jobDetails-header-title{
position: absolute;
left: 0;
right: 0;
top: 0;
padding: 37rpx 31rpx;
text-align: center;
letter-spacing: 1rpx;
font-size: 32rpx;
font-weight: 500;
color: #282828;
}
.jobDetails-header{
margin: 50rpx 50rpx 0 50rpx;
align-items: center;
}
.jobDetails-header-left{
font-size: 40rpx;
position: relative;
z-index: 3;
}
.jobDetails-header-box{
padding: 37rpx 31rpx;
position: relative;
}
.navbarSticky {
display: sticky;
top: 0;
z-index: 9;
}
</style>
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