Commit bd9cb5aa authored by 杨梦雪's avatar 杨梦雪

11

parent 920d83d1
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
this.$message.success(res.data.message); // this.$message.success(res.data.message);
this.info = res.data; this.info = res.data;
}); });
}, },
......
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
<div> <div>
请等待工作人员审核,审核结果将于1-3个工作日发布,请留意网站及短信 请等待工作人员审核,审核结果将于1-3个工作日发布,请留意网站及短信
</div> </div>
<div v-if="this.examine_status == 1">审核已通过</div>
<div class="btn" v-show="this.getExamine == 1 || this.getExamine == 2"> <div v-if="this.examine_status == 2">提示:{{ this.examine_reason }}</div>
<div class="btn" v-show="this.examine_status == 1 || this.examine_status == 2">
<el-button @click="paying()">下一步 </el-button> <el-button @click="paying()">下一步 </el-button>
</div> </div>
</div> </div>
...@@ -21,16 +22,21 @@ ...@@ -21,16 +22,21 @@
export default { export default {
name: "Pass", name: "Pass",
props: { props: {
getExamine: [String, Number], // getExamine: [String, Number],
// isNext:''
}, },
created() { data() {
// console.log(this.getExamine); return {
examine_status: window.localStorage.getItem("examine_status"),
examine_reason: window.localStorage.getItem("examine_reason"),
};
}, },
watch: { created() {
// is_next(val){ console.log(this.examine_reason);
// }
}, },
watch: {},
methods: { methods: {
paying() { paying() {
this.$emit("is_next", 1); this.$emit("is_next", 1);
......
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
<script> <script>
/* eslint-disable */ /* eslint-disable */
import Cookie from "js-cookie" import Cookie from "js-cookie";
import { import {
getAccount, getAccount,
getAchievementOss, getAchievementOss,
...@@ -528,10 +528,18 @@ export default { ...@@ -528,10 +528,18 @@ export default {
let signUpFile = window.localStorage.getItem( let signUpFile = window.localStorage.getItem(
"sign_up_file_" + window.localStorage.getItem("phone") "sign_up_file_" + window.localStorage.getItem("phone")
); );
console.log(signUpFile)
if (signUpFile && JSON.parse(signUpFile).length > 0) { if (signUpFile && JSON.parse(signUpFile).length > 0) {
this.fileList = JSON.parse(signUpFile); this.fileList = JSON.parse(signUpFile);
} }
//回显图片
// let aPath=window.localStorage.getItem("achievement_path")
// console.log(aPath)
// if (window.localStorage.getItem("achievement_path")!=null) {
// this.fileList = window.localStorage.getItem("achievement_path");
// }
// console.log(window.localStorage.getItem("achievement_path"))
console.log(this.fileList);
this.getSchool(); this.getSchool();
this.getProAndCity(); this.getProAndCity();
this.getTenYear(); this.getTenYear();
...@@ -786,7 +794,7 @@ export default { ...@@ -786,7 +794,7 @@ export default {
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
console.log(file,'11111111'); console.log(file, "11111111");
this.resultPicture = file.url; this.resultPicture = file.url;
this.dialogVisible = true; this.dialogVisible = true;
}, },
...@@ -862,7 +870,7 @@ export default { ...@@ -862,7 +870,7 @@ export default {
// console.log(this.fileList, " this.fileList"); // console.log(this.fileList, " this.fileList");
window.localStorage.setItem( window.localStorage.setItem(
"sign_up_file_" + window.localStorage.getItem("phone"), "sign_up_file_" + +window.localStorage.getItem("phone"),
JSON.stringify(this.fileList) JSON.stringify(this.fileList)
); );
}) })
...@@ -965,8 +973,8 @@ export default { ...@@ -965,8 +973,8 @@ export default {
// console.log(3333); // console.log(3333);
this.$emit("getstatus", res.data.status); this.$emit("getstatus", res.data.status);
this.$message.success(res.data.message); this.$message.success(res.data.message);
let code =Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.push("/signUp/check?code="+code); this.$router.push("/signUp/check?code=" + code);
this.referForm = res.data.data; this.referForm = res.data.data;
}); });
}); });
......
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
@getstatus="statuss" @getstatus="statuss"
></Invitation> ></Invitation>
<ReferInfo v-else-if="type == 'referInfo'" @getstatus="statuss"></ReferInfo> <ReferInfo v-else-if="type == 'referInfo'" @getstatus="statuss"></ReferInfo>
<Pass <Pass v-else-if="type == 'check'" @is_next="is_nextevent"></Pass>
v-else-if="type == 'check'"
@is_next="is_nextevent"
:getExamine="getExamine"
></Pass>
<Paying v-else-if="type == 'pay'" @getstatus="statuss"></Paying> <Paying v-else-if="type == 'pay'" @getstatus="statuss"></Paying>
<Success v-else-if="type == 'success'" @getstatus="statuss"></Success> <Success v-else-if="type == 'success'" @getstatus="statuss"></Success>
</div> </div>
...@@ -88,7 +84,6 @@ export default { ...@@ -88,7 +84,6 @@ export default {
statuss(val) { statuss(val) {
// console.log(val, "statuss"); // console.log(val, "statuss");
this.status_val = val; this.status_val = val;
this.signUpInit(this.status_val); this.signUpInit(this.status_val);
}, },
// status=4,跳到审核页面;status=3时,根据doubt_check做判断 // status=4,跳到审核页面;status=3时,根据doubt_check做判断
...@@ -169,14 +164,31 @@ export default { ...@@ -169,14 +164,31 @@ export default {
this.type = "success"; this.type = "success";
} }
this.$emit("getStatus", this.type); this.$emit("getStatus", this.type);
this.getExamine = res.data.examine_status; // this.getExamine = res.data.examine_status;
// console.log(res.data.examine_status, "res.data.examine_status"); // console.log(res.data.examine_status, "res.data.examine_status");
//审核报名资料状态
//订单支付金额 //订单支付金额
window.localStorage.setItem("has_amount", res.data.has_amount); window.localStorage.setItem("has_amount", res.data.has_amount);
window.localStorage.setItem("campsite_id", res.data.campsite_id); window.localStorage.setItem("campsite_id", res.data.campsite_id);
window.localStorage.setItem("order_no", res.data.order_no); window.localStorage.setItem("order_no", res.data.order_no);
window.localStorage.setItem("examine_status", res.data.examine_status); //返回错误原因
window.localStorage.setItem("examine_reason", res.data.examine_reason); //资料审核状态
// window.localStorage.setItem("achievement_path", res.data.achievement_path); //上传的图片
const aPath = res.data.achievement_path;
if (aPath) {
let arr = aPath.split(",");
let fileList = [];
fileList = arr.map((item) => {
let obj = {
url: item
};
return obj
});
window.localStorage.setItem(
"sign_up_file_" + window.localStorage.getItem("phone"),
JSON.stringify(fileList)
); //上传的图片
}
}); });
}, },
}, },
......
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
this.$message.success("登录成功"); // this.$message.success("登录成功");
// token存储 // token存储
window.localStorage.setItem("index-token", res.data.token); window.localStorage.setItem("index-token", res.data.token);
window.localStorage.setItem("phone", this.loginForm.phone); window.localStorage.setItem("phone", this.loginForm.phone);
......
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
this.$message.success(res.data.message); // this.$message.success(res.data.message);
// token存储 // token存储
window.localStorage.setItem("index-token", res.data.token); window.localStorage.setItem("index-token", res.data.token);
......
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
this.$message.success(res.data.message); // this.$message.success(res.data.message);
// token存储 // token存储
window.localStorage.setItem("index-token", res.token); window.localStorage.setItem("index-token", res.token);
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
......
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