Skip to content

严立 / mini-shimao

Go to a project
Commit 1132be00 by wjw
Options

ww-能量补给站和订单详情修改

parent 6396b40c
Inline Side-by-side
Showing with 94 additions and 72 deletions
pages/commodity/snacks/snacks.wxml
<view class="cates">
<view class="cates_container">
<view class="cates-container">
<!-- 左边菜单 -->
<scroll-view scroll-y class="left_menu">
<scroll-view scroll-y class="left-menu">
<view
class="menu_item {{currentIndex === index ? 'active' : ''}}"
class="menu-item {{currentIndex === index ? 'active' : ''}}"
wx:for="{{leftMenuList}}"
wx:key="id"
bindtap="handleItemTap"
......@@ -13,73 +13,73 @@
</view>
</scroll-view>
<!-- 右边内容 -->
<scroll-view scroll-top="{{scrollTop}}" scroll-y class="right_content">
<view class="right_content_title">{{rightTitle}}</view>
<scroll-view scroll-top="{{scrollTop}}" scroll-y class="right-content">
<view class="right-content-title">{{rightTitle}}</view>
<view class="item row" wx:for="{{cart}}" wx:key="id" bindtap="handleAddCartPopup">
<view class="item_img">
<view class="item-img">
<image src="{{item.img}}" mode="widthFix"/>
</view>
<view class="item_info">
<view class="item_info_title">{{item.goods_name}}</view>
<view class="item_info_text_wrap">
<view class="item-info">
<view class="item-info-title">{{item.goods_name}}</view>
<view class="item-info-text-wrap">
<view wx:if="{{item.goods_text}}">{{item.goods_text}}</view>
<view wx:else class="item_info_content"></view>
<view wx:else class="item-info-content"></view>
</view>
<view class="item_info_now_price row align-c">
<view class="item-info-now-price row align-c">
<view>
<text class="price_symbol">￥</text>
<text class="price-symbol">￥</text>
<text class="price">{{item.goods_now_price}}</text>
</view>
<view
class="item_now_price_text {{item.goods_now_text === '业主价' ? 'vipPrice' : ''}}"
class="item-now-price-text {{item.goods_now_text === '业主价' ? 'vipPrice' : ''}}"
wx:if="{{item.goods_now_text}}"
>
{{item.goods_now_text}}
</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">
<image mode="widthFix" src="/image/add-w.png"></image>
</l-button>
</view>
</view>
<view class="item_info_old_price" wx:if="{{item.goods_old_price}}"><text>￥</text>{{item.goods_old_price}}</view>
<view class="item-info-old-price" wx:if="{{item.goods_old_price}}"><text>￥</text>{{item.goods_old_price}}</view>
</view>
</view>
<!-- 购物车按钮 -->
<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">
<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="../../../image/cart.png" mode="widthFix"></image>
</view>
</view>
</scroll-view>
<!-- 购物车弹窗 -->
<l-popup show="{{showPopup}}" content-align="center" locked="{{true}}">
<view class="popup_wrap">
<view class="popup_img_wrapper">
<view class="popup-wrap">
<view class="popup-img-wrapper">
<image mode="widthFix" src="./image/popup.png"></image>
</view>
<view class="popup_info_wrapper">
<view class="popuo_info_title">咖喱蔬菜大虾</view>
<view class="popup_info_text">新鲜可口的大虾，搭配咖喱与蔬菜，口感舒适，这个夏天，有你就够了</view>
<view class="popup-info-wrapper">
<view class="popuo-info-title">咖喱蔬菜大虾</view>
<view class="popup-info-text">新鲜可口的大虾，搭配咖喱与蔬菜，口感舒适，这个夏天，有你就够了</view>
</view>
<view class="popup_footer_wrapper">
<view class="popup_price_row row align-c">
<view class="popup_price_now">￥<text style="font-size: 38rpx">78.00</text></view>
<view class="popup_price_discount row con-c align-c {{popupObj.goods_now_text === '业主价' ? 'vipPrice' : ''}}">{{popupObj.goods_now_text}}</view>
<view class="popup_price_old">¥68.00</view>
<view class="popup-footer-wrapper">
<view class="popup-price-row row align-c">
<view class="popup-price-now">￥<text style="font-size: 38rpx">78.00</text></view>
<view class="popup-price-discount row con-c align-c {{popupObj.goods_now_text === '业主价' ? 'vipPrice' : ''}}">{{popupObj.goods-now-text}}</view>
<view class="popup-price-old">¥68.00</view>
</view>
<view class="popup_footer_btn row con-c align-c" bindtap="handleAddCart">加入购物车</view>
<view class="popup-footer-btn row con-c align-c" bindtap="handleAddCart">加入购物车</view>
</view>
</view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close">
<view class="popup-close-btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup-close">
<image mode="widthFix" src="../../../image/icon_close.png"></image>
</view>
</view>
</l-popup>
<!-- 添加成功 -->
<l-toast show="{{showAddSucc}}" l-image-class="toast-image" l-class="toast_bg" image="/image/success.png" title="添加购物车成功" />
<l-toast show="{{showAddSucc}}" l-image-class="toast-image" l-class="toast-bg" image="/image/success.png" title="添加购物车成功" />
</view>
</view>
<Blank></Blank>
pages/commodity/snacks/snacks.wxss
......@@ -4,11 +4,11 @@ Page {
.cates {
height: 100%;
}
.cates_container {
.cates-container {
height: 100vh;
display: flex;
}
.left_menu {
.left-menu {
width: 160rpx;
background: #F2F3F5;
......@@ -18,7 +18,7 @@ Page {
height: 0;
color: transparent;
}
.menu_item {
.menu-item {
height: 136rpx;
display: flex;
justify-content: center;
......@@ -26,24 +26,25 @@ Page {
font-size: 26rpx;
color: #656E7B;
}
.menu_item.active {
.menu-item.active {
color: #5CB5DD;
font-weight: 600;
background: #fff;
border-left: 8rpx solid #86C5E1;
}
.right_content {
.right-content {
position: relative;
flex: 1;
padding: 0 32rpx 0 28rpx;
}
.right_content_title {
.right-content-title {
height: 100rpx;
padding: 32rpx 0;
font-size: 26rpx;
color: #959DA9;
}
.cart_btn {
.cart-btn {
position: fixed;
right: 48rpx;
bottom: 160rpx;
......@@ -53,20 +54,21 @@ Page {
background-color: #86C5E1;
}
.cart_num {
.cart-num {
position: absolute;
top: 0;
right: 0;
height: 32rpx;
padding: 0 10rpx;
padding: 0 12rpx;
font-size: 22rpx;
line-height: 32rpx;
border: 1px solid #86C5E1;
border-radius: 17rpx;
color: #86C5E1;
background-color: #fff;
}
.cart_img_wrap {
.cart-img-wrap {
width: 48rpx;
height: 48rpx;
}
......@@ -77,46 +79,49 @@ Page {
box-sizing: border-box;
}
.item_img {
.item-img {
width: 160rpx;
height: 160rpx;
}
.item_info {
.item-info {
flex: 1;
margin-left: 28rpx;
}
.item_info_title {
.item-info-title {
font-size: 30rpx;
color: #15191F;
font-weight: 600;
}
.item_info_text_wrap {
.item-info-text-wrap {
width: 100%;
padding: 16rpx 0 24rpx;
font-size: 22rpx;
line-height: 32rpx;
color: #959DA9;
}
.item_info_content {
.item-info-content {
height: 40rpx;
}
.item_info_now_price {
.item-info-now-price {
font-size: 30rpx;
font-weight: 600;
color: #15191F;
}
.price_symbol {
.price-symbol {
font-size: 22rpx;
}
.item_now_price_text {
.item-now-price-text {
width: 78rpx;
height: 32rpx;
margin-left: 4px;
font-size: 18rpx;
font-size: 20rpx;
font-weight: 500;
color: #EF4E4E;
line-height: 32rpx;
text-align: center;
......@@ -130,7 +135,7 @@ Page {
opacity: 1;
}
.goods_add_btn_wrap {
.goods-add-btn-wrap {
flex: 1;
}
......@@ -140,33 +145,33 @@ Page {
}
.item_info_old_price {
.item-info-old-price {
margin-top: 4rpx;
font-size: 22rpx;
color: #959DA9;
text-decoration:line-through
}
.popup_wrap {
.popup-wrap {
position: relative;
width: 606rpx;
background-color: #fff;
border-radius: 4rpx;
}
.popup_img_wrap {
.popup-img-wrap {
width: 606rpx;
height: 382rpx;
}
.popup_info_wrapper {
.popup-info-wrapper {
padding: 48rpx 40rpx;
}
.popuo_info_title {
.popuo-info-title {
font-size: 34rpx;
color: #15191F;
}
.popup_info_text {
.popup-info-text {
margin-top: 24rpx;
font-size: 22rpx;
line-height: 32rpx;
......@@ -176,19 +181,19 @@ Page {
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
}
.popup_footer_wrapper {
.popup-footer-wrapper {
margin: 0 40rpx;
padding: 40rpx 0;
border-top: 1px solid #E2E7EF;
}
.popup_price_row {
.popup-price-row {
padding: 10rpx 0;
}
.popup_price_now {
.popup-price-now {
color: #15191F;
}
.popup_price_discount {
.popup-price-discount {
width: 90rpx;
height: 36rpx;
margin-left: 10px;
......@@ -205,13 +210,13 @@ Page {
opacity: 1;
}
.popup_price_old {
.popup-price-old {
margin-left: 20rpx;
font-size: 26rpx;
color: #959DA9;
text-decoration:line-through
}
.popup_footer_btn {
.popup-footer-btn {
width: 526rpx;
height: 80rpx;
margin-top: 30rpx;
......@@ -221,7 +226,7 @@ Page {
border-radius: 4rpx;
}
.popup_close_btn {
.popup-close-btn {
width: 80rpx;
height: 80rpx;
margin: 48rpx auto 0;
......@@ -229,12 +234,12 @@ Page {
border-radius: 50%;
}
.popup_close {
.popup-close {
width: 40rpx;
height: 40rpx;
}
.toast_bg {
.toast-bg {
min-width: 262rpx !important;
min-height: 262prx !important;
}
......
pages/pay/order-detail/order-detail.js
......@@ -21,7 +21,7 @@ Page({
// sealImg: './image/seal.png'
// },
ticketInfo: {
status: 0, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
status: 2, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
ticketType: 's',
store: '拾光花坊插花分享会',
date: '8月24日 10:00 - 12:30',
......
pages/pay/order-detail/order-detail.wxml
......@@ -5,7 +5,7 @@
<view class="ticket-wrapper">
<!-- 票券上 -->
<view class="ticket-main col">
<view class="ticket-main col {{ticketInfo.status !== 0 ? 'border-none' : ''}}">
<view class="ticket-row-store row {{ticketInfo.store.length>11?'align-s':'align-c'}}">
<view class="ticket-left">{{ticketInfo.type === 'movie' ? '电影' :'使用门店'}}</view>
<view class="ticket-right">
......@@ -147,7 +147,7 @@
</view>
<view class="footer-btn row con-e" wx:if="{{ticketInfo.status !== 0}}">
<view class="delete-btn" wx:if="!{{ticketInfo.status === 0 || ticketInfo.status === 1}}">删除订单</view>
<view class="delete-btn" wx:if="{{ticketInfo.status !== 0 && ticketInfo.status !== 1}}">删除订单</view>
<view class="order-btn" wx:if="{{ticketInfo.status === 1 || ticketInfo.status === 3 || ticketInfo.status === 5}}">{{orderBtnText}}</view>
</view>
......
pages/pay/order-detail/order-detail.wxss
......@@ -28,6 +28,9 @@
background-color: #F3F4F6;
border-bottom: 1px dashed #E2E7EF;
}
.border-none {
border-bottom: none;
}
.ticket-left {
width: 152rpx;
display: table-cell;
......@@ -110,6 +113,7 @@
color: #fff;
font-size: 30rpx;
text-align: center;
font-weight: 600;
}
.code-tips {
height: 92rpx;
......@@ -333,11 +337,11 @@
width: 134rpx;
height: 58rpx;
color: #5DB5DD;
font-size: 34rpx;
font-size: 40rpx;
font-weight: 600;
}
.order-price-symbol {
font-size: 30rpx;
font-size: 34rpx;
}
.order-title {
width: 100%;
......
project.config.json
......@@ -130,6 +130,19 @@
"pathName": "pages/pay/order-detail/order-detail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/home/home/home",
"pathName": "pages/home/home/home",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/commodity/snacks/snacks",
"pathName": "pages/commodity/snacks/snacks",
"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