From 99730c8890388fc2131c2b38146d966e7ef33d17 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:41:31 +0800
Subject: [PATCH] 1.前端缓存地址特别严重临时性修改
---
pages/order/order.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 1a11356..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('收货成功')
}
}
@@ -486,22 +514,23 @@
<view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
<!-- <view class="line-gray"></view> -->
- <view class="supplier-name " @click.stop="openbrand(item)">
+ <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)" -->
<image class="flower-img img100 m-r-6" :src="item.flowerCover"
- @click="previewImg(item.flowerCover)">
+ @click.stop="toDetail(dto)" >
</image>
<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
- <view class="flex1" @click.stop="toDetail(dto)">
+ <view class="flex1" >
<view class=" flex">
<view class="title flex flex1">
<!-- <span class="level">{{ item.flowerCategory }}</span> -->
- <span class="m-r-10">{{ item.flowerName }}</span>
- <span class="level">{{ item.flowerLevelStr }}</span>
+ <span class="m-r-10" @click.stop="toDetail(dto)">{{ item.flowerName }}</span>
+ <span class="level" @click.stop="toDetail(dto)">{{ item.flowerLevelStr }}</span>
<view class="m-l-a m-r-10 flex">
<view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
v-if="item.lackNum">
@@ -514,7 +543,7 @@
</view>
</view>
</view>
- <view class="each-list">
+ <view class="each-list" @click.stop="toDetail(dto)">
<view class="each-item">
<view class="label">颜色</view>
<view class="value">{{ item.flowerColor || '-' }}</view>
@@ -578,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