|
@@ -1,7 +1,5 @@
|
|
|
-import {
|
|
|
- drawById
|
|
|
-} from "../../utils/qrcode"
|
|
|
import orderApi from '../../api/order'
|
|
|
+import drawQrcode from '../../utils/weapp.qrcode.js'
|
|
|
// pages/order/order.js
|
|
|
Page({
|
|
|
|
|
@@ -9,12 +7,12 @@ Page({
|
|
|
* 页面的初始数据
|
|
|
*/
|
|
|
data: {
|
|
|
- orderId:0,
|
|
|
+ orderId: 0,
|
|
|
order: {},
|
|
|
//1显示订单详情,2显示确认支付,取消订单,3显示删除订单
|
|
|
orderStatus: 1,
|
|
|
- timer: {}
|
|
|
-
|
|
|
+ timer: {},
|
|
|
+ codeUrl: ''
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -23,9 +21,11 @@ Page({
|
|
|
onLoad: async function (options) {
|
|
|
var orderId = options.id;
|
|
|
this.setData({
|
|
|
- orderId:orderId
|
|
|
+ orderId: orderId
|
|
|
})
|
|
|
-
|
|
|
+ let order = await orderApi.getOrderById(orderId);
|
|
|
+
|
|
|
+
|
|
|
|
|
|
},
|
|
|
//生成二维码
|
|
@@ -95,6 +95,16 @@ Page({
|
|
|
})
|
|
|
|
|
|
},
|
|
|
+ drawCode: function (writeOffCode) {
|
|
|
+ let width = this.rpxToPx(280);
|
|
|
+ drawQrcode({
|
|
|
+ width: width,
|
|
|
+ height: width,
|
|
|
+ canvasId: 'qrCode',
|
|
|
+ text: writeOffCode,
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
/**
|
|
|
* 生命周期函数--监听页面初次渲染完成
|
|
|
*/
|
|
@@ -105,23 +115,24 @@ Page({
|
|
|
/**
|
|
|
* 生命周期函数--监听页面显示
|
|
|
*/
|
|
|
- onShow:async function () {
|
|
|
+ onShow: async function () {
|
|
|
var orderId = this.data.orderId;
|
|
|
let order = await orderApi.getOrderById(orderId);
|
|
|
this.setData({
|
|
|
order: order.info,
|
|
|
orderStatus: order.info.status,
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
if (order.info.status == 1) {
|
|
|
this.createTimeClock()
|
|
|
}
|
|
|
if (order.info.status == 2) {
|
|
|
- drawById.call(wx, "qrCode", {
|
|
|
- text: order.info.writeOffCode, // 二维码内容
|
|
|
- })
|
|
|
-
|
|
|
+ this.drawCode(order.info.writeOffCode)
|
|
|
}
|
|
|
+
|
|
|
+ },
|
|
|
+ rpxToPx(data) {
|
|
|
+ return data / 750 * wx.getSystemInfoSync().windowWidth
|
|
|
},
|
|
|
|
|
|
/**
|