Skip to content

C
center-marketing-show
提交 98199b87 authored 作者: matian's avatar matian
浏览文件
操作

fix:代码修改

上级 f32b9d8d
隐藏空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 97 行删除
package-lock.json
浏览文件 @ 98199b87
......@@ -24,9 +24,9 @@
"cross-env": "^7.0.3",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^7.16.0",
"sass": "^1.37.5",
"vite": "^2.4.4",
"vite-plugin-vue2": "^1.8.0",
"sass": "^1.38.0",
"vite": "^2.5.0",
"vite-plugin-vue2": "^1.8.1",
"vue-template-compiler": "^2.6.14"
}
},
......@@ -2374,9 +2374,9 @@
}
},
"node_modules/esbuild": {
"version": "0.12.15",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.15.tgz",
"integrity": "sha512-72V4JNd2+48eOVCXx49xoSWHgC3/cCy96e7mbXKY+WOWghN00cCmlGnwVLRhRHorvv0dgCyuMYBZlM2xDM5OQw==",
"version": "0.12.21",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.21.tgz",
"integrity": "sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==",
"dev": true,
"hasInstallScript": true,
"bin": {
......@@ -4261,9 +4261,9 @@
"dev": true
},
"node_modules/sass": {
"version": "1.37.5",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz",
"integrity": "sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==",
"version": "1.38.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz",
"integrity": "sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0"
......@@ -4889,12 +4889,12 @@
}
},
"node_modules/vite": {
"version": "2.4.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.4.4.tgz",
"integrity": "sha512-m1wK6pFJKmaYA6AeZIUXyiAgUAAJzVXhIMYCdZUpCaFMGps0v0IlNJtbmPvkUhVEyautalajmnW5X6NboUPsnw==",
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.0.tgz",
"integrity": "sha512-Dn4B+g54PJsMG5WCc4QeFy1ygMXRdTtFrUPegqfk4+vzVQcbF/DqqmI/1bxezArzbujBJg/67QeT5wz8edfJVQ==",
"dev": true,
"dependencies": {
"esbuild": "^0.12.8",
"esbuild": "^0.12.17",
"postcss": "^8.3.6",
"resolve": "^1.20.0",
"rollup": "^2.38.5"
......@@ -4903,16 +4903,16 @@
"vite": "bin/vite.js"
},
"engines": {
"node": ">=12.0.0"
"node": ">=12.2.0"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
}
},
"node_modules/vite-plugin-vue2": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.8.0.tgz",
"integrity": "sha512-7/4FQBYcGBzBvdcgh4sscQc4FLQumM8cjwlmMi514uNOSwJiG0jSl47Vwajn8s8k9X3itqaNBy+EGod2720GsQ==",
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.8.1.tgz",
"integrity": "sha512-arqvNRbo7pYlyflY9U2i7vWOhncLoR6DZQfhC0rf4hF+1riFtwX5n7nIGc6nqr819bpVQSnZ8+4J7aejbA9NfA==",
"dev": true,
"dependencies": {
"@babel/core": "^7.11.6",
......@@ -7082,9 +7082,9 @@
}
},
"esbuild": {
"version": "0.12.15",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.15.tgz",
"integrity": "sha512-72V4JNd2+48eOVCXx49xoSWHgC3/cCy96e7mbXKY+WOWghN00cCmlGnwVLRhRHorvv0dgCyuMYBZlM2xDM5OQw==",
"version": "0.12.21",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.21.tgz",
"integrity": "sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==",
"dev": true
},
"escalade": {
......@@ -8552,9 +8552,9 @@
"dev": true
},
"sass": {
"version": "1.37.5",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz",
"integrity": "sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==",
"version": "1.38.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz",
"integrity": "sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0"
......@@ -9045,12 +9045,12 @@
}
},
"vite": {
"version": "2.4.4",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.4.4.tgz",
"integrity": "sha512-m1wK6pFJKmaYA6AeZIUXyiAgUAAJzVXhIMYCdZUpCaFMGps0v0IlNJtbmPvkUhVEyautalajmnW5X6NboUPsnw==",
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.0.tgz",
"integrity": "sha512-Dn4B+g54PJsMG5WCc4QeFy1ygMXRdTtFrUPegqfk4+vzVQcbF/DqqmI/1bxezArzbujBJg/67QeT5wz8edfJVQ==",
"dev": true,
"requires": {
"esbuild": "^0.12.8",
"esbuild": "^0.12.17",
"fsevents": "~2.3.2",
"postcss": "^8.3.6",
"resolve": "^1.20.0",
......@@ -9058,9 +9058,9 @@
}
},
"vite-plugin-vue2": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.8.0.tgz",
"integrity": "sha512-7/4FQBYcGBzBvdcgh4sscQc4FLQumM8cjwlmMi514uNOSwJiG0jSl47Vwajn8s8k9X3itqaNBy+EGod2720GsQ==",
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.8.1.tgz",
"integrity": "sha512-arqvNRbo7pYlyflY9U2i7vWOhncLoR6DZQfhC0rf4hF+1riFtwX5n7nIGc6nqr819bpVQSnZ8+4J7aejbA9NfA==",
"dev": true,
"requires": {
"@babel/core": "^7.11.6",
......
src/components/AppPopup.vue
浏览文件 @ 98199b87
<template>
<div class="popup" v-show="visible">
<div class="popup-container" @touchmove.prevent>
<img class="img_default" :src="signInfo.market_background_img || defaultImg1" alt="" v-if="status == true">
<img class="img_default" :src="signInfo.market_background_img || defaultImg2" alt="" v-else>
<div class="success"> {{ status === true ? "签到成功!" : "签到失败!" }}</div>
<div class="remark">{{signInfo.student.remark}}</div>
<img
class="img_default"
:src="signInfo.market_background_img || defaultImg1"
alt=""
v-if="status == true"
/>
<img
class="img_default"
:src="signInfo.market_background_img || defaultImg2"
alt=""
v-else
/>
<div class="success">
{{ status === true ? "签到成功!" : "签到失败!" }}
</div>
<div class="remark">{{ signInfo.student.remark }}</div>
</div>
<div class="overlay" @click="handleClose" @touchmove.prevent></div>
</div>
......@@ -14,77 +26,77 @@ export default {
props: {
visible: {
type: Boolean,
default: false
default: false,
},
status: {
type: Boolean,
default: false
default: false,
},
signInfo: {
type: Object,
default: ()=>{
},
},
signInfo:{
type:Object,
default:{}
}
},
data() {
return {
defaultImg1:'https://webapp-pub.ezijing.com/marketing/img_success.png',
defaultImg2:'https://webapp-pub.ezijing.com/marketing/img_fail.png'
}
defaultImg1: "https://webapp-pub.ezijing.com/marketing/img_success.png",
defaultImg2: "https://webapp-pub.ezijing.com/marketing/img_fail.png",
};
},
methods: {
handleClose() {
this.$emit('update:visible', false)
}
}
}
handleClose() {
this.$emit("update:visible", false);
},
},
};
</script>
<style lang="scss" scoped>
.overlay{
position:fixed;
left:0;
top:0;
right:0;
bottom:0;
z-index:5;
background:rgba(0, 0, 0, .5);
.overlay {
position: fixed;
left: 0;
top: 0;
right: 0;
bottom: 0;
z-index: 5;
background: rgba(0, 0, 0, 0.5);
}
.popup-container{
position:fixed;
left:50%;
top:50%;
transform:translate(-50%, -50%);
z-index:10;
width:6.24rem;
height:7.2rem;
border-radius:5px;
.popup-container {
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
z-index: 10;
width: 6.24rem;
height: 7.2rem;
border-radius: 5px;
box-shadow: 0 1px 3px rgb(0 0 0 / 30%);
background-color: #fff;
.img_default{
.img_default {
width: 6.24rem;
height: 3.13rem;
line-height: 1.95rem;
}
.success{
position:absolute;
left:50%;
top: 3.32rem;
transform:translateX(-50%);
font-size: .52rem;
color: #333;
font-weight: 400;
.success {
position: absolute;
left: 50%;
top: 3.32rem;
transform: translateX(-50%);
font-size: 0.52rem;
color: #333;
font-weight: 400;
}
.remark{
width: 4.14rem;
position:absolute;
left:50%;
top: 4.15rem;
transform:translateX(-50%);
color: #939393;
font-size: .32rem;
line-height: .48rem;
font-weight: 400;
text-align: center;
.remark {
width: 4.14rem;
position: absolute;
left: 50%;
top: 4.15rem;
transform: translateX(-50%);
color: #939393;
font-size: 0.32rem;
line-height: 0.48rem;
font-weight: 400;
text-align: center;
}
}
</style>
src/views/signIn/Index.vue
浏览文件 @ 98199b87
......@@ -54,7 +54,7 @@ export default {
handleClick() {
this.popupVisible = true;
},
getSignInDetail() {
getSignInDetail() {
//调用签到详情接口
let id = this.id;
signInDetail(id).then((res) => {
......@@ -62,11 +62,8 @@ export default {
if (res.code == 0) {
this.signInfo = res.data; //获取签到详情数据
let time = new Date().getTime(); //获取当前时间戳
let sign_start_time = new Date(
this.signInfo.sign_start_time
).getTime(); //签到开始
let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到结束
if (sign_start_time !== "" && sign_end_time !== "") {
let sign_start_time = new Date(this.signInfo.sign_start_time).getTime(); //签到开始
if (this.signInfo.sign_start_time !== "" && this.signInfo.sign_end_time !== "") {
//限制签到时间
if (time < sign_start_time) {
Toast.fail(`该活动将于${this.signInfo.sign_start_time}开始签到`);
......@@ -90,18 +87,19 @@ export default {
this.status = res.data.status; //签到状态
let time = new Date().getTime(); //获取当前时间戳
let end_time = new Date(this.signInfo.sign_end_time).getTime(); //活动结束
let sign_start_time = new Date(this.signInfo.sign_start_time).getTime();
let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到结束
if (this.signInfo.sign_start_time !== "" && this.signInfo.sign_end_time !== "") {
if (this.signInfo.sign_start_time !== "" &&this.signInfo.sign_end_time !== "") {
if (this.status == false && time >= 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 if (this.status == true &&time < sign_end_time &&time > sign_start_time) {
Toast.success("您已签到成功");
}
} else {
if (this.status == false && time >= end_time) {
Toast.fail("该活动已结束签到");
}else if(this.status == true && time < end_time){
Toast.success('您已签到成功');
} else if (this.status == true && time < end_time) {
Toast.success("您已签到成功");
}
}
} else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论