Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
严立
/
mini-shimao
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
69245f71
authored
Sep 18, 2020
by
zqm
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
MM - 订单操作确认框,核销权限,logo图显示
parent
f6b14b04
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
275 additions
and
154 deletions
pages/mine/home/home.js
pages/mine/home/home.wxml
pages/mine/order/order.js
pages/mine/order/order.wxml
pages/mine/order/order.wxss
pages/pay/order-detail/order-detail.js
pages/pay/order-detail/order-detail.wxml
pages/pay/order-detail/order-detail.wxss
pages/mine/home/home.js
View file @
69245f71
...
...
@@ -6,6 +6,7 @@ Page({
* 页面的初始数据
*/
data
:
{
isCheckPermission
:
false
,
imageBase
:
App
.
globalData
.
appImageBase
,
orderType
:
1
,
// 1 - 年卡/月卡,2 - 次票, 3 - SPA, 4 - 文创, 5 - 餐品, 6 - 活动, 7 - 观影
...
...
@@ -113,6 +114,35 @@ Page({
url
:
'/pages/pay/coupon-input/coupon-input'
,
})
},
// 获取核销权限
// api/v1/login/getPermissions权限更上去了
getPermissions
()
{
let
that
=
this
App
.
wxRequest
({
url
:
'/api/v1/login/getPermissions'
,
data
:
{
permission
:
'sys:role:distinguish'
},
success
:
function
(
res
)
{
console
.
log
(
res
,
'核销'
);
let
data
=
res
.
data
let
isPer
=
false
if
(
data
.
length
>
0
)
{
//有核销权限
isPer
=
true
}
else
{
// 无核销权限
isPer
=
false
}
that
.
setData
({
isCheckPermission
:
isPer
})
}
})
},
//获取待使用订单
getWillUseOrders
()
{
let
that
=
this
...
...
@@ -200,6 +230,7 @@ Page({
this
.
getMyActivityList
()
this
.
getCardList
()
this
.
getWillUseOrders
()
this
.
getPermissions
()
}
else
{
this
.
setData
({
isRegister
:
false
,
...
...
pages/mine/home/home.wxml
View file @
69245f71
...
...
@@ -47,7 +47,7 @@
</view>
</view>
<view class="coupon row align-c" bindtap="goCouponInput">
<view class="coupon row align-c" bindtap="goCouponInput"
wx:if="{{isCheckPermission}}"
>
<view class="cpopon-info col">
<text>券码核销</text>
<text>所属门店:拾光花坊</text>
...
...
pages/mine/order/order.js
View file @
69245f71
...
...
@@ -100,13 +100,18 @@ Page({
'status'
:
Number
(
funcResponse
[
i
].
status
),
'amount'
:
funcResponse
[
i
].
totalMoney
,
'commodity'
:
[],
'commodityBackup'
:
[],
'commoditySlice3'
:
[],
'commodityType'
:
Number
(
funcResponse
[
i
].
goodType
),
'wxRequest'
:
funcResponse
[
i
].
wxRequest
'wxRequest'
:
funcResponse
[
i
].
wxRequest
,
'total'
:
funcResponse
[
i
].
smOrderDetails
.
length
}
// 添加订单商品列表
let
funcTotal
=
0
let
funcCommodity
=
funcResponse
[
i
].
smOrderDetails
let
commodityBackup
=
[]
for
(
let
ii
=
0
,
ll
=
funcCommodity
.
length
;
ii
<
ll
;
ii
++
)
{
let
funcCommodityItem
=
{
'cover'
:
funcCommodity
[
ii
].
imgUrl
,
...
...
@@ -116,7 +121,13 @@ Page({
}
funcTotal
=
funcTotal
+
funcCommodityItem
.
quantity
funcItem
.
commodity
.
push
(
funcCommodityItem
)
funcItem
.
commodityBackup
.
push
(
funcCommodityItem
)
}
// 处理大于三条数据的问题
if
(
funcItem
.
commodity
.
length
>
3
)
{
funcItem
.
commoditySlice3
=
funcItem
.
commodityBackup
.
slice
(
0
,
3
)
}
funcItem
.
total
=
funcTotal
// 映射门店信息
...
...
@@ -275,40 +286,48 @@ Page({
*/
onOrderCancel
:
function
(
event
)
{
let
that
=
this
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
})
let
funcItem
=
event
.
target
.
dataset
.
item
// let index = event.target.dataset.index
// // 无刷新更新数据
// let status = `orderList[${index}].status`
// this.setData({
// [status]:-1
// })
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
funcItem
.
id
,
'type'
:
0
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
that
.
setData
({
isDoing
:
false
})
that
.
setData
({
'orderList'
:
[],
'orderPages'
:
1
,
})
that
.
queryOrder
()
wx
.
lin
.
showDialog
({
type
:
"confirm"
,
title
:
""
,
content
:
"是否确认取消订单"
,
success
:
(
res
)
=>
{
if
(
res
.
confirm
)
{
console
.
log
(
'用户点击确定'
)
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
})
let
funcItem
=
event
.
target
.
dataset
.
item
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
funcItem
.
id
,
'type'
:
0
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
that
.
setData
({
isDoing
:
false
})
that
.
setData
({
'orderList'
:
[],
'orderPages'
:
1
,
})
that
.
queryOrder
()
}
})
}
else
if
(
res
.
cancel
)
{
console
.
log
(
'用户点击取消'
)
}
}
})
},
/**
...
...
@@ -319,29 +338,42 @@ Page({
*/
onOrderRemove
:
function
(
event
)
{
let
that
=
this
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
})
let
funcItem
=
event
.
target
.
dataset
.
item
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
funcItem
.
id
,
'type'
:
1
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
that
.
setData
({
isDoing
:
false
,
'orderList'
:
[],
'orderPages'
:
1
,
})
that
.
queryOrder
()
console
.
log
(
response
)
wx
.
lin
.
showDialog
({
type
:
"confirm"
,
title
:
""
,
content
:
"是否确认删除订单"
,
success
:
(
res
)
=>
{
if
(
res
.
confirm
)
{
console
.
log
(
'用户点击确定'
)
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
})
let
funcItem
=
event
.
target
.
dataset
.
item
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
funcItem
.
id
,
'type'
:
1
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
that
.
setData
({
isDoing
:
false
,
'orderList'
:
[],
'orderPages'
:
1
,
})
that
.
queryOrder
()
console
.
log
(
response
)
}
})
}
else
if
(
res
.
cancel
)
{
console
.
log
(
'用户点击取消'
)
}
}
})
...
...
pages/mine/order/order.wxml
View file @
69245f71
...
...
@@ -13,21 +13,27 @@
<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="{{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">
<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">
<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">
<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">
<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>
...
...
@@ -39,7 +45,8 @@
<view class="container-order">
<view class="status row con-b align-c fixed-tab">
<block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="status-item row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}" data-type="{{index}}" bindtap="onSelectionStatus">
<view class="status-item row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}"
data-type="{{index}}" bindtap="onSelectionStatus">
<text>{{item.name}}</text>
</view>
</block>
...
...
@@ -50,7 +57,9 @@
<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 wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="heightFix"></image>
<view class="logo-box">
<image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image>
</view>
<text>{{item.name}}</text>
</view>
<view>
...
...
@@ -71,24 +80,39 @@
</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="{{commodityItem.cover}}"></image>
<block wx:if="{{item.commodity.length>3}}">
<block wx:for="{{item.commoditySlice3}}" wx:for-index="commodityIndex" wx:for-item="commodityItem"
wx:key="commodityIndex">
<image class="cover" src="{{commodityItem.cover}}"></image>
</block>
</block>
<block wx:else>
<block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem"
wx:key="commodityIndex">
<image class="cover" src="{{commodityItem.cover}}"></image>
</block>
</block>
<text class="total">{{'共 ' + item.commodity.length + ' 件'}}</text>
</view>
<text class="total">{{'共 ' + item.commodityBackup.length + ' 件'}}</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">¥{{item.amount}}</text>
</view>
<view class="row align-c">
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-index="{{index}}"
data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}"
class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c align-c"
data-item="{{item}}" catchtap="onOrderPay">去支付</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c align-c"
data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c align-c"
data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c align-c"
data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view>
</view>
</view>
...
...
@@ -132,4 +156,6 @@
<image src="{{imageBase + 'icon/close-1.png'}}"></image>
</view>
</view>
</view>
\ No newline at end of file
</view>
<!-- 确认框 -->
<l-dialog />
\ No newline at end of file
pages/mine/order/order.wxss
View file @
69245f71
...
...
@@ -149,10 +149,10 @@ page {
}
.order-list-item-title image {
display: block;
/*
display: block;
max-width: 100rpx;
height: 60rpx;
margin-right: 20rpx;
margin-right: 20rpx;
*/
}
.order-list-item-service {
...
...
@@ -337,4 +337,17 @@ page {
text-align: center;
background: #86C5E1;
border-radius: 4rpx;
}
.logo-box {
width: 100rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
}
.logo-box image {
max-width: 100%!important;
max-height: 100%!important;
}
\ No newline at end of file
pages/pay/order-detail/order-detail.js
View file @
69245f71
...
...
@@ -25,7 +25,7 @@ Page({
sealSrc
:
''
,
shopConfig
:
App
.
globalData
.
shopId
,
imgBasehost
:
App
.
globalData
.
appResourcesBase
},
...
...
@@ -87,65 +87,66 @@ Page({
})
},
// 删除订单&取消订单
// type :1删除0取消
onDelOrCancelOrder
:
function
(
event
)
{
// wx.lin.showDialog({
// type: "confirm",
// title: "",
// content: "是否确认核销券码",
// success: (res) => {
// if (res.confirm) {
// console.log('用户点击确定')
// that.doVolume()
// } else if (res.cancel) {
// console.log('用户点击取消')
// }
// }
// })
let
type
=
event
.
currentTarget
.
dataset
.
type
let
that
=
this
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
,
})
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
this
.
data
.
orderInfo
.
id
,
'type'
:
type
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
let
winToastText
=
type
==
1
?
'订单删除成功'
:
'订单取消成功'
that
.
setData
({
isDoing
:
false
,
winToast
:
true
,
winToastText
:
winToastText
})
setTimeout
(
function
()
{
if
(
type
==
1
)
{
// 删除操作
wx
.
redirectTo
({
url
:
'/pages/mine/order/order'
,
})
}
else
{
// 取消操作
let
state
=
`orderInfo.state`
that
.
setData
({
isDoing
:
false
,
[
state
]:
-
1
})
}
let
tip
=
type
==
1
?
'删除订单'
:
'取消订单'
wx
.
lin
.
showDialog
({
type
:
"confirm"
,
title
:
""
,
content
:
"是否确认"
+
tip
,
success
:
(
res
)
=>
{
if
(
res
.
confirm
)
{
console
.
log
(
'用户点击确定'
)
wx
.
showLoading
({
title
:
'处理中'
,
mask
:
true
})
this
.
setData
({
isDoing
:
true
,
})
App
.
wxRequest
({
url
:
'/api/v1/order/cancelOrder'
,
data
:
{
'orderId'
:
this
.
data
.
orderInfo
.
id
,
'type'
:
type
,
},
success
:
(
response
)
=>
{
wx
.
hideLoading
()
let
winToastText
=
type
==
1
?
'订单删除成功'
:
'订单取消成功'
that
.
setData
({
isDoing
:
false
,
winToast
:
true
,
winToastText
:
winToastText
})
setTimeout
(
function
()
{
if
(
type
==
1
)
{
// 删除操作
wx
.
redirectTo
({
url
:
'/pages/mine/order/order'
,
})
}
else
{
// 取消操作
let
state
=
`orderInfo.state`
that
.
setData
({
isDoing
:
false
,
[
state
]:
-
1
})
}
},
2000
)
},
2000
)
}
})
}
else
if
(
res
.
cancel
)
{
console
.
log
(
'用户点击取消'
)
}
}
})
},
// 使用须知
handleNotice
()
{
...
...
@@ -219,22 +220,20 @@ Page({
'tipTimePay'
:
App
.
modular
.
miment
(
funcResponse
.
paymentTime
).
format
(
'YYYY-MM-DD hh:mm:ss'
),
'tipIntegral'
:
funcResponse
.
integral
,
'officeName'
:
funcResponse
.
officeName
,
'wxRequest'
:
funcResponse
.
wxRequest
'wxRequest'
:
funcResponse
.
wxRequest
,
'businessTime'
:
funcResponse
.
businessTime
,
//营业时间
'expireTime'
:
funcResponse
.
expireTime
,
//订单有效期
}
// 设置印章
let
shopName
=
funcResponse
.
officeName
;
let
shopFilter
=
this
.
data
.
shopConfig
.
filter
(
item
=>
{
return
item
.
name
.
toLowerCase
()
==
shopName
.
toLowerCase
()
}
)
funcOrderInfo
.
shopInfo
=
shopFilter
[
0
]
console
.
log
(
shopFilter
[
0
],
'-----------shopFilter[0]------'
);
// 添加订单商品列表
let
funcCommodity
=
funcResponse
.
smOrderDetails
for
(
let
i
=
0
,
l
=
funcCommodity
.
length
;
i
<
l
;
i
++
)
{
...
...
pages/pay/order-detail/order-detail.wxml
View file @
69245f71
...
...
@@ -55,9 +55,9 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-describe">
周一至周日 10:00 - 20:00
</text>
<text class="info-content-item-describe">
{{orderInfo.businessTime}}
</text>
</view>
<image class="seal-shot" src="{{
imgBasehost
+orderInfo.shopInfo.print}}"></image>
<image class="seal-shot" src="{{
resourcesBase
+orderInfo.shopInfo.print}}"></image>
</view>
</block>
...
...
@@ -71,7 +71,7 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-describe">
周一至周日 10:00 - 20:00
</text>
<text class="info-content-item-describe">
{{orderInfo.businessTime}}
</text>
</view>
<view class="info-content-item row">
...
...
@@ -82,19 +82,19 @@
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
imgBasehost
+orderInfo.shopInfo.print}}"></image>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
resourcesBase
+orderInfo.shopInfo.print}}"></image>
</view>
<block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c">
<view class="info-line-point-left"></view>
<view class="info-line-line"></view>
<view class="info-line-point-right"></view>
<image class="seal-long" src="{{
imgBasehost
+orderInfo.shopInfo.printUse}}"></image>
<image class="seal-long" src="{{
resourcesBase
+orderInfo.shopInfo.printUse}}"></image>
</view>
<view class="info-code col con-c align-c">
<text>{{'件商品可用'}}</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{
'2019.09.30 - 2020.12.30'
}}</text>
<text>{{
orderInfo.expireTime
}}</text>
</view>
</block>
</block>
...
...
@@ -107,7 +107,7 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-describe">
周一至周日 10:00 - 20:00
</text>
<text class="info-content-item-describe">
{{orderInfo.businessTime}}
</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
...
...
@@ -117,21 +117,21 @@
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
imgBasehost
+orderInfo.shopInfo.print}}"></image>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
resourcesBase
+orderInfo.shopInfo.print}}"></image>
</view>
<block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c">
<view class="info-line-point-left"></view>
<view class="info-line-line"></view>
<view class="info-line-point-right"></view>
<image class="seal-long" src="{{
imgBasehost
+orderInfo.shopInfo.printUse}}"></image>
<image class="seal-long" src="{{
resourcesBase
+orderInfo.shopInfo.printUse}}"></image>
</view>
<view class="info-code col con-c align-c">
<text wx:if="{{orderInfo.commodityType === 5}}">{{'1件餐品可用'}}</text>
<text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text>
<text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{
'2019.09.30 - 2020.12.30'
}}</text>
<text>{{
orderInfo.expireTime
}}</text>
</view>
</block>
</block>
...
...
@@ -146,7 +146,7 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label">活动时间</text>
<text class="info-content-item-describe">
周一至周日 10:00 - 20:00
</text>
<text class="info-content-item-describe">
{{orderInfo.businessTime}}
</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">活动地点</text>
...
...
@@ -160,19 +160,19 @@
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
imgBasehost
+orderInfo.shopInfo.print}}"></image>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
resourcesBase
+orderInfo.shopInfo.print}}"></image>
</view>
<block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c">
<view class="info-line-point-left"></view>
<view class="info-line-line"></view>
<view class="info-line-point-right"></view>
<image class="seal-long" src="{{
imgBasehost
+orderInfo.shopInfo.printUse}}"></image>
<image class="seal-long" src="{{
resourcesBase
+orderInfo.shopInfo.printUse}}"></image>
</view>
<view class="info-code col con-c align-c">
<text>{{'张门票可用'}}</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{
'2019.09.30 - 2020.12.30'
}}</text>
<text>{{
orderInfo.expireTime
}}</text>
</view>
</block>
...
...
@@ -188,7 +188,7 @@
</view>
<view class="info-content-item row">
<text class="info-content-item-label">场次</text>
<text class="info-content-item-describe">
周一至周日 10:00 - 20:00
</text>
<text class="info-content-item-describe">
{{orderInfo.businessTime}}
</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
...
...
@@ -198,19 +198,19 @@
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
imgBasehost
+orderInfo.shopInfo.print}}"></image>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{
resourcesBase
+orderInfo.shopInfo.print}}"></image>
</view>
<block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c">
<view class="info-line-point-left"></view>
<view class="info-line-line"></view>
<view class="info-line-point-right"></view>
<image class="seal-long" src="{{
imgBasehost
+orderInfo.shopInfo.printUse}}"></image>
<image class="seal-long" src="{{
resourcesBase
+orderInfo.shopInfo.printUse}}"></image>
</view>
<view class="info-code col con-c align-c">
<text>{{'张电影票可用'}}</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{
'2019.09.30 - 2020.12.30'
}}</text>
<text>{{
orderInfo.expireTime
}}</text>
</view>
</block>
...
...
@@ -231,7 +231,10 @@
</view>
<view class="commodity-list">
<view class="commodity-shop-info row align-c">
<image src="{{resourcesBase + shopInfo.logo}}"></image>
<view class="logo-box">
<image src="{{resourcesBase + orderInfo.shopInfo.logo}}" mode="aspectFit"></image>
</view>
<text>{{orderInfo.officeName}}</text>
</view>
<block wx:for="{{orderInfo.commodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
...
...
@@ -364,4 +367,6 @@
<!-- 成功提示 -->
<l-toast l-image-class="toast-image" l-class="toast-bg" show="{{winToast}}" image="/image/success.png"
title="{{winToastText}}" duration="2000"></l-toast>
\ No newline at end of file
title="{{winToastText}}" duration="2000"></l-toast>
<!-- 确认框 -->
<l-dialog />
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
View file @
69245f71
...
...
@@ -219,6 +219,7 @@
line-height: 32rpx;
color: #FFFFFF;
}
.commodity-item-operation>button.btn-disabled {
background: #C8E1EC;
color: #FFFFFF;
...
...
@@ -820,4 +821,16 @@
image {
width: 100%;
height: 100%;
}
.logo-box {
width: 100rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
}
.logo-box image {
max-width: 100%;
max-height: 100%;
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment