mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/student-h5.git
synced 2025-12-06 09:26:46 +08:00
feat:修改版本号
This commit is contained in:
@@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi";
|
|||||||
import { getCookie } from "@/api/utils";
|
import { getCookie } from "@/api/utils";
|
||||||
|
|
||||||
import { USER_INFO } from "@/api/api";
|
import { USER_INFO } from "@/api/api";
|
||||||
console.log("版本2.1.2------------");
|
console.log("版本2.1.3------------");
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
|||||||
@@ -141,14 +141,7 @@
|
|||||||
<div class="box" style="width: 80px; right: 0px"></div>
|
<div class="box" style="width: 80px; right: 0px"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="teachermain">
|
<div class="teachermain">
|
||||||
<img
|
<img class="teacherAvatar" :src="teacherInfo?.avatar" />
|
||||||
class="teacherAvatar"
|
|
||||||
:src="
|
|
||||||
teacherInfo?.avatar?.includes('upload')
|
|
||||||
? teacherInfo?.avatar
|
|
||||||
: fielPath + teacherInfo?.avatar
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
||||||
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
||||||
<div class="teacherIntro">
|
<div class="teacherIntro">
|
||||||
@@ -468,7 +461,7 @@ function isSignClick() {
|
|||||||
data &&
|
data &&
|
||||||
data.value &&
|
data.value &&
|
||||||
data.value.planDto?.beginTime &&
|
data.value.planDto?.beginTime &&
|
||||||
data.value.planDto?.afterStart
|
data.value.planDto?.endTime
|
||||||
) {
|
) {
|
||||||
let newStartTime = changeTime(data.value.planDto?.beginTime);
|
let newStartTime = changeTime(data.value.planDto?.beginTime);
|
||||||
let newEndTime = data.value.planDto?.endTime.replaceAll("-", "/");
|
let newEndTime = data.value.planDto?.endTime.replaceAll("-", "/");
|
||||||
@@ -497,6 +490,7 @@ function isSignClick() {
|
|||||||
endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
|
endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
|
||||||
console.log("1111333");
|
console.log("1111333");
|
||||||
}
|
}
|
||||||
|
console.log("nowTime", nowTime, endTime);
|
||||||
if (nowTime < endTime && nowTime > beginTime) {
|
if (nowTime < endTime && nowTime > beginTime) {
|
||||||
state.isAllowSign = true;
|
state.isAllowSign = true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -50,14 +50,7 @@
|
|||||||
<div class="box" style="width: 80px; right: 0px"></div>
|
<div class="box" style="width: 80px; right: 0px"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="teachermain">
|
<div class="teachermain">
|
||||||
<img
|
<img class="teacherAvatar" :src="teacherInfo?.avatar" />
|
||||||
class="teacherAvatar"
|
|
||||||
:src="
|
|
||||||
teacherInfo?.avatar?.includes('upload')
|
|
||||||
? teacherInfo?.avatar
|
|
||||||
: fielPath + teacherInfo?.avatar
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
||||||
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
||||||
<div class="teacherIntro">
|
<div class="teacherIntro">
|
||||||
|
|||||||
@@ -55,14 +55,7 @@
|
|||||||
<div class="box" style="width: 80px; right: 0px"></div>
|
<div class="box" style="width: 80px; right: 0px"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="teachermain">
|
<div class="teachermain">
|
||||||
<img
|
<img class="teacherAvatar" :src="teacherInfo?.avatar" />
|
||||||
class="teacherAvatar"
|
|
||||||
:src="
|
|
||||||
teacherInfo?.avatar?.includes('upload')
|
|
||||||
? teacherInfo?.avatar
|
|
||||||
: fielPath + teacherInfo?.avatar
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
||||||
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
||||||
<div class="teacherIntro">
|
<div class="teacherIntro">
|
||||||
|
|||||||
@@ -82,14 +82,7 @@
|
|||||||
<div class="box" style="width: 80px; right: 0px"></div>
|
<div class="box" style="width: 80px; right: 0px"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="teachermain">
|
<div class="teachermain">
|
||||||
<img
|
<img class="teacherAvatar" :src="teacherInfo?.avatar" />
|
||||||
class="teacherAvatar"
|
|
||||||
:src="
|
|
||||||
teacherInfo?.avatar?.includes('upload')
|
|
||||||
? teacherInfo?.avatar
|
|
||||||
: fielPath + teacherInfo?.avatar
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
|
||||||
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
<div class="teacherName">{{ data.planDto?.teacher }}</div>
|
||||||
<div class="teacherIntro">
|
<div class="teacherIntro">
|
||||||
|
|||||||
@@ -156,7 +156,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- <div class="notice">
|
||||||
|
<div class="noticebox">
|
||||||
|
<div class="mani">
|
||||||
|
<div class="joininfo">教师</div>
|
||||||
|
<img class="avaimg" :src="teacherInfo?.avatar" />
|
||||||
|
<div class="avaname">{{ data.userInfoBo?.userName }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div> -->
|
||||||
<div class="notice">
|
<div class="notice">
|
||||||
<div class="noticebox">
|
<div class="noticebox">
|
||||||
<div class="mani">
|
<div class="mani">
|
||||||
@@ -290,6 +298,7 @@ function isSignClick() {
|
|||||||
endTime = endTime + data.value.afterSignIn * 60 * 1000;
|
endTime = endTime + data.value.afterSignIn * 60 * 1000;
|
||||||
console.log("1111333");
|
console.log("1111333");
|
||||||
}
|
}
|
||||||
|
console.log("nowTime", nowTime, endTime);
|
||||||
if (nowTime < endTime && nowTime > beginTime) {
|
if (nowTime < endTime && nowTime > beginTime) {
|
||||||
state.isAllowSign = true;
|
state.isAllowSign = true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user