Commit aedc820b authored by 黄奎's avatar 黄奎

行程特色修改

parent 44f2f5fa
......@@ -11,6 +11,9 @@
</div>
<div v-if="isXuan === true">
<i :class="'iconfont ' + icon.xuan" @click="toXuan"></i>
</div>
<div v-if="isAdd === true">
<i :class="'' + icon.add" @click="toAdd"></i>
</div>
<div v-if="isDelete === true">
<i :class="'iconfont ' + icon.delete" @click="toDelete"></i>
......@@ -75,6 +78,11 @@
type: Boolean,
default: true
},
//是否显示添加
isAdd: {
type: Boolean,
default: true
},
// 是否显示删除
isDelete: {
type: Boolean,
......@@ -100,7 +108,8 @@
rightZ: 'icon-right',
bottomY: 'icon-arrowdown',
bottomZ: 'icon-zhidi',
reset: 'icon-zhongzhi'
reset: 'icon-zhongzhi',
add: 'el-icon-plus'
}
}
},
......@@ -158,6 +167,11 @@
},
toReset: function () {
this.$emit('toReset', this.name, this.index1, this.index2)
},
//添加
toAdd:function()
{
this.$emit('toAdd', this.name, this.index1, this.index2)
}
}
}
......
......@@ -27,7 +27,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="hotel_1_info_1_img">
......@@ -36,7 +36,7 @@
<vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="0"
:length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'>
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar>
<input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic">
</div>
......@@ -54,7 +54,7 @@
<vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="1"
:length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete">
@toXuan="imgToXuan" @toDelete="imgToDelete" >
</vToolBar>
<input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_1"' @change="uploadpic">
</div>
......@@ -93,7 +93,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="hotel_1_info_2_top">
......@@ -178,7 +178,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<img class="hotel_2_info_1_bg"
......@@ -238,7 +238,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="hotel_2_info_2_top">
......@@ -365,7 +365,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="viewSpot_1_info_1_img1">
......@@ -373,7 +373,7 @@
<vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4" :index2="0"
:length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toXuan="imgToXuan"
@toDelete="imgToDelete" @toReset="resetXY" :isReset='true'>
@toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar>
<input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic">
</div>
......@@ -408,7 +408,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4+1"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="viewSpot_1_info_2_bottom">
......@@ -444,7 +444,6 @@
</div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_1"'>
<div class="triangle_border_rb_c"></div>
<!-- viewSpotObj.list[item*4+1].images[1].y -->
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[1]"
:ref='"viewSpotVds_"+(item*4+1)+"_1"' tabindex="0" :resizable='false' :active="false"
:parent="false" axis='x' @activated="onActivated(item*4+1,1)"
......@@ -480,7 +479,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4-2"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="viewSpot_2_info_1_info">
......@@ -503,7 +502,7 @@
<vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4-2" :index2="0"
:length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length"
@toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ"
@toHuan="imgToHuan" @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'>
@toHuan="imgToHuan" @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar>
<input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic">
</div>
......@@ -585,7 +584,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4-1" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4-1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete">
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="travel_toolbar" v-if="canEdit===true">
......@@ -612,7 +611,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete">
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="travel_toolbar" v-if="canEdit===true">
......@@ -639,7 +638,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4+1" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete">
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="travel_toolbar" v-if="canEdit===true">
......@@ -698,7 +697,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1" :index1="item*2"
:index2="0" :length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
@toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="restaurant_1_info_1_img1">
......@@ -706,7 +705,7 @@
<vToolBar :isHorizontal="true" name="restaurant" :type="2" :index1="item*2" :index2="0"
:length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length"
@toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'>
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar>
<input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic">
</div>
......@@ -741,7 +740,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1"
:index1="item*2+1" :index2="0" :length1="restaurantObj.list.length"
:length2="restaurantObj.list[item*2+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete">
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar>
</div>
<div class="restaurant_1_info_2_left">
......@@ -1635,6 +1634,37 @@
blockList.splice(index1, 1);
this.pageCount(name)
},
//添加酒店、门票、餐厅
blockToAdd:function(name, index1, index2)
{
var addObj={
Ename:"",
MD5Sign:"",
description:"酒店描述信息",
images:[],
name:"酒店名称",
type:"Hotel"
};
if (name === 'hotel') {
if(this.hotelObj&&this.hotelObj.list){
this.hotelObj.list.push(addObj);
}
} else if (name === 'viewSpot') {
addObj.description="景点描述";
addObj.name="景点名称";
addObj.type="Scenic";
if(this.viewSpotObj&&this.viewSpotObj.list){
this.viewSpotObj.list.push(addObj);
}
} else if (name === 'restaurant') {
addObj.description="餐厅描述";
addObj.name="餐厅名称";
addObj.type="Dinner";
if(this.restaurantObj&&this.restaurantObj.list){
this.restaurantObj.list.push(addObj);
}
}
},
//判断是否切换
getIsRefresh()
{
......
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