From 210866e6342fe6b0beee90171e6373b880a1f7b9 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:45:27 +0800
Subject: [PATCH] 1.后台文件上传失败提醒
---
pages/order/order.vue | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index ecbd85d..3a628f1 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -46,13 +46,22 @@
this.query.status = options.status || ''
this.listApi = `/api/customer/order/list`
await this.getList()
- this.timer = setInterval(() => {
+
+ this.timer = setInterval(async () => {
+
+ 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 change = false
for (var item of this.list) {
if (item.statusBackend === 'PENDING') {
//计算倒计时
+
var diff = new Date(item.createTime).getTime() - nowdate
// console.log('diff', diff, item)
if (diff <= 2000 && true) {
@@ -74,7 +83,8 @@
} else {
tt = alltime
}
- item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ // item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ item.bctime = `${parseInt(alltime / 60) < 10 ? '0' : ''}${parseInt(alltime / 60)}:${tt < 10 ? '0' : ''}${tt}`
change = true
}
@@ -136,8 +146,17 @@
url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
})
},
- getList_after() {
- var nowdate = new Date().getTime() - 1000 * 60 * 5
+ async getList_after() {
+
+ let res = await this.$http.request('get', `/api/order/time/now`, {
+ params: {}
+ })
+ let serverTime=res.data;
+
+ //倒计时
+ var nowdate = serverTime - 1000 * 60 * 15
+
+ // var nowdate = new Date().getTime() - 1000 * 60 * 15
var change = false
for (var item of this.list) {
if (item.statusBackend === 'PENDING') {
@@ -164,6 +183,12 @@
// console.log(' toDetail item', item)
uni.navigateTo({
url: '/pages/order/order-detail?id=' + item.id
+ })
+ },
+
+ commentButtonClick(item){
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?id='+item.id
})
},
@@ -294,6 +319,9 @@
this.$message.hideLoading()
if (code === 0) {
this.refreshList()
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -488,7 +516,7 @@
<view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
- {{ item.supplierName }}
+ {{ item.supplierName|| '' }} >
</view>
<view class="flex m-t-12 flex-wrap-normal">
<!-- @click="previewImg(item.flowerCover)" -->
@@ -579,8 +607,11 @@
<!-- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
</view> -->
- <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
+ <!-- <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
v-if="dto.statusBackend === 'EVALUATE'"> 评价
+ </view> -->
+ <view class="button button-0 m-l-a m-r-15" @click="commentButtonClick(dto)"
+ v-if="dto.statusBackend === 'EVALUATE'"> 评价
</view>
--
Gitblit v1.9.3