Skip to content

E
educationStu
Commit ed96ba59 authored by 罗超's avatar 罗超
Browse files
Options

1

parent e293ba30
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 290 deletions
src/api/activity.js
View file @ ed96ba59
import request from '../utils/request.js' import request from '../utils/request.js'
let JHdata = uni.getStorageSync("userInfo");
/** /**
* 获取活动类型列表 * 获取活动类型列表
* @param {JSON参数} data * @param {JSON参数} data
...@@ -8,7 +8,17 @@ export function getActivityTypeList(data) { ...@@ -8,7 +8,17 @@ export function getActivityTypeList(data) {
return request({ return request({
url: '/AppletEducation/GetActivityTypeList', url: '/AppletEducation/GetActivityTypeList',
method: 'post', method: 'post',
data data: {
msg: data,
MallBaseId: JHdata.JHMallBaseId,
UserId: JHdata.JHMallUserId,
TenantId: JHdata.JHTenantId,
StudentId: JHdata.Id,
OpenId: JHdata.JHMallUserOpenId,
SmallShopsId: 0,
MiniAppId: "wx38e054ee42b054f4",
token: JHdata.MallToken
}
}) })
} }
...@@ -20,6 +30,16 @@ export function getActivityList(data) { ...@@ -20,6 +30,16 @@ export function getActivityList(data) {
return request({ return request({
url: '/AppletEducation/GetActivityPageJXH', url: '/AppletEducation/GetActivityPageJXH',
method: 'post', method: 'post',
data data: {
msg: data,
MallBaseId: JHdata.JHMallBaseId,
UserId: JHdata.JHMallUserId,
TenantId: JHdata.JHTenantId,
StudentId: JHdata.Id,
OpenId: JHdata.JHMallUserOpenId,
SmallShopsId: 0,
MiniAppId: "wx38e054ee42b054f4",
token: JHdata.MallToken
}
}) })
} }
\ No newline at end of file
src/api/exam.js
View file @ ed96ba59
...@@ -8,7 +8,7 @@ export function getPaperList(data) { ...@@ -8,7 +8,7 @@ export function getPaperList(data) {
return request({ return request({
url: '/AppletIndex/GetGuestExaminationPublishPage', url: '/AppletIndex/GetGuestExaminationPublishPage',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -20,7 +20,7 @@ export function getPaperDetail(data) { ...@@ -20,7 +20,7 @@ export function getPaperDetail(data) {
return request({ return request({
url: '/appletindex/GetPaperDetails', url: '/appletindex/GetPaperDetails',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -32,6 +32,6 @@ export function submitPaper(data) { ...@@ -32,6 +32,6 @@ export function submitPaper(data) {
return request({ return request({
url: '/AppletIndex/StuSubmitExamPaper', url: '/AppletIndex/StuSubmitExamPaper',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
\ No newline at end of file
src/api/index.js
View file @ ed96ba59
...@@ -8,7 +8,7 @@ export function login(data) { ...@@ -8,7 +8,7 @@ export function login(data) {
return request({ return request({
url: '/AppletLogin/Login', url: '/AppletLogin/Login',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -20,7 +20,7 @@ export function getIndexInfo(data) { ...@@ -20,7 +20,7 @@ export function getIndexInfo(data) {
return request({ return request({
url: '/AppletIndex/GetIndexInfo', url: '/AppletIndex/GetIndexInfo',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -32,7 +32,7 @@ export function getStundentPlanStatistical(data) { ...@@ -32,7 +32,7 @@ export function getStundentPlanStatistical(data) {
return request({ return request({
url: '/AppletIndex/GetStundentPlanStatistical', url: '/AppletIndex/GetStundentPlanStatistical',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -44,7 +44,7 @@ export function getCourse(data) { ...@@ -44,7 +44,7 @@ export function getCourse(data) {
return request({ return request({
url: '/AppletIndex/GetChapterTree', url: '/AppletIndex/GetChapterTree',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -56,7 +56,7 @@ export function getContract(data) { ...@@ -56,7 +56,7 @@ export function getContract(data) {
return request({ return request({
url: '/AppletIndex/GetContractList', url: '/AppletIndex/GetContractList',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -68,7 +68,7 @@ export function getProgress(data) { ...@@ -68,7 +68,7 @@ export function getProgress(data) {
return request({ return request({
url: '/AppletIndex/GetStundentScheduleList', url: '/AppletIndex/GetStundentScheduleList',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -80,7 +80,7 @@ export function getStundentSurplus(data) { ...@@ -80,7 +80,7 @@ export function getStundentSurplus(data) {
return request({ return request({
url: '/AppletIndex/GetStundentSurplus', url: '/AppletIndex/GetStundentSurplus',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -92,7 +92,7 @@ export function setStudentLeave(data) { ...@@ -92,7 +92,7 @@ export function setStudentLeave(data) {
return request({ return request({
url: '/LeaveStudent/SetStudentLeave', url: '/LeaveStudent/SetStudentLeave',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
...@@ -104,7 +104,7 @@ export function getStudentLeaveList(data) { ...@@ -104,7 +104,7 @@ export function getStudentLeaveList(data) {
return request({ return request({
url: '/AppletIndex/GetEducationReceiptPage', url: '/AppletIndex/GetEducationReceiptPage',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
/** /**
...@@ -115,7 +115,7 @@ export function invalidReceiptInfo(data) { ...@@ -115,7 +115,7 @@ export function invalidReceiptInfo(data) {
return request({ return request({
url: '/AppletIndex/InvalidReceipt', url: '/AppletIndex/InvalidReceipt',
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
/** /**
...@@ -126,6 +126,6 @@ export function getEduReceiptInfo(data) { ...@@ -126,6 +126,6 @@ export function getEduReceiptInfo(data) {
return request({ return request({
url: "/AppletIndex/GetEduReceiptInfo", url: "/AppletIndex/GetEduReceiptInfo",
method: 'post', method: 'post',
data data: { msg: data }
}) })
} }
\ No newline at end of file
src/components/subject/SingleChoiceNumber.vue
View file @ ed96ba59
<template> <template>
<!-- 单选题 --> <!-- 单选题 -->
<view> <view>
<view class="item" style="padding: 0 20px"> <view class="item" style="padding: 0 20px">
<view class="name"> <view class="name">
<view> <view class="grow">
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color: #999999">（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text> <text style="color: #999999"
</view> >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
<view class="ExamIndex_Box"> >
<text class="Single_Before">{{ ExamIndex }}</text>/<text </view>
class="Exam_Total">{{ data.DetailsList.length }}</text> <view class="ExamIndex_Box">
</view> <text class="Single_Before">{{ ExamIndex }}</text
</view> >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
<swiper class="swiper-box" :style="{ </view>
</view>
<swiper
class="swiper-box"
:style="{
height: `calc(100vh - 300rpx - ${statusBarHeight}px)`, height: `calc(100vh - 300rpx - ${statusBarHeight}px)`,
}" :autoplay="autoplay" :current="current" @change="onchange" :skip-hidden-item-layout="true"> }"
<swiper-item v-if="sortIndex != 1"></swiper-item> :autoplay="autoplay"
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> :current="current"
<view class="item1"> @change="onchange"
<view class="flex"> :skip-hidden-item-layout="true"
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}） :disable-programmatic-animation="true"
</view> >
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" <swiper-item v-if="sortIndex != 1"></swiper-item>
class="flex item2 flex_start_center"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<template v-if="isOperate"> <view class="item1">
<view class="chooseNum" :class="{ myAnswer: item2.IsAnswer }" <view class="flex flex_start_center">
@click="change(item1, item2)">{{ item2.ShowName }} <view class="num" v-html="item1.Title"></view>
</view> </view>
<view class="chooseName" @click="change(item1, item2)" v-html="item2.Content"></view>
</template> <view
<template v-else> v-for="(item2, index2) in item1.QuestionContentObj"
<view class="chooseNum" :class="{ isTrueAnswer: item2.IsAnswer }">{{ item2.Name }} :key="index2"
</view> class="flex item2 flex_start_center"
<view class="chooseName" :class="{ isTrueAnswer: item2.IsAnswer }" >
v-html="item2.Content"> <template v-if="isOperate">
</view> <view
</template> class="chooseNum"
</view> :class="{ myAnswer: item2.IsAnswer }"
</view> @click="change(item1, item2)"
<view class="AnswerContent" v-if="!isOperate"> >{{ item2.ShowName }}
<view> </view>
<text style="color: #8c8a94">正确答案：</text> <view
<text class="isTrueAnswer">{{item1.Answer}}</text>， class="chooseName"
<text> @click="change(item1, item2)"
您的答案： v-html="item2.Content"
<template v-if="item1.StundetAnswer != ''"> ></view>
<text v-if="item1.Answer == item1.StundetAnswer" class="isTrueAnswer"> </template>
{{ item1.StundetAnswer }}，回答正确 <template v-else>
</text> <view
<text v-else class="isNotAnswer">{{ item1.StundetAnswer }}，回答错误</text> class="chooseNum"
</template> :class="{ isTrueAnswer: item2.IsAnswer }"
<template v-else> >{{ item2.Name }}
<text>未作答</text> </view>
</template> <view
</text> class="chooseName"
</view> :class="{ isTrueAnswer: item2.IsAnswer }"
<view style="margin:20rpx 0;"> v-html="item2.Content"
<text style="color:#8c8a94">您的得分：</text> >
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text> </view>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text> </template>
</view> </view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse"> </view>
<text style="color: #8c8a94">解析：</text> <view class="AnswerContent" v-if="!isOperate">
<text style="color: #000">{{ item1.AnswerParse }}</text> <view>
</view> <text style="color: #8c8a94">正确答案：</text>
</view> <text class="isTrueAnswer">{{ item1.Answer }}</text
</swiper-item> >，
<swiper-item v-if="sortIndex != sortTotal"> <text
<!-- 最后一页 --> >您的答案是：
</swiper-item> <template v-if="item1.StundetAnswer != ''">
</swiper> <text
</view> v-if="item1.Answer == item1.StundetAnswer"
<van-toast id="van-toast" /> class="isTrueAnswer"
</view> >
{{ item1.StundetAnswer }}，回答正确
</text>
<text v-else class="isNotAnswer"
>{{ item1.StundetAnswer }}，回答错误</text
>
</template>
<template v-else>
<text>未作答</text>
</template>
</text>
</view>
<view
style="margin-top: 20rpx; word-wrap: break-word"
v-if="item1.AnswerParse"
>
<text style="color: #8c8a94">解析：</text>
<text style="color: #000">{{ item1.AnswerParse }}</text>
</view>
</view>
</swiper-item>
<swiper-item v-if="sortIndex != sortTotal">
<!-- 最后一页 -->
</swiper-item>
</swiper>
</view>
<van-toast id="van-toast" />
</view>
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
toRef, toRef,
getCurrentInstance, getCurrentInstance,
watch, watch,
computed, computed,
onMounted, onMounted,
} from "vue"; } from "vue";
import { import { changeNumToHan } from "../../utils/index";
changeNumToHan export default {
} from "../../utils/index"; props: {
export default { paperData: Object,
props: { sort: Number,
paperData: Object, sortTotal: Number,
sort: Number, isLast: Boolean,
sortTotal: Number, startIndex: Number,
isLast: Boolean, isOperate: Boolean,
startIndex: Number, },
ExamStatus: Number, setup(props, context) {
isOperate: Boolean, let { ctx } = getCurrentInstance();
}, let data = reactive({
setup(props, context) { autoplay: false,
let { sortIndex: props.sort + 1, //大题序号
ctx sortTotal: props.sortTotal, //总共多少道大题
} = getCurrentInstance(); data: props.paperData,
let data = reactive({ current: 1, //默认从第几个开始-用于从快捷菜单点入
autoplay: false, ExamIndex: 1, //第几题
sortIndex: props.sort + 1, //大题序号 isOperate: props.isOperate,
sortTotal: props.sortTotal, //总共多少道大题 statusBarHeight: 0,
data: props.paperData, });
current: 1, //默认从第几个开始-用于从快捷菜单点入 //判断是否是第一大题
ExamIndex: 1, //第几题 if (data.sortIndex === 1) {
isOperate: props.isOperate, data.current = 0;
statusBarHeight: 0, //从答题卡进入
}); if (props.startIndex) {
//判断是否是第一大题 data.current = props.startIndex - 1;
if (data.sortIndex === 1) { data.ExamIndex = props.startIndex;
data.current = 0; }
//从答题卡进入 } else {
if (props.startIndex) { if (props.startIndex) {
data.current = props.startIndex - 1; data.current = props.startIndex;
data.ExamIndex = props.startIndex; data.ExamIndex = props.startIndex;
} }
} else { }
if (props.startIndex) {
data.current = props.startIndex; let methods = {
data.ExamIndex = props.startIndex; changeNumToHan,
} jumpPage() {
} uni.navigateTo({
url: "/pages/exam/examPaper",
});
},
back() {
uni.navigateBack();
},
//选题
change(item1, item2) {
context.emit("answerChange", data.data);
item1.QuestionContentObj.map((e) => {
if (e.Name == item2.Name) {
e.IsAnswer = true;
} else {
e.IsAnswer = false;
}
if (e.IsAnswer) {
//标记已回答
item1.IsRes = true;
}
});
},
onchange(e) {
data.ExamIndex = e.detail.current;
if (data.sortIndex == 1) {
data.ExamIndex = e.detail.current + 1;
}
let methods = { if (data.ExamIndex === data.data.DetailsList.length + 1) {
changeNumToHan, this.$emit("getAfterTopic");
jumpPage() { }
uni.navigateTo({ if (e.detail.current == 0 && data.sortIndex != 1) {
url: "/pages/exam/examPaper", this.$emit("getBeforeTopic");
}); }
}, },
back() { jumpAnswerSheet() {
uni.navigateBack(); uni.navigateTo({
}, url: "/pages/exam/answerSheet",
//选题 });
change(item1, item2) { },
context.emit("answerChange", data.data); };
item1.QuestionContentObj.map((e) => { onMounted(() => {
if (e.Name == item2.Name) { if (props.isLast) {
e.IsAnswer = true; if (data.sortIndex === 1) {
item1.IsRes = true; data.current = props.paperData.DetailsList.length - 1;
} else { } else {
e.IsAnswer = false; data.current = props.paperData.DetailsList.length;
} }
}); }
}, data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
onchange(e) { });
data.ExamIndex = e.detail.current; let that = methods;
if (data.ExamIndex === data.data.DetailsList.length + 1) { return {
console.log("单选", e.detail); ...toRefs(data),
this.$emit("getAfterTopic"); ...methods,
} };
if (e.detail.current == 0 && data.sortIndex != 1) { },
this.$emit("getBeforeTopic"); };
}
}
};
onMounted(() => {
if (props.isLast) {
if (data.sortIndex === 1) {
data.current = props.paperData.DetailsList.length - 1;
} else {
data.current = props.paperData.DetailsList.length;
}
}
data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
});
let that = methods;
return {
...toRefs(data),
...methods,
};
},
};
</script> </script>
<style scoped> <style scoped>
.name { .name {
height: 90rpx; height: 90rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.swiper-box { .isTrueAnswer {
box-sizing: border-box; color: green !important;
} }
.isTrueAnswer { .isNotAnswer {
color: green !important; color: red !important;
} }
.isNotAnswer { .AnswerContent {
color: red !important; font-size: 28rpx;
} padding: 25rpx;
background-color: #f4f4f4;
border-radius: 5px;
}
.AnswerContent { .Single_Before {
font-size: 28rpx; font-size: 28rpx;
padding: 25rpx; font-weight: bold;
background-color: #f4f4f4; color: #da7878;
border-radius: 5px; }
}
.Single_Before { .ExamIndex_Box {
font-size: 28rpx; margin-right: 20px;
font-weight: bold; }
color: #da7878;
}
.ExamIndex_Box { .Exam_Total {
margin-right: 20px; font-size: 25rpx;
} color: gray;
}
.Exam_Total { .answerSheet {
font-size: 25rpx; font-size: 30rpx;
color: gray; margin-left: 20rpx;
} color: #000;
}
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); box-sizing: border-box;
box-sizing: border-box; }
}
.num { .num {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
.item { .item {
/* margin-bottom: 40rpx; */ /* margin-bottom: 40rpx; */
position: relative; position: relative;
} }
.item1 { .item1 {
/* margin: 25rpx 0; */ /* margin: 25rpx 0; */
align-items: center; align-items: center;
} }
.item2 { .item2 {
padding-left: 25rpx; padding-left: 25rpx;
margin: 30rpx 0; margin: 30rpx 0;
} }
.myAnswer { .myAnswer {
background-color: #00acf9 !important; background-color: #00acf9 !important;
color: #ffffff !important; color: #ffffff !important;
} }
.chooseNum { .chooseNum {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
text-align: center; text-align: center;
line-height: 40rpx; line-height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
flex-shrink: 0; }
}
.chooseName { .chooseName {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
} }
</style> </style>
src/pages/activity/activityList.vue
View file @ ed96ba59
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</view> </view>
<view v-show="current == 2" style="height: calc(100vh - 50px)"> <view v-show="current == 2" style="height: calc(100vh - 50px)">
<signUp ref="children"></signUp> <SignUp ref="children"></SignUp>
</view> </view>
<auth <auth
...@@ -191,7 +191,13 @@ ...@@ -191,7 +191,13 @@
@changeuserinfo="reloadUserinfo" @changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth" @gbAuth="gbAuth"
></auth> ></auth>
<van-popup :show="show" closeable position="bottom" @close="show = false"> <van-popup
:show="show"
closeable
round
position="bottom"
@close="show = false"
>
<view class="pubox"> <view class="pubox">
<view class="pubox-top"> <view class="pubox-top">
<text>选择活动类型</text> <text>选择活动类型</text>
...@@ -236,13 +242,16 @@ import { ...@@ -236,13 +242,16 @@ import {
onMounted, onMounted,
} from "vue"; } from "vue";
import Loadmore from "../../components/loadmore.vue"; import Loadmore from "../../components/loadmore.vue";
import SignUp from "../../components/signUp.vue";
import { getActivityTypeList, getActivityList } from "../../api/activity"; import { getActivityTypeList, getActivityList } from "../../api/activity";
export default { export default {
components: { components: {
Loadmore, Loadmore,
SignUp,
}, },
setup() { setup() {
let JHdata = uni.getStorageSync("userInfo"); let i = getCurrentInstance();
console.log(252, i);
let data = reactive({ let data = reactive({
show: false, show: false,
pageState: "more", pageState: "more",
......
src/pages/progress/progress.vue
View file @ ed96ba59
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</view> </view>
<van-empty description="暂无数据" v-if="data.length === 0" /> <van-empty description="暂无数据" v-if="data.length === 0" />
<view v-for="(item, index) in data" :key="index" v-if="data.length > 0"> <view v-for="(item, index) in data" :key="index" v-if="data.length > 0">
<view class="chapter" @click="openLayer"> <view class="chapter">
<view class="flex flex_between_center"> <view class="flex flex_between_center">
<view class="flex flex_between_center"> <view class="flex flex_between_center">
<view class="dot"></view> <view class="dot"></view>
...@@ -65,7 +65,6 @@ import { getIndexInfo } from "../../api/index"; ...@@ -65,7 +65,6 @@ import { getIndexInfo } from "../../api/index";
export default { export default {
setup() { setup() {
let data = reactive({ let data = reactive({
showLayer: false,
msg: { msg: {
ClassId: 0, ClassId: 0,
}, },
...@@ -73,16 +72,9 @@ export default { ...@@ -73,16 +72,9 @@ export default {
CourseName: "", CourseName: "",
}); });
let methods = { let methods = {
openLayer() {
data.showLayer = true;
},
closeLayer() {
data.showLayer = false;
},
async getData() { async getData() {
let res = await getProgress(data.msg); let res = await getProgress(data.msg);
data.data = res.Data; data.data = res.Data;
console.log(113, data);
}, },
async getIndexdata() { async getIndexdata() {
let res = await getIndexInfo(); let res = await getIndexInfo();
......
src/utils/request.js
View file @ ed96ba59
let host = 'http://192.168.20.17:8017/api' let host = 'http://192.168.20.17:8017/api'
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.20.17:8017/api' // host = 'http://192.168.20.17:8017/api'
// host = 'http://192.168.20.24:8300/api' host = 'http://192.168.20.24:8300/api'
} else { } else {
host = 'https://eduapi.oytour.com/api' host = 'https://eduapi.oytour.com/api'
} }
...@@ -18,8 +18,7 @@ let request = (param) => { ...@@ -18,8 +18,7 @@ let request = (param) => {
'token': token || "" 'token': token || ""
}, },
data: { data: {
msg: param.data, ...param.data,
// ...param.data.activityMsg
}, },
success: res => { success: res => {
if (res.data.Code === 1) { if (res.data.Code === 1) {
......
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