Skip to content

S
SuperMan
Commit d3cda73a authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 223abf0d
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 120 deletions
src/components/WebSet/WebSiteEdit.vue
View file @ d3cda73a
...@@ -222,7 +222,6 @@ ...@@ -222,7 +222,6 @@
<el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id"> <el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<div class="temp-list-wrap"> <div class="temp-list-wrap">
<div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true" <div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true"
@dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)"> @dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)">
...@@ -234,7 +233,7 @@ ...@@ -234,7 +233,7 @@
</div> </div>
</div> </div>
<el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px"> <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
<!--视频--> <!--视频-->
<plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog> <plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog>
<!--轮播图--> <!--轮播图-->
......
src/components/WebSet/home/indexRoll1.vue
View file @ d3cda73a
...@@ -93,35 +93,45 @@ ...@@ -93,35 +93,45 @@
<template> <template>
<div class="WebSite_slider"> <div class="WebSite_slider">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row class="row" :gutter="24">
<el-row class="row"> <el-col :span="10">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.Title"></el-input> <el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> </el-col>
<el-input type="text" v-model="plugData.SubTitle"></el-input> <el-col :span="10">
</el-form-item> <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-form-item label="Mobile LOGO" style="margin-bottom: 0;"> <el-input type="text" v-model="plugData.SubTitle"></el-input>
<div class="webSliderDiv" style="width: 100px;height:100px;"> </el-form-item>
<el-upload :http-request="UploadAttachmentMLogo" :multiple="true" </el-col>
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> <el-col :span="4">
<img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" /> <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
<div class="addIconDiv"> <div class="webSliderDiv" style="width:40px;height:40px;">
<i class="web_addImg iconfont icon-img_haha"></i> <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
@click.stop="plugData.MLogo=''"></i> <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
</div> <div class="addIconDiv">
</el-upload> <i class="web_addImg iconfont icon-img_haha" style="font-size:15px;"></i>
</div> <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
</el-form-item> @click.stop="plugData.MLogo=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"> <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;"> :gutter="24">
<el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input> <el-col :span="20">
</el-form-item> <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;"> <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker> </el-form-item>
</el-form-item> </el-col>
<el-col :span="4">
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<table> <table>
<tbody v-for="(item,index) in plugData.NavList" :key="index"> <tbody v-for="(item,index) in plugData.NavList" :key="index">
...@@ -132,20 +142,14 @@ ...@@ -132,20 +142,14 @@
<td></td> <td></td>
<td class="rowEnd"> <td class="rowEnd">
<div> <div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top"> <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button> <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="w350" rowspan="3"> <td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index"> <div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true" <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
......
src/components/WebSet/home/indexRoll2.vue
View file @ d3cda73a
...@@ -93,34 +93,45 @@ ...@@ -93,34 +93,45 @@
<template> <template>
<div class="WebSite_slider"> <div class="WebSite_slider">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row class="row"> <el-row class="row" :gutter="24">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> <el-col :span="10">
<el-input type="text" v-model="plugData.Title"></el-input> <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
</el-form-item> <el-input type="text" v-model="plugData.Title"></el-input>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> </el-form-item>
<el-input type="text" v-model="plugData.SubTitle"></el-input> </el-col>
</el-form-item> <el-col :span="10">
<el-form-item label="Mobile LOGO" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height:100px;"> <el-input type="text" v-model="plugData.SubTitle"></el-input>
<el-upload :http-request="UploadAttachmentMLogo" :multiple="true" </el-form-item>
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> </el-col>
<img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" /> <el-col :span="4">
<div class="addIconDiv"> <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
<i class="web_addImg iconfont icon-img_haha"></i> <div class="webSliderDiv" style="width:40px;height:40px;">
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
@click.stop="plugData.MLogo=''"></i> accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
</div> <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
</el-upload> <div class="addIconDiv">
</div> <i class="web_addImg iconfont icon-img_haha" style="font-size:15px;"></i>
</el-form-item> <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
@click.stop="plugData.MLogo=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"> <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;"> :gutter="24">
<el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input> <el-col :span="20">
</el-form-item> <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;"> <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker> </el-form-item>
</el-form-item> </el-col>
<el-col :span="4">
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<table> <table>
<tbody v-for="(item,index) in plugData.NavList" :key="index"> <tbody v-for="(item,index) in plugData.NavList" :key="index">
...@@ -131,20 +142,15 @@ ...@@ -131,20 +142,15 @@
<td></td> <td></td>
<td class="rowEnd"> <td class="rowEnd">
<div> <div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top"> <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button> <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-tooltip> </el-button>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="w350" rowspan="3"> <td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index"> <div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true" <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
...@@ -252,7 +258,7 @@ ...@@ -252,7 +258,7 @@
}, },
methods: { methods: {
UploadAttachmentMLogo(file) { UploadAttachmentMLogo(file) {
let newArr = []; let newArr = [];
newArr.push(file.file); newArr.push(file.file);
var path = "/Upload/WebSite/"; var path = "/Upload/WebSite/";
......
src/components/WebSet/home/indexSlider1.vue
View file @ d3cda73a
...@@ -92,36 +92,45 @@ ...@@ -92,36 +92,45 @@
<template> <template>
<div class="WebSite_slider"> <div class="WebSite_slider">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row class="row" :gutter="24">
<el-row class="row"> <el-col :span="10">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.Title"></el-input> <el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;"> </el-col>
<el-input type="text" v-model="plugData.SubTitle"></el-input> <el-col :span="10">
</el-form-item> <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-form-item label="Mobile LOGO" style="margin-bottom: 0;"> <el-input type="text" v-model="plugData.SubTitle"></el-input>
<div class="webSliderDiv" style="width: 100px;height:100px;"> </el-form-item>
<el-upload :http-request="UploadAttachmentMLogo" :multiple="true" </el-col>
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> <el-col :span="4">
<img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" /> <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
<div class="addIconDiv"> <div class="webSliderDiv" style="width: 40px;height:40px;">
<i class="web_addImg iconfont icon-img_haha"></i> <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
@click.stop="plugData.MLogo=''"></i> <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
</div> <div class="addIconDiv">
</el-upload> <i class="web_addImg iconfont icon-img_haha" style=" font-size:15px;"></i>
</div> <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
</el-form-item> @click.stop="plugData.MLogo=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"> <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
:gutter="24">
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;"> <el-col :span="20">
<el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input> <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
</el-form-item> <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;"> </el-form-item>
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker> </el-col>
</el-form-item> <el-col :span="4">
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<table> <table>
<tbody v-for="(item,index) in plugData.NavList" :key="index"> <tbody v-for="(item,index) in plugData.NavList" :key="index">
...@@ -132,20 +141,15 @@ ...@@ -132,20 +141,15 @@
<td></td> <td></td>
<td class="rowEnd"> <td class="rowEnd">
<div> <div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top"> <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button> <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-tooltip> </el-button>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="w350" rowspan="3"> <td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;"> <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index"> <div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true" <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
...@@ -253,7 +257,7 @@ ...@@ -253,7 +257,7 @@
}, },
methods: { methods: {
UploadAttachmentMLogo(file) { UploadAttachmentMLogo(file) {
let newArr = []; let newArr = [];
newArr.push(file.file); newArr.push(file.file);
var path = "/Upload/WebSite/"; var path = "/Upload/WebSite/";
......
src/components/WebSet/plug-in/choose_menu.vue
View file @ d3cda73a
<style> <style>
.choose_menu { .choose_menu {
width: 450px; width: 500px;
line-height: 0; max-height: 430px;
max-height: 400px;
} }
</style> </style>
<template> <template>
...@@ -24,6 +23,9 @@ ...@@ -24,6 +23,9 @@
:check-strictly="true" show-checkbox :check-on-click-node="true"> :check-strictly="true" show-checkbox :check-on-click-node="true">
</el-tree> </el-tree>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('objFill.v101.xuanzhexingc')" name="3">
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
...@@ -124,4 +126,5 @@ ...@@ -124,4 +126,5 @@
}, },
}; };
</script>
\ No newline at end of file </script>
src/components/WebSet/plug-in/choose_trip.vue
View file @ d3cda73a
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
{{ item.DayNum }} {{ item.DayNum }}
</td> </td>
<td> <td>
{{ item.B2BPrice }} {{ item.B2CPrice }}
</td> </td>
<td> <td>
{{ {{
......
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