Skip to content

E
ElectricitySheep
Commit 67bc466d authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 2d6e888c a5651e47
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 918 additions and 4 deletions
src/assets/css/zkcss.css
View file @ 67bc466d
......@@ -43,3 +43,9 @@ input, textarea, select{
word-break: break-all;
-webkit-line-clamp: 1;
}
.el-card__header {
padding: 18px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
src/components/StoreDesign/customPoster.vue 0 → 100644
View file @ 67bc466d
This diff is collapsed.
src/components/StoreDesign/thematicPosters.vue 0 → 100644
View file @ 67bc466d
<template>
<div>
123
</div>
</template>
\ No newline at end of file
src/components/common/PictureCheck.vue 0 → 100644
View file @ 67bc466d
<style>
.app-style-multi-map .goods-one, .goods-two, .goods-three, .goods-four {
height: 100%;
width: 100%;
}
.app-style-multi-map .goods-three .el-image:nth-child(1) {
height: 50%;
width: 100%;
}
.app-style-multi-map .goods-three .el-image:nth-child(2) {
height: 50%;
width: 50%;
}
.app-style-multi-map .goods-three .el-image:nth-child(3) {
height: 50%;
width: 50%;
}
.goods-four .el-image{
width:50%;
height:50%;
}
.postimage_inner{
vertical-align: top;
width: 100%;
height: 100%;
object-fit: cover;
}
.goods-two .el-image{
height: 50%;
width: 100%;
}
.goods_one img{
width:100%;
height:100%;
}
.app-style-multi-map {
height: 100%;
width: 100%;
overflow: hidden;
}
.app-style-multi-map > div {
flex-wrap: wrap;
}
.app-style-multi-map .goods-five {
height: 100%;
width: 100%;
position: relative;
}
.app-style-multi-map .goods-five .el-image:nth-child(1) {
position: absolute;
top: 0;
left: 0;
height: 50%;
width: 50%;
}
.app-style-multi-map .goods-five .el-image:nth-child(2) {
position: absolute;
top: 50%;
left: 0;
height: 50%;
width: 50%;
}
.app-style-multi-map .goods-five .el-image:nth-child(3) {
position: absolute;
top: 0;
left: 50%;
height: 33.333%;
width: 50%;
}
.app-style-multi-map .goods-five .el-image:nth-child(4) {
position: absolute;
top: 33.33%;
left: 50%;
height: 33.333%;
width: 50%;
}
.app-style-multi-map .goods-five .el-image:nth-child(5) {
position: absolute;
top: 66.66%;
left: 50%;
height: 33.333%;
width: 50%;
}
</style>
<template>
<div class="app-style-multi-map">
<template v-if="pictureNum==1">
<div class="goods_one">
<img src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
</template>
<template v-else-if="pictureNum==2">
<div flex="dir:left" class="goods-two">
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
</div>
</template>
<template v-else-if="pictureNum==3">
<div flex="dir:left" class="goods-three">
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
</div>
</template>
<template v-else-if="pictureNum==4">
<div flex="dir:left" class="goods-four">
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
</div>
</template>
<template v-else-if="pictureNum==5">
<div flex="dir:left" class="goods-five">
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
<div class="el-image">
<img class="postimage_inner" src="../../assets/img/storeDesign/goods-url.png" alt=""/>
</div>
</div>
</template>
</div>
</template>
<script>
export default {
props: ["pictureNum"],
data() {
return {
};
},
created() {
},
methods: {
},
mounted() {
}
};
</script>
src/components/zanIndex.vue
View file @ 67bc466d
......@@ -162,10 +162,10 @@
border-radius: 4px;
overflow: hidden;
}
.el-card__header{
.el-zanIndex_btmheader{
padding: 14px 20px;
}
.el-card__header span{
.el-zanIndex_btmheader span{
/* float:left; */
height: 32px;
line-height: 32px;
......@@ -376,7 +376,7 @@
</div>
<div class="zantable-area">
<div class="el-card">
<div class="el-card__header">
<div class="el-zanIndex_btmheader">
<span>商品购买力TOP排行</span>
<el-button type="primary" class="ZexportBtn" size="mini">导出TOP100</el-button>
</div>
......@@ -434,7 +434,7 @@
</div>
</div>
<div class="el-card">
<div class="el-card__header">
<div class="el-zanIndex_btmheader">
<span>用户购买力TOP排行</span>
<el-button type="primary" class="ZexportBtn" size="mini">导出TOP100</el-button>
</div>
......
src/router/index.js
View file @ 67bc466d
......@@ -216,6 +216,12 @@ export default new Router({
path: '/userCenter',
name: 'userCenter',
component: resolve => require(['@/components/StoreDesign/userCenter'], resolve),
},
//店铺管理 自定义海报
{
path: '/customPoster',
name: 'customPoster',
component: resolve => require(['@/components/StoreDesign/customPoster'], resolve),
}
]
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment