Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
U
uni-pdtravel
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
panyongping
uni-pdtravel
Commits
ef058e11
Commit
ef058e11
authored
Jul 09, 2024
by
潘永坪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式和bug处理
parent
d467d949
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
40 deletions
+67
-40
pages.json
pages.json
+3
-1
distributionCombiChoose.vue
...ation/distributionCombiChoose/distributionCombiChoose.vue
+12
-2
jointElectronicTicket.vue
.../my/order/jointElectronicTicket/jointElectronicTicket.vue
+52
-37
No files found.
pages.json
View file @
ef058e11
...
@@ -268,7 +268,9 @@
...
@@ -268,7 +268,9 @@
"style"
:
"style"
:
{
{
"navigationBarTitleText"
:
"电子门票"
,
"navigationBarTitleText"
:
"电子门票"
,
"enablePullDownRefresh"
:
false
"enablePullDownRefresh"
:
false
,
"navigationBarTextStyle"
:
"black"
,
"navigationBarBackgroundColor"
:
"#F7F8FA"
}
}
}
}
]
]
...
...
pages/combination/distributionCombiChoose/distributionCombiChoose.vue
View file @
ef058e11
...
@@ -10,9 +10,19 @@
...
@@ -10,9 +10,19 @@
</u-swiper>
</u-swiper>
</view>
</view>
<view
class=
"middle"
>
<view
class=
"middle"
>
<view
class=
"detail"
>
<view
class=
"merchant-info"
>
<view
class=
"merchant-name"
>
长江索道
</view>
<view>
<view
class=
"merchant-time"
>
</view>
<view
class=
"merchant-address"
>
</view>
</view>
</view>
</view>
<checkbox-group
@
change=
"checkboxChange"
class=
"checkbox-box"
>
<checkbox-group
@
change=
"checkboxChange"
class=
"checkbox-box"
>
<view
class=
"merchant"
v-for=
"(item, index) in scenicList"
:key=
"index"
>
<view
class=
"merchant"
v-for=
"(item, index) in scenicList"
:key=
"index"
>
<view
class=
"merchant-title"
@
click=
"clikDetail(item.id)"
>
<view
class=
"merchant-title"
@
click=
"clikDetail(item.id)"
>
...
...
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @
ef058e11
...
@@ -100,12 +100,12 @@
...
@@ -100,12 +100,12 @@
</view>
</view>
</view>
</view>
<!-- 4-可返程取号(仅胖丁显示),5-第一次取号(仅胖丁显示)-->
<!-- 4-可返程取号(仅胖丁显示),5-第一次取号(仅胖丁显示)-->
<view
v-else-if=
"item2.sortFair==4||item2.sortFair==5"
>
<view
v-else-if=
"item2.sortFair==4||item2.sortFair==5"
style=
"padding-top: 16rpx;"
>
<view
class=
"current-number"
>
<view
class=
"current-number"
>
当前排队区间
<text
style=
"color: #FE6600;"
>
{{
item2
.
showStart
}}
-
{{
item2
.
showEnd
}}
</text>
号
当前排队区间
<text
style=
"color: #FE6600;"
>
{{
item2
.
showStart
}}
-
{{
item2
.
showEnd
}}
</text>
号
</view>
</view>
<!-- 1购票返程允许取号 -->
<!-- 1购票返程允许取号 -->
<view
v-if=
"item2.config.paReturnTripNumEnable==1"
style=
"margin-top:
2
0rpx;"
>
<view
v-if=
"item2.config.paReturnTripNumEnable==1"
style=
"margin-top:
3
0rpx;"
>
<text
v-if=
"canTakeNumber"
@
click=
"sortAgain(item)"
class=
"number-btn2"
>
取号
</text>
<text
v-if=
"canTakeNumber"
@
click=
"sortAgain(item)"
class=
"number-btn2"
>
取号
</text>
<text
v-else
>
<text
v-else
>
<text
style=
"color: #FE6600;font-weight: bold;"
>
{{
minute
}}
</text>
分
<text
style=
"color: #FE6600;font-weight: bold;"
>
{{
minute
}}
</text>
分
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
</text>
</text>
</view>
</view>
<!-- 1购票返程不允许取号,仅提示 -->
<!-- 1购票返程不允许取号,仅提示 -->
<view
v-if=
"item2.config.paReturnTripNumEnable==0"
style=
"margin-top:
2
0rpx;"
>
<view
v-if=
"item2.config.paReturnTripNumEnable==0"
style=
"margin-top:
3
0rpx;"
>
{{
item
.
config
.
paReturnTripHint
}}
{{
item
.
config
.
paReturnTripHint
}}
</view>
</view>
</view>
</view>
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
<view
class=
"rufundRule"
>
<view
class=
"rufundRule"
>
<!-- 等于3退票规则以子订单为准 -->
<!-- 等于3退票规则以子订单为准 -->
<view
style=
"padding: 32rpx;"
v-if=
"orderInfo.isRefund==3"
>
<view
style=
"padding: 32rpx
32rpx 0 32rpx
;"
v-if=
"orderInfo.isRefund==3"
>
<view
v-for=
"(item,index) in orderInfo.childs"
:key=
"index"
>
<view
v-for=
"(item,index) in orderInfo.childs"
:key=
"index"
>
<view
class=
"rule-title"
>
<view
class=
"rule-title"
>
{{item.productName}}退改规则
{{item.productName}}退改规则
...
@@ -849,20 +849,20 @@ export default {
...
@@ -849,20 +849,20 @@ export default {
if
(
res
.
data
.
length
>
0
){
if
(
res
.
data
.
length
>
0
){
//防止代码bug进入catch里面,一直请求接口影响性能
//防止代码bug进入catch里面,一直请求接口影响性能
try
{
try
{
//显示排号信息
item
.
showSortInfo
=
true
let
dataObj
=
res
.
data
[
0
]
let
dataObj
=
res
.
data
[
0
]
//子产品获取公司Id,用于重排号传参
if
(
dataObj
.
pays
.
length
>
0
){
item
.
companyIdCopy
=
dataObj
.
pays
[
0
].
companyId
}
//由于页面不显示历史排号,所以只取第一个最新的排号信息
//由于页面不显示历史排号,所以只取第一个最新的排号信息
item
.
sorts
=
dataObj
.
sorts
.
slice
(
0
,
1
)
||
[]
item
.
sorts
=
dataObj
.
sorts
.
slice
(
0
,
1
)
||
[]
if
(
item
.
sorts
[
0
].
sortFair
==
4
||
item
.
sorts
[
0
].
sortFair
==
5
){
item
.
sorts
.
forEach
(
item2
=>
{
//sceneSortStatus,1上架
if
(
item2
.
config
.
sceneSortStatus
==
1
){
//显示排号信息
item
.
showSortInfo
=
true
}
if
(
item2
.
sortFair
==
4
||
item2
.
sortFair
==
5
){
//时间判断,用于返程或第一次取号时,是否可以显示取号按钮
//时间判断,用于返程或第一次取号时,是否可以显示取号按钮
let
presentTime
=
new
Date
().
getTime
()
let
presentTime
=
new
Date
().
getTime
()
let
time1
=
new
Date
((
item
.
sorts
[
0
]
.
createDate
).
replace
(
/-/g
,
'/'
)).
getTime
()
let
time1
=
new
Date
((
item2
.
createDate
).
replace
(
/-/g
,
'/'
)).
getTime
()
let
time2
=
parseInt
((
item
.
sorts
[
0
]
.
config
.
paReturnTripTime
)
*
60
*
1000
)
let
time2
=
parseInt
((
item2
.
config
.
paReturnTripTime
)
*
60
*
1000
)
let
takeNumberTime
=
time1
+
time2
let
takeNumberTime
=
time1
+
time2
if
(
presentTime
>
takeNumberTime
){
if
(
presentTime
>
takeNumberTime
){
this
.
canTakeNumber
=
true
this
.
canTakeNumber
=
true
...
@@ -882,6 +882,17 @@ export default {
...
@@ -882,6 +882,17 @@ export default {
},
1000
)
},
1000
)
}
}
}
}
})
//子产品获取公司Id,用于重排号传参
if
(
dataObj
.
pays
.
length
>
0
){
item
.
merchantCodeCopy
=
dataObj
.
pays
[
0
].
companyId
}
//子产品获取三方Id,用于重排号传参
item
.
thirdIdCopy
=
dataObj
.
order
.
orderId
//子产品获取站点编码,用于重排号传参
if
(
item
.
sorts
.
length
>
0
){
item
.
areaCodeCopy
=
item
.
sorts
[
0
].
projectId
}
this
.
$forceUpdate
()
this
.
$forceUpdate
()
}
catch
(
e
){
}
catch
(
e
){
uni
.
showToast
({
uni
.
showToast
({
...
@@ -911,10 +922,10 @@ export default {
...
@@ -911,10 +922,10 @@ export default {
sortAgain
(
item
){
sortAgain
(
item
){
let
data
=
{
let
data
=
{
againNumber
:
1
,
againNumber
:
1
,
thirdId
:
item
.
third
OrderId
,
//三方订单id
thirdId
:
item
.
third
IdCopy
,
//三方订单id
areaCode
:
item
.
areaCode
,
//站点
areaCode
:
item
.
areaCode
Copy
,
//站点
userId
:
this
.
openid
,
userId
:
this
.
openid
,
merchantCode
:
item
.
companyId
Copy
,
merchantCode
:
item
.
merchantCode
Copy
,
}
}
this
.
$request
(
'distribution/distribution/newFetchNumber'
,
data
).
then
((
res
)
=>
{
this
.
$request
(
'distribution/distribution/newFetchNumber'
,
data
).
then
((
res
)
=>
{
if
(
res
.
code
==
'00'
){
if
(
res
.
code
==
'00'
){
...
@@ -1038,6 +1049,7 @@ export default {
...
@@ -1038,6 +1049,7 @@ export default {
.product-name
{
.product-name
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
font-size
:
36rpx
;
font-size
:
36rpx
;
font-weight
:
600
;
font-weight
:
600
;
text
:first-child
{
text
:first-child
{
...
@@ -1059,7 +1071,7 @@ export default {
...
@@ -1059,7 +1071,7 @@ export default {
}
}
}
}
.product-number
{
.product-number
{
padding
:
0
32
rpx
;
padding
:
0
20
rpx
;
border-radius
:
16rpx
;
border-radius
:
16rpx
;
background
:
#FFFFFF
;
background
:
#FFFFFF
;
margin-top
:
20rpx
;
margin-top
:
20rpx
;
...
@@ -1150,6 +1162,9 @@ export default {
...
@@ -1150,6 +1162,9 @@ export default {
margin-top
:
20rpx
;
margin-top
:
20rpx
;
color
:
$red
;
color
:
$red
;
}
}
.product-useknow
{
padding
:
0
32rpx
;
}
.useknow-list
{
.useknow-list
{
display
:
flex
;
display
:
flex
;
margin-top
:
28rpx
;
margin-top
:
28rpx
;
...
@@ -1185,7 +1200,7 @@ export default {
...
@@ -1185,7 +1200,7 @@ export default {
}
}
}
}
.rule-list
{
.rule-list
{
margin
-top
:
30rpx
;
margin
:
30rpx
0
;
}
}
.rule-service
{
.rule-service
{
display
:
flex
;
display
:
flex
;
...
...
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