Skip to content

S
SuperMan
Commit e4460dda authored by 罗超's avatar 罗超
Browse files
Options

1

parent 027a93fc
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 115 deletions
src/components/Restaurant/demesticRestaurantInfoManage.vue
View file @ e4460dda
......@@ -738,8 +738,8 @@
</div>
</el-form-item>
<el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
</el-form-item>
<!-- <el-form-item :label="$t('system.table_country')">
<el-select
......
src/components/Restaurant/domesticRestaurantList.vue
View file @ e4460dda
......@@ -369,7 +369,7 @@
</div>
</div>
</div> -->
<el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading">
<el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading" >
<el-table-column prop="Name" label="餐厅名称">
<template slot-scope="scope">
<div style="display:flex;align-items:center;">
......@@ -425,7 +425,8 @@
</el-table-column>
</el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total" v-if="tableData.length>0"></el-pagination>
<!-- <div v-if="tableData.length===0">暂无数据</div> -->
</div>
</template>
......
src/components/scenicSpot/domesticScenicSpotInfoManage.vue
View file @ e4460dda
<style>
.domesticScenic .imgtag{
.domesticScenicSpotInfoManage .imgtag{
height: 40px;
color: #000;
}
.domesticScenic .resourceImgAdd {
.domesticScenicSpotInfoManage .resourceImgAdd {
width: 620px;
margin: auto;
}
.domesticScenic .clearfix:after {
.domesticScenicSpotInfoManage .clearfix:after {
content: "\0020";
display: block;
height: 0;
clear: both;
}
.domesticScenic .resource-content {
.domesticScenicSpotInfoManage .resource-content {
width: 100%;
margin-top: 30px;
font-size: 12px;
min-width: 1200px;
}
.domesticScenic .resource-baseinfo {
.domesticScenicSpotInfoManage .resource-baseinfo {
float: left;
height: auto;
width: 600px;
margin: 0 0 20px 30px;
}
.domesticScenic .resource-imginfo {
.domesticScenicSpotInfoManage .resource-imginfo {
float: left;
width: 510px;
margin-top: 35px;
}
/* .domesticScenic .open-time {
/* .domesticScenicSpotInfoManage .open-time {
float: left;
min-height: 100vh;
background-color: #000;
margin-top: 35px;
} */
.domesticScenic .resource-lititle {
.domesticScenicSpotInfoManage .resource-lititle {
display: block;
border-left: 4px solid #e95252;
padding-left: 10px;
margin-bottom: 20px;
}
.domesticScenic .resource-baseinfo span {
.domesticScenicSpotInfoManage .resource-baseinfo span {
display: inline-block;
}
.domesticScenic .resource-name {
.domesticScenicSpotInfoManage .resource-name {
width: 300px;
height: 34px;
background: rgba(255, 255, 255, 1);
......@@ -61,18 +61,18 @@
padding-left: 10px;
}
.domesticScenic .common-lefttit {
.domesticScenicSpotInfoManage .common-lefttit {
width: 80px;
text-align: right;
margin: 0 7px 0 8px;
display: inline-block;
}
.domesticScenic .resource-net {
.domesticScenicSpotInfoManage .resource-net {
position: relative;
}
.domesticScenic .resource-http {
.domesticScenicSpotInfoManage .resource-http {
position: absolute;
color: #999999;
width: 70px !important;
......@@ -88,22 +88,22 @@
text-align: center;
}
.domesticScenic .R1 {
.domesticScenicSpotInfoManage .R1 {
width: 300px;
padding: 0 15px 0 80px;
transition: all 0.3s ease-in-out;
}
.domesticScenic .areaInput {
.domesticScenicSpotInfoManage .areaInput {
width: 300px;
padding-right: 120px;
}
.domesticScenic .areaInput:focus {
.domesticScenicSpotInfoManage .areaInput:focus {
border: 1px solid #e95252;
}
.domesticScenic .map-icon {
.domesticScenicSpotInfoManage .map-icon {
position: absolute;
right: 1px;
top: 1px;
......@@ -120,13 +120,13 @@
background-color: #f5f7fa;
}
.domesticScenic .map-icon i {
.domesticScenicSpotInfoManage .map-icon i {
margin: 0 5px;
position: relative;
top: 1px;
}
.domesticScenic .save-Btn {
.domesticScenicSpotInfoManage .save-Btn {
width: 90px;
height: 30px;
background: rgba(233, 82, 82, 1);
......@@ -137,12 +137,12 @@
margin-right: 20px;
}
.domesticScenic .cancel-Btn,
.domesticScenicSpotInfoManage .cancel-Btn,
.save-Btn:hover {
opacity: 0.8;
}
.domesticScenic .cancel-Btn {
.domesticScenicSpotInfoManage .cancel-Btn {
width: 90px;
height: 30px;
background: rgba(255, 255, 255, 1);
......@@ -153,7 +153,7 @@
border: 1px solid #e95252;
}
.domesticScenic .re-img {
.domesticScenicSpotInfoManage .re-img {
width: 140px;
height: 93px;
border-radius: 10px;
......@@ -162,27 +162,27 @@
position: relative;
}
.domesticScenic .re-img:first-child {
.domesticScenicSpotInfoManage .re-img:first-child {
margin-left: 0;
}
.domesticScenic .resource-imglist {
.domesticScenicSpotInfoManage .resource-imglist {
width: 100%;
height: auto;
margin-top: 20px;
}
.domesticScenic .resource-imglist img {
.domesticScenicSpotInfoManage .resource-imglist img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.domesticScenic .add-img {
.domesticScenicSpotInfoManage .add-img {
margin-top: 20px;
}
.domesticScenic .reimg-add {
.domesticScenicSpotInfoManage .reimg-add {
width: 140px;
height: 93px;
background: rgba(236, 236, 236, 1);
......@@ -191,7 +191,7 @@
cursor: pointer;
}
.domesticScenic .ad-one {
.domesticScenicSpotInfoManage .ad-one {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
......@@ -202,7 +202,7 @@
z-index: 999;
}
.domesticScenic .bigAdd {
.domesticScenicSpotInfoManage .bigAdd {
font-size: 50px;
color: #d1d1d1;
position: absolute;
......@@ -210,7 +210,7 @@
top: 10px;
}
.domesticScenic .imgzhe {
.domesticScenicSpotInfoManage .imgzhe {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
......@@ -222,15 +222,15 @@
top: 0;
}
.domesticScenic .reimg-add:hover .ad-one {
.domesticScenicSpotInfoManage .reimg-add:hover .ad-one {
display: block;
}
.domesticScenic .re-img:hover .imgzhe {
.domesticScenicSpotInfoManage .re-img:hover .imgzhe {
display: block;
}
.domesticScenic .ad-one div {
.domesticScenicSpotInfoManage .ad-one div {
width: 32px;
height: 32px;
border-radius: 50%;
......@@ -240,41 +240,41 @@
color: #fff;
}
.domesticScenic .ad-one div:hover {
.domesticScenicSpotInfoManage .ad-one div:hover {
background-color: #fff;
color: #e95252;
}
.domesticScenic .re-upload {
.domesticScenicSpotInfoManage .re-upload {
position: absolute;
top: 30px;
left: 30px;
}
.domesticScenic .re-find {
.domesticScenicSpotInfoManage .re-find {
position: absolute;
top: 30px;
right: 30px;
}
.domesticScenic .search-imgicon {
.domesticScenicSpotInfoManage .search-imgicon {
padding-right: 20px;
margin-left: -40px;
}
.domesticScenic .resAddImg {
.domesticScenicSpotInfoManage .resAddImg {
width: 520px;
padding-right: 45px;
}
.domesticScenic .addimgContent {
.domesticScenicSpotInfoManage .addimgContent {
height: 290px;
overflow: auto;
margin: 30px 0 30px 25px;
width: 545px;
}
.domesticScenic .addimgDiv {
.domesticScenicSpotInfoManage .addimgDiv {
width: 160px;
height: 155px;
float: left;
......@@ -282,7 +282,7 @@
overflow: hidden;
}
.domesticScenic .addimgContent div:first-child {
.domesticScenicSpotInfoManage .addimgContent div:first-child {
margin-left: 0;
}
......@@ -290,19 +290,19 @@
margin-right: 0;
}
.domesticScenic .itemImgdiv {
.domesticScenicSpotInfoManage .itemImgdiv {
width: 160px;
height: 106px;
position: relative;
}
.domesticScenic .itemImgdiv img {
.domesticScenicSpotInfoManage .itemImgdiv img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.domesticScenic .imgseclet {
.domesticScenicSpotInfoManage .imgseclet {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.4);
......@@ -318,33 +318,33 @@
font-size: 25px;
}
.domesticScenic .test-1::-webkit-scrollbar {
.domesticScenicSpotInfoManage .test-1::-webkit-scrollbar {
width: 0px;
height: 0px;
background-color: #f5f5f5;
}
.domesticScenic .test-1::-webkit-scrollbar-track {
.domesticScenicSpotInfoManage .test-1::-webkit-scrollbar-track {
background-color: #f5f5f5;
}
.domesticScenic .test-1::-webkit-scrollbar-thumb {
.domesticScenicSpotInfoManage .test-1::-webkit-scrollbar-thumb {
border-radius: 20px;
background-color: #aaa;
margin-bottom: 24px;
}
.domesticScenic .test-1:hover::-webkit-scrollbar {
.domesticScenicSpotInfoManage .test-1:hover::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: #f5f5f5;
}
.domesticScenic .addimg-btnlist {
.domesticScenicSpotInfoManage .addimg-btnlist {
text-align: center;
}
.domesticScenic .addimg-select {
.domesticScenicSpotInfoManage .addimg-select {
font-size: 14px;
color: #999999;
float: right;
......@@ -353,7 +353,7 @@
bottom: 20px;
}
.domesticScenic .re-delte {
.domesticScenicSpotInfoManage .re-delte {
width: 32px;
height: 32px;
background: gray;
......@@ -365,12 +365,12 @@
cursor: pointer;
}
.domesticScenic .re-delte:hover {
.domesticScenicSpotInfoManage .re-delte:hover {
color: #e95252;
background: #fff;
}
.domesticScenic .imgDescription {
.domesticScenicSpotInfoManage .imgDescription {
font-size: 12px;
margin-top: 12px;
color: #333333;
......@@ -383,102 +383,102 @@
-webkit-box-orient: vertical;
}
.domesticScenic .el-upload-dragger {
.domesticScenicSpotInfoManage .el-upload-dragger {
border: none;
}
.domesticScenic .res-span span:last-child {
.domesticScenicSpotInfoManage .res-span span:last-child {
display: inline;
}
.domesticScenic .resourcerightTop span {
.domesticScenicSpotInfoManage .resourcerightTop span {
display: inline-block;
}
.domesticScenic .sheshi {
.domesticScenicSpotInfoManage .sheshi {
margin-bottom: 20px;
}
.domesticScenic .dialog-footer {
.domesticScenicSpotInfoManage .dialog-footer {
padding-bottom: 30px;
}
.domesticScenic .btn-list {
.domesticScenicSpotInfoManage .btn-list {
margin: 0 0 40px 30px;
}
.domesticScenic .input-with-select .el-input-group__prepend {
.domesticScenicSpotInfoManage .input-with-select .el-input-group__prepend {
background-color: #fff;
}
.domesticScenic .el-textarea__inner {
.domesticScenicSpotInfoManage .el-textarea__inner {
resize: none;
height: 120px;
font-family: "微软雅黑";
}
.domesticScenic .R1:focus {
.domesticScenicSpotInfoManage .R1:focus {
border: 1px solid #e95252;
}
.domesticScenic .el-form-item__label {
.domesticScenicSpotInfoManage .el-form-item__label {
width: 96px;
font-size: 12px;
}
.domesticScenic .el-form-item__error {
.domesticScenicSpotInfoManage .el-form-item__error {
left: 100px;
}
.domesticScenic .hotelDay {
.domesticScenicSpotInfoManage .hotelDay {
margin-left: 10px;
}
.domesticScenic .searchImgIcon {
.domesticScenicSpotInfoManage .searchImgIcon {
cursor: pointer;
}
.domesticScenic .el-dialog--center .el-dialog__body {
.domesticScenicSpotInfoManage .el-dialog--center .el-dialog__body {
padding: 25px 25px 0;
}
.domesticScenic .addressInput .el-input-group__append {
.domesticScenicSpotInfoManage .addressInput .el-input-group__append {
border-top-right-radius: 17px;
border-bottom-right-radius: 17px;
}
.domesticScenic ::-webkit-input-placeholder {
.domesticScenicSpotInfoManage ::-webkit-input-placeholder {
color: #d1d1d1;
}
.domesticScenic :-moz-placeholder {
.domesticScenicSpotInfoManage :-moz-placeholder {
color: #d1d1d1;
}
.domesticScenic ::-moz-placeholder {
.domesticScenicSpotInfoManage ::-moz-placeholder {
color: #d1d1d1;
}
.domesticScenic :-ms-input-placeholder {
.domesticScenicSpotInfoManage :-ms-input-placeholder {
color: #d1d1d1;
}
.domesticScenic .el-switch.is-checked .el-switch__core {
.domesticScenicSpotInfoManage .el-switch.is-checked .el-switch__core {
border-color: #4bca81;
background-color: #4bca81;
}
.domesticScenic .orderAdd {
.domesticScenicSpotInfoManage .orderAdd {
position: relative;
width: 340px;
}
.domesticScenic .minus:hover {
.domesticScenicSpotInfoManage .minus:hover {
background-color: #cccccc;
cursor: pointer;
}
.domesticScenic .minus {
.domesticScenicSpotInfoManage .minus {
width: 34px;
height: 32px;
border: #dcdfe6;
......@@ -493,7 +493,7 @@
background-color: #dcdfe6;
}
.domesticScenic .addPeople {
.domesticScenicSpotInfoManage .addPeople {
width: 34px;
height: 32px;
top: 4px;
......@@ -507,22 +507,22 @@
z-index: 999;
}
.domesticScenic .addPeople:hover {
.domesticScenicSpotInfoManage .addPeople:hover {
background-color: #cccccc;
cursor: pointer;
}
.domesticScenic .orderAdd .el-input__inner {
.domesticScenicSpotInfoManage .orderAdd .el-input__inner {
padding-left: 90px;
}
.domesticScenic .littleadd {
.domesticScenicSpotInfoManage .littleadd {
font-size: 12px !important;
color: #fff;
display: inline-block;
}
.domesticScenic .footabs {
.domesticScenicSpotInfoManage .footabs {
width: 300px;
min-height: 34px;
border: 1px solid #d1d1d1;
......@@ -534,7 +534,7 @@
flex-wrap: wrap;
}
.domesticScenic .foodtips {
.domesticScenicSpotInfoManage .foodtips {
display: inline-block;
padding: 3px 5px;
background-color: #efefef;
......@@ -542,22 +542,22 @@
position: relative;
}
.domesticScenic .toolOne {
.domesticScenicSpotInfoManage .toolOne {
margin: 0 0 28px 38px;
display: flex;
}
.domesticScenic .foodTipsDiv {
.domesticScenicSpotInfoManage .foodTipsDiv {
max-width: 200px;
display: inline;
}
.domesticScenic .wInput {
.domesticScenicSpotInfoManage .wInput {
border: none;
height: 30px;
}
.domesticScenic .wInput .el-input__inner {
.domesticScenicSpotInfoManage .wInput .el-input__inner {
border: none !important;
height: 28px;
padding: 0;
......@@ -565,7 +565,7 @@
margin-top: 2px;
}
.domesticScenic .delTips {
.domesticScenicSpotInfoManage .delTips {
position: absolute;
right: -5px;
top: -5px;
......@@ -574,68 +574,68 @@
font-size: 14px;
}
.domesticScenic .delTips:hover {
.domesticScenicSpotInfoManage .delTips:hover {
color: #e95252;
}
.domesticScenic .fanyong {
.domesticScenicSpotInfoManage .fanyong {
font-size: 12px;
color: #666666;
margin-right: 10px;
}
.domesticScenic .footabs .el-tag {
.domesticScenicSpotInfoManage .footabs .el-tag {
margin: 0 5px 5px 0;
}
.domesticScenic .footabs .el-input__inner {
.domesticScenicSpotInfoManage .footabs .el-input__inner {
height: 30px;
position: relative;
}
.domesticScenic .button-new-tag {
.domesticScenicSpotInfoManage .button-new-tag {
height: 30px;
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
}
.domesticScenic .input-new-tag {
.domesticScenicSpotInfoManage .input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
.domesticScenic .el-dialog--center .el-dialog__body {
.domesticScenicSpotInfoManage .el-dialog--center .el-dialog__body {
padding: 15px 25px 0 !important;
}
.domesticScenic .mapList {
.domesticScenicSpotInfoManage .mapList {
width: 850px !important;
/* height: 510px !important; */
}
.domesticScenic .fanbili {
.domesticScenicSpotInfoManage .fanbili {
margin-top: 8px;
}
.domesticScenic .RabateDiv {
.domesticScenicSpotInfoManage .RabateDiv {
margin-left: 10px;
}
.domesticScenic .RebateCount {
.domesticScenicSpotInfoManage .RebateCount {
height: 34px;
border-radius: 17px;
float: left;
}
.domesticScenic .reOne,
.domesticScenic .reTwo,
.domesticScenic .dayNum {
.domesticScenicSpotInfoManage .reOne,
.domesticScenicSpotInfoManage .reTwo,
.domesticScenicSpotInfoManage .dayNum {
position: relative;
}
.domesticScenic .leftPnum {
.domesticScenicSpotInfoManage .leftPnum {
float: left;
width: 50px;
height: 32px;
......@@ -649,26 +649,26 @@
border-bottom-left-radius: 17px;
}
.domesticScenic .toolInput {
.domesticScenicSpotInfoManage .toolInput {
height: 34px;
padding-left: 5px;
border: none;
}
.domesticScenic .inpuOne {
.domesticScenicSpotInfoManage .inpuOne {
width: 135px;
padding-left: 55px;
border: 1px solid #d1d1d1;
border-right: none;
}
.domesticScenic .inpuTwo {
.domesticScenicSpotInfoManage .inpuTwo {
width: 166px;
padding: 0 45px 0 55px;
border: 1px solid #d1d1d1;
}
.domesticScenic .percentCon {
.domesticScenicSpotInfoManage .percentCon {
float: right;
width: 40px;
height: 32px;
......@@ -682,7 +682,7 @@
top: 1px;
}
.domesticScenic .fanNum {
.domesticScenicSpotInfoManage .fanNum {
float: left;
width: 50px;
height: 32px;
......@@ -694,26 +694,26 @@
top: 1px;
}
.domesticScenic .fdTag {
.domesticScenicSpotInfoManage .fdTag {
margin-top: 13px;
}
.domesticScenic .addAddress .el-input__inner {
.domesticScenicSpotInfoManage .addAddress .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border: 1px solid #d1d1d1 !important;
}
.domesticScenic .el-input-group__append {
.domesticScenicSpotInfoManage .el-input-group__append {
border-top-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
.domesticScenic #imageUploader{
.domesticScenicSpotInfoManage #imageUploader{
display: none !important;
}
</style>
<template>
<div class="flexOne domesticScenic">
<div class="flexOne domesticScenicSpotInfoManage">
<div class="resource-content clearfix">
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resource-baseinfo">
......
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