diff --git a/src/App.vue b/src/App.vue
index 7c606247..d3bdee6f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
-
+
+
+
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index c1dfaf17..50b68eb6 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -148,7 +148,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -335,7 +338,7 @@ export default {
}
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
.ContentBox {
@@ -351,6 +354,7 @@ export default {
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
height: 59px;
@@ -393,7 +397,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
padding-left: 20px;
@@ -431,6 +435,11 @@ export default {
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
width: calc(100% - 20px);
@@ -480,6 +489,7 @@ export default {
}
.img {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 7b5f6ad8..31b05562 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -981,7 +981,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -1761,7 +1764,7 @@ export default {
}
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
.ContentBox {
@@ -1777,6 +1780,7 @@ export default {
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
height: 59px;
@@ -1819,7 +1823,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
padding-left: 20px;
@@ -1857,6 +1861,11 @@ export default {
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
width: calc(100% - 20px);
@@ -1906,6 +1915,8 @@ export default {
}
.img {
width: 835px;
+ height: 428px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index be67af95..8b2ac6f1 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -148,7 +148,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -497,7 +500,7 @@ export default {
}
.ClassBoxContentx {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
.ContentBoxx {
@@ -513,6 +516,7 @@ export default {
.leftBox {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.titlex {
width: 200px;
height: 59px;
@@ -555,7 +559,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_titlex {
width: 100%;
padding-left: 20px;
@@ -593,6 +597,11 @@ export default {
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cylx {
cursor: pointer;
width: calc(100% - 20px);
@@ -642,6 +651,7 @@ export default {
}
.imgx {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 3791854f..c80452a5 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -349,7 +349,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -385,7 +388,7 @@ import apiType from "@/api/modules/type.js";
import { cutFullName } from "@/utils/tools.js";
import apiPlace from "@/api/phase2/place.js"
export default {
- name: "index",
+ name: "case",
components: {
portalHeader,
portalFooter,
@@ -556,6 +559,32 @@ export default {
return !this.speciData.some(item => item.fielclass);
}
},
+ beforeRouteLeave (to, from, next) {
+ if(to.name !== 'caseDetail'){
+ console.log('我是外')
+ this.queryCondition.pageIndex = 1
+ this.search()
+ // window.location.reload()
+ // this.$destroy()
+ }else{
+ sessionStorage.setItem('pagesScroll', JSON.stringify(window.pageYOffset))
+ }
+ next()
+ },
+ beforeRouteEnter(to, from, next) {
+ if(from.name !== 'caseDetail'){
+ console.log('我是内')
+ }
+ next(vm=>{
+ vm.$nextTick(() => {
+ window.scrollTo({
+ left: 0,
+ top: JSON.parse(sessionStorage.getItem("pagesScroll")),
+ })
+ sessionStorage.removeItem("pagesScroll")
+ });
+ })
+ },
created() {
(() => {
const allData = {
@@ -621,7 +650,6 @@ export default {
}
dataList(allData[random])
})()
- // this.pageScroll = JSON.parse(sessionStorage.getItem("pagesScroll"))
},
mounted() {
let $this = this;
@@ -700,10 +728,6 @@ export default {
// window.addEventListener("scroll", this.handleScroll);
// 获取年
this.getYears();
- // if(this.pageScroll){
- // this.queryCondition.pageIndex = parseInt(this.pageScroll.pages)
- // this.queryCondition.type = this.pageScroll.type
- // }
},
beforeDestroy() {
// window.removeEventListener("scroll", this.handleScroll);
@@ -793,12 +817,6 @@ export default {
apiCase.startReadTimer(refId)
}
this.$router.push({ path: '/case/detail', query: { id } });
- // this.pageScroll = {
- // pages: this.queryCondition.pageIndex,
- // scrollTop: window.pageYOffset,
- // type: this.queryCondition.type
- // }
- // sessionStorage.setItem('pagesScroll', JSON.stringify(this.pageScroll))
},
tylClick() {
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
@@ -1300,16 +1318,6 @@ export default {
// 给所有的赋值
this.caseList.count = res.result.count;
this.caseList.showPagCount = res.result.count;
- // this.$nextTick(() => {
- // if(JSON.parse(sessionStorage.getItem("pagesScroll"))){
- // window.scrollTo({
- // left: 0,
- // top: JSON.parse(sessionStorage.getItem("pagesScroll")).scrollTop,
- // behavior: 'smooth'
- // })
- // sessionStorage.removeItem("pagesScroll")
- // }
- // });
} else {
this.$message.error(res.message);
}
@@ -1591,7 +1599,7 @@ export default {
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
@@ -1610,6 +1618,7 @@ export default {
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
@@ -1658,7 +1667,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
@@ -1702,6 +1711,11 @@ export default {
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
@@ -1759,6 +1773,7 @@ export default {
.img {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index fd69d227..7b235855 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -468,7 +468,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -1711,7 +1714,7 @@ console.log(res.result.list,'data')
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
@@ -1730,6 +1733,7 @@ console.log(res.result.list,'data')
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
@@ -1778,7 +1782,7 @@ console.log(res.result.list,'data')
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
@@ -1822,6 +1826,11 @@ console.log(res.result.list,'data')
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
@@ -1879,6 +1888,7 @@ console.log(res.result.list,'data')
.img {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
index 5eba2372..21dc6f92 100644
--- a/src/views/portal/follow/index.vue
+++ b/src/views/portal/follow/index.vue
@@ -196,7 +196,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -770,7 +773,7 @@
}
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
.ContentBox {
@@ -786,6 +789,7 @@
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
height: 59px;
@@ -828,7 +832,7 @@
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
padding-left: 20px;
@@ -866,6 +870,11 @@
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
width: calc(100% - 20px);
@@ -915,6 +924,7 @@
}
.img {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 1db2871a..630ce104 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -158,7 +158,10 @@
内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
-
@@ -528,7 +531,7 @@ export default {
}
.ClassBoxContent {
width: 100%;
- height: 456px;
+ height: 396px;
// background: red;
border-radius: 15px;
.ContentBox {
@@ -544,6 +547,7 @@ export default {
.left {
padding-left: 30px;
width: 48%;
+ margin-top: -32px;
.title {
width: 200px;
height: 59px;
@@ -586,7 +590,7 @@ export default {
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 160px;
- margin-top: 83px;
+ margin-top: 163px;
.tyl_title {
width: 100%;
padding-left: 20px;
@@ -624,6 +628,11 @@ export default {
border: 0.96px solid rgba(140, 105, 242, 1);
box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
}
+ .text_msg{
+ margin: 43px 0 0 222px;
+ font-size: 14px;
+ color: #000;
+ }
.cyl {
cursor: pointer;
width: calc(100% - 20px);
@@ -673,6 +682,7 @@ export default {
}
.img {
width: 835px;
+ height: 428px;
margin-left: -1px;
margin-top: -1px;
position: absolute;
diff --git a/src/views/user/MyAssess.vue b/src/views/user/MyAssess.vue
index 1a947c52..11d0965b 100644
--- a/src/views/user/MyAssess.vue
+++ b/src/views/user/MyAssess.vue
@@ -19,9 +19,9 @@
-->
- ![]()
+ ![]()
- 完成时间：{{item.date}}
+ 上传时间：{{item.date}}
@@ -98,9 +98,11 @@
agent:'pc'
}
apiBoeCourse.reportList(params).then(rs=>{
- this.testList = rs.result.reportList
+ this.testList = Array.isArray(rs.result.reportList)
+ ? rs.result.reportList
+ : Array.from(Object.values(rs.result.reportList));
+ // this.testList = rs.result.reportList
this.total = rs.result.count
-
})
},
textdetail(item){
@@ -110,10 +112,12 @@
// /course/boeframe
},
handleSizeChange(val) {
+ console.log(val,'sizeval')
this.size = val
this.findList()
},
handleCurrentChange(val) {
+ console.log(val,'pageval')
this.page = val
this.findList()
},