Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
华国豪
Athena
Commits
613c6810
Commit
613c6810
authored
May 08, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分样式
parent
bd1b9704
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
245 additions
and
172 deletions
+245
-172
home.css
src/assets/css/home.css
+23
-6
CustomizedTourism.vue
src/components/DependentTravel/CustomizedTourism.vue
+92
-72
DesignScheme.vue
src/components/DependentTravel/DesignScheme.vue
+111
-76
Home.vue
src/components/Home.vue
+5
-5
detailThree.vue
src/components/mall/detailThree.vue
+0
-1
CustomizedList.vue
src/components/newPersonalCenter/block/CustomizedList.vue
+10
-8
TdOrder.vue
src/components/newPersonalCenter/block/model/TdOrder.vue
+3
-3
newPersonalCenter.vue
src/components/newPersonalCenter/newPersonalCenter.vue
+1
-1
No files found.
src/assets/css/home.css
View file @
613c6810
...
...
@@ -5,7 +5,7 @@
.Home
.ticket
.el-form-item
{
display
:
inline-block
;
margin-bottom
:
0
;
width
:
18
5
px
;
width
:
18
2
px
;
}
.Home
.el-tabs__item
:hover
{
color
:
#fd6473
;
...
...
@@ -118,7 +118,7 @@ p {
font-family
:
"PingFang"
;
}
.Home
.cztm_item_content
p
{
padding
:
1
px
0
;
padding
:
2
px
0
;
}
.Home
.cztm_item_content
.cztm_title
{
color
:
#333333
;
...
...
@@ -155,14 +155,14 @@ p {
}
.Home
.cztm
.cztm_item
{
position
:
relative
;
width
:
2
20
px
;
width
:
2
15
px
;
height
:
130px
;
font-size
:
1
4
px
;
font-size
:
1
2
px
;
background
:
rgba
(
255
,
255
,
255
,
1
);
border
:
1px
solid
rgba
(
220
,
220
,
220
,
1
);
display
:
inline-flex
;
align-items
:
center
;
margin
:
0
0
15px
15
px
;
margin
:
0
0
15px
22
px
;
box-sizing
:
border-box
;
}
.Home
#triangle-left
{
...
...
@@ -234,7 +234,7 @@ p {
position
:
relative
;
}
.Home
.Grouptour
.tour_left
{
width
:
2
20
px
;
width
:
2
16
px
;
box-sizing
:
border-box
;
position
:
absolute
;
left
:
0
;
...
...
@@ -673,4 +673,21 @@ p {
.Home
.visa
.el-tabs__nav-wrap
::after
{
height
:
1px
;
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
src/components/DependentTravel/CustomizedTourism.vue
View file @
613c6810
This diff is collapsed.
Click to expand it.
src/components/DependentTravel/DesignScheme.vue
View file @
613c6810
This diff is collapsed.
Click to expand it.
src/components/Home.vue
View file @
613c6810
...
...
@@ -38,7 +38,7 @@
</ul>
<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-item
label=
"国家/地区"
style=
"margin-bottom:10px"
>
<el-input
size=
"small"
v-model=
"visa_form.name"
placeholder=
"国家或者地区名字"
></el-input>
...
...
@@ -63,7 +63,7 @@
</el-form>
</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-tab-pane
label=
"国际机票"
name=
"first"
>
<el-form
ref=
"ticket_form"
:model=
"ticket_form"
label-width=
"70px"
>
...
...
@@ -111,7 +111,7 @@
</el-tabs>
</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-tab-pane
label=
"国际酒店"
name=
"gjjd"
>
<el-form
ref=
"visa_form"
:model=
"visa_form"
label-width=
"60px"
>
...
...
@@ -144,7 +144,7 @@
</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-item
label=
"关键词搜索"
style=
"margin-bottom:10px"
>
<el-input
size=
"small"
v-model=
"visa_form.name"
placeholder=
"输入景点名称、城市或主题"
></el-input>
...
...
@@ -184,7 +184,7 @@
<div
class=
"cztm"
>
<el-tabs
v-model=
"activecontent1"
@
tab-click=
"handleClick"
>
<el-tab-pane
label=
"超值特卖"
name=
"first"
>
<div
style=
"margin-left:-
17
px"
>
<div
style=
"margin-left:-
25
px"
>
<div
class=
"cztm_item"
>
<img
src=
"//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg"
alt=
""
class=
""
>
<div
class=
"cztm_item_content"
>
...
...
src/components/mall/detailThree.vue
View file @
613c6810
...
...
@@ -898,7 +898,6 @@ export default {
getData
:
function
(
msg
)
{
this
.
loadingDataList
=
true
this
.
apipost
(
'b2b_get_GetB2BFreeInfo'
,
msg
,
r
=>
{
if
(
r
.
data
.
resultCode
==
1
){
let
data
=
(
r
.
data
.
data
);
this
.
sonData
=
data
;
...
...
src/components/newPersonalCenter/block/CustomizedList.vue
View file @
613c6810
<
template
>
<div
class=
"CustomizedList"
>
<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-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
label=
"已提交"
:value=
"1"
></el-option>
...
...
@@ -10,7 +10,7 @@
<el-option
label=
"下单"
:value=
"4"
></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=
"
7
"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"出发日期"
>
...
...
@@ -57,12 +57,15 @@
label=
"人均预算"
>
</el-table-column>
<el-table-column
label=
"
处理
状态"
>
label=
"
订单
状态"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.orderStatus==1"
>
未分配
</span>
<span
v-if=
"scope.row.orderStatus==2"
>
处理中
</span>
<span
v-if=
"scope.row.orderStatus==3"
>
处理完成
</span>
<span
v-if=
"scope.row.orderStatus==4"
>
处理失败
</span>
<span
v-if=
"scope.row.orderStatus==1"
>
已提交
</span>
<span
v-if=
"scope.row.orderStatus==2"
>
方案设计
</span>
<span
v-if=
"scope.row.orderStatus==3"
>
合同签订
</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
>
</el-table-column>
<el-table-column
...
...
@@ -131,7 +134,6 @@ export default {
getList
(){
this
.
apiJavaPost
(
'/api/b2b/free/getTravelCoupomList'
,
this
.
form
,
res
=>
{
this
.
loading
=
false
;
console
.
log
(
res
);
if
(
res
.
data
.
resultCode
==
1
){
this
.
tableData
=
res
.
data
.
data
.
pageData
;
this
.
totalCount
=
res
.
data
.
data
.
count
;
...
...
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @
613c6810
...
...
@@ -14,7 +14,7 @@
</
template
>
</ul>
<!-- 表格 -->
<T
K
Table
:tableData=
"tableData"
/>
<T
C
Table
:tableData=
"tableData"
/>
<div
class=
"empty-data"
v-if=
"tableData.length<1"
>
<i
class=
"iconfont icon-kong"
></i>
很抱歉,你想要的信息我们真的找不到了
...
...
@@ -32,10 +32,10 @@
</el-row>
</template>
<
script
>
import
T
KTable
from
"./OrderInfoModel/TK
Table"
;
import
T
CTable
from
"./OrderInfoModel/TC
Table"
;
export
default
{
components
:
{
T
KTable
:
TK
Table
T
CTable
:
TC
Table
},
data
()
{
return
{
...
...
src/components/newPersonalCenter/newPersonalCenter.vue
View file @
613c6810
...
...
@@ -50,7 +50,7 @@
<i
class=
"iconfont icon-huiyuanicon"
></i>
<span
slot=
"title"
>
会员中心
</span>
</el-menu-item>
<el-submenu
index=
"
3
"
>
<el-submenu
index=
"
9
"
>
<template
slot=
"title"
>
<i
class=
"iconfont icon-huiyuanicon"
></i>
<span>
定制游
</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment