提交 dfb77be9 authored 作者: matian's avatar matian

fix:代码修改

上级 e01ed602
<template> <template>
<div class="popup" v-show="visible"> <div class="popup" v-show="visible">
<div class="popup-container" @touchmove.prevent> <div class="popup-container" @touchmove.prevent>
<img class="img_default" :src="defaultImg2" alt="" v-if="status == true && signInfo.market_background_img == ''"> <img class="img_default" :src="signInfo.market_background_img || defaultImg1" alt="" v-if="status == true">
<img class="img_default" :src="defaultImg1" alt="" v-else-if="status == false && signInfo.market_background_img == ''"> <img class="img_default" :src="signInfo.market_background_img || defaultImg2" alt="" v-else>
<img class="img_bgImg" :src="signInfo.market_background_img" alt="" v-else>
<div class="success"> {{ status === true ? "签到成功!" : "签到失败!" }}</div> <div class="success"> {{ status === true ? "签到成功!" : "签到失败!" }}</div>
<div class="remark">{{signInfo.student.remark}}</div> <div class="remark">{{signInfo.student.remark}}</div>
</div> </div>
...@@ -28,8 +27,8 @@ export default { ...@@ -28,8 +27,8 @@ export default {
}, },
data() { data() {
return { return {
defaultImg1:'https://webapp-pub.ezijing.com/marketing/sign_error.png', defaultImg1:'https://webapp-pub.ezijing.com/marketing/img_success.png',
defaultImg2:'https://webapp-pub.ezijing.com/marketing/sign_success.png' defaultImg2:'https://webapp-pub.ezijing.com/marketing/img_fail.png'
} }
}, },
methods: { methods: {
...@@ -61,22 +60,14 @@ export default { ...@@ -61,22 +60,14 @@ export default {
box-shadow: 0 1px 3px rgb(0 0 0 / 30%); box-shadow: 0 1px 3px rgb(0 0 0 / 30%);
background-color: #fff; background-color: #fff;
.img_default{ .img_default{
width: 1.91rem; width: 6.24rem;
height: 1.95rem; height: 3.13rem;
line-height: 1.95rem; line-height: 1.95rem;
margin-top: .73rem;
position: absolute;
left: 50%;
transform: translateX(-50%);
}
.img_bgImg{
width:6.24rem;
height: 1.95rem;
} }
.success{ .success{
position:absolute; position:absolute;
left:50%; left:50%;
top: 3.12rem; top: 3.32rem;
transform:translateX(-50%); transform:translateX(-50%);
font-size: .52rem; font-size: .52rem;
color: #333; color: #333;
...@@ -86,7 +77,7 @@ export default { ...@@ -86,7 +77,7 @@ export default {
width: 4.14rem; width: 4.14rem;
position:absolute; position:absolute;
left:50%; left:50%;
top: 4.05rem; top: 4.15rem;
transform:translateX(-50%); transform:translateX(-50%);
color: #939393; color: #939393;
font-size: .32rem; font-size: .32rem;
......
...@@ -10,8 +10,11 @@ import './assets/rem/rem.js' ...@@ -10,8 +10,11 @@ import './assets/rem/rem.js'
import { Toast } from 'vant'; // vant
Vue.use(Toast); import Vant from 'vant'
import 'vant/lib/index.css'
Vue.use(Vant)
import VueAwesomeSwiper from 'vue-awesome-swiper' import VueAwesomeSwiper from 'vue-awesome-swiper'
Vue.use(VueAwesomeSwiper, /* { default options with global component } */) Vue.use(VueAwesomeSwiper, /* { default options with global component } */)
......
...@@ -55,7 +55,6 @@ export default { ...@@ -55,7 +55,6 @@ export default {
this.popupVisible = true; this.popupVisible = true;
}, },
getSignInDetail() { getSignInDetail() {
Toast(`该活动已于结束签到`);
//调用签到详情接口 //调用签到详情接口
let id = this.id; let id = this.id;
signInDetail(id).then((res) => { signInDetail(id).then((res) => {
...@@ -69,7 +68,7 @@ export default { ...@@ -69,7 +68,7 @@ export default {
if (sign_start_time !== "" && sign_end_time !== "") { if (sign_start_time !== "" && sign_end_time !== "") {
//限制签到时间 //限制签到时间
if (time < sign_start_time) { if (time < sign_start_time) {
Toast(`该活动将于${this.signInfo.sign_start_time}开始签到`); Toast.fail(`该活动将于${this.signInfo.sign_start_time}开始签到`);
} else { } else {
this.getSignIn(); //调用签到接口 this.getSignIn(); //调用签到接口
} }
...@@ -91,16 +90,17 @@ export default { ...@@ -91,16 +90,17 @@ export default {
let time = new Date().getTime(); //获取当前时间戳 let time = new Date().getTime(); //获取当前时间戳
let end_time = new Date(this.signInfo.sign_end_time).getTime(); //活动结束 let end_time = new Date(this.signInfo.sign_end_time).getTime(); //活动结束
let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到结束 let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到结束
if ( if (this.signInfo.sign_start_time !== "" && this.signInfo.sign_end_time !== "") {
this.signInfo.sign_start_time !== "" &&
this.signInfo.sign_end_time !== ""
) {
if (this.status == false && time >= sign_end_time) { if (this.status == false && time >= sign_end_time) {
Toast(`该活动已于${this.signInfo.sign_end_time}结束签到`); Toast.fail(`该活动已于${this.signInfo.sign_end_time}结束签到`);
}else if(this.status == true && time < sign_end_time && time > sign_start_time){
Toast.success('您已签到成功');
} }
} else { } else {
if (this.status == false && time >= end_time) { if (this.status == false && time >= end_time) {
Toast("该活动已结束签到"); Toast.fail("该活动已结束签到");
}else if(this.status == true && time < end_time){
Toast.success('您已签到成功');
} }
} }
} else { } else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论