Commit 6e722213 by 严立

LL - 确认订单 UI

parents 09bb006f be976f6f
Showing with 580 additions and 310 deletions
{
"pages": [
"pages/pay/order-input/order-input",
"pages/home/home/home",
"pages/home/dynamic/dynamic",
......@@ -43,7 +43,7 @@
"pages/mine/question-more/question-more",
"pages/pay/home/home",
"pages/pay/order-input/order-input",
"pages/pay/order-detail/order-detail",
"pages/pay/coupon/coupon",
"pages/pay/coupon-input/coupon-input",
......@@ -71,7 +71,8 @@
"l-collapse": "../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "../miniprogram_npm/lin-ui/textarea/index",
"l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index"
"l-notice-bar": "../miniprogram_npm/lin-ui/notice-bar/index",
"l-popup": "./miniprogram_npm/lin-ui/popup/index"
},
"window": {
"navigationStyle": "custom",
......
<view class="tips">
<view class="tips-img"><image src="../../assets/icon_wraning.png" mode="widthFix"></image></view>
<view class="tips-img"><image src="/image/fail-glod.png" mode="widthFix"></image></view>
<view class="tips-text">{{text}}</view>
</view>
image/cart.png

844 Bytes

......@@ -17,7 +17,7 @@ Page({
goods_num: 1,
store_num: 1,
checked: true,
img: '/assets/logo.png'
img: './image/item01.png'
},
{
goods_id: 1,
......@@ -28,7 +28,7 @@ Page({
goods_num: 1,
store_num: 2,
checked: true,
img: '/assets/logo.png'
img: './image/item01.png'
},
{
goods_id: 2,
......@@ -36,7 +36,7 @@ Page({
goods_now_price: 30.00,
goods_num: 2,
checked: true,
img: '/assets/logo.png'
img: './image/item01.png'
},
{
goods_id: 3,
......@@ -44,18 +44,18 @@ Page({
goods_now_price: 78,
goods_num: 12,
checked: false,
img: '/assets/logo.png'
img: './image/item01.png'
}
],
notEnough: [
{
id: 0,
img: '../../assets/enough01.png',
img: './image/item01.png',
title: '葱爆牛肉佐秘制麻椒汁'
},
{
id: 1,
img: '../../assets/enough01.png',
img: './image/item01.png',
title: '抹茶酸奶芝士'
}
]
......
{
"usingComponents": {
"Tips": "../../components/Tips/Tips",
"Blank": "../../components/Blank/Blank"
"Tips": "../../../component/Tips/Tips",
"Blank": "../../../component/Blank/Blank"
},
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "购物车"
}
\ No newline at end of file
<view class="header row align-c">
<view class="header_img">
<image mode="aspectFill" src="/assets/logo.png" />
<image mode="aspectFill" src="./image/item01.png" />
</view>
<view class="header_title">儿童营地</view>
<view class="header_clear row align-c" bindtap="handleClearCart">清空</view>
......@@ -88,7 +88,7 @@
</view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close">
<image mode="widthFix" src="../../assets/icon_close.png"></image>
<image mode="widthFix" src="../../../image/icon_close.png"></image>
</view>
</view>
</l-popup>
......
......@@ -57,7 +57,7 @@ Page({
goods_now_text: '业主价',
goods_num: 1,
checked: true,
img: '/assets/item01.png'
img: './image/cola.png'
},
{
goods_id: 1,
......@@ -68,7 +68,7 @@ Page({
goods_now_text: '活动价',
goods_num: 1,
checked: true,
img: '/assets/item01.png'
img: './image/cola.png'
},
{
goods_id: 2,
......@@ -76,7 +76,7 @@ Page({
goods_now_price: 30.00,
goods_num: 2,
checked: true,
img: '/assets/item01.png'
img: './image/cola.png'
},
{
goods_id: 3,
......@@ -85,7 +85,7 @@ Page({
goods_now_price: 78,
goods_num: 12,
checked: false,
img: '/assets/item01.png'
img: './image/cola.png'
}
],
popupObj: {
......@@ -123,7 +123,7 @@ Page({
},
goToCart() {
wx.navigateTo({
url: '/pages/cart/index',
url: '/pages/commodity/shopping-cart/shopping-cart',
})
}
})
\ No newline at end of file
{
"usingComponents": {
"Blank": "../../components/Blank/Blank"
"Blank": "../../../component/Blank/Blank"
},
"navigationBarTitleText": "原味书食"
"navigationBarTitleText": "购物车",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
}
\ No newline at end of file
......@@ -38,7 +38,7 @@
</view>
<view class="goods_add_btn_wrap row con-e" bindtap="handleAddCartPopup">
<l-button l-class="l-btn-circle" height="44" width="44" bg-color="#86C5E1" bind="handleAddCartPopup">
<image mode="widthFix" src="../../assets/icon_add2.png"></image>
<image mode="widthFix" src="/image/add-w.png"></image>
</l-button>
</view>
</view>
......@@ -49,7 +49,7 @@
<view class="cart_btn row con-c align-c" bindtap="goToCart">
<view class="cart_num row con-c align-c">{{cart.length}}</view>
<view class="cart_img_wrap">
<image src="../../assets/icon_cart.png" mode="widthFix"></image>
<image src="../../../image/cart.png" mode="widthFix"></image>
</view>
</view>
<navigator url="/pages/orderDetail/index">订单详情</navigator>
......@@ -58,7 +58,7 @@
<l-popup show="{{showPopup}}" content-align="center" locked="{{true}}">
<view class="popup_wrap">
<view class="popup_img_wrapper">
<image mode="widthFix" src="../../assets/popup.png"></image>
<image mode="widthFix" src="./image/popup.png"></image>
</view>
<view class="popup_info_wrapper">
<view class="popuo_info_title">咖喱蔬菜大虾</view>
......@@ -75,12 +75,12 @@
</view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close">
<image mode="widthFix" src="../../assets/icon_close.png"></image>
<image mode="widthFix" src="../../../image/icon_close.png"></image>
</view>
</view>
</l-popup>
<!-- 添加成功 -->
<l-toast show="{{true}}" duration="100000" l-class="toast_bg" icon="success" icon-color="#fff" title="添加购物车成功" />
<l-toast show="{{showAddSucc}}" l-image-class="toast-image" l-class="toast_bg" image="/image/success.png" title="添加购物车成功" />
</view>
</view>
<Blank></Blank>
......@@ -238,6 +238,9 @@ Page {
min-width: 262rpx !important;
min-height: 262prx !important;
}
.toast-image {
}
image {
width: 100%;
......
......@@ -263,7 +263,7 @@ Page({
})
}
// 游客攻略瀑布列表
wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => {})
// wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => {})
} else {
......@@ -318,4 +318,9 @@ Page({
})
},
onTest: function (event) {
wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=' + event.currentTarget.dataset.index + '&passType=1'
})
},
})
\ No newline at end of file
......@@ -65,7 +65,7 @@
</view>
<!-- 游客攻略 -->
<block wx:if="{{strategyOriginList.length > 0}}">
<!-- <block wx:if="{{strategyOriginList.length > 0}}">
<view class="strategy detail-item" bindtap="onFirstStrategyDetail">
<image src="./image/title-strategy.png"></image>
<view class="strategy-content">
......@@ -78,7 +78,13 @@
<view style="margin-bottom:10px">
<l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow>
</view>
</block>
</block> -->
<button class="test-button" data-index="{{1}}" bindtap="onTest">年卡月卡</button>
<button class="test-button" data-index="{{2}}" bindtap="onTest">次票</button>
<button class="test-button" data-index="{{3}}" bindtap="onTest">SPA</button>
<button class="test-button" data-index="{{4}}" bindtap="onTest">文创</button>
<button class="test-button" data-index="{{5}}" bindtap="onTest">餐品</button>
<button class="test-button" data-index="{{6}}" bindtap="onTest">活动</button>
<button class="test-button" data-index="{{7}}" bindtap="onTest">观影</button>
</view>
</view>
\ No newline at end of file
......@@ -290,4 +290,10 @@
.banner-image {
width: 32rpx;
height: 32rpx;
}
.test-button {
display: block;
margin: 20rpx;
background: #808080;
}
\ No newline at end of file
......@@ -15,7 +15,7 @@ Page({
// phone: '17612345222',
// useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal.png'
// sealImg: './image/seal.png'
// },
// ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
......@@ -27,7 +27,7 @@ Page({
// phone: '17612345222',
// useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png'
// sealImg: './image/seal2.png'
// },
// ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
......@@ -39,8 +39,8 @@ Page({
// phone: '17612345222',
// useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png',
// sealImg2: '../../assets/seal2-1.png'
// sealImg: './image/seal2.png',
// sealImg2: './image/seal2-1.png'
// },
ticketInfo: {
type: 'movie',
......@@ -51,44 +51,44 @@ Page({
phone: '17612345222',
useNum:'3张电影票',
useTime: '2019.09.30 - 2020.12.30',
sealImg: '../../assets/seal2.png',
sealImg2: '../../assets/seal2-1.png'
sealImg: './image/seal2.png',
sealImg2: './image/seal2-1.png'
},
goodsInfo:{
titleImg: '../../assets/goods_title.png',
titleImg: './image/goods_title.png',
title: '海错图展馆',
list: [
{
id: 0,
infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png',
img: './image/goods_item.png',
price: '30.60',
used: '查看券码'
},
{
id: 1,
infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png',
img: './image/goods_item.png',
price: '30.60',
used: '已使用'
},
]
},
// goodsInfo:{
// titleImg: '../../assets/good2.png',
// titleImg: './image/good2.png',
// title: '元养水韵SPA',
// list: [
// {
// id: 0,
// infoText: '肌底补水保湿焕肤提亮SPA套餐',
// img: '../../assets/goods_item2.png',
// img: './image/goods_item2.png',
// price: '30.60',
// used: '查看券码'
// },
// {
// id: 1,
// infoText: '泰国皇室经典SPA',
// img: '../../assets/goods_item2.png',
// img: './image/goods_item2.png',
// price: '30.60',
// used: '已使用'
// },
......@@ -105,16 +105,20 @@ Page({
{
id: 0,
title: '《 阿凡达 》电影票',
img: '../../assets/QRcode.png',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 1,
content: 2
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 2,
content: 3
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}
]
},
......@@ -167,7 +171,6 @@ Page({
},
swiperChange(e) {
let swiperCurrent = e.detail.current
console.log(swiperCurrent)
this.setData({
swiperCurrent
})
......
{
"usingComponents": {
"Tips": "../../components/Tips/Tips",
"Blank": "../../components/Blank/Blank"
"Tips": "../../../component/Tips/Tips",
"Blank": "../../../component/Blank/Blank"
},
"navigationBarTitleText": "订单详情"
"navigationBarTitleText": "订单详情",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
}
\ No newline at end of file
......@@ -80,7 +80,7 @@
<text class="total-img-num">{{codeList.length}}</text>
</view>
<view class="code-close-btn row con-c align-c" bindtap="closeQRcode">
<image mode="widthFix" src="../../assets/icon_close.png"></image>
<image mode="widthFix" src="/image/icon_close.png"></image>
</view>
</view>
</l-popup>
......
let App = getApp()
let logicData = {
option: {},
registerInfoItem: {
'name': '',
'phone': '',
'identity': '',
'errorName': '',
'errorPhone': '',
'errorIdentity': '',
}
}
Page({
data: {
imageBase: App.globalData.appImageBase,
orderType: 6, // 1 - 年卡/月卡,2 - 次票, 3 - SPA, 4 - 文创, 5 - 餐品, 6 - 活动, 7 - 观影
buyContent: '',
buyPass: [
App.globalData.appResourcesBase + 'pay/content-pass-1.png'
],
orderType: 1, // 1 - 年卡/月卡,2 - 次票, 3 - SPA, 4 - 文创, 5 - 餐品, 6 - 活动, 7 - 观影
required: false,
isOld: true,
showNotice: false,
formItemNum: 1,
formItem: {},
formList: [],
formName: '',
formPhone: '',
formIdNum: '',
isSubmit: false,
// 购买内容
buyContent: '',
buyPass: [
App.globalData.appResourcesBase + 'pay/content-pass-1.png', // 年卡月卡预设图片
App.globalData.appResourcesBase + 'pay/content-pass-2.png', // 年卡月卡预设图片
App.globalData.appResourcesBase + 'pay/content-pass-3.png', // 年卡月卡预设图片
App.globalData.appResourcesBase + 'pay/content-pass-4.png', // 年卡月卡预设图片
],
buyPoint: [
App.globalData.appResourcesBase + 'pay/content-service-1.png',
],
buyContentCover: '',
buyContentTitle: '肌底补水保湿焕肤提华SPA套餐SPA套餐',
buyContentTime: '周一至周日 10:00-12:00',
buyContentTitle: '',
buyContentTime: '',
buyContentAmount: '36.00',
// 购买清单
shoppingCartList: [{
cover: '',
name: 'aaaaa',
name: '《海错图》超级豪华精致古风限量版折扇',
quantity: 12,
price: '60.50',
}, {
cover: '',
name: 'aaaaa',
name: '《海错图》主题画册',
quantity: 12,
price: '60.50',
}],
......@@ -50,21 +61,29 @@ Page({
// 数量选择组件属性
quantityTitle: '选择购买数量',
quantityError: '每笔订单购买数量上限为20',
quantityError: '',
quantityTipText: '剩余库存',
quantityTipNumber: 0,
quantity: 0,
quantity: 1,
quantityMax: 20,
quantityMin: 0,
quantityMin: 1,
// 购买人员信息
contactTitle: '填写购票人信息',
contactName: '',
contactPhone: '',
contactErrorName: '',
contactErrorPhone: '',
// 注册信息
registerInfo: [],
// 立即支付
payAmount: '59.00',
// 购买须知详情
noticeDetail: App.globalData.appResourcesBase + 'pay/notice-detail.png',
// 以下变量均为界面控制
winBuyContent: false, // 购买内容
winShoppingCart: false, // 购买清单
......@@ -76,62 +95,189 @@ Page({
winRegister: false, // 注册信息
winButtonPay: false, // 立即支付
winButtonAppointment: false, // 确认预约
winNoticeDetail: false, // 购买须知详情
},
onLoad() {
// this.setData({
// buyContent: this.data.buyPass[0]
// })
// if (this.data.orderType === '年卡') {
// let formItem = {}
// let formList = []
// formItem.name = '姓名'
// formItem.phone = '手机号'
// formItem.idNum = '身份证'
// formList.push(formItem)
// this.setData({
// formItem,
// formList
// })
// }
},
handleNotice() {
let showNotice = true
this.setData({
showNotice
})
},
payOrder() {
wx.reLaunch({
url: '/pages/paySucc/index',
})
onLoad: function (options) {
if (options.type) options.type = Number(options.type)
if (options.passType) options.passType = Number(options.passType)
// options.type = 7
// options.passType = 1
logicData.option = options
this.setView()
},
handleItemNumEdit(e) {
const operation = e.currentTarget.dataset.operation
let formItemNum = this.data.formItemNum
let formItem = this.data.formItem
let formList = this.data.formList
if (formItemNum === 1 && operation === -1) {
console.log('至少买一个')
} else if (formItemNum === 20 && operation === 1) {
console.log('最多买20个')
} else if (operation === 1) {
formItemNum += operation
formList.push(formItem)
} else if (operation === -1) {
formItemNum += operation
formList.pop()
setView: function () {
switch (logicData.option.type) {
case 1:
let funcList = []
funcList.push(JSON.parse(JSON.stringify(logicData.registerInfoItem)))
this.setData({
orderType: logicData.option.type,
buyContent: this.data.buyPass[logicData.option.passType],
registerInfo: funcList,
winBuyContent: true, // 购买内容
winShoppingCart: false, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: true, // 数量选择
winContact: false, // 联系信息
winRegister: true, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 2:
this.setData({
orderType: logicData.option.type,
buyContent: this.data.buyPoint[0],
winBuyContent: true, // 购买内容
winShoppingCart: false, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: true, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 3:
this.setData({
orderType: logicData.option.type,
buyContentTitle: '肌底补水保湿焕肤提华SPA套餐',
buyContentAmount: '360.00',
winBuyContent: true, // 购买内容
winShoppingCart: false, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: true, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 4:
this.setData({
orderType: logicData.option.type,
buyContentTitle: '海错图文创商店',
buyContentTime: '周一至周日 10:00-12:00',
shoppingCartList: [{
cover: '',
name: '《海错图》超级豪华精致古风限量版折扇',
quantity: 12,
price: '60.50',
}, {
cover: '',
name: '《海错图》主题画册',
quantity: 12,
price: '60.50',
}],
winBuyContent: true, // 购买内容
winShoppingCart: true, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: false, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 5:
this.setData({
orderType: logicData.option.type,
buyContentTitle: '原味舒食',
buyContentTime: '周一至周日 10:00-21:30',
shoppingCartList: [{
cover: '',
name: '低温鸡胸沙拉',
quantity: 12,
price: '60.50',
}, {
cover: '',
name: '抹茶酸奶芝士',
quantity: 12,
price: '60.50',
}],
winBuyContent: true, // 购买内容
winShoppingCart: true, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: false, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 6:
this.setData({
orderType: logicData.option.type,
buyContentTitle: '拾光花坊插花分享会',
buyContentTime: '周一至周日 10:00-21:30',
buyContentAmount: '36.00',
winBuyContent: true, // 购买内容
winShoppingCart: false, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: true, // 预约选择
winQuantity: false, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
case 7:
this.setData({
orderType: logicData.option.type,
buyContentTitle: '《哈利波特与死亡圣器》',
buyContentTime: '8月4日 19:30-21:30',
buyContentAmount: '免费',
winBuyContent: true, // 购买内容
winShoppingCart: false, // 购买清单
winNotice: true, // 购买须知
winNoticeTip: false, // 购买提示
winEntry: false, // 预约选择
winQuantity: true, // 数量选择
winContact: true, // 联系信息
winRegister: false, // 注册信息
winButtonPay: true, // 立即支付
winButtonAppointment: false, // 确认预约
})
break
}
this.setData({
formItemNum,
formList
wx.pageScrollTo({
scrollTop: 0,
duration: 300,
})
},
onInputBlur: function(event) {
console.log(event)
let funcType = event.target.dataset.type
let funcValue = event.detail.value
console.log(funcType, funcValue)
switch (funcType) {
case 'name':
this.setData({
......@@ -152,7 +298,6 @@ Page({
this.inspectForm()
},
inspectForm: function() {
console.log(1)
if (this.data.formName === '') {
this.setData({
isSubmit: false,
......@@ -200,18 +345,81 @@ Page({
})
},
/**
* 购买须知详情
* @function
* @param
* @returns
*/
onNotice: function () {
this.setData({
winNoticeDetail: true,
})
},
/**
* 关闭购买须知详情
* @function
* @param
* @returns
*/
onNoticeClose: function () {
this.setData({
winNoticeDetail: false
})
},
/**
* 数量减少事件
* @function
* @param
* @returns
*/
onQuantityCut: function () {
// 购买数量最小为 1
if (this.data.quantity === this.data.quantityMin) return
this.setData({
quantity: this.data.quantity - 1
quantity: this.data.quantity - 1,
quantityError: '',
})
if (this.data.orderType === 1) {
let funcRegisterInfo = this.data.registerInfo
funcRegisterInfo.pop()
this.setData({
registerInfo: funcRegisterInfo
})
}
},
/**
* 数量添加事件
* @function
* @param
* @returns
*/
onQuantityAdd: function () {
// 购买数量最大为 20
if (this.data.quantity >= this.data.quantityMax) {
this.setData({
quantityError: '每笔订单购买数量上限为20',
})
return
}
this.setData({
quantity: this.data.quantity + 1
})
if (this.data.orderType === 1) {
let funcRegisterInfo = this.data.registerInfo
funcRegisterInfo.push(JSON.parse(JSON.stringify(logicData.registerInfoItem)))
this.setData({
registerInfo: funcRegisterInfo
})
}
},
})
\ No newline at end of file
<view class="container">
<!-- winBuyContent -->
<view class="buy-content">
<view class="buy-content" wx:if="{{winBuyContent}}">
<view class="buy-content-pass" wx:if="{{orderType === 1}}">
<image src="{{buyContent}}"></image>
</view>
......@@ -63,7 +63,7 @@
<text>{{buyContentTime}}</text>
</view>
<view class="amount row align-e">
<text>{{buyContentAmount}}</text>
<text>{{'¥' + buyContentAmount}}</text>
</view>
</view>
</view>
......@@ -85,7 +85,7 @@
</view>
<!-- winShoppingCart -->
<view class="shopping-cart" wx:if="{{orderType === 4 || orderType === 5}}">
<view class="shopping-cart" wx:if="{{winShoppingCart}}">
<view class="shopping-cart-title">
<text>确认商品</text>
</view>
......@@ -96,29 +96,29 @@
<image src="{{item.cover}}"></image>
</view>
<view class="shopping-cart-item-name row">
<text>{{'撒大声地撒多多撒大声地撒多'}}</text>
<text>{{item.name}}</text>
</view>
<view class="shopping-cart-item-info col">
<text>123</text>
<text>123</text>
<text>¥123</text>
<text>x3</text>
</view>
</view>
</block>
<view class="shopping-cart-total row con-b align-c">
<text>总计</text>
<text>181.80</text>
<text>¥181.80</text>
</view>
</view>
</view>
<!-- winNotice -->
<view class="buy-notice row con-e align-c">
<text>{{noticeText}}</text>
<image src="{{imageBase + 'more-g.png'}}"></image>
<view class="buy-notice row con-e align-c" wx:if="{{winNotice}}">
<text bindtap="onNotice">{{noticeText}}</text>
<image src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
</view>
<!-- winEntry -->
<view class="entry">
<view class="entry" wx:if="{{winEntry && !winNoticeDetail}}">
<view class="entry-title">
<text>选择报名时间与人数</text>
</view>
......@@ -156,7 +156,7 @@
</view>
<!-- winQuantity -->
<view class="quantity col">
<view class="quantity col" wx:if="{{winQuantity && !winNoticeDetail}}">
<view class="quantity-title">
<text>{{quantityTitle}}</text>
</view>
......@@ -181,7 +181,7 @@
</view>
<!-- winContact -->
<view class="contact">
<view class="contact" wx:if="{{winContact && !winNoticeDetail}}">
<view class="contact-title col">
<text>{{contactTitle}}</text>
<text>仅用于接收订单确认短信</text>
......@@ -189,17 +189,17 @@
<view class="contact-input col">
<text>姓名</text>
<input auto-focus placeholder="请输入姓名"></input>
<text>{{'错误信息'}}</text>
<text>{{contactErrorName}}</text>
</view>
<view class="contact-input col">
<text>手机号</text>
<input auto-focus placeholder="请输入手机号"></input>
<text>{{'错误信息'}}</text>
<text>{{contactErrorPhone}}</text>
</view>
</view>
<!-- winRegister -->
<view class="register">
<view class="register" wx:if="{{winRegister && !winNoticeDetail}}">
<view class="register-title col">
<text>填写贵宾信息</text>
</view>
......@@ -208,30 +208,30 @@
<text>凭月卡入园需出示身份证信息</text>
</view>
<block wx:for="{{3}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<block wx:for="{{registerInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="register-item-title">
<text>{{'年卡' + (index + 1)}}</text>
</view>
<view class="contact-input col">
<text>姓名</text>
<input auto-focus placeholder="请输入姓名"></input>
<text>{{'错误信息'}}</text>
<input placeholder="请输入姓名"></input>
<text>{{item.errorName}}</text>
</view>
<view class="contact-input col">
<text>手机号</text>
<input auto-focus placeholder="请输入手机号"></input>
<text>{{'错误信息'}}</text>
<input placeholder="请输入手机号"></input>
<text>{{item.errorPhone}}</text>
</view>
<view class="contact-input col">
<text>身份证号</text>
<input auto-focus placeholder="请输入身份证号"></input>
<text>{{'错误信息'}}</text>
<input placeholder="请输入身份证号"></input>
<text>{{item.errorIdentity}}</text>
</view>
</block>
</view>
<!-- winButtonPay -->
<view class="pay">
<view class="pay" wx:if="{{winButtonPay}}">
<view class="pay-tip row align-c">
<image src="{{imageBase + 'fail-icon-4.png'}}"></image>
<text>付款后一经确认不得退款</text>
......@@ -241,4 +241,10 @@
<button class="row con-c align-c">立即支付</button>
</view>
</view>
</view>
<view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
<view class="notice-item">
<image src="{{noticeDetail}}"></image>
</view>
</view>
\ No newline at end of file
.notice-detail {
position: fixed;
left: 0;
bottom: 0;
width: 750rpx;
height: 100%;
background: rgba(0, 0, 0, .6);
}
.notice-item {
position: absolute;
left: 0;
bottom: 0;
width: 750rpx;
padding: 28px 0 12px 0;
border-radius: 24px 24px 0px 0px;
background: #FFFFFF;
}
.notice-item image {
display: block;
width: 750rpx;
height: 950rpx;
}
.container {
margin-top: 60rpx;
}
......@@ -11,7 +36,13 @@
width: 670rpx;
height: 356rpx;
border-radius: 4px;
background: linear-gradient(47deg, #122F3B 0%, rgba(14, 53, 70, 0) 100%);
background: #808080;
}
.buy-content-pass image {
display: block;
width: 670rpx;
height: 356rpx;
}
/* 购买内容 - service */
......@@ -86,7 +117,6 @@
}
.buy-content-art-info text:nth-child(1) {
height: 42rpx;
font-size: 30rpx;
font-weight: 800;
line-height: 42rpx;
......@@ -135,6 +165,7 @@
display: block;
width: 150rpx;
height: 200rpx;
border-radius: 4px;
background: #808080;
}
......@@ -439,7 +470,7 @@
font-size: 30rpx;
font-weight: 400;
line-height: 32rpx;
color: #C2C7CF;
color: #000000;
}
.contact-input text:nth-child(3) {
......@@ -452,7 +483,7 @@
/* 注册人员信息 */
.register {
margin-top: 64rpx;
}
.register-title {
......@@ -567,7 +598,6 @@
.price-symbol {
font-size: 26rpx;
}
.card-times {
margin-top: 80rpx;
}
......@@ -586,7 +616,6 @@
.card-left {
font-weight: 500;
}
.card-bg, .card-logo {
position: absolute;
right: 0;
......@@ -604,215 +633,194 @@
height: 186rpx;
z-index: 2;
}
.notice-wrapper {
width: 100%;
height: 100rpx;
padding: 0 40rpx;
line-height: 100rpx;
.once-card-bg {
opacity: .5;
width: 670rpx;
height: 356rpx;
}
.notice {
margin-right: 8rpx;
color: #15191f;
font-size: 26rpx;
font-weight: 500;
.once-card-logo {
bottom: 58rpx;
}
.notice-popup-wrapper {
max-height: 1110rpx;
padding: 56rpx 40rpx 68rpx;
background-color: #fff;
border-radius: 24rpx 24rpx 0 0;
/* spa */
.spa-wrapper,.artFood-store-wrapper {
width: 670rpx;
height: 216rpx;
margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
}
.notice-popup-title {
width: 100%;
height: 90rpx;
.spa-img, .artFood-store-img, .artFood-goods-img {
width: 140rpx;
height: 136rpx;
}
.notice-popup-content {
max-height: 896rpx;
.spa-info, .artFood-store-info, .active-info-wrapper {
flex: 1;
padding-left: 32rpx;
}
.content-title {
height: 80rpx;
color: #15191f;
font-size: 34rpx;
.spa-title, .artFood-store-name {
color: #15191F;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 600;
}
.content-sub-title {
height: 52rpx;
color: #15191f;
font-size: 26rpx;
.spa-price {
color: #5DB5DD;
font-size: 30rpx;
}
.content-text {
height: 112rpx;
color: #959da9;
/* 文创 */
.artFood-top-wrapper {
width: 670rpx;
margin: 64rpx auto 0;
}
.artFood-store-wrapper {
margin-top: 0;
}
.artFood-store-title,.artFood-goods-title {
height: 90rpx;
color: #15191F;
font-size: 34rpx;
font-weight: 600;
}
.artFood-store-time {
color: #656E7B;
font-size: 26rpx;
line-height: 44rpx;
}
.choose-num-wrapper {
position: relative;
.artFood-bottom-wrapper {
width: 670rpx;
height: 226rpx;
margin: 32rpx auto 0;
margin: 64rpx auto 0;
}
.choose-num-title {
color: #15191f;
font-size: 34rpx;
.artFood-goods-wrapper {
padding: 20rpx 32rpx 0;
background-color: #F5F6F8;
border-radius: 4rpx;
}
.artFood-goods-item {
padding: 20rpx 0 24rpx;
border-bottom: 1px solid #E2E7EF;
}
.artFood-goods-name {
flex: 1;
color: #15191F;
font-size: 26rpx;
font-weight: 600;
line-height: 48rpx;
line-height: 40rpx;
padding: 20rpx 24rpx 0 32rpx;
}
.choose-num-tool {
width: 100%;
.artFood-goods-data {
width: 120rpx;
height: 80rpx;
margin-top: 40rpx;
border: 1px solid #dbdfe5;
border-radius: 4rpx;
margin-top: 20rpx;
text-align: right;
font-size: 26rpx;
}
.choose-edit {
width: 78rpx;
.artFood-goods-price {
color: #15191F;
font-weight: 600;
line-height: 40rpx;
font-size: 40rpx;
text-align: center;
}
.choose-num {
flex: 1;
.artFood-goods-num {
color: #959DA9;
line-height: 40rpx;
border-left: 1px solid #c2c7cf;
border-right: 1px solid #c2c7cf;
text-align: center;
}
.choose-wraning {
position: absolute;
left: 0;
bottom: 0;
color: #d92b3a;
.artFood-price-symbol {
font-size: 22rpx;
}
.choose-num-total {
position: absolute;
right: 0;
bottom: 0;
color: #15191f;
font-size: 30rpx;
.artFood-total-price-wrapper {
margin-top: 24rpx;
height: 60rpx;
font-size: 26rpx;
}
.num-total {
color: #86c5e1;
.artFood-total-text {
color: #959DA9;
}
.artFood-total-price {
color: #5DB5DD;
}
.artFood-tips-wrapper {
margin: 40rpx auto 0;
}
.vip-info-wrapper {
/* 活动观影 */
.active-wrapper {
width: 670rpx;
height: 280rpx;
margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
}
.vip-info-title {
color: #15191f;
font-size: 34rpx;
font-weight: 600;
}
.tips-wrapper {
margin-top: 24rpx;
.active-img {
width: 150rpx;
height: 200rpx;
}
.vip-info {
margin-top: 48rpx;
.active-info {
height: 158rpx;
}
.vip-info-no {
height: 90rpx;
color: #15191f;
.active-name {
color: #15191F;
font-size: 30rpx;
font-weight: 600;
line-height: 42rpx;
}
.vip-input-wrapper {
height: 210rpx;
.active-date {
margin-top: 16rpx;
color: #656E7B;
font-size: 26rpx;
line-height: 36rpx;
}
.vip-input-header {
height: 58rpx;
color: #1e2025;
.active-price {
color: #5DB5DD;
font-size: 30rpx;
}
.vip-input {
width: 670rpx;
height: 80rpx;
padding-left: 24rpx;
border: 1px solid #dbdfe5;
border-radius: 4rpx;
font-size: 30rpx;
line-height: 80rpx;
/* 购买须知 */
.notice-wrapper {
width: 100%;
height: 100rpx;
padding: 0 40rpx;
line-height: 100rpx;
}
.input-place {
color: #c2c7cf;
.notice {
margin-right: 8rpx;
color: #15191f;
font-size: 26rpx;
font-weight: 500;
}
.inputError {
border-color: #d92b3a;
.notice-popup-wrapper {
max-height: 1110rpx;
padding: 56rpx 40rpx 68rpx;
background-color: #fff;
border-radius: 24rpx 24rpx 0 0;
}
.vip-input-tips {
margin-top: 8rpx;
color: #d92b3a;
font-size: 22rpx;
.notice-popup-title {
width: 100%;
height: 90rpx;
}
.footer-btn {
position: relative;
height: 128rpx;
padding: 32rpx 40rpx 0;
border-top: 1px solid #e2e7ef;
.notice-popup-content {
max-height: 896rpx;
}
.new-price {
color: #5db5dd;
.content-title {
height: 80rpx;
color: #15191f;
font-size: 34rpx;
}
.old-price {
margin-left: 8px;
color: #c2c7cf;
font-size: 22rpx;
text-decoration: line-through;
}
.new-symbol {
font-size: 32rpx;
}
.old-symbol {
font-size: 20rpx;
}
.pay-btn {
position: absolute;
right: 40rpx;
bottom: 0;
width: 248rpx;
height: 96rpx;
color: #fff;
font-size: 30rpx;
line-height: 96rpx;
text-align: center;
border-radius: 4rpx;
background-color: #86c5e1;
.content-sub-title {
height: 52rpx;
color: #15191f;
font-size: 26rpx;
}
image {
width: 100%;
height: 100%;
}
.content-text {
height: 112rpx;
color: #959da9;
font-size: 26rpx;
line-height: 44rpx;
}
\ No newline at end of file
......@@ -114,6 +114,14 @@
"id": -1,
"name": "pages/moreProblems/moreProblems",
"pathName": "pages/moreProblems/moreProblems",
"query": "",
"scene": null
},
{
"id": 7,
"name": "pages/pay/order-input/order-input",
"pathName": "pages/pay/order-input/order-input",
"query": "",
"scene": null
}
]
......
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