Skip to content

严立 / mini-shimao

Go to a project
Commit 3a64cb5f by 严立
Options

LL - 我的订单

parent 95118cd6
Expand all
Inline Side-by-side
Showing with 253 additions and 399 deletions
pages/commodity/project-detail/project-detail.js
......@@ -109,14 +109,17 @@ Page({
funcItem.priceType = 3
}
}
funcCommodityList.push(funcItem)
}
console.log(JSON.stringify(funcCommodityList))
break
// 普通商品
case 2:
// 门票商品
case 3:
default:
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'id': funcResponse[i].id, // 商品标识
......@@ -150,6 +153,7 @@ Page({
}
funcCommodityList.push(funcItem)
}
console.log(JSON.stringify(funcCommodityList))
break
}
......@@ -175,7 +179,7 @@ Page({
console.log(JSON.stringify(funcCommodityInfo))
wx.navigateTo({
url: '/pages/pay/order-input/order-input?type=1'
url: '/pages/pay/order-input/order-input?type=' + this.data.shopInfo.shopType
})
},
})
\ No newline at end of file
pages/commodity/project-detail/project-detail.wxml
......@@ -18,8 +18,26 @@
<text>{{item.describe}}</text>
</view>
<view class="project-price-wrapper row align-c">
<view class="price-special-msg" wx:if="{{item.isSpecial}}">
<!-- 活动价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 1}}">
<view class="item-price-discount row con-c align-c">
<text>活动价</text>
</view>
<view class="price-special">
<text class="price-symbol">￥</text>
<text>{{item.priceDiscountText}}</text>
<text class="price-unit" wx:if="{{item.unit}}">{{unitText}}</text>
</view>
<view class="price-old">
<text>￥</text>
<text>{{item.priceText}}</text>
<text class="price-old-unit" wx:if="{{item.unit}}">{{unitText}}</text>
</view>
</view>
<!-- 业主价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 2}}">
<view class="item-price-special row con-c align-c">
<text>业主价</text>
</view>
<view class="price-special">
......@@ -34,6 +52,18 @@
</view>
</view>
<!-- 普通价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 3}}">
<view class="price-special-msg row con-c align-c">
<text></text>
</view>
<view class="price-special">
<text class="price-symbol">￥</text>
<text>{{item.priceText}}</text>
<text class="price-unit" wx:if="{{item.unit}}">{{unitText}}</text>
</view>
</view>
<view class="project-btn" data-item="{{item}}" bindtap="onBuy">
<text>{{buyText}}</text>
</view>
......
pages/commodity/project-detail/project-detail.wxss
......@@ -13,44 +13,64 @@
margin-bottom: 48rpx;
border-radius: 4rpx;
}
.project-cover {
width: 670rpx;
height: 376rpx;
background-color: lightpink;
}
.project-info {
position: relative;
padding: 32rpx;
background-color: #fff;
}
.project-name {
color: #15191F;
font-size: 34rpx;
font-weight: 600;
line-height: 48rpx;
}
.project-msg {
margin-top: 16rpx;
color: #959DA9;
font-size: 26rpx;
line-height: 36rpx;
}
.project-price-wrapper {
height: 64rpx;
margin-top: 40rpx;
line-height: 64rpx;
}
.price-special-msg {
.item-price-discount {
width: 78rpx;
height: 32rpx;
margin-right: 12rpx;
color: #E8D0AF;
border-radius: 4px;
background: #FAEDEA;
font-size: 18rpx;
text-align: center;
line-height: 32rpx;
font-weight: 500;
line-height: 26rpx;
color: #EF4E4E;
}
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
border-radius: 4rpx;
font-size: 18rpx;
font-weight: 500;
line-height: 26rpx;
color: #E8D0AF;
}
.price-special {
margin-right: 12rpx;
color: #EF4E4E;
......@@ -58,23 +78,27 @@
line-height: 34rpx;
font-weight: 600;
}
.price-symbol {
font-size: 24rpx;
}
.price-unit {
font-size: 20rpx;
}
.price-old {
margin-top: 10rpx;
color: #959DA9;
font-size: 22rpx;
line-height: 32rpx;
letter-spacing: 1rpx;
text-decoration: line-through;
}
.price-old-unit {
font-size: 18rpx;
}
.project-btn {
position: absolute;
right: 32rpx;
......
pages/home/home/home.js
......@@ -8,6 +8,7 @@ let logicData = {
Page({
data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
// 导航栏相关属性
navigationStyle: {
......
pages/mine/order/order.wxml
......@@ -10,26 +10,43 @@
<view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType">
<view>
<view class="order-type-row row con-b align-c">
<view class="order-type-item row con-c align-c {{orderTypeTitle === '全部分类' ? 'order-type-item-active' : ''}}" data-id="全部分类" bindtap="onOrderTypeSelection">
<text>全部分类</text>
</view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === '门票' ? 'order-type-item-active' : ''}}" data-id="门票" bindtap="onOrderTypeSelection">
<text>门票</text>
</view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === '餐饮' ? 'order-type-item-active' : ''}}" data-id="餐饮" bindtap="onOrderTypeSelection">
<text>餐饮</text>
</view>
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view
wx:if="{{index < 3}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}"
data-index="{{index}}"
bindtap="onOrderTypeSelection"
>
<text>{{item.name}}</text>
</view>
</block>
</view>
<view class="order-type-row row con-b align-c">
<view class="order-type-item row con-c align-c {{orderTypeTitle === '影票' ? 'order-type-item-active' : ''}}" data-id="影票" bindtap="onOrderTypeSelection">
<text>影票</text>
</view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === 'SPA' ? 'order-type-item-active' : ''}}" data-id="SPA" bindtap="onOrderTypeSelection">
<text>SPA</text>
</view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === '文创' ? 'order-type-item-active' : ''}}" data-id="文创" bindtap="onOrderTypeSelection">
<text>文创</text>
</view>
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view
wx:if="{{3 <= index && index < 6}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}"
data-index="{{index}}"
bindtap="onOrderTypeSelection"
>
<text>{{item.name}}</text>
</view>
</block>
</view>
<view class="order-type-row row con-b align-c">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view
wx:if="{{6 <= index && index < 9}}"
class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}"
data-index="{{index}}"
bindtap="onOrderTypeSelection"
>
<text>{{item.name}}</text>
</view>
</block>
</view>
</view>
</view>
......@@ -45,10 +62,10 @@
<view class="order-list col con-c align-c">
<block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="order-list-item col align-c">
<view class="order-list-item col align-c" data-item="{{item}}" bindtap="onOrderDetail">
<view class="order-list-item-title row con-b align-c">
<view class="row align-c">
<image src=""></image>
<image wx:if="{{item.logo}}" src="{{resourcesBase + 'commodity/' + item.logo}}"></image>
<text>{{item.name}}</text>
</view>
<view>
......@@ -60,29 +77,34 @@
<text class="message" wx:if="{{item.status === 5}}">已评价</text>
</view>
</view>
<!-- 商品数量样式一 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length === 1}}">
<image class="cover" src=""></image>
<image class="cover" src="{{item.commodity[0].cover}}"></image>
<text class="name">精灵鸟理想国单人次票精灵鸟理想国单人次票</text>
<text class="total">{{'x ' + item.total}}</text>
</view>
<!-- 商品数量样式二 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}">
<block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem" wx:key="commodityIndex">
<image class="cover" src=""></image>
<image class="cover" src="{{commodityItem.cover}}"></image>
</block>
<text class="total">{{'共 ' + item.total + ' 件'}}</text>
</view>
<view class="order-list-item-operation row con-b align-c">
<view class="row align-c">
<text class="amount">实付:</text>
<text class="amount">¥20.00</text>
</view>
<view class="row align-c">
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c">取消订单</button>
<button wx:if="{{item.status >= 3}}" class="delete row con-c align-c">删除订单</button>
<button wx:if="{{item.status === 0}}" class="again row con-c align-c">去支付</button>
<button wx:if="{{item.status === 1}}" class="again row con-c align-c">去使用</button>
<button wx:if="{{item.status === 2}}" class="again row con-c align-c">去评价</button>
<button wx:if="{{item.status === 3}}" class="again row con-c align-c">再次下单</button>
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderCancel">取消订单</button>
<button wx:if="{{item.status >= 3}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button wx:if="{{item.status === 0}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
<button wx:if="{{item.status === 1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view>
</view>
</view>
......
pages/mine/order/order.wxss
......@@ -26,6 +26,11 @@
font-size: 26rpx;
}
.order-type image {
width: 32rpx;
height: 32rpx;
}
/* 订单类型选择 */
.order-type-selection {
z-index: 1700;
......@@ -39,7 +44,7 @@
.order-type-selection > view {
width: 750rpx;
height: 240rpx;
min-height: 240rpx;
padding-top: 10rpx;
border-radius: 0px 0px 24rpx 24rpx;
background: #FFFFFF;
......
pages/pay/order-detail/order-detail.wxss
.order-status {
width: 670rpx;
height: 240rpx;
margin: 64rpx auto 0;
padding-left: 32rpx;
color: #15191F;
background-color: #ECF4F8;
}
.status-text {
font-size: 54rpx;
font-weight: 600;
}
.status-tips {
margin-top: 24rpx;
}
.bgPink {
background-color: #F3E1E1;
/* 订单状态 */
.state {
width: 750rpx;
}
.ticket-wrapper {
width: 670rpx;
margin: 64rpx auto 0;
}
.ticket-main {
position: relative;
width: 100%;
padding: 48rpx 32rpx 46rpx;
background-color: #F3F4F6;
border-bottom: 1px dashed #E2E7EF;
}
.border-none {
border-bottom: none;
}
.ticket-left {
width: 152rpx;
display: table-cell;
vertical-align: bottom;
font-size: 26rpx;
color: #959DA9;
}
.ticket-right {
flex: 1;
font-size: 26rpx;
}
.ticket-store {
font-size: 38rpx;
color: #15191F;
font-weight: 600;
}
.ticket-row-time, .ticket-row-phone {
margin-top: 16rpx;
}
.ticket-time, .ticket-address, .ticket-date {
font-size: 30rpx;
line-height: 42rpx;
.state-content {
width: 670rpx;
height: 240rpx;
padding: 0 32rpx;
border-radius: 4px;
background: #F3E1E1;
}
.ticket-info {
margin-top: 48rpx;
.state-content-invalid {
background: #ECF4F8;
}
.seal-wrapper {
position: absolute;
right: 0;
bottom: -32rpx;
width: 166rpx;
height: 200rpx;
}
.seal {
width: 100%;
height: 100%;
.state-content-title text {
height: 76rpx;
font-size: 54rpx;
font-weight: 500;
line-height: 76rpx;
color: #15191F;
}
.circle {
position: absolute;
left: -18rpx;
bottom: -18rpx;
width: 36rpx;
height: 36rpx;
border-radius: 50%;
background-color: #fff;
.state-content-tip {
margin-top: 24rpx;
}
.ticket-footer {
padding: 50rpx 32rpx 24rpx;
background-color: #F3F4F6;
}
.ticket-footer-top {
font-size: 34rpx;
color: #15191F;
}
.ticket-footer-middle {
width: 606rpx;
height: 96rpx;
line-height: 96rpx;
margin: 40rpx 0;
color: #fff;
text-align: center;
background-color: #86C5E1;
border-radius: 4rpx;
}
.ticket-footer-bottom {
font-size: 26rpx;
color: #959DAA;
.state-content-tip text {
height: 36rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
color: #15191F;
}
/* 扫码弹窗 */
.scan-code-wrapper {
}
.code-header {
height: 70rpx;
color: #fff;
font-size: 30rpx;
text-align: center;
font-weight: 600;
}
.code-tips {
height: 92rpx;
color: #fff;
font-size: 26rpx;
text-align: center;
}
.code-main {
width: 750rpx;
height: 666rpx;
}
.code-item {
position: relative;
width: 526rpx;
height: 666rpx;
background-color: #fff;
border-radius: 4rpx;
}
.item-center {
margin-left: 112rpx;
}
.code-item-title {
color: #15191F;
font-size: 30rpx;
font-weight: 600;
}
.code-img {
position: relative;
width: 296rpx;
height: 296rpx;
margin: 56rpx 0;
}
.code-img-used {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: #FFFFFF;
opacity: .9;
z-index: 10;
}
.code-num-wrapper {
width: 446rpx;
height: 96rpx;
padding: 0 24rpx;
background-color: #F2F3F5;
border-radius: 4rpx;
line-height: 96rpx;
}
.code-num-title {
color: #959DA9;
text-decoration: none !important;
font-size: 26rpx;
}
.code-num {
color: #15191F;
font-size: 30rpx;
}
.code-used {
color: #C2C7CF;
text-decoration: line-through;
}
.num-copy {
color: #5DB5DD;
font-size: 26rpx;
}
.code-used-seal {
position: absolute;
right: -68rpx;
transform: translateY(56rpx);
width: 254rpx;
height: 254rpx;
z-index: 11;
}
.img-num {
width: 65rpx;
margin-top: 54rpx;
}
.current-img-num {
color: #fff;
font-size: 34rpx;
}
.symbol-img-num, .total-img-num {
color: #979797;
font-size: 26rpx;
}
.code-close-btn {
width: 80rpx;
height: 80rpx;
margin-top: 35rpx;
background: rgba(254, 252, 249, 0.5);
border-radius: 50%;
}
.code-close-btn image {
width: 60%;
/* 订单信息 */
.info-content {
width: 670rpx;
min-height: 206rpx;
padding: 48rpx 32rpx;
background: #F3F4F6;
border-radius: 4px;
overflow: hidden;
}
.l-popup-bg {
background: rgba(0, 0, 0, .4);
.info-content-item {
position: relative;
margin-top: 16rpx;
}
.tips-wrapper {
margin: 40rpx 40rpx 0;
}
.notice-wrapper {
width: 100%;
height: 100rpx;
padding: 0 40rpx;
line-height: 100rpx;
}
.notice {
margin-right: 8rpx;
color: #15191F;
font-size: 26rpx;
}
.notice-popup-wrapper {
padding: 56rpx 40rpx 68rpx;
background-color: #fff;
border-radius: 24rpx 24rpx 0 0;
}
.notice-popup-title {
width: 100%;
height: 90rpx;
}
.notice-content {
max-height: 896rpx;
.info-content-item-label {
width: 104rpx;
height: 36rpx;
margin-right: 48rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
color: #959DA9;
}
.info-content-item-title {
position: relative;
top: -8rpx;
width: 454rpx;
min-height: 52rpx;
.goods-wrapper {
padding: 32rpx 40rpx 0;
}
.goods-title {
color: #15191F;
font-size: 34rpx;
font-weight: 600;
}
.goods-list {
margin-top: 40rpx;
padding: 0 32rpx 14rpx;
background-color: #F5F6F8;
}
.goods-list-title-wrapper {
width: 100%;
height: 132rpx;
}
.goods-list-title-img {
min-width: 40rpx;
min-height: 54rpx;
max-width: 74rpx;
max-height: 74rpx;
}
.goods-list-title {
margin-left: 16rpx;
color: #15191F;
font-size: 26rpx;
font-weight: 600;
}
.goods-item {
margin-bottom: 22rpx;
padding-bottom: 22rpx;
border-bottom: 1px solid #E2E7EF;
}
.goods-item:last-child {
margin-bottom: 0rpx;
border-bottom: none;
}
.goods-item-img {
width: 140rpx;
height: 136rpx;
}
.goods-item-info {
flex: 1;
padding-left: 24rpx;
}
.goods-item-info-text {
color: #15191F;
font-size: 26rpx;
font-weight: 600;
display: -webkit-box;
overflow: hidden;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.goods-item-info-price {
color: #15191F;
font-weight: 600;
}
.price-symbol {
font-size: 22rpx;
}
.price{
font-size: 26rpx;
}
.goods-item-btn {
width: 120rpx;
height: 56rpx;
margin-top: 40rpx;
margin-left: 32rpx;
color: #fff;
font-size: 22rpx;
text-align: center;
line-height: 56rpx;
background-color: #86C5E1;
border-radius: 4rpx;
}
.disabled {
background-color: #C8E1EC;
word-wrap: break-word;
font-size: 38rpx;
font-weight: 500;
line-height: 52rpx;
color: #15191F;
}
.order-info-wrapper {
position: relative;
width: 670rpx;
margin: 64rpx 40rpx 64rpx;
}
.order-price {
position: absolute;
top: 0;
right: 0;
width: 134rpx;
height: 58rpx;
color: #5DB5DD;
font-size: 40rpx;
font-weight: 600;
.info-content-item-describe {
height: 42rpx;
font-size: 30rpx;
font-weight: 500;
line-height: 42rpx;
color: #15191F;
}
.order-price-symbol {
font-size: 34rpx;
.info-content-item-tip {
height: 36rpx;
font-size: 26rpx;
font-weight: 500;
line-height: 36rpx;
color: #15191F;
}
.order-title {
width: 100%;
line-height: 68rpx;
font-size: 34rpx;
font-weight: 600;
/* 商品信息 */
.commodity {
margin: 0 40rpx;
}
.order-info {
margin-top: 22rpx;
.commodity-title {
height: 48rpx;
font-size: 34rpx;
font-weight: 500;
line-height: 48px;
color: #15191F;
}
.order-item {
width: 100%;
color: #959DA9;
font-size: 22rpx;
line-height: 42rpx;
.commodity-list {
width: 670rpx;
height: 676rpx;
padding: 40rpx;
border-radius: 4px;
background: #F3F4F6;
}
.footer-btn {
padding: 32rpx 20rpx 0;
border-top: 1px solid #E2E7EF;
.commodity-shop-info > image {
max-width: 62rpx;
max-height: 62rpx;
margin-right: 16rpx;
background: #999999;
}
.delete-btn, .order-btn {
width: 200rpx;
line-height: 96rpx;
margin-right: 24rpx;
border-radius: 4rpx;
font-size: 30rpx;
font-weight: 600;
text-align: center;
.commodity-item {
width: 606rpx;
height: 184rpx;
border-bottom: 1px #E2E7EF solid;
}
.delete-btn {
color: #656E7B;
background-color: #fff;
border: 1px solid #C2C7CF;
.commodity-item > image {
width: 140rpx;
height: 136rpx;
margin-right: 24rpx;
background: #999999;
}
.order-btn {
color: #fff;
background-color: #86C5E1;
.commodity-item-info {
width: 290rpx;
}
image {
width: 100%;
height: 100%;
.commodity-item-operation {
width: 290rpx;
margin-right: 32rpx;
}
.commodity-item-operation > button {
width: 120rpx;
height: 56rpx;
border-radius: 4px;
background: #86C5E1;
font-size: 22rpx;
font-weight: 500;
line-height: 32rpx;
color: #FFFFFF;
}
\ No newline at end of file
pages/pay/order-input/order-input.js
......@@ -485,6 +485,8 @@ Page({
}
}
}
console.log('inspectData', funcPass)
return funcPass
},
......@@ -550,10 +552,10 @@ Page({
'package': funcResponse.package,
'signType': funcResponse.signType,
'paySign': funcResponse.paySign,
'success': function (response) {
'success': (response) => {
if (response.errMsg === 'requestPayment:ok') {
// 用户点击支付完成按钮回调
// This.payStatus(true)
this.payStatus(true)
}
if (response.errMsg === 'requestPayment:fail cancel') {
......
project.config.json
......@@ -8,6 +8,7 @@
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
......@@ -19,18 +20,18 @@
"checkInvalidKey": true,
"checkSiteMap": false,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"preloadBackgroundData": false,
"compileHotReLoad": false,
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": true,
"useApiHook": false,
"packNpmManually": false,
"packNpmRelationList": []
},
......
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