Commit d6dadee7 authored by 罗超's avatar 罗超

1

parent be0e0360
......@@ -153,7 +153,7 @@
height: 93px;
border-radius: 10px;
float: left;
margin: 0 30px 30px 0;
margin: 0 30px 50px 0;
position: relative;
}
......@@ -607,7 +607,7 @@
.scenicSpotInfoManage .mapList {
width: 850px !important;
height: 510px !important;
/* height: 510px !important; */
}
.scenicSpotInfoManage .fanbili {
......@@ -716,7 +716,7 @@
<el-form-item :label="$t('scen.sc_resName')" prop="Name">
<el-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
</el-form-item>
<el-form-item label="景区类型" prop="FoodType">
<!-- <el-form-item label="景区类型" prop="FoodType">
<el-cascader
placeholder="请选择景区类型"
:options="scenicList"
......@@ -734,23 +734,23 @@
@change="handleChange"
>
</el-cascader>
</el-form-item>
</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-form-item>
<el-form-item label="网址">
<!-- <el-form-item label="网址">
<el-input type="text" v-model="addMsg.Url" maxlength="100" class="w300"></el-input>
</el-form-item>
<el-form-item label="国家">
</el-form-item> -->
<!-- <el-form-item label="国家">
<el-select placeholder="请选择国家" filterable v-model="addMsg.Country" class='multiple_input w300'
@change="GetSubAreaList(addMsg.Country,1),addMsg.Province=0,addMsg.City=0,addMsg.District=0">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in CountryList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
</el-option>
</el-select>
</el-form-item>
</el-select> -->
<!-- </el-form-item> -->
<el-form-item label="省">
<el-select placeholder="请选择省" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2),addMsg.City=0,addMsg.District=0">
......@@ -797,7 +797,12 @@
<el-form-item :label="$t('scen.sc_tel')" prop="Tel">
<el-input type="text" maxlength="20" v-model="addMsg.Tel" class="w300"></el-input>
</el-form-item>
<el-form-item :label="$t('restaurant.res_salePlatform')">
<el-select v-model="openplatString" class='multiple_input w300' multiple :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in openplatform" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<span class="resource-lititle">开放时间
<el-tooltip
class="item"
......@@ -951,36 +956,31 @@
</template>
</div>
<span class="resource-lititle sheshi">{{$t('restaurant.res_detailInformation')}}</span>
<el-form-item :label="$t('restaurant.res_salePlatform')">
<el-select v-model="openplatString" class='multiple_input w300' multiple :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in openplatform" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('restaurant.res_advanceDays')" prop="DieLine">
<!-- <span class="resource-lititle sheshi">{{$t('restaurant.res_detailInformation')}}</span> -->
<!-- <el-form-item :label="$t('restaurant.res_advanceDays')" prop="DieLine">
<el-input type="text" maxlength="10" class="w300" v-model="addMsg.DieLine"
@keyup.native="checkInteger(addMsg,'DieLine')"></el-input>&nbsp;{{$t('hotel.hotel_day')}}
</el-form-item>
<el-form-item label="是否预约">
</el-form-item> -->
<!-- <el-form-item label="是否预约">
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive">
</el-switch>
</el-form-item>
<el-form-item label="支付方式">
</el-form-item> -->
<!-- <el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
:disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否免费">
</el-form-item> -->
<!-- <el-form-item label="是否免费">
<el-select v-model="addMsg.IsFree" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<div class="toolOne">
</el-form-item> -->
<!-- <div class="toolOne">
<span class="fanbili">游玩时间</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
......@@ -992,11 +992,11 @@
<input type="text" class="toolInput inpuTwo" v-model="addMsg.PlayTimeMinutes" maxlength="20">
</div>
</div>
</div>
</div> -->
</div>
<div class="resource-imginfo">
<div class="resourcerightTop">
<div class="toolOne">
<!-- <div class="toolOne">
<span class="fanbili">{{$t('restaurant.res_commissionColumn')}}</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
......@@ -1011,7 +1011,7 @@
<div class="percentCon">%</div>
</div>
</div>
</div>
</div> -->
<div class="toolOne">
<span class="fdTag">{{$t('scen.sc_fdTag')}}</span>
......@@ -1065,17 +1065,17 @@
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div>
</el-form-item>
<el-form-item :label="$t('restaurant.res_WhetherToConfirm')">
<!-- <el-form-item :label="$t('restaurant.res_WhetherToConfirm')">
<el-switch v-model="addMsg.Sure" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-form-item> -->
<el-form-item>
<!-- <el-form-item>
<el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" active-text="供应商"
inactive-text="自订"></el-switch>
</el-form-item>
<el-form-item label="是否包含领队">
<el-switch v-model="addMsg.IsIncludeLeader" :active-value="0" :inactive-value="1"></el-switch>
</el-form-item>
</el-form-item> -->
</div>
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list">
......@@ -1326,11 +1326,11 @@
tencentMap
},
methods: {
handleChange(value) {
console.log(value);
this.addMsg.FoodType=value.slice(-1).join()
console.log(this.addMsg.FoodType);
},
// handleChange(value) {
// console.log(value);
// this.addMsg.FoodType=value.slice(-1).join()
// console.log(this.addMsg.FoodType);
// },
//得到地图信息
mapEvent(e) {
this.addMsg.Lat = e.lat;
......@@ -1402,7 +1402,6 @@
},
saveResource() {
//保存餐厅信息
this.addMsg.FoodType=this.addMsg.FoodType.slice(-1).join()
if (this.isBook) {
this.addMsg.IsSelfBook = 1;
} else {
......@@ -1485,9 +1484,9 @@
res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
if (this.addMsg.Country > 0) {
this.GetSubAreaList(this.addMsg.Country, 1);
}
// if (this.addMsg.Country > 0) {
// this.GetSubAreaList(this.addMsg.Country, 1);
// }
if (this.addMsg.Province > 0) {
this.GetSubAreaList(this.addMsg.Province, 2);
}
......@@ -1510,16 +1509,17 @@
this.addMsg.Sure = res.data.data.Sure.toString();
}
this.isBook = this.addMsg.IsSelfBook;
res.data.data.PicPath.split(",").forEach(x => {
res.data.data.TicketCouponsPicList.forEach(x => {
if (x != "") {
var obj = this.$DMCUtils.DMCImageObj();
obj.ID = res.data.data.ID;
obj.Path = x;
obj.PicID = 0;
obj.ID = x.ID;
obj.Path = x.Path;
obj.PicID = x.Pic;
obj.ShowPath =
this.domainManager().ViittoFileUrl +
x +
x.Path +
"?x-oss-process=image/resize,l_140";
obj.TagName=x.TagName
this.TicketCouponsImageArray.push(obj);
}
});
......@@ -1661,7 +1661,7 @@
let msg = {
Id: ID
};
if (this.addMsg.Country != 0) {
// if (this.addMsg.Country != 0) {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
......@@ -1679,7 +1679,7 @@
},
err => {}
);
}
// }
},
getDMCimg(imgArr) {
imgArr.forEach(imgItem => {
......@@ -1790,12 +1790,13 @@
this.GetPayList();
this.ID = this.$route.query.id;
this.init(); //开放平台
this.GetCounrty();
// this.GetCounrty();
if (typeof this.ID != "undefined") {
this.initHotelData();
}
this.getweekenum();
this.getScenicList();
this.GetSubAreaList(2,1)
}
};
......
......@@ -511,7 +511,7 @@
var that = this;
that.Confirm(that.$t('tips.shifoushanchu'), function () {
that.apipost(
"ticketcoupons_post_Remove", {
"appletsticketcoupons_post_Remove", {
ID: ID
},
res => {
......
......@@ -174,9 +174,15 @@
</el-tooltip>
</td>
<td>{{item.TicketSubName}}</td>
<td>{{item.IsSameDayBuy}}</td>
<td>
<div v-if="item.IsSameDayBuy===0"></div>
<div v-if="item.IsSameDayBuy===1"></div>
</td>
<td>{{item.DayBuyTime}}</td>
<td>{{item.IsWorryFreeRefund}}</td>
<td>
<div v-if="item.IsWorryFreeRefund===0"></div>
<div v-if="item.IsWorryFreeRefund===1">有条件退</div>
</td>
<td>{{item.SubscribeTime}}</td>
<td class="DaysInfo">
<span
......
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