新版楼层装修样式修改以及链接修改

master
Yer 2023-04-21 17:25:16 +08:00
parent 531ed5b2dd
commit 2213f0d0ce
12 changed files with 47 additions and 187 deletions

View File

@ -296,7 +296,11 @@ li {
justify-content: center; justify-content: center;
} }
.width_1200_auto {
width: 1184px;
margin: 0 auto;
}

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="navbar" :class="{'small-search-box':useClass == 'fixed-show'}"> <div class="navbar" :class="{'small-search-box':useClass == 'fixed-show'}">
<div class="container flex flex-a-c"> <div class="container width_1200_auto flex flex-a-c">
<img <img
:src="$store.state.logoImg" :src="$store.state.logoImg"
v-if="showLogo" v-if="showLogo"
@ -17,7 +17,7 @@
@keyup.enter.native="search" @keyup.enter.native="search"
> >
<div class="search-icon" slot="append"> <div class="search-icon" slot="append" @click="search">
<Icon type="ios-search" size="21"/> <Icon type="ios-search" size="21"/>
</div> </div>
</i-input> </i-input>
@ -130,14 +130,10 @@ export default {
margin: 0 !important; margin: 0 !important;
} }
.search-input {
}
.container { .container {
position: relative; position: relative;
width: 1200px;
margin: 0 auto;
height: 100%; height: 100%;
} }

View File

@ -20,9 +20,9 @@ export default {
path:"/home" path:"/home"
}, },
{ {
icon:"consumer", icon:"carts",
label:"客服", label:"购物车",
path:"/home" path:"/cart"
}, },
{ {
icon:"notification", icon:"notification",
@ -30,9 +30,9 @@ export default {
path:"/home/MsgList" path:"/home/MsgList"
}, },
{ {
icon:"feedback", icon:"collage",
label:"反馈", label:"收藏",
path:"/home" path:"/home/Favorites"
}, },
{ {
icon:"back", icon:"back",
@ -69,6 +69,8 @@ export default {
handleClickIcon(val){ handleClickIcon(val){
if(val.path === 'back'){ if(val.path === 'back'){
this.scrollToTop() this.scrollToTop()
}else{
this.$router.push(val.path)
} }
} }
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="box"> <div class="box">
<div class="nav"> <div class="nav width_1200_auto">
<ul class="location flex"> <ul class="location flex">
<li v-if="$route.path.includes('home')" style="margin-left:10px"> <li v-if="$route.path.includes('home')" style="margin-left:10px">
<router-link to="/">首页</router-link> <router-link to="/">首页</router-link>
@ -199,8 +199,6 @@ export default {
} }
.nav { .nav {
margin: 0 auto;
width: 1200px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;

View File

@ -1,62 +0,0 @@
<template>
<div class="shop-box">
<div class="shop-container">
<div class="shop-title-content">
<img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
<p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
<div class="ml_20" v-html="storeDetail.storeDesc"></div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'ShopHeader',
props: {
detail: {
type: Object,
default: null
}
},
computed: {
storeDetail () { //
return this.detail;
}
}
};
</script>
<style scoped>
/* 店铺介绍 */
.shop-box {
width: 100%;
height: 50px;
background-color: #484848;
}
.shop-container {
width: 1200px;
height: 100%;
margin: 0px auto;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
color: #fff;
}
.shop-title-content {
display: flex;
align-items: center;
}
.shop-title-content p {
font-size: 20px;
margin-left: 20px;
}
.shop-title-content a {
color: #fff;
}
</style>

View File

@ -234,9 +234,4 @@ export default {
} }
} }
.width_1200_auto {
width: 1184px;
margin: 0 auto;
}
</style> </style>

View File

@ -110,19 +110,23 @@ export default {
appendList:[ appendList:[
{ {
icon:"support", icon:"support",
label:"帮助中心" label:"帮助中心",
path:"/article"
}, },
{ {
icon:"feedback", icon:"feedback",
label:"问题反馈" label:"我的评论",
path:"/home/CommentList"
}, },
{ {
icon:"notice", icon:"notice",
label:"平台公告" label:"收货地址",
path:"/home/MyAddress"
}, },
{ {
icon:"notification", icon:"notification",
label:"我的消息" label:"我的消息",
path:"/home/MsgList"
}, },
], ],
recentList:[ recentList:[
@ -148,7 +152,6 @@ export default {
methods: { methods: {
// //
entryControl(val){ entryControl(val){
console.log(val)
this.$router.push(val.path) this.$router.push(val.path)
}, },
}, },
@ -322,7 +325,7 @@ export default {
float: left; float: left;
padding: 0px; padding: 0px;
color: #fff; color: #fff;
background-color: #6e6568; // background-color: #6e6568;
} }

View File

@ -65,12 +65,12 @@ export default {
handleScrollx(){ handleScrollx(){
// console.log('',window.pageYOffset) // // console.log('',window.pageYOffset) //
// console.log(this.$refs.obtain.getBoundingClientRect().top) // // console.log(this.$refs.obtain.getBoundingClientRect().top) //
this.scrollHieght = Number(window.pageYOffset);// // this.scrollHieght = Number(window.pageYOffset);//
this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); // // this.scrollTops = Number(this.$refs.obtain.getBoundingClientRect().top); //
this.topSearchShow = true; // // this.topSearchShow = true; //
if(this.scrollTops < -660){ // // if(this.scrollTops < -660){ //
this.topSearchShow = false; // this.topSearchShow = false;
} // }
}, },
toguid(path,id){ toguid(path,id){
var path =path; var path =path;
@ -81,7 +81,7 @@ export default {
change(status){ // change(status){ //
this.open = status this.open = status
}, },
gotoDemo(){ // demo gotoDemo(){ // demo
if(this.open){ // if(this.open){ //
document.querySelector("#demo").scrollIntoView(true); document.querySelector("#demo").scrollIntoView(true);
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="cate-nav" :class="{'fixed-show':useClass == 'fixed-show'}"> <div class="cate-nav width_1200_auto" :class="{'fixed-show':useClass == 'fixed-show'}">
<div class="nav-con" > <div class="nav-con" :class="{'background-white':useClass == 'background-white'}">
<div <div
class="all-categories hover-pointer" class="all-categories hover-pointer"
@mouseenter="showFirstLists" @mouseenter="showFirstLists"
@ -23,6 +23,7 @@
<!-- 全部商品分类 --> <!-- 全部商品分类 -->
<div <div
class="cate-list" class="cate-list"
:style="{'top':!showNavBar ?'60px':'46px'}"
v-show="showAlways || showFirstList" v-show="showAlways || showFirstList"
@mouseenter="showFirstList = true" @mouseenter="showFirstList = true"
@mouseleave="showFirstList = false" @mouseleave="showFirstList = false"
@ -227,6 +228,9 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.background-white{
background: #fff;
}
.nav-lis:hover { .nav-lis:hover {
color: $theme_color !important; color: $theme_color !important;
cursor: pointer; cursor: pointer;
@ -257,13 +261,11 @@ export default {
right: 0; right: 0;
} }
.cate-nav { .cate-nav {
width: 1200px;
position: relative; position: relative;
margin: 14px auto 0 auto; margin: 14px auto 0 auto;
} }
/** 商品分类 */ /** 商品分类 */
.nav-con { .nav-con {
width: 1200px;
height: 46px; height: 46px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
@ -309,6 +311,7 @@ export default {
.cate-list { .cate-list {
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
z-index: 1000; z-index: 1000;
} }

View File

@ -3,7 +3,6 @@
<BaseHeader></BaseHeader> <BaseHeader></BaseHeader>
<Search></Search> <Search></Search>
<drawer></drawer> <drawer></drawer>
<ShopHeader :detail="storeMsg"></ShopHeader>
<div class="shop-item-path"> <div class="shop-item-path">
<div class="shop-nav-container"> <div class="shop-nav-container">
<Breadcrumb> <Breadcrumb>
@ -39,7 +38,7 @@
<script> <script>
import Search from "@/components/Search"; import Search from "@/components/Search";
import ShopHeader from "@/components/header/ShopHeader";
import ShowGoods from "@/components/goodsDetail/ShowGoods"; import ShowGoods from "@/components/goodsDetail/ShowGoods";
import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail"; import ShowGoodsDetail from "@/components/goodsDetail/ShowGoodsDetail";
import { goodsSkuDetail } from "@/api/goods"; import { goodsSkuDetail } from "@/api/goods";
@ -176,7 +175,6 @@ export default {
watch: {}, watch: {},
components: { components: {
Search, Search,
ShopHeader,
ShowGoods, ShowGoods,
ShowGoodsDetail, ShowGoodsDetail,
}, },

View File

@ -1,9 +1,9 @@
<template> <template>
<div> <div class="wrapper">
<BaseHeader></BaseHeader> <BaseHeader></BaseHeader>
<Search @search="handleSearch"></Search> <Search @search="handleSearch"></Search>
<drawer></drawer> <drawer></drawer>
<cateNav></cateNav> <cateNav useClass="background-white"></cateNav>
<div class="container"> <div class="container">
<!-- 商品筛选栏 --> <!-- 商品筛选栏 -->
<GoodsClassNav @getParams="getParams"></GoodsClassNav> <GoodsClassNav @getParams="getParams"></GoodsClassNav>
@ -261,6 +261,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "../assets/styles/goodsList.scss"; @import "../assets/styles/goodsList.scss";
.goods-show-info > .goods-show-seller > .goods-show-buyer { .goods-show-info > .goods-show-seller > .goods-show-buyer {
width: 35px; width: 35px;
height: 17px; height: 17px;
@ -288,7 +289,7 @@ export default {
} }
.container { .container {
margin: 15px auto; margin: 15px auto;
width: 1200px; width: 1184px;
min-width: 1000px; min-width: 1000px;
position: relative; position: relative;
} }
@ -299,92 +300,14 @@ export default {
display: flex; display: flex;
} }
/* ---------------侧边广告栏开始------------------- */ /* ---------------侧边广告栏开始------------------- */
.as-box {
width: 200px;
border: 1px solid #ccc;
}
.goods-show-right { .goods-show-right {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: 5px; margin-top: 5px;
} }
.goods-show-self {
float: left;
height: 16px;
line-height: 16px;
padding: 0 3px;
margin-right: 3px;
overflow: hidden;
text-align: center;
font-style: normal;
font-size: 12px;
background: #e23a3a;
color: #fff;
border-radius: 2px;
}
.goods-show-middle {
float: left;
height: 16px;
line-height: 16px;
padding: 0 3px;
margin-right: 3px;
overflow: hidden;
text-align: center;
font-style: normal;
font-size: 12px;
border: 1px solid rgba(112, 123, 187, 0.8);
color: rgba(112, 123, 187, 0.8);
}
// .goods-show-middle:hover {
// color: rgba(2, 15, 88, 0.6);
// border: 0.2px solid rgba(0, 13, 87, 0.6);
// border-radius: 4px;
// line-height: 18px;
// }
.item-as-title {
width: 100%;
height: 36px;
color: $theme_color;
line-height: 36px;
font-size: 18px;
}
.item-as-title span:first-child {
margin-left: 20px;
}
.item-as-title span:last-child {
float: right;
margin-right: 15px;
font-size: 10px;
color: rgb(204, 204, 204);
}
.item-as {
width: 160px;
margin: 18px auto;
}
.item-as-img {
width: 160px;
height: 160px;
margin: 0px auto;
}
.item-as-price span {
font-size: 18px;
}
.item-as-intro {
margin-top: 5px;
font-size: 12px;
}
.item-as-selled {
margin-top: 5px;
font-size: 12px;
}
.item-as-selled span {
color: #005aa0;
}
/* ---------------侧边广告栏结束------------------- */
/* ---------------商品栏开始------------------- */ /* ---------------商品栏开始------------------- */
.goods-list-box { .goods-list-box {

View File

@ -194,7 +194,7 @@ export default {
"Button", "Button",
{ {
props: { props: {
type: "success", type: "primary",
size: "small", size: "small",
}, },
style: { style: {
@ -216,7 +216,7 @@ export default {
"Button", "Button",
{ {
props: { props: {
type: "primary", type: "default",
size: "small", size: "small",
}, },
style: { style: {