Skip to content

严立 / mini-shimao

Go to a project
Commit be976f6f by wjw
Options

wjw--确认订单修改

parent b4da39a4
Expand all
Inline Side-by-side
Showing with 232 additions and 52 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: '年卡',
required: false, isVip: false,
isOld: true, required: false,
showNotice: false, isMonthCard: false,
formItemNum: 1, isOnceCard: true,
formItem: {}, isOld: true,
formList: [], showNotice: false,
formName: '', formItemNum: 1,
formPhone: '', formItem: {},
formIdNum: '', formList: [],
isSubmit: false formName: '',
formPhone: '',
formIdNum: '',
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 = '姓名'
...@@ -21,8 +41,18 @@ Page({ ...@@ -21,8 +41,18 @@ Page({
formItem.idNum = '身份证' formItem.idNum = '身份证'
formList.push(formItem) formList.push(formItem)
this.setData({ this.setData({
formItem, formItem,
formList formList
})
} else {
let formItem = {}
let formList = []
formItem.name = '姓名'
formItem.phone = '手机号'
formList.push(formItem)
this.setData({
formItem,
formList
}) })
} }
}, },
...@@ -33,9 +63,9 @@ Page({ ...@@ -33,9 +63,9 @@ Page({
}) })
}, },
payOrder() { payOrder() {
wx.reLaunch({ wx.reLaunch({
url: '/pages/paySucc/index', url: '/pages/paySucc/index',
}) })
}, },
handleItemNumEdit(e) { handleItemNumEdit(e) {
const operation = e.currentTarget.dataset.operation const operation = e.currentTarget.dataset.operation
......
pages/pay/order-input/order-input.json
{ {
"usingComponents": { "usingComponents": {
"Tips": "../../../component/Tips/Tips", "Tips": "../../../component/Tips/Tips",
"Blank": "../../../component/Blank/Blank" "Blank": "../../../component/Blank/Blank"
}, },
"navigationBarTitleText": "确认订单", "navigationBarTitleText": "确认订单",
"navigationStyle": "default", "navigationStyle": "default",
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff"
} }
\ No newline at end of file
pages/pay/order-input/order-input.wxss
/* 理想国 */
.card-wrapper { .card-wrapper {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
height: 356rpx; height: 356rpx;
margin: 64rpx auto 0; margin: 64rpx auto 0;
padding: 32rpx 40rpx; padding: 32rpx 40rpx;
color: #fff; color: #fff;
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;
...@@ -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,23 +41,164 @@ ...@@ -35,23 +41,164 @@
.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;
bottom: 0; bottom: 0;
} }
.card-bg { .card-bg {
width: 366rpx; width: 366rpx;
height: 356rpx; height: 356rpx;
z-index: 1; z-index: 1;
} }
.card-logo { .card-logo {
width: 308rpx; width: 308rpx;
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,18 +272,13 @@ ...@@ -127,18 +272,13 @@
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; color: #15191F;
bottom: 0; font-size: 30rpx;
color: #15191F;
font-size: 30rpx;
} }
.num-total { .num-total {
color: #86C5E1; color: #86C5E1;
...@@ -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