Skip to content

S
store-system
Commit a7fdefcf authored by 燕南天's avatar 燕南天
Browse files
Options

前后台项目完善

parent b359f2cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 35 deletions
2code/web/h5_pro/index.html
View file @ a7fdefcf
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no"> <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
<title>xule_pro</title> <title>娱乐汇</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script type="text/javascript">document.documentElement.style.fontSize = document.documentElement.clientWidth / 750*100 + 'px'; </script> <script type="text/javascript">document.documentElement.style.fontSize = document.documentElement.clientWidth / 750*100*0.9 + 'px'; </script>
</body> </body>
</html> </html>
2code/web/h5_pro/src/views/home/components/HBanner.vue
View file @ a7fdefcf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</swiper-slide> </swiper-slide>
<div class="swiper-pagination swiper-pagination-bullets" slot="pagination"></div> <div class="swiper-pagination swiper-pagination-bullets" slot="pagination"></div>
</swiper> </swiper>
</template> </template>
<script> <script>
...@@ -17,6 +17,9 @@ export default { ...@@ -17,6 +17,9 @@ export default {
pagination: { pagination: {
el: ".swiper-pagination", el: ".swiper-pagination",
clickable: true clickable: true
},
autoplay:{
delay:2500
} }
} }
}; };
......
2code/web/h5_pro/src/views/home/components/HShopList.vue
View file @ a7fdefcf
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
@r:100rem; @r:100rem;
.list-item{ .list-item{
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 30/@r; padding: 30/@r;
border-bottom: solid 1px #dedede; border-bottom: solid 1px #dedede;
...@@ -42,6 +42,7 @@ export default { ...@@ -42,6 +42,7 @@ export default {
} }
.item-infro{ .item-infro{
width: 540/@r; width: 540/@r;
margin-left: 20/@r;
.name{ .name{
font-size: 32/@r; font-size: 32/@r;
color: #333; color: #333;
......
2code/web/h5_pro/src/views/home/components/HStaff.vue
View file @ a7fdefcf
...@@ -18,11 +18,11 @@ export default { ...@@ -18,11 +18,11 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@r:100rem; @r:100rem;
.staff-item{ .staff-item{
width: 220/@r; width: 240/@r;
height: 280/@r; height: 300/@r;
position: relative; position: relative;
margin-bottom: 15/@r; margin-bottom: 20/@r;
margin-left: 15/@r; margin-left: 20/@r;
box-shadow: 2px 2px 2px rgba(0,0,0,.2); box-shadow: 2px 2px 2px rgba(0,0,0,.2);
&:nth-child(3n+1){ &:nth-child(3n+1){
margin-left: 0; margin-left: 0;
......
2code/web/h5_pro/src/views/home/index.vue
View file @ a7fdefcf
...@@ -125,6 +125,7 @@ export default { ...@@ -125,6 +125,7 @@ export default {
.staff-wrapper { .staff-wrapper {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
// justify-content: space-between
padding: 0 30 / @r; padding: 0 30 / @r;
} }
</style> </style>
......
2code/web/h5_pro/src/views/shopDetails/index.vue
View file @ a7fdefcf
...@@ -3,7 +3,14 @@ ...@@ -3,7 +3,14 @@
<c-header title="商家详情"></c-header> <c-header title="商家详情"></c-header>
<div class="shop-main-infro"> <div class="shop-main-infro">
<div class="img" :style="{'background-image':`url(${shopData.storeHomePic})`}"></div>
<swiper :options="swiperOption">
<swiper-slide v-for="(item,index) in shopImgs" :key="index">
<div class="img" :style="{'background-image':`url(${item})`}"></div>
</swiper-slide>
<div class="swiper-pagination" slot="pagination"></div>
</swiper>
<div class="infro-wrapper"> <div class="infro-wrapper">
<div class="shop-name">{{shopData.storeName}}</div> <div class="shop-name">{{shopData.storeName}}</div>
<div class="infro"><i class="iconfont icon-shijian"></i> {{shopData.storeBusinessTimeStart}}-{{shopData.storeBusinessTimeEnd}} <i class="iconfont icon-xiaofei"></i>{{shopData.consumeInterval}}</div> <div class="infro"><i class="iconfont icon-shijian"></i> {{shopData.storeBusinessTimeStart}}-{{shopData.storeBusinessTimeEnd}} <i class="iconfont icon-xiaofei"></i>{{shopData.consumeInterval}}</div>
...@@ -57,6 +64,16 @@ export default { ...@@ -57,6 +64,16 @@ export default {
components:{CHeader,SInfroContent,NoData}, components:{CHeader,SInfroContent,NoData},
data(){ data(){
return { return {
swiperOption: {
pagination: {
el: ".swiper-pagination",
clickable: true,
type: 'fraction'
},
autoplay:{
delay:2500
}
},
shopData:{ shopData:{
storeName:'', storeName:'',
province:'', province:'',
...@@ -65,7 +82,9 @@ export default { ...@@ -65,7 +82,9 @@ export default {
storePosition:'', storePosition:'',
storeDetails:'' storeDetails:''
}, },
workerData:[] workerData:[],
shopImgs:[]
} }
}, },
beforeMount(){ beforeMount(){
...@@ -77,6 +96,7 @@ export default { ...@@ -77,6 +96,7 @@ export default {
const param = {storeId:id} const param = {storeId:id}
shopDetails.storeDetails(param).then(res=>{ shopDetails.storeDetails(param).then(res=>{
this.shopData = res.data this.shopData = res.data
this.buildShopImg()
shopDetails.searchWorkerResult(param).then(res=>{ shopDetails.searchWorkerResult(param).then(res=>{
this.workerData = res.data this.workerData = res.data
}) })
...@@ -84,6 +104,10 @@ export default { ...@@ -84,6 +104,10 @@ export default {
}, },
toWorkerDetails(id){ toWorkerDetails(id){
this.$router.push({ path:`/workerDetails/${id}`}) this.$router.push({ path:`/workerDetails/${id}`})
},
buildShopImg(){
this.shopImgs = this.shopData.storePic?this.shopData.storePic.split(','):[]
// this.shopImgs.unshift(this.shopData.storeHomePic)
} }
} }
} }
...@@ -107,7 +131,7 @@ export default { ...@@ -107,7 +131,7 @@ export default {
bottom: 0; bottom: 0;
padding: 10/@r 30/@r; padding: 10/@r 30/@r;
background: rgba(0, 0, 0, .5); background: rgba(0, 0, 0, .5);
z-index: 10000;
.shop-name{ .shop-name{
font-size: 36/@r; font-size: 36/@r;
color: #fff; color: #fff;
...@@ -145,13 +169,13 @@ export default { ...@@ -145,13 +169,13 @@ export default {
.employee-item{ .employee-item{
border-radius: 10/@r; border-radius: 10/@r;
overflow: hidden; overflow: hidden;
width: 330/@r; width: 370/@r;
height: 400/@r; height: 450/@r;
background: #f0f0f0; background: #f0f0f0;
margin-bottom: 30/@r; margin-bottom: 30/@r;
position: relative; position: relative;
.img{ .img{
height: 250/@r; height: 300/@r;
background: rgba(222,75,75,.5) ; background: rgba(222,75,75,.5) ;
background-color: #dedede; background-color: #dedede;
background-size:cover; background-size:cover;
...@@ -207,6 +231,22 @@ export default { ...@@ -207,6 +231,22 @@ export default {
} }
} }
.swiper-pagination-fraction{
font-size: 40/@r;
// font-weight: 700;
width: inherit;
color: #fff;
background: rgba(0, 0,0, .3);
padding: 10/@r 40/@r;
border-radius: 40/@r;
right: 20/@r;
top: 20/@r;
left: inherit;
bottom: inherit;
.swiper-pagination-current{
color: #de4b4b!important;
font-weight: 700!important;
}
}
</style> </style>
2code/web/h5_pro/src/views/workerDetails/index.vue
View file @ a7fdefcf
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
<div class="page-wrapper"> <div class="page-wrapper">
<c-header title="人员详情"></c-header> <c-header title="人员详情"></c-header>
<div class="worker-details" id="scrollContainer"> <div class="worker-details" id="scrollContainer">
<div class="img" :style="{'background-image':`url(${workerData.workerHomePic})`}"></div> <swiper :options="swiperOption">
<swiper-slide v-for="(item,index) in workerImgs" :key="index">
<div class="img" :style="{'background-image':`url(${item})`}"></div>
</swiper-slide>
<div class="swiper-pagination" slot="pagination"></div>
</swiper>
<div class="infro"> <div class="infro">
<div class="name">{{workerData.workerName}}<span class="clicks"><i class="iconfont icon-xinaixin"></i>{{workerData.clicks}}</span></div> <div class="name">{{workerData.workerName}}<span class="clicks"><i class="iconfont icon-xinaixin"></i>{{workerData.clicks}}</span></div>
...@@ -64,11 +69,22 @@ export default { ...@@ -64,11 +69,22 @@ export default {
components:{CHeader}, components:{CHeader},
data(){ data(){
return { return {
swiperOption: {
pagination: {
el: ".swiper-pagination",
clickable: true,
type: 'fraction'
},
autoplay:{
delay:2500
}
},
workerData:{ workerData:{
workerName:'', workerName:'',
workerHomePic:'', workerHomePic:'',
workerResume:'' workerResume:''
} },
workerImgs:[]
} }
}, },
mounted(){ mounted(){
...@@ -85,12 +101,13 @@ export default { ...@@ -85,12 +101,13 @@ export default {
} }
workerDetails.workerDetails(param).then(res=>{ workerDetails.workerDetails(param).then(res=>{
this.workerData = res.data this.workerData = res.data
this.buildWorkerImg()
}) })
}, },
handleScroll(){ buildWorkerImg(){
this.workerImgs = this.workerData.workerPic?this.workerData.workerPic.split(','):[]
// this.workerImgs.unshift(this.workerData.workerHomePic)
}, },
toStoreDetails(id){ toStoreDetails(id){
...@@ -242,6 +259,22 @@ export default { ...@@ -242,6 +259,22 @@ export default {
} }
} }
} }
.swiper-pagination-fraction{
font-size: 40/@r;
// font-weight: 700;
width: inherit;
color: #fff;
background: rgba(0, 0,0, .3);
padding: 10/@r 40/@r;
border-radius: 40/@r;
right: 40/@r;
left: inherit;
.swiper-pagination-current{
color: #de4b4b!important;
font-weight: 700!important;
}
}
</style> </style>
2code/web/h5_pro/src/views/workerList/components/WStaff.vue
View file @ a7fdefcf
...@@ -15,11 +15,11 @@ export default { ...@@ -15,11 +15,11 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@r:100rem; @r:100rem;
.staff-item{ .staff-item{
width: 220/@r; width: 240/@r;
height: 280/@r; height: 300/@r;
position: relative; position: relative;
margin-bottom: 15/@r; margin-bottom: 20/@r;
margin-left: 15/@r; margin-left: 20/@r;
box-shadow: 2px 2px 2px rgba(0,0,0,.2); box-shadow: 2px 2px 2px rgba(0,0,0,.2);
&:nth-child(3n+1){ &:nth-child(3n+1){
margin-left: 0; margin-left: 0;
......
2code/web/h5_pro/src/views/workerList/index.vue
View file @ a7fdefcf
...@@ -68,5 +68,7 @@ export default { ...@@ -68,5 +68,7 @@ export default {
.nodata-wrapper{ .nodata-wrapper{
padding-top: 200/@r; padding-top: 200/@r;
} }
</style> </style>
2code/web/mgt_pro/index.html
View file @ a7fdefcf
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- 激活chrome frame内核插件 --> <!-- 激活chrome frame内核插件 -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>内部资讯管理系统</title> <title>娱乐汇管理系统</title>
<!-- <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_674196_89pa9pmfyd0cz0k9.css"> --> <!-- <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_674196_89pa9pmfyd0cz0k9.css"> -->
</head> </head>
<body> <body>
......
2code/web/mgt_pro/src/views/advert/advertList.vue
View file @ a7fdefcf
...@@ -330,17 +330,31 @@ export default { ...@@ -330,17 +330,31 @@ export default {
isAvailable: 1, isAvailable: 1,
linkUrl: this.dialogBindData.linkUrl linkUrl: this.dialogBindData.linkUrl
}; };
this.submmitSuccess = true;
adver.addOrEditAdvert(param).then(res => {
this.getList(() => { let submitParam =
this.$message({ param.advertTitle&&
message: this.dialogType === 1 ? "添加成功" : "编辑成功", param.advertPicUrl&&
type: "success" param.advertContent
if(!!submitParam){
this.submmitSuccess = true;
adver.addOrEditAdvert(param).then(res => {
this.getList(() => {
this.$message({
message: this.dialogType === 1 ? "添加成功" : "编辑成功",
type: "success"
});
this.submmitSuccess = false;
this.handleClose();
}); });
this.submmitSuccess = false;
this.handleClose();
}); });
}); }else{
this.$message({
message: "请完善信息",
type: "warning"
});
}
}, },
//关闭弹框 //关闭弹框
handleClose() { handleClose() {
......
2code/web/mgt_pro/src/views/login/index.vue
View file @ a7fdefcf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="login-container" :style="{backgroundImage:'url(' + bgImg + ')' }"> <div class="login-container" :style="{backgroundImage:'url(' + bgImg + ')' }">
<el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left"> <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
<div class="title-container"> <div class="title-container">
<h3 class="title">内部资讯管理系统</h3> <h3 class="title">娱乐汇管理系统</h3>
</div> </div>
<el-form-item prop="username"> <el-form-item prop="username">
<span class="svg-container svg-container_login"> <span class="svg-container svg-container_login">
......
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