Skip to content

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

营地2.0-整合修改

parent e2bbcf67
Hide whitespace changes
Inline Side-by-side
Showing with 265 additions and 238 deletions
src/App.vue
View file @ 01a0c21c
......@@ -75,18 +75,20 @@
.el-message-box__title {
color: red;
}
.el-message-box__close {
.el-message-box__headerbtn {
&:focus,
&:hover {
color: var(--color);
.el-message-box__close {
color: var(--color);
}
}
}
}
.el-button {
&:nth-child(1):hover {
color: #fff;
background-color: var(--color);
color: var(--color);
background-color: #ffffff;
border-color: var(--color);
opacity: 0.6;
}
......
src/assets/img/logo_base.png
View replaced file @ e2bbcf67 View file @ 01a0c21c
src/assets/img/logo_base.png

255 KB | W: | H:

src/assets/img/logo_base.png

2.67 KB | W: | H:

src/assets/img/logo_base.png
src/assets/img/logo_base.png
src/assets/img/logo_base.png
src/assets/img/logo_base.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/scss/dialog.scss 0 → 100644
View file @ 01a0c21c
::v-deep .el-dialog {
.el-dialog__header {
.el-dialog__headerbtn {
&:focus,
&:hover {
.el-dialog__close {
color: var(--color);
}
}
}
}
.el-dialog__footer {
.el-button {
&:hover {
color: var(--color);
border-color: var(--color);
background-color: #ffffff;
}
}
.el-button--primary {
border-color: var(--color);
background-color: var(--color);
&:hover {
color: #ffffff;
border-color: var(--color);
background-color: var(--color);
}
}
}
}
src/components/Header.vue
View file @ 01a0c21c
......@@ -5,7 +5,8 @@
<img v-if="type==1" :src="all_logo" alt=""/>
<img v-if="type==2" :src="system_logo" alt=""/>
<img v-if="type==3" :src="system_logo" alt="" @click="toRecruit"/>
<img v-if="type==4" :src="system_logo?system_logo:all_logo" alt="" @click="toRecruit"/>
<img v-if="type==4" :src="all_logo" alt=""/>
<!--<img v-if="type==4" :src="system_logo?system_logo:all_logo" alt=""/>-->
</div>
<div class="right">
<el-menu :default-active="$store.state.activeIndex"
......@@ -198,10 +199,12 @@
align-items: center;
justify-content: space-between;
.image img {
// width: 318px;
height: 62px;
cursor: pointer;
.image{
img {
height: 50px;
cursor: pointer;
vertical-align: top;
}
}
.right {
......
src/components/base/myInfo/campList.vue
View file @ 01a0c21c
......@@ -52,7 +52,7 @@
type: this.type
}).then((res) => {
if (res.data.code != 200) {
return this.$message.error(res.data.message);
return this.$message.error(res.data.msg);
}
this.activeList = res.data.data;
})
......
src/components/index/SignUp/deliveryAddress.vue
View file @ 01a0c21c
......@@ -99,226 +99,230 @@
</el-dialog>
</template>
<script>
/* eslint-disable */
import { getProAndCity } from "r/index/signUp";
import { setAddress, getAddress } from "r/index/certificate";
import validator from "common/validator";
/* eslint-disable */
import {getProAndCity} from "r/index/signUp";
import {setAddress, getAddress} from "r/index/certificate";
import validator from "common/validator";
export default {
name: "deliveryAddress",
props: {
dialogVisibleAddress: Boolean,
},
data() {
return {
dialogVisible: false, //确认收货地址对话框
addressRules: {
certificate_name: [
{ required: true, message: "姓名不能为空！", trigger: "blur" },
],
certificate_phone: [
{
required: true,
message: "手机号不能为空！",
trigger: "blur",
},
{ validator: validator.validatePhone, trigger: "blur" },
],
certificate_province: [
{
required: true,
message: "请选择所在省份！",
trigger: "change",
},
],
certificate_city: [
{
required: true,
message: "请选择所在城市！",
trigger: "change",
},
],
// county: [
// { required: true, message: "请选择所在区县！", trigger: "blur" },
// ],
certificate_address: [
{ required: true, message: "详细地址不能为空！", trigger: "blur" },
],
},
addressForm: {
certificate_name: "",
certificate_phone: "",
certificate_province: null,
certificate_city: null,
certificate_address: "",
},
county: "", //区县
certificate_address: "", //详细地址
selectProvince: [], //省份
CityName: {}, //根据省份筛选出所有城市的对象
selectCityJiguan: [], //籍贯城市列表
selectCitySchool: [], //就读中学-城市列表
jgProvinceCode: "", //省份id
jiguan_city: "", //城市id(和省份id拼接)
};
},
created() {
// this.getProAndCity();
},
watch: {
dialogVisibleAddress() {
this.dialogVisible = this.dialogVisibleAddress;
export default {
name: "deliveryAddress",
props: {
dialogVisibleAddress: Boolean,
},
},
methods: {
// 确认,关闭弹框，修改父组件的值
cancelBtn() {
this.dialogVisible = false;
this.$emit("closeAddressDialog", this.dialogVisible, false);
data() {
return {
dialogVisible: false, //确认收货地址对话框
addressRules: {
certificate_name: [
{required: true, message: "姓名不能为空！", trigger: "blur"},
],
certificate_phone: [
{
required: true,
message: "手机号不能为空！",
trigger: "blur",
},
{validator: validator.validatePhone, trigger: "blur"},
],
certificate_province: [
{
required: true,
message: "请选择所在省份！",
trigger: "change",
},
],
certificate_city: [
{
required: true,
message: "请选择所在城市！",
trigger: "change",
},
],
// county: [
// { required: true, message: "请选择所在区县！", trigger: "blur" },
// ],
certificate_address: [
{required: true, message: "详细地址不能为空！", trigger: "blur"},
],
},
addressForm: {
certificate_name: "",
certificate_phone: "",
certificate_province: null,
certificate_city: null,
certificate_address: "",
},
county: "", //区县
certificate_address: "", //详细地址
selectProvince: [], //省份
CityName: {}, //根据省份筛选出所有城市的对象
selectCityJiguan: [], //籍贯城市列表
selectCitySchool: [], //就读中学-城市列表
jgProvinceCode: "", //省份id
jiguan_city: "", //城市id(和省份id拼接)
};
},
open() {
this.getProAndCity();
this.getAddress();
created() {
// this.getProAndCity();
},
getAddress() {
console.log(111111)
getAddress({}).then((res) => {
// console.log(res, "getAddress");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
console.log(res.data.info)
console.log(res.data.info.length==0 )
if (res.data.info.length==0) {
watch: {
dialogVisibleAddress() {
this.dialogVisible = this.dialogVisibleAddress;
},
},
methods: {
// 确认,关闭弹框，修改父组件的值
cancelBtn() {
this.dialogVisible = false;
this.$emit("closeAddressDialog", this.dialogVisible, false);
},
open() {
this.getProAndCity();
this.getAddress();
},
getAddress() {
console.log(111111)
getAddress({}).then((res) => {
// console.log(res, "getAddress");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
console.log(res.data.info)
console.log(res.data.info.length == 0)
if (res.data.info.length == 0) {
console.log(111111)
return;
} else {
// console.log(Object.keys(res.data.info),'info')
// if (Object.keys(res.data.info).length != 0) {
// return this.$message.error("已保存地址");
// }
// this.dialogVisible = true;
this.addressForm.certificate_name = res.data.info.certificate_name;
this.addressForm.certificate_phone = res.data.info.certificate_phone;
this.addressForm.certificate_province =
res.data.info.certificate_province;
this.addressForm.certificate_city = res.data.info.certificate_city;
this.selectCitySchool = this.getCurrentCityLists(
this.addressForm.certificate_province
);
if (res.data.info.certificate_address) {
this.county = res.data.info.certificate_address.split("-")[0];
this.certificate_address =
res.data.info.certificate_address.split("-")[1];
return;
} else {
// console.log(Object.keys(res.data.info),'info')
// if (Object.keys(res.data.info).length != 0) {
// return this.$message.error("已保存地址");
// }
// this.dialogVisible = true;
this.addressForm.certificate_name = res.data.info.certificate_name;
this.addressForm.certificate_phone = res.data.info.certificate_phone;
this.addressForm.certificate_province =
res.data.info.certificate_province;
this.addressForm.certificate_city = res.data.info.certificate_city;
this.selectCitySchool = this.getCurrentCityLists(
this.addressForm.certificate_province
);
if (res.data.info.certificate_address) {
this.county = res.data.info.certificate_address.split("-")[0];
this.certificate_address =
res.data.info.certificate_address.split("-")[1];
}
}
}
});
},
});
},
// 获取省份城市
getProAndCity() {
getProAndCity({}).then((res) => {
// console.log(res, "getProAndCity");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.selectProvince = res.data.province_list;
this.CityName = res.data.city_list;
});
},
// 获取省份城市
getProAndCity() {
getProAndCity({}).then((res) => {
// console.log(res, "getProAndCity");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.selectProvince = res.data.province_list;
this.CityName = res.data.city_list;
});
},
//选择籍贯省份change事件
changeProvince(val, status) {
console.log(val);
this.selectCitySchool = [];
this.selectCitySchool = this.getCurrentCityLists(val); //在此调用城市筛选列表
if (!status) {
this.addressForm.certificate_city = "";
}
},
//选择籍贯省份change事件
changeProvince(val, status) {
console.log(val);
this.selectCitySchool = [];
this.selectCitySchool = this.getCurrentCityLists(val); //在此调用城市筛选列表
if (!status) {
this.addressForm.certificate_city = "";
}
},
//返回当前省份下的城市列表
getCurrentCityLists(val) {
console.log(val);
let currentCity = [];
if (
this.CityName == null ||
!this.CityName ||
Object.values(this.CityName).length == 0
) {
getProAndCity({})
.then((res) => {
if (res.data.code === 200) {
this.CityName = res.data.city_list;
for (let key in this.CityName) {
if (this.CityName[key].parent_id == val) {
currentCity.push(this.CityName[key]);
//返回当前省份下的城市列表
getCurrentCityLists(val) {
console.log(val);
let currentCity = [];
if (
this.CityName == null ||
!this.CityName ||
Object.values(this.CityName).length == 0
) {
getProAndCity({})
.then((res) => {
if (res.data.code === 200) {
this.CityName = res.data.city_list;
for (let key in this.CityName) {
if (this.CityName[key].parent_id == val) {
currentCity.push(this.CityName[key]);
}
}
return currentCity;
} else {
this.$message.error(res.data.message);
}
return currentCity;
} else {
this.$message.error(res.data.message);
})
.catch((err) => {
this.$message.error(err);
});
} else {
for (let key in this.CityName) {
if (this.CityName[key].parent_id == val) {
currentCity.push(this.CityName[key]);
}
})
.catch((err) => {
this.$message.error(err);
});
} else {
for (let key in this.CityName) {
if (this.CityName[key].parent_id == val) {
currentCity.push(this.CityName[key]);
}
return currentCity;
}
return currentCity;
}
return currentCity;
},
// 提交
setAddress() {
this.addressForm.certificate_address =
this.county.toString() + "-" + this.certificate_address.toString();
this.$refs["addressRef"].validate((valid, object) => {
console.log(valid, "valid");
if (!valid) {
return false;
}
});
},
// 提交
setAddress() {
this.addressForm.certificate_address =
this.county.toString() + "-" + this.certificate_address.toString();
this.$refs["addressRef"].validate((valid, object) => {
console.log(valid, "valid");
if (!valid) {
return false;
}
});
setAddress(this.addressForm).then((res) => {
// console.log(res, "setAddress");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
this.dialogVisible = false;
});
setAddress(this.addressForm).then((res) => {
// console.log(res, "setAddress");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
this.dialogVisible = false;
});
},
},
},
};
};
</script>
<style lang="scss" scoped>
::v-deep.el-form-item {
margin-bottom: 20px;
@import "a/scss/dialog";
// item的验证红点点
.el-form-item__label {
height: 32px;
line-height: 32px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500;
color: #12141c;
}
&.no_label .el-form-item__label {
width: 0 !important;
}
&.no_label .el-form-item__label::before {
content: "" !important;
}
::v-deep.el-form-item {
margin-bottom: 20px;
// item的验证红点点
.el-form-item__label {
height: 32px;
line-height: 32px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 500;
color: #12141c;
}
&.no_label .el-form-item__label {
width: 0 !important;
}
&.no_label .el-form-item__label::before {
content: "" !important;
}
&.no_label .el-form-item__content {
margin-left: 0 !important;
&.no_label .el-form-item__content {
margin-left: 0 !important;
}
}
}
</style>
\ No newline at end of file
</style>
src/components/index/SignUp/pass.vue
View file @ 01a0c21c
......@@ -52,11 +52,9 @@
methods: {
Lasting() {
signBack({}).then((res) => {
console.log(res, "signBack");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
// console.log(res.data.status, "signBack.status");
this.signBackStatus = res.data.status;
this.$emit("getstatus", res.data.status);
this.$message.success(res.data.message);
......@@ -64,12 +62,8 @@
},
paying() {
this.$emit("is_next", 1);
// console.log(is_next);
},
signUpInit(status_val) {
// console.log(status_val, "11111");
// console.log(isNexts, "2222");
signUpInit({}).then((res) => {
console.log(res, "signUpInit");
if (res.data.code != 200) {
......@@ -80,13 +74,11 @@
return this.$message.error(res.data.message);
}
this.status = res.data.status;
console.log(this.status, "11111");
// 点击下一步传值给status,更新
if (status_val != null) {
this.status = status_val;
} else {
this.status = res.data.status;
// console.log(this.status, "11111");
}
// doubt_code，doubt_info，doubt_check。0为不填写，1为填写
if (this.status == 0) {
......@@ -101,7 +93,6 @@
this.status = 1;
}
} else if (this.status == 2) {
console.log(this.doubt_info, "doubt_info");
// 是否填写个人资料
if (this.doubt_info == 0) {
this.type = "check";
......@@ -122,19 +113,13 @@
} else if (this.status == 4) {
this.type = "check";
this.status = 3;
// console.log(this.status, "this.status ");
// console.log(this.isNexts ,'this.isNexts ')
if (this.isNexts == 1) {
// console.log(11111);
if (res.data.examine_status == 1) {
console.log(333);
this.type = "pay";
this.status = 4;
} else if (res.data.examine_status == 2) {
this.type = "referInfo";
this.status = 2;
// return this.$message.error(res.data.examine_reason);
}
}
} else if (this.status == 5) {
......@@ -162,7 +147,6 @@
};
return obj;
});
const code = this.$store.state.indexIdentity;
window.localStorage.setItem("sign_up_file_" + window.localStorage.getItem("index-phone-all"), JSON.stringify(fileList)); //上传的图片
}
});
......
src/components/index/SignUp/paying.vue
View file @ 01a0c21c
......@@ -775,7 +775,8 @@
</script>
<style lang="scss" scoped>
@import "a/scss/btn";
@import "a/scss/btn";
@import "a/scss/dialog";
.btn {
padding-bottom: 0 !important;
......
src/views/index/camp/SignUp.vue
View file @ 01a0c21c
......@@ -95,7 +95,7 @@
&emsp;&emsp;希望广大师生以营地招生简章为准，不要轻信有关宣传，以免自身利益受损。如遇类似上述情况，可发送邮件至service@campcenter.cn反映核实。特此声明！
</div>
<div class="btn">
<el-button @click="toBackList">返回营地通知列表</el-button>
<el-button type="primary" @click="toBackList">返回营地通知列表</el-button>
</div>
</el-dialog> -->
......@@ -117,7 +117,7 @@
&emsp;&emsp;希望广大师生以营地招生简章为准，不要轻信有关宣传，以免自身利益受损。如遇类似上述情况，可发送邮件至service@campcenter.cn反映核实。特此声明！
</div>
<div class="btn">
<el-button @click="dialogVisible = false">确 定</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</div>
</el-dialog>
......@@ -144,7 +144,7 @@
<a :href="yingdiHref">查看报名简章</a>。
</div>
<div class="btn">
<el-button @click="dialogVisible = false">确 定</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</div>
</el-dialog> -->
</div>
......@@ -242,7 +242,6 @@
// 上一步回退
lasStep() {
signBack({}).then((res) => {
console.log(res, "signBack");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
......@@ -261,14 +260,13 @@
this.signUpInit(this.status_val);
},
// status=4,跳到审核页面；status=3时，根据doubt_check做判断
signUpInit(status_val) {
signUpInit(status_val = null) {
signUpInit({}).then((res) => {
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.status = res.data.status;
// 点击下一步传值给status,更新
if (status_val != null) {
if (status_val && status_val != null && status_val != "") {
this.status = status_val;
} else {
this.status = res.data.status;
......@@ -279,7 +277,6 @@
} else if (this.status == 1) {
// 是否填写邀请码
if (this.doubt_code == 0) {
this.type = "referInfo";
this.status = 2;
} else {
......@@ -344,7 +341,6 @@
};
return obj;
});
// let code = this.$store.state.indexIdentity;
window.localStorage.setItem("sign_up_file_" +
window.localStorage.getItem("index-phone-all") +
code,
......@@ -402,9 +398,9 @@
.el-button {
width: 120px;
height: 35px;
background: var(--color);
border-radius: 4px;
border-color: var(--color);
background: var(--color);
opacity: 0.8;
line-height: 35px;
text-align: center;
......@@ -502,3 +498,7 @@
}
}
</style>
<style lang="scss" scoped>
@import "a/scss/dialog";
</style>
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