Skip to content

严立 / mini-shimao

Go to a project
Commit 3a64cb5f by 严立
Options

LL - 我的订单

parent 95118cd6
Inline Side-by-side
Showing with 805 additions and 798 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.js
......@@ -3,173 +3,294 @@ const App = getApp()
Page({
data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
orderTypeTitle: '全部分类',
orderTypeHeight: 0,
statusActive: 0,
orderType: [],
orderTypeActive: 0,
statusList: [
{ 'id': 0, 'name': '全部' },
{ 'id': 1, 'name': '待付款' },
{ 'id': 2, 'name': '待使用' },
{ 'id': 3, 'name': '取消/过期' },
{ 'value': '', 'name': '全部' },
{ 'value': '0', 'name': '待付款' },
{ 'value': '1', 'name': '待使用' },
{ 'value': '-1, 4', 'name': '取消/过期' },
],
statusActive: 0,
orderList: [
{
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 0,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 20
}],
'total': 0,
'amount': '130.30'
}, {
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 1,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 10
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}],
'total': 0,
'amount': '130.30'
}, {
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 2,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 10
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}],
'total': 0,
'amount': '130.30'
}, {
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 3,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 10
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}],
'total': 0,
'amount': '130.30'
}, {
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 4,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 10
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}],
'total': 0,
'amount': '130.30'
}, {
'id': 0,
'logo': '',
'name': '原味舒食',
'status': 5,
'commodity': [{
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 2,
'price': 10
}, {
'cover': '',
'name': '咖喱蔬菜大虾',
'quantity': 5,
'price': 24
}],
'total': 0,
'amount': '130.30'
}
],
orderList: [],
orderPages: 1,
winOrderType: false,
},
onLoad: function (options) {
this.queryOrder()
this.setOrderType()
},
/**
* 查询订单列表
* @function
* @param
* @returns
*/
queryOrder: function () {
let funcName = this.data.orderType[this.data.orderTypeActive].value
let funcValue = this.data.statusList[this.data.statusActive].value
console.log(this.data.orderType)
console.log(this.data.statusList)
App.wxRequest({
url: '/api/v1/order/getOrderList',
data: {
'goodType': '',
'status': '',
'pageSize': -1,
'pageNo': '',
'goodType': this.data.orderType[this.data.orderTypeActive].value,
'status': this.data.statusList[this.data.statusActive].value,
'pageSize': 10,
'pageNo': this.data.orderPages,
},
success: (response) => {
let funcResponse = response.data
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'id': funcResponse[i].orderId,
'logo': '',
'name': funcResponse[i].officeName,
'total': 0,
'status': Number(funcResponse[i].status),
'amount': funcResponse[i].totalMoney,
'commodity': [],
}
// 添加订单商品列表
let funcTotal = 0
let funcCommodity = funcResponse[i].smOrderDetails
for (let ii = 0, ll = funcCommodity.length; ii < ll; ii++) {
let funcCommodityItem = {
'cover': funcCommodity[ii].imgUrl,
'name': funcCommodity[ii].name,
'quantity': funcCommodity[ii].number,
'price': funcCommodity[ii].unitPrice,
}
funcTotal = funcTotal + funcCommodityItem.quantity
funcItem.commodity.push(funcCommodityItem)
}
funcItem.total = funcTotal
// 映射门店信息
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcItem.name === App.globalData.shopId[i].name) {
funcItem.logo = App.globalData.shopId[i].logo
break
}
}
// 映射显示状态与后台状态
switch (funcItem.status) {
case -2:
funcItem.status = 0
break
case -1:
funcItem.status = 1
break
case 0:
funcItem.status = 2
break
case 1:
funcItem.status = 3
break
case 2:
funcItem.status = 5
break
}
funcList.push(funcItem)
}
this.setData({
orderList: funcList
})
}
})
},
/**
* 初始化订单类型数据字典
* @function
* @param
* @returns
*/
setOrderType: function () {
App.wxRequest({
url: '/api/v1/common/getDictByType',
data: {
'type': 'good_type',
},
success: (response) => {
console.log(response)
let funcResponse = response.data
let funcList = [{ 'value': '', 'name': '全部分类' }]
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'value': funcResponse[i].value,
'name': funcResponse[i].label,
}
funcList.push(funcItem)
}
this.setData({
'orderType': funcList
})
this.queryOrder()
}
})
},
onOrderType: function () {
this.setData({
winOrderType: !this.data.winOrderType
'winOrderType': !this.data.winOrderType
})
},
/**
* 订单分类
* @function
* @param {object} - event
* @returns
*/
onOrderTypeSelection: function (event) {
console.log(event.currentTarget.dataset.id)
let funcItem = event.currentTarget.dataset.item
let funcIndex = event.currentTarget.dataset.index
console.log(funcItem)
this.setData({
orderTypeTitle: event.currentTarget.dataset.id
'orderTypeTitle': funcItem.name,
'orderTypeActive': funcIndex,
'orderPages': 1,
})
this.queryOrder()
},
/**
* 订单状态
* @function
* @param {object} - event
* @returns
*/
onSelectionStatus: function (event) {
console.log(event.currentTarget.dataset.type)
this.setData({
statusActive: Number(event.currentTarget.dataset.type)
'statusActive': Number(event.currentTarget.dataset.type),
'orderPages': 1,
})
this.queryOrder()
},
onNavigationBack: function () {
wx.navigateBack({
delta: 1
'delta': 1
})
},
/**
* 订单详情
* @function
* @param
* @returns
*/
onOrderDetail: function (event) {
let funcItem = event.currentTarget.dataset.item
wx.navigateTo({
url: '/pages/pay/order-detail/order-detail?id=' + funcItem.id,
})
},
/**
* 订单取消
* @function
* @param
* @returns
*/
onOrderCancel: function (event) {
let funcItem = event.target.dataset.item
App.wxRequest({
url: '/api/v1/order/cancelOrder',
data: {
'orderId': funcItem.id,
'type': 0,
},
success: (response) => {
console.log(response)
}
})
this.queryOrder()
},
/**
* 订单删除
* @function
* @param
* @returns
*/
onOrderRemove: function (event) {
let funcItem = event.target.dataset.item
App.wxRequest({
url: '/api/v1/order/cancelOrder',
data: {
'orderId': funcItem.id,
'type': 1,
},
success: (response) => {
console.log(response)
}
})
this.queryOrder()
},
/**
* 订单支付
* @function
* @param
* @returns
*/
onOrderPay: function (event) {
},
/**
* 订单使用
* @function
* @param
* @returns
*/
onOrderUse: function (event) {
},
/**
* 订单评价
* @function
* @param
* @returns
*/
onOrderEvaluate: function (event) {
},
/**
* 订单再次下单
* @function
* @param
* @returns
*/
onOrderAgain: function (event) {
},
})
\ No newline at end of file
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.js
// pages/orderDetail/index.js
let App = getApp()
Page({
data: {
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
orderInfo: {
id: '',
no: '12345994500652',
price: '61.20',
time: '2020-09-30 12:00:00',
payTime: '2020-09-30 12:11:11',
score: 50,
commodity: [], // 购买商品列表
},
showNotice: false,
isFoodOrder: true,
......@@ -10,125 +25,73 @@ Page({
swiperCurrent: 0,
showCodePopup: false,
statusTips: '',
// ticketInfo: {
// store: '元养水韵SPA',
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价
// time: '周一至周日 10:00 - 20:00',
// name: '文碧海',
// phone: '17612345222',
// useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: './image/seal.png'
// },
ticketInfo: {
status: 2, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
ticketType: 's',
store: '拾光花坊插花分享会',
date: '8月24日 10:00 - 12:30',
// time: '10:00 - 12:30',
address: '拾光花坊2号厅',
name: '文碧海',
phone: '17612345222',
useNum:'1件商品可用',
useTime: '2019.09.30 - 2020.12.30',
sealImg: './image/seal2.png',
sealImg2: './image/seal2-1.png'
status: 2, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
ticketType: 's',
store: '拾光花坊插花分享会',
date: '8月24日 10:00 - 12:30',
// time: '10:00 - 12:30',
address: '拾光花坊2号厅',
name: '文碧海',
phone: '17612345222',
useNum:'1件商品可用',
useTime: '2019.09.30 - 2020.12.30',
sealImg: './image/seal2.png',
sealImg2: './image/seal2-1.png'
},
goodsInfo: {
titleImg: './image/goods_title.png',
title: '海错图展馆',
list: [
{
id: 0,
infoText: '拾光花坊国际花艺设计咖啡烘焙基础知识交流分享会',
img: './image/goods_item.png',
price: '30.60',
used: '查看券码'
},
{
id: 1,
infoText: '《海错图》展览单人门票',
img: './image/goods_item.png',
price: '30.60',
used: '已使用'
},
]
},
// ticketInfo: {
// status: 1, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
// store: '夏日音乐盛典星光之夜主题演唱会',
// date: '8月24日 - 10月30日',
// time: '10:00 - 12:30',
// address: '世茂 · 碧海银湖营销展示中心前100米星光广场',
// name: '文碧海',
// phone: '17612345222',
// useNum:'1件商品可用',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: './image/seal2.png',
// sealImg2: './image/seal2-1.png'
// },
// ticketInfo: {
// type: 'movie',
// status: 0, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
// store: '阿凡达',
// date: '8月24日 10:00 - 12:30',
// name: '文碧海',
// phone: '17612345222',
// useNum:'3张电影票',
// useTime: '2019.09.30 - 2020.12.30',
// sealImg: './image/seal2.png',
// sealImg2: './image/seal2-1.png'
// },
goodsInfo:{
titleImg: './image/goods_title.png',
title: '海错图展馆',
list: [
codeList: [
{
id: 0,
infoText: '拾光花坊国际花艺设计咖啡烘焙基础知识交流分享会',
img: './image/goods_item.png',
price: '30.60',
used: '查看券码'
id: 0,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 1,
infoText: '《海错图》展览单人门票',
img: './image/goods_item.png',
price: '30.60',
used: '已使用'
id: 1,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925',
codeUsed: true
},
{
id: 2,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}
]
},
// goodsInfo:{
// titleImg: './image/good2.png',
// title: '元养水韵SPA',
// list: [
// {
// id: 0,
// infoText: '肌底补水保湿焕肤提亮SPA套餐',
// img: './image/goods_item2.png',
// price: '30.60',
// used: '查看券码'
// },
// {
// id: 1,
// infoText: '泰国皇室经典SPA',
// img: './image/goods_item2.png',
// price: '30.60',
// used: '已使用'
// },
// ]
// },
orderInfo: {
price: '61.20',
no: '12345994500652',
time: '2020-09-30 12:00:00',
payTime: '2020-09-30 12:11:11',
score: 50
},
codeList: [
{
id: 0,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 1,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925',
codeUsed: true
},
{
id: 2,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}
]
},
onLoad(options) {
onLoad: function (options) {
let funcOrderInfo = this.data.orderInfo
funcOrderInfo.id = options.id
this.setData({
orderInfo: funcOrderInfo
})
this.queryOrderDetail()
return
console.log(options)
if (options.type) options.type = Number(options.type)
let statusText = ''
......@@ -142,12 +105,14 @@ Page({
ticketInfo.status = 0
bottom = '-32rpx'
break
case 1:
ticketInfo.status = 1
statusText = '活动待评价',
statusTips = '评价本单获得10积分'
orderBtnText = '去评价'
break
case 2:
ticketInfo.status = 2
statusText = '活动已结束'
......@@ -175,14 +140,16 @@ Page({
console.log(typeof options.type)
switch (options.type) {
case 0:
ticketInfo.status = 0
ticketInfo.status = 0
bottom = '-32rpx'
break
case 1:
ticketInfo.status = 1
statusText = '订单待评价',
orderBtnText = '去评价'
break
case 2:
console.log(2)
......@@ -190,16 +157,19 @@ Page({
statusText = '订单已过期'
statusTips = '有效期2019.09.30 - 2020.12.30'
break
case 3:
ticketInfo.status = 3
statusText = '订单已取消'
statusTips = '下单后15分钟内未付款，自动取消订单'
orderBtnText = '再次下单'
break
case 4:
ticketInfo.status = 4
statusText = '订单已评价'
break
case 5:
ticketInfo.status = 5
statusText = '订单待付款'
......@@ -216,42 +186,98 @@ Page({
ticketInfo
})
},
/**
* 订单详情
* @function
* @param
* @returns
*/
queryOrderDetail: function () {
App.wxRequest({
url: '/api/v1/order/getOrderDetail',
data: {
'orderId': this.data.orderInfo.id
},
success: (response) => {
let funcResponse = response.data
let funcOrderInfo = {
'id': this.data.orderInfo.id,
'logo': '',
'shopName': funcResponse.officeName, // 使用门店
'score': funcResponse.integral, // 积分
'status': funcResponse.status, // 订单状态
'amount': funcResponse.totalMoney, // 实付金额
'contactName': funcResponse.name, // 联系人名称
'contactPhone': funcResponse.mobilePhone, // 联系人电话
'commodity': [],
}
// 添加订单商品列表
let funcCommodity = funcResponse.smOrderDetails
for (let i = 0, l = funcCommodity.length; i < l; i++) {
let funcCommodityItem = {
'cover': '',
'name': funcCommodity[i].name, // 名称
'quantity': funcCommodity[i].number, // 数量
'amount': funcCommodity[i].totalPrices, // 总价
'status': funcCommodity[i].status, // 状态
}
funcOrderInfo.commodity.push(funcCommodityItem)
}
// 映射门店信息
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcOrderInfo.name === App.globalData.shopId[i].name) {
funcOrderInfo.logo = App.globalData.shopId[i].logo
break
}
}
this.setData({
orderInfo: funcOrderInfo
})
console.log(JSON.stringify(funcOrderInfo))
}
})
},
handleQRcode() {
let showCodePopup = true
this.setData({
showCodePopup
showCodePopup
})
},
closeQRcode() {
let showCodePopup = false
this.setData({
showCodePopup
showCodePopup
})
},
handleNotice() {
let showNotice = true
this.setData({
showNotice
showNotice
})
},
swiperChange(e) {
let swiperCurrent = e.detail.current
this.setData({
swiperCurrent
swiperCurrent
})
},
setClipboard(e) {
const index = e.currentTarget.dataset.index
const data = this.data.codeList[index].num
wx.setClipboardData({
data: data,
success (res) {
wx.getClipboardData({
success (res) {
console.log(res.data) // data
}
})
}
})
}
setClipboard(e) {
const index = e.currentTarget.dataset.index
const data = this.data.codeList[index].num
wx.setClipboardData({
data: data,
success (res) {
wx.getClipboardData({
success (res) {
console.log(res.data) // data
}
})
}
})
}
})
\ No newline at end of file
pages/pay/order-detail/order-detail.wxml
<view class="order-status col con-c {{ticketInfo.status === 1 || ticketInfo.status === 5 ? 'bgPink' : ''}}" wx:if="{{ticketInfo.status !== 0}}">
<view class="status-text">{{statusText}}</view>
<view class="status-tips" wx:if="{{statusTips}}">{{statusTips}}</view>
</view>
<!-- <navigation class="navigation" titleText="订单详情" color="#ffffff" background="#FFFFFF"></navigation> -->
<view class="ticket-wrapper">
<!-- 票券上 -->
<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">
<view class="ticket-store">{{ticketInfo.store}}</view>
<view class="container">
<!-- 订单状态 -->
<view class="state row con-c">
<!-- <view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}"> -->
<view class="state-content col con-c">
<view class="state-content-title row">
<text>订单待付款</text>
</view>
<view class="state-content-tip row">
<text>内付款，否则将自动取消订单</text>
</view>
</view>
</view>
<view class="ticket-row-time row">
<view class="ticket-left">{{ticketInfo.date && ticketInfo.type === 'movie' ? '场次': (ticketInfo.date ? '活动时间' : '')}}</view>
<view class="ticket-right">
<view class="ticket-date">{{ticketInfo.date}}</view>
<view class="ticket-time">{{ticketInfo.time}}</view>
<view class="state-content col con-c" wx:if="{{orderInfo.state === 3}}">
<view class="state-content-title row">
<text>订单待评价</text>
</view>
</view>
</view>
<view class="ticket-row-time row" wx:if="{{ticketInfo.address}}">
<view class="ticket-left">活动地点</view>
<view class="ticket-right">
<view class="ticket-address">{{ticketInfo.address}}</view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 4}}">
<view class="state-content-title row">
<text>订单已过期</text>
</view>
<view class="state-content-tip row">
<text>内付款，否则将自动取消订单</text>
</view>
</view>
</view>
<view class="ticket-info">
<view class="ticket-row-name row align-c">
<view class="ticket-left">订单信息</view>
<view class="ticket-right">
<view class="ticket-name">{{ticketInfo.name}}</view>
</view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === -1}}">
<view class="state-content-title row">
<text>订单已取消</text>
</view>
<view class="state-content-tip row">
<text>内付款，否则将自动取消订单</text>
</view>
</view>
<view class="ticket-row-phone row">
<view class="ticket-left"></view>
<view class="ticket-right">
<view class="ticket-phone">{{ticketInfo.phone}}</view>
</view>
<view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === 3}}">
<view class="state-content-title row">
<text>订单已评价</text>
</view>
</view>
</view>
<!-- 印章 -->
<view class="seal-wrapper" style="bottom: {{bottom}}">
<image class="seal" mode="widthFix" src="{{ticketInfo.status === 0 ? ticketInfo.sealImg : ticketInfo.sealImg2}}"></image>
</view>
<!-- 白色圆 -->
<view class="circle" wx:if="{{ticketInfo.status === 0}}"></view>
</view>
<!-- 票券下 -->
<view class="ticket-footer col align-c" wx:if="{{ticketInfo.status === 0}}">
<view class="ticket-footer-top">{{ticketInfo.useNum}}</view>
<view class="ticket-footer-middle" bindtap="handleQRcode">一键扫码</view>
<view class="ticket-footer-bottom">{{ticketInfo.useTime}}</view>
</view>
<!-- 扫码弹窗 -->
<l-popup show="{{showCodePopup}}" l-class="l-popup-bg">
<view class="scan-code-wrapper col align-c">
<view class="code-header">20件商品可用</view>
<view class="code-tips">请将券码出示给门店核销人员</view>
<swiper class="code-main" next-margin="64rpx" bindchange="swiperChange">
<swiper-item wx:for="{{codeList}}" wx:key="id">
<view class="code-item col con-c align-c {{index === swiperCurrent ? 'item-center' : ''}}">
<view class="code-item-title">{{item.title}}</view>
<view class="code-img">
<image mode="widthFix" src="{{item.img}}"></image>
<view wx:if="{{item.codeUsed}}" class="code-img-used"></view>
</view>
<view class="code-num-wrapper row align-c con-a">
<view class="code-num-title {{item.codeUsed ? 'code-used' : ''}}">券码{{index+1}}:</view>
<view class="code-num {{item.codeUsed ? 'code-used' : ''}}">{{item.num}}</view>
<view class="num-copy" wx:if="{{!item.codeUsed}}" bindtap="setClipboard" data-index="{{index}}">复制</view>
</view>
<view class="code-used-seal" wx:if="{{item.codeUsed}}">
<image mode="widthFix" src="./image/used.png"></image>
</view>
</view>
</swiper-item>
</swiper>
<view class="img-num row align-c con-b">
<text class="current-img-num">{{swiperCurrent+1}}</text>
<text class="symbol-img-num">/</text>
<text class="total-img-num">{{codeList.length}}</text>
</view>
<view class="code-close-btn row con-c align-c" bindtap="closeQRcode">
<image mode="widthFix" src="/image/icon_close.png"></image>
</view>
</view>
</l-popup>
</view>
<view class="tips-wrapper" wx:if="{{ticketInfo.ticketType === 'food'}}">
<Tips text="请在下单内3天内取餐，逾期无效"></Tips>
</view>
<!-- 订单信息 -->
<view class="info">
<!-- 年卡月卡 -->
<view class="info-content col con-c">
<view class="info-content-item row">
<text class="info-content-item-label">使用门店</text>
<text class="info-content-item-title">儿童营地</text>
</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>
</view>
</view>
<view class="notice-wrapper row con-e" bindtap="handleNotice" wx:if="{{ticketInfo.orderType === 1}}">
<view class="notice">{{ticketInfo.status === 0 ? '使用须知' : '购买须知'}}</view>
<l-icon name="right" color="#959DAA" size="22" />
</view>
<l-popup show="{{showNotice}}" content-align="bottom">
<view class="notice-popup-wrapper">
<view class="notice-popup-title">购买须知</view>
<scroll-view scroll-y class="notice-popup-content">
</scroll-view>
</view>
</l-popup>
<!-- 普通商品 -->
<!-- 餐品 -->
<view class="info-content col con-c">
<view class="info-content-item row">
<text class="info-content-item-label">使用门店</text>
<text class="info-content-item-title">儿童营地</text>
</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>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">儿童营地</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view>
</view>
<!-- 活动 -->
<view class="info-content col con-c">
<view class="info-content-item row">
<text class="info-content-item-label">报名活动</text>
<text class="info-content-item-title">儿童营地儿童营地儿童营地儿童营地儿童营地儿童营地</text>
</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>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">活动地点</text>
<text class="info-content-item-describe">儿童营地</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">姓名</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view>
</view>
<view class="goods-wrapper">
<view class="goods-title">购买商品</view>
<view class="goods-list">
<view class="goods-list-title-wrapper row align-c">
<view class="goods-list-title-img">
<image mode="widthFix" src="{{goodsInfo.titleImg}}"></image>
</view>
<view class="goods-list-title">{{goodsInfo.title}}</view>
</view>
<view class="goods-item row" wx:for="{{goodsInfo.list}}" wx:key="id">
<view class="goods-item-img">
<image mode="widthFix" src="{{item.img}}"></image>
</view>
<view class="goods-item-info col con-a">
<view class="goods-item-info-text">{{item.infoText}}</view>
<view class="goods-item-info-price">
<text class="price-symbol">￥</text>
<text class="price">{{item.price}}</text>
<!-- 观影 -->
<view class="info-content col con-c">
<view class="info-content-item row">
<text class="info-content-item-label">电影</text>
<text class="info-content-item-title">儿童营地</text>
</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>
</view>
<view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">姓名</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view>
</view>
</view>
<view class="goods-item-btn {{item.used === '已使用'?'disabled':''}}" bindtap="handleQRcode">{{item.used}}</view>
</view>
</view>
</view>
<view class="order-info-wrapper">
<view class="order-price">
<text class="order-price-symbol">￥</text>
<text>{{orderInfo.price}}</text>
</view>
<view class="order-title">实付金额</view>
<view class="order-info">
<view class="order-item">订单编号：{{orderInfo.no}}</view>
<view class="order-item">下单时间：{{orderInfo.time}}</view>
<view class="order-item">付款时间：{{orderInfo.payTime}}</view>
<view class="order-item">获得积分：{{orderInfo.score}}分</view>
</view>
</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="order-btn" wx:if="{{ticketInfo.status === 1 || ticketInfo.status === 3 || ticketInfo.status === 5}}">{{orderBtnText}}</view>
</view>
<!-- 商品信息 -->
<view class="commodity col">
<view class="commodity-title">
<text>购买商品</text>
</view>
<view class="commodity-list">
<view class="commodity-shop-info row align-c">
<image></image>
<text>商店名称</text>
</view>
<view class="commodity-item row align-c">
<image></image>
<view class="commodity-item-info col">
<view>
<text>儿童营地年卡</text>
</view>
<view>
<text>1680.00</text>
</view>
</view>
<view class="commodity-item-operation">
<button class="row con-c align-c">查看券码</button>
</view>
</view>
</view>
</view>
<Blank></Blank>
\ No newline at end of file
<!-- 订单提示 -->
<view class="tip">
</view>
</view>
\ No newline at end of file
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