Skip to content

严立 / mini-shimao

Go to a project
Commit 746763ca by wjw
Options

Signed-off-by: wjw <364716925@qq.com>

parent afb7e057
Inline Side-by-side
Showing with 373 additions and 99 deletions
image/icon/letter-1.png
image/icon/letter-1.png

990 Bytes | W: | H:

image/icon/letter-1.png

1.35 KB | W: | H:

image/icon/letter-1.png
image/icon/letter-1.png
image/icon/letter-1.png
image/icon/letter-1.png
  • 2-up
  • Swipe
  • Onion skin
image/icon/service-1.png
image/icon/service-1.png

1.13 KB | W: | H:

image/icon/service-1.png

1.29 KB | W: | H:

image/icon/service-1.png
image/icon/service-1.png
image/icon/service-1.png
image/icon/service-1.png
  • 2-up
  • Swipe
  • Onion skin
image/icon/wechat-1.png
image/icon/wechat-1.png

1.58 KB | W: | H:

image/icon/wechat-1.png

2.08 KB | W: | H:

image/icon/wechat-1.png
image/icon/wechat-1.png
image/icon/wechat-1.png
image/icon/wechat-1.png
  • 2-up
  • Swipe
  • Onion skin
pages/campsite/home/home.js
......@@ -11,6 +11,22 @@ Page({
imageBase: App.globalData.appImageBase,
appResourcesBase: App.globalData.appResourcesBase,
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '',
color: 'rgba(255, 255, 255, 0)',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '',
color: '#000000',
background: 'rgba(246, 218, 218, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
showPopup: false,
winSide: true,
sideHeight: 1250,
......@@ -141,6 +157,10 @@ Page({
})
}
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
......
pages/campsite/home/home.wxml
<navigation class="navigation" titleText="营地" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container">
<!-- <view class="appointment">
<l-button l-class="appointment-button" bind:lintap="onServic">电话预约</l-button>
......
pages/campsite/home/home.wxss
......@@ -48,6 +48,7 @@
}
.container > image {
display: block;
width: 750rpx;
}
......
pages/commodity/home/home.js
const App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({
data: {
appStatus: App.globalData.appStatus,
......@@ -22,6 +27,22 @@ Page({
shopRecommendD: [], // 底部第二商店推荐
banner: [],
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '',
color: 'rgba(255, 255, 255, 0)',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
},
onLoad: function (option) {
......@@ -487,4 +508,20 @@ Page({
hotline: false,
})
},
onPageScroll: function(funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function() {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
})
\ No newline at end of file
pages/commodity/home/home.wxml
<navigation class="navigation"></navigation>
<navigation class="navigation" titleText="服务" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container">
<block wx:if="{{!appStatus}}">
......
pages/commodity/menu-food/menu-food.wxss
......@@ -40,7 +40,7 @@ page {
.menu-list {
width: 590rpx;
height: 100vh;
padding: 0 28rpx 80rpx 32rpx;
padding: 0 28rpx 0rpx 32rpx;
overflow-y: scroll;
background: #FFFFFF;
}
......@@ -50,8 +50,8 @@ page {
}
.menu-list-title {
height: 100rpx;
padding: 32rpx 0;
/* height: 100rpx; */
padding: 0 0 32rpx 0;
font-size: 26rpx;
color: #959da9;
}
......@@ -88,7 +88,7 @@ page {
.commodity-item {
width: 100%;
min-height: 250rpx;
padding-bottom: 58rpx;
padding-bottom: 48rpx;
box-sizing: border-box;
}
......
pages/commodity/shopping-cart/shopping-cart.js
......@@ -17,7 +17,7 @@ Page({
amountDiscount: 0, // 优惠金额
winToast: false,
isIphoneX: '', //判断是否为iphonex
sideBarTopPadding: 0,
......@@ -80,7 +80,8 @@ Page({
this.setShopInfo()
this.setData({
shoppingCart: wx.getStorageSync('shoppingCartBuffer'),
sideBarTopPadding: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight')
sideBarTopPadding: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight'),
isIphoneX: wx.getSystemInfoSync().model.indexOf("iPhone X")
})
this.selectionTotal()
......
pages/commodity/shopping-cart/shopping-cart.wxml
......@@ -84,11 +84,11 @@
<!-- 只有在食品购物车才出现 -->
<view class="pay-tip row align-c" wx:if="{{shopInfo.shopType === 5}}">
<image src="{{imageBase + 'icon/warning-4.png'}}"></image>
<image src="{{imageBase + 'fail-glod.png'}}"></image>
<text>请在下单3天内取餐，逾期无效</text>
</view>
<view class="pay row con-c align-c">
<view class="pay row con-c align-c" style="padding-bottom:{{isIphoneX >=0?36:0}}rpx;">
<!-- 选择计数 -->
<view class="pay-selection row con-c align-c">
<l-checkbox-group l-class="list-item-selection" bind:linchange="onSelectionAll">
......
pages/commodity/shopping-cart/shopping-cart.wxss
......@@ -208,7 +208,7 @@
bottom: 0;
width: 750rpx;
height: 200rpx;
padding: 0 40rpx 36rpx 36rpx;
padding: 0 40rpx 0rpx 36rpx;
border-top: 1px solid #E2E7EF;
background: #FFFFFF;
}
......
pages/home/night-appointment/night-appointment.js
const App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({
data: {
imageBase: App.globalData.appImageBase,
......@@ -24,7 +29,23 @@ Page({
// 预约入园剩余名额
total: 0,
frompage: '',
optionsTab: ''
optionsTab: '',
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/icon/arrow-l-2.png',
color: '#FFFFFF',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/icon/arrow-l-1.png',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
},
onLoad: function (options) {
......@@ -299,5 +320,20 @@ Page({
console.log(d) //格式为---Sat Feb 16 2019 08:00:00 GMT+0800 (中国标准时间)
return App.modular.miment(new Date(d)).format("YYYY-MM-DD") //格式为"2019-02-16 00:00:00"
},
onPageScroll: function(funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function() {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
})
\ No newline at end of file
pages/home/night-appointment/night-appointment.wxml
<l-toast l-image-class="toast-image"></l-toast>
<!-- 首页 - 入园预约 / 房屋预约 -->
<navigation class="navigation" titleText="夜间入园预约" color="#FFFFFF" backIcon="{{'../../image/icon/arrow-l-2.png'}}"></navigation>
<navigation class="navigation" titleText="夜间入园预约" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
<view class="appointment-complete-tip">
......
pages/mine/accumulate/accumulate.js
let App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({
data: {
imageResourcesBase: App.globalData.appResourcesBase,
......@@ -27,6 +32,22 @@ Page({
type: '',
accumulateListHeight: 0,
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back-w.png',
color: '#FFFFFF',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/back.png',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
},
onLoad: function(options) {
......@@ -75,7 +96,7 @@ Page({
// 显示菜单
onShowMenu: function() {
this.setData({
showMenu: true
showMenu: !this.data.showMenu
})
},
......@@ -110,5 +131,21 @@ Page({
})
this.onHideMenu()
this.getAccumulate()
}
},
onPageScroll: function(funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function() {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
})
\ No newline at end of file
pages/mine/accumulate/accumulate.wxml
<navigation class="navigation" titleText="我的积分" color="#FFFFFF" backIcon="/image/back-w.png"></navigation>
<navigation class="navigation" titleText="我的积分" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container con-s" bindtap="onHideMenu">
<!-- 积分背景图 -->
......@@ -15,7 +15,8 @@
<view class="banner-menu row con-b align-c" catchtap="onShowMenu">
<text>{{menu}}</text>
<image src="/image/icon/arrow-b-2.png"></image>
<image wx:if="{{showMenu}}" src="/image/icon/arrow-t-2.png"></image>
<image wx:if="{{!showMenu}}" src="/image/icon/arrow-b-2.png"></image>
<view class="banner-menu-down col" wx:if="{{showMenu}}">
<block wx:for="{{menuList}}" wx:key="id">
<text class="{{menu === item.name ? 'selected' : ''}}" data-type="{{item.id}}" catchtap="onTabMenu"
......@@ -35,8 +36,8 @@
<view class="accumulate row con-b align-c">
<view class="accumulate-left col con-b">
<view class="accumulate-type">
<text wx:if="item.type === '0'">获取</text>
<text wx:else>消费</text>
<text wx:if="item.type === '0'">消费</text>
<text wx:else>已使用</text>
</view>
<view class="accumulate-time">
<text>{{item.createDate}}</text>
......
pages/mine/accumulate/accumulate.wxss
......@@ -4,7 +4,7 @@ page {
.container {
position: relative;
height: 100vh;
min-height: 100vh;
}
.banner {
......
pages/mine/appointment-ticket/appointment-ticket.wxss
......@@ -8,6 +8,7 @@
}
.bgcImg {
display: block;
width: 100%;
height: 316rpx;
}
......
pages/mine/card/card.js
......@@ -93,6 +93,7 @@ Page({
let shopFilter = that.data.shopConfig.filter(k => {
return k.name.toLowerCase() == item.officeName.toLowerCase()
})
item.expireTime = item.expireTime.replace(/-/g, '.')
if (item.name.indexOf('年卡') != -1) {
item.cardType = 1
} else if (item.name.indexOf('月卡') != -1) {
......
pages/mine/card/card.wxml
......@@ -169,9 +169,7 @@
</swiper>
<!-- 底部logo -->
<view class="footer-logo" style="margin-top: {{marginTop + 'rpx'}}">
<block>
<image src="{{imageResourcesBase +'mine/card/card-footer.png'}}"></image>
</block>
</view>
<view class="cloud-left">
<image src="{{imageResourcesBase +'mine/card/cloud-1.png'}}"></image>
......
pages/mine/card/card.wxss
......@@ -128,6 +128,10 @@
margin-top: 32rpx;
}
.look-order text {
font-size: 26rpx;
}
.look-order image {
margin-left: 8rpx;
width: 32rpx;
......@@ -142,13 +146,15 @@ image {
.bottom-img {
position: absolute;
right: -16rpx;
bottom: -5rpx;
bottom: -1rpx;
}
.bottom-month {
display: block;
width: 180rpx;
height: 106rpx;
}
.bottom-year {
display: block;
width: 114rpx;
height: 128rpx;
}
......@@ -159,6 +165,7 @@ image {
}
.footer-logo image {
display: block;
width: 620rpx;
height: 316rpx;
}
......
pages/mine/home/home.js
......@@ -55,12 +55,7 @@ Page({
orderList: []
}
},
appointmentList: [{
time: '8月15日-7月15日 10:00-12:00',
img: '',
title: '日落观光游船体验活动之船行碧波共赏美景',
num: 3
}],
appointmentList: [],
orderListBackup: [],
integral: 0, //积分
shopConfig: App.globalData.shopId,
......@@ -245,6 +240,7 @@ Page({
return k.name.toLowerCase() == item.officeName.toLowerCase()
})
item.expireTime = item.expireTime.replace(/-/g, '.')
if (item.name.indexOf('年卡') != -1) {
item.cardType = 1
......@@ -350,6 +346,7 @@ Page({
this.getIntegral()
this.getCountByGoodType()
this.getCountEnrollSubscribe()
// this.getList()
},
})
} else {
......@@ -372,7 +369,7 @@ Page({
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '300rpx',
scroll: '200rpx',
}
this.setData({
navigationStyle: funcNavigation
......
pages/mine/home/home.wxml
......@@ -144,8 +144,8 @@
<image wx:elif="{{myOrder.passOrder[0].cardType==2}}" class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image>
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-one {{myOrder.passOrder[0].cardType==1 ? '' : 'bg-one-month'}}" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two {{myOrder.passOrder[0].cardType==1 ? '' : 'bg-two-month'}}" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ myOrder.passOrder[0].logo}}"></image>
......
pages/mine/home/home.wxss
......@@ -104,7 +104,7 @@
.integral-num {
font-size: 54rpx;
line-height: 76rpx;
line-height: 66rpx;
padding-right: 80rpx;
font-weight: 600;
}
......@@ -198,7 +198,7 @@
}
.status-operation {
width: 176rpx;
width: 110rpx;
height: 52rpx;
border-radius: 4rpx;
/* border: 1px solid rgba(72, 53, 34, 1) !important; */
......@@ -486,7 +486,7 @@
}
.more-wrapper {
padding-top: 16rpx;
padding-top: 44rpx;
}
.pass-wrapper {
......@@ -520,6 +520,10 @@
border-radius: 4rpx 4rpx 0 0;
}
.bg-one-month {
background: rgba(142, 185, 231, 0.5);
}
.pass-bg-two {
position: absolute;
left: 0;
......@@ -528,18 +532,20 @@
width: 542rpx;
height: 16rpx;
margin: 0 auto;
background-color: blue;
background: rgba(247, 179, 197, 0.3);
border-radius: 4rpx 4rpx 0 0;
}
.bg-two-month {
background: rgba(142, 185, 231, 0.3);
}
.pass-logo-wrapper {
height: 50rpx;
}
.pass-logo-wrapper text {
height: 50rpx;
margin-left: 20rpx;
font-size: 26rpx;
line-height: 50rpx;
}
......@@ -581,7 +587,6 @@
.goods-logo-wrapper text {
height: 100rpx;
margin-left: 20rpx;
font-size: 26rpx;
color: #15191f;
line-height: 100rpx;
......@@ -739,9 +744,8 @@ image {
}
.logo-box {
width: 100rpx;
height: 80rpx;
line-height: 80rpx;
width: 64rpx;
height: 50rpx;
text-align: center;
margin-right: 20rpx;
}
......
pages/mine/question-more/question-more.wxml
......@@ -5,7 +5,7 @@
<block wx:if="{{checkInProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./image/Icon／24pt／Service@2x.png"></image>
<image class="icon-img" src="./image/bag.png"></image>
</view>
<view class="title">入住问题</view>
</view>
......@@ -33,7 +33,7 @@
<block wx:if="{{ticketsProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./image/Icon／24pt／Ticket@2x.png"></image>
<image class="icon-img" src="./image/ticket.png"></image>
</view>
<view class="title">门票问题</view>
</view>
......@@ -59,7 +59,7 @@
<block wx:if="{{serviceProblems.length > 0}}">
<view class="row align-c">
<view class="icon">
<image class="icon-img" src="./image/Icon／24pt／Ticket@2x.png"></image>
<image class="icon-img" src="./image/service.png"></image>
</view>
<view class="title">服务问题</view>
</view>
......
pages/mine/question/question.js
const App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({
data: {
imageBase: App.globalData.appImageBase,
......@@ -29,6 +34,22 @@ Page({
focus: false,
remark: '',
isIphoneX: '', //判断是否为iphonex
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back-w.png',
color: '#FFFFFF',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/icon/arrow-l-1.png',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
},
//获取焦点的时候
linfocus(e) {
......@@ -220,6 +241,21 @@ Page({
})
}
})
}
},
onPageScroll: function(funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function() {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
})
\ No newline at end of file
pages/mine/question/question.wxml
<l-toast l-image-class="toast-image"></l-toast>
<navigation class="navigation" titleText="{{title}}" backIcon="/image/back-w.png" color="#ffffff"></navigation>
<navigation class="navigation" titleText="{{title}}" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view style="height:{{height}}px;background-color:white;">
<image class="banner-img" src="http://upload.miaomiao-bao.com/70161202008161703131621.jpg"></image>
<view class="customer-body">
......
pages/mine/question/question.wxss
......@@ -38,6 +38,7 @@
.customer-body-title {
font-size: 46rpx;
font-weight: 600;
}
.circle {
......@@ -67,6 +68,7 @@
width: 48rpx;
height: 48rpx;
margin-top: 14rpx;
margin-bottom: 2rpx;
}
.mask-content {
......
pages/pay/order-detail/order-detail.wxml
......@@ -8,7 +8,9 @@
<text>订单待付款</text>
</view>
<view class="state-content-tip row">
<text>请在 {{residuePayTime}} 内付款，否则将自动取消订单</text>
<text decode>请在&nbsp;</text>
<text>{{residuePayTime}}</text>
<text decode>&nbsp;内付款，否则将自动取消订单</text>
</view>
</view>
......@@ -280,7 +282,7 @@
</view>
<!-- 多张 扫码弹窗 -->
<l-popup show="{{showCodePopup}}" l-class="l-popup-bg">
<l-popup show="{{showCodePopup}}" l-class="l-popup-bg" animation="{{false}}">
<view class="scan-code-wrapper col align-c">
<view class="code-header" wx:if="{{orderInfo.commodityType === 5}}">{{codeList.length}}件餐品可用</view>
<view class="code-header" wx:if="{{orderInfo.commodityType === 4}}">{{codeList.length}}件商品可用</view>
......
pages/pay/order-detail/order-detail.wxss
......@@ -32,7 +32,8 @@
margin-top: 24rpx;
}
.state-content-tip text {
.state-content-tip text:nth-child(1),
.state-content-tip text:nth-child(3) {
height: 36rpx;
font-size: 26rpx;
font-weight: 400;
......@@ -40,6 +41,15 @@
color: #15191f;
}
.state-content-tip text:nth-child(2) {
height: 36rpx;
font-size: 26rpx;
font-weight: 600;
line-height: 36rpx;
color: #15191f;
}
/* 订单信息 */
.info {
......
pages/pay/order-input/order-input.js
......@@ -91,6 +91,8 @@ Page({
stockList: [],
winStockTip: false,
isIphoneX: '', //判断是否为iphonex
},
onLoad: function (options) {
......@@ -115,7 +117,8 @@ Page({
*/
setView: function () {
this.setData({
registerInfo: [JSON.parse(JSON.stringify(logicData.registerInfoItem))]
registerInfo: [JSON.parse(JSON.stringify(logicData.registerInfoItem))],
isIphoneX: wx.getSystemInfoSync().model.indexOf("iPhone X")
})
switch (logicData.option.type) {
......
pages/pay/order-input/order-input.wxml
......@@ -9,7 +9,11 @@
<view class="buy-content-pass-content col con-b">
<view class="col">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<text class="pass-content-price">{{'¥' + shoppingCartList[0].priceFinal + '/人'}}</text>
<view class="row">
<text class="pass-content-symbol">¥</text>
<text class="pass-content-price">{{shoppingCartList[0].priceFinal}}</text>
<text class="pass-content-unit">/人</text>
</view>
</view>
<view class="col">
<view class="row align-c">
......@@ -30,7 +34,7 @@
<image src="{{resourcesBase + shopInfo.cover}}"></image>
</view>
<view class="buy-content-service-info col con-b">
<text>{{buyContentTitle}}</text>
<text class="row align-c">{{buyContentTitle}}</text>
<text>{{'¥' + buyContentAmount}}</text>
</view>
</view>
......@@ -41,16 +45,20 @@
<view class="buy-content-pass-content col con-b">
<view class="col">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<text class="pass-content-price">{{'¥' + shoppingCartList[0].priceFinal + '/人'}}</text>
<view class="row">
<text class="pass-content-symbol">¥</text>
<text class="pass-content-price">{{shoppingCartList[0].priceFinal}}</text>
<text class="pass-content-unit">/人</text>
</view>
</view>
<view class="col">
<view class="row align-c">
<text class="pass-content-tip">{{'使用次数　'}}</text>
<text class="pass-content-tip">{{'1次'}}</text>
<text class="pass-content-tip-right">{{'1次'}}</text>
</view>
<view class="row align-c">
<text class="pass-content-tip">{{'有效期　'}}</text>
<text class="pass-content-tip">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
<text class="pass-content-tip-right">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
</view>
</view>
</view>
......@@ -87,7 +95,7 @@
</view>
</view>
<view class="buy-content-art-tip row align-c">
<image src="{{imageBase + 'fail-icon-4.png'}}"></image>
<image src="{{imageBase + 'fail-glod.png'}}"></image>
<text>请在下单3天内取餐，逾期失效</text>
</view>
</view>
......@@ -97,7 +105,7 @@
<!-- <image src="{{resourcesBase + shopInfo.cover}}"></image> -->
<image src="{{buyContentCover}}"></image>
<view class="buy-content-activity-info col con-b">
<view class="title">
<view class="title row align-c">
<text>{{buyContentTitle}}</text>
</view>
<view class="time">
......@@ -113,7 +121,7 @@
<view class="buy-content-activity row align-c" wx:if="{{orderType === 7}}">
<image src="{{shoppingCartList[0].cover}}"></image>
<view class="buy-content-activity-info col con-b">
<view class="title">
<view class="title row align-c">
<text>{{buyContentTitle}}</text>
</view>
<view class="time">
......@@ -141,14 +149,20 @@
<text>{{item.name}}</text>
</view>
<view class="shopping-cart-item-info col">
<text>{{'¥' + item.priceFinal}}</text>
<view class="row con-e">
<text>￥</text>
<text>{{item.priceFinal}}</text>
</view>
<text>{{'x' + item.quantity}}</text>
</view>
</view>
</block>
<view class="shopping-cart-total row con-b align-c">
<text>总计</text>
<text>{{'¥' + payAmount}}</text>
<view>
<text>￥</text>
<text>{{payAmount}}</text>
</view>
</view>
</view>
</view>
......@@ -255,7 +269,7 @@
<text>填写贵宾信息</text>
</view>
<view class="register-tip row align-c">
<image src="{{imageBase + 'fail-icon-4.png'}}"></image>
<image src="{{imageBase + 'fail-glod.png'}}"></image>
<text>凭月卡入园需出示身份证信息</text>
</view>
......@@ -290,13 +304,16 @@
</view>
<!-- winButtonPay -->
<cover-view class="pay" wx:if="{{winButtonPay && !winNoticeDetail && !winStockTip && !winActivityResult}}">
<cover-view class="pay" style="padding-bottom:{{isIphoneX >=0?36:0}}rpx;" wx:if="{{winButtonPay && !winNoticeDetail && !winStockTip && !winActivityResult}}">
<cover-view class="pay-tip row align-c">
<cover-image src="{{imageBase + 'fail-icon-4.png'}}"></cover-image>
<cover-image src="{{imageBase + 'fail-glod.png'}}"></cover-image>
<cover-view class="pay-tip-text row con-c align-c">付款后一经确认不得退款</cover-view>
</cover-view>
<cover-view class="pay-operation row con-b align-c">
<cover-view class="pay-operation-amount row align-c">{{'¥' + payAmount}}</cover-view>
<cover-view class="row align-c">
<cover-view class="pay-operation-amount-symbol">￥</cover-view>
<cover-view class="pay-operation-amount">{{payAmount}}</cover-view>
</cover-view>
<cover-view class="pay-operation-confirm row con-c align-c" bindtap="onPaySubmit">立即支付</cover-view>
</cover-view>
</cover-view>
......
pages/pay/order-input/order-input.wxss
......@@ -16,7 +16,7 @@
width: 750rpx;
height: 70%;
padding: 130rpx 40rpx 50rpx 40rpx;
border-radius: 24px 24px 0px 0px;
border-radius: 24rpx 24rpx 0rpx 0rpx;
background: #FFFFFF;
}
......@@ -76,16 +76,37 @@
.pass-content-title {
height: 58rpx;
font-size: 42rpx;
font-weight: 500;
font-weight: 600;
line-height: 58rpx;
color: #FFFFFF;
}
.pass-content-price {
display: inline-block;
height: 58rpx;
margin-top: 8rpx;
font-size: 42rpx;
font-weight: 600;
line-height: 36rpx;
color: #FFFFFF;
}
.pass-content-symbol {
height: 58rpx;
margin-top: 14rpx;
margin-right: 4rpx;
font-size: 26rpx;
font-weight: 500;
font-weight: 600;
line-height: 36rpx;
color: #FFFFFF;
}
.pass-content-unit {
height: 58rpx;
margin-top: 12rpx;
margin-left: 4rpx;
font-size: 26rpx;
font-weight: 600;
line-height: 36rpx;
color: #FFFFFF;
}
......@@ -99,6 +120,16 @@
color: #FFFFFF;
}
.pass-content-tip-right {
height: 32rpx;
margin-top: 8rpx;
font-size: 22rpx;
font-weight: 400;
line-height: 32rpx;
color: #FFFFFF;
opacity: .9;
}
/* 购买内容 - service */
.buy-content-service {
width: 670rpx;
......@@ -123,9 +154,9 @@
}
.buy-content-service-info text:nth-child(1) {
height: 42rpx;
height: 84rpx;
font-size: 30rpx;
font-weight: 800;
font-weight: 600;
line-height: 42rpx;
color: #15191F;
}
......@@ -134,7 +165,7 @@
height: 42rpx;
font-size: 30rpx;
font-weight: 800;
line-height: 32rpx;
line-height: 52rpx;
color: #5DB5DD;
}
......@@ -229,9 +260,10 @@
}
.buy-content-activity-info .title {
height: 84rpx;
width: 424rpx;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 42rpx;
color: #15191F;
}
......@@ -239,7 +271,6 @@
.buy-content-activity-info .time {
width: 424rpx;
height: 36rpx;
margin-top: 16rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
......@@ -296,7 +327,7 @@
height: 108rpx;
margin-left: 24rpx;
font-size: 26rpx;
font-weight: 500;
font-weight: 600;
line-height: 40rpx;
color: #15191F;
}
......@@ -306,12 +337,23 @@
height: 108rpx;
}
.shopping-cart-item-info text:nth-child(1) {
.shopping-cart-item-info view text:nth-child(1) {
height: 36rpx;
margin-top: 4rpx;
margin-right: 2rpx;
text-align: right;
font-size: 22rpx;
font-weight: 600;
line-height: 32rpx;
color: #15191F;
}
.shopping-cart-item-info view text:nth-child(2) {
height: 36rpx;
margin-top: 4rpx;
text-align: right;
font-size: 26rpx;
font-weight: 500;
font-weight: 600;
line-height: 32rpx;
color: #15191F;
}
......@@ -338,14 +380,22 @@
color: #959DA9;
}
.shopping-cart-total text:nth-child(2) {
.shopping-cart-total view text:nth-child(1) {
font-size: 22rpx;
font-weight: 600;
line-height: 32rpx;
color: #5DB5DD;
}
.shopping-cart-total view text:nth-child(2) {
font-size: 32rpx;
font-weight: 500;
font-weight: 600;
line-height: 32rpx;
color: #5DB5DD;
}
/* 购买须知 / 报名须知 / 预约须知 */
.buy-notice {
width: 670rpx;
......@@ -572,7 +622,7 @@
.register-item-title {
height: 42rpx;
margin-top: 40rpx;
margin-top: 48rpx;
font-size: 30rpx;
font-weight: 800;
line-height: 42rpx;
......@@ -587,7 +637,6 @@
left: 0;
width: 100%;
margin-top: 40rpx;
padding-bottom: 36rpx;
background: #FFFFFF;
}
......@@ -619,16 +668,20 @@
padding: 32rpx 40rpx;
}
.pay-operation-amount {
width: 442rpx;
.pay-operation-amount-symbol{
height: 58rpx;
background: rgba(0, 0, 0, 0);
font-size: 34rpx;
font-weight: 800;
line-height: 48rpx;
color: #5DB5DD;
}
.pay-operation-amount {
height: 58rpx;
font-size: 42rpx;
font-weight: 800;
line-height: 48rpx;
color: #5DB5DD;
}
.pay-operation-confirm {
width: 248rpx;
......@@ -638,7 +691,7 @@
text-align: center;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 96rpx;
color: #FFFFFF;
}
......
pages/pay/order-state/order-state.wxss
......@@ -23,7 +23,7 @@
.content-state-message text {
height: 64rpx;
font-size: 46rpx;
font-weight: 500;
font-weight: 600;
line-height: 64rpx;
color: #15191F;
}
......@@ -34,8 +34,9 @@
.content-state-amount text:nth-child(1) {
height: 42rpx;
margin-right: 6rpx;
font-size: 22rpx;
font-weight: 500;
font-weight: 600;
line-height: 32rpx;
color: #959DA9;
}
......@@ -43,7 +44,7 @@
.content-state-amount text:nth-child(2) {
height: 42rpx;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 32rpx;
color: #959DA9;
}
......@@ -56,7 +57,7 @@
background: #FFFFFF;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 42rpx;
color: #86C5E1;
}
......@@ -69,7 +70,7 @@
border-radius: 4rpx;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 42rpx;
color: #FFFFFF;
}
\ No newline at end of file
pages/play/home/home.wxss
......@@ -126,7 +126,7 @@
.item-nothing {
width: 670rpx;
height: 544rpx;
height: 478rpx;
}
.item-nothing text {
......
pages/play/movie/movie.js
......@@ -7,6 +7,7 @@ let logicData = {
Page({
data: {
resourcesBase: App.globalData.appResourcesBase,
// 请求参数
queryParams: {
pageNo: '1',
......
pages/play/movie/movie.wxml
......@@ -12,7 +12,7 @@
</view>
<view wx:if="{{statusActive === 0}}">
<block wx:for="{{movieToday}}" wx:key="{{index}}" wx:if="{{movieToday.length !== 0}}">
<block wx:for="{{movieToday}}" wx:key="index" wx:if="{{movieToday.length !== 0}}">
<view class="movie-wrapper row" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}">
<view class="movie-time-wrapper row align-c">
<view class="movie-time-start">
......@@ -82,7 +82,7 @@
<block wx:if="{{movieToday.length === 0 && !loading}}">
<view class="show-end col align-c">
<image src="/image/no-movie.png"></image>
<image src="{{resourcesBase + 'play/no-movie.png'}}"></image>
<text>观影已结束，请期待后续排片</text>
</view>
</block>
......@@ -157,7 +157,7 @@
</block>
<block wx:if="{{movieAll.movieWeek.list.length === 0 && movieAll.movieNextWeek.list.length === 0 && !loading}}">
<view class="show-end col align-c">
<image src="/image/no-movie.png"></image>
<image src="{{resourcesBase + 'play/no-movie.png'}}"></image>
<text>观影已结束，请期待后续排片</text>
</view>
</block>
......
pages/play/service-detail/service-detail.js
......@@ -55,7 +55,7 @@ Page({
banner: [],
bannerIndex: 0,
bannerHeight: 300,
movieHeight: 1180,
movieHeight: 1064,
info: {},
shopInfo: {},
......@@ -111,7 +111,7 @@ Page({
break
case 2:
this.queryMovie()
// this.queryMovie()
this.setData({
navigationStyle: this.data.navigationStyleBlack,
cssDetail: 'padding-bottom: 0;',
......@@ -548,7 +548,7 @@ Page({
funcList.push(funcItem)
}
let movieHeight = 1180
let movieHeight = 1064
if (funcList.length > 0) {
movieHeight = 1380
}
......
pages/play/service-detail/service-detail.wxml
......@@ -372,7 +372,7 @@
<view class="movie-card-last-item col" wx:if="{{detailCommodity.length > 2}}"></view>
<block wx:if="{{detailCommodity.length === 0}}">
<view class="commodity-card-item-nothing col con-c align-c">
<image class="nothing-movie" src="{{imageBase + 'no-movie.png'}}"></image>
<image class="nothing-movie" src="{{resourcesBase + 'play/no-movie-2.png'}}"></image>
<text>暂无影片，请期待后续排片</text>
</view>
</block>
......
pages/play/service-detail/service-detail.wxss
......@@ -266,7 +266,7 @@
.commodity-card-item-nothing {
width: 670rpx;
height: 544rpx;
height: 380rpx;
}
.commodity-card-item-nothing text {
......@@ -519,7 +519,7 @@
background: #86c5e1;
color: #fff;
font-size: 26rpx;
font-weight: 500;
font-weight: 600;
line-height: 36rpx;
}
......@@ -531,7 +531,7 @@
background: #595967;
color: #fff;
font-size: 26rpx;
font-weight: 500;
font-weight: 600;
line-height: 36rpx;
}
......
pages/play/service-sell/service-sell.wxss
......@@ -151,6 +151,7 @@
height: 96rpx;
color: #fff;
font-size: 30rpx;
font-weight: 600;
line-height: 96rpx;
text-align: center;
background-color: #86c5e1;
......
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