Skip to content

严立 / mini-shimao

Go to a project
Commit 3b5fab58 by 严立
Options

LL - 景点分享问题，其他UI问题

parent ddff6ecb
Inline Side-by-side
Showing with 337 additions and 90 deletions
app.js
...@@ -293,10 +293,13 @@ App({ ...@@ -293,10 +293,13 @@ App({
}) })
}, },
setShopInfo: function (funcShopAppId) { setShopInfo: function (funcShopAppId, funcShopType) {
for (let i = 0, l = iEnvironmental.shopId.length; i < l; i++) { for (let i = 0, l = iEnvironmental.shopId.length; i < l; i++) {
if (funcShopAppId === iEnvironmental.shopId[i].appId) { if (funcShopAppId === iEnvironmental.shopId[i].appId) {
wx.setStorageSync('shopInfoBuffer', iEnvironmental.shopId[i]) let funcShopInfo = JSON.parse(JSON.stringify(iEnvironmental.shopId[i]))
if (funcShopType) funcShopInfo.shopType = funcShopType
wx.setStorageSync('shopInfoBuffer', funcShopInfo)
return iEnvironmental.shopId[i] return iEnvironmental.shopId[i]
} }
} }
......
pages/home/guide/guide.js
...@@ -12,10 +12,12 @@ Page({ ...@@ -12,10 +12,12 @@ Page({
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
mapCss: '', mapCss: '',
arrowCss: '',
pointDetail: './image/card/01.png', pointDetail: './image/card/01.png',
winPointDetail: false, winPointDetail: false,
pointInfo: iPoint, pointInfo: iPoint,
selectionPoint: 0, selectionPoint: 0,
isSave: false, isSave: false,
winDialog: false, winDialog: false,
...@@ -53,6 +55,36 @@ Page({ ...@@ -53,6 +55,36 @@ Page({
mapCss: JSON.stringify(funcMapCss).replace(/[{",}]/g, ''), mapCss: JSON.stringify(funcMapCss).replace(/[{",}]/g, ''),
}) })
this.setPointCss(funcProportion) this.setPointCss(funcProportion)
this.setArrowCss(funcProportion)
},
setArrowCss: function (funcProportion) {
// 设置景点底部箭头样式
// 数值以设计图上的像素为准
let funcArrowStyle = {
'width': 50,
'height': 62,
'top': 0,
'left': 0,
}
funcArrowStyle['width'] = Math.floor(funcArrowStyle['width'] * funcProportion)
funcArrowStyle['height'] = Math.floor(funcArrowStyle['height'] * funcProportion)
funcArrowStyle['top'] = Math.floor(funcArrowStyle['top'] * funcProportion)
funcArrowStyle['left'] = Math.floor(funcArrowStyle['left'] * funcProportion)
let funcArrowCss = {
'width': funcArrowStyle['width'] + 'px;',
'height': funcArrowStyle['height'] + 'px;',
'top': funcArrowStyle['top'] + 'px;',
'left': funcArrowStyle['left'] + 'px;',
}
this.setData({
arrowCss: JSON.stringify(funcArrowCss).replace(/[{",}]/g, '')
})
console.log(funcArrowCss)
}, },
setPointCss: function (funcProportion) { setPointCss: function (funcProportion) {
...@@ -123,13 +155,18 @@ Page({ ...@@ -123,13 +155,18 @@ Page({
}) })
}) })
this.setData({ this.setData({
selectionPoint: 200 selectionPoint: 200
}) })
return return
} }
// 屏蔽门店点击进入地图不显示详情卡片
let funcWinPointDetail = true
if (logicData.option.card && logicData.option.card === 'false') {
funcWinPointDetail = false
}
let funcIndex = 0 let funcIndex = 0
let funcPointInfo = this.data.pointInfo let funcPointInfo = this.data.pointInfo
for (let i = 0, l = funcPointInfo.length; i < l; i++) { for (let i = 0, l = funcPointInfo.length; i < l; i++) {
...@@ -141,7 +178,7 @@ Page({ ...@@ -141,7 +178,7 @@ Page({
this.setData({ this.setData({
pointInfo: funcPointInfo, pointInfo: funcPointInfo,
pointDetail: funcPointInfo[funcIndex].card, pointDetail: funcPointInfo[funcIndex].card,
winPointDetail: true, winPointDetail: funcWinPointDetail,
}) })
this.scrollSelection(funcPointInfo[funcIndex]) this.scrollSelection(funcPointInfo[funcIndex])
......
pages/home/guide/guide.wxml
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
catch:tap="onPointInfo" catch:tap="onPointInfo"
> >
<!-- 默认样式 --> <!-- 默认样式 -->
<image class="point-info-arrow" src="./image/icon/point-arrow-inactive.png" hidden="{{item.isActive}}"></image> <image class="point-info-arrow" src="./image/icon/point-arrow-inactive.png" style="{{arrowCss}}" hidden="{{item.isActive}}"></image>
<image class="icon-inactive" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{item.isActive}}"></image> <image class="icon-inactive" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{item.isActive}}"></image>
<button class="button-inactive" hidden="{{item.isActive}}">{{item.name}}</button> <button class="button-inactive" hidden="{{item.isActive}}">{{item.name}}</button>
<!-- 选择样式 --> <!-- 选择样式 -->
<image class="point-info-arrow" src="./image/icon/point-arrow-active.png" hidden="{{!item.isActive}}"></image> <image class="point-info-arrow" src="./image/icon/point-arrow-active.png" style="{{arrowCss}}" hidden="{{!item.isActive}}"></image>
<image class="icon-active" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{!item.isActive}}"></image> <image class="icon-active" src="{{item.icon}}" style="{{pointIconCss}}" hidden="{{!item.isActive}}"></image>
<button class="button-active" hidden="{{!item.isActive}}">{{item.name}}</button> <button class="button-active" hidden="{{!item.isActive}}">{{item.name}}</button>
</view> </view>
......
pages/home/guide/guide.wxss
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
position: absolute; position: absolute;
left: 13px; left: 13px;
bottom: -8px; bottom: -8px;
width: 10px;
height: 8px;
} }
.icon-active { .icon-active {
...@@ -45,11 +43,11 @@ ...@@ -45,11 +43,11 @@
.button-active { .button-active {
background: #2a6381; background: #2a6381;
color: #FFFFFF; color: #FFFFFF;
} }
.icon-inactive { .icon-inactive {
z-index: 9;
border: 2px #FFFFFF solid; border: 2px #FFFFFF solid;
border-radius: 50%; border-radius: 50%;
box-shadow: 0px 1px 2px 0px rgba(50,128,182,0.24); box-shadow: 0px 1px 2px 0px rgba(50,128,182,0.24);
...@@ -57,7 +55,6 @@ ...@@ -57,7 +55,6 @@
.button-inactive { .button-inactive {
background: #FFFFFF; background: #FFFFFF;
color: #000000; color: #000000;
} }
......
pages/home/guide/image/icon/point-arrow-active.png
pages/home/guide/image/icon/point-arrow-active.png

295 Bytes | W: | H:

pages/home/guide/image/icon/point-arrow-active.png

1.79 KB | W: | H:

pages/home/guide/image/icon/point-arrow-active.png
pages/home/guide/image/icon/point-arrow-active.png
pages/home/guide/image/icon/point-arrow-active.png
pages/home/guide/image/icon/point-arrow-active.png
  • 2-up
  • Swipe
  • Onion skin
pages/home/guide/image/icon/point-arrow-inactive.png
pages/home/guide/image/icon/point-arrow-inactive.png

317 Bytes | W: | H:

pages/home/guide/image/icon/point-arrow-inactive.png

1.76 KB | W: | H:

pages/home/guide/image/icon/point-arrow-inactive.png
pages/home/guide/image/icon/point-arrow-inactive.png
pages/home/guide/image/icon/point-arrow-inactive.png
pages/home/guide/image/icon/point-arrow-inactive.png
  • 2-up
  • Swipe
  • Onion skin
pages/home/guide/js/point.js
...@@ -9,7 +9,7 @@ let output = [ ...@@ -9,7 +9,7 @@ let output = [
detail: '/pages/play/point-detail/point-detail?id=105', detail: '/pages/play/point-detail/point-detail?id=105',
isActive: false, isActive: false,
}, { }, {
x: 810, x: 813,
y: 220, y: 220,
id: '', id: '',
name: '海错图2号馆', name: '海错图2号馆',
...@@ -18,7 +18,7 @@ let output = [ ...@@ -18,7 +18,7 @@ let output = [
detail: '/pages/play/service-detail/service-detail?id=1', detail: '/pages/play/service-detail/service-detail?id=1',
isActive: false, isActive: false,
}, { }, {
x: 1060, x: 1063,
y: 220, y: 220,
id: 1, id: 1,
name: '海错图1号馆', name: '海错图1号馆',
...@@ -27,7 +27,7 @@ let output = [ ...@@ -27,7 +27,7 @@ let output = [
detail: '/pages/play/service-detail/service-detail?id=1', detail: '/pages/play/service-detail/service-detail?id=1',
isActive: false, isActive: false,
}, { }, {
x: 1300, x: 1303,
y: 220, y: 220,
id: 6, id: 6,
name: '原味舒食', name: '原味舒食',
......
pages/home/home/home.js
...@@ -73,11 +73,9 @@ Page({ ...@@ -73,11 +73,9 @@ Page({
}, },
setLogin: function () { setLogin: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
if (!funcUserInfo.isSignIn) { this.setData({
this.setData({ isLogin: funcUserInfo.isSignIn
isLogin: true })
})
}
}, },
onShareAppMessage: function (res) { onShareAppMessage: function (res) {
if (res.from === 'button') { if (res.from === 'button') {
......
pages/home/home/home.wxml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<image src="/image/ornament-0.png" mode="widthFix"></image> <image src="/image/ornament-0.png" mode="widthFix"></image>
</view> </view>
<view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{isLogin}}"> <view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}">
<view class="row align-c"> <view class="row align-c">
<image src="/image/wechat.png"></image> <image src="/image/wechat.png"></image>
<text>微信登陆</text> <text>微信登陆</text>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</view> </view>
</view> </view>
<view class="detail {{isLogin ? 'login-detail' : ''}}"> <view class="detail {{!isLogin ? 'login-detail' : ''}}">
<!-- 预约公告 --> <!-- 预约公告 -->
<view class="night row con-b" bindtap="onAppointmentInto"> <view class="night row con-b" bindtap="onAppointmentInto">
<image src="./image/into.png" mode="aspectFit"></image> <image src="./image/into.png" mode="aspectFit"></image>
......
pages/home/night-appointment/night-appointment.wxml
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
<text>数</text> <text>数</text>
</view> </view>
<view class="input-wrap row con-b align-c" style="padding: 0"> <view class="input-wrap row con-b align-c" style="padding: 0">
<l-button special="{{true}}" bind:lintap="onQuantityCut"> <button class="row con-c align-c" bindtap="onQuantityCut">
<image class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image> <image src="{{imageBase + 'icon/cut-1.png'}}"></image>
</l-button> </button>
<text class="text" style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text> <text style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text>
<l-button special="{{true}}" bind:lintap="onQuantityAdd"> <button class="row con-c align-c" bindtap="onQuantityAdd">
<image class="input-icon" src="{{imageBase + 'icon/add-1.png'}}"></image> <image src="{{imageBase + 'icon/add-1.png'}}"></image>
</l-button> </button>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row align-c">
...@@ -81,9 +81,11 @@ ...@@ -81,9 +81,11 @@
<text>期</text> <text>期</text>
</view> </view>
<view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx"> <view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate"> <picker class="input-picker row align-c" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate">
<view class="picker text" style="display: inline-block;width:400rpx">{{formDate}}</view> <view class="row con-b align-c">
<image class="input-icon" style="float: right;" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image> <text class="grow">{{formDate}}</text>
<image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
</view>
</picker> </picker>
</view> </view>
</view> </view>
......
pages/home/night-appointment/night-appointment.wxss
...@@ -84,18 +84,37 @@ ...@@ -84,18 +84,37 @@
width: 510rpx; width: 510rpx;
height: 80rpx; height: 80rpx;
margin-top: 32rpx; margin-top: 32rpx;
padding: 0 24rpx; padding: 20rpx 24rpx;
border: 1px #DBDFE5 solid; border: 1px #DBDFE5 solid;
border-radius: 2px; border-radius: 2px;
} }
.input-wrap .text { .input-wrap button:nth-child(1) {
width: 76rpx;
height: 40rpx;
border-right: 1px #DBDFE5 solid;
background: #FFFFFF;
}
.input-wrap text {
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
color: #1E2025; color: #1E2025;
line-height: 80rpx; line-height: 80rpx;
} }
.input-wrap button:nth-child(3) {
width: 76rpx;
height: 40rpx;
border-left: 1px #DBDFE5 solid;
background: #FFFFFF;
}
.input-wrap button > image {
width: 32rpx;
height: 32rpx;
}
.input-tip { .input-tip {
font-size: 30rpx; font-size: 30rpx;
color: #C2C7CF; color: #C2C7CF;
...@@ -113,6 +132,10 @@ ...@@ -113,6 +132,10 @@
display: flex; display: flex;
} }
.input-picker view {
width: 486rpx;
}
.form-error { .form-error {
width: 510rpx; width: 510rpx;
height: 32rpx; height: 32rpx;
......
pages/pay/order-input/order-input.js
...@@ -451,8 +451,8 @@ Page({ ...@@ -451,8 +451,8 @@ Page({
for (let i = 0, l = funcTimetable.length; i < l; i++) { for (let i = 0, l = funcTimetable.length; i < l; i++) {
if (funcEntryId === funcTimetable[i].id) { if (funcEntryId === funcTimetable[i].id) {
funcDate = App.modular.miment(funcTimetable[i].beginTime).format('MM月DD日') funcDate = App.modular.miment(funcTimetable[i].beginTime).format('MM月DD日')
funcTimeBegin = App.modular.miment(funcTimetable[i].beginTime).format('hh:mm:ss') funcTimeBegin = App.modular.miment(funcTimetable[i].beginTime).format('hh:mm')
funcTimeEnd = App.modular.miment(funcTimetable[i].endTime).format('hh:mm:ss') funcTimeEnd = App.modular.miment(funcTimetable[i].endTime).format('hh:mm')
break break
} }
} }
......
pages/pay/order-input/order-input.wxml
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
</cover-view> </cover-view>
<!-- winButtonAppointment --> <!-- winButtonAppointment -->
<cover-view class="appointment row con-c align-c" wx:if="{{winButtonAppointment && !winNoticeDetail}}"> <cover-view class="appointment row con-c align-c" wx:if="{{winButtonAppointment && !winNoticeDetail && !winActivityResult}}">
<cover-view class="appointment-confirm row con-c align-c" bindtap="paySubmitActivity">确认预约</cover-view> <cover-view class="appointment-confirm row con-c align-c" bindtap="paySubmitActivity">确认预约</cover-view>
</cover-view> </cover-view>
......
pages/play/activity-detail/activity-detail.js
...@@ -93,7 +93,6 @@ Page({ ...@@ -93,7 +93,6 @@ Page({
funcItem.priceType = 3 funcItem.priceType = 3
} }
} }
funcItem.priceType = 3
wx.setStorageSync('shoppingCartBuffer', [funcItem]) wx.setStorageSync('shoppingCartBuffer', [funcItem])
this.setData({ this.setData({
......
pages/play/home/home.js
...@@ -12,6 +12,7 @@ Page({ ...@@ -12,6 +12,7 @@ Page({
strategy: [], strategy: [],
strategyList: [], strategyList: [],
strategyOriginList: [], strategyOriginList: [],
//接口参数 //接口参数
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
...@@ -240,7 +241,9 @@ Page({ ...@@ -240,7 +241,9 @@ Page({
routeList: function () { routeList: function () {
App.wxRequest({ App.wxRequest({
url: '/api/v1/strategy/getList', url: '/api/v1/strategy/getList',
data: { pageSize: this.data.pageSize + '', pageNo: this.data.pageNo + '' }, data: {
'pageSize': this.data.pageSize + '',
'pageNo': this.data.pageNo + '' },
success: (response) => { success: (response) => {
let funcResponse = response.data let funcResponse = response.data
let funcList = [] let funcList = []
...@@ -261,7 +264,7 @@ Page({ ...@@ -261,7 +264,7 @@ Page({
} }
this.setData({ this.setData({
touristRouteList: funcList touristRouteList: this.data.touristRouteList.concat(funcList)
}) })
}, },
fail: (err) => { fail: (err) => {
...@@ -270,6 +273,15 @@ Page({ ...@@ -270,6 +273,15 @@ Page({
}) })
}, },
onReachBottom: function () {
console.log('onReachBottom')
this.setData({
pageNo: this.data.pageNo + 1
})
this.routeList()
},
/** /**
* 游客攻略详情 * 游客攻略详情
* @function * @function
......
pages/play/home/home.wxss
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
.activity-item image { .activity-item image {
width: 648rpx; width: 648rpx;
height: 720rpx; height: 720rpx;
background-color: #ccc;
} }
.activity-item-left { .activity-item-left {
......
pages/play/point-detail/point-detail.js
...@@ -32,6 +32,7 @@ Page({ ...@@ -32,6 +32,7 @@ Page({
{ {
id: 101, id: 101,
name: '星光广场', name: '星光广场',
title: '星光广场',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-1-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-1-1.png',
...@@ -50,6 +51,7 @@ Page({ ...@@ -50,6 +51,7 @@ Page({
}, { }, {
id: 102, id: 102,
name: '云之亭', name: '云之亭',
title: '云之亭',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-2-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-2-1.png',
...@@ -68,6 +70,7 @@ Page({ ...@@ -68,6 +70,7 @@ Page({
}, { }, {
id: 103, id: 103,
name: '湿地公园', name: '湿地公园',
title: '湿地公园',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-3-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-3-1.png',
...@@ -86,6 +89,7 @@ Page({ ...@@ -86,6 +89,7 @@ Page({
}, { }, {
id: 104, id: 104,
name: '新月码头', name: '新月码头',
title: '新月码头',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-4-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-4-1.png',
...@@ -103,7 +107,8 @@ Page({ ...@@ -103,7 +107,8 @@ Page({
popupImage: App.globalData.appResourcesBase + 'share/share-7.png', popupImage: App.globalData.appResourcesBase + 'share/share-7.png',
}, { }, {
id: 105, id: 105,
name: '温泉洋房', name: '温泉洋房（建设中)',
title: '温泉洋房',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-5-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-5-1.png',
...@@ -122,6 +127,7 @@ Page({ ...@@ -122,6 +127,7 @@ Page({
}, { }, {
id: 106, id: 106,
name: '星耀银湖', name: '星耀银湖',
title: '星耀银湖',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-6-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-6-1.png',
...@@ -140,6 +146,7 @@ Page({ ...@@ -140,6 +146,7 @@ Page({
}, { }, {
id: 107, id: 107,
name: '奇幻森林', name: '奇幻森林',
title: '奇幻森林',
contact: '13316748039', contact: '13316748039',
banner: [ banner: [
App.globalData.appResourcesBase + 'guide/banner/banner-7-1.png', App.globalData.appResourcesBase + 'guide/banner/banner-7-1.png',
...@@ -210,8 +217,44 @@ Page({ ...@@ -210,8 +217,44 @@ Page({
showPopup: false showPopup: false
}) })
}, },
// 点击下载图片 // 点击下载图片
onDownload: function () { onDownload: function () {
console.log('download') wx.downloadFile({
url: this.data.popupImage,
success: (result) => {
console.log(result)
wx.saveImageToPhotosAlbum({
filePath: result.tempFilePath,
success: (result) => {
wx.lin.showToast({
icon: 'success',
title: '图片已保存至相册',
show: true,
mask: true
})
this.setData({
isSave: true
})
},
fail: (error) => {
wx.lin.showToast({
icon: 'error',
title: '图片已保存失败',
show: true,
mask: true
})
}
})
},
fail: (error) => {
wx.lin.showToast({
icon: 'error',
title: '图片下载失败',
show: true,
mask: true
})
}
})
} }
}) })
\ No newline at end of file
pages/play/point-detail/point-detail.wxml
<!-- 畅玩 - 商店详情 --> <!-- 畅玩 - 商店详情 -->
<navigation class="navigation" titleText="{{info.name}}" color="#ffffff" backIcon="/image/back-w.png"></navigation> <navigation class="navigation" titleText="{{info.title}}" color="#ffffff" backIcon="/image/back-w.png"></navigation>
<view class="container"> <view class="container">
<view id="banner" class="banner"> <view id="banner" class="banner">
...@@ -19,26 +19,28 @@ ...@@ -19,26 +19,28 @@
</view> </view>
<view class="describe" style="{{info.background}}"> <view class="describe" style="{{info.background}}">
<block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <view class="describe-occupy row align-c">
<image src="{{item}}" mode="aspectFit"></image> <text>{{info.name}}</text>
</block> <image src="/image/icon/share-3.png" bindtap="onShare"></image>
<image class="icon-share" src="/image/icon/share-3.png" bindtap="onShare"></image> </view>
<view class="describe-content">
<block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<image src="{{item}}" mode="aspectFit"></image>
</block>
</view>
</view> </view>
<view class="iphonexr-fill" style="{{info.background}}"></view> <view class="iphonexr-fill" style="{{info.background}}"></view>
</view>
<!-- 弹出图片 --> <view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<l-popup show="{{showPopup}}" animation="{{false}}"> <view class="col con-c">
<view class="popupImage"> <view class="share-content">
<image src="{{popupImage}}"></image> <image src="{{popupImage}}"></image>
</view> </view>
<view class="row con-b"> <view class="share-operation row con-b align-c">
<view class="cancel" bindtap="onCancel"> <button bindtap="onCancel">取消</button>
<text>取消</text> <button bindtap="onDownload">下载图片</button>
</view>
<view class="download" bindtap="onDownload">
<text>下载图片</text>
</view>
</view> </view>
</l-popup> </view>
</view> </view>
\ No newline at end of file
pages/play/point-detail/point-detail.wxss
...@@ -52,35 +52,48 @@ page { ...@@ -52,35 +52,48 @@ page {
width: 750rpx; width: 750rpx;
} }
.describe image:nth-child(1) { .describe-occupy {
position: absolute;
top: 34rpx;
left: 40rpx;
}
.describe-occupy text {
font-size: 54rpx;
color: rgba(0, 0, 0, 0);
}
.describe-occupy image {
width: 40rpx;
height: 40rpx;
margin: 8rpx 0 0 24rpx;
}
.describe-content {
padding: 50rpx 40rpx 0 40rpx;
}
.describe-content image:nth-child(1) {
width: 670rpx; width: 670rpx;
height: 52rpx; height: 52rpx;
margin: 50rpx 0 0 40rpx;
} }
.describe image:nth-child(2) { .describe-content image:nth-child(2) {
width: 670rpx; width: 670rpx;
height: 50rpx; height: 50rpx;
margin: 8rpx 0 0 40rpx; margin-top: 8rpx;
} }
.describe image:nth-child(3) { .describe-content image:nth-child(3) {
width: 670rpx; width: 670rpx;
height: 90rpx; height: 90rpx;
margin: 24rpx 0 0 40rpx; margin-top: 24rpx;
} }
.describe image:nth-child(4) { .describe-content image:nth-child(4) {
width: 670rpx; width: 670rpx;
height: 230rpx; height: 230rpx;
margin: 56rpx 0 40rpx 40rpx; margin: 56rpx 0 40rpx 0;
}
.icon-share {
position: absolute;
top: 55rpx;
left: 274rpx;
width: 40rpx;
height: 40rpx;
} }
/* iphone x 底部颜色填充 */ /* iphone x 底部颜色填充 */
...@@ -94,25 +107,48 @@ page { ...@@ -94,25 +107,48 @@ page {
} }
/* 分享弹窗 */ /* 分享弹窗 */
.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.75);
}
.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;
text-align: center;
line-height: 96rpx;
border-radius: 4rpx; border-radius: 4rpx;
} background: #FFFFFF;
.cancel { text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #15191F; color: #15191F;
background-color: #fff;
} }
.download { .share-operation button:nth-child(2) {
color: #fff; width: 288rpx;
background-color: #15191F; height: 96rpx;
border-radius: 4rpx;
background: #15191F;
text-align: center;
font-size: 30rpx;
font-weight: 500;
line-height: 96rpx;
color: #FFFFFF;
} }
\ No newline at end of file
pages/play/service-detail/service-detail.js
...@@ -652,7 +652,7 @@ Page({ ...@@ -652,7 +652,7 @@ Page({
onLocation: function () { onLocation: function () {
wx.navigateTo({ wx.navigateTo({
url: '/pages/home/guide/guide?id=' + Number(this.data.option.id) url: '/pages/home/guide/guide?id=' + Number(this.data.option.id) + '&card=false'
}) })
}, },
// 缓存商店信息 // 缓存商店信息
...@@ -730,6 +730,7 @@ Page({ ...@@ -730,6 +730,7 @@ Page({
}, },
// 跳转到餐品购物车 // 跳转到餐品购物车
onBuyFood: function () { onBuyFood: function () {
App.setShopInfo(6, 5)
wx.navigateTo({ wx.navigateTo({
url: '/pages/commodity/menu-food/menu-food' url: '/pages/commodity/menu-food/menu-food'
}) })
......
pages/play/service-detail/service-detail.wxss
...@@ -272,7 +272,6 @@ ...@@ -272,7 +272,6 @@
margin-right: 24rpx; margin-right: 24rpx;
padding-bottom: 32rpx; padding-bottom: 32rpx;
border-radius: 4px; border-radius: 4px;
background: #F5F6F8;
} }
.movie-card-item { .movie-card-item {
width: 300rpx; width: 300rpx;
...@@ -285,12 +284,10 @@ ...@@ -285,12 +284,10 @@
.commodity-card-item > image { .commodity-card-item > image {
width: 562rpx; width: 562rpx;
height: 316rpx; height: 316rpx;
background: #999999;
} }
.movie-card-item > image { .movie-card-item > image {
width: 300rpx; width: 300rpx;
height: 369rpx; height: 369rpx;
background: #999999;
} }
.commodity-card-item-title { .commodity-card-item-title {
......
pages/play/service-sell/service-sell.js
...@@ -49,7 +49,7 @@ Page({ ...@@ -49,7 +49,7 @@ Page({
let funcItem = { let funcItem = {
'name': funcResponse.name, 'name': funcResponse.name,
'time': funcResponse.spaMins + 'mins', 'time': funcResponse.spaMins ? funcResponse.spaMins + 'mins' : '',
'address': '元养水韵SPA', 'address': '元养水韵SPA',
'content': funcResponse.particulars, 'content': funcResponse.particulars,
......
pages/play/service-sell/service-sell.wxml
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
<view class="service-name"> <view class="service-name">
<text>{{serviceInfo.name}}</text> <text>{{serviceInfo.name}}</text>
</view> </view>
<view class="time-address-wrapper row align-c"> <view class="time-address-wrapper row align-c" wx:if="{{serviceInfo.time}}">
<view class="service-icon"> <view class="service-icon">
<image src="/image/icon/g-time.png"></image> <image src="/image/icon/g-time.png"></image>
</view> </view>
<view class="time-address-title"> <view class="time-address-title">
<text>时长</text> <text>时长</text>
</view> </view>
<view class="time-address" wx:if="{{serviceInfo.time}}"> <view class="time-address">
<text>{{serviceInfo.time}}</text> <text>{{serviceInfo.time}}</text>
</view> </view>
</view> </view>
......
project.config.json 0 → 100644
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": false,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"compileType": "miniprogram",
"libVersion": "2.10.0",
"appid": "wx37a9b7a3d92029f2",
"projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
"cloudfunctionTemplateRoot": "",
"watchOptions": {
"ignore": []
},
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": [
{
"id": -1,
"name": "pages/commodity/menu-food/menu-food",
"pathName": "pages/commodity/menu-food/menu-food",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/home/home",
"pathName": "pages/play/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/play/service-detail/service-detail",
"pathName": "pages/play/service-detail/service-detail",
"query": "id=1&type=4",
"scene": null
},
{
"id": -1,
"name": "pages/mine/home/home",
"pathName": "pages/mine/home/home",
"query": "",
"scene": null
}
]
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment