Skip to content

T
thinkApp
Commit 83c99a26 authored by zhengke's avatar zhengke
Browse files
Options

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

parents 2acfd29f ef9d42a2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 750 additions and 823 deletions
src/components/index/JobComponents.vue
View file @ 83c99a26
This diff is collapsed.
src/components/index/commentsComponents.vue
View file @ 83c99a26
<template>
<view class="CommentsComponents-box">
<view class="CommentsComponents activeOne flex">
<view class="CommentsComponents-time-box flex">
<view class="CommentsComponents-time">
<view>05/25 17:13</view>
</view>
<view class="CommentsComponents-line">
<view class="CommentsComponents-point"></view>
</view>
</view>
<view class="CommentsComponents-center-box">
<view class="CommentsComponents-center-line"></view>
<view class="CommentsComponents-center flex">
<view class="CommentsComponents-left flex">
<van-image width="38rpx" height="38rpx" fit="cover" class="operation-img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png"/>
<view class="operation-name">周老师的评语</view>
</view>
<view class="CommentsComponents-right">
你是个做事小心翼翼，感情细腻丰富的女孩
，每次看你认真的样子老师都很感动。你也是幸运的，周
边有很多人都在关爱着你，所以，对他们，尤其是父母，记得不要
太莽撞，不要太任性，要学着体谅，学着换位思考
，学着懂事。另外，今后要多运动、多锻炼，有健康才能成就美好未来！
</view>
</view>
</view>
</view>
<view class="CommentsComponents-time-box flex">
<view class="CommentsComponents-time">
<view>{{jobData.CreateTime}}</view>
</view>
<view class="CommentsComponents-line">
<view class="CommentsComponents-point"></view>
</view>
</view>
<view class="CommentsComponents-center-box">
<view class="CommentsComponents-center-line"></view>
<view class="CommentsComponents-center flex">
<view class="CommentsComponents-left flex">
<van-image width="38rpx" height="38rpx" fit="cover" class="operation-img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
<view class="operation-name">{{jobData.Title}}</view>
</view>
<view class="CommentsComponents-right">
{{jobData.DataObj.Comment}}
</view>
</view>
</view>
</view>
</view>
</template>
<script>
......@@ -40,12 +34,9 @@
} from "vue";
export default {
props: {
},
props: ["jobData"],
components: {},
setup() {
let data = reactive({
obj: {
Name: '',
......@@ -61,95 +52,111 @@
};
</script>
<style scoped>
.CommentsComponents-right{
color: #FFFFFF;
font-size: 20rpx;
line-height: 35rpx;
letter-spacing: 1rpx;
}
.CommentsComponents.activeThree .operation-name{
color: #282828;
}
.CommentsComponents.activeTwo .operation-name{
color: #282828;
}
.CommentsComponents.activeOne .operation-name{
color: #FFFFFF;
}
.operation-name{
font-size: 26rpx;
letter-spacing: 1px;
font-weight: 500;
flex-grow: 1;
}
.operation-img{
margin-right: 12rpx;
border-radius: 50%;
flex-shrink: 0;
}
.CommentsComponents-left{
flex: 1;
flex-grow: 1;
margin-top: -5rpx;
margin-bottom: 10rpx;
}
.CommentsComponents-center{
flex-direction: column;
}
.CommentsComponents-center-line{
width: 4rpx;
height: 23rpx;
background: #FEFEFE;
position: absolute;
left: 0;
top: 33rpx;
}
.CommentsComponents.activeOne .CommentsComponents-center-box{
background: #52C1CA;
}
.CommentsComponents-center-box{
flex-grow: 1;
position: relative;
border-radius: 30rpx;
padding: 31rpx 18rpx 21rpx 24rpx;
margin-bottom: 50rpx;
}
.CommentsComponents.activeOne .CommentsComponents-point{
background: #1E7BF5;
box-shadow: 0px 0px 12px 0px rgba(30, 123, 245, 0.46);
}
.CommentsComponents-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);
}
.CommentsComponents-line{
width: 4rpx;
height: 100%;
background: #F1F1F1;
margin-left: 46rpx;
margin-right: 46rpx;
position: relative;
}
.CommentsComponents-time{
width: 61rpx;
height: 55rpx;
color: #CCC8C6;
font-size: 20rpx;
border-radius: 20rpx;
padding: 14rpx 13rpx;
background: #F6F6F6;
}
.CommentsComponents{
justify-content: space-between;
padding: 0 50rpx;
}
.CommentsComponents-box{
background: #FFFFFF;
}
.CommentsComponents-right {
color: #FFFFFF;
font-size: 20rpx;
line-height: 35rpx;
letter-spacing: 1rpx;
}
.CommentsComponents.activeThree .operation-name {
color: #282828;
}
.CommentsComponents.activeTwo .operation-name {
color: #282828;
}
.CommentsComponents.activeOne .operation-name {
color: #FFFFFF;
}
.operation-name {
font-size: 26rpx;
letter-spacing: 1px;
font-weight: 500;
flex-grow: 1;
}
.operation-img {
margin-right: 12rpx;
border-radius: 50%;
flex-shrink: 0;
}
.CommentsComponents-left {
flex: 1;
flex-grow: 1;
margin-top: -5rpx;
margin-bottom: 10rpx;
}
.CommentsComponents-center {
flex-direction: column;
}
.CommentsComponents-center-line {
width: 4rpx;
height: 23rpx;
background: #FEFEFE;
position: absolute;
left: 0;
top: 33rpx;
}
.CommentsComponents.activeOne .CommentsComponents-center-box {
background: #52C1CA;
}
.CommentsComponents-center-box {
flex-grow: 1;
position: relative;
border-radius: 30rpx;
padding: 31rpx 18rpx 21rpx 24rpx;
margin-bottom: 50rpx;
}
.CommentsComponents.activeOne .CommentsComponents-point {
background: #1E7BF5;
box-shadow: 0px 0px 12px 0px rgba(30, 123, 245, 0.46);
}
.CommentsComponents-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);
}
.CommentsComponents-line {
width: 4rpx;
height: 100%;
background: #F1F1F1;
margin-left: 46rpx;
margin-right: 46rpx;
position: relative;
}
.CommentsComponents-time {
width: 61rpx;
height: 55rpx;
color: #CCC8C6;
font-size: 20rpx;
border-radius: 20rpx;
padding: 14rpx 13rpx;
background: #F6F6F6;
}
.CommentsComponents {
justify-content: space-between;
padding: 0 50rpx;
}
.CommentsComponents-box {
background: #FFFFFF;
}
</style>
src/components/index/course-card.vue
View file @ 83c99a26
This diff is collapsed.
src/components/index/examComponents.vue
View file @ 83c99a26
This diff is collapsed.
src/pages/index/index.vue
View file @ 83c99a26
......@@ -3,32 +3,34 @@
<navbar class="navbarSticky" bg="#F6F6F6">
<view class="index-header-box">
<view class="index-header-img">
<van-image width="100%" height="100%" fit="cover" class="img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
<van-image width="100%" height="100%" fit="cover" class="img" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
</view>
<view class="index-header-tetx">
<view class="index-header-title">
welcome {{userData}}
welcome
</view>
<view class="index-header-name">周一围</view>
<view class="index-header-name">{{userData.AccountName}}</view>
</view>
</view>
</navbar>
<view style="margin: 40rpx 0 10rpx 0;">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;">
<view style="font-size: 36rpx;">Hello,</view>
<view style="font-size: 36rpx;">Hello,{{userData.AccountName}}</view>
<view style="font-size: 50rpx;">您的学情反馈已准备好</view>
</view>
</view>
<course-card></course-card>
<course-card :stuCourseList="stuCourseList"></course-card>
<view class="index-student-title flex">
<text>考情详情</text>
<view>(共53条)</view>
<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
</view>
<view class="index-student-information">
<JobComponents></JobComponents>
<examComponents></examComponents>
<commentsComponents></commentsComponents>
<template v-for="(item,index) in workList">
<JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents>
<examComponents v-if="item.ResultType==2" :jobData="item"></examComponents>
<commentsComponents v-if="item.ResultType==3" :jobData="item"></commentsComponents>
</template>
</view>
</view>
</template>
......@@ -51,9 +53,9 @@
nextTick,
} from "vue";
import {
getSweepCode
} from '../../api/index.js'
import {
getSweepCode
} from '../../api/index.js'
import {
getImageColor
} from '../../utils/index.js'
......@@ -61,11 +63,6 @@
import navbar from '../../components/navbar.vue'
import bottom from '../../components/bottom.vue'
export default {
// data(){
// return{
// }
// }
components: {
indexassembly,
navbar,
......@@ -80,25 +77,16 @@
proxy
} = getCurrentInstance();
let data = reactive({
ActiveMsg: {
pageIndex: 1,
pageSize: 10,
ActivityType: 0,
SelectIsEnd: 0,
},
ActivityList: [],
pageData: {
LearningGardenList: []
},
SurveyObj:{
ActivitySurveyId:0,
ActivitySurveyGuestId:0,
stuCourseList: [], //学员课程列表
userData: {}, //用户信息
//学员作业和考试查询参数
workMsg: {
courseId: 0,
},
userData: {}
workList: [],//学员作业、考试、评语数据
});
let methods = {
jumpPage(url) {
uni.navigateTo({
url: url,
......@@ -109,10 +97,7 @@
url: '/pages/timetable/timeTable',
})
},
//跳转至详情
goActiveDetail(Id) {
// this.jumpPage(`/pages/activity/activityDetails?Id=${Id}`);
},
base64_decode(data) {
var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
var o1,
......@@ -149,91 +134,26 @@
}
} while (i < data.length);
dec = tmp_arr.join("");
//dec = utf8_decode(dec);
return dec;
},
//{"cmd":"checkin","params":{"classId":0,"ClassDate":"2022-4-19","ClassRoomId":27,
//"School_Id":0,"TeacherId":8,"CheckStatus":0,"StudyNum":"90","ClassTimeId":16531}}
scan() {
//调起条码扫描
console.log("进来了")
let that = this
uni.scanCode({
scanType: ['qrCode'],
success: function(res) {
// 解码
var saveObj={};
try {
saveObj = that.base64_decode(res.result)
// console.log(saveObj)
} catch (e) {
//TODO handle the exception
// console.log(e)
}
var jsonObj= JSON.parse(saveObj)
if(jsonObj.cmd =="checkin"){
var userData = uni.getStorageSync('userInfo');
console.log("userData",userData);
jsonObj.params.StuId=userData.AccountId;
var array=[];
array.push(jsonObj.params);
console.log("jsonObj.params",jsonObj.params)
let result = getSweepCode(array);
if (result) {
// console.log(result)
if (result.Code == 1) {
console.log('扫码成功')
uni.navigateTo({
url:'./success',
})
}else{
console.log('扫码失败')
uni.navigateTo({
url: './fail'
})
}
}
}
},
});
},
async getActivityData() {
// let res = await getActivityList(data.ActiveMsg);
// if (res.resultCode == 1) {
// data.ActivityList = res.data.pageData;
// }
},
getIndexData() {
//获取学员课程列表
getStuCourse() {
proxy.$request("/Stu/GetStuCourse", {}).then(res => {
data.pageData = res.Data
uni.setStorageSync("indexData", res.Data);
data.SurveyObj.ActivitySurveyId=res.Data.ActivitySurveyId;
data.SurveyObj.ActivitySurveyGuestId=res.Data.ActivitySurveyGuestId;
if (data.pageData.LearningGardenList.length > 0) {
data.pageData.LearningGardenList.forEach((x, y) => {
if (x.List.length > 0) {
x.List.forEach(async (item, index) => {
await this.getColor(item.Img, index, y).then(v => {
data.pageData.LearningGardenList[v.y]
.List[
v.index].bgcolor = v.formatres;
data.pageData.LearningGardenList[v.y]
.List[
v.index].bgcolor1 = v
.formatres1;
data.pageData.LearningGardenList[v.y]
.List[
v.index].bgcolor2 = v
.formatres2;
})
})
}
})
let tempArray = res.Data;
data.stuCourseList = tempArray;
if (tempArray && tempArray.length > 0) {
this.getStuHomeWorkAndExam(tempArray[0].courseId)
}
})
},
//获取学员作业、考试、评语
getStuHomeWorkAndExam(courseId) {
this.workMsg.courseId = courseId;
data.workList = [];
proxy.$request("/Stu/GetStuWork", this.workMsg).then(res => {
data.workList = res.Data;
})
},
async getColor(src, index, y) {
let res = await getImageColor('myCanvas', 'img' + index, src)
let obj = {}
......@@ -244,33 +164,6 @@
obj.y = y
return obj
},
againdata() {
data.userData = uni.getStorageSync('userInfo');
methods.getIndexData();
methods.getActivityData();
},
jumpGarden(id) {
if (id == 1) {
uni.navigateTo({
url: "/pages/learningGarden/learningGardenList"
})
} else if (id == 2) {
// uni.navigateTo({
// url:"/pages/learningGarden/learningGardenList"
// })
}
},
jumpJiahemini() {
let userinfo = uni.getStorageSync('userInfo');
wx.navigateToMiniProgram({
appId: 'wx38e054ee42b054f4',
path: '', //为空则打开首页
extraData: {
Id: userinfo.Id || 0
}
})
}
};
onMounted(() => {
......@@ -282,8 +175,7 @@
};
},
onShow() {
this.getActivityData();
this.getIndexData();
this.getStuCourse();
this.userData = uni.getStorageSync('userInfo');
},
onShareAppMessage() {
......@@ -304,35 +196,41 @@
</script>
<style scoped>
.index-student-title view{
.index-student-title view {
font-size: 25rpx;
color: #ABABAB;
margin-left: 20rpx;
padding: 13rpx 0 0 0;
}
.index-student-title text{
.index-student-title text {
font-size: 36rpx;
font-weight: 800;
color: #282828;
}
.index-student-title{
.index-student-title {
padding: 0 50rpx 45rpx;
}
.index-student-information{
.index-student-information {
min-height: 500rpx;
background: rgba(255,255,255,.7);
background: rgba(255, 255, 255, .7);
border-radius: 50rpx 50rpx 0 0;
padding: 71rpx 0 0 0;
}
.index-header-name{
.index-header-name {
font-size: 30rpx;
color: #474747;
}
.index-header-tetx{
.index-header-tetx {
color: #D0D0D0;
font-size: 24rpx;
}
.index-header-img .img{
.index-header-img .img {
display: block;
border: 2rpx solid rgba(164, 164, 164, 0.32);
border-radius: 50%;
......@@ -342,7 +240,8 @@
box-sizing: border-box;
margin: 4rpx;
}
.index-header-img{
.index-header-img {
width: 68rpx;
height: 68rpx;
border-radius: 50%;
......@@ -351,6 +250,7 @@
margin-right: 20rpx;
background: #FFFFFF;
}
.indexpage {
min-height: 100vh;
background-color: #f6f6f6;
......@@ -360,26 +260,29 @@
background-repeat: no-repeat;
background-size: 100% auto;
}
.index-header-box{
.index-header-box {
display: flex;
flex-direction: row;
align-items: center;
padding:0rpx 42rpx ;
padding: 0rpx 42rpx;
}
.index-header-box .index-header-title{
.index-header-box .index-header-title {
font-size: 24rpx;
font-weight: 400;
color: #B8B8B8;
}
.index-header-box .index-header-name{
.index-header-box .index-header-name {
font-size: 30rpx;
font-weight: 800;
color: #282828;
}
.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