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
b2cfec57
Commit
b2cfec57
authored
Jul 10, 2024
by
潘永坪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
组合票首页面开发
parent
06d50525
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
133 additions
and
86 deletions
+133
-86
pages.json
pages.json
+7
-0
distributionCombiChooseNew.vue
...on/distributionCombiChoose/distributionCombiChooseNew.vue
+122
-82
jointElectronicTicket.vue
.../my/order/jointElectronicTicket/jointElectronicTicket.vue
+4
-4
No files found.
pages.json
View file @
b2cfec57
...
@@ -57,6 +57,13 @@
...
@@ -57,6 +57,13 @@
"enablePullDownRefresh"
:
false
"enablePullDownRefresh"
:
false
}
}
},
},
{
"path"
:
"pages/combination/distributionCombiChoose/distributionCombiChooseNew"
,
"style"
:
{
"navigationBarTitleText"
:
"产品选择"
,
"enablePullDownRefresh"
:
false
}
},
{
{
"path"
:
"pages/combination/combiOrder/combiOrder"
,
"path"
:
"pages/combination/combiOrder/combiOrder"
,
"style"
:
{
"style"
:
{
...
...
pages/combination/distributionCombiChoose/distributionCombiChoose
-n
ew.vue
→
pages/combination/distributionCombiChoose/distributionCombiChoose
N
ew.vue
View file @
b2cfec57
...
@@ -24,13 +24,13 @@
...
@@ -24,13 +24,13 @@
重庆市渝中区新华路
重庆市渝中区新华路
</view>
</view>
<view
class=
"merchant-nav"
>
<view
class=
"merchant-nav"
>
<view>
<view
class=
"merchant-bg"
>
<image
src=
"@/static/img/combination/nav.png"
style=
"width: 28rpx;height: 28rpx;"
></image>
<image
src=
"@/static/img/combination/nav.png"
style=
"width: 28rpx;height: 28rpx;"
></image>
</view>
</view>
<view>
导航
</view>
<view>
导航
</view>
</view>
</view>
<view
class=
"merchant-phone"
>
<view
class=
"merchant-phone"
>
<view>
<view
class=
"merchant-bg"
>
<image
src=
"@/static/img/combination/phone.png"
style=
"width: 28rpx;height: 28rpx;"
></image>
<image
src=
"@/static/img/combination/phone.png"
style=
"width: 28rpx;height: 28rpx;"
></image>
</view>
</view>
<view>
电话
</view>
<view>
电话
</view>
...
@@ -38,18 +38,23 @@
...
@@ -38,18 +38,23 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"middle-bottom"
>
<view
class=
"middle-bottom-left"
>
长江索道
</view>
<view
class=
"middle-bottom-right"
>
<checkbox-group
@
change=
"checkboxChange"
class=
"checkbox-box"
>
<checkbox-group
@
change=
"checkboxChange"
class=
"checkbox-box"
>
<view
class=
"merchan
t"
v-for=
"(item, index) in scenicList"
:key=
"index"
>
<view
class=
"merchantlis
t"
v-for=
"(item, index) in scenicList"
:key=
"index"
>
<view
class=
"merchan
t-title"
@
click=
"clikDetail(item.id)"
>
<view
class=
"merchantlis
t-title"
@
click=
"clikDetail(item.id)"
>
<view
class=
"title-left
"
>
<view
class=
"merchantlist-name
"
>
<text>
{{
item
.
name
}}
</text>
<text>
{{
item
.
name
}}
</text>
<template
v-if=
"item.couponVoList && item.couponVoList.length > 0"
>
<template
v-if=
"item.couponVoList && item.couponVoList.length > 0"
>
<image
src=
"@/static/img/scenic/coupon.png"
></image>
<image
src=
"@/static/img/scenic/coupon.png"
></image>
<text
class=
"title
-coupon"
>
劵惠
</text>
<text
class=
"merchantlist
-coupon"
>
劵惠
</text>
</
template
>
</
template
>
</view>
</view>
<view
v-if=
"showDistance"
class=
"title-right
"
>
<view
v-if=
"showDistance"
class=
"merchantlist-detail
"
>
距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km
距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km
<u-icon
name=
"arrow-right"
style=
"margin-left: 4rpx;"
size=
'26'
color=
'#B4B4B4'
></u-icon>
<u-icon
name=
"arrow-right"
style=
"margin-left: 4rpx;"
size=
'26'
color=
'#B4B4B4'
></u-icon>
</view>
</view>
...
@@ -74,7 +79,7 @@
...
@@ -74,7 +79,7 @@
</view>
</view>
<view
class=
"product-price"
>
<view
class=
"product-price"
>
<view
style=
"font-size: 24
rpx;display: flex;"
>
<view
style=
"font-size: 20
rpx;display: flex;"
>
<text
class=
"product-rule"
v-if=
"items.productRefundRuleVo"
>
<text
class=
"product-rule"
v-if=
"items.productRefundRuleVo"
>
<text
v-if=
"items.productRefundRuleVo.refundType == 0"
>
不可退
</text>
<text
v-if=
"items.productRefundRuleVo.refundType == 0"
>
不可退
</text>
<text
v-if=
"items.productRefundRuleVo.refundType == 1"
>
有条件退
</text>
<text
v-if=
"items.productRefundRuleVo.refundType == 1"
>
有条件退
</text>
...
@@ -85,7 +90,6 @@
...
@@ -85,7 +90,6 @@
<u-icon
name=
"arrow-right"
size=
'26'
color=
'#B4B4B4'
></u-icon>
<u-icon
name=
"arrow-right"
size=
'26'
color=
'#B4B4B4'
></u-icon>
</view>
</view>
<view>
<view>
<text
class=
"product-orange"
>
¥{{ items.originalPrice }}
</text>
<text
class=
"product-sell"
>
<text
style=
"font-size: 28rpx"
>
¥
</text>
{{ items.sellingPrice }}
</text>
<text
class=
"product-sell"
>
<text
style=
"font-size: 28rpx"
>
¥
</text>
{{ items.sellingPrice }}
</text>
</view>
</view>
</view>
</view>
...
@@ -108,6 +112,9 @@
...
@@ -108,6 +112,9 @@
</checkbox-group>
</checkbox-group>
<u-empty
text=
"暂无数据..."
mode=
"list"
v-if=
"scenicList.length == 0"
iconSize=
"160"
textSize=
'24'
textColor=
'#3688FF'
></u-empty>
<u-empty
text=
"暂无数据..."
mode=
"list"
v-if=
"scenicList.length == 0"
iconSize=
"160"
textSize=
'24'
textColor=
'#3688FF'
></u-empty>
</view>
</view>
</view>
</view>
<view
class=
"bottom"
>
<view
class=
"bottom"
>
<view
class=
"bottom-left"
@
click=
"showCustomer()"
>
<view
class=
"bottom-left"
@
click=
"showCustomer()"
>
<u-icon
name=
"chat"
size=
"36"
></u-icon>
<u-icon
name=
"chat"
size=
"36"
></u-icon>
...
@@ -633,12 +640,14 @@ export default {
...
@@ -633,12 +640,14 @@ export default {
flex-direction
:
column
;
flex-direction
:
column
;
background
:
#f7f7f7
;
background
:
#f7f7f7
;
}
}
.middle
{
.middle
{
padding
:
0
24rpx
100rpx
24
rpx
;
padding
-bottom
:
100
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
position
:
relative
;
top
:
-40rpx
;
}
}
// 中间上部分
.merchant-info
{
.merchant-info
{
background
:
#ffffff
;
background
:
#ffffff
;
border-radius
:
24rpx
24rpx
0
0
;
border-radius
:
24rpx
24rpx
0
0
;
...
@@ -673,34 +682,70 @@ export default {
...
@@ -673,34 +682,70 @@ export default {
display
:
flex
;
display
:
flex
;
padding
:
0
20rpx
;
padding
:
0
20rpx
;
align-items
:
center
;
align-items
:
center
;
background
:
url('@/static/img/combination/mapbg.png')
no-repeat
;
background-size
:
100%
100%
;
}
.merchant-address
{
flex
:
1
;
font-size
:
26rpx
;
font-weight
:
600
;
}
.merchant-nav
{
margin
:
0
36rpx
;
font-size
:
20rpx
;
text-align
:
center
;
}
.merchant-phone
{
font-size
:
20rpx
;
text-align
:
center
;
}
.merchant-bg
{
width
:
52rpx
;
height
:
52rpx
;
background
:
#ffffff
;
border-radius
:
50%
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
//中间下部分
.middle-bottom
{
display
:
flex
;
}
.middle-bottom-left
{
width
:
128rpx
;
margin-right
:
24rpx
;
}
}
.merchant
{
.middle-bottom-right
{
flex
:
1
;
}
.merchantlist
{
border-radius
:
16rpx
;
border-radius
:
16rpx
;
background
:
#ffffff
;
background
:
#ffffff
;
margin-top
:
24rpx
;
margin-top
:
24rpx
;
padding
:
24rpx
;
padding
:
24rpx
;
}
}
.merchant
label
{
.merchant
list
label
{
width
:
100%
;
width
:
100%
;
}
}
.merchant
label
.off
.product
{
.merchant
list
label
.off
.product
{
background
:
#f3f3f3
;
background
:
#f3f3f3
;
color
:
#999999
;
color
:
#999999
;
}
}
.merchant
label
.off
.product-name
{
.merchant
list
label
.off
.product-name
{
color
:
#999999
;
color
:
#999999
;
}
}
.merchant
label
.off
.product-rule
{
.merchant
list
label
.off
.product-rule
{
color
:
#999999
;
color
:
#999999
;
}
}
.merchant-title
{
.merchant
list
-title
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
padding-bottom
:
16rpx
;
padding-bottom
:
16rpx
;
}
}
.
title-left
{
.
merchantlist-name
{
font-size
:
3
2
rpx
;
font-size
:
3
6
rpx
;
margin-right
:
10rpx
;
margin-right
:
10rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
image
{
image
{
...
@@ -711,11 +756,11 @@ export default {
...
@@ -711,11 +756,11 @@ export default {
margin
:
0
8rpx
;
margin
:
0
8rpx
;
}
}
}
}
.
title
-coupon
{
.
merchantlist
-coupon
{
color
:
$red
;
color
:
$red
;
font-size
:
24rpx
;
font-size
:
24rpx
;
}
}
.
title-right
{
.
merchantlist-detail
{
color
:
$grey
;
color
:
$grey
;
font-size
:
24rpx
;
font-size
:
24rpx
;
display
:
flex
;
display
:
flex
;
...
@@ -738,7 +783,7 @@ export default {
...
@@ -738,7 +783,7 @@ export default {
flex
:
1
;
flex
:
1
;
}
}
.product-name
{
.product-name
{
font-size
:
28
rpx
;
font-size
:
30
rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#191919
;
color
:
#191919
;
display
:
flex
;
display
:
flex
;
...
@@ -771,11 +816,6 @@ export default {
...
@@ -771,11 +816,6 @@ export default {
background
:
#ccc
;
background
:
#ccc
;
width
:
1px
;
width
:
1px
;
}
}
.product-orange
{
font-size
:
20rpx
;
color
:
$grey
;
text-decoration
:
line-through
;
}
.product-sell
{
.product-sell
{
font-size
:
40rpx
;
font-size
:
40rpx
;
color
:
$red
;
color
:
$red
;
...
...
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @
b2cfec57
...
@@ -197,7 +197,7 @@
...
@@ -197,7 +197,7 @@
</view>
</view>
</view>
</view>
<!-- 后端返回了二维码才显示下面内容 -->
<!-- 后端返回了二维码才显示下面内容 -->
<view
class=
"product-code"
v-if=
"item.orderTicketDetailList.length>0&&item.orderTicketDetailList[0].
verify
Code"
>
<view
class=
"product-code"
v-if=
"item.orderTicketDetailList.length>0&&item.orderTicketDetailList[0].
ticket
Code"
>
<view
class=
"code-title"
>
<view
class=
"code-title"
>
凭「入园码」直接入园
凭「入园码」直接入园
</view>
</view>
...
@@ -206,9 +206,9 @@
...
@@ -206,9 +206,9 @@
</view>
</view>
<view
class=
"code-number"
>
<view
class=
"code-number"
>
<text>
<text>
{{
item
.
orderTicketDetailList
[
0
].
verify
Code
}}
{{
item
.
orderTicketDetailList
[
0
].
ticket
Code
}}
</text>
</text>
<text
@
click=
"copyText(item.orderTicketDetailList[0].
verify
Code)"
>
<text
@
click=
"copyText(item.orderTicketDetailList[0].
ticket
Code)"
>
复制
复制
</text>
</text>
</view>
</view>
...
@@ -854,6 +854,7 @@ export default {
...
@@ -854,6 +854,7 @@ export default {
},
},
//---生成二维码
//---生成二维码
getCode
(
item
){
getCode
(
item
){
//生成二维码码取值verifyCode,页面显示取值ticketCode--生成二维码比页面显示多一个TBD
let
verifyCode
=
''
let
verifyCode
=
''
if
(
item
.
orderTicketDetailList
.
length
>
0
){
if
(
item
.
orderTicketDetailList
.
length
>
0
){
verifyCode
=
item
.
orderTicketDetailList
[
0
].
verifyCode
||
''
verifyCode
=
item
.
orderTicketDetailList
[
0
].
verifyCode
||
''
...
@@ -1036,7 +1037,6 @@ export default {
...
@@ -1036,7 +1037,6 @@ export default {
})
})
}
}
}
}
}
}
</
script
>
</
script
>
...
...
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