Skip to content

S
SuperMan
Commit f21e1742 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 640b4652 d7277f93
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 529 additions and 189 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ f21e1742
......@@ -139,7 +139,7 @@
<el-select v-model="msg2.BatchNumber" placeholder="请选择">
<el-option label="第一批" :value="1"></el-option>
<el-option label="第二批" :value="2"></el-option>
<el-option label="第三批" :value="3"></el-option>
<!-- <el-option label="第三批" :value="3"></el-option> -->
</el-select>
</el-form-item>
</el-col>
......@@ -345,7 +345,7 @@
<el-select v-model="msg.BatchNumber" placeholder="请选择">
<el-option label="第一批" :value="1"></el-option>
<el-option label="第二批" :value="2"></el-option>
<el-option label="第三批" :value="3"></el-option>
<!-- <el-option label="第三批" :value="3"></el-option> -->
</el-select>
</el-form-item>
</el-col>
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ f21e1742
......@@ -881,6 +881,7 @@ export default {
let path = "/Upload/DMC/Icon/";
this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
console.log('url', url)
let Name=x.data.SourceFileName;
this.addMsg.VisaProductInfo.DownloadMaterialsFileList.push({Url:url,Name:Name,name:Name})
......
src/components/SalesVisa/VisaProductCountryManager.vue
View file @ f21e1742
......@@ -204,6 +204,7 @@
margin-left: 10px;
}
._top img {
display: inline-block;
width: 71px;
height: 46px;
}
......@@ -237,7 +238,46 @@
top:2px;
right: 0px;
}
.visa_pro_country .TFimgList {
float: left;
width: 170px;
height: 120px;
border-radius: 4px;
position: relative;
margin: 0 10px 10px 0;
overflow: hidden;
}
.visa_pro_country .TFIMGzhe {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.4);
position: absolute;
top: 0;
text-align: center;
line-height: 115px;
border-radius: 4px;
display: none;
}
.visa_pro_country .TFreupload {
width: 32px;
height: 32px;
border-radius: 50%;
line-height: 32px;
top: 50px;
left: 53px;
display: inline-block;
text-align: center;
background-color: gray;
color: #fff;
}
.visa_pro_country .TFimgList:hover .TFIMGzhe {
display: block;
}
.visa_pro_country .TFimgList img {
width: 100%;
height: 100%;
}
</style>
<template>
<div class="page_visaMG visa_pro_country">
......@@ -313,31 +353,56 @@
<el-input v-model="country.Sort" placeholder="排序"/>
</el-form-item>
<el-form-item label="国家图标">
<el-upload
:file-list="fileList"
:http-request="uploadTest"
:multiple="true"
:limit="2"
:on-change="handleChange1"
action="">
<!-- <el-upload
:file-list="fileList"
:http-request="uploadTest"
:multiple="true"
:limit="2"
:on-change="handleChange1"
action="">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-upload> -->
<div class="TFimgList">
<img v-if="!country.Icon" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='country.Icon'>
<div class="TFIMGzhe">
<div class="TFreupload">
<el-upload :file-list="fileList" :http-request="uploadTest" :multiple="true" :limit="2"
:on-change="handleChange1"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-Edit"></i>
</el-upload>
</div>
</div>
</div>
</el-form-item>
<el-form-item label="背景图片">
<el-upload
:file-list="fileList2"
:http-request="uploadTest2"
:multiple="true"
:limit="2"
:on-change="handleChange2"
<!-- <el-upload
:file-list="fileList2"
:http-request="uploadTest2"
:multiple="true"
:limit="2"
:on-change="handleChange2"
action="">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
<el-button size="small" type="primary">点击上传</el-button></el-upload> -->
<div class="TFimgList">
<img v-if="!country.ImageFileList[0]" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='country.ImageFileList[0]'>
<div class="TFIMGzhe">
<div class="TFreupload">
<el-upload :file-list="fileList2" :http-request="uploadTest2" :multiple="true" :limit="2"
:on-change="handleChange2"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-Edit"></i>
</el-upload>
</div>
</div>
</div>
</el-form-item>
<!-- <el-form-item>
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">取消</button>
<button type="button" class="normalBtn" @click="saveVisa">保存</button>
</el-form-item> -->
</el-form>
</div>
<!-- 国家产品标签 -->
......@@ -488,7 +553,7 @@ export default {
},
// 编辑标签
EditTag(tag,num){
console.log(tag);
this.showInput(num);
this.inputValue=tag.TagTame;
this.productlabel.Id=tag.Id;
......@@ -587,11 +652,9 @@ export default {
"dmc_post_visa_GetVisaProductCountryTagList",
{VisaCountryId:item},
res => {
console.log(res);
this.tagloading=false;
if (res.data.resultCode == 1) {
this.CountryTagList=res.data.data;
console.log(this.CountryTagList,'countrylist');
} else {
this.Error(res.data.message);
}
......@@ -648,8 +711,10 @@ export default {
this.fileList2 = fileList.slice(-1);
},
handleChange1(file, fileList) {
this.fileList = fileList.slice(-1);
this.fileList = fileList.slice(-1);
},
// 修改国家图标
uploadTest(file) {
let newArr = [];
newArr.push(file.file);
......@@ -700,7 +765,7 @@ export default {
},
saveVisa() {
//修改保存
// console.log("this.country",this.country);
if (this.country.CountryId == "") {
this.$message.error("请选择国家！");
return;
......
src/components/busManagement/BusInfo.vue
View file @ f21e1742
......@@ -824,6 +824,7 @@
newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.BusNum = oldPlanData.BusNum;
newPlanData.BusCompany = oldPlanData.BusCompany;
newPlanData.BusType = oldPlanData.BusType;
newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup;
}
......
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