Skip to content

Y
ybf
Commit f36dc6ad authored by Z's avatar Z
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 9f8896ec 94d7af76
Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 3 deletions
ybf_wx/src/router/index.js
View file @ f36dc6ad
......@@ -18,12 +18,12 @@ const routes = [
{
path: '/createActive',
name: 'createActive',
component: () => import(/* webpackChunkName: "about" */ '../views/active/createActive.vue')
component: () => import('../views/active/createActive.vue')
},
{
path: '/activeList',
name: 'activeList',
component: () => import(/* webpackChunkName: "about" */ '../views/active/activeList.vue')
component: () => import('../views/active/activeList.vue')
},
{
path: '/discount',
......@@ -35,6 +35,26 @@ const routes = [
name: 'MainSale',
component: () => import('@/views/mainSale/active/main/index')
},
{
path: '/changeCounter',
name: 'changeCounter',
component: () => import('@/views/counter/changeCounter')
},
{
path: '/counterInfo',
name: 'counterInfo',
component: () => import('@/views/counter/counterInfo')
},
{
path: '/counterMaintain',
name: 'counterMaintain',
component: () => import('@/views/counter/counterMaintain')
},
{
path: '/goodManage',
name: 'goodManage',
component: () => import('@/views/goods/goodManage')
},
{
path: '/actTemplate',
name: 'ActTemplate',
......
ybf_wx/src/views/active/turntableDetail.vue
View file @ f36dc6ad
......@@ -30,7 +30,9 @@
export default {};
</script>
<style></style>
<style>
</style>
<style scoped>
p {
font-size: 12px;
......
ybf_wx/src/views/counter/changeCounter.vue 0 → 100644
View file @ f36dc6ad
<template>
<div class="container">
<div class="active">
<div class="list">
<div class="left">
<img src="../../../public/img/counter.png" alt="">
</div>
<div class="right">
<h3>欧亚一号专柜</h3>
<p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
</div>
</div>
<div class="list">
<div class="left">
<img src="../../../public/img/counter.png" alt="">
</div>
<div class="right">
<h3>欧亚一号专柜</h3>
<p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
</div>
</div>
<div class="list list3">
<div class="left">
<img src="../../../public/img/counter.png" alt="">
</div>
<div class="right">
<h3>欧亚一号专柜</h3>
<p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
</div>
</div>
</div>
</div>
</template>
<script>
export default {};
</script>
<style scoped>
.container {
height: 100%;
background-color: rgba(248, 248, 248, 1);
}
.title {
height: 44px;
background: rgba(248, 248, 248, 1);
line-height: 44px;
padding: 0 16px;
font-size: 12px;
color: rgba(45, 71, 106, 1);
}
.fg {
padding: 0 16px;
font-size: 12px;
color: rgba(45, 71, 106, 1);
height: 44px;
line-height: 44px;
}
.icon {
font-weight: 800;
}
.active {
background-color: #fff;
padding: 12px 12px 0 12px;
box-shadow:0px 2px 4px 0px rgba(221,221,221,1);
}
.list {
height: 94px;
width: 100%;
background-color: #fff;
display: flex;
justify-content: space-between;
border-bottom: 1px solid rgba(238,238,238,1);
margin-bottom: 14px;
}
.list3 {
border-bottom: none;
margin-bottom: 0;
}
.left,.right {
height: 80px;
}
.left {
width: 80px;
background:rgba(248,248,248,1);
}
.left img {
width: 100%;
}
.right {
width: 76%;
padding: 10px;
background-color: #fff;
}
h3 {
font-size: 14px;
font-weight:bold;
color:rgba(45,71,106,1);
}
p {
margin-top: 10px;
font-size:12px;
color:rgba(45,71,106,0.8);
}
</style>
ybf_wx/src/views/counter/counterInfo.vue 0 → 100644
View file @ f36dc6ad
<template>
<div class="container">
<div class="img">
<van-swipe :autoplay="3000">
<van-swipe-item>
<img src="../../../public/img/cswiper.png" />
</van-swipe-item>
<van-swipe-item>
<img src="../../../public/img/cswiper.png" />
</van-swipe-item>
<van-swipe-item>
<img src="../../../public/img/cswiper.png" />
</van-swipe-item>
</van-swipe>
</div>
<div class="list">
<div class="left">
<img src="../../../public/img/counter.png" alt="" />
</div>
<div class="right">
<h3>欧亚一号专柜</h3>
<p>由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状。</p>
</div>
</div>
<van-cell-group class="gn">
<van-cell title="专柜信息" is-link value="详细信息" />
<van-cell title="访问专柜首页" is-link value="详细信息" />
<van-cell title="专柜收款码" is-link value="详细信息" />
<van-cell title="推送门店信息" is-link value="详细信息" />
</van-cell-group>
</div>
</template>
<script>
export default {
data() {
return {};
}
};
</script>
<style scoped>
.gn >>> .van-cell__title{
font-size:14px;
font-weight:bold;
color:rgba(45,71,106,1);
}
.gn {
margin-top: 12px;
}
.container {
height: 100%;
background: rgba(248, 248, 248, 1);
}
.img {
width: 100%;
height: 200px;
background-color: pink;
}
.img img {
width: 100%;
}
.list {
height: 80px;
width: 100%;
background-color: #fff;
display: flex;
justify-content: space-between;
border-bottom: 1px solid rgba(238, 238, 238, 1);
box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1);
border-radius: 2px;
}
.list3 {
border-bottom: none;
margin-bottom: 0;
}
.left,
.right {
height: 80px;
}
.left {
width: 80px;
background: rgba(248, 248, 248, 1);
position: absolute;
top: 188px;
left: 10px;
}
.left img {
width: 100%;
}
.right {
width: 76%;
padding: 10px;
background-color: #fff;
margin-left: 94px;
}
h3 {
font-size: 14px;
font-weight: bold;
color: rgba(45, 71, 106, 1);
}
p {
margin-top: 10px;
font-size: 12px;
color: rgba(45, 71, 106, 0.8);
}
</style>
ybf_wx/src/views/counter/counterMaintain.vue 0 → 100644
View file @ f36dc6ad
<template>
<div class="container">
<div class="img">
<van-uploader class="upload">
<div class="circle">
<span class="add">+</span>
</div>
</van-uploader>
<div class="tj">
点击添加专柜主题图
</div>
<img src="../../../public/img/cswiper.png" />
</div>
<van-cell-group class="gn">
<van-cell title="专柜LOGO">
<template slot="default">
<van-uploader v-model="fileList" :max-count="1" class="input">
<div class="cube">
<van-icon name="photo" size="40" />
<div class="mb">点击替换</div>
</div>
</van-uploader>
</template>
</van-cell>
<van-cell title="专柜名称">
<template slot="default">
<van-field v-model="name" placeholder="输入名称" class="input" />
</template>
</van-cell>
<van-cell title="所在楼层">
<template slot="default">
<van-field v-model="floor" placeholder="输入楼层" class="input" />
</template>
</van-cell>
<van-cell title="专柜介绍" is-link value="点击输入" />
</van-cell-group>
<div class="creat">保存信息</div>
</div>
</template>
<script>
export default {
data() {
return {
name: "",
floor: "",
fileList: []
};
}
};
</script>
<style >
</style>
<style scoped>
.creat {
position: absolute;
left: 50%;
transform: translate(-50%);
width: 343px;
height: 40px;
line-height: 40px;
background: rgba(117, 178, 253, 1);
border-radius: 10px;
font-size: 16px;
font-weight: bold;
color: rgba(255, 255, 255, 1);
text-align: center;
bottom: 0;
}
.cube {
width: 48px;
height: 48px;
background: rgba(248, 248, 248, 1);
border-radius: 8px;
position: relative;
text-align: center;
}
.tj {
height: 32px;
line-height: 32px;
background: rgba(117, 178, 253, 0.8);
text-align: center;
font-size: 12px;
color: #fff;
position: absolute;
bottom: 0;
width: 100%;
}
.add {
font-size: 60px;
font-weight: 500;
color: #fff;
}
.circle {
width: 64px;
height: 64px;
background: rgba(255, 255, 255, 0.6);
border-radius: 50%;
line-height: 60px;
text-align: center;
}
.upload {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
.van-cell__value,
.van-cell__value--alone {
text-align: right;
}
.input {
padding: 0;
}
.gn >>> .van-field__control {
text-align: right;
}
.gn >>> .van-cell__title {
font-size: 14px;
font-weight: bold;
color: rgba(45, 71, 106, 1);
}
.gn {
margin-top: 12px;
}
.container {
height: 100%;
background: #F8F8F8;
}
.img {
width: 100%;
height: 200px;
background-color: pink;
position: relative;
}
.img img {
width: 100%;
}
.mb {
position: absolute;
width: 48px;
height: 16px;
bottom: 0;
line-height: 16px;
background-color: #8EBFFB;
font-size: 6px;
color: #fff;
}
.mb img {
height: 100%;
}
.cfx {
position: absolute;
width: 100%;
height: 100%;
}
</style>
ybf_wx/src/views/goods/goodManage.vue 0 → 100644
View file @ f36dc6ad
<template>
<div>
<div class="container">
<div class="search">
<van-search
v-model="inputValue"
placeholder="客官你要搜索点什么"
shape="round"
@search="onSearch"
>
</van-search>
</div>
<van-tabs
type="card"
@click="onClick"
title-active-color="#fff"
title-inactive-color="#2D476A"
class="tab"
background="#F8F8F8"
>
<van-tab title="已上架">
<div class="list">
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
</div>
</van-tab>
<van-tab title="未上架">
<div class="list">
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
<div class="good">
<div class="left">
<img src="../../../public/img/goods.png" />
</div>
<div class="center">
<div class="name">商品名称商品名称商品名称商品名称商品</div>
<h3>￥888</h3>
</div>
<div class="right">
<div class="sj" color="#75B2FD">上架</div>
</div>
</div>
</div>
</van-tab>
</van-tabs>
</div>
</div>
</template>
<script>
export default {
data() {
return {
inputValue: "",
lower: 2,
higger: 1
};
},
methods: {
onSearch() {},
onClick(name, title) {
this.$toast(title);
if (title == "已上架") {
this.higger = 1;
this.lower = 2;
} else {
this.higger = 2;
this.lower = 1;
}
}
}
};
</script>
<style scoped>
.tab >>> .van-tabs__nav--card .van-tab {
border-right: none;
}
.tab >>> .van-tab.van-tab--active {
background-color: #75B2FD;
}
.sj {
width: 64px;
height: 32px;
background: rgba(117, 178, 253, 1);
border-radius: 8px;
line-height: 32px;
text-align: center;
font-size: 14px;
color: #fff;
margin-top: 20px;
}
h3 {
font-size: 14px;
color: rgba(208, 2, 27, 1);
margin-top: 18px;
}
.name {
font-size: 14px;
font-weight: bold;
color: rgba(45, 71, 106, 1);
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.good {
height: 108px;
border-bottom: 1px solid rgba(238, 238, 238, 1);
width: 100%;
padding: 12px 0;
display: flex;
justify-content: space-between;
}
.list {
padding: 0 16px;
box-sizing: border-box;
}
.left,
.right,
.center {
height: 80px;
}
.left {
width: 80px;
border-radius:4px;
}
.left img {
width: 100%;
}
.center {
width: 50%;
}
.right {
width: 20%;
}
.tab >>> .van-tabs__nav--card {
margin: 0;
border: none;
height: 40px;
}
.container {
height: 100%;
background-color: #fff;
}
.search {
padding: 12px 16px;
}
.active {
background-color: #75b2fd;
}
</style>
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