diff --git a/package.json b/package.json index 9c5c574..24c1b52 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "vue-template-compiler": "^2.6.11" }, "gitHooks": { - "pre-commit": "lint-staged" }, "lint-staged": { "*.{js,jsx,vue}": [ diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index 05a3f81..188e086 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -1014,6 +1014,7 @@ export default { this.getHotCity(); this.getCityWhichHasJob(); this.getHotStore(); + this.hideFilterContent(); }, /** * el 被新创建的 vm.el 替换,并挂载到实例上去之后调用该钩子。 @@ -1166,7 +1167,7 @@ export default { this.$nextTick(() => { let fileterContent = document.querySelector(".filter-content"); this.filterHeight = fileterContent.scrollHeight; - fileterContent.style.height = this.filterHeight + "px"; + // fileterContent.style.height = this.filterHeight + "px"; }); }); } else { @@ -1196,7 +1197,7 @@ export default { this.$nextTick(() => { let fileterContent = document.querySelector(".filter-content"); this.filterHeight = fileterContent.scrollHeight; - fileterContent.style.height = this.filterHeight + "px"; + // fileterContent.style.height = this.filterHeight + "px"; }); } } else { @@ -1225,7 +1226,7 @@ export default { this.$nextTick(() => { let fileterContent = document.querySelector(".filter-content"); this.filterHeight = fileterContent.scrollHeight; - fileterContent.style.height = this.filterHeight + "px"; + // fileterContent.style.height = this.filterHeight + "px"; }); }); } @@ -1644,15 +1645,21 @@ export default { // console.log(item); // }, hideFilterContent() { - let fileterContent = document.querySelector(".filter-content"); - // fileterContent.style.transition = 'all .2s' - if (this.filterStatus == 0) { - this.filterStatus = 1; - fileterContent.style.height = "0px"; - } else { - this.filterStatus = 0; - fileterContent.style.height = this.filterHeight + "px"; - } + setTimeout(() => { + let fileterContent = document.querySelector(".filter-content"); + console.log(fileterContent); + // fileterContent.style.transition = 'all .2s' + if (this.filterStatus == 0) { + console.log("is in the 0 zone"); + this.filterStatus = 1; + fileterContent.style.height = "0px"; + } else { + console.log("is in the 1 zone"); + + this.filterStatus = 0; + fileterContent.style.height = this.filterHeight + "px"; + } + }, 0); }, }, }; diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index 9f4ebca..78c3213 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -169,7 +169,10 @@
  • - {{ item.statusTag }}{{ item.statusTag }}{{ item.statusTimeInfo }}: {{ item.statusShowTime }} @@ -755,6 +758,12 @@ export default { } // console.log(e); }, + /* + 显示报名详情 + */ + showDetail(item) { + console.log(item); + }, }, }; diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue index c0b8a51..3e6883a 100644 --- a/src/components/userinfo/usercenter/components/townsman.vue +++ b/src/components/userinfo/usercenter/components/townsman.vue @@ -59,6 +59,13 @@ :rowKey="(record) => record.index" > {{ text }} + 详情
    diff --git a/src/utils/request.js b/src/utils/request.js index e8f7d82..927e3e8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,20 +3,20 @@ import router from "@/router"; import Cookies from "js-cookie"; // import Vue from "vue"; // const baseURL = "http://1shoudan.com"; // 正式环境线上 -// const baseURL = "http://idaotian.com"; // 正式环境线上 +const baseURL = "http://idaotian.com"; // 正式环境线上 // const baseURL = "http://idagou.cn"; // 正式环境线上 // console.log(baseURL); // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地 // const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地 // const baseURL = "http://1shoudan.renminshitang.com.cn"; // 测试环境线上 -const baseURL = "http://localhost:8001"; +// const baseURL = "http://localhost:8001"; // const data1 = require.context("./", false, /\.js$/); // 测试用 // console.log(data1.keys()); axios.defaults.withCredentials = true; //添加这行代码 // console.log(axios); const service = axios.create({ - // baseURL: "/api_prod", // url = base url + request url 测试 - baseURL: baseURL, // baseURL: "/api", // url = base url + request url 正式 + baseURL: "/api_prod", // url = base url + request url 测试 + // baseURL: baseURL, // baseURL: "/api", // url = base url + request url 正式 withCredentials: true, // send cookies when cross-domain requests timeout: 60000, // request timeout crossDomain: true, @@ -24,21 +24,22 @@ const service = axios.create({ service.interceptors.response.use( (response) => { const { msg, status } = response.data; + return response; // console.log(status) ; - if (status == 9999) { - sessionStorage.removeItem("LOGIN_DATA"); - Cookies.remove("LOGIN_DATA"); - router.push("/login"); - // 跳转到登录页面 - // this.$message.warning(msg); - return Promise.reject(new Error("token过期")); - } - if (response.status === 200) { - return response; - } else { - // Message.error(message) - return Promise.reject(new Error(msg)); - } + // if (status == 9999) { + // sessionStorage.removeItem("LOGIN_DATA"); + // Cookies.remove("LOGIN_DATA"); + // router.push("/login"); + // // 跳转到登录页面 + // // this.$message.warning(msg); + // return Promise.reject(new Error("token过期")); + // } + // if (response.status === 200) { + // return response; + // } else { + // // Message.error(message) + // return Promise.reject(new Error(msg)); + // } }, (error) => { console.log(error); diff --git a/vue.config.js b/vue.config.js index fc350e8..5d82ec8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,9 +32,10 @@ module.exports = { // 地址中有 /api 的时候会触发代理 "/api_prod": { // target: "http://localhost:8001/", - // target: "http://bl7.matripe.com.cn:8001", + target: "http://bl7.matripe.com.cn:8001", // target: "http://1shoudan.renminshitang.com.cn", - target: "https://idaotian.com", + // target: "https://idaotian.com", + // target: "https://d.matripe.com.cn", ws: true, // proxy websockets changeOrigin: true, // 确定是否跨域 pathRewrite: { @@ -46,6 +47,7 @@ module.exports = { // target: "http://bl7.matripe.com.cn:8001", // target: "http://1shoudan.renminshitang.com.cn", target: "https://idaotian.com", + // target: "https://d.matripe.com.cn", ws: true, // proxy websockets changeOrigin: true, // 确定是否跨域 pathRewrite: {