Skip to content

C
campSite
Commit f1c41d17 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

11

parent 96a8ccd1
Show whitespace changes
Inline Side-by-side
Showing with 390 additions and 274 deletions
src/components/index/Footer.vue
View file @ f1c41d17
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ul class="contact_list"> <ul class="contact_list">
<li v-if="$store.state.human != 1"> <li v-if="$store.state.human != 1">
<i class="el-icon-message"></i> <i class="el-icon-message"></i>
<span>联系邮箱</span>ydhdservice@163.com <span>联系邮箱</span>service@campcenter.cn
</li> </li>
<!-- <li> <!-- <li>
<i class="el-icon-phone-outline"></i> <i class="el-icon-phone-outline"></i>
......
src/components/index/SignUp/deliveryAddress.vue 0 → 100644
View file @ f1c41d17
<template>
<!-- 确认收货地址对话框 -->
<el-dialog
title="确认收货地址"
:visible.sync="dialogVisible"
width="40%"
@open="open()"
@close="cancelBtn()"
>
<el-form ref="addressRef" :model="addressForm" :rules="addressRules">
<el-form-item label="收件人" prop="certificate_name">
<el-input
v-model="addressForm.certificate_name"
placeholder="填写真实姓名"
clearable
></el-input>
</el-form-item>
<el-form-item label="收件人电话" prop="certificate_phone">
<el-input
v-model="addressForm.certificate_phone"
placeholder="填写真实电话"
clearable
></el-input>
</el-form-item>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="收货地址" prop="certificate_province">
<el-select
ref="certificate_province"
v-model="addressForm.certificate_province"
clearable
placeholder="选择省份"
@change="changeProvince($event)"
>
<el-option
v-for="item in selectProvince"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="no_label" label=" " prop="certificate_city">
<el-select
ref="certificate_city"
v-model="addressForm.certificate_city"
clearable
placeholder="选择城市"
>
<el-option
v-for="item in selectCitySchool"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="no_label" label=" " prop="county">
<!-- <el-select
ref="school"
v-model="addressForm.school"
clearable
placeholder="选择所在区县"
>
<el-option
v-for="item in selectSchoolList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> -->
<el-input
v-model="county"
placeholder="选择所在区县"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="" prop="certificate_address">
<el-input
ref="certificate_address"
v-model="certificate_address"
placeholder="填写详细地址"
clearable
></el-input>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="setAddress()">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
/* 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;
},
},
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];
}
}
});
},
// 获取省份城市
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 = "";
}
},
//返回当前省份下的城市列表
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);
}
})
.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;
},
// 提交
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;
});
},
},
};
</script>
<style lang="scss" scoped>
::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;
}
}
</style>
\ No newline at end of file
src/components/index/SignUp/paying.vue
View file @ f1c41d17
...@@ -253,7 +253,7 @@ export default { ...@@ -253,7 +253,7 @@ export default {
.catch((_) => {}); .catch((_) => {});
}, },
// 子组件触发，关闭确认报名弹框 // 子组件触发，关闭确认报名弹框
closeCFSUDialog(val, type) { closeCFSUDialog(val) {
console.log(val, "val"); console.log(val, "val");
this.confirmSignUpDialogFu = val; this.confirmSignUpDialogFu = val;
}, },
......
src/components/index/SignUp/success.vue
View file @ f1c41d17
...@@ -14,10 +14,14 @@ ...@@ -14,10 +14,14 @@
：请及时完成入营通知书内的要求事项。 ：请及时完成入营通知书内的要求事项。
</div> </div>
</div> </div>
<div class="flex btnList">
<div class="btn"> <div class="btn">
<el-button @click="handleDownload">下载课程通知书</el-button> <el-button @click="handleDownload">下载课程通知书</el-button>
</div> </div>
<div class="btn">
<el-button @click="openAddress">输入邮寄地址</el-button>
</div>
</div>
</div> </div>
</div> </div>
...@@ -35,29 +39,45 @@ ...@@ -35,29 +39,45 @@
：请及时完成入营通知书内的要求事项。 ：请及时完成入营通知书内的要求事项。
</div> </div>
</div> </div>
<div class="flex btnList">
<div class="btn"> <div class="btn">
<el-button @click="handleDownload">下载入营通知书</el-button> <el-button @click="handleDownload">下载入营通知书</el-button>
</div> </div>
<div class="btn">
<el-button @click="openAddress">输入邮寄地址</el-button>
</div>
</div>
</div> </div>
</div> </div>
<!-- 收货地址 -->
<delivery-address
:dialogVisibleAddress="dialogVisibleAddress"
@closeAddressDialog="closeAddressDialog"
>
</delivery-address>
</div> </div>
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
import { signUpInit } from "r/index/signUp"; import { signUpInit } from "r/index/signUp";
import deliveryAddress from "@/components/index/SignUp/deliveryAddress.vue";
export default { export default {
name: "Sucess", name: "Sucess",
components: {
deliveryAddress,
},
data() { data() {
return {}; return {
dialogVisibleAddress: false,
};
}, },
created() { created() {
console.log(123); // console.log(123);
var url = location.search; // var url = location.search;
console.log(url); // console.log(url);
}, },
methods: { methods: {
handleDownload() { handleDownload() {
...@@ -72,6 +92,14 @@ export default { ...@@ -72,6 +92,14 @@ export default {
} }
}); });
}, },
openAddress() {
this.dialogVisibleAddress = true;
},
// 子组件触发，关闭确认报名弹框
closeAddressDialog(val) {
console.log(val, "val");
this.dialogVisibleAddress = val;
},
}, },
}; };
</script> </script>
...@@ -100,6 +128,12 @@ export default { ...@@ -100,6 +128,12 @@ export default {
line-height: 18px; line-height: 18px;
} }
} }
.btnList {
justify-content: center;
div {
padding: 0 30px;
}
}
} }
// 注意事项 // 注意事项
.lips { .lips {
......
src/views/index/camp/Certificate.vue
View file @ f1c41d17
...@@ -58,281 +58,39 @@ ...@@ -58,281 +58,39 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- 确认收货地址对话框 --> <!-- 收货地址 -->
<el-dialog title="确认收货地址" :visible.sync="dialogVisible" width="40%"> <delivery-address
<el-form ref="addressRef" :model="addressForm" :rules="addressRules"> :dialogVisibleAddress="dialogVisibleAddress"
<el-form-item label="收件人" prop="certificate_name"> @closeAddressDialog="closeAddressDialog"
<el-input
v-model="addressForm.certificate_name"
placeholder="填写真实姓名"
size="small"
clearable
></el-input>
</el-form-item>
<el-form-item label="收件人电话" prop="certificate_phone">
<el-input
v-model="addressForm.certificate_phone"
placeholder="填写真实电话"
size="small"
clearable
></el-input>
</el-form-item>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="收货地址" prop="certificate_province">
<el-select
ref="certificate_province"
v-model="addressForm.certificate_province"
clearable
placeholder="选择省份"
@change="changeProvince($event)"
> >
<el-option </delivery-address>
v-for="item in selectProvince"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="no_label" label=" " prop="certificate_city">
<el-select
ref="certificate_city"
v-model="addressForm.certificate_city"
clearable
placeholder="选择城市"
>
<el-option
v-for="item in selectCitySchool"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="no_label" label=" " prop="county">
<!-- <el-select
ref="school"
v-model="addressForm.school"
clearable
placeholder="选择所在区县"
>
<el-option
v-for="item in selectSchoolList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> -->
<el-input
v-model="county"
placeholder="选择所在区县"
size="small"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="" prop="certificate_address">
<el-input
ref="certificate_address"
v-model="certificate_address"
placeholder="填写详细地址"
size="small"
clearable
></el-input>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="setAddress()">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
import { getProAndCity } from "r/index/signUp"; import deliveryAddress from "@/components/index/SignUp/deliveryAddress.vue";
import { setAddress, getAddress } from "r/index/certificate";
import validator from "common/validator";
export default { export default {
name: "certificate", name: "certificate",
components: {
deliveryAddress,
},
data() { data() {
return { return {
dialogVisible: false, //确认收货地址对话框 dialogVisibleAddress: 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() { created() {},
this.getProAndCity();
},
watch: {}, watch: {},
methods: { methods: {
getCertifi() { getCertifi() {
this.getAddress(); this.dialogVisibleAddress = true;
}, },
getAddress() { // 子组件触发，关闭确认报名弹框
// console.log(111111) closeAddressDialog(val) {
getAddress({}).then((res) => { console.log(val, "val");
// console.log(res, "getAddress"); this.dialogVisibleAddress = val;
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
// 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;
});
},
//选择籍贯省份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]);
}
}
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]);
}
}
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).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;
});
}, },
}, },
}; };
......
src/views/index/login/Login.vue
View file @ f1c41d17
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<div class="fr" @click="register()">还没有账号？立即注册</div> <div class="fr" @click="register()">还没有账号？立即注册</div>
<div class="fl" @click="forgetPwd()">忘记密码？</div> <div class="fl" @click="forgetPwd()">忘记密码？</div>
</div> </div>
<!-- <div class="fc">忘记密码请联系管理员邮箱：ydhdservice@163.com</div> --> <!-- <div class="fc">忘记密码请联系管理员邮箱：service@campcenter.cn</div> -->
</div> </div>
</el-form> </el-form>
</div> </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