Commit be2effe7 authored by 罗超's avatar 罗超

调整

parent e87edc18
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
export default { export default {
props: ["stuCourseList"], props: ["stuCourseList"],
emits:['change'], emits:['change','changePopStatus'],
setup(props, context) { setup(props, context) {
let data = reactive({ let data = reactive({
statusBarHeight: 24, statusBarHeight: 24,
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
let methods = { let methods = {
exchangeItemHandler() { exchangeItemHandler() {
data.showItems = true data.showItems = true
context.emit('changePopStatus',1)
}, },
//点击切换课程 //点击切换课程
hideExchangeBoxHandler(item) { hideExchangeBoxHandler(item) {
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
context.emit('change',item.courseId) context.emit('change',item.courseId)
} }
data.showItems = false data.showItems = false
context.emit('changePopStatus',0)
// setTimeout(()=>{ // setTimeout(()=>{
// uni.reLaunch({ // uni.reLaunch({
// url: '/pages/index/workSituation?tabNme=' + '作业情况' +'&courseId=' + item.courseId // url: '/pages/index/workSituation?tabNme=' + '作业情况' +'&courseId=' + item.courseId
...@@ -154,12 +155,14 @@ ...@@ -154,12 +155,14 @@
left: 350rpx; left: 350rpx;
top: -11rpx; top: -11rpx;
width: 340rpx; width: 340rpx;
height: 294rpx;
} }
.course-card .end { .course-card .end {
width: 550rpx; width: 550rpx;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
height: 20rpx;
} }
.course-card .course-item .course-name { .course-card .course-item .course-name {
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
import {getTeacherCourse} from '../../../api/index' import {getTeacherCourse} from '../../../api/index'
export default { export default {
props: {}, props: {},
emits:['change'], emits:['change','changePopStatus'],
setup(props,ctx) { setup(props,ctx) {
const Keywords=ref('') const Keywords=ref('')
let data = reactive({ let data = reactive({
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
}, },
exchangeItemHandler(){ exchangeItemHandler(){
data.showItems=true data.showItems=true
ctx.emit('changePopStatus',1)
}, },
hideExchangeBoxHandler(item){ hideExchangeBoxHandler(item){
if(item){ if(item){
...@@ -168,6 +169,7 @@ ...@@ -168,6 +169,7 @@
ctx.emit('change',item.courseId) ctx.emit('change',item.courseId)
} }
data.showItems=false data.showItems=false
ctx.emit('changePopStatus',0)
}, },
queryTecherCourse(){ queryTecherCourse(){
getTeacherCourse().then(r=>{ getTeacherCourse().then(r=>{
...@@ -258,12 +260,14 @@ ...@@ -258,12 +260,14 @@
left: 350rpx; left: 350rpx;
top: -11rpx; top: -11rpx;
width: 340rpx; width: 340rpx;
height: 294rpx;
} }
.course-card .end { .course-card .end {
width: 550rpx; width: 550rpx;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
height: 20rpx;
} }
.course-card .course-item .course-name { .course-card .course-item .course-name {
......
...@@ -58,17 +58,18 @@ ...@@ -58,17 +58,18 @@
<input v-model="uploadParm.ExamName" class="examList-popup-name" placeholder="请输入考试名称"/> <input v-model="uploadParm.ExamName" class="examList-popup-name" placeholder="请输入考试名称"/>
<van-uploader <van-uploader
class="examList-popup-fil-box flex" class="examList-popup-fil-box flex"
accept=".excel" accept="file"
preview-size="120rpx" preview-size="120rpx"
:before-read="beforeRead" :before-read="beforeRead"
@after-read="customUpload" @after-read="customUpload"
:disabled="loading"
> >
<view class="examList-popup-fil"> <!-- <view class="examList-popup-fil">
<van-image class="img" width="32rpx" height="32rpx" fit="cover" <van-image class="img" width="32rpx" height="32rpx" fit="cover"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653639041000_305.png" /> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653639041000_305.png" />
选择文件 选择文件
</view> </view> -->
<van-button round color='#C91727' custom-style='width: 548rpx;' block>选择文件</van-button>
</van-uploader> </van-uploader>
</view> </view>
</view> </view>
...@@ -235,7 +236,7 @@ ...@@ -235,7 +236,7 @@
} }
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api' host = 'https://jjswapi.oytour.com/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<button class="hotsopt" :style="{width:width,height:height}" open-type="getUserInfo" @tap="getUserProfile()" <button class="hotsopt" :style="{width:width,height:height}" open-type="getUserInfo" @tap="getUserProfile()"
@click="getCode"></button> @click="getCode"></button>
</view> </view>
<van-popup :show="showPhone"> <van-popup :show="showPhone" @click-overlay="closeOverlayHandler">
<view <view
style="width: 70vw;background: #FFF;display: flex;flex-direction: column;align-items: center;padding-bottom: 20px;border-radius: 8px;"> style="width: 70vw;background: #FFF;display: flex;flex-direction: column;align-items: center;padding-bottom: 20px;border-radius: 8px;">
<view <view
...@@ -75,6 +75,9 @@ ...@@ -75,6 +75,9 @@
showLogin: true, //多次点击 showLogin: true, //多次点击
}); });
let methods = { let methods = {
closeOverlayHandler(){
data.showPhone=false
},
getUserProfile() { getUserProfile() {
//新的获取用户资料 //新的获取用户资料
var that = this; var that = this;
......
<template> <template>
<page-meta :page-style="showPopu?'overflow:hidden;':''">
<view class="indexpage"> <view class="indexpage">
<navbar class="navbarSticky" bg="#F6F6F6"> <navbar class="navbarSticky" bg="#F6F6F6">
<view class="index-header-box"> <view class="index-header-box">
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<view style="font-size: 50rpx;">您的学情反馈已准备好</view> <view style="font-size: 50rpx;">您的学情反馈已准备好</view>
</view> </view>
</view> </view>
<course-card :stuCourseList="stuCourseList" @change="changeCourseHandler"></course-card> <course-card :stuCourseList="stuCourseList" @changePopStatus='changePopStatusHandler' @change="changeCourseHandler"></course-card>
<view class="index-student-title flex"> <view class="index-student-title flex">
<text>学情反馈</text> <text>学情反馈</text>
<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view> <view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
</view> </view>
</view> </view>
</view> </view>
</page-meta>
</template> </template>
<script> <script>
...@@ -88,10 +90,14 @@ ...@@ -88,10 +90,14 @@
workMsg: { workMsg: {
courseId: 0, courseId: 0,
}, },
showPopu:false,
workList: [],//学员作业、考试、评语数据 workList: [],//学员作业、考试、评语数据
}); });
let methods = { let methods = {
changePopStatusHandler(status){
data.showPopu=status==1
},
jumpPage(url) { jumpPage(url) {
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
......
<template> <template>
<page-meta :page-style="showPopu?'overflow:hidden;':''">
<view class="workSituationpage"> <view class="workSituationpage">
<navbar class="navbarSticky" bg="#F6F6F6"> <navbar class="navbarSticky" bg="#F6F6F6">
<view class="index-header-box" @click="back"> <view class="index-header-box" @click="back">
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
</view> </view>
</view> </view>
</view> </view>
<courseCard @change="changeCourseHandler"></courseCard> <courseCard @changePopStatus='changePopStatusHandler' @change="changeCourseHandler"></courseCard>
<view class="index-student-information"> <view class="index-student-information">
<view class="workSituation-title-box flex"> <view class="workSituation-title-box flex">
<view class="workSituation-title" <view class="workSituation-title"
...@@ -53,6 +54,7 @@ ...@@ -53,6 +54,7 @@
<!-- <Loadmore :state="pageState" /> --> <!-- <Loadmore :state="pageState" /> -->
</view> </view>
</view> </view>
</page-meta>
</template> </template>
<script> <script>
...@@ -120,10 +122,14 @@ ...@@ -120,10 +122,14 @@
pageState: "more", pageState: "more",
currentCourseId:0, currentCourseId:0,
userData:{}, userData:{},
loading:false loading:false,
showPopu:false
}); });
data.userData=uni.getStorageSync("userInfo") data.userData=uni.getStorageSync("userInfo")
let methods = { let methods = {
changePopStatusHandler(status){
data.showPopu=status==1
},
goSet(){ goSet(){
let url='/pages/setComments/setComments?CourseId='+data.currentCourseId; let url='/pages/setComments/setComments?CourseId='+data.currentCourseId;
console.log("url",url); console.log("url",url);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</navbar> </navbar>
<view style="margin: 40rpx 0 10rpx 0;"> <view style="margin: 40rpx 0 10rpx 0;">
<view style="padding:0 50rpx;font-weight: 800;color: #282828;"> <view style="padding:0 50rpx;font-weight: 800;color: #282828;">
<view style="font-size: 36rpx;">{{stuName}}学情反馈</view> <view style="font-size: 36rpx;">{{stuName}}</view>
</view> </view>
</view> </view>
<view class="index-student-title flex"> <view class="index-student-title flex">
......
//请求教育接口 //请求教育接口
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api' host = 'https://jjswapi.oytour.com/api'
// host = 'http://192.168.10.65:8085/api' // host = 'http://192.168.10.65:8085/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
......
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