From 264a2c1e93e9b9cd3c7e0568b656325b12b008ec Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 25 八月 2025 15:59:03 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website
---
src/views/home/index.vue | 270 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 209 insertions(+), 61 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 974cb22..a6ede68 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,17 +1,17 @@
<template>
<div class="homePage">
- <el-carousel :height="screenheight + 'px'">
+ <el-carousel :height="'615px'">
<el-carousel-item v-for="(item, index) in banner" :key="index">
<div class="bannerBox imgBox">
<img id="autoHeight" class="bannerImg" :src="item.icon" @click="bannerLink(item)" />
</div>
</el-carousel-item>
</el-carousel>
- <div class="contentBox" style="margin-top: 50px">
+ <div v-if="informationList.length > 0" class="contentBox" style="margin-top: 50px">
<div class="informationBox">
<div class="bookListTitle">
<div class="title">鏂伴椈璧勮</div>
- <div class="more">鏇村></div>
+ <div class="more" @click="toMore">鏇村></div>
</div>
<div class="informationList">
<div class="informationItem" v-for="(item, index) in informationList" :key="index">
@@ -29,25 +29,23 @@
<div class="contentBox">
<div class="bookListTitle">
<div class="title">鎺ㄨ崘鏁欐潗</div>
- <div class="more">鏇村></div>
+ <div class="more" @click="toMore">鏇村></div>
</div>
<div class="recommendList">
- <div class="recommendItem" v-for="item in bookListData" :key="item.id">
+ <div class="recommendItem" v-for="item in bookListData" :key="item.id" @click="toDetail(item)">
<div class="recommendItemImg">
<img class="autoImg" :src="item.icon" />
</div>
<div class="infoBox">
<div class="bookName">{{ item.name }}</div>
<div class="author">
- 浣滆�咃細{{ item.authorcaupress_author ? item.caupress_author : '-' }}
+ {{ item.author ? item.author : '-' }} 钁�
</div>
<div class="priceBox">
- <span class="oldPrice" v-if="item.oldPrice">鍘熶环锛毬{ item.oldPrice }}</span>
<span class="price" v-if="item.price && item.price > 0">
- 瀹氫环锛毬�
- <span>{{ item.price }}</span>
+ <span> 楼{{ item.price }}</span>
</span>
- <span class="price" v-else> 瀹氫环锛�<span class="freePrice">鍏嶈垂</span> </span>
+ <span class="oldPrice" v-if="item.oldPrice"> 楼{{ item.oldPrice }}</span>
</div>
</div>
</div>
@@ -58,16 +56,18 @@
<div class="funBox">
<div class="authentication">
<div class="cardNav" @click="toAuthentication(true)">
+ <img id="rightImg" src="@/assets/images/xiehe/home/jxfw.png" alt="">
<div class="cardTitle">鏁欏笀璁よ瘉</div>
<div class="cardText">
- 瀛︽牎浠昏鑰佸笀涓婁紶鏁欏笀璇佹槑鏂囦欢锛岄�氳繃璁よ瘉鍚庯紝鍙繘琛屾牱涔︿笌鏁欏璧勬簮涓嬭浇鐢宠
+ 瀛︽牎浠昏鑰佸笀涓婁紶鏁欏笀璇佹槑鏂囦欢锛岄�氳繃璁よ瘉鍚庯紝鍙繘琛屾暟瀛楁暀鏉愯瘯鐢ㄧ敵璇峰強寮�璇惧紑鐝�
</div>
</div>
</div>
<div class="manual">
<div class="cardNav" @click="toAuthentication(false)">
+ <img id="rightImg" src="@/assets/images/xiehe/home/jxfw.png" alt="">
<div class="cardTitle">鎿嶄綔鎵嬪唽</div>
- <div class="cardText">蹇�熶簡瑙ｄ娇鐢ㄦ楠わ紝杞绘澗寮�鍚暀瀛︽敮鎸佷箣鏃呫��</div>
+ <div class="cardText">蹇�熶簡瑙ｄ娇鐢ㄦ楠わ紝杞绘澗寮�鍚暀瀛︽敮鎸佷箣鏃�</div>
</div>
</div>
</div>
@@ -77,35 +77,29 @@
<div>鏁欏瀵艰埅</div>
<div class="titleTabs" v-if="classfeild.length > 0">
<el-tabs v-model="activeName" @tab-change="handleClick">
- <el-tab-pane
- v-for="item in classfeild"
- :key="item.value"
- :label="item.name"
- :name="item.value"
- />
+ <el-tab-pane v-for="item in classfeild" :key="item.value" :label="item.name" :name="item.value" />
</el-tabs>
</div>
+ <div class="more" style="margin-left: 30px; font-weight: normal" @click="toMore">
+ 鏇村>
+ </div>
</div>
-
- <div class="more">鏇村></div>
</div>
<div class="recommendList">
- <div class="recommendItem" v-for="item in navBookList" :key="item.id">
+ <div class="recommendItem" v-for="item in navBookList" :key="item.id" @click="toDetail(item)">
<div class="recommendItemImg">
<img class="autoImg" :src="item.icon" />
</div>
<div class="infoBox">
<div class="bookName">{{ item.name }}</div>
<div class="author">
- 浣滆�咃細{{ item.authorcaupress_author ? item.caupress_author : '-' }}
+ {{ item.author ? item.author : '-' }} 钁�
</div>
<div class="priceBox">
- <span class="oldPrice" v-if="item.oldPrice">鍘熶环锛毬{ item.oldPrice }}</span>
<span class="price" v-if="item.price && item.price > 0">
- 瀹氫环锛毬�
- <span>{{ item.price }}</span>
+ <span>楼{{ item.price }}</span>
</span>
- <span class="price" v-else> 瀹氫环锛�<span class="freePrice">鍏嶈垂</span> </span>
+ <span class="oldPrice" v-if="item.oldPrice">楼{{ item.oldPrice }}</span>
</div>
</div>
</div>
@@ -119,16 +113,22 @@
import moment from 'moment'
import { ElMessage } from 'element-plus'
import teacherCertification from '@/views/personalCenter/teacherCertification.vue'
-import { ref, onBeforeMount, inject, reactive, onMounted } from 'vue'
+import { ref, onBeforeMount, inject, reactive, onMounted, watch } from 'vue'
let screenheight = ref(document.documentElement.clientHeight / 2)
+import { useRouter, useRoute } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
+
const MG = inject('MG')
const config = inject('config')
+const logIn = inject('logIn')
const tool = inject('tool')
const toolClass = inject('toolClass')
const banner = reactive([])
const informationList = reactive([])
let classfeild = ref([])
let activeName = ref('A1')
+let callbackLink = ref(null)
let bookListData = ref([])
let navBookList = ref([])
@@ -144,13 +144,55 @@
}
})
+// 鑾峰彇url鍙傛暟
+const getUrlParams = () => {
+ let url = window.location.href
+ let params = url.split('?')[1]
+ let paramsObj = {}
+ if (params) {
+ paramsObj = params.split('&').reduce((pre, cur) => {
+ pre[cur.split('=')[0]] = cur.split('=')[1]
+ return pre
+ }, {})
+ }
+ return paramsObj
+}
+
onMounted(() => {
+ // 鐩戝惉鏄惁鏉ヨ嚜鏁板瓧闃呰
+ const params = getUrlParams()
+ if (params.login) {
+ localStorage.setItem('loginBack', decodeURIComponent(params.callBackUrl))
+ logIn()
+ }
getBanner()
classifList()
getInformationList()
getBookList()
getNavBookList()
})
+
+watch(
+ () => route, // 鐩戝惉 path 鍙樺寲
+ (newPath, oldPath) => {
+ console.log('璺敱璺緞浠�', oldPath, '鍙樹负', newPath)
+ },
+)
+
+const toMore = () => {
+ router.push({
+ path: '/bookStore',
+ })
+}
+
+const toDetail = (item) => {
+ router.push({
+ path: '/bookdetail',
+ query: {
+ bookId: item.id,
+ },
+ })
+}
const handleClick = (tab, event) => {
console.log(tab)
@@ -175,10 +217,8 @@
value: item.value,
}
})
- console.log(noCheck, 'noCheck')
classfeild.value = noCheck
- console.log(classfeild, 'classfeild')
})
}
@@ -194,10 +234,10 @@
},
fields: {
'teachingLevel=': activeName.value,
+ author: [],
},
})
.then((res) => {
- console.log(res, '11111111111')
navBookList.value = res.datas
})
}
@@ -243,7 +283,11 @@
const toAuthentication = (type) => {
if (type) {
- teacherDialog.value = true
+ if (localStorage.getItem(config.tokenKey)) {
+ teacherDialog.value = true
+ } else {
+ logIn()
+ }
} else {
ElMessage({
message: '寤鸿涓�...',
@@ -262,10 +306,10 @@
},
fields: {
author: [],
+ isbn: []
},
})
.then((res) => {
- console.log(res, '鎺ㄨ崘鏁欐潗')
bookListData.value = res.datas
})
}
@@ -303,7 +347,29 @@
min-height: calc(100vh - 61.8%);
background-color: #fff;
padding-bottom: 100px;
+
+ .bannerBox {
+ height: 615px;
+ position: relative;
+ .bannerText {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ font-size: 36px;
+ font-weight: 700;
+ color: #fff;
+ text-shadow: 0px 0px 10px #000000;
+ text-align: center;
+ }
+ .enText {
+ font-size: 28px;
+ opacity: 0.45;
+ margin-top: 10px;
+ }
+ }
}
+
.el-carousel__item h3 {
color: #475669;
opacity: 0.75;
@@ -323,6 +389,7 @@
.informationList {
display: flex;
flex-wrap: wrap;
+
.informationItem {
display: flex;
width: 42%;
@@ -333,14 +400,17 @@
border-radius: 10px;
padding: 10px;
cursor: pointer;
+
.imgBox {
width: 30%;
height: 100%;
position: relative;
}
+
.informationContent {
width: 70%;
padding-left: 10px;
+
.informationTitle {
font-size: 14px;
width: 100%;
@@ -351,30 +421,37 @@
font-weight: bold;
margin-bottom: 10px;
}
+
.informationDate {
margin-top: 10px;
}
+
.informationText {
color: #666666;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
margin-top: 10px;
- display: -webkit-box; /* 灏嗗璞′綔涓哄脊鎬т几缂╃洅瀛愭ā鍨嬫樉绀� */
- -webkit-line-clamp: 3; /* 鏄剧ず鐨勮鏁� */
- -webkit-box-orient: vertical; /* 璁剧疆鎴栨绱几缂╃洅瀵硅薄鐨勫瓙鍏冪礌鐨勬帓鍒楁柟寮� */
- overflow: hidden; /* 婧㈠嚭闅愯棌 */
+ display: -webkit-box;
+ /* 灏嗗璞′綔涓哄脊鎬т几缂╃洅瀛愭ā鍨嬫樉绀� */
+ -webkit-line-clamp: 3;
+ /* 鏄剧ず鐨勮鏁� */
+ -webkit-box-orient: vertical;
+ /* 璁剧疆鎴栨绱几缂╃洅瀵硅薄鐨勫瓙鍏冪礌鐨勬帓鍒楁柟寮� */
+ overflow: hidden;
+ /* 婧㈠嚭闅愯棌 */
}
}
}
- .informationItem:hover {
- border: 1px solid #019e58;
- }
+
+ // .informationItem:hover {
+ // border: 1px solid #019e58;
+ // }
}
+
.bookListBox {
width: 100%;
padding: 80px 0;
- margin-top: 30px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url('@/assets/images/tuijian-bg.png');
@@ -389,45 +466,81 @@
.recommendItem {
flex: 1;
margin-right: 20px;
- height: 300px;
+ width: 261px;
+ height: 389px;
background-repeat: no-repeat;
background-size: 100% 100%;
cursor: pointer;
border: 1px solid #dedede;
background-color: #fff;
padding-top: 10px;
+ background: rgba(255, 255, 255, 0.73);
+ border-radius: 8px 8px 8px 8px;
+ border: 1px solid #DEDEDE;
+ box-sizing: border-box;
+ padding: 30px 0;
+
&:last-child {
margin-right: 0;
}
}
+
+ .recommendItem:hover {
+ background-image: url(@/assets/images/Mouse_fill.png);
+ background-position: center;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ }
}
.recommendItemImg {
- width: 150px;
- height: 200px;
+ width: 156px;
+ height: 210px;
position: relative;
margin: 0 auto;
}
.infoBox {
text-align: center;
- margin-top: 10px;
+ padding: 20px 0;
+ box-sizing: border-box;
+ font-family: Microsoft YaHei UI, Microsoft YaHei UI;
+ box-sizing: border-box;
}
+
+.bookName {
+ font-weight: bold;
+ font-size: 18px;
+ color: #000000;
+ font-weight: 700;
+}
+
.author {
- margin-top: 10px;
+ font-weight: 400;
+ font-size: 16px;
+ color: #333333;
+ padding: 15px 0;
+ box-sizing: border-box;
}
+
.priceBox {
- margin-top: 10px;
+ font-family: DIN, DIN;
+ font-weight: 500;
+ font-size: 18px;
+ color: #D91523;
+ padding: 15px 0;
+ box-sizing: border-box;
+
.oldPrice {
- font-size: 16px;
- color: #444444;
+ color: #999999;
text-decoration: line-through;
- margin-right: 20px;
+ margin-left: 20px;
}
+
.price {
span {
font-weight: bold;
- font-size: 14px;
+ color: #d91523;
}
}
}
@@ -438,26 +551,29 @@
align-items: center;
margin-top: 60px;
margin-bottom: 60px;
+
.authentication {
- width: 40%;
- height: 100px;
+ width: 650px;
+ height: 123px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-image: url('@/assets/images/xiehe/home/jiaoshirenzheng.png');
}
+
.manual {
- width: 40%;
- height: 100px;
+ width: 650px;
+ height: 123px;
background-repeat: no-repeat;
background-size: 100% 100%;
- background-image: url('@/assets/images/xiehe/home/jiaoshirenzheng.png');
+ background-image: url('@/assets/images/xiehe/home/caozuoshouce.png');
}
}
.titleTabs {
margin-left: 50px;
- width: 70%;
+ width: 85%;
}
+
.bookListTitle {
display: flex;
justify-content: space-between;
@@ -466,30 +582,62 @@
border-bottom: 1px solid #ebebeb;
padding-bottom: 20px;
+
.title {
font-size: 20px;
color: #333333;
font-weight: bold;
}
+
.more {
font-size: 14px;
color: #999999;
cursor: pointer;
+ font-weight: 500;
}
}
+
.cardNav {
- margin-left: 30%;
+ margin-left: 150px;
margin-top: 20px;
padding-right: 20px;
cursor: pointer;
+ position: relative;
+
+ #rightImg {
+ position: absolute;
+ right: 48px;
+ top: 26px;
+ height: 30px;
+ }
+
.cardTitle {
- font-size: 28px;
- color: #ffffff;
+ font-family: JDLangZhengTi, JDLangZhengTi;
+ font-weight: 400;
+ font-size: 32px;
+ color: #FFFFFF;
+ margin-bottom: 5px;
+ font-weight: 500;
}
+
.cardText {
+ width: 351px;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
font-size: 14px;
- color: #ccc;
- margin-top: 10px;
+ color: #FFFFFF;
+ line-height: 25px;
}
+
+
+}
+
+::v-deep(.el-tabs__item) {
+ height: 50px;
+ line-height: 22px;
+ text-align: center;
+ padding: 15px 0;
+ box-sizing: border-box;
+ margin: 0 10px;
}
</style>
--
Gitblit v1.9.1