Skip to content

严立 / mini-shimao

Go to a project
Commit be976f6f by wjw
Options

wjw--确认订单修改

parent b4da39a4
Inline Side-by-side
Showing with 289 additions and 33 deletions
pages/commodity/shopping-cart/shopping-cart.wxml
...@@ -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
...@@ -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.wxml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</view> </view>
</l-popup> </l-popup>
<!-- 添加成功 --> <!-- 添加成功 -->
<l-toast show="{{true}}" duration="100000" l-class="toast_bg" image="../../../image/success.png" 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/pay/order-input/order-input.js
Page({ Page({
data: { data: {
orderType: '年卡', // orderType: '年卡',
isVip: false,
required: false, required: false,
isMonthCard: false,
isOnceCard: true,
isOld: true, isOld: true,
showNotice: false, showNotice: false,
formItemNum: 1, formItemNum: 1,
...@@ -10,10 +13,27 @@ Page({ ...@@ -10,10 +13,27 @@ Page({
formName: '', formName: '',
formPhone: '', formPhone: '',
formIdNum: '', formIdNum: '',
isSubmit: false isSubmit: false,
goodsList: [
{
id: 0,
img: './image/spa.png',
name: '《海错图》超级豪华精致古风限量版折扇',
num: 3,
price: '30.60'
},
{
id: 0,
img: './image/spa.png',
name: '《海错图》主题画册',
num: 3,
price: '30.60'
}
]
}, },
onLoad() { onLoad() {
if (this.data.orderType === '年卡') { if (this.data.isVip) {
let formItem = {} let formItem = {}
let formList = [] let formList = []
formItem.name = '姓名' formItem.name = '姓名'
...@@ -24,6 +44,16 @@ Page({ ...@@ -24,6 +44,16 @@ Page({
formItem, formItem,
formList formList
}) })
} else {
let formItem = {}
let formList = []
formItem.name = '姓名'
formItem.phone = '手机号'
formList.push(formItem)
this.setData({
formItem,
formList
})
} }
}, },
handleNotice() { handleNotice() {
......
pages/pay/order-input/order-input.wxml
<view class="card-wrapper"> <!-- 精灵鸟理想国 -->
<!-- <view class="card-wrapper {{isMonthCard?'month-bg':''}} {{isOnceCard?'once-bg':''}}">
<view class="card-name">精灵鸟理想国年卡</view> <view class="card-name">精灵鸟理想国年卡</view>
<view class="card-price"> <view class="card-price">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
...@@ -13,14 +14,91 @@ ...@@ -13,14 +14,91 @@
<view class="card-left">有效期</view> <view class="card-left">有效期</view>
<view class="card-right">2019.09.30 - 2020.09.30</view> <view class="card-right">2019.09.30 - 2020.09.30</view>
</view> </view>
<view class="card-bg"> <view class="card-bg {{isOnceCard ? 'once-card-bg' : ''}}">
<image mode="widthFix" src="./image/logo1.png"></image> <image wx:if="{{isMonthCard}}" mode="widthFix" src="./image/logo1-2.png"></image>
<image wx:elif="{{isOnceCard}}" mode="widthFix" src="./image/build.png"></image>
<image wx:else mode="widthFix" src="./image/logo1.png"></image>
</view> </view>
<view class="card-logo"> <view class="card-logo {{isOnceCard ? 'once-card-logo' : ''}}">
<image mode="widthFix" src="./image/logo2.png"></image> <image wx:if="{{isOnceCard}}" mode="widthFix" src="./image/fish.png"></image>
<image wx:else mode="widthFix" src="./image/logo2.png"></image>
</view>
</view> -->
<!-- SPA -->
<!-- <view class="spa-wrapper row">
<view class="spa-img">
<image mode="widthFix" src="./image/spa.png"></image>
</view>
<view class="spa-info col con-a">
<view class="spa-title">肌底补水保湿焕肤提亮尊享豪华SPA套餐</view>
<view class="spa-price">
<text class="price-symbol">￥</text>
<text>360.00</text>
</view>
</view>
</view> -->
<!-- 文创 && 餐品 -->
<!-- <view class="artFood-top-wrapper">
<view class="artFood-store-title">取货门店</view>
<view class="artFood-store-wrapper row">
<view class="artFood-store-img">
<image mode="widthFix" src="./image/spa.png"></image>
</view>
<view class="artFood-store-info col con-a">
<view class="artFood-store-name">海错图文创商店</view>
<view class="artFood-store-time">周一至周日 10:00-12:00</view>
</view>
</view>
<view class="artFood-tips-wrapper" wx:if="{{orderType === 'food'}}">
<Tips text="付款后一经确认不得退款"></Tips>
</view> </view>
</view> </view>
<view class="artFood-bottom-wrapper">
<view class="artFood-goods-title">确认商品</view>
<view class="artFood-goods-wrapper">
<view class="artFood-goods-item row" wx:for="{{goodsList}}" wx:key="id">
<view class="artFood-goods-img">
<image mode="widthFix" src="{{item.img}}"></image>
</view>
<view class="artFood-goods-name">{{item.name}}</view>
<view class="artFood-goods-data">
<view class="artFood-goods-price">
<text class="artFood-price-symbol">￥</text>
<text>{{item.price}}</text>
</view>
<view class="artFood-goods-num">x{{item.num}}</view>
</view>
</view>
<view class="artFood-total-price-wrapper row con-b">
<view class="artFood-total-text">总计</view>
<view class="artFood-total-price">
<text class="artFood-price-symbol">￥</text>
<text>181.80</text>
</view>
</view>
</view>
</view> -->
<!-- 活动 && 观影 -->
<view class="active-wrapper row">
<view class="active-img">
<image mode="widthFix" src="./image/active.png"></image>
</view>
<view class="active-info-wrapper">
<view class="active-info col">
<view class="active-name">拾光花坊插花分享会</view>
<view class="active-date">周一至周日 10:00-21:30</view>
</view>
<view class="active-price">
<text class="price-symbol">￥</text>
<text>360.00</text>
</view>
</view>
</view>
<!-- 购买须知 -->
<view class="notice-wrapper row con-e" bindtap="handleNotice"> <view class="notice-wrapper row con-e" bindtap="handleNotice">
<view class="notice">购买须知</view> <view class="notice">购买须知</view>
<l-icon name="right" color="#959DAA" size="22" /> <l-icon name="right" color="#959DAA" size="22" />
...@@ -56,27 +134,26 @@ ...@@ -56,27 +134,26 @@
<view class="choose-num">{{formItemNum}}</view> <view class="choose-num">{{formItemNum}}</view>
<view class="choose-edit" bindtap="handleItemNumEdit" data-operation="{{1}}">+</view> <view class="choose-edit" bindtap="handleItemNumEdit" data-operation="{{1}}">+</view>
</view> </view>
<view class="choose-wraning">每笔订单购买数量上限为20</view> <view class="choose-less row con-b align-e">
<view class="choose-wraning" wx:if="{{isVip}}">每笔订单购买数量上限为20</view>
<view class="choose-num-total"> <view class="choose-num-total">
<text>剩余库存：</text> <text>剩余库存：</text>
<text class="num-total">500</text> <text class="num-total">500</text>
</view> </view>
</view>
</view> </view>
<view class="vip-info-wrapper"> <view class="vip-info-wrapper">
<view class="vip-info-title">填写贵宾信息</view> <view class="vip-info-title" wx:if="{{orderType === '年卡'}}">填写贵宾信息</view>
<view class="tips-wrapper"> <view class="vip-info-title" wx:else >填写购买人信息</view>
<view class="vip-info-subTitle" wx:if="{{orderType !== '年卡'}}">仅用于接受订单确认短信</view>
<view class="tips-wrapper" wx:if="{{orderType === '年卡'}}">
<Tips text="凭年卡入园需出示身份证信息"></Tips> <Tips text="凭年卡入园需出示身份证信息"></Tips>
</view> </view>
<view class="vip-info"> <view class="vip-info">
<form> <form>
<view class="vip-item" wx:for="{{formList}}" wx:key="index"> <view class="vip-item" wx:for="{{formList}}" wx:key="index">
<view class="vip-info-no">年卡{{index+1}}</view> <view class="vip-info-no" wx:if="{{isVip}}">年卡{{index+1}}</view>
<!-- <view class="vip-input-wrapper" wx:for="{{item}}" wx:for-index="key" wx:for-item="value" wx:key="key">
<view class="vip-input-header">{{value}}</view>
<input class="vip-input {{required ? 'inputError' : ''}}" placeholder="请输入{{value}}" placeholder-class="input-place" data-type="{{key}}" bindblur="onInputBlur"></input>
<view wx:if="{{required}}" class="vip-input-tips">请填写{{value}}</view>
</view> -->
<view class="vip-input-wrapper" wx:if="{{item.name}}"> <view class="vip-input-wrapper" wx:if="{{item.name}}">
<view class="vip-input-header">{{item.name}}</view> <view class="vip-input-header">{{item.name}}</view>
<input class="vip-input {{errorName.length>0 ? 'inputError' : ''}}" placeholder="请输入{{item.name}}" placeholder-class="input-place" data-type="{{name}}" bindblur="onInputBlur"></input> <input class="vip-input {{errorName.length>0 ? 'inputError' : ''}}" placeholder="请输入{{item.name}}" placeholder-class="input-place" data-type="{{name}}" bindblur="onInputBlur"></input>
...@@ -111,6 +188,6 @@ ...@@ -111,6 +188,6 @@
<text>5600.00</text> <text>5600.00</text>
</view> </view>
<view class="pay-btn" bindtap="payOrder">立即支付</view> <view class="pay-btn" bindtap="payOrder">立即支付</view>
</view> </view>
<!-- 底部占位 --> <!-- 底部占位 -->
<Blank></Blank> <Blank></Blank>
pages/pay/order-input/order-input.wxss
/* 理想国 */
.card-wrapper { .card-wrapper {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
...@@ -8,6 +9,12 @@ ...@@ -8,6 +9,12 @@
background: linear-gradient(140deg, #F4D5C1 0%, #FA99CE 100%); background: linear-gradient(140deg, #F4D5C1 0%, #FA99CE 100%);
border-radius: 4rpx; border-radius: 4rpx;
} }
.month-bg {
background: linear-gradient(144deg, #B7D5F6 0%, #86B3E3 100%);
}
.once-bg {
background: linear-gradient(47deg, #122F3B 0%, rgba(14, 53, 70, 0) 100%);
}
.card-name, .card-price { .card-name, .card-price {
font-size: 42rpx; font-size: 42rpx;
font-weight: 500; font-weight: 500;
...@@ -19,7 +26,6 @@ ...@@ -19,7 +26,6 @@
.price-symbol { .price-symbol {
font-size: 26rpx; font-size: 26rpx;
} }
.card-times { .card-times {
margin-top: 80rpx; margin-top: 80rpx;
} }
...@@ -35,7 +41,6 @@ ...@@ -35,7 +41,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;
...@@ -51,7 +56,149 @@ ...@@ -51,7 +56,149 @@
height: 186rpx; height: 186rpx;
z-index: 2; z-index: 2;
} }
.once-card-bg {
opacity: .5;
width: 670rpx;
height: 356rpx;
}
.once-card-logo {
bottom: 58rpx;
}
/* spa */
.spa-wrapper,.artFood-store-wrapper {
width: 670rpx;
height: 216rpx;
margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
}
.spa-img, .artFood-store-img, .artFood-goods-img {
width: 140rpx;
height: 136rpx;
}
.spa-info, .artFood-store-info, .active-info-wrapper {
flex: 1;
padding-left: 32rpx;
}
.spa-title, .artFood-store-name {
color: #15191F;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 600;
}
.spa-price {
color: #5DB5DD;
font-size: 30rpx;
}
/* 文创 */
.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;
}
.artFood-bottom-wrapper {
width: 670rpx;
margin: 64rpx auto 0;
}
.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: 40rpx;
padding: 20rpx 24rpx 0 32rpx;
}
.artFood-goods-data {
width: 120rpx;
height: 80rpx;
margin-top: 20rpx;
text-align: right;
font-size: 26rpx;
}
.artFood-goods-price {
color: #15191F;
font-weight: 600;
line-height: 40rpx;
}
.artFood-goods-num {
color: #959DA9;
line-height: 40rpx;
}
.artFood-price-symbol {
font-size: 22rpx;
}
.artFood-total-price-wrapper {
margin-top: 24rpx;
height: 60rpx;
font-size: 26rpx;
}
.artFood-total-text {
color: #959DA9;
}
.artFood-total-price {
color: #5DB5DD;
}
.artFood-tips-wrapper {
margin: 40rpx auto 0;
}
/* 活动观影 */
.active-wrapper {
width: 670rpx;
height: 280rpx;
margin: 64rpx auto 0;
padding: 40rpx 32rpx;
background-color: #F5F6F8;
border-radius: 4rpx;
}
.active-img {
width: 150rpx;
height: 200rpx;
}
.active-info {
height: 158rpx;
}
.active-name {
color: #15191F;
font-size: 30rpx;
font-weight: 600;
line-height: 42rpx;
}
.active-date {
margin-top: 16rpx;
color: #656E7B;
font-size: 26rpx;
line-height: 36rpx;
}
.active-price {
color: #5DB5DD;
font-size: 30rpx;
}
/* 购买须知 */
.notice-wrapper { .notice-wrapper {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
...@@ -95,9 +242,7 @@ ...@@ -95,9 +242,7 @@
} }
.choose-num-wrapper { .choose-num-wrapper {
position: relative;
width: 670rpx; width: 670rpx;
height: 226rpx;
margin: 32rpx auto 0; margin: 32rpx auto 0;
} }
.choose-num-title { .choose-num-title {
...@@ -127,16 +272,11 @@ ...@@ -127,16 +272,11 @@
text-align: center; text-align: center;
} }
.choose-wraning { .choose-wraning {
position: absolute;
left: 0;
bottom: 0;
color: #D92B3A; color: #D92B3A;
font-size: 22rpx; font-size: 22rpx;
} }
.choose-num-total { .choose-num-total {
position: absolute; margin-top: 16rpx;
right: 0;
bottom: 0;
color: #15191F; color: #15191F;
font-size: 30rpx; font-size: 30rpx;
} }
...@@ -153,6 +293,11 @@ ...@@ -153,6 +293,11 @@
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
.vip-info-subTitle {
margin-top: 8rpx;
color: #959DA9;
font-size: 26rpx;
}
.tips-wrapper { .tips-wrapper {
margin-top: 24rpx; margin-top: 24rpx;
} }
......
project.config.json
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
}, },
{ {
"id": 7, "id": 7,
"name": "pages/commodity/snacks/snacks", "name": "pages/pay/order-input/order-input",
"pathName": "pages/commodity/snacks/snacks", "pathName": "pages/pay/order-input/order-input",
"query": "", "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