Skip to content

严立 / mini-shimao

Go to a project
Commit 3a64cb5f by 严立
Options

LL - 我的订单

parent 95118cd6
Expand all
Inline Side-by-side
Showing with 327 additions and 447 deletions
pages/commodity/project-detail/project-detail.js
...@@ -109,14 +109,17 @@ Page({ ...@@ -109,14 +109,17 @@ Page({
funcItem.priceType = 3 funcItem.priceType = 3
} }
} }
funcCommodityList.push(funcItem) funcCommodityList.push(funcItem)
} }
console.log(JSON.stringify(funcCommodityList))
break break
// 普通商品 // 普通商品
case 2: case 2:
// 门票商品 // 门票商品
case 3: case 3:
default:
for (let i = 0, l = funcResponse.length; i < l; i++) { for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = { let funcItem = {
'id': funcResponse[i].id, // 商品标识 'id': funcResponse[i].id, // 商品标识
...@@ -150,6 +153,7 @@ Page({ ...@@ -150,6 +153,7 @@ Page({
} }
funcCommodityList.push(funcItem) funcCommodityList.push(funcItem)
} }
console.log(JSON.stringify(funcCommodityList))
break break
} }
...@@ -175,7 +179,7 @@ Page({ ...@@ -175,7 +179,7 @@ Page({
console.log(JSON.stringify(funcCommodityInfo)) console.log(JSON.stringify(funcCommodityInfo))
wx.navigateTo({ 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 @@ ...@@ -18,8 +18,26 @@
<text>{{item.describe}}</text> <text>{{item.describe}}</text>
</view> </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> <text>业主价</text>
</view> </view>
<view class="price-special"> <view class="price-special">
...@@ -34,6 +52,18 @@ ...@@ -34,6 +52,18 @@
</view> </view>
</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"> <view class="project-btn" data-item="{{item}}" bindtap="onBuy">
<text>{{buyText}}</text> <text>{{buyText}}</text>
</view> </view>
......
pages/commodity/project-detail/project-detail.wxss
...@@ -13,44 +13,64 @@ ...@@ -13,44 +13,64 @@
margin-bottom: 48rpx; margin-bottom: 48rpx;
border-radius: 4rpx; border-radius: 4rpx;
} }
.project-cover { .project-cover {
width: 670rpx; width: 670rpx;
height: 376rpx; height: 376rpx;
background-color: lightpink; background-color: lightpink;
} }
.project-info { .project-info {
position: relative; position: relative;
padding: 32rpx; padding: 32rpx;
background-color: #fff; background-color: #fff;
} }
.project-name { .project-name {
color: #15191F; color: #15191F;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
line-height: 48rpx; line-height: 48rpx;
} }
.project-msg { .project-msg {
margin-top: 16rpx; margin-top: 16rpx;
color: #959DA9; color: #959DA9;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
} }
.project-price-wrapper { .project-price-wrapper {
height: 64rpx; height: 64rpx;
margin-top: 40rpx; margin-top: 40rpx;
line-height: 64rpx; line-height: 64rpx;
} }
.price-special-msg {
.item-price-discount {
width: 78rpx; width: 78rpx;
height: 32rpx; height: 32rpx;
margin-right: 12rpx; margin-right: 12rpx;
color: #E8D0AF; border-radius: 4px;
background: #FAEDEA;
font-size: 18rpx; font-size: 18rpx;
text-align: center; font-weight: 500;
line-height: 32rpx; line-height: 26rpx;
color: #EF4E4E;
}
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%); background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
border-radius: 4rpx;
font-size: 18rpx;
font-weight: 500;
line-height: 26rpx;
color: #E8D0AF;
} }
.price-special { .price-special {
margin-right: 12rpx; margin-right: 12rpx;
color: #EF4E4E; color: #EF4E4E;
...@@ -58,23 +78,27 @@ ...@@ -58,23 +78,27 @@
line-height: 34rpx; line-height: 34rpx;
font-weight: 600; font-weight: 600;
} }
.price-symbol { .price-symbol {
font-size: 24rpx; font-size: 24rpx;
} }
.price-unit { .price-unit {
font-size: 20rpx; font-size: 20rpx;
} }
.price-old { .price-old {
margin-top: 10rpx;
color: #959DA9; color: #959DA9;
font-size: 22rpx; font-size: 22rpx;
line-height: 32rpx; line-height: 32rpx;
letter-spacing: 1rpx; letter-spacing: 1rpx;
text-decoration: line-through; text-decoration: line-through;
} }
.price-old-unit { .price-old-unit {
font-size: 18rpx; font-size: 18rpx;
} }
.project-btn { .project-btn {
position: absolute; position: absolute;
right: 32rpx; right: 32rpx;
......
pages/home/home/home.js
...@@ -8,6 +8,7 @@ let logicData = { ...@@ -8,6 +8,7 @@ let logicData = {
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
// 导航栏相关属性 // 导航栏相关属性
navigationStyle: { navigationStyle: {
......
pages/mine/order/order.wxml
...@@ -10,26 +10,43 @@ ...@@ -10,26 +10,43 @@
<view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType"> <view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType">
<view> <view>
<view class="order-type-row row con-b align-c"> <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"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<text>全部分类</text> <view
</view> wx:if="{{index < 3}}"
<view class="order-type-item row con-c align-c {{orderTypeTitle === '门票' ? 'order-type-item-active' : ''}}" data-id="门票" bindtap="onOrderTypeSelection"> class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
<text>门票</text> data-item="{{item}}"
</view> data-index="{{index}}"
<view class="order-type-item row con-c align-c {{orderTypeTitle === '餐饮' ? 'order-type-item-active' : ''}}" data-id="餐饮" bindtap="onOrderTypeSelection"> bindtap="onOrderTypeSelection"
<text>餐饮</text> >
<text>{{item.name}}</text>
</view> </view>
</block>
</view> </view>
<view class="order-type-row row con-b align-c"> <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"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<text>影票</text> <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> </view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === 'SPA' ? 'order-type-item-active' : ''}}" data-id="SPA" bindtap="onOrderTypeSelection"> </block>
<text>SPA</text>
</view> </view>
<view class="order-type-item row con-c align-c {{orderTypeTitle === '文创' ? 'order-type-item-active' : ''}}" data-id="文创" bindtap="onOrderTypeSelection"> <view class="order-type-row row con-b align-c">
<text>文创</text> <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> </view>
</block>
</view> </view>
</view> </view>
</view> </view>
...@@ -45,10 +62,10 @@ ...@@ -45,10 +62,10 @@
<view class="order-list col con-c align-c"> <view class="order-list col con-c align-c">
<block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <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="order-list-item-title row con-b align-c">
<view class="row 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> <text>{{item.name}}</text>
</view> </view>
<view> <view>
...@@ -60,29 +77,34 @@ ...@@ -60,29 +77,34 @@
<text class="message" wx:if="{{item.status === 5}}">已评价</text> <text class="message" wx:if="{{item.status === 5}}">已评价</text>
</view> </view>
</view> </view>
<!-- 商品数量样式一 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length === 1}}"> <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="name">精灵鸟理想国单人次票精灵鸟理想国单人次票</text>
<text class="total">{{'x ' + item.total}}</text> <text class="total">{{'x ' + item.total}}</text>
</view> </view>
<!-- 商品数量样式二 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}"> <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"> <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> </block>
<text class="total">{{'共 ' + item.total + ' 件'}}</text> <text class="total">{{'共 ' + item.total + ' 件'}}</text>
</view> </view>
<view class="order-list-item-operation row con-b align-c"> <view class="order-list-item-operation row con-b align-c">
<view class="row align-c"> <view class="row align-c">
<text class="amount">实付:</text> <text class="amount">实付:</text>
<text class="amount">¥20.00</text> <text class="amount">¥20.00</text>
</view> </view>
<view class="row align-c"> <view class="row align-c">
<button wx:if="{{item.status === 0}}" class="delete 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">删除订单</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">去支付</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">去使用</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">去评价</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">再次下单</button> <button wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/mine/order/order.wxss
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
font-size: 26rpx; font-size: 26rpx;
} }
.order-type image {
width: 32rpx;
height: 32rpx;
}
/* 订单类型选择 */ /* 订单类型选择 */
.order-type-selection { .order-type-selection {
z-index: 1700; z-index: 1700;
...@@ -39,7 +44,7 @@ ...@@ -39,7 +44,7 @@
.order-type-selection > view { .order-type-selection > view {
width: 750rpx; width: 750rpx;
height: 240rpx; min-height: 240rpx;
padding-top: 10rpx; padding-top: 10rpx;
border-radius: 0px 0px 24rpx 24rpx; border-radius: 0px 0px 24rpx 24rpx;
background: #FFFFFF; background: #FFFFFF;
......
pages/pay/order-detail/order-detail.js
// pages/orderDetail/index.js let App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影 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, showNotice: false,
isFoodOrder: true, isFoodOrder: true,
orderBtnText: '去评价', orderBtnText: '去评价',
...@@ -10,16 +25,6 @@ Page({ ...@@ -10,16 +25,6 @@ Page({
swiperCurrent: 0, swiperCurrent: 0,
showCodePopup: false, showCodePopup: false,
statusTips: '', 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: { ticketInfo: {
status: 2, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款 status: 2, // 0未使用 1待评价 2已过期 3已取消 4已评价 5待付款
ticketType: 's', ticketType: 's',
...@@ -34,32 +39,7 @@ Page({ ...@@ -34,32 +39,7 @@ Page({
sealImg: './image/seal2.png', sealImg: './image/seal2.png',
sealImg2: './image/seal2-1.png' sealImg2: './image/seal2-1.png'
}, },
// ticketInfo: { goodsInfo: {
// 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', titleImg: './image/goods_title.png',
title: '海错图展馆', title: '海错图展馆',
list: [ list: [
...@@ -79,33 +59,6 @@ Page({ ...@@ -79,33 +59,6 @@ Page({
}, },
] ]
}, },
// 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: [ codeList: [
{ {
id: 0, id: 0,
...@@ -128,7 +81,17 @@ Page({ ...@@ -128,7 +81,17 @@ Page({
} }
] ]
}, },
onLoad(options) {
onLoad: function (options) {
let funcOrderInfo = this.data.orderInfo
funcOrderInfo.id = options.id
this.setData({
orderInfo: funcOrderInfo
})
this.queryOrderDetail()
return
console.log(options) console.log(options)
if (options.type) options.type = Number(options.type) if (options.type) options.type = Number(options.type)
let statusText = '' let statusText = ''
...@@ -142,12 +105,14 @@ Page({ ...@@ -142,12 +105,14 @@ Page({
ticketInfo.status = 0 ticketInfo.status = 0
bottom = '-32rpx' bottom = '-32rpx'
break break
case 1: case 1:
ticketInfo.status = 1 ticketInfo.status = 1
statusText = '活动待评价', statusText = '活动待评价',
statusTips = '评价本单获得10积分' statusTips = '评价本单获得10积分'
orderBtnText = '去评价' orderBtnText = '去评价'
break break
case 2: case 2:
ticketInfo.status = 2 ticketInfo.status = 2
statusText = '活动已结束' statusText = '活动已结束'
...@@ -178,11 +143,13 @@ Page({ ...@@ -178,11 +143,13 @@ Page({
ticketInfo.status = 0 ticketInfo.status = 0
bottom = '-32rpx' bottom = '-32rpx'
break break
case 1: case 1:
ticketInfo.status = 1 ticketInfo.status = 1
statusText = '订单待评价', statusText = '订单待评价',
orderBtnText = '去评价' orderBtnText = '去评价'
break break
case 2: case 2:
console.log(2) console.log(2)
...@@ -190,16 +157,19 @@ Page({ ...@@ -190,16 +157,19 @@ Page({
statusText = '订单已过期' statusText = '订单已过期'
statusTips = '有效期2019.09.30 - 2020.12.30' statusTips = '有效期2019.09.30 - 2020.12.30'
break break
case 3: case 3:
ticketInfo.status = 3 ticketInfo.status = 3
statusText = '订单已取消' statusText = '订单已取消'
statusTips = '下单后15分钟内未付款，自动取消订单' statusTips = '下单后15分钟内未付款，自动取消订单'
orderBtnText = '再次下单' orderBtnText = '再次下单'
break break
case 4: case 4:
ticketInfo.status = 4 ticketInfo.status = 4
statusText = '订单已评价' statusText = '订单已评价'
break break
case 5: case 5:
ticketInfo.status = 5 ticketInfo.status = 5
statusText = '订单待付款' statusText = '订单待付款'
...@@ -216,6 +186,62 @@ Page({ ...@@ -216,6 +186,62 @@ Page({
ticketInfo 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() { handleQRcode() {
let showCodePopup = true let showCodePopup = true
this.setData({ this.setData({
......
pages/pay/order-detail/order-detail.wxss
.order-status { /* 订单状态 */
.state {
width: 750rpx;
}
.state-content {
width: 670rpx; width: 670rpx;
height: 240rpx; height: 240rpx;
margin: 64rpx auto 0; padding: 0 32rpx;
padding-left: 32rpx; border-radius: 4px;
color: #15191F; background: #F3E1E1;
background-color: #ECF4F8;
} }
.status-text {
.state-content-invalid {
background: #ECF4F8;
}
.state-content-title text {
height: 76rpx;
font-size: 54rpx; font-size: 54rpx;
font-weight: 600; font-weight: 500;
line-height: 76rpx;
color: #15191F;
} }
.status-tips {
.state-content-tip {
margin-top: 24rpx; margin-top: 24rpx;
} }
.bgPink {
background-color: #F3E1E1;
}
.ticket-wrapper { .state-content-tip text {
width: 670rpx; height: 36rpx;
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; font-size: 26rpx;
} font-weight: 400;
.ticket-store { line-height: 36rpx;
font-size: 38rpx;
color: #15191F; 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;
} }
.ticket-info { /* 订单信息 */
margin-top: 48rpx; .info-content {
width: 670rpx;
min-height: 206rpx;
padding: 48rpx 32rpx;
background: #F3F4F6;
border-radius: 4px;
overflow: hidden;
} }
.seal-wrapper { .info-content-item {
position: absolute; position: relative;
right: 0; margin-top: 16rpx;
bottom: -32rpx;
width: 166rpx;
height: 200rpx;
}
.seal {
width: 100%;
height: 100%;
} }
.circle { .info-content-item-label {
position: absolute; width: 104rpx;
left: -18rpx;
bottom: -18rpx;
width: 36rpx;
height: 36rpx; height: 36rpx;
border-radius: 50%; margin-right: 48rpx;
background-color: #fff;
}
.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; font-size: 26rpx;
color: #959DAA; font-weight: 400;
line-height: 36rpx;
color: #959DA9;
} }
/* 扫码弹窗 */ .info-content-item-title {
.scan-code-wrapper { position: relative;
top: -8rpx;
width: 454rpx;
min-height: 52rpx;
word-wrap: break-word;
font-size: 38rpx;
font-weight: 500;
line-height: 52rpx;
color: #15191F;
} }
.code-header {
height: 70rpx; .info-content-item-describe {
color: #fff; height: 42rpx;
font-size: 30rpx; font-size: 30rpx;
text-align: center; font-weight: 500;
font-weight: 600; line-height: 42rpx;
}
.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; 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; .info-content-item-tip {
height: 96rpx; height: 36rpx;
padding: 0 24rpx;
background-color: #F2F3F5;
border-radius: 4rpx;
line-height: 96rpx;
}
.code-num-title {
color: #959DA9;
text-decoration: none !important;
font-size: 26rpx; font-size: 26rpx;
} font-weight: 500;
.code-num { line-height: 36rpx;
color: #15191F; 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%;
} }
.l-popup-bg { /* 商品信息 */
background: rgba(0, 0, 0, .4); .commodity {
margin: 0 40rpx;
} }
.tips-wrapper { .commodity-title {
margin: 40rpx 40rpx 0; height: 48rpx;
} font-size: 34rpx;
.notice-wrapper { font-weight: 500;
width: 100%; line-height: 48px;
height: 100rpx;
padding: 0 40rpx;
line-height: 100rpx;
}
.notice {
margin-right: 8rpx;
color: #15191F; 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;
}
.goods-wrapper { .commodity-list {
padding: 32rpx 40rpx 0; width: 670rpx;
} height: 676rpx;
.goods-title { padding: 40rpx;
color: #15191F; border-radius: 4px;
font-size: 34rpx; background: #F3F4F6;
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; .commodity-shop-info > image {
padding-bottom: 22rpx; max-width: 62rpx;
border-bottom: 1px solid #E2E7EF; max-height: 62rpx;
margin-right: 16rpx;
background: #999999;
} }
.goods-item:last-child {
margin-bottom: 0rpx; .commodity-item {
border-bottom: none; width: 606rpx;
height: 184rpx;
border-bottom: 1px #E2E7EF solid;
} }
.goods-item-img {
.commodity-item > image {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
margin-right: 24rpx;
background: #999999;
} }
.goods-item-info {
flex: 1; .commodity-item-info {
padding-left: 24rpx; width: 290rpx;
}
.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; .commodity-item-operation {
width: 290rpx;
margin-right: 32rpx;
} }
.goods-item-btn {
.commodity-item-operation > button {
width: 120rpx; width: 120rpx;
height: 56rpx; height: 56rpx;
margin-top: 40rpx; border-radius: 4px;
margin-left: 32rpx; background: #86C5E1;
color: #fff;
font-size: 22rpx;
text-align: center;
line-height: 56rpx;
background-color: #86C5E1;
border-radius: 4rpx;
}
.disabled {
background-color: #C8E1EC;
}
.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;
}
.order-price-symbol {
font-size: 34rpx;
}
.order-title {
width: 100%;
line-height: 68rpx;
font-size: 34rpx;
font-weight: 600;
}
.order-info {
margin-top: 22rpx;
}
.order-item {
width: 100%;
color: #959DA9;
font-size: 22rpx; font-size: 22rpx;
line-height: 42rpx; font-weight: 500;
} line-height: 32rpx;
color: #FFFFFF;
.footer-btn {
padding: 32rpx 20rpx 0;
border-top: 1px solid #E2E7EF;
} }
\ No newline at end of file
.delete-btn, .order-btn {
width: 200rpx;
line-height: 96rpx;
margin-right: 24rpx;
border-radius: 4rpx;
font-size: 30rpx;
font-weight: 600;
text-align: center;
}
.delete-btn {
color: #656E7B;
background-color: #fff;
border: 1px solid #C2C7CF;
}
.order-btn {
color: #fff;
background-color: #86C5E1;
}
image {
width: 100%;
height: 100%;
}
pages/pay/order-input/order-input.js
...@@ -485,6 +485,8 @@ Page({ ...@@ -485,6 +485,8 @@ Page({
} }
} }
} }
console.log('inspectData', funcPass)
return funcPass return funcPass
}, },
...@@ -550,10 +552,10 @@ Page({ ...@@ -550,10 +552,10 @@ Page({
'package': funcResponse.package, 'package': funcResponse.package,
'signType': funcResponse.signType, 'signType': funcResponse.signType,
'paySign': funcResponse.paySign, 'paySign': funcResponse.paySign,
'success': function (response) { 'success': (response) => {
if (response.errMsg === 'requestPayment:ok') { if (response.errMsg === 'requestPayment:ok') {
// 用户点击支付完成按钮回调 // 用户点击支付完成按钮回调
// This.payStatus(true) this.payStatus(true)
} }
if (response.errMsg === 'requestPayment:fail cancel') { if (response.errMsg === 'requestPayment:fail cancel') {
......
project.config.json
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"es6": true, "es6": true,
"enhance": true, "enhance": true,
"postcss": true, "postcss": true,
"preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"coverView": true, "coverView": true,
...@@ -19,18 +20,18 @@ ...@@ -19,18 +20,18 @@
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": false, "checkSiteMap": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"preloadBackgroundData": false, "enableEngineNative": false,
"compileHotReLoad": false,
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": true,
"useApiHook": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [] "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