Skip to content

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

1

parent ba0b9a01
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 39 deletions
src/components/Restaurant/demesticRestaurantInfoManage.vue
View file @ 5c86b560
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
height: 93px; height: 93px;
border-radius: 10px; border-radius: 10px;
float: left; float: left;
margin: 0 30px 30px 0; margin: 0 30px 50px 0;
position: relative; position: relative;
} }
...@@ -208,8 +208,12 @@ ...@@ -208,8 +208,12 @@
text-align: center; text-align: center;
line-height: 93px; line-height: 93px;
top: 0; top: 0;
}
}
.restaurantInfo .imgtag{
height: 40px;
color: #000;
}
.restaurantInfo .reimg-add:hover .ad-one { .restaurantInfo .reimg-add:hover .ad-one {
display: block; display: block;
} }
...@@ -848,7 +852,6 @@ ...@@ -848,7 +852,6 @@
> >
<template> <template>
<el-time-select <el-time-select
@change="timechange"
v-model="item.StartTime" v-model="item.StartTime"
:picker-options="{ :picker-options="{
start: '08:30', start: '08:30',
...@@ -859,7 +862,6 @@ ...@@ -859,7 +862,6 @@
> >
</el-time-select> </el-time-select>
<el-time-select <el-time-select
@change="timechange"
v-model="item.EndTime" v-model="item.EndTime"
:picker-options="{ :picker-options="{
start: '08:30', start: '08:30',
...@@ -911,6 +913,7 @@ ...@@ -911,6 +913,7 @@
allow-create allow-create
placeholder="请选择" placeholder="请选择"
> >
<el-option label="不限" :value="0"></el-option>
<el-option <el-option
v-for="item in weekEnumList" v-for="item in weekEnumList"
:key="item.ID" :key="item.ID"
...@@ -925,6 +928,7 @@ ...@@ -925,6 +928,7 @@
allow-create allow-create
placeholder="请选择" placeholder="请选择"
> >
<el-option label="不限" :value="0"></el-option>
<el-option <el-option
v-for="item in weekEnumList" v-for="item in weekEnumList"
:key="item.ID" :key="item.ID"
...@@ -1052,7 +1056,7 @@ ...@@ -1052,7 +1056,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="美食类型"> <el-form-item label="美食分类">
<el-select <el-select
v-model="addMsg.FoodType" v-model="addMsg.FoodType"
class="multiple_input w300" class="multiple_input w300"
...@@ -1316,6 +1320,12 @@ ...@@ -1316,6 +1320,12 @@
> >
<img v-if="!item" src="../../assets/img/bg_c3@3x.png" /> <img v-if="!item" src="../../assets/img/bg_c3@3x.png" />
<img :src="item.ShowPath" :onerror="defaultImg" /> <img :src="item.ShowPath" :onerror="defaultImg" />
<div class="imgtag resTypeList">
<el-input v-model="item.TagName"
><div slot="prepend">标签</div></el-input>
</div>
<div class="imgzhe"> <div class="imgzhe">
<div class="re-delte"> <div class="re-delte">
<i <i
...@@ -1341,6 +1351,15 @@ ...@@ -1341,6 +1351,15 @@
> >
<i class="iconfont icon-youyi"></i> <i class="iconfont icon-youyi"></i>
</div> </div>
<!-- <el-tooltip class="item" effect="dark" content="添加标签" placement="top">
<div
class="re-delte"
@click.stop="addTag(index)"
>
<i class="iconfont el-icon-circle-plus"></i>
</div>
</el-tooltip> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -1366,6 +1385,9 @@ ...@@ -1366,6 +1385,9 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="add-img">
<el-button type="primary" @click="isShowHotelImg=true" icon="el-icon-plus" circle></el-button>
</div> -->
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -1400,7 +1422,7 @@ ...@@ -1400,7 +1422,7 @@
<button class="save-Btn" @click="submitForm('addMsg')"> <button class="save-Btn" @click="submitForm('addMsg')">
{{ $t("pub.saveBtn") }} {{ $t("pub.saveBtn") }}
</button> </button>
<button class="cancel-Btn" @click="goUrl('restaurantList')"> <button class="cancel-Btn" @click="goUrl('domesticRestaurantList')">
{{ $t("pub.cancelBtn") }} {{ $t("pub.cancelBtn") }}
</button> </button>
</div> </div>
...@@ -1413,12 +1435,25 @@ ...@@ -1413,12 +1435,25 @@
> >
<img v-for="src in images" :src="src" :key="src" /> <img v-for="src in images" :src="src" :key="src" />
</viewer> </viewer>
<!-- <el-dialog title="餐厅图片" :visible.sync="isShowHotelImg" width="1240px">
<comImgList :saveObj="DiningImageArray"></comImgList>
</el-dialog> -->
<!-- <el-dialog :visible.sync="showaddTag" width="400px" title="添加图片标签" center>
<div style="margin-bottom:10px">
<el-input v-model="tagName"
><div slot="prepend">图片标签</div></el-input>
</div>
<div slot="footer">
<el-button size="small" text-type="primary" @click="showaddTag=false">取消</el-button>
<el-button size="small" type="primary" @click="saveTag">确认</el-button>
</div>
</el-dialog> -->
</div> </div>
</template> </template>
<script> <script>
import DMCchooseImg from "../commonPage/DMCchooseImg.vue"; import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
import googleMap from "../commonPage/googleMap.vue"; import googleMap from "../commonPage/googleMap.vue";
// import comImgList from "../commonPage/comImgList.vue";
export default { export default {
data() { data() {
return { return {
...@@ -1521,7 +1556,7 @@ export default { ...@@ -1521,7 +1556,7 @@ export default {
AppointmentStyle: 0, AppointmentStyle: 0,
//支付方式 //支付方式
PayStyle: 0, PayStyle: 0,
FoodType: 0, //美食类型 FoodType: 0, //美食分类
FoodRecommendList: [{ FoodName: "", Sort: 0 }], //推荐菜品 FoodRecommendList: [{ FoodName: "", Sort: 0 }], //推荐菜品
}, },
rules: { rules: {
...@@ -1585,16 +1620,17 @@ export default { ...@@ -1585,16 +1620,17 @@ export default {
weekEnumList: [], //周一到周日枚举 weekEnumList: [], //周一到周日枚举
startDay: "", //开始日 startDay: "", //开始日
endDay: "", //结束日 endDay: "", //结束日
showaddTag:false,
tagName:"",
tagIndex:0
}; };
}, },
components: { components: {
googleMap: googleMap, googleMap: googleMap,
DMCchooseImg: DMCchooseImg, DMCchooseImg: DMCchooseImg,
// comImgList
}, },
methods: { methods: {
timechange() {
console.log(this.addMsg);
},
//上传餐厅图片 //上传餐厅图片
UploadImage(file) { UploadImage(file) {
let newArr = []; let newArr = [];
...@@ -1604,10 +1640,12 @@ export default { ...@@ -1604,10 +1640,12 @@ export default {
this.UploadSelfFileT(path, newArr, (x) => { this.UploadSelfFileT(path, newArr, (x) => {
//统一图片处理 //统一图片处理
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
console.log(obj)
var str = x.data.FilePath; var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
obj.TagName="";
this.DiningImageArray.push(obj); this.DiningImageArray.push(obj);
}); });
}, },
...@@ -1676,22 +1714,29 @@ export default { ...@@ -1676,22 +1714,29 @@ export default {
this.addMsg.GeographicTag = this.Geographic.join(","); this.addMsg.GeographicTag = this.Geographic.join(",");
this.addMsg.DiningImageList = this.DiningImageArray; this.addMsg.DiningImageList = this.DiningImageArray;
this.addMsg.DeleteImageList = this.DeleteImageArray; this.addMsg.DeleteImageList = this.DeleteImageArray;
this.addMsg.BusinessWeek=this.startDay+'-'+this.endDay if(this.startDay==""){
console.log(this.addMsg.BusinessWeek) this.startDay=0
// this.apipost( }
// "dining_post_Set", if(this.endDay==""){
// this.addMsg, this.endDay=0
// (res) => { }
// //修改添加接口 this.addMsg.BusinessWeek=this.startDay+'-'+this.endDay;
// if (res.data.resultCode == 1) {
// this.tips(this.$t("tips.baocunchenggong"), "success"); console.log(1683,this.addMsg)
// this.goUrl("restaurantList"); this.apipost(
// } else { "appletsdining_post_AppletsSet",
// this.tips(res.data.message, "error"); this.addMsg,
// } (res) => {
// }, //修改添加接口
// null if (res.data.resultCode == 1) {
// ); this.tips(this.$t("tips.baocunchenggong"), "success");
this.goUrl("domesticRestaurantList");
} else {
this.tips(res.data.message, "error");
}
},
null
);
}, },
init() { init() {
var msg = {}; var msg = {};
...@@ -1742,16 +1787,17 @@ export default { ...@@ -1742,16 +1787,17 @@ export default {
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
console.log(this.addMsg);
if (this.addMsg.OpeningHoursList.length === 0) { if (this.addMsg.OpeningHoursList.length === 0) {
this.addMsg.OpeningHoursList[0] = { let obj={
StartTime: "", StartTime: "",
EndTime: "", EndTime: "",
}; }
console.log(1290, this.addMsg.OpeningHoursList); this.addMsg.OpeningHoursList.push(obj)
console.log(this.addMsg.OpeningHoursList)
} }
if (this.addMsg.Country > 0) { if (this.addMsg.Country > 0) {
this.GetSubAreaList(this.addMsg.Country, 1); this.GetSubAreaList(this.addMsg.Country, 1);
this.$forceUpdate
} }
if (this.addMsg.Province > 0) { if (this.addMsg.Province > 0) {
this.GetSubAreaList(this.addMsg.Province, 2); this.GetSubAreaList(this.addMsg.Province, 2);
...@@ -1786,12 +1832,14 @@ export default { ...@@ -1786,12 +1832,14 @@ export default {
this.domainManager().ViittoFileUrl + this.domainManager().ViittoFileUrl +
x + x +
"?x-oss-process=image/resize,l_140"; "?x-oss-process=image/resize,l_140";
obj.TagName=""
this.DiningImageArray.push(obj); this.DiningImageArray.push(obj);
} }
}); });
} else { } else {
this.tips(res.data.message, "error"); this.tips(res.data.message, "error");
} }
console.log("图片",this.DiningImageArray);
}, },
null null
); );
...@@ -1799,9 +1847,9 @@ export default { ...@@ -1799,9 +1847,9 @@ export default {
goUrl(path) { goUrl(path) {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { // query: {
cache: this.$route.query.cache, // cache: this.$route.query.cache,
}, // },
}); });
}, },
closeDMCchooseImg() { closeDMCchooseImg() {
...@@ -2063,7 +2111,20 @@ export default { ...@@ -2063,7 +2111,20 @@ export default {
//删除营业时间 //删除营业时间
delBusinessTime(index){ delBusinessTime(index){
this.addMsg.OpeningHoursList.splice(index,1); this.addMsg.OpeningHoursList.splice(index,1);
} },
//图片加标签
// addTag(index){
// this.showaddTag=true;
// this.tagName=""
// this.tagIndex=index
// console.log(index)
// },
//保存标签
// saveTag(){
// this.DiningImageArray[this.tagIndex].tagName=this.tagName
// this.showaddTag=false;
// console.log(this.DiningImageArray)
// }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/Restaurant/demesticRestaurantPackage.vue
View file @ 5c86b560
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"meal_post_GetPageList", "appletsmeal_post_GetPageList",
this.msg, this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
} }
}) })
this.apipost( this.apipost(
"meal_post_Set", "appletsmeal_post_Set",
this.addMsg, this.addMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
ID: Id ID: Id
}; };
this.apipost( this.apipost(
"meal_post_Get", "appletsmeal_post_Get",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
ID: ID ID: ID
}; };
this.apipost( this.apipost(
"meal_post_Remove", "appletsmeal_post_Remove",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
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