diff --git a/css/index.css b/css/index.css index 5dc5b53..5d7658d 100644 --- a/css/index.css +++ b/css/index.css @@ -503,6 +503,26 @@ color: #7f7f7f; margin-bottom: 12px; } +.data .item .type { + width: 284px; + height: 40px; + background: -webkit-linear-gradient(164.3443153deg, #cff7ff -38%, #eff0d1 31%, #cff7ff 115%); + background: -moz-linear-gradient(-74.3443153deg, #cff7ff -38%, #eff0d1 31%, #cff7ff 115%); + background: linear-gradient(-74.3443153deg, #cff7ff -38%, #eff0d1 31%, #cff7ff 115%); + border-radius: 0 0 12px 12px; + margin-left: -15px; +} +.data .item .type .type-name { + width: 83px; + height: 22px; +} +.data .item .type .type-icon { + width: 40px; + height: 40px; + position: absolute; + bottom: 40px; + right: 0; +} .data .item .operate { height: 80px; position: relative; diff --git a/css/index.less b/css/index.less index 751f654..865e142 100644 --- a/css/index.less +++ b/css/index.less @@ -318,6 +318,7 @@ object-fit: contain; margin-right: 10px; } + .info { .school { font-size: 14px; @@ -560,6 +561,31 @@ margin-bottom: 12px; } + .type { + // position: absolute; + // bottom: 0; + // left: 0; + width: 284px; + height: 40px; + background: -webkit-linear-gradient(164.344315300508deg, rgba(207, 247, 255, 1) -38%, rgba(239, 240, 209, 1) 31%, rgba(207, 247, 255, 1) 115%); + background: -moz-linear-gradient(-74.344315300508deg, rgba(207, 247, 255, 1) -38%, rgba(239, 240, 209, 1) 31%, rgba(207, 247, 255, 1) 115%); + background: linear-gradient(-74.344315300508deg, rgba(207, 247, 255, 1) -38%, rgba(239, 240, 209, 1) 31%, rgba(207, 247, 255, 1) 115%); + border-radius: 0 0 12px 12px; + margin-left: -15px; + .type-name { + width: 83px; + height: 22px; + } + + .type-icon { + width: 40px; + height: 40px; + position: absolute; + bottom: 40px; + right: 0; + } + } + .operate { height: 80px; position: relative; @@ -651,7 +677,7 @@ top: 0; left: 0; } - + .already { font-size: 14px; color: #7f7f7f; diff --git a/html/index.html b/html/index.html index 7ec756f..0488062 100644 --- a/html/index.html +++ b/html/index.html @@ -204,6 +204,12 @@
+ + +
+ + +
@@ -363,7 +369,7 @@ // 初始化 const init = () => { - $ajaxget("/api/project.home/basicData").then(result => { + $ajaxget("/api/home/basicData").then(result => { const data = result.data || {} user.value = data.user university.value = data.university @@ -382,7 +388,7 @@ // 今日缘分项目 let fateProject = ref([]) const getFate = () => { - $ajaxget("/api/project.home/todayFateProject").then(res => { + $ajaxget("/api/home/todayFateProject").then(res => { if (res.code != 200) return const data = res.data || [] data.forEach(element => { @@ -398,7 +404,7 @@ // 获取 招生官项目 const getAdmission = () => { - $ajaxget("/api/project.lists", { + $ajaxget("/api/lists", { limit: 20, page: 1, admissionsproject: 1, @@ -458,7 +464,7 @@ // 获取项目数据 const getProjectData = () => { if (projectPage == 0) return - $ajaxget("/api/project.lists", { + $ajaxget("/api/lists", { limit: 20, page: projectPage, }).then(res => { @@ -511,7 +517,7 @@ const random = item.random if (item.status == 1) return - $ajax("/api/project.contrast/add", { + $ajax("/api/contrast/add", { projectid: item.id, }).then(res => { baseRef.value.calculate(random) @@ -657,10 +663,9 @@ } const manageEmpty = computed(() => { - return typeList.value[typeIndex.value]['count'] == 0 + return typeList.value[typeIndex.value]["count"] == 0 }) - const isPitchExceedOne = computed(() => { return contrastList.value.filter(item => item.pitch).length >= 1 }) @@ -685,7 +690,7 @@ let quickList = ref([]) // 获取快速列表 const getQuickList = () => { - $ajaxget("/api/project.contrast/getQuickList", {}).then(res => { + $ajaxget("/api/contrast/getQuickList", {}).then(res => { if (res.code != 200) return const data = res.data quickList.value = data || [] @@ -700,7 +705,7 @@ // 点击删除快速对比 const quickDelete = index => { const data = quickList.value[index] - $ajax("/api/project.contrast/deleteQuick", { + $ajax("/api/contrast/deleteQuick", { id: data.id, }).then(res => { quickList.value.splice(index, 1) @@ -711,7 +716,7 @@ const contrastDelete = () => { contrastList.value.forEach((element, index) => { if (element["pitch"]) { - $ajax("/api/project.contrast/delete", { + $ajax("/api/contrast/delete", { projectid: element.projectid, }).then(res => { contrastList.value[index]["status"] = false @@ -723,7 +728,7 @@ // 公共的获取列表 方法 const getList = (obj = {}) => { return new Promise((resolve, reject) => { - $ajax("/api/project.user", { + $ajax("/api/user", { limit: 2000, page: obj.page || 1, typeid: obj.typeid || "", @@ -760,7 +765,7 @@ const inputblur = index => { const target = manageList.value[index] - $ajax("/api/project.user/remarks", { + $ajax("/api/user/remarks", { token: target.token, remarks: target.remarks, }).then(res => { @@ -791,7 +796,7 @@ const cutManageState = (typeid, index) => { const target = manageList.value[index] || {} - $ajax("/api/project.user/changeType", { + $ajax("/api/user/changeType", { token: target.token, typeid, }).then(res => { diff --git a/img/angle.svg b/img/angle.svg new file mode 100644 index 0000000..a065adf --- /dev/null +++ b/img/angle.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/js/common.js b/js/common.js index 3689814..a184844 100644 --- a/js/common.js +++ b/js/common.js @@ -1,7 +1,9 @@ const projectBaseURL = "https://project.gter.net" + if (["localhost", "127.0.0.1"].includes(location.hostname)) { + console.log(111); axios.defaults.headers = { - "Authorization": "813blr43ue2hhf2kjnlfibyy9swlxm2x", + "Authorization": "e0ebd36621dc8578fdd6f177b00a8e7b", } } @@ -9,7 +11,7 @@ function $ajax(url) { var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {} url = url.indexOf("https://") > -1 ? url : projectBaseURL + url - // data["authorization"] = "813blr43ue2hhf2kjnlfibyy9swlxm2x" + // data["authorization"] = "e0ebd36621dc8578fdd6f177b00a8e7b" return new Promise(function (resolve, reject) { axios @@ -35,7 +37,7 @@ function $ajax(url) { function $ajaxget(url, data) { if (!data) data = {} - // data["authorization"] = "813blr43ue2hhf2kjnlfibyy9swlxm2x" + // data["authorization"] = "e0ebd36621dc8578fdd6f177b00a8e7b" url = url.indexOf("https://") > -1 ? url : projectBaseURL + url url += objectToQueryString(data)