From cb623fcefa72d5b54b1e536aa84c3f3851743975 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 20 十一月 2024 11:01:43 +0800
Subject: [PATCH] update 打印可能的空白（不能确定是不是纸张大小超出还是空数据的问题，已经提交了
---
pages/order/order-detail.vue | 71 +++++++++++------------------------
1 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 24a86bb..cbc4434 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,19 +18,6 @@
salesTypeList: [],
};
},
-
- async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER_DEV
- let options = wx.getEnterOptionsSync();
- if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
- // 代表从收银台小程序返回
- let extraData = options.referrerInfo.extraData;
- this.getDetail()
- return
- }
- // #endif
- },
onUnload() {
this.timer && clearTimeout(this.timer)
},
@@ -58,9 +45,17 @@
if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {
- this.timer = setInterval(() => {
+ this.timer = setInterval(async () => {
+ //倒计时,修改成
+ // var nowdate = new Date().getTime() - 1000 * 60 * 15
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
+
//倒计时
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var nowdate = serverTime - 1000 * 60 * 15
+
var change = false
//计算倒计时
@@ -87,7 +82,9 @@
} else {
tt = alltime
}
- this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ // this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ this.dto.bctime = `${parseInt(alltime / 60) < 10 ? '0' : ''}${parseInt(alltime / 60)}:${tt < 10 ? '0' : ''}${tt}`
+
change = true
}
@@ -131,7 +128,6 @@
url: '/pages/order/comment/order-comment?orderId='+this.id
})
},
-
openbrand(item) {
//也要判断一下是否重复进入
//判断堆栈，如果是店铺，就直接返回
@@ -201,8 +197,13 @@
// }]
}
if (this.dto.statusBackend === 'PENDING') {
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
//先判断要不要字节变成已取消
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var nowdate = serverTime - 1000 * 60 * 15
+ // var nowdate = new Date().getTime() - 1000 * 60 * 5
var diff = new Date(this.dto.createTime).getTime() - nowdate
if (diff <= 2000 && true) {
@@ -332,6 +333,8 @@
this.$message.hideLoading()
if (code === 0) {
this.getDetail()
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -354,8 +357,6 @@
if (code === 0) {
//微信接口
let that = this
- // #ifndef PUB_CUSTOMER_DEV
-
wx.requestPayment({
...data,
async success(res) {
@@ -368,32 +369,6 @@
that.$message.showToast('支付失败')
}
})
- // #endif
- // #ifdef PUB_CUSTOMER_DEV
- var param = {
- // cusid: "平台分配的商户号",
- // appid: "平台分配的appid",
- // orgid: "平台分配的机构号",
- // version: "12",
- // trxamt: "1",
- // reqsn: "商户唯一订单号",
- // notify_url: "服务器异步通知页面路径",
- // body: "标题",
- // remark: "备注",
- // validtime: "订单有效时间",
- // limit_pay: "no_credit",
- // randomstr: "随机字符串",
- // paytype: "W06",
- // signtype: "签名方式",
- // sign: "签名，参考2.1",
- ...data
- }
- wx.openEmbeddedMiniProgram({
- appId: 'wxef277996acc166c3',
- extraData: param
- })
- // #endif
-
}
@@ -898,8 +873,8 @@
<view class="button button-1" @click="buttonClick('payAgain')" v-if=" dto.status === 'PENDING'"> 重新支付<span
v-if="dto.bctime">({{dto.bctime}})</span>
</view>
- <!-- <view class="button button-1" @click="commentButtonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
- <!-- <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
+ <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
+ </view>
<!-- ||dto.status=='COMPLETED' -->
<!-- 在外面申请了，里面不允许了 -->
<!-- <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后
--
Gitblit v1.9.3