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
8f10bc98
Commit
8f10bc98
authored
Oct 12, 2023
by
潘永坪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
弹窗修改
parent
c86d9003
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
306 additions
and
2084 deletions
+306
-2084
buyKnow.vue
components/buyKnow.vue
+126
-122
customer.vue
components/customer.vue
+40
-42
merchantDetail.vue
components/merchantDetail.vue
+92
-81
orderCoupon.vue
components/orderCoupon.vue
+1
-1
combinationProduct.vue
pages/scenic/combinationProduct/combinationProduct.vue
+9
-6
detail.vue
pages/scenic/combinationProduct/components/detail.vue
+38
-34
scenicSingleOrder-new.vue
pages/scenic/scenicSingleOrder/scenicSingleOrder-new.vue
+0
-1798
No files found.
components/buyKnow.vue
View file @
8f10bc98
<
template
>
<u-popup
v-model=
"showPop"
mode=
"bottom"
border-radius=
"14"
closeable
height=
"85%
"
>
<u-popup
:show=
"showPop"
:round=
"20"
@
close=
"showPop=false
"
>
<view
class=
"son-wrap"
>
<view
class=
"head"
>
<view
class=
"head1"
>
<view
style=
"flex: 1;text-align: center;"
>
购买须知
</view>
<u-icon
name=
"close"
@
click=
"showPop=false"
></u-icon>
</view>
<view
class=
"head2"
>
{{
buyKnowData
.
name
}}
</view>
...
...
@@ -12,8 +15,10 @@
<view
class=
"head3"
>
挂牌价:¥
{{
buyKnowData
.
originalPrice
}}
</view>
</view>
<view
style=
"flex: 1;overflow-y: scroll;"
>
<view
class=
"middle"
>
<view
class=
"middle-list"
v-for=
"(item,a) of buyKnowData.productTitleResVos"
:key=
"a"
>
<view
class=
"middle-title"
>
...
...
@@ -46,6 +51,8 @@
</view>
</view>
</view>
</view>
</u-popup>
</
template
>
...
...
@@ -63,56 +70,53 @@ export default {
</
script
>
<
style
scoped=
"scoped"
>
.son-wrap
{
font-size
:
24
rpx
;
.son-wrap
{
position
:
relative
;
}
.head
{
padding
:
100
rpx
24
rpx
0
24
rpx
;
}
.head1
{
text-align
:
center
;
height
:
85vh
;
display
:
flex
;
flex-direction
:
column
;
}
.head
{
padding
:
0
24
rpx
;
}
.head1
{
display
:
flex
;
font-size
:
32
rpx
;
font-weight
:
bold
;
text-align
:
center
;
padding
:
30
rpx
0
;
position
:
fixed
;
top
:
0
;
width
:
100%
;
background
:
#fff
;
z-index
:
1
;
}
.head2
{
border-radius
:
20
rpx
20
rpx
0
0
;
}
.head2
{
font-weight
:
bolder
;
font-size
:
32
rpx
;
line-height
:
40
rpx
;
}
.head3
{
}
.head3
{
font-size
:
28
rpx
;
margin-top
:
20
rpx
;
color
:
#666666
;
border-bottom
:
1px
solid
#e6e6e6
;
padding-bottom
:
30
rpx
;
}
.middle
{
}
.middle
{
padding-bottom
:
100
rpx
;
font-size
:
28
rpx
;
}
.middle-list
{
}
.middle-list
{
margin
:
30
rpx
24
rpx
;
padding-bottom
:
24
rpx
;
border-bottom
:
1px
solid
#E6E6E6
;
}
.middle-title
{
}
.middle-title
{
font-size
:
32
rpx
;
font-weight
:
bold
;
}
.middle-content
{
}
.middle-content
{
display
:
flex
;
margin-top
:
30
rpx
;
position
:
relative
;
}
.middle-content
>
text
{
}
.middle-content
>
text
{
color
:
#666666
;
margin-right
:
30
rpx
;
width
:
120
rpx
;
...
...
@@ -123,13 +127,13 @@ export default {
flex-shrink
:
0
;
font-size
:
26
rpx
;
position
:
relative
;
}
.middle-content
view
{
}
.middle-content
view
{
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
}
.bottom
{
}
.bottom
{
display
:
flex
;
justify-content
:
space-between
;
padding
:
0
24
rpx
;
...
...
@@ -141,24 +145,24 @@ export default {
z-index
:
9
;
background
:
#FFFFFF
;
box-sizing
:
border-box
;
}
}
.bottom-left
{
.bottom-left
{
color
:
#f9690e
;
}
}
.bottom-left
text
{
.bottom-left
text
{
font-size
:
36
rpx
;
font-weight
:
bolder
;
}
}
.bottom
view
{
.bottom
view
{
display
:
flex
;
align-items
:
center
;
}
.btn
{
}
.btn
{
padding
:
16
rpx
48
rpx
;
border-radius
:
20
rpx
;
font-size
:
32
rpx
;
}
}
</
style
>
components/customer.vue
View file @
8f10bc98
<
template
>
<!-- 客服 -->
<u-popup
v-model=
"showPop"
mode=
"bottom"
border-radius=
"14"
closeable
height=
"75%
"
>
<u-popup
:show=
"showPop"
:round=
"20"
@
close=
"showPop = false
"
>
<view
class=
"son-wrap"
>
<view
class=
"title"
>
客服电话
<view
style=
"flex: 1; text-align: center"
>
客服电话
</view>
<u-icon
name=
"close"
@
click=
"showPop = false"
></u-icon>
</view>
<view
class=
"middle"
>
<view
class=
"list"
v-for=
"(item,index) in scenicList"
:key=
'index'
@
click=
"makePhone(item.phone)"
>
<view
class=
"list"
v-for=
"(item, index) in scenicList"
:key=
"index"
@
click=
"makePhone(item.phone)"
>
<text>
{{
item
.
name
}}
:
</text>
<text>
{{
item
.
name
}}
:
</text>
<text>
{{
item
.
phone
}}
{{
item
.
phone
}}
</text>
</view>
</view>
...
...
@@ -20,50 +19,49 @@
</
template
>
<
script
>
export
default
{
props
:[
'scenicList'
],
data
(){
return
{
showPop
:
false
,
//控制弹窗显示隐藏
export
default
{
props
:
[
'scenicList'
],
data
()
{
return
{
showPop
:
false
//控制弹窗显示隐藏
}
},
methods
:{
methods
:
{
//---拨打电话
makePhone
(
phoneNumber
){
makePhone
(
phoneNumber
)
{
uni
.
makePhoneCall
({
phoneNumber
})
}
}
}
</
script
>
<
style
scoped
lang=
"scss"
>
.son-wrap
{
.son-wrap
{
position
:
relative
;
}
.title
{
text-align
:
center
;
height
:
65vh
;
display
:
flex
;
flex-direction
:
column
;
}
.title
{
display
:
flex
;
font-size
:
32rpx
;
font-weight
:
bold
;
padding
:
30rpx
0
;
position
:fixed
;
top
:
0
;
width
:
100%
;
padding
:
30rpx
;
background
:
#fff
;
z-index
:
1
;
}
.middle
{
padding-top
:
100rpx
;
}
.list
{
height
:
100rpx
;
border-bottom
:
1px
solid
#E6E6E6
;
border-radius
:
20rpx
20rpx
0
0
;
}
.middle
{
flex
:
1
;
overflow-y
:
scroll
;
}
.list
{
height
:
100rpx
;
border-bottom
:
1px
solid
#e6e6e6
;
padding
:
0
24rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
}
}
</
style
>
components/merchantDetail.vue
View file @
8f10bc98
<
template
>
<!-- 商家详情弹窗 -->
<u-popup
v-model=
"showPop"
mode=
"bottom"
border-radius=
"14"
closeable
height=
"85%
"
>
<u-popup
:show=
"showPop"
:round=
"20"
@
close=
"showPop=false
"
>
<view
class=
"son-wrap"
>
<view
class=
"head"
>
<view
class=
"head-name"
>
{{
detailData
.
name
}}
</view>
<view
style=
"padding-top: 100rpx;"
>
<u-icon
name=
"close"
@
click=
"showPop=false"
></u-icon>
</view>
<view
style=
"flex: 1;overflow-y: scroll;"
>
<view>
<u-swiper
:list=
"detailData.imgList"
mode=
"number"
height=
"350"
name=
"url"
></u-swiper>
</view>
<view
class=
"middle"
>
...
...
@@ -91,6 +95,8 @@
</view>
</view>
</view>
</view>
</u-popup>
</
template
>
...
...
@@ -158,17 +164,22 @@ export default {
<
style
scoped=
"scoped"
lang=
"scss"
>
.son-wrap
{
position
:
relative
;
height
:
80vh
;
display
:
flex
;
flex-direction
:column
;
}
.head
{
text-align
:
center
;
display
:
flex
;
font-size
:
32rpx
;
font-weight
:
bold
;
padding
:
30rpx
0
;
position
:fixed
;
top
:
0
;
width
:
100%
;
padding
:
30rpx
;
background
:
#fff
;
z-index
:
1
;
border-radius
:
20rpx
20rpx
0
0
;
border-bottom
:
1px
solid
#f5f5f5
;
}
.head-name
{
flex
:
1
;
text-align
:
center
;
}
.middle
{
padding
:
24rpx
24rpx
80rpx
24rpx
;
...
...
components/orderCoupon.vue
View file @
8f10bc98
<
template
>
<!----------------适用于订单选择券的时候展示券列表-------------------------->
<u-popup
v-model=
"show"
mode=
"bottom
"
>
<u-popup
:show=
"show"
:round=
"20"
closeable
@
close=
"show=false
"
>
<view
class=
"title"
>
<view
class=
"titleContent"
v-for=
"(item,index) of navTitle"
:key=
"index"
:class=
"
{on:active==index}" @click="navClick(index)">
<view
style=
"position: relative;top:15rpx;"
>
{{
item
}}
</view>
...
...
pages/scenic/combinationProduct/combinationProduct.vue
View file @
8f10bc98
...
...
@@ -53,7 +53,7 @@
</view>
<view
class=
"product-price"
>
<view
style=
"font-size: 24rpx"
>
<view
style=
"font-size: 24rpx
;display: flex;
"
>
<text
class=
"product-rule"
v-if=
"items.productRefundRuleVo"
>
<text
v-if=
"items.productRefundRuleVo.refundType == 0"
>
不可退
</text>
<text
v-if=
"items.productRefundRuleVo.refundType == 1"
>
规定时间退
</text>
...
...
@@ -74,12 +74,12 @@
</label>
<view
class=
"product-more"
v-if=
"index > 0 && item.productList.length > 2"
>
<view
v-if=
"item.productListCopy.length != item.productList.length"
@
click=
"showMoreProduct(item)"
>
<view
style=
"display: flex;justify-content: center;"
v-if=
"item.productListCopy.length != item.productList.length"
@
click=
"showMoreProduct(item)"
>
更多
<u-icon
name=
"arrow-down"
></u-icon>
</view>
<view
v-else
@
click=
"retractProduct(item)"
>
<view
style=
"display: flex;justify-content: center;"
v-else
@
click=
"retractProduct(item)"
>
收起
<u-icon
name=
"arrow-up"
></u-icon>
</view>
...
...
@@ -707,6 +707,7 @@ export default {
.title-right
{
color
:
$grey
;
font-size
:
24rpx
;
display
:
flex
;
}
.product
{
padding
:
10rpx
16rpx
;
...
...
@@ -816,6 +817,7 @@ export default {
.bottom-detail
{
position
:
relative
;
text-align
:
center
;
display
:
flex
;
}
.bottom-number
{
display
:
inline-block
;
...
...
@@ -862,15 +864,16 @@ export default {
}
}
.album-btn
{
display
:
inline-block
;
display
:
flex
;
width
:
160rpx
;
height
:
44rpx
;
background
:
#E1E1D9
;
border-radius
:
20rpx
20rpx
20rpx
20rpx
;
font-size
:
22rpx
;
color
:
#333333
;
text-align
:
center
;
line-height
:
44rpx
;
align-items
:
center
;
justify-content
:
center
;
padding-left
:
8rpx
;
}
.swiper-item
/
deep
/
.u-waterfall
{
padding-top
:
8rpx
;
...
...
pages/scenic/combinationProduct/components/detail.vue
View file @
8f10bc98
<
template
>
<!-- 详情 -->
<u-popup
v-model=
"showPop"
mode=
"bottom"
border-radius=
"14"
closeable
height=
"75%
"
>
<u-popup
:show=
"showPop"
:round=
"20"
@
close=
"showPop = false
"
>
<view
class=
"son-wrap"
>
<view
class=
"title"
>
<view
style=
"flex: 1; text-align: center"
>
明细
</view>
<u-icon
name=
"close"
@
click=
"showPop = false"
></u-icon>
</view>
<view
style=
"flex: 1;overflow-y: scroll;"
>
<view
class=
"middle"
>
<view
class=
"merchantlist"
v-for=
"(item,index) in merchantList"
:key=
"index"
>
<view
class=
"merchant-title"
>
...
...
@@ -34,6 +37,8 @@
</view>
</view>
</view>
</view>
</u-popup>
</
template
>
...
...
@@ -91,21 +96,20 @@ export default {
<
style
scoped=
"scoped"
lang=
"scss"
>
.son-wrap
{
position
:
relative
;
height
:
80vh
;
display
:
flex
;
flex-direction
:column
;
}
.title
{
text-align
:
center
;
display
:
flex
;
font-size
:
32rpx
;
font-weight
:
bold
;
text-align
:
center
;
padding
:
30rpx
0
;
position
:fixed
;
top
:
0
;
width
:
100%
;
padding
:
30rpx
;
background
:
#fff
;
z-index
:
1
;
border-radius
:
20rpx
20rpx
0
0
;
}
.middle
{
padding
:
100rpx
24rpx
;
padding
:
0
24rpx
100rpx
24rpx
;
}
.merchantlist
{
border-bottom
:
2rpx
solid
#ececec
;
...
...
pages/scenic/scenicSingleOrder/scenicSingleOrder-new.vue
deleted
100644 → 0
View file @
c86d9003
This diff is collapsed.
Click to expand it.
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