Skip to content

严立 / mini-shimao

Go to a project
Commit 6e722213 by 严立
Options

LL - 确认订单 UI

parents 09bb006f be976f6f
Expand all
Inline Side-by-side
Showing with 300 additions and 239 deletions
app.json
{ {
"pages": [ "pages": [
"pages/pay/order-input/order-input",
"pages/home/home/home", "pages/home/home/home",
"pages/home/dynamic/dynamic", "pages/home/dynamic/dynamic",
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
"pages/mine/question-more/question-more", "pages/mine/question-more/question-more",
"pages/pay/home/home", "pages/pay/home/home",
"pages/pay/order-input/order-input",
"pages/pay/order-detail/order-detail", "pages/pay/order-detail/order-detail",
"pages/pay/coupon/coupon", "pages/pay/coupon/coupon",
"pages/pay/coupon-input/coupon-input", "pages/pay/coupon-input/coupon-input",
...@@ -71,7 +71,8 @@ ...@@ -71,7 +71,8 @@
"l-collapse": "../miniprogram_npm/lin-ui/collapse/index", "l-collapse": "../miniprogram_npm/lin-ui/collapse/index",
"l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index", "l-collapse-item": "../miniprogram_npm/lin-ui/collapse-item/index",
"l-textarea": "../miniprogram_npm/lin-ui/textarea/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": { "window": {
"navigationStyle": "custom", "navigationStyle": "custom",
......
component/Tips/Tips.wxml
<view class="tips"> <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 class="tips-text">{{text}}</view>
</view> </view>
image/cart.png 0 → 100644
image/cart.png

844 Bytes
pages/commodity/shopping-cart/shopping-cart.js
...@@ -17,7 +17,7 @@ Page({ ...@@ -17,7 +17,7 @@ Page({
goods_num: 1, goods_num: 1,
store_num: 1, store_num: 1,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 1, goods_id: 1,
...@@ -28,7 +28,7 @@ Page({ ...@@ -28,7 +28,7 @@ Page({
goods_num: 1, goods_num: 1,
store_num: 2, store_num: 2,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 2, goods_id: 2,
...@@ -36,7 +36,7 @@ Page({ ...@@ -36,7 +36,7 @@ Page({
goods_now_price: 30.00, goods_now_price: 30.00,
goods_num: 2, goods_num: 2,
checked: true, checked: true,
img: '/assets/logo.png' img: './image/item01.png'
}, },
{ {
goods_id: 3, goods_id: 3,
...@@ -44,18 +44,18 @@ Page({ ...@@ -44,18 +44,18 @@ Page({
goods_now_price: 78, goods_now_price: 78,
goods_num: 12, goods_num: 12,
checked: false, checked: false,
img: '/assets/logo.png' img: './image/item01.png'
} }
], ],
notEnough: [ notEnough: [
{ {
id: 0, id: 0,
img: '../../assets/enough01.png', img: './image/item01.png',
title: '葱爆牛肉佐秘制麻椒汁' title: '葱爆牛肉佐秘制麻椒汁'
}, },
{ {
id: 1, id: 1,
img: '../../assets/enough01.png', img: './image/item01.png',
title: '抹茶酸奶芝士' title: '抹茶酸奶芝士'
} }
] ]
......
pages/commodity/shopping-cart/shopping-cart.json
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../components/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "购物车" "navigationBarTitleText": "购物车"
} }
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxml
<view class="header row align-c"> <view class="header row align-c">
<view class="header_img"> <view class="header_img">
<image mode="aspectFill" src="/assets/logo.png" /> <image mode="aspectFill" src="./image/item01.png" />
</view> </view>
<view class="header_title">儿童营地</view> <view class="header_title">儿童营地</view>
<view class="header_clear row align-c" bindtap="handleClearCart">清空</view> <view class="header_clear row align-c" bindtap="handleClearCart">清空</view>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</view> </view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup"> <view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close"> <view class="popup_close">
<image mode="widthFix" src="../../assets/icon_close.png"></image> <image mode="widthFix" src="../../../image/icon_close.png"></image>
</view> </view>
</view> </view>
</l-popup> </l-popup>
......
pages/commodity/snacks/snacks.js
...@@ -57,7 +57,7 @@ Page({ ...@@ -57,7 +57,7 @@ Page({
goods_now_text: '业主价', goods_now_text: '业主价',
goods_num: 1, goods_num: 1,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 1, goods_id: 1,
...@@ -68,7 +68,7 @@ Page({ ...@@ -68,7 +68,7 @@ Page({
goods_now_text: '活动价', goods_now_text: '活动价',
goods_num: 1, goods_num: 1,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 2, goods_id: 2,
...@@ -76,7 +76,7 @@ Page({ ...@@ -76,7 +76,7 @@ Page({
goods_now_price: 30.00, goods_now_price: 30.00,
goods_num: 2, goods_num: 2,
checked: true, checked: true,
img: '/assets/item01.png' img: './image/cola.png'
}, },
{ {
goods_id: 3, goods_id: 3,
...@@ -85,7 +85,7 @@ Page({ ...@@ -85,7 +85,7 @@ Page({
goods_now_price: 78, goods_now_price: 78,
goods_num: 12, goods_num: 12,
checked: false, checked: false,
img: '/assets/item01.png' img: './image/cola.png'
} }
], ],
popupObj: { popupObj: {
...@@ -123,7 +123,7 @@ Page({ ...@@ -123,7 +123,7 @@ Page({
}, },
goToCart() { goToCart() {
wx.navigateTo({ wx.navigateTo({
url: '/pages/cart/index', url: '/pages/commodity/shopping-cart/shopping-cart',
}) })
} }
}) })
\ No newline at end of file
pages/commodity/snacks/snacks.json
{ {
"usingComponents": { "usingComponents": {
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "原味书食" "navigationBarTitleText": "购物车",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
pages/commodity/snacks/snacks.wxml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</view> </view>
<view class="goods_add_btn_wrap row con-e" bindtap="handleAddCartPopup"> <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"> <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> </l-button>
</view> </view>
</view> </view>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<view class="cart_btn row con-c align-c" bindtap="goToCart"> <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_num row con-c align-c">{{cart.length}}</view>
<view class="cart_img_wrap"> <view class="cart_img_wrap">
<image src="../../assets/icon_cart.png" mode="widthFix"></image> <image src="../../../image/cart.png" mode="widthFix"></image>
</view> </view>
</view> </view>
<navigator url="/pages/orderDetail/index">订单详情</navigator> <navigator url="/pages/orderDetail/index">订单详情</navigator>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<l-popup show="{{showPopup}}" content-align="center" locked="{{true}}"> <l-popup show="{{showPopup}}" content-align="center" locked="{{true}}">
<view class="popup_wrap"> <view class="popup_wrap">
<view class="popup_img_wrapper"> <view class="popup_img_wrapper">
<image mode="widthFix" src="../../assets/popup.png"></image> <image mode="widthFix" src="./image/popup.png"></image>
</view> </view>
<view class="popup_info_wrapper"> <view class="popup_info_wrapper">
<view class="popuo_info_title">咖喱蔬菜大虾</view> <view class="popuo_info_title">咖喱蔬菜大虾</view>
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
</view> </view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup"> <view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close"> <view class="popup_close">
<image mode="widthFix" src="../../assets/icon_close.png"></image> <image mode="widthFix" src="../../../image/icon_close.png"></image>
</view> </view>
</view> </view>
</l-popup> </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>
</view> </view>
<Blank></Blank> <Blank></Blank>
pages/commodity/snacks/snacks.wxss
...@@ -238,6 +238,9 @@ Page { ...@@ -238,6 +238,9 @@ Page {
min-width: 262rpx !important; min-width: 262rpx !important;
min-height: 262prx !important; min-height: 262prx !important;
} }
.toast-image {
}
image { image {
width: 100%; width: 100%;
......
pages/home/home/home.js
...@@ -263,7 +263,7 @@ Page({ ...@@ -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 { } else {
...@@ -318,4 +318,9 @@ Page({ ...@@ -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
pages/home/home/home.wxml
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</view> </view>
<!-- 游客攻略 --> <!-- 游客攻略 -->
<block wx:if="{{strategyOriginList.length > 0}}"> <!-- <block wx:if="{{strategyOriginList.length > 0}}">
<view class="strategy detail-item" bindtap="onFirstStrategyDetail"> <view class="strategy detail-item" bindtap="onFirstStrategyDetail">
<image src="./image/title-strategy.png"></image> <image src="./image/title-strategy.png"></image>
<view class="strategy-content"> <view class="strategy-content">
...@@ -78,7 +78,13 @@ ...@@ -78,7 +78,13 @@
<view style="margin-bottom:10px"> <view style="margin-bottom:10px">
<l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow> <l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow>
</view> </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>
</view> </view>
\ No newline at end of file
pages/home/home/home.wxss
...@@ -291,3 +291,9 @@ ...@@ -291,3 +291,9 @@
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.test-button {
display: block;
margin: 20rpx;
background: #808080;
}
\ No newline at end of file
pages/pay/order-detail/order-detail.js
...@@ -15,7 +15,7 @@ Page({ ...@@ -15,7 +15,7 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal.png' // sealImg: './image/seal.png'
// }, // },
// ticketInfo: { // ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款 // status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
...@@ -27,7 +27,7 @@ Page({ ...@@ -27,7 +27,7 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png' // sealImg: './image/seal2.png'
// }, // },
// ticketInfo: { // ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款 // status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
...@@ -39,8 +39,8 @@ Page({ ...@@ -39,8 +39,8 @@ Page({
// phone: '17612345222', // phone: '17612345222',
// useNum:'1件商品可用', // useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30', // useTime: '2019.09.30 - 2020.12.30',
// sealImg: '../../assets/seal2.png', // sealImg: './image/seal2.png',
// sealImg2: '../../assets/seal2-1.png' // sealImg2: './image/seal2-1.png'
// }, // },
ticketInfo: { ticketInfo: {
type: 'movie', type: 'movie',
...@@ -51,44 +51,44 @@ Page({ ...@@ -51,44 +51,44 @@ Page({
phone: '17612345222', phone: '17612345222',
useNum:'3张电影票', useNum:'3张电影票',
useTime: '2019.09.30 - 2020.12.30', useTime: '2019.09.30 - 2020.12.30',
sealImg: '../../assets/seal2.png', sealImg: './image/seal2.png',
sealImg2: '../../assets/seal2-1.png' sealImg2: './image/seal2-1.png'
}, },
goodsInfo:{ goodsInfo:{
titleImg: '../../assets/goods_title.png', titleImg: './image/goods_title.png',
title: '海错图展馆', title: '海错图展馆',
list: [ list: [
{ {
id: 0, id: 0,
infoText: '《海错图》展览单人门票', infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png', img: './image/goods_item.png',
price: '30.60', price: '30.60',
used: '查看券码' used: '查看券码'
}, },
{ {
id: 1, id: 1,
infoText: '《海错图》展览单人门票', infoText: '《海错图》展览单人门票',
img: '../../assets/goods_item.png', img: './image/goods_item.png',
price: '30.60', price: '30.60',
used: '已使用' used: '已使用'
}, },
] ]
}, },
// goodsInfo:{ // goodsInfo:{
// titleImg: '../../assets/good2.png', // titleImg: './image/good2.png',
// title: '元养水韵SPA', // title: '元养水韵SPA',
// list: [ // list: [
// { // {
// id: 0, // id: 0,
// infoText: '肌底补水保湿焕肤提亮SPA套餐', // infoText: '肌底补水保湿焕肤提亮SPA套餐',
// img: '../../assets/goods_item2.png', // img: './image/goods_item2.png',
// price: '30.60', // price: '30.60',
// used: '查看券码' // used: '查看券码'
// }, // },
// { // {
// id: 1, // id: 1,
// infoText: '泰国皇室经典SPA', // infoText: '泰国皇室经典SPA',
// img: '../../assets/goods_item2.png', // img: './image/goods_item2.png',
// price: '30.60', // price: '30.60',
// used: '已使用' // used: '已使用'
// }, // },
...@@ -105,16 +105,20 @@ Page({ ...@@ -105,16 +105,20 @@ Page({
{ {
id: 0, id: 0,
title: '《 阿凡达 》电影票', title: '《 阿凡达 》电影票',
img: '../../assets/QRcode.png', img: './image/QRcode.png',
num: '2179 7092 0925' num: '2179 7092 0925'
}, },
{ {
id: 1, id: 1,
content: 2 title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}, },
{ {
id: 2, id: 2,
content: 3 title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
} }
] ]
}, },
...@@ -167,7 +171,6 @@ Page({ ...@@ -167,7 +171,6 @@ Page({
}, },
swiperChange(e) { swiperChange(e) {
let swiperCurrent = e.detail.current let swiperCurrent = e.detail.current
console.log(swiperCurrent)
this.setData({ this.setData({
swiperCurrent swiperCurrent
}) })
......
pages/pay/order-detail/order-detail.json
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../components/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../components/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "订单详情" "navigationBarTitleText": "订单详情",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
pages/pay/order-detail/order-detail.wxml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<text class="total-img-num">{{codeList.length}}</text> <text class="total-img-num">{{codeList.length}}</text>
</view> </view>
<view class="code-close-btn row con-c align-c" bindtap="closeQRcode"> <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>
</view> </view>
</l-popup> </l-popup>
......
pages/pay/order-input/order-input.wxml
<view class="container"> <view class="container">
<!-- winBuyContent --> <!-- winBuyContent -->
<view class="buy-content"> <view class="buy-content" wx:if="{{winBuyContent}}">
<view class="buy-content-pass" wx:if="{{orderType === 1}}"> <view class="buy-content-pass" wx:if="{{orderType === 1}}">
<image src="{{buyContent}}"></image> <image src="{{buyContent}}"></image>
</view> </view>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<text>{{buyContentTime}}</text> <text>{{buyContentTime}}</text>
</view> </view>
<view class="amount row align-e"> <view class="amount row align-e">
<text>{{buyContentAmount}}</text> <text>{{'¥' + buyContentAmount}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</view> </view>
<!-- winShoppingCart --> <!-- winShoppingCart -->
<view class="shopping-cart" wx:if="{{orderType === 4 || orderType === 5}}"> <view class="shopping-cart" wx:if="{{winShoppingCart}}">
<view class="shopping-cart-title"> <view class="shopping-cart-title">
<text>确认商品</text> <text>确认商品</text>
</view> </view>
...@@ -96,29 +96,29 @@ ...@@ -96,29 +96,29 @@
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="shopping-cart-item-name row"> <view class="shopping-cart-item-name row">
<text>{{'撒大声地撒多多撒大声地撒多'}}</text> <text>{{item.name}}</text>
</view> </view>
<view class="shopping-cart-item-info col"> <view class="shopping-cart-item-info col">
<text>123</text> <text>¥123</text>
<text>123</text> <text>x3</text>
</view> </view>
</view> </view>
</block> </block>
<view class="shopping-cart-total row con-b align-c"> <view class="shopping-cart-total row con-b align-c">
<text>总计</text> <text>总计</text>
<text>181.80</text> <text>¥181.80</text>
</view> </view>
</view> </view>
</view> </view>
<!-- winNotice --> <!-- winNotice -->
<view class="buy-notice row con-e align-c"> <view class="buy-notice row con-e align-c" wx:if="{{winNotice}}">
<text>{{noticeText}}</text> <text bindtap="onNotice">{{noticeText}}</text>
<image src="{{imageBase + 'more-g.png'}}"></image> <image src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
</view> </view>
<!-- winEntry --> <!-- winEntry -->
<view class="entry"> <view class="entry" wx:if="{{winEntry && !winNoticeDetail}}">
<view class="entry-title"> <view class="entry-title">
<text>选择报名时间与人数</text> <text>选择报名时间与人数</text>
</view> </view>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
</view> </view>
<!-- winQuantity --> <!-- winQuantity -->
<view class="quantity col"> <view class="quantity col" wx:if="{{winQuantity && !winNoticeDetail}}">
<view class="quantity-title"> <view class="quantity-title">
<text>{{quantityTitle}}</text> <text>{{quantityTitle}}</text>
</view> </view>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</view> </view>
<!-- winContact --> <!-- winContact -->
<view class="contact"> <view class="contact" wx:if="{{winContact && !winNoticeDetail}}">
<view class="contact-title col"> <view class="contact-title col">
<text>{{contactTitle}}</text> <text>{{contactTitle}}</text>
<text>仅用于接收订单确认短信</text> <text>仅用于接收订单确认短信</text>
...@@ -189,17 +189,17 @@ ...@@ -189,17 +189,17 @@
<view class="contact-input col"> <view class="contact-input col">
<text>姓名</text> <text>姓名</text>
<input auto-focus placeholder="请输入姓名"></input> <input auto-focus placeholder="请输入姓名"></input>
<text>{{'错误信息'}}</text> <text>{{contactErrorName}}</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>手机号</text> <text>手机号</text>
<input auto-focus placeholder="请输入手机号"></input> <input auto-focus placeholder="请输入手机号"></input>
<text>{{'错误信息'}}</text> <text>{{contactErrorPhone}}</text>
</view> </view>
</view> </view>
<!-- winRegister --> <!-- winRegister -->
<view class="register"> <view class="register" wx:if="{{winRegister && !winNoticeDetail}}">
<view class="register-title col"> <view class="register-title col">
<text>填写贵宾信息</text> <text>填写贵宾信息</text>
</view> </view>
...@@ -208,30 +208,30 @@ ...@@ -208,30 +208,30 @@
<text>凭月卡入园需出示身份证信息</text> <text>凭月卡入园需出示身份证信息</text>
</view> </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"> <view class="register-item-title">
<text>{{'年卡' + (index + 1)}}</text> <text>{{'年卡' + (index + 1)}}</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>姓名</text> <text>姓名</text>
<input auto-focus placeholder="请输入姓名"></input> <input placeholder="请输入姓名"></input>
<text>{{'错误信息'}}</text> <text>{{item.errorName}}</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>手机号</text> <text>手机号</text>
<input auto-focus placeholder="请输入手机号"></input> <input placeholder="请输入手机号"></input>
<text>{{'错误信息'}}</text> <text>{{item.errorPhone}}</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>身份证号</text> <text>身份证号</text>
<input auto-focus placeholder="请输入身份证号"></input> <input placeholder="请输入身份证号"></input>
<text>{{'错误信息'}}</text> <text>{{item.errorIdentity}}</text>
</view> </view>
</block> </block>
</view> </view>
<!-- winButtonPay --> <!-- winButtonPay -->
<view class="pay"> <view class="pay" wx:if="{{winButtonPay}}">
<view class="pay-tip row align-c"> <view class="pay-tip row align-c">
<image src="{{imageBase + 'fail-icon-4.png'}}"></image> <image src="{{imageBase + 'fail-icon-4.png'}}"></image>
<text>付款后一经确认不得退款</text> <text>付款后一经确认不得退款</text>
...@@ -242,3 +242,9 @@ ...@@ -242,3 +242,9 @@
</view> </view>
</view> </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
pages/pay/order-input/order-input.wxss
.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 { .container {
margin-top: 60rpx; margin-top: 60rpx;
} }
...@@ -11,7 +36,13 @@ ...@@ -11,7 +36,13 @@
width: 670rpx; width: 670rpx;
height: 356rpx; height: 356rpx;
border-radius: 4px; 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 */ /* 购买内容 - service */
...@@ -86,7 +117,6 @@ ...@@ -86,7 +117,6 @@
} }
.buy-content-art-info text:nth-child(1) { .buy-content-art-info text:nth-child(1) {
height: 42rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
line-height: 42rpx; line-height: 42rpx;
...@@ -135,6 +165,7 @@ ...@@ -135,6 +165,7 @@
display: block; display: block;
width: 150rpx; width: 150rpx;
height: 200rpx; height: 200rpx;
border-radius: 4px;
background: #808080; background: #808080;
} }
...@@ -439,7 +470,7 @@ ...@@ -439,7 +470,7 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #C2C7CF; color: #000000;
} }
.contact-input text:nth-child(3) { .contact-input text:nth-child(3) {
...@@ -452,7 +483,7 @@ ...@@ -452,7 +483,7 @@
/* 注册人员信息 */ /* 注册人员信息 */
.register { .register {
margin-top: 64rpx;
} }
.register-title { .register-title {
...@@ -567,7 +598,6 @@ ...@@ -567,7 +598,6 @@
.price-symbol { .price-symbol {
font-size: 26rpx; font-size: 26rpx;
} }
.card-times { .card-times {
margin-top: 80rpx; margin-top: 80rpx;
} }
...@@ -586,7 +616,6 @@ ...@@ -586,7 +616,6 @@
.card-left { .card-left {
font-weight: 500; font-weight: 500;
} }
.card-bg, .card-logo { .card-bg, .card-logo {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -604,215 +633,194 @@ ...@@ -604,215 +633,194 @@
height: 186rpx; height: 186rpx;
z-index: 2; z-index: 2;
} }
.once-card-bg {
.notice-wrapper { opacity: .5;
width: 100%; width: 670rpx;
height: 100rpx; height: 356rpx;
padding: 0 40rpx;
line-height: 100rpx;
} }
.once-card-logo {
.notice { bottom: 58rpx;
margin-right: 8rpx;
color: #15191f;
font-size: 26rpx;
font-weight: 500;
} }
.notice-popup-wrapper { /* spa */
max-height: 1110rpx; .spa-wrapper,.artFood-store-wrapper {
padding: 56rpx 40rpx 68rpx; width: 670rpx;
background-color: #fff; height: 216rpx;
border-radius: 24rpx 24rpx 0 0; margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
} }
.spa-img, .artFood-store-img, .artFood-goods-img {
.notice-popup-title { width: 140rpx;
width: 100%; height: 136rpx;
height: 90rpx;
} }
.spa-info, .artFood-store-info, .active-info-wrapper {
.notice-popup-content { flex: 1;
max-height: 896rpx; padding-left: 32rpx;
} }
.spa-title, .artFood-store-name {
.content-title { color: #15191F;
height: 80rpx; font-size: 30rpx;
color: #15191f; line-height: 42rpx;
font-size: 34rpx; font-weight: 600;
} }
.spa-price {
.content-sub-title { color: #5DB5DD;
height: 52rpx; font-size: 30rpx;
color: #15191f;
font-size: 26rpx;
} }
.content-text { /* 文创 */
height: 112rpx; .artFood-top-wrapper {
color: #959da9; 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; font-size: 26rpx;
line-height: 44rpx;
} }
.artFood-bottom-wrapper {
.choose-num-wrapper {
position: relative;
width: 670rpx; width: 670rpx;
height: 226rpx; margin: 64rpx auto 0;
margin: 32rpx auto 0;
} }
.artFood-goods-wrapper {
.choose-num-title { padding: 20rpx 32rpx 0;
color: #15191f; background-color: #F5F6F8;
font-size: 34rpx; 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; font-weight: 600;
line-height: 48rpx; line-height: 40rpx;
padding: 20rpx 24rpx 0 32rpx;
} }
.artFood-goods-data {
.choose-num-tool { width: 120rpx;
width: 100%;
height: 80rpx; height: 80rpx;
margin-top: 40rpx; margin-top: 20rpx;
border: 1px solid #dbdfe5; text-align: right;
border-radius: 4rpx; font-size: 26rpx;
} }
.artFood-goods-price {
.choose-edit { color: #15191F;
width: 78rpx; font-weight: 600;
line-height: 40rpx; line-height: 40rpx;
font-size: 40rpx;
text-align: center;
} }
.artFood-goods-num {
.choose-num { color: #959DA9;
flex: 1;
line-height: 40rpx; line-height: 40rpx;
border-left: 1px solid #c2c7cf;
border-right: 1px solid #c2c7cf;
text-align: center;
} }
.artFood-price-symbol {
.choose-wraning {
position: absolute;
left: 0;
bottom: 0;
color: #d92b3a;
font-size: 22rpx; font-size: 22rpx;
} }
.artFood-total-price-wrapper {
.choose-num-total { margin-top: 24rpx;
position: absolute; height: 60rpx;
right: 0; font-size: 26rpx;
bottom: 0;
color: #15191f;
font-size: 30rpx;
} }
.artFood-total-text {
.num-total { color: #959DA9;
color: #86c5e1; }
.artFood-total-price {
color: #5DB5DD;
}
.artFood-tips-wrapper {
margin: 40rpx auto 0;
} }
.vip-info-wrapper { /* 活动观影 */
.active-wrapper {
width: 670rpx; width: 670rpx;
height: 280rpx;
margin: 64rpx auto 0; margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
} }
.active-img {
.vip-info-title { width: 150rpx;
color: #15191f; height: 200rpx;
font-size: 34rpx;
font-weight: 600;
}
.tips-wrapper {
margin-top: 24rpx;
} }
.active-info {
.vip-info { height: 158rpx;
margin-top: 48rpx;
} }
.active-name {
.vip-info-no { color: #15191F;
height: 90rpx;
color: #15191f;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
line-height: 42rpx;
} }
.active-date {
.vip-input-wrapper { margin-top: 16rpx;
height: 210rpx; color: #656E7B;
font-size: 26rpx;
line-height: 36rpx;
} }
.active-price {
.vip-input-header { color: #5DB5DD;
height: 58rpx;
color: #1e2025;
font-size: 30rpx; font-size: 30rpx;
} }
/* 购买须知 */
.vip-input { .notice-wrapper {
width: 670rpx; width: 100%;
height: 80rpx; height: 100rpx;
padding-left: 24rpx; padding: 0 40rpx;
border: 1px solid #dbdfe5; line-height: 100rpx;
border-radius: 4rpx;
font-size: 30rpx;
line-height: 80rpx;
} }
.input-place { .notice {
color: #c2c7cf; margin-right: 8rpx;
color: #15191f;
font-size: 26rpx;
font-weight: 500;
} }
.inputError { .notice-popup-wrapper {
border-color: #d92b3a; max-height: 1110rpx;
padding: 56rpx 40rpx 68rpx;
background-color: #fff;
border-radius: 24rpx 24rpx 0 0;
} }
.vip-input-tips { .notice-popup-title {
margin-top: 8rpx; width: 100%;
color: #d92b3a; height: 90rpx;
font-size: 22rpx;
} }
.footer-btn { .notice-popup-content {
position: relative; max-height: 896rpx;
height: 128rpx;
padding: 32rpx 40rpx 0;
border-top: 1px solid #e2e7ef;
} }
.new-price { .content-title {
color: #5db5dd; height: 80rpx;
color: #15191f;
font-size: 34rpx; font-size: 34rpx;
} }
.old-price { .content-sub-title {
margin-left: 8px; height: 52rpx;
color: #c2c7cf; color: #15191f;
font-size: 22rpx; font-size: 26rpx;
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;
} }
image { .content-text {
width: 100%; height: 112rpx;
height: 100%; color: #959da9;
font-size: 26rpx;
line-height: 44rpx;
} }
\ No newline at end of file
project.config.json
...@@ -114,6 +114,14 @@ ...@@ -114,6 +114,14 @@
"id": -1, "id": -1,
"name": "pages/moreProblems/moreProblems", "name": "pages/moreProblems/moreProblems",
"pathName": "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 "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