Commit 613c6810 authored by huangyuanyuan's avatar huangyuanyuan

修改部分样式

parent bd1b9704
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.Home .ticket .el-form-item { .Home .ticket .el-form-item {
display: inline-block; display: inline-block;
margin-bottom: 0; margin-bottom: 0;
width: 185px; width: 182px;
} }
.Home .el-tabs__item:hover { .Home .el-tabs__item:hover {
color: #fd6473; color: #fd6473;
...@@ -118,7 +118,7 @@ p { ...@@ -118,7 +118,7 @@ p {
font-family: "PingFang"; font-family: "PingFang";
} }
.Home .cztm_item_content p{ .Home .cztm_item_content p{
padding:1px 0; padding:2px 0;
} }
.Home .cztm_item_content .cztm_title{ .Home .cztm_item_content .cztm_title{
color:#333333; color:#333333;
...@@ -155,14 +155,14 @@ p { ...@@ -155,14 +155,14 @@ p {
} }
.Home .cztm .cztm_item{ .Home .cztm .cztm_item{
position: relative; position: relative;
width:220px; width:215px;
height:130px; height:130px;
font-size: 14px; font-size: 12px;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(220,220,220,1); border:1px solid rgba(220,220,220,1);
display: inline-flex; display: inline-flex;
align-items:center; align-items:center;
margin:0 0 15px 15px; margin:0 0 15px 22px;
box-sizing: border-box; box-sizing: border-box;
} }
.Home #triangle-left{ .Home #triangle-left{
...@@ -234,7 +234,7 @@ p { ...@@ -234,7 +234,7 @@ p {
position: relative; position: relative;
} }
.Home .Grouptour .tour_left{ .Home .Grouptour .tour_left{
width:220px; width:216px;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -673,4 +673,21 @@ p { ...@@ -673,4 +673,21 @@ p {
.Home .visa .el-tabs__nav-wrap::after{ .Home .visa .el-tabs__nav-wrap::after{
height: 1px; height: 1px;
background-color: #d8d8d8; background-color: #d8d8d8;
}
.Home .el-input__inner{
border: 1px solid #d8dadc;
}
.Home .tag_right .hotel_tabcontent .el-form-item {
margin-bottom: 13px;
}
.Home .cztm .el-tabs__item.is-active{
color:#ee4454;
}
.Home .cztm .el-tabs__active-bar{
height: 3px;
background: #ee4454;
}
.Home .cztm .el-tabs__nav-wrap::after{
height: 1px;
background-color: #ededed;
} }
\ No newline at end of file
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</ul> </ul>
<div class="tag_right"> <div class="tag_right">
<!-- 签证 --> <!-- 签证 -->
<div v-show="tag=='visa'" class="visa"> <div style="width:394px" v-show="tag=='visa'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px"> <el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="国家/地区" style="margin-bottom:10px"> <el-form-item label="国家/地区" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-form> </el-form>
</div> </div>
<!-- 机票 --> <!-- 机票 -->
<div v-show="tag=='ticket'" class="ticket"> <div style="width:394px" v-show="tag=='ticket'" class="ticket">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="国际机票" name="first"> <el-tab-pane label="国际机票" name="first">
<el-form ref="ticket_form" :model="ticket_form" label-width="70px"> <el-form ref="ticket_form" :model="ticket_form" label-width="70px">
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-tabs> </el-tabs>
</div> </div>
<!-- 酒店 --> <!-- 酒店 -->
<div v-show="tag=='hotel'" class="visa"> <div style="width:394px" v-show="tag=='hotel'" class="visa hotel_tabcontent">
<el-tabs v-model="hotel_tab" @tab-click="handleClick"> <el-tabs v-model="hotel_tab" @tab-click="handleClick">
<el-tab-pane label="国际酒店" name="gjjd"> <el-tab-pane label="国际酒店" name="gjjd">
<el-form ref="visa_form" :model="visa_form" label-width="60px"> <el-form ref="visa_form" :model="visa_form" label-width="60px">
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</div> </div>
<!-- 门票 --> <!-- 门票 -->
<div v-show="tag=='admticket'" class="visa"> <div style="width:394px" v-show="tag=='admticket'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px"> <el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="关键词搜索" style="margin-bottom:10px"> <el-form-item label="关键词搜索" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input> <el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<div class="cztm"> <div class="cztm">
<el-tabs v-model="activecontent1" @tab-click="handleClick"> <el-tabs v-model="activecontent1" @tab-click="handleClick">
<el-tab-pane label="超值特卖" name="first"> <el-tab-pane label="超值特卖" name="first">
<div style="margin-left:-17px"> <div style="margin-left:-25px">
<div class="cztm_item"> <div class="cztm_item">
<img src="//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg" alt="" class=""> <img src="//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg" alt="" class="">
<div class="cztm_item_content"> <div class="cztm_item_content">
......
...@@ -898,7 +898,6 @@ export default { ...@@ -898,7 +898,6 @@ export default {
getData: function (msg) { getData: function (msg) {
this.loadingDataList=true this.loadingDataList=true
this.apipost('b2b_get_GetB2BFreeInfo',msg,r=>{ this.apipost('b2b_get_GetB2BFreeInfo',msg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
let data = (r.data.data); let data = (r.data.data);
this.sonData = data; this.sonData = data;
......
<template> <template>
<div class="CustomizedList"> <div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px"> <el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="订单信息"> <el-form-item label="订单状态">
<el-select size="small" v-model="form.orderStatus" placeholder="请订单信息"> <el-select size="small" v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="已提交" :value="1"></el-option> <el-option label="已提交" :value="1"></el-option>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-option label="下单" :value="4"></el-option> <el-option label="下单" :value="4"></el-option>
<el-option label="已成团" :value="5"></el-option> <el-option label="已成团" :value="5"></el-option>
<el-option label="已关团" :value="6"></el-option> <el-option label="已关团" :value="6"></el-option>
<el-option label="已取消" :value="6"></el-option> <el-option label="已取消" :value="7"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="出发日期"> <el-form-item label="出发日期">
...@@ -57,12 +57,15 @@ ...@@ -57,12 +57,15 @@
label="人均预算"> label="人均预算">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="处理状态"> label="订单状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.orderStatus==1">未分配</span> <span v-if="scope.row.orderStatus==1">已提交</span>
<span v-if="scope.row.orderStatus==2">处理中</span> <span v-if="scope.row.orderStatus==2">方案设计</span>
<span v-if="scope.row.orderStatus==3">处理完成</span> <span v-if="scope.row.orderStatus==3">合同签订</span>
<span v-if="scope.row.orderStatus==4">处理失败</span> <span v-if="scope.row.orderStatus==4">下单</span>
<span v-if="scope.row.orderStatus==5">已成团</span>
<span v-if="scope.row.orderStatus==6">已关团</span>
<span v-if="scope.row.orderStatus==7">已取消</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -131,7 +134,6 @@ export default { ...@@ -131,7 +134,6 @@ export default {
getList(){ getList(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomList',this.form,res=>{ this.apiJavaPost('/api/b2b/free/getTravelCoupomList',this.form,res=>{
this.loading=false; this.loading=false;
console.log(res);
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
this.totalCount=res.data.data.count; this.totalCount=res.data.data.count;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</template> </template>
</ul> </ul>
<!-- 表格 --> <!-- 表格 -->
<TKTable :tableData="tableData"/> <TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1"> <div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
很抱歉,你想要的信息我们真的找不到了 很抱歉,你想要的信息我们真的找不到了
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
</el-row> </el-row>
</template> </template>
<script> <script>
import TKTable from "./OrderInfoModel/TKTable"; import TCTable from "./OrderInfoModel/TCTable";
export default { export default {
components: { components: {
TKTable: TKTable TCTable: TCTable
}, },
data() { data() {
return { return {
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span> <span slot="title">会员中心</span>
</el-menu-item> </el-menu-item>
<el-submenu index="3"> <el-submenu index="9">
<template slot="title"> <template slot="title">
<i class="iconfont icon-huiyuanicon"></i> <i class="iconfont icon-huiyuanicon"></i>
<span>定制游</span> <span>定制游</span>
......
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