Commit 9da0d5a6 authored by zhengke's avatar zhengke

修改

parent 44476ec3
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item>
<el-input type="text" v-model="plugData.TripTitle"></el-input>
</el-form-item>
<el-form-item> <el-form-item>
<div class="webSliderDiv"> <div class="webSliderDiv">
<div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage + ')'}"></div> <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage + ')'}"></div>
...@@ -97,6 +100,7 @@ ...@@ -97,6 +100,7 @@
Price: item.B2BPrice, Price: item.B2BPrice,
}; };
this.plugData.TripImage = obj.imgUrl; this.plugData.TripImage = obj.imgUrl;
this.plugData.TripTitle = obj.Title;
this.$refs.chooseTrip.clearData(); this.$refs.chooseTrip.clearData();
}); });
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
height: 275px; height: 275px;
width:275px; width:275px;
border: 1px solid #ccc; border: 1px solid #ccc;
cursor: pointer;
position: relative; position: relative;
} }
...@@ -72,16 +71,8 @@ ...@@ -72,16 +71,8 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item> <el-form-item>
<div class="webSliderDiv" @click="checkindex=1"> <div class="webSliderDiv">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage1 + ')'}"></div>
:show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + plugData.ImageUrl1 + ')'}"></div>
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="plugData.ImageUrl1=''"></i>
</div>
</el-upload>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -89,27 +80,20 @@ ...@@ -89,27 +80,20 @@
<el-form-item style="margin-bottom:0"> <el-form-item style="margin-bottom:0">
<span>圖片尺寸請上傳:770x770,檔案請小於3M</span> <span>圖片尺寸請上傳:770x770,檔案請小於3M</span>
</el-form-item> </el-form-item>
<el-form-item label="行程名稱"> <el-form-item>
<el-input type="text" v-model="plugData.TripTitle1"></el-input> <el-button type="primary" size="small" @click="isShowTripDailog=true,checkIndex=1">选择行程
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="連結網址"> <el-form-item label="行程名稱1">
<el-input type="text" v-model="plugData.LinkUrl1"></el-input> <el-input type="text" v-model="plugData.TripTitle1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item> <el-form-item>
<div class="webSliderDiv" @click="checkindex=2"> <div class="webSliderDiv">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage2 + ')'}"></div>
:show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + plugData.ImageUrl2 + ')'}"></div>
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="plugData.ImageUrl2=''"></i>
</div>
</el-upload>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -117,26 +101,41 @@ ...@@ -117,26 +101,41 @@
<el-form-item style="margin-bottom:0"> <el-form-item style="margin-bottom:0">
<span>圖片尺寸請上傳:770x770,檔案請小於3M</span> <span>圖片尺寸請上傳:770x770,檔案請小於3M</span>
</el-form-item> </el-form-item>
<el-form-item label="行程名稱"> <el-form-item>
<el-input type="text" v-model="plugData.TripTitle2"></el-input> <el-button type="primary" size="small" @click="isShowTripDailog=true,checkIndex=2">选择行程
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="連結網址"> <el-form-item label="行程名稱2">
<el-input type="text" v-model="plugData.LinkUrl2"></el-input> <el-input type="text" v-model="plugData.TripTitle2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-dialog title="选择行程" :visible.sync="isShowTripDailog" width="1000px" append-to-body>
<!-- 行程选中 -->
<chooseTrip ref="chooseTrip" :IsMultiple="false"></chooseTrip>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowTripDailog = false" size="small">取 消</el-button>
<el-button type="danger" size="small" @click="getChooseTripData()">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import chooseTrip from "../plug-in/choose_trip.vue"
export default { export default {
props: ["plugData"], props: ["plugData"],
data() { data() {
return { return {
checkindex:1 checkIndex:0,
isShowTripDailog:false
}; };
}, },
components: {
chooseTrip
},
created() {}, created() {},
methods: { methods: {
UploadImage(file) { UploadImage(file) {
...@@ -153,10 +152,42 @@ ...@@ -153,10 +152,42 @@
this.plugData.ImageUrl2 = imgUrl; this.plugData.ImageUrl2 = imgUrl;
} }
}); });
} },
//获取选择行程数据
getChooseTripData() {
var tempArray = this.$refs.chooseTrip.getChooseData();
this.isShowTripDailog = false;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
var imgUrl = ""
if (item.ImgCover && item.ImgCover.length > 0) {
imgUrl = item.ImgCover[0].Url;
}
var obj = {
StartDate: item.StartDate,
imgUrl: imgUrl,
TCNUM: item.TCNUM,
TCID: item.TCID,
Title: item.Title,
DayNum: item.DayNum,
Price: item.B2BPrice,
};
if(this.checkIndex==1){
this.plugData.TripImage1 = obj.imgUrl;
this.plugData.TripTitle1 = obj.Title;
}
if(this.checkIndex==2){
this.plugData.TripImage2 = obj.imgUrl;
this.plugData.TripTitle2 = obj.Title;
}
this.$refs.chooseTrip.clearData();
});
}
},
}, },
mounted() { mounted() {
console.log(this.plugData, 'plugin');
}, },
}; };
......
...@@ -62,44 +62,54 @@ ...@@ -62,44 +62,54 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :span="24"> <el-row :span="24">
<el-form-item label="描述"> <el-form-item>
<el-button type="primary" size="small" @click="isShowTripDailog=true">选择行程</el-button>
</el-form-item>
</el-row>
<el-row :span="24">
<el-form-item label="行程名稱">
<el-input type="text" v-model="plugData.TripTitle"></el-input> <el-input type="text" v-model="plugData.TripTitle"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :span="24"> <el-row :span="24">
<el-form-item label="連結網址"> <el-form-item label="連結網址">
<el-input type="text" v-model="plugData.LinkUrl"></el-input> <el-input type="text" v-model="plugData.LinkUrl" maxlength="200"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item> <el-form-item>
<div class="webSliderDiv"> <div class="webSliderDiv">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <img v-if="plugData.ImageUrl" :src="plugData.ImageUrl" class="web_imgUrl" alt="" />
:show-file-list="false" action="">
<img v-if="plugData.ImageUrl" :src="plugData.ImageUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="plugData.ImageUrl=''"></i>
</div>
</el-upload>
</div> </div>
<div>圖片尺寸請上傳:1600x1059,檔案請小於3M</div> <div>圖片尺寸請上傳:1600x1059,檔案請小於3M</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-dialog title="选择行程" :visible.sync="isShowTripDailog" width="1000px" append-to-body>
<!-- 行程选中 -->
<chooseTrip ref="chooseTrip" :IsMultiple="false"></chooseTrip>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowTripDailog = false" size="small">取 消</el-button>
<el-button type="danger" size="small" @click="getChooseTripData()">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import chooseTrip from "../plug-in/choose_trip.vue"
export default { export default {
props: ["plugData"], props: ["plugData"],
data() { data() {
return { return {
isShowTripDailog: false
}; };
}, },
components: {
chooseTrip,
},
created() {}, created() {},
methods: { methods: {
UploadImage(file) { UploadImage(file) {
...@@ -112,7 +122,35 @@ ...@@ -112,7 +122,35 @@
var imgUrl = this.domainManager().ViittoFileUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.ImageUrl = imgUrl; this.plugData.ImageUrl = imgUrl;
}); });
} },
//获取选择行程数据
getChooseTripData() {
var tempArray = this.$refs.chooseTrip.getChooseData();
this.isShowTripDailog = false;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
var imgUrl = ""
if (item.ImgCover && item.ImgCover.length > 0) {
imgUrl = item.ImgCover[0].Url;
}
var obj = {
StartDate: item.StartDate,
imgUrl: imgUrl,
TCNUM: item.TCNUM,
TCID: item.TCID,
Title: item.Title,
DayNum: item.DayNum,
Price: item.B2BPrice,
};
this.plugData.ImageUrl = obj.imgUrl;
this.plugData.TripTitle = obj.Title;
this.$refs.chooseTrip.clearData();
});
}
},
}, },
mounted() { mounted() {
......
...@@ -69,16 +69,8 @@ ...@@ -69,16 +69,8 @@
<template v-if="plugData.Type==1||plugData.Type==2||plugData.Type==3"> <template v-if="plugData.Type==1||plugData.Type==2||plugData.Type==3">
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;"> <el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="10"> <el-col :span="10">
<div class="webSliderDiv" @click="clickIndex=index"> <div class="webSliderDiv">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <img v-if="item.ImageUrl" :src="item.ImageUrl" class="web_imgUrl" alt="" />
:show-file-list="false" action="">
<img v-if="item.ImageUrl" :src="item.ImageUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="item.ImageUrl=''"></i>
</div>
</el-upload>
</div> </div>
<div v-if="plugData.Type==3" style="margin-top:5px;">圖片尺寸請上傳:600x264,檔案請小於3M</div> <div v-if="plugData.Type==3" style="margin-top:5px;">圖片尺寸請上傳:600x264,檔案請小於3M</div>
<div v-else-if="plugData.Type==2">圖片尺寸請上傳:600x397,檔案請小於3M</div> <div v-else-if="plugData.Type==2">圖片尺寸請上傳:600x397,檔案請小於3M</div>
...@@ -86,28 +78,36 @@ ...@@ -86,28 +78,36 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-row> <el-row>
<el-col :span="24">
<el-form-item>
<el-button type="primary" size="small" @click="isShowTripDailog=true,checkIndex=index">选择行程
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="plugData.Type==1||plugData.Type==2||plugData.Type==3">
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="'行程名稱'+' '+(index+1)"> <el-form-item :label="'行程名稱'+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle"></el-input> <el-input type="text" v-model="item.TripTitle2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="plugData.Type==1||plugData.Type==2"> <el-row v-if="plugData.Type==1||plugData.Type==2">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="價格"> <el-form-item label="價格">
<el-input type="text" v-model="item.Price"></el-input> <el-input type="text" v-model="item.Price2" @keyup.native="checkPrice(item,'Price2')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="天數"> <el-form-item label="天數">
<el-input type="text" v-model="item.DayNum"></el-input> <el-input type="text" v-model="item.DayNum2" @keyup.native="checkInteger(item,'DayNum2')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="連結網址"> <el-form-item label="連結網址">
<el-input type="text" v-model="item.LinkUrl"></el-input> <el-input type="text" v-model="item.LinkUrl2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -117,33 +117,31 @@ ...@@ -117,33 +117,31 @@
<template v-if="plugData.Type==5"> <template v-if="plugData.Type==5">
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;"> <el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="5"> <el-col :span="5">
<div class="webSliderDiv myWebDiv" @click="clickIndex=index"> <div class="webSliderDiv myWebDiv">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <img v-if="item.ImageUrl" :src="item.ImageUrl" style="width:auto;" class="web_imgUrl" alt="" />
:show-file-list="false" action="">
<img v-if="item.ImageUrl" :src="item.ImageUrl" style="width:auto;" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="item.ImageUrl=''"></i>
</div>
</el-upload>
</div> </div>
</el-col> </el-col>
<el-col :span="19"> <el-col :span="19">
<el-form-item style="margin-bottom:0"> <el-form-item style="margin-bottom:0">
<div>圖片尺寸請上傳:373x600,檔案請小於3M</div> <div>圖片尺寸請上傳:373x600,檔案請小於3M</div>
</el-form-item> </el-form-item>
<el-row :span="24">
<el-form-item>
<el-button type="primary" size="small" @click="isShowTripDailog=true,checkIndex=index">选择行程
</el-button>
</el-form-item>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="行程名稱"> <el-form-item label="行程名稱">
<el-input type="text" v-model="item.TripTitle"></el-input> <el-input type="text" v-model="item.TripTitle2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="連結網址"> <el-form-item label="連結網址">
<el-input type="text" v-model="item.LinkUrl"></el-input> <el-input type="text" v-model="item.LinkUrl2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -192,16 +190,16 @@ ...@@ -192,16 +190,16 @@
<template v-if="plugData.Type==6"> <template v-if="plugData.Type==6">
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;"> <el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="8"> <el-col :span="8">
<div class="webSliderDiv webImg_radius" @click="clickIndex=index"> <div class="webSliderDiv webImg_radius">
<el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" <!-- <el-upload :http-request="UploadImage" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action=""> :show-file-list="false" action=""> -->
<img v-if="item.ImageUrl" :src="item.ImageUrl" style="width:auto;" class="web_imgUrl" alt="" /> <img v-if="item.ImageUrl" :src="item.ImageUrl" style="width:auto;" class="web_imgUrl" alt="" />
<div class="addIconDiv"> <!-- <div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i> <i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="item.ImageUrl=''"></i> @click.stop="item.ImageUrl=''"></i>
</div> </div>
</el-upload> </el-upload> -->
</div> </div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
...@@ -209,14 +207,20 @@ ...@@ -209,14 +207,20 @@
<div>圖片尺寸請上傳:700x700,檔案請小於3M</div> <div>圖片尺寸請上傳:700x700,檔案請小於3M</div>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="24">
<el-form-item>
<el-button type="primary" size="small" @click="isShowTripDailog=true,checkIndex=index">选择行程
</el-button>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="'行程名稱'+' '+(index+1)"> <el-form-item :label="'行程名稱'+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle"></el-input> <el-input type="text" v-model="item.TripTitle2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="連結網址"> <el-form-item label="連結網址">
<el-input type="text" v-model="item.LinkUrl"></el-input> <el-input type="text" v-model="item.LinkUrl2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -242,7 +246,6 @@ ...@@ -242,7 +246,6 @@
props: ["plugData"], props: ["plugData"],
data() { data() {
return { return {
clickIndex: 1,
checkIndex: 0, checkIndex: 0,
isShowTripDailog: false isShowTripDailog: false
}; };
......
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