Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
严立
/
mini-shimao
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4801a0cb
authored
Sep 25, 2020
by
严立
Browse files
Options
_('Browse Files')
Download
Plain Diff
LL - 正式体验版代码合并
parents
2e76f6ea
7f272207
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
337 additions
and
112 deletions
app.js
pages/campsite/home-mirror/home-mirror.js
pages/campsite/home-mirror/home-mirror.wxml
pages/campsite/home-mirror/home-mirror.wxss
pages/campsite/home/home.js
pages/campsite/home/home.wxml
pages/campsite/home/home.wxss
pages/commodity/project/project.js
pages/mine/home/home.js
pages/mine/home/home.wxml
pages/play/movie-detail/movie-detail.js
pages/play/movie-detail/movie-detail.wxss
pages/play/service-detail/service-detail.js
pages/play/service-detail/service-detail.wxml
pages/play/service-detail/service-detail.wxss
app.js
View file @
4801a0cb
...
@@ -320,9 +320,7 @@ App({
...
@@ -320,9 +320,7 @@ App({
* @param {object} - { commodity: '商品数据对象', complete: '回调函数' }
* @param {object} - { commodity: '商品数据对象', complete: '回调函数' }
* @returns
* @returns
*/
*/
setCommodityInfo
:
function
(
funcParam
)
{
setCommodityInfo
:
function
(
funcInfoRaw
)
{
let
funcInfoRaw
=
funcParam
.
commodity
let
funcComplete
=
funcParam
.
complete
// 特殊数据格式化
// 特殊数据格式化
switch
(
Number
(
funcInfoRaw
.
genre
))
{
switch
(
Number
(
funcInfoRaw
.
genre
))
{
...
@@ -346,15 +344,15 @@ App({
...
@@ -346,15 +344,15 @@ App({
'notificationId'
:
funcInfoRaw
.
notificationId
,
// 购买须知
'notificationId'
:
funcInfoRaw
.
notificationId
,
// 购买须知
'priceType'
:
1
,
// 当前用户身份享受价格类型
'priceType'
:
1
,
// 当前用户身份享受价格类型
'price'
:
funcInfoRaw
.
sightseerPrice
,
// 普通价
'price'
:
funcInfoRaw
.
sightseerPrice
,
// 普通价
'priceText'
:
App
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
sightseerPrice
),
// 普通价文本格式
'priceText'
:
this
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
sightseerPrice
),
// 普通价文本格式
'priceSpecial'
:
funcInfoRaw
.
ownerPrice
,
// 业主价
'priceSpecial'
:
funcInfoRaw
.
ownerPrice
,
// 业主价
'priceSpecialText'
:
App
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
ownerPrice
),
// 业主价文本格式
'priceSpecialText'
:
this
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
ownerPrice
),
// 业主价文本格式
'priceDiscount'
:
funcInfoRaw
.
price
,
// 活动价
'priceDiscount'
:
funcInfoRaw
.
price
,
// 活动价
'priceDiscountText'
:
App
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
price
),
// 活动价文本格式
'priceDiscountText'
:
this
.
modular
.
utils
.
formatAmount
(
funcInfoRaw
.
price
),
// 活动价文本格式
'inventoriesId'
:
funcInfoRaw
.
inventoriesId
,
'inventoriesId'
:
funcInfoRaw
.
inventoriesId
,
'dateValid'
:
this
.
modular
.
miment
().
format
(
'YYYY.MM.DD'
),
// 有效时间
'dateValid'
:
this
.
modular
.
miment
().
format
(
'YYYY.MM.DD'
),
// 有效时间
'dateInvalid'
:
funcInfoRaw
.
funcInfoRaw
.
cardNam
,
// 失效时间
'dateInvalid'
:
funcInfoRaw
.
cardNam
,
// 失效时间
}
}
let
funcUserType
=
wx
.
getStorageSync
(
'userInfo'
).
userType
let
funcUserType
=
wx
.
getStorageSync
(
'userInfo'
).
userType
...
@@ -370,5 +368,7 @@ App({
...
@@ -370,5 +368,7 @@ App({
funcInfo
.
priceType
=
3
funcInfo
.
priceType
=
3
}
}
}
}
return
funcInfo
},
},
})
})
\ No newline at end of file
pages/campsite/home-mirror/home-mirror.js
View file @
4801a0cb
...
@@ -242,18 +242,35 @@ Page({
...
@@ -242,18 +242,35 @@ Page({
},
},
// 点击下载图片
// 点击下载图片
onDownload
:
function
()
{
onDownload
:
function
()
{
wx
.
showToast
({
wx
.
downloadFile
({
title
:
'已保存到相册'
,
url
:
this
.
data
.
shareImage
,
icon
:
'success'
success
:
(
result
)
=>
{
})
wx
.
saveImageToPhotosAlbum
({
this
.
setData
({
filePath
:
result
.
tempFilePath
,
showPopup
:
false
success
:
(
result
)
=>
{
this
.
setData
({
showPopup
:
false
,
winToastSuccess
:
true
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
}
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
}
})
})
},
},
// 点击位置图标
// 点击位置图标
onLocation
:
function
()
{
onLocation
:
function
()
{
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'/pages/home/guide/guide?id='
+
3
url
:
'/pages/home/guide/guide?id='
+
3
+
'&card=false'
})
})
},
},
// 点击全部活动
// 点击全部活动
...
...
pages/campsite/home-mirror/home-mirror.wxml
View file @
4801a0cb
...
@@ -22,19 +22,35 @@
...
@@ -22,19 +22,35 @@
<image class="icon-share" src="/image/icon/share-3.png"></image>
<image class="icon-share" src="/image/icon/share-3.png"></image>
</view>
</view>
<!-- 分享弹出图片 -->
<!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}">
<view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage">
<view class="col con-c">
<image src="{{shareImage}}"></image>
<view class="share-content">
</view>
<image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view>
</view>
<view class="download" bindtap="onDownload">
<view class="share-operation row con-b align-c">
<text>下载图片</text>
<button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view>
</view>
</view>
</view>
</l-popup>
</view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 位置按钮 -->
<!-- 位置按钮 -->
<view class="location col con-c align-c" bindtap="onLocation">
<view class="location col con-c align-c" bindtap="onLocation">
<image class="icon-location" src="/image/icon/location-3.png"></image>
<image class="icon-location" src="/image/icon/location-3.png"></image>
...
...
pages/campsite/home-mirror/home-mirror.wxss
View file @
4801a0cb
...
@@ -197,25 +197,61 @@
...
@@ -197,25 +197,61 @@
}
}
/* 分享弹窗 */
/* 分享弹窗 */
.popupImage image {
.container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx;
width: 606rpx;
height: 977rpx;
height: 977rpx;
margin-bottom: 64rpx;
}
}
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx;
width: 288rpx;
height: 96rpx;
height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx;
border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
}
}
.cancel {
.toast {
color: #15191F;
width: 262rpx;
background-color: #fff;
height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
}
}
.
download
{
.
toast-icon
{
color: #fff
;
width: 88rpx !important
;
background-color: #15191F
;
height: 88rpx !important
;
}
}
\ No newline at end of file
pages/campsite/home/home.js
View file @
4801a0cb
...
@@ -211,30 +211,59 @@ Page({
...
@@ -211,30 +211,59 @@ Page({
},
},
// 点击分享图标
// 点击分享图标
onShare
:
function
()
{
onShare
:
function
()
{
wx
.
hideTabBar
({
animation
:
true
,
})
this
.
setData
({
this
.
setData
({
showPopup
:
true
showPopup
:
true
})
})
},
},
// 点击取消
// 点击取消
onCancel
:
function
()
{
onCancel
:
function
()
{
wx
.
showTabBar
({
animation
:
true
,
})
this
.
setData
({
this
.
setData
({
showPopup
:
false
showPopup
:
false
})
})
},
},
// 点击下载图片
// 点击下载图片
onDownload
:
function
()
{
onDownload
:
function
()
{
wx
.
showToast
({
wx
.
downloadFile
({
title
:
'已保存到相册'
,
url
:
this
.
data
.
shareImage
,
icon
:
'success'
success
:
(
result
)
=>
{
})
wx
.
saveImageToPhotosAlbum
({
this
.
setData
({
filePath
:
result
.
tempFilePath
,
showPopup
:
false
success
:
(
result
)
=>
{
this
.
setData
({
showPopup
:
false
,
winToastSuccess
:
true
})
wx
.
showTabBar
({
animation
:
true
,
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
}
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
wx
.
showTabBar
({
animation
:
true
,
})
}
})
})
},
},
// 点击位置图标
// 点击位置图标
onLocation
:
function
()
{
onLocation
:
function
()
{
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'/pages/home/guide/guide?id='
+
3
url
:
'/pages/home/guide/guide?id='
+
3
+
'&card=false'
})
})
},
},
// 点击全部活动
// 点击全部活动
...
...
pages/campsite/home/home.wxml
View file @
4801a0cb
...
@@ -18,20 +18,36 @@
...
@@ -18,20 +18,36 @@
<view class="share col con-c align-c" bindtap="onShare">
<view class="share col con-c align-c" bindtap="onShare">
<image class="icon-share" src="/image/icon/share-3.png"></image>
<image class="icon-share" src="/image/icon/share-3.png"></image>
</view>
</view>
<!-- 分享弹出图片 -->
<!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}">
<view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage">
<view class="col con-c">
<image src="{{shareImage}}"></image>
<view class="share-content">
</view>
<image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view>
</view>
<view class="download" bindtap="onDownload">
<view class="share-operation row con-b align-c">
<text>下载图片</text>
<button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view>
</view>
</view>
</view>
</l-popup>
</view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 位置按钮 -->
<!-- 位置按钮 -->
<view class="location col con-c align-c" bindtap="onLocation">
<view class="location col con-c align-c" bindtap="onLocation">
<image class="icon-location" src="/image/icon/location-3.png"></image>
<image class="icon-location" src="/image/icon/location-3.png"></image>
...
...
pages/campsite/home/home.wxss
View file @
4801a0cb
...
@@ -194,27 +194,62 @@
...
@@ -194,27 +194,62 @@
.wx-swiper-dots.wx-swiper-dots-horizontal{
.wx-swiper-dots.wx-swiper-dots-horizontal{
margin-bottom: 64rpx;
margin-bottom: 64rpx;
}
}
/* 分享弹窗 */
/* 分享弹窗 */
.popupImage image {
.container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx;
width: 606rpx;
height: 977rpx;
height: 977rpx;
margin-bottom: 64rpx;
}
}
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx;
width: 288rpx;
height: 96rpx;
height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx;
border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
}
}
.cancel {
.toast {
color: #15191F;
width: 262rpx;
background-color: #fff;
height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
}
}
.
download
{
.
toast-icon
{
color: #fff
;
width: 88rpx !important
;
background-color: #15191F
;
height: 88rpx !important
;
}
}
\ No newline at end of file
pages/commodity/project/project.js
View file @
4801a0cb
...
@@ -236,11 +236,10 @@ Page({
...
@@ -236,11 +236,10 @@ Page({
*/
*/
onBanner
:
function
(
event
)
{
onBanner
:
function
(
event
)
{
return
return
let
funcItme
=
event
.
currentTarget
.
dataset
.
item
let
funcItme
=
event
.
currentTarget
.
dataset
.
item
// 月卡商品
// 月卡商品
//
funcItme.targetId = '94b7a6a7f82845d3a1875ee1e7a033fa'
funcItme
.
targetId
=
'94b7a6a7f82845d3a1875ee1e7a033fa'
// 门票商品
// 门票商品
// funcItme.targetId = '0ac170457a8546469976753ea21cd8e9'
// funcItme.targetId = '0ac170457a8546469976753ea21cd8e9'
...
@@ -252,7 +251,7 @@ Page({
...
@@ -252,7 +251,7 @@ Page({
// funcItme.targetId = '006a1a3df15e43119103ec34e0bec393'
// funcItme.targetId = '006a1a3df15e43119103ec34e0bec393'
// 餐品
// 餐品
funcItme
.
targetId
=
'329f304aca104ff1887dde5877e15126'
//
funcItme.targetId = '329f304aca104ff1887dde5877e15126'
funcItme
.
targetType
=
4
funcItme
.
targetType
=
4
...
@@ -304,13 +303,7 @@ Page({
...
@@ -304,13 +303,7 @@ Page({
},
},
success
:
(
response
)
=>
{
success
:
(
response
)
=>
{
console
.
log
(
response
)
console
.
log
(
response
)
let
funcParam
=
{
console
.
log
(
App
.
setCommodityInfo
(
response
.
data
))
'commodity'
:
response
.
data
,
'complete'
:
function
()
{
console
.
log
(
'complete'
)
}
}
App
.
setCommodityInfo
(
funcParam
)
}
}
})
})
...
...
pages/mine/home/home.js
View file @
4801a0cb
...
@@ -79,7 +79,7 @@ Page({
...
@@ -79,7 +79,7 @@ Page({
authInfo
:
null
,
authInfo
:
null
,
goodTypeCountData
:
{},
goodTypeCountData
:
{},
enrollSubscribeData
:
{},
enrollSubscribeData
:
{},
isLoadingOrder
:
true
isLoadingOrder
:
true
},
},
// 去活动预约列表
// 去活动预约列表
...
@@ -189,7 +189,7 @@ Page({
...
@@ -189,7 +189,7 @@ Page({
getWillUseOrders
()
{
getWillUseOrders
()
{
let
that
=
this
let
that
=
this
this
.
setData
({
this
.
setData
({
isLoadingOrder
:
true
isLoadingOrder
:
true
})
})
App
.
wxRequest
({
App
.
wxRequest
({
url
:
'/api/v1/order/getOrderList'
,
url
:
'/api/v1/order/getOrderList'
,
...
@@ -217,11 +217,14 @@ Page({
...
@@ -217,11 +217,14 @@ Page({
let
listBackUp
=
JSON
.
parse
(
JSON
.
stringify
(
list
))
//备份数据
let
listBackUp
=
JSON
.
parse
(
JSON
.
stringify
(
list
))
//备份数据
let
orderList
=
`myOrder.artOrder.orderList`
let
orderList
=
`myOrder.artOrder.orderList`
list
.
length
=
1
// 初始化取一个
if
(
list
.
length
>
0
)
{
list
.
length
=
1
}
that
.
setData
({
that
.
setData
({
[
orderList
]:
list
,
[
orderList
]:
list
,
orderListBackup
:
listBackUp
,
orderListBackup
:
listBackUp
,
isLoadingOrder
:
false
isLoadingOrder
:
false
})
})
...
@@ -432,11 +435,11 @@ Page({
...
@@ -432,11 +435,11 @@ Page({
App
.
wxRequest
({
App
.
wxRequest
({
url
:
'/api/v1/activity/getMyActivityList'
,
url
:
'/api/v1/activity/getMyActivityList'
,
data
:
{
data
:
{
enrollState
:
2
,
//待使用
enrollState
:
2
,
//待使用
activeState
:
'1'
,
//""全部 0 未开始 1进行中 2已结束
activeState
:
'1'
,
//""全部 0 未开始 1进行中 2已结束
pageSize
:
-
1
,
pageSize
:
-
1
,
pageNo
:
1
,
pageNo
:
1
,
type
:
1
,
//0 影片 1 活动
type
:
1
,
//0 影片 1 活动
},
},
success
:
function
(
res
)
{
success
:
function
(
res
)
{
let
list
=
res
.
data
.
list
let
list
=
res
.
data
.
list
...
...
pages/mine/home/home.wxml
View file @
4801a0cb
...
@@ -207,7 +207,7 @@
...
@@ -207,7 +207,7 @@
</view>
</view>
</view>
</view>
<!-- more -->
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder}}">
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder
&&orderListBackup.length>1
}}">
<text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:else>收起</text>
<text wx:else>收起</text>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
...
...
pages/play/movie-detail/movie-detail.js
View file @
4801a0cb
...
@@ -99,7 +99,7 @@ Page({
...
@@ -99,7 +99,7 @@ Page({
name
:
'今日'
+
App
.
modular
.
miment
().
format
(
'MM月DD日'
)
name
:
'今日'
+
App
.
modular
.
miment
().
format
(
'MM月DD日'
)
}
}
statusList
.
push
(
tempItem
)
statusList
.
push
(
tempItem
)
showList
[
index
]
=
movieInfo
.
allTimes
[
key
]
showList
[
index
]
=
movieInfo
.
today
index
++
index
++
}
else
if
(
key
===
App
.
modular
.
miment
().
add
(
1
,
'DD'
).
format
(
'YYYY-MM-DD'
))
{
}
else
if
(
key
===
App
.
modular
.
miment
().
add
(
1
,
'DD'
).
format
(
'YYYY-MM-DD'
))
{
tempItem
=
{
tempItem
=
{
...
@@ -107,7 +107,7 @@ Page({
...
@@ -107,7 +107,7 @@ Page({
name
:
'明日'
+
App
.
modular
.
miment
().
add
(
1
,
'DD'
).
format
(
'MM月DD日'
)
name
:
'明日'
+
App
.
modular
.
miment
().
add
(
1
,
'DD'
).
format
(
'MM月DD日'
)
}
}
statusList
.
push
(
tempItem
)
statusList
.
push
(
tempItem
)
showList
[
index
]
=
movieInfo
.
allTimes
[
key
]
showList
[
index
]
=
movieInfo
.
tomorrow
index
++
index
++
}
else
if
(
key
===
App
.
modular
.
miment
().
add
(
day
,
'DD'
).
format
(
'YYYY-MM-DD'
))
{
}
else
if
(
key
===
App
.
modular
.
miment
().
add
(
day
,
'DD'
).
format
(
'YYYY-MM-DD'
))
{
tempItem
=
{
tempItem
=
{
...
...
pages/play/movie-detail/movie-detail.wxss
View file @
4801a0cb
...
@@ -149,7 +149,8 @@ page {
...
@@ -149,7 +149,8 @@ page {
width: 710rpx;
width: 710rpx;
height: 160rpx;
height: 160rpx;
margin-left: 40rpx;
margin-left: 40rpx;
border-bottom: 1px solid #3A3A40;
padding-right: 40rpx;
border-bottom: 1rpx solid #3A3A40;
}
}
.show-time-start {
.show-time-start {
width: 118rpx;
width: 118rpx;
...
@@ -158,13 +159,14 @@ page {
...
@@ -158,13 +159,14 @@ page {
font-weight: 600;
font-weight: 600;
}
}
.show-time-end {
.show-time-end {
width: 1
22
rpx;
width: 1
30
rpx;
margin-left: 48rpx;
margin-left: 48rpx;
color: #959DA9;
color: #959DA9;
font-size: 26rpx;
font-size: 26rpx;
}
}
.show-free {
.show-free {
margin-left: 130rpx;
margin-left: 80rpx;
width: 130rpx;
color: #fff;
color: #fff;
font-size: 26;
font-size: 26;
}
}
...
...
pages/play/service-detail/service-detail.js
View file @
4801a0cb
...
@@ -458,6 +458,7 @@ Page({
...
@@ -458,6 +458,7 @@ Page({
success
:
(
response
)
=>
{
success
:
(
response
)
=>
{
let
funcCommodityList
=
[]
let
funcCommodityList
=
[]
let
funcResponse
=
response
.
data
let
funcResponse
=
response
.
data
console
.
log
(
JSON
.
stringify
(
funcResponse
))
for
(
let
i
=
0
,
l
=
funcResponse
.
length
;
i
<
l
;
i
++
)
{
for
(
let
i
=
0
,
l
=
funcResponse
.
length
;
i
<
l
;
i
++
)
{
let
funcItem
=
{
let
funcItem
=
{
'id'
:
funcResponse
[
i
].
id
,
// 商品标识
'id'
:
funcResponse
[
i
].
id
,
// 商品标识
...
@@ -465,7 +466,7 @@ Page({
...
@@ -465,7 +466,7 @@ Page({
'sidebarId'
:
funcResponse
[
i
].
classifyId
,
// 商品分类标识
'sidebarId'
:
funcResponse
[
i
].
classifyId
,
// 商品分类标识
'name'
:
funcResponse
[
i
].
name
,
'name'
:
funcResponse
[
i
].
name
,
'cover'
:
funcResponse
[
i
].
coverImg
,
// 商品封面
'cover'
:
funcResponse
[
i
].
coverImg
,
// 商品封面
'img'
:
funcResponse
[
i
].
img
,
// 商品详情图
'img'
:
funcResponse
[
i
].
img
.
split
(
'|'
)
,
// 商品详情图
'price'
:
funcResponse
[
i
].
sightseerPrice
,
// 普通价
'price'
:
funcResponse
[
i
].
sightseerPrice
,
// 普通价
'priceText'
:
App
.
modular
.
utils
.
formatAmount
(
funcResponse
[
i
].
sightseerPrice
),
// 普通价文本格式
'priceText'
:
App
.
modular
.
utils
.
formatAmount
(
funcResponse
[
i
].
sightseerPrice
),
// 普通价文本格式
'priceSpecial'
:
funcResponse
[
i
].
ownerPrice
,
// 业主价
'priceSpecial'
:
funcResponse
[
i
].
ownerPrice
,
// 业主价
...
@@ -490,7 +491,6 @@ Page({
...
@@ -490,7 +491,6 @@ Page({
funcItem
.
priceType
=
3
funcItem
.
priceType
=
3
}
}
}
}
console
.
log
(
funcItem
.
img
)
funcCommodityList
.
push
(
funcItem
)
funcCommodityList
.
push
(
funcItem
)
}
}
...
@@ -791,12 +791,29 @@ Page({
...
@@ -791,12 +791,29 @@ Page({
},
},
// 点击下载图片
// 点击下载图片
onDownload
:
function
()
{
onDownload
:
function
()
{
wx
.
showToast
({
wx
.
downloadFile
({
title
:
'已保存到相册'
,
url
:
this
.
data
.
shareImage
,
icon
:
'success'
success
:
(
result
)
=>
{
})
wx
.
saveImageToPhotosAlbum
({
this
.
setData
({
filePath
:
result
.
tempFilePath
,
showPopup
:
false
success
:
(
result
)
=>
{
this
.
setData
({
showPopup
:
false
,
winToastSuccess
:
true
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
}
})
},
fail
:
(
error
)
=>
{
this
.
setData
({
winToastFail
:
true
})
}
})
})
},
},
// 跳转到文创商品商店
// 跳转到文创商品商店
...
...
pages/play/service-detail/service-detail.wxml
View file @
4801a0cb
...
@@ -25,19 +25,35 @@
...
@@ -25,19 +25,35 @@
<image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
<image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
</view>
</view>
<!-- 分享弹出图片 -->
<!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}">
<view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="popupImage">
<view class="col con-c">
<image src="{{shareImage}}"></image>
<view class="share-content">
</view>
<image src="{{shareImage}}"></image>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
</view>
</view>
<view class="download" bindtap="onDownload">
<view class="share-operation row con-b align-c">
<text>下载图片</text>
<button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view>
</view>
</view>
</view>
</l-popup>
</view>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 开放时间信息 -->
<!-- 开放时间信息 -->
<view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
<view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
<image src="./image/time.png"></image>
<image src="./image/time.png"></image>
...
@@ -109,7 +125,9 @@
...
@@ -109,7 +125,9 @@
<view class="commodity-card-list row">
<view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col">
<view class="commodity-card-item col">
<image mode="center" src="{{item.img}}"></image>
<view class="commodity-card-item-cover row con-c align-c">
<image mode="aspectFill" src="{{item.img[0]}}"></image>
</view>
<view class="commodity-card-item-title row con-b align-c">
<view class="commodity-card-item-title row con-b align-c">
<text>{{item.name}}</text>
<text>{{item.name}}</text>
</view>
</view>
...
...
pages/play/service-detail/service-detail.wxss
View file @
4801a0cb
...
@@ -309,6 +309,10 @@
...
@@ -309,6 +309,10 @@
width: 562rpx;
width: 562rpx;
height: 316rpx;
height: 316rpx;
}
}
.commodity-card-item-cover image{
width: 562rpx;
height: 316rpx;
}
.movie-card-item > image {
.movie-card-item > image {
width: 300rpx;
width: 300rpx;
height: 369rpx;
height: 369rpx;
...
@@ -551,27 +555,63 @@
...
@@ -551,27 +555,63 @@
}
}
/* 分享弹窗 */
/* 分享弹窗 */
.popupImage image {
.container-share {
z-index: 1700;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding-top: 60rpx;
background: rgba(0, 0, 0, 0.65);
}
.share-content image {
width: 606rpx;
width: 606rpx;
height: 977rpx;
height: 977rpx;
margin-bottom: 64rpx;
}
}
.cancel, .download {
.share-operation {
margin-top: 60rpx;
}
.share-operation button:nth-child(1) {
width: 288rpx;
width: 288rpx;
height: 96rpx;
height: 96rpx;
border-radius: 4rpx;
background: #FFFFFF;
text-align: center;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
line-height: 96rpx;
color: #15191F;
}
.share-operation button:nth-child(2) {
width: 288rpx;
height: 96rpx;
border-radius: 4rpx;
border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
}
}
.cancel {
.toast {
color: #15191F;
width: 262rpx;
background-color: #fff;
height: 262rpx;
border-radius: 4px;
box-shadow: 0px 0px 68px 0px rgba(0,0,0,0.16);
background: #1F252E;
}
}
.
download
{
.
toast-icon
{
color: #fff
;
width: 88rpx !important
;
background-color: #15191F
;
height: 88rpx !important
;
}
}
/* 简介,评论 */
/* 简介,评论 */
...
...
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