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
0670ca36
Commit
0670ca36
authored
Jun 05, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改过滤器
parent
e3ec2a0f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
20 deletions
+21
-20
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+1
-1
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+4
-4
Home.vue
src/components/Home.vue
+8
-8
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+3
-3
OnedayList.vue
src/components/LocalTour/OnedayList.vue
+2
-2
OneDayDetailTwo.vue
src/components/mall/OneDayDetailTwo.vue
+2
-1
index.js
src/plugins/index.js
+1
-1
No files found.
src/components/DependentTravel/IndependentList.vue
View file @
0670ca36
...
...
@@ -137,7 +137,7 @@
<p>
出发日期:最早
{{
item
.
startDate
}}
出发
</p>
</el-col>
<el-col
:span=
"4"
style=
"color:#FF680B;font-size:16px;"
>
¥
<span
style=
"font-weight:700"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span><span
style=
"font-size:12px"
>
起
</span>
¥
<span
style=
"font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span><span
style=
"font-size:12px"
>
起
</span>
</el-col>
<el-col
:span=
"3"
style=
"text-align:right"
>
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
size=
"small"
style=
"border:1px solid #FF6633;color:#FF6633;"
>
立即预定
</el-button>
...
...
src/components/DependentTravel/IndependentTravel.vue
View file @
0670ca36
...
...
@@ -110,7 +110,7 @@
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
<p
style=
"font-size:12px;padding-top:10px"
>
RMB
</p>
<p
style=
"font-size:14px;font-weight:600"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
<span
style=
"font-size:12px;font-weight:10"
>
起
</span>
</p>
</div>
...
...
@@ -170,7 +170,7 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
...
...
@@ -202,7 +202,7 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
...
...
@@ -246,7 +246,7 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
<span
style=
"font-size:20px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
...
...
src/components/Home.vue
View file @
0670ca36
...
...
@@ -308,7 +308,7 @@
<p
style=
"margin-top:35px"
class=
"cztm_title"
>
{{
item
.
dayNum
}}
日
{{
item
.
nightNum
}}
晚
</p>
<!--
<p><span
class=
"discount"
>
7.2折
</span></p>
-->
<p
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
<!--
<p><span
class=
"bg"
>
5
</span>
天
<span
class=
"bg"
>
14
</span>
时
<span
class=
"bg"
>
18
</span>
分
</p>
-->
...
...
@@ -338,7 +338,7 @@
<p
style=
"font-size:12px;padding:6px 0 2px 10px"
>
日期:
{{
item
.
flightDate
}}
</p>
<p
style=
"font-size:12px;padding:2px 0 2px 10px"
>
¥
<span
style=
"color:#FF6600;font-size:16px;font-weight:700"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
</div>
</div>
...
...
@@ -371,7 +371,7 @@
</div>
<div>
<span
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span>
<span
style=
"color:#666666;float:right;margin-top:6px"
>
席位充足
</span>
</div>
...
...
@@ -402,7 +402,7 @@
<div
class=
"Remarks"
>
<p
class=
"text2"
>
{{
item
.
title
}}
</p>
<p
style=
"text-align:right"
><span
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span></p>
</div>
</div>
...
...
@@ -413,7 +413,7 @@
<div
class=
"Remarks"
>
<p
class=
"text2"
>
{{
item
.
title
}}
</p>
<p
style=
"text-align:right"
><span
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span></p>
</div>
</div>
...
...
@@ -424,7 +424,7 @@
<div
class=
"Remarks"
>
<p
class=
"text2"
>
{{
item
.
title
}}
</p>
<p
style=
"text-align:right"
><span
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span></p>
</div>
</div>
...
...
@@ -634,7 +634,7 @@
</p>
<p>
{{
item
.
flightDate
}}
</p>
<p
style=
"color:#FF6600"
>
¥
<span
style=
"font-size:18px;font-weight:bold"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
<span
@
click=
"Purchase(item)"
class=
"qg"
>
抢购
</span>
</p>
...
...
@@ -678,7 +678,7 @@
</div>
<div
class=
"price"
>
<p
class=
"f12"
style=
"color:#fff;"
>
¥
<span
style=
"font-size:18px;font-weight:bold;color:#FF6600"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
</div>
</div>
...
...
src/components/LocalTour/Localtourhome.vue
View file @
0670ca36
...
...
@@ -78,7 +78,7 @@
<div
@
click=
"goOneDayDetail(item)"
v-if=
"index
<2
"
v-for=
"(item,index) in abroadList"
:key=
"index+300"
>
<img
v-if=
"index==0"
:key=
"img.url"
v-for=
"(img,index) in item.imgCover"
:src=
'compressImg(img.url, "filt", 245, "")'
alt=
""
>
<span
class=
"daydes"
>
{{
item
.
title
}}
</span>
<span
class=
"price"
>
¥
<span
class=
"pfR font18"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
起
</span>
<span
class=
"price"
>
¥
<span
class=
"pfR font18"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span>
</div>
</div>
<div
class=
"dayConDiv2"
>
...
...
@@ -88,7 +88,7 @@
<img
v-if=
"index==0"
:key=
"img.url"
v-for=
"(img,index) in item.imgCover"
:src=
'compressImg(img.url, "filt", 245, "")'
alt=
""
>
<span
class=
"country"
>
{{
item
.
lineShortName
}}
</span>
<p
class=
"price"
>
<span>
¥
<span
class=
"font18 pfR"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
起
</span>
<span>
¥
<span
class=
"font18 pfR"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</span>
</p>
</div>
...
...
@@ -110,7 +110,7 @@
<div
class=
"hotcontent"
>
<span
class=
"textHidden font12"
>
{{
item
.
title
}}
</span>
<p
class=
"font12"
style=
"color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"
>
¥
<span
class=
"pfR font14"
>
{{
isLogin
!=
1
?
(
item
.
b2CPrice
|
NoDesnum
)
:
item
.
b2BPrice
|
NoDesnum
}}
</span>
起
</p>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
</div>
</li>
</ul>
...
...
src/components/LocalTour/OnedayList.vue
View file @
0670ca36
...
...
@@ -23,7 +23,7 @@
</p>
</div>
<div
class=
"threeDiv"
>
<p><span
style=
"color:#FDAC11;font-size:22px"
>
¥
{{
isLogin
!==
1
?
item
.
b2CPrice
:
item
.
b2BPrice
}}
</span>
起
</p>
<p><span
style=
"color:#FDAC11;font-size:22px"
>
¥
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
<p
style=
"margin-top:80px"
><span
class=
"ckxq"
>
查看详情
</span></p>
</div>
</li>
...
...
@@ -40,7 +40,7 @@
<div
class=
"hotcontent"
>
<span
class=
"textHidden font12"
>
{{
item
.
title
}}
</span>
<p
class=
"font12"
style=
"color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"
>
¥
<span
class=
"pfR font14"
>
{{
isLogin
!==
1
?
item
.
b2CPrice
:
item
.
b2BPrice
}}
</span>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
起
</p>
</div>
</li>
...
...
src/components/mall/OneDayDetailTwo.vue
View file @
0670ca36
...
...
@@ -868,13 +868,14 @@ export default {
},
creatCalendar
(
list
){
// 创建日历
let
dateList
=
[];
// isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum
if
(
list
&&
list
.
length
>
0
){
list
.
forEach
((
x
,
index
)
=>
{
if
(
x
.
tcState
==
3
){
let
msg
=
{
dateStr
:
x
.
startDate
,
cDate
:
x
.
startDate
.
replace
(
'-'
,
'年'
).
replace
(
'-'
,
'月'
),
price
:
x
.
b2C
Price
,
price
:
this
.
isLogin
!=
1
?
x
.
b2CPrice
:
x
.
b2B
Price
,
b2BMemberPrice
:
x
.
b2BMemberPrice
,
b2BPrice
:
x
.
b2BPrice
,
b2CMemberPrice
:
x
.
b2CMemberPrice
,
...
...
src/plugins/index.js
View file @
0670ca36
...
...
@@ -31,7 +31,7 @@ export default {
DomainUrl
:
domainUrl
,
//常用提交数据URL
PostUrl
:
domainUrl
+
"/api/common/post"
,
javaUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.
106
:9000"
,
javaUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.
215
:9000"
,
ViittoFileUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://imgfile.oytour.com"
:
'http://192.168.2.214:8130'
,
UploadUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://upload.oytour.com"
:
"http://192.168.2.214:8120"
,
LocalFileStreamDownLoadUrl
:
domainUrl
+
"/api/file/GetFileFromWebApi"
,
...
...
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