Skip to content

C
campSite
Commit ca6fc8d1 authored by wuwangwolihui's avatar wuwangwolihui
Browse files
Options

修改-提示文字、西交大支付不传截图

parent 85dd5829
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1085 additions and 951 deletions
src/components/breadcrumb.vue
View file @ ca6fc8d1
......@@ -43,7 +43,7 @@
</div>
<div
class="referInfoTips"
v-show="status == 0 || status == 1 || status == 2||status == 3 "
v-show="status == 0 || status == 1 || status == 2 || status == 3"
@click="toShowSteps"
>
<i class="el-icon-question"></i>
......@@ -52,233 +52,238 @@
</template>
<script>
/* eslint-disable */
export default {
name: "breadcrumb",
props: { statusNum: [String, Number] }, //进度参数
data() {
return {
status: this.statusNum,
bCList: [],
// 报名流程提示
steps: [
"登录报名系统",
"提交报名信息，等待审核",
"收到审核短信，登录系统缴费",
"上传缴费截图，等待审核",
"收到审核短信，登录系统",
"下载入营通知书，完成报名",
],
isShowStepsTips: false,
};
},
created() {
let code = this.$store.state.indexIdentity;
const doubt_code = window.localStorage.getItem("doubt_code" + code);
const doubt_info = window.localStorage.getItem("doubt_info" + code);
const doubt_check = window.localStorage.getItem("doubt_check" + code);
// console.log(doubt_check, "doubt_check");
const newArr = [
{
name: "确认报名",
status: 0,
},
{
name: "填写邀请码",
status: 1,
},
{
name: "填写报名资料",
status: 2,
},
{
name: "报名资料审核",
status: 3,
},
{
name: "缴费",
status: 4,
},
];
let arr = [];
// console.log(newArr, "newArr");
for (let i = 0; i < newArr.length; i++) {
const item = newArr[i];
if (
(doubt_code == 0 && item.status == 1) ||
(doubt_info == 0 && item.status == 2) ||
(doubt_check == 0 && item.status == 3)
) {
} else {
arr.push(item);
/* eslint-disable */
export default {
name: "breadcrumb",
props: {statusNum: [String, Number]}, //进度参数
data() {
return {
status: this.statusNum,
bCList: [],
// 报名流程提示
steps: [
"登录报名系统",
"提交报名信息，等待审核",
"收到审核短信，登录系统缴费",
"上传缴费截图，等待审核",
"收到审核短信，登录系统",
"下载入营通知书，完成报名",
],
isShowStepsTips: false,
};
},
created() {
let code = this.$store.state.indexIdentity;
const doubt_code = window.localStorage.getItem("doubt_code" + code);
const doubt_info = window.localStorage.getItem("doubt_info" + code);
const doubt_check = window.localStorage.getItem("doubt_check" + code);
// console.log(doubt_check, "doubt_check");
const newArr = [
{
name: "确认报名",
status: 0,
},
{
name: "填写邀请码",
status: 1,
},
{
name: "填写报名资料",
status: 2,
},
{
name: "报名资料审核",
status: 3,
},
{
name: "缴费",
status: 4,
},
];
let arr = [];
// console.log(newArr, "newArr");
for (let i = 0; i < newArr.length; i++) {
const item = newArr[i];
if (
(doubt_code == 0 && item.status == 1) ||
(doubt_info == 0 && item.status == 2) ||
(doubt_check == 0 && item.status == 3)
) {
} else {
arr.push(item);
}
}
}
this.bCList = arr;
},
watch: {
statusNum(val) {
console.log(val, "statusNum");
this.status = val;
this.bCList = arr;
},
},
methods: {
toShowSteps() {
this.isShowStepsTips = !this.isShowStepsTips;
watch: {
statusNum(val) {
console.log(val, "statusNum");
this.status = val;
},
},
methods: {
toShowSteps() {
this.isShowStepsTips = !this.isShowStepsTips;
},
},
},
};
};
</script>
<style scoped lang="scss">
.flex {
display: flex;
}
// 报名流程提示
.referInfoTips {
// position: absolute;
// right: 1%;
// top: 45%;
margin-left: 20px;
color: var(--color);
i {
font-size: 26px;
cursor: pointer;
.flex {
display: flex;
}
}
.vertical-steps {
position: absolute;
right: 2%;
top: 9.5%;
// width: 280px;
margin: 0 auto;
background-color: #f8f8f8;
padding: 30px 20px 20px;
border-radius: 8px;
z-index: 99;
.vertical-steps-title {
text-align: center;
margin-bottom: 20px;
font-weight: 600;
font-size: 18px;
}
// 报名流程提示
.referInfoTips {
// position: absolute;
// right: 1%;
// top: 45%;
margin-left: 20px;
color: var(--color);
.vertical_close {
position: absolute;
right: 4%;
top: 2%;
cursor: pointer;
i {
font-size: 26px;
cursor: pointer;
}
}
}
.step {
display: flex;
margin-bottom: 10px;
position: relative;
.vertical-steps {
position: absolute;
right: 2%;
top: 9.5%;
// width: 280px;
margin: 0 auto;
background-color: #f8f8f8;
padding: 30px 20px 20px;
border-radius: 8px;
z-index: 99;
.step-number {
width: 20px;
height: 20px;
border-radius: 50%;
background-color: #ddd;
color: #666;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
margin-right: 15px;
flex-shrink: 0;
position: relative;
z-index: 2;
border: 2px solid white;
box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3),
/* 主阴影 */ inset 0 2px 4px rgba(255, 255, 255, 0.3),
/* 内阴影 */ 0 0 0 4px rgba(24, 144, 255, 0.1);
/* 外发光效果 */
}
.vertical-steps-title {
text-align: center;
margin-bottom: 20px;
font-weight: 600;
font-size: 18px;
}
.step-number {
background-color: var(--color);
color: white;
.vertical_close {
position: absolute;
right: 4%;
top: 2%;
cursor: pointer;
}
}
.step-content {
padding: 5px 0;
.step {
display: flex;
margin-bottom: 10px;
position: relative;
/* 向左三角形 */
.triangle-left {
width: 0;
height: 0;
border-top: 6px solid transparent;
border-right: 12px solid #ffffff;
border-bottom: 6px solid transparent;
}
.step-title {
color: #333;
font-size: 12px;
background-color: #ffffff;
width: 182px;
height: 30px;
.step-number {
width: 20px;
height: 20px;
border-radius: 50%;
background-color: #ddd;
color: #666;
display: flex;
align-items: center;
justify-content: center;
border-radius: 6px;
font-size: 12px;
margin-right: 15px;
flex-shrink: 0;
position: relative;
top: -8px;
z-index: 2;
border: 2px solid white;
box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3),
/* 主阴影 */
inset 0 2px 4px rgba(255, 255, 255, 0.3),
/* 内阴影 */
0 0 0 4px rgba(24, 144, 255, 0.1);
/* 外发光效果 */
}
}
.connector {
position: absolute;
left: 11px;
top: 24px;
bottom: -30px;
width: 2px;
border-left: 1.5px dotted var(--color);
z-index: 1;
}
}
.step-number {
background-color: var(--color);
color: white;
}
.speed-bg-color {
background-color: var(--color) !important;
}
.step-content {
padding: 5px 0;
display: flex;
.speed-text-color {
color: var(--color) !important;
}
/* 向左三角形 */
.triangle-left {
width: 0;
height: 0;
border-top: 6px solid transparent;
border-right: 12px solid #ffffff;
border-bottom: 6px solid transparent;
}
.steps {
.step {
align-items: center;
.cricle {
width: 30px;
height: 30px;
text-align: center;
line-height: 30px;
color: #ffff;
background: #d0ced0;
border-radius: 15px;
margin-right: 10px;
font-size: 14px;
font-family: PingFang SC;
.step-title {
color: #333;
font-size: 12px;
background-color: #ffffff;
width: 182px;
height: 30px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 6px;
position: relative;
top: -8px;
}
}
.step_title {
flex: 1;
font-size: 14px;
height: 20px;
font-weight: 600;
color: #d0ced0;
line-height: 20px;
font-family: PingFang SC;
.connector {
position: absolute;
left: 11px;
top: 24px;
bottom: -30px;
width: 2px;
border-left: 1.5px dotted var(--color);
z-index: 1;
}
}
.speed-bg-color {
background-color: var(--color) !important;
}
img {
margin: 0 15px 0 10px;
.speed-text-color {
color: var(--color) !important;
}
.steps {
.step {
align-items: center;
.cricle {
width: 30px;
height: 30px;
text-align: center;
line-height: 30px;
color: #ffff;
background: #d0ced0;
border-radius: 15px;
margin-right: 10px;
font-size: 14px;
font-family: PingFang SC;
}
.step_title {
flex: 1;
font-size: 14px;
height: 20px;
font-weight: 600;
color: #d0ced0;
line-height: 20px;
font-family: PingFang SC;
}
img {
margin: 0 15px 0 10px;
}
}
}
}
</style>
src/components/index/SignUp/pass.vue
View file @ ca6fc8d1
......@@ -5,13 +5,14 @@
<!-- <img src="@/assets/img/signUp/icon-shenhe.png" alt="" /> -->
<i class="icon-icon"></i>
</div>
<!-- {{!this.examine_status == 1}} -->
<div v-if="this.examine_status == 0 || this.examine_status == 3">
同学你好，你的报名资料已提交
</div>
<div v-if="this.examine_status == 0 || this.examine_status == 3">
请等待工作人员审核，审核结果将于以短信形式发送到报名手机号，请注意查收。
</div>
<!--<template v-if="this.examine_status == 0 || this.examine_status == 3">
<div>同学你好，你的报名资料已提交</div>
<div>请等待工作人员审核，审核结果将于以短信形式发送到报名手机号，请注意查收。</div>
</template>-->
<template v-if="this.examine_status == 0 || this.examine_status == 3">
<div>同学好，你的报名资料已提交</div>
<div>请等待工作人员审核，审核结果将以邮件形式发送到您的邮箱，请注意查收。</div>
</template>
<div v-if="this.examine_status == 1">
同学你好，你的材料已经通过审核，请点击“下一步”完成报名
</div>
......
src/components/index/SignUp/paying.vue
View file @ ca6fc8d1
This diff is collapsed.
src/components/index/SignUp/referInfo.vue
View file @ ca6fc8d1
This diff is collapsed.
src/config/server.js
View file @ ca6fc8d1
......@@ -9,6 +9,6 @@ export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-camps
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// 测试
// export const SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://192.168.8.204:8088"; // websocket
// export const SERVER_URL = "http://192.168.1.107:8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://192.168.1.107:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://192.168.1.107:8088"; // websocket
src/views/base/active/ActiveInfo.vue
View file @ ca6fc8d1
......@@ -50,7 +50,7 @@
<div v-if="activeInfo.bmEndTime!=null">报名截止：{{formatYMDChina(activeInfo.bmEndTime)}}</div>
<div v-if="activeInfo.activityFee && activeInfo.activityFee!='0'">
活动费用：￥{{activeInfo.activityFee}}
<el-tooltip class="item" content="申请审核通过后，才可缴费参与活动具体活动费用以缴费时为准。" effect="dark" placement="top">
<el-tooltip class="item" content="申请审核通过后，才可缴费参与活动，具体活动费用以缴费时为准。" effect="dark" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</div>
......
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