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
d3d4f147
Commit
d3d4f147
authored
Apr 23, 2025
by
潘永坪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
组合票优惠券开发
parent
74371ab7
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
185 additions
and
107 deletions
+185
-107
combiChoose.vue
pages/combination/combiChoose/combiChoose.vue
+168
-90
distributionCombiChoose.vue
...ation/distributionCombiChoose/distributionCombiChoose.vue
+16
-16
merchantListIndex.vue
pages/indexs/merchantListIndex/merchantListIndex.vue
+1
-1
bigCoupon.png
static/img/combination/bigCoupon.png
+0
-0
coupon.gif
static/img/combination/coupon.gif
+0
-0
redEnvelope.png
static/img/coupon/redEnvelope.png
+0
-0
No files found.
pages/combination/combiChoose/combiChoose.vue
View file @
d3d4f147
This diff is collapsed.
Click to expand it.
pages/combination/distributionCombiChoose/distributionCombiChoose.vue
View file @
d3d4f147
...
@@ -214,7 +214,7 @@
...
@@ -214,7 +214,7 @@
<view
v-if=
"showBigCoupon"
@
click=
"showBigCoupon=false,showSmallCoupon=false"
style=
"position: fixed;top: 0;right: 0;bottom: 0;left: 0;background:rgba(0, 0, 0, 0.5);z-index: 10;display: flex;align-items: center;"
>
<view
v-if=
"showBigCoupon"
@
click=
"showBigCoupon=false,showSmallCoupon=false"
style=
"position: fixed;top: 0;right: 0;bottom: 0;left: 0;background:rgba(0, 0, 0, 0.5);z-index: 10;display: flex;align-items: center;"
>
<view
style=
"width: 100%;"
>
<view
style=
"width: 100%;"
>
<view
style=
"display:flex;justify-content: center;"
>
<view
style=
"display:flex;justify-content: center;"
>
<image
src=
"/static/img/combination/
coupon.gif
"
style=
"width: 85%;"
mode=
"widthFix"
></image>
<image
src=
"/static/img/combination/
bigCoupon.png
"
style=
"width: 85%;"
mode=
"widthFix"
></image>
</view>
</view>
<!-- <view style="display: flex;justify-content: center;">
<!-- <view style="display: flex;justify-content: center;">
<u-icon name="close-circle-fill" color="#333333" size="56"></u-icon>
<u-icon name="close-circle-fill" color="#333333" size="56"></u-icon>
...
@@ -273,8 +273,8 @@ export default {
...
@@ -273,8 +273,8 @@ export default {
topHeight
:
0
,
//上面状态栏+上面导航栏总高度
topHeight
:
0
,
//上面状态栏+上面导航栏总高度
tabbarOpacity
:
0
,
//导航栏透明度
tabbarOpacity
:
0
,
//导航栏透明度
tabbarHeight
:
''
,
//导航栏高度
tabbarHeight
:
''
,
//导航栏高度
showSmallCoupon
:
false
,
//显示小券
showSmallCoupon
:
false
,
//显示小券
showBigCoupon
:
false
,
//显示大券
showBigCoupon
:
false
,
//显示大券
}
}
},
},
watch
:
{
watch
:
{
...
@@ -606,23 +606,23 @@ export default {
...
@@ -606,23 +606,23 @@ export default {
uni
.
setStorageSync
(
'newTimestamp'
,
newTimestamp
)
uni
.
setStorageSync
(
'newTimestamp'
,
newTimestamp
)
})
})
},
},
//---送券
//---送券
giveCoupon
()
{
giveCoupon
()
{
let
data
=
{
let
data
=
{
pageCode
:
'SD_GROUP'
,
//页面码
pageCode
:
'SD_GROUP'
,
//页面码
marketingStatus
:
1
,
//状态
marketingStatus
:
1
,
//状态
userId
:
uni
.
getStorageSync
(
'userId'
)
||
''
,
userId
:
uni
.
getStorageSync
(
'userId'
)
||
''
,
openid
:
uni
.
getStorageSync
(
'openid'
)
||
''
,
openid
:
uni
.
getStorageSync
(
'openid'
)
||
''
,
companyId
:
this
.
companyId
,
//公司Id
companyId
:
this
.
companyId
,
//公司Id
}
}
this
.
$request
(
'scenic/market/findPageMarket'
,
data
).
then
((
res
)
=>
{
this
.
$request
(
'scenic/market/findPageMarket'
,
data
).
then
((
res
)
=>
{
if
(
res
.
data
&&
res
.
data
.
length
>
0
)
{
if
(
res
.
data
&&
res
.
data
.
length
>
0
)
{
//有券时显示券
//有券时显示券
this
.
showSmallCoupon
=
true
this
.
showSmallCoupon
=
true
this
.
showBigCoupon
=
true
this
.
showBigCoupon
=
true
}
}
})
})
},
},
//---初始化详情
//---初始化详情
initDetail
(
merchantId
){
initDetail
(
merchantId
){
let
data
=
{
let
data
=
{
...
@@ -791,10 +791,10 @@ export default {
...
@@ -791,10 +791,10 @@ export default {
},
},
//---多选框变化
//---多选框变化
checkboxChange
(
e
)
{
checkboxChange
(
e
)
{
//如果有券没有领取,直接显示券,并领取
//如果有券没有领取,直接显示券,并领取
if
(
this
.
showSmallCoupon
){
if
(
this
.
showSmallCoupon
){
this
.
showBigCoupon
=
true
this
.
showBigCoupon
=
true
}
}
let
value
=
e
.
detail
.
value
let
value
=
e
.
detail
.
value
let
arr
=
[]
let
arr
=
[]
value
.
forEach
(
item
=>
{
value
.
forEach
(
item
=>
{
...
...
pages/indexs/merchantListIndex/merchantListIndex.vue
View file @
d3d4f147
...
@@ -457,7 +457,7 @@ export default {
...
@@ -457,7 +457,7 @@ export default {
width
:
465rpx
;
width
:
465rpx
;
height
:
155rpx
;
height
:
155rpx
;
padding
:
10rpx
20rpx
;
padding
:
10rpx
20rpx
;
background
:
url('/static/img/coupon/
redEnvelope
.png')
no-repeat
;
background
:
url('/static/img/coupon/
coupon-new
.png')
no-repeat
;
background-size
:
100%
100%
;
background-size
:
100%
100%
;
text-align
:
left
;
text-align
:
left
;
}
}
...
...
static/img/combination/bigCoupon.png
0 → 100644
View file @
d3d4f147
220 KB
static/img/combination/coupon.gif
deleted
100644 → 0
View file @
74371ab7
212 KB
static/img/coupon/redEnvelope.png
deleted
100644 → 0
View file @
74371ab7
24.4 KB
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