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
8663fb0c
Commit
8663fb0c
authored
Sep 02, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
03065c12
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
20 deletions
+32
-20
FreeDetail.vue
src/components/FreeTravel/FreeDetail.vue
+0
-2
OrderConfirmation.vue
src/components/FreeTravel/OrderConfirmation.vue
+7
-8
payInfo.vue
src/components/FreeTravel/payInfo.vue
+4
-4
FreeTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/FreeTable.vue
+8
-3
JuanList.vue
src/components/taskPage/JuanList.vue
+13
-3
No files found.
src/components/FreeTravel/FreeDetail.vue
View file @
8663fb0c
...
...
@@ -469,8 +469,6 @@ export default {
let
today
=
moment
().
format
(
"YYYY-MM-DD"
);
this
.
pkgsList
=
[];
this
.
mealType
=
res
.
data
.
data
;
console
.
log
(
"this.mealType"
,
this
.
mealType
.
pkgs
)
console
.
log
(
moment
(
'2019-08-29'
).
isBefore
(
moment
(
'2019-08-30'
)))
if
(
this
.
mealType
.
pkgs
){
this
.
mealType
.
pkgs
.
forEach
(
item
=>
{
//
...
...
src/components/FreeTravel/OrderConfirmation.vue
View file @
8663fb0c
...
...
@@ -190,7 +190,7 @@
<span
class=
"f18 pfR"
>
交通列表
</span>
</div>
<el-row
class=
"trafficList"
v-for=
"(item,index) in traffic.car"
:key=
"index+100"
>
<el-col
:span=
"2"
class=
"c88"
style=
"text-align:center;padding-top:27px"
>
{{
index
+
1
}}
</el-col>
<el-col
:span=
"2"
class=
"c88"
style=
"text-align:center;padding-top:27px"
>
第
{{
index
+
1
}}
天
</el-col>
<el-col
:span=
"20"
>
<div
class=
"f12"
style=
"padding:20px;padding-left:80px"
>
<el-form-item
label=
"出发地"
:prop=
"'car.'+index+'.s_location'"
:rules=
"[
{ required: true, message: '请填写出发地', trigger: 'blur' }]">
...
...
@@ -287,10 +287,10 @@
</div>
</div>
</el-form>
<
!--
<
el-button
:loading=
"BtnLoading"
@
click=
"PayBtn"
class=
"OrderConBtn"
>
<el-button
:loading=
"BtnLoading"
@
click=
"PayBtn"
class=
"OrderConBtn"
>
下一步,支付
</el-button>
-->
</el-button>
</div>
</div>
<div
class=
"right"
style=
"width:388px;box-sizing:border-box"
>
...
...
@@ -381,8 +381,6 @@ export default {
native_last_name
:
false
,
//本国姓
tel_country_code
:
false
,
//电话国号
tel_number
:
false
,
//电话号码
},
tel_country_code
:[],
guide_langList
:[],
...
...
@@ -432,8 +430,10 @@ export default {
this
.
freeMsg
.
buyer_tel_country_code
=
"86"
;
this
.
freeMsg
.
buyer_tel_number
=
"13183813102"
;
this
.
freeMsg
.
buyer_email
=
"13183813102@qq.com"
;
// this.freeMsg.buyer_tel_number="13183813102";
// this.freeMsg.buyer_email="13183813102@qq.com";
this
.
freeMsg
.
buyer_tel_number
=
""
;
this
.
freeMsg
.
buyer_email
=
""
;
this
.
freeMsg
.
pay
=
{
type
:
"02"
,
...
...
@@ -774,7 +774,6 @@ export default {
})
}
console
.
log
(
"this.traffic.car"
,
this
.
traffic
.
car
)
}
}
...
...
src/components/FreeTravel/payInfo.vue
View file @
8663fb0c
...
...
@@ -206,7 +206,7 @@ export default {
CancelBy
:
''
,
},
msg
:{
order
_no
:
''
,
order
Id
:
''
,
},
payInfoObj
:{},
oldModel
:{},
...
...
@@ -221,8 +221,8 @@ export default {
}
},
created
(){
if
(
this
.
$route
.
query
.
ThirdOrderNo
){
this
.
msg
.
order
_no
=
this
.
$route
.
query
.
ThirdOrderNo
;
if
(
this
.
$route
.
query
.
OrderID
){
this
.
msg
.
order
Id
=
this
.
$route
.
query
.
OrderID
;
}
this
.
getPayInfo
();
...
...
@@ -294,7 +294,7 @@ export default {
"dmc_post_Get_KKDayOrderQueryOrderDtl"
,
this
.
msg
,
res
=>
{
console
.
log
(
"sfafg"
,
res
);
//
console.log("sfafg",res);
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
oldModel
=
res
.
data
.
data
.
oldModel
;
this
.
jo
=
res
.
data
.
data
.
jo
;
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/FreeTable.vue
View file @
8663fb0c
...
...
@@ -56,6 +56,11 @@
background-color
:
gray
;
margin-right
:
10px
;
display
:
inline-block
;
overflow
:
hidden
;
}
.freetable
tbody
.info
.tc_info
._left
img
{
height
:
100%
;
width
:
auto
;
}
.orderTable
tbody
.info
.tc_info
._right
{
color
:
#666666
;
...
...
@@ -159,7 +164,7 @@
</
style
>
<
template
>
<el-row>
<table
class=
"orderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"
freetable
orderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<thead>
<tr>
<th
width=
"328px"
>
...
...
@@ -357,14 +362,14 @@ export default {
Exit
(
item
){
let
userInfo
=
this
.
getLocalStorage
();
this
.
dialogFormVisible
=
true
;
this
.
exitMsg
.
order_no
=
item
.
ThirdOrderNo
;
this
.
exitMsg
.
order_no
=
item
.
OrderID
;
this
.
exitMsg
.
CancelBy
=
userInfo
.
name
;
},
gopayInfo
(
item
){
this
.
$router
.
push
({
name
:
"payInfo"
,
query
:
{
ThirdOrderNo
:
item
.
ThirdOrderNo
,
OrderID
:
item
.
OrderID
,
}
});
...
...
src/components/taskPage/JuanList.vue
View file @
8663fb0c
...
...
@@ -169,10 +169,12 @@
.juanList
.MoreDiv
.moreItem
.dataImg
{
width
:
100%
;
height
:
100%
;
background-size
:
cover
;
overflow
:
hidden
;
}
.juanList
.MoreDiv
.moreItem
.dataImg
img
{
width
:
100%
;
height
:
100%
;
min-
height
:
100%
;
}
.juanList
.MoreDiv
.moreItem
.noneData
{
background
:
rgba
(
224
,
224
,
224
,
1
);
...
...
@@ -319,6 +321,12 @@
background
:
rgba
(
255
,
255
,
255
,
0.2
);
/* margin-bottom:10px; */
}
.juanList
.topImg
{
width
:
100%
;
height
:
100%
;
background-position
:
50%
;
/* background-size: cover; */
}
</
style
>
<
template
>
<div
@
click=
"getRef($event,1)"
:data-self=
"0"
class=
"juan juanList commonF"
>
...
...
@@ -372,7 +380,8 @@
<p
v-show=
"TOPlist.length>0"
class=
"f30 pfR"
style=
""
>
探索
<span
style=
"color:#EE4454"
>
. 热门体验
</span></p>
<div
class=
"hotCity"
>
<div
v-for=
"(item,index) in TOPlist"
@
click=
"Gourl(item)"
:key=
"index"
@
mouseenter=
"mouseOver(index)"
class=
"cityItem"
:class=
"HoverIndex==index?'cityItemBig':''"
>
<img
:src=
"item.imgs"
:onerror=
"defaultImg"
alt=
""
>
<!--
<img
:src=
"item.imgs"
:onerror=
"defaultImg"
alt=
""
>
-->
<div
class=
"topImg"
:style=
"`background-image: url($
{item.imgs})`">
</div>
<p
v-show=
"HoverIndex!=index"
class=
"name text1"
>
{{
item
.
title
}}
</p>
<div
v-show=
"HoverIndex==index"
class=
"CityHover"
>
<p
class=
"f26 pfR text1"
>
{{
item
.
title
}}
</p>
...
...
@@ -387,7 +396,8 @@
<div
v-loading=
"dataloading"
v-show=
'dataList.length!=0'
id=
"MoreDiv"
ref=
"MoreDiv"
class=
"MoreDiv"
>
<div
@
click=
"Gourl(item)"
v-for=
"(item,index) in dataList"
:key=
"index"
class=
"moreItem"
>
<div
class=
"itemImg"
>
<div
class=
"dataImg"
v-if=
"item.imgs&&item.imgs!=''"
>
<!-- :style="
{background:'url(' + item.imgs + ') no-repeat center center'}" -->
<div
class=
"dataImg"
v-if=
"item.imgs&&item.imgs!=''"
>
<img
:src=
"item.imgs"
:onerror=
"defaultImg"
alt=
""
>
</div>
<div
v-else
class=
"noneData"
>
...
...
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