Skip to content

S
SuperMan
Commit 366ce2b7 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 57bf8d2e b151e310
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1075 additions and 713 deletions
src/assets/common/lang/EN/fill.js
View file @ 366ce2b7
......@@ -2386,6 +2386,7 @@ export const obj = {
zicancd: 'Asset Menu',
qingsrcd: 'Please enter menu URL',
qingsrcdmc: 'Please enter menu name',
qingxzcd: 'Select menu',
qingxzcdcj: 'Please select menu level',
qingxzxtcd: 'Please select System menu',
caidanmbnwk: 'Menu names cannot be empty',
......
src/assets/common/lang/Japan/fill.js
View file @ 366ce2b7
......@@ -2386,6 +2386,7 @@ export const obj = {
zicancd: '資産メニュー',
qingsrcd: 'メニューURLを入力してください',
qingsrcdmc: 'メニュー名を入力してください',
qingxzcd: '選択メニュー',
qingxzcdcj: 'メニュー階層を選択してください',
qingxzxtcd: 'システムメニューを選択してください',
caidanmbnwk: 'メニュー名は空ではいけません',
......
src/assets/common/lang/zhCN/fill.js
View file @ 366ce2b7
......@@ -2386,6 +2386,7 @@ export const obj = {
zicancd: '资产菜单',
qingsrcd: '请输入菜单URL',
qingsrcdmc: '请输入菜单名称',
qingxzcd: '选择菜单',
qingxzcdcj: '请选择菜单层级',
qingxzxtcd: '请选择系统菜单',
caidanmbnwk: '菜单名不能为空',
......
src/assets/common/lang/zhTW/fill.js
View file @ 366ce2b7
......@@ -2386,6 +2386,7 @@ export const obj = {
zicancd: '資產菜單',
qingsrcd: '請輸入菜單URL',
qingsrcdmc: '請輸入菜單名稱',
qingxzcd: '選擇菜單',
qingxzcdcj: '請選擇菜單層級',
qingxzxtcd: '請選擇系統菜單',
caidanmbnwk: '菜單名不能爲空',
......
src/components/WebSet/WebSiteEdit.vue
View file @ 366ce2b7
......@@ -216,10 +216,10 @@
</div>
</div>
<div class="WebSite_Left">
<el-select v-model="countryId" @change="changeCountry" style="margin-bottom:12px;">
<!-- <el-select v-model="countryId" @change="changeCountry" style="margin-bottom:12px;">
<el-option v-for="x in tempCountry" :label="x.name" :value="x.val" :key="x.val">
</el-option>
</el-select>
</el-select> -->
<el-select v-model="templateId" @change="getTemplateDetails()">
<el-option :label="$t('pub.pleaseSel')" :value="0" :key="0">
</el-option>
......
src/components/WebSet/home/indexNav.vue
View file @ 366ce2b7
This diff is collapsed.
src/components/WebSet/home/indexRoll1.vue
View file @ 366ce2b7
This diff is collapsed.
src/components/WebSet/home/indexRoll2.vue
View file @ 366ce2b7
This diff is collapsed.
src/components/WebSet/home/indexSlider1.vue
View file @ 366ce2b7
This diff is collapsed.
src/components/WebSet/home/linkUrl.vue
View file @ 366ce2b7
......@@ -10,14 +10,7 @@
<el-popover trigger="click">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('objFill.v101.myOrdersAllType.zidingyi')+$t('objFill.caidan')" name="1">
<!-- <el-checkbox-group
v-model="checkedCities"
:min="0"
:max="1" class="column"
@change="getUrl">
<el-checkbox v-for="(item,i) in dataDiyList" :label="item.Id" :key="i">
{{item.CategoryName}}</el-checkbox>
</el-checkbox-group> -->
<div class="column">
<el-checkbox v-model="checked"
:true-label="item.Id"
......@@ -73,10 +66,7 @@
};
},
created() {
var arr = [ [1, 2, 2], [3, 4, 5, 5], [6, 7, 8, 9, [11, 12, [12, 13, [14] ] ] ], 10]
// console.log(Array.from(new Set(data.arr.flat(Infinity))))
// console.log()
this.getOptions()
},
methods: {
......
src/components/WebSet/plug-in/b2b_dialog.vue
View file @ 366ce2b7
......@@ -27,15 +27,18 @@
align-items: center;
justify-content: center;
}
.b2bDialog .webSliderDiv .addIconDiv:hover {
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
.b2bDialog .webSliderDiv i {
font-size: 50px;
color: #d1d1d1;
cursor: pointer;
}
}
.b2bDialog .webSliderDiv>div {
height: 100%;
}
......@@ -50,7 +53,7 @@
height: 310px !important;
border-radius: 50%;
overflow: hidden;
margin-left:80px;
margin-left: 80px;
}
.b2b_imgList {
......@@ -67,7 +70,6 @@
background-position: center;
background-size: cover;
}
</style>
<template>
<div class="b2bDialog">
......@@ -82,8 +84,8 @@
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="10">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.TripImageUrl" :src="item.TripImageUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
......@@ -98,7 +100,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,clickIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,clickIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -125,7 +128,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,clickIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,clickIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -163,13 +167,14 @@
<el-col :span="12" v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<div>
<el-form-item>
<el-button type="primary" style="margin-left:80px;" size="small" @click="isShowTripDailog=true,clickIndex=index">{{$t('objFill.v101.xuanzhexingc')}}
<el-button type="primary" style="margin-left:80px;" size="small"
@click="isShowTripDailog=true,clickIndex=index">{{$t('objFill.v101.xuanzhexingc')}}
</el-button>
</el-form-item>
</div>
<div class="webSliderDiv webImg_radius" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.TripImageUrl" :src="item.TripImageUrl" style="width:auto;" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
......@@ -250,5 +255,4 @@
},
mounted() {},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/b2blink_dialog.vue
View file @ 366ce2b7
......@@ -73,7 +73,7 @@
<el-col :span="24">
<el-form-item>
<el-input type="text" v-model="plugData.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
<el-form-item>
......
src/components/WebSet/plug-in/banner_dialog.vue
View file @ 366ce2b7
......@@ -2,7 +2,7 @@
.bannerdialog .webSliderDiv {
line-height: 0;
height: 115px;
width:400px;
width: 400px;
border: 1px solid #ccc;
cursor: pointer;
position: relative;
......@@ -43,14 +43,14 @@
.bannerdialog .webSliderDiv>div {
height: 100%;
}
.bannerdialog .sectionImg{
position:absolute;
width:100%;
height:100%;
.bannerdialog .sectionImg {
position: absolute;
width: 100%;
height: 100%;
background-position: center;
background-size: cover;
}
</style>
<template>
<div class="bannerdialog">
......@@ -65,65 +65,81 @@
</template>
<template v-if="plugData.Type==1">
<el-row>
<el-col :span="12" v-for="(item,index) in plugData.Details" :key="index">
<el-col :span="12" v-for="(item,index) in plugData.Details" :key="index">
<el-form-item>
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></div>
<div class="addIconDiv">
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></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="item.ImageUrl=''"></i>
</div>
@click.stop="item.ImageUrl=''"></i>
</div>
</el-upload>
</div>
<div>{{$t('objFill.v101.tupccqscwwnpx')}}</div>
</div>
<div>{{$t('objFill.v101.tupccqscwwnpx')}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
</template>
<template v-if="plugData.Type==2||plugData.Type==3||plugData.Type==4">
<el-row v-for="(item,index) in plugData.Details" :key="index">
<el-col :span="12">
<el-form-item>
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></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="item.ImageUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==2">{{$t('objFill.v101.tupccqscwns')}}</div>
<div v-if="plugData.Type==3">{{$t('objFill.v101.tupccqscsse')}}</div>
<div v-if="plugData.Type==4">{{$t('objFill.v101.tupccqscsse')}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.biaoti')+' '+(index+1)">
<el-input type="text" v-model="item.LinkTitle"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.v101.lianjwz')" v-if="plugData.Type==2">
<el-input type="text" v-model="item.LinkUrl"></el-input>
</el-form-item>
</el-col>
<el-row v-for="(item,index) in plugData.Details" :key="index">
<el-col :span="12">
<el-form-item>
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></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="item.ImageUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==2">{{$t('objFill.v101.tupccqscwns')}}</div>
<div v-if="plugData.Type==3">{{$t('objFill.v101.tupccqscsse')}}</div>
<div v-if="plugData.Type==4">{{$t('objFill.v101.tupccqscsse')}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.biaoti')+' '+(index+1)">
<el-input type="text" v-model="item.LinkTitle"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.v101.lianjwz')" v-if="plugData.Type==2">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
</template>
</el-form>
<el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
<!-- 行程选中 -->
<chooseMenu ref="chooseMenu"></chooseMenu>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowMenuDialog = false" size="small">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="getMenuChoose()">{{$t('pub.sureBtn')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import chooseMenu from "../plug-in/choose_menu.vue"
export default {
props: ["plugData"],
components: {
chooseMenu
},
data() {
return {
checkIndex: 1,
clickItem: {},
isShowMenuDialog: false, //是否显示菜单弹窗
};
},
created() {},
......@@ -131,17 +147,29 @@
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.Details[this.checkIndex].ImageUrl=imgUrl;
this.plugData.Details[this.checkIndex].ImageUrl = imgUrl;
});
}
},
mounted() {
},
//显示菜单弹窗
ShowMenuDialog(item) {
this.clickItem = item;
this.isShowMenuDialog = true;
},
//获取选中的菜单数据
getMenuChoose() {
var chooseMenuObj = this.$refs.chooseMenu.getChooseMenu();
this.isShowMenuDialog = false;
if (chooseMenuObj) {
this.clickItem.LinkTitle = chooseMenuObj.MenuName;
this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
}
this.$refs.chooseMenu.initMenuCheck();
},
},
mounted() {},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/choose_menu.vue 0 → 100644
View file @ 366ce2b7
<style>
.choose_menu {
width: 450px;
line-height: 0;
max-height: 400px;
}
</style>
<template>
<div class="choose_menu">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('objFill.v101.myOrdersAllType.zidingyi')+$t('objFill.caidan')" name="1">
<div class="column" style="height:400px;overflow-y:scroll;line-height:normal;">
<template v-for="(subItem,subIndex) in dataDiyList">
<div :key="subIndex" style="margin-bottom:10px;">
<el-checkbox v-model="subItem.IsChecked" :key="subIndex" @change="checkMenuChange(subItem)">
<span>{{subItem.CategoryName}}</span>
</el-checkbox>
</div>
</template>
</div>
</el-tab-pane>
<el-tab-pane :label="$t('ground.fenlei')+$t('objFill.caidan')" name="2">
<el-tree :data='WebSiteCategoryList' node-key="Id" ref="treeMenu" :props="defaultProps" @check="treeCheck"
:check-strictly="true" show-checkbox :check-on-click-node="true">
</el-tree>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
export default {
data() {
return {
defaultProps: {
children: "SubList",
label: "CategoryName",
},
activeName: '1',
WebSiteCategoryList: [], //分类菜单
dataDiyList: [], //自定义页面
checkedMenuObj: {}, //选中的菜单对象
};
},
created() {
this.getOptions()
},
methods: {
//复选框选择
checkMenuChange(subItem) {
if (this.dataDiyList && this.dataDiyList.length > 0) {
this.dataDiyList.forEach(item => {
item.IsChecked = false;
});
}
subItem.IsChecked = !subItem.IsChecked;
},
//树形菜单选择
treeCheck(node, list) {
if (list.checkedKeys.length == 2) {
//单选实现
this.$refs.treeMenu.setCheckedKeys([node.Id]);
this.checkedMenuObj = node;
}
},
//选项卡切换
handleClick() {
},
//获取菜单数据
getOptions() {
this.apipost(
"ws_post_GetAllMenuList", {},
res => {
if (res.data.resultCode == 1) {
this.WebSiteCategoryList = res.data.data.WebSiteCategoryList
this.dataDiyList = res.data.data.DiyList;
} else {
this.Error(res.data.message);
}
});
},
//初始化菜单选中状态
initMenuCheck() {
if (this.dataDiyList && this.dataDiyList.length > 0) {
this.dataDiyList.forEach(item => {
item.IsChecked = false;
});
}
this.checkedMenuObj = {};
},
//获取选择的菜单
getChooseMenu() {
var obj = {
MenuName: "",
MenuUrl: "",
};
if (this.activeName == "1") {
if (this.dataDiyList && this.dataDiyList.length > 0) {
this.dataDiyList.forEach(item => {
if (item.IsChecked) {
obj.MenuUrl = item.LinkUrl;
obj.MenuName = item.CategoryName;
}
});
}
} else {
obj.MenuUrl = this.checkedMenuObj.LinkUrl;
obj.MenuName = this.checkedMenuObj.CategoryName
}
var domainUrl = this.getLocalStorage().B2BDomain;
if (obj.MenuUrl) {
if (obj.MenuUrl.indexOf("https") != -1) {
} else if (obj.MenuUrl.indexOf("http") != -1) {
} else {
obj.MenuUrl = domainUrl + obj.MenuUrl;
}
}
return obj;
},
},
mounted() {
},
};
</script>
\ No newline at end of file
src/components/WebSet/plug-in/imglink_dialog.vue
View file @ 366ce2b7
......@@ -50,7 +50,6 @@
background-position: center;
background-size: cover;
}
</style>
<template>
<div class="WebSiteimgLink">
......@@ -73,8 +72,8 @@
<el-col :span="10">
<el-form-item>
<div class="webSliderDiv" @click="checkindex=1">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -91,7 +90,8 @@
</el-form-item>
<el-form-item :label="$t('objFill.xingchengmc')+' 1'">
<el-input type="text" v-model="plugData.TripTitle1">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=1">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=1">{{$t('objFill.v101.xuanzhexingc')}}
</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -99,9 +99,9 @@
<el-row>
<el-col :span="10">
<el-form-item>
<div class="webSliderDiv" @click="checkindex=2">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<div class="webSliderDiv" @click="checkindex=2">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -120,7 +120,8 @@
</el-form-item>
<el-form-item :label="$t('objFill.xingchengmc')+' 2'">
<el-input type="text" v-model="plugData.TripTitle2">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=2">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=2">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -204,5 +205,4 @@
},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/paragraphLink_dialog.vue
View file @ 366ce2b7
......@@ -42,7 +42,6 @@
.paragraphLink .webSliderDiv>div {
height: 100%;
}
</style>
<template>
<div class="paragraphLink">
......@@ -64,7 +63,7 @@
<el-row :span="24">
<el-form-item :label="$t('objFill.xingchengmc')">
<el-input type="text" v-model="plugData.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-row>
......@@ -77,8 +76,8 @@
<el-col :span="24">
<el-form-item>
<div class="webSliderDiv">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -138,6 +137,7 @@
if (item.ImgCover && item.ImgCover.length > 0) {
imgUrl = item.ImgCover[0].Url;
}
var LinkUrl = this.$tripUtils.GetB2BUrl(this.getLocalStorage().B2BDomain, item.ConfigId, item.TCID);
var obj = {
StartDate: item.StartDate,
imgUrl: imgUrl,
......@@ -149,16 +149,14 @@
};
this.plugData.ImageUrl = obj.imgUrl;
this.plugData.TripTitle = obj.Title;
this.plugData.LinkUrl = LinkUrl;
this.$refs.chooseTrip.clearData();
});
}
},
},
mounted() {
},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/picture_dialog.vue
View file @ 366ce2b7
......@@ -68,10 +68,9 @@
<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-col :span="10">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -89,7 +88,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -120,8 +120,8 @@
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="5">
<div class="webSliderDiv myWebDiv" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -139,7 +139,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -158,8 +159,8 @@
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="10">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -175,7 +176,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -198,9 +200,9 @@
<template v-if="plugData.Type==6">
<el-row v-for="(item,index) in plugData.Details" :key="index" style="margin-bottom:20px;">
<el-col :span="10">
<div class="webSliderDiv webImg_radius" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<div class="webSliderDiv webImg_radius" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :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>
......@@ -218,7 +220,8 @@
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')+' '+(index+1)">
<el-input type="text" v-model="item.TripTitle">
<el-button slot="append" type="primary" @click="isShowTripDailog=true,checkIndex=index">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
<el-button slot="append" @click="isShowTripDailog=true,checkIndex=index">
{{$t('objFill.v101.xuanzhexingc')}}</el-button>
</el-input>
</el-form-item>
</el-col>
......@@ -257,8 +260,7 @@
components: {
chooseTrip
},
created() {
},
created() {},
methods: {
UploadAttachment(file) {
let newArr = [];
......@@ -289,7 +291,7 @@
TCID: item.TCID,
Title: item.Title,
DayNum: item.DayNum,
Price: item.B2BPrice,
Price: item.B2CPrice,
LinkUrl: LinkUrl,
};
if (this.plugData.Type == 1 || this.plugData.Type == 2 || this.plugData.Type == 3 || this.plugData
......@@ -314,5 +316,4 @@
},
mounted() {},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/qrcode_dialog.vue
View file @ 366ce2b7
......@@ -7,14 +7,17 @@
cursor: pointer;
position: relative;
}
.webSite_qrcode .webSliderDiv .web_imgUrl {
width: 100%;
height: 100%;
}
.webSite_qrcode .webSliderDiv .el-upload{
width:100%;
height:100%;
.webSite_qrcode .webSliderDiv .el-upload {
width: 100%;
height: 100%;
}
.webSite_qrcode .webSliderDiv .addIconDiv {
position: absolute;
width: 100%;
......@@ -25,16 +28,17 @@
align-items: center;
justify-content: center;
}
.webSite_qrcode .webSliderDiv i {
font-size: 50px;
color: #d1d1d1;
cursor: pointer;
}
.webSliderDiv .addIconDiv:hover {
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
</style>
<template>
<div class="webSite_qrcode">
......@@ -46,111 +50,147 @@
<el-input type="text" v-model="plugData.Describe"></el-input>
</el-form-item>
<el-row>
<el-col :span="6">
<div class="webSliderDiv" @click="clickIndex=1">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.LinkImg1" :src="plugData.LinkImg1" 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.LinkImg1=''"></i>
</div>
</el-upload>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="24">
<el-form-item>
<span style="font-size:14px;color:#737373">{{$t('objFill.v101.tupiccqscsln')}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')">
<el-input type="text" v-model="plugData.TripTitle1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.v101.lianjwz')">
<el-input type="text" v-model="plugData.LinkUrl1"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="6">
<div class="webSliderDiv" @click="clickIndex=1">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.LinkImg1" :src="plugData.LinkImg1" 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.LinkImg1=''"></i>
</div>
</el-upload>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="24">
<el-form-item>
<span style="font-size:14px;color:#737373">{{$t('objFill.v101.tupiccqscsln')}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')">
<el-input type="text" v-model="plugData.TripTitle1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.v101.lianjwz')">
<el-input type="text" v-model="plugData.LinkUrl1">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row style="margin-top:20px;">
<el-col :span="6">
<div class="webSliderDiv" @click="clickIndex=2">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.LinkImg2" :src="plugData.LinkImg2" 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.LinkImg2=''"></i>
</div>
</el-upload>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="24">
<el-form-item>
<span style="font-size:14px;color:#737373">{{$t('objFill.v101.tupiccqscsln')}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')">
<el-input type="text" v-model="plugData.TripTitle2"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.v101.lianjwz')">
<el-input type="text" v-model="plugData.LinkUrl2" maxlength="200"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="6">
<div class="webSliderDiv" @click="clickIndex=2">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.LinkImg2" :src="plugData.LinkImg2" 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.LinkImg2=''"></i>
</div>
</el-upload>
</div>
</el-col>
<el-col :span="18">
<el-row>
<el-col :span="24">
<el-form-item>
<span style="font-size:14px;color:#737373">{{$t('objFill.v101.tupiccqscsln')}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.xingchengmc')">
<el-input type="text" v-model="plugData.TripTitle2"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item :label="$t('objFill.v101.lianjwz')">
<el-input type="text" v-model="plugData.LinkUrl2" maxlength="200">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(2)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</el-form>
<el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
<!-- 行程选中 -->
<chooseMenu ref="chooseMenu"></chooseMenu>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowMenuDialog = false" size="small">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="getMenuChoose()">{{$t('pub.sureBtn')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import chooseMenu from "../plug-in/choose_menu.vue"
export default {
props: ["plugData"],
components: {
chooseMenu
},
data() {
return {
clickIndex:1
clickIndex: 1,
isShowMenuDialog: false, //是否显示菜单弹窗
};
},
created() {},
methods: {
//上传图片
//上传图片
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
if(this.clickIndex==1){
if (this.clickIndex == 1) {
this.plugData.LinkImg1 = imgUrl;
}else{
} else {
this.plugData.LinkImg2 = imgUrl;
}
});
}
},
mounted() {
},
//显示菜单弹窗
ShowMenuDialog(index) {
this.clickIndex = index;
this.isShowMenuDialog = true;
},
//获取选中的菜单数据
getMenuChoose() {
var chooseMenuObj = this.$refs.chooseMenu.getChooseMenu();
this.isShowMenuDialog = false;
if (chooseMenuObj) {
if (this.clickIndex == 1) {
this.plugData.TripTitle1 = chooseMenuObj.MenuName;
this.plugData.LinkUrl1 = chooseMenuObj.MenuUrl;
} else {
this.plugData.TripTitle2 = chooseMenuObj.MenuName;
this.plugData.LinkUrl2 = chooseMenuObj.MenuUrl;
}
}
this.$refs.chooseMenu.initMenuCheck();
},
},
mounted() {},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/searchs_dialog.vue
View file @ 366ce2b7
......@@ -2,11 +2,12 @@
.searchsdialog .webSliderDiv {
line-height: 0;
height: 115px;
width:400px;
width: 400px;
border: 1px solid #ccc;
cursor: pointer;
position: relative;
}
.searchsdialog .webSliderDiv .el-upload {
width: 100%;
height: 100%;
......@@ -37,14 +38,14 @@
.searchsdialog .webSliderDiv>div {
height: 100%;
}
.searchsdialog .sectionImg{
position:absolute;
width:100%;
height:100%;
.searchsdialog .sectionImg {
position: absolute;
width: 100%;
height: 100%;
background-position: center;
background-size: cover;
}
</style>
<template>
<div class="searchsdialog">
......@@ -53,41 +54,57 @@
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
<template>
<el-row v-for="(item,index) in plugData.Details" :key="index">
<el-col :span="12">
<el-form-item>
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></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="item.ImageUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==1">{{$t('objFill.v101.tupiqscsqn')}}</div>
<div v-if="plugData.Type==2">{{$t('objFill.v101.tupiqscsys')}}</div>
<div v-if="plugData.Type==3">{{$t('objFill.v101.tupiqscesw')}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v101.lianjie')">
<el-input type="text" v-model="plugData.LinkUrl"></el-input>
</el-form-item>
</el-col>
<el-row v-for="(item,index) in plugData.Details" :key="index">
<el-col :span="12">
<el-form-item>
<div class="webSliderDiv" @click="checkIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<div class="sectionImg" :style="{backgroundImage:'url(' + item.ImageUrl + ')'}"></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="item.ImageUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==1">{{$t('objFill.v101.tupiqscsqn')}}</div>
<div v-if="plugData.Type==2">{{$t('objFill.v101.tupiqscsys')}}</div>
<div v-if="plugData.Type==3">{{$t('objFill.v101.tupiqscesw')}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v101.lianjie')">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
</template>
</el-form>
<el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
<!-- 行程选中 -->
<chooseMenu ref="chooseMenu"></chooseMenu>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowMenuDialog = false" size="small">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="getMenuChoose()">{{$t('pub.sureBtn')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import chooseMenu from "../plug-in/choose_menu.vue"
export default {
props: ["plugData"],
components: {
chooseMenu
},
data() {
return {
checkIndex: 1,
clickItem: {},
isShowMenuDialog: false, //是否显示菜单弹窗
};
},
created() {},
......@@ -95,17 +112,28 @@
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.Details[this.checkIndex].ImageUrl=imgUrl;
this.plugData.Details[this.checkIndex].ImageUrl = imgUrl;
});
}
},
mounted() {
},
//显示菜单弹窗
ShowMenuDialog(item) {
this.clickItem = item;
this.isShowMenuDialog = true;
},
//获取选中的菜单数据
getMenuChoose() {
var chooseMenuObj = this.$refs.chooseMenu.getChooseMenu();
this.isShowMenuDialog = false;
if (chooseMenuObj) {
this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
}
this.$refs.chooseMenu.initMenuCheck();
},
},
mounted() {},
};
</script>
</script>
\ No newline at end of file
src/components/WebSet/plug-in/slider_dialog.vue
View file @ 366ce2b7
......@@ -18,6 +18,7 @@
width: 100%;
height: 100%;
}
.WebSite_slider .webSliderDiv .addIconDiv {
position: absolute;
width: 100%;
......@@ -39,7 +40,6 @@
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
</style>
<template>
<div class="WebSite_slider">
......@@ -62,14 +62,15 @@
<tbody v-for="(item,index) in plugData.Details" :key="index">
<tr>
<td>
<el-form-item >
<el-form-item>
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.LinkImg" :src="item.LinkImg" 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.LinkImg=''"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;"
@click.stop="item.LinkImg=''"></i>
</div>
</el-upload>
</div>
......@@ -79,21 +80,37 @@
</td>
<td>
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)">
<el-input type="text" v-model="item.LinkUrl" class="w250"></el-input>
<el-input type="text" v-model="item.LinkUrl" class="w300">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</el-form>
<el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
<!-- 行程选中 -->
<chooseMenu ref="chooseMenu"></chooseMenu>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowMenuDialog = false" size="small">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="getMenuChoose()">{{$t('pub.sureBtn')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import chooseMenu from "../plug-in/choose_menu.vue"
export default {
props: ["plugData"],
components: {
chooseMenu
},
data() {
return {
clickIndex: 0, //点击图片索引
isShowMenuDialog: false, //是否显示菜单弹窗
clickItem: {},
};
},
created() {
......@@ -104,7 +121,6 @@
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
......@@ -112,9 +128,21 @@
this.plugData.Details[this.clickIndex].LinkImg = imgUrl;
});
},
//显示菜单弹窗
ShowMenuDialog(item) {
this.clickItem = item;
this.isShowMenuDialog = true;
},
//获取选中的菜单数据
getMenuChoose() {
var chooseMenuObj = this.$refs.chooseMenu.getChooseMenu();
this.isShowMenuDialog = false;
if (chooseMenuObj) {
this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
}
this.$refs.chooseMenu.initMenuCheck();
},
},
mounted() {}
};
</script>
</script>
\ No newline at end of file
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