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-detail.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 72f611f..4acc628 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -45,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
//计算倒计时
@@ -74,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
}
@@ -110,8 +120,15 @@
})
},
+
methods: {
-
+ // 商品评论
+ commentButtonClick(){
+ // 跳转的到评论列表
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?orderId='+this.id
+ })
+ },
openbrand(item) {
//也要判断一下是否重复进入
//判断堆栈，如果是店铺，就直接返回
@@ -181,8 +198,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) {
@@ -201,9 +223,23 @@
async callTel() {
await this.$message.confirm('是否拨打客服电话')
uni.makePhoneCall({
- phoneNumber: '15974805814'
+ phoneNumber: '19288780072'
});
},
+
+ async getTelNum(){
+ this.$http.request('get', '/api/code/value', {
+ params: {
+ type: 'customer_service_hotline'
+ }
+ }).then(res => {
+ var data = res.data;
+
+ console.log(data)
+
+ })
+ },
+
async getItemList() {
this.$message.showLoading()
const {
@@ -263,7 +299,7 @@
// 发送请求
if (info.extraData && info.extraData.status === 'fail') {
tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
-
+
} else if (info.extraData && info.extraData.status === 'cancel') {
} else {
@@ -312,6 +348,8 @@
this.$message.hideLoading()
if (code === 0) {
this.getDetail()
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -476,10 +514,13 @@
// this.$message.showToast('未选择需要售后的商品')
// return
// }
- if (isNaN(parseFloat(this.submitForm.num)) || this.submitForm.num <= 0) {
+ if (isNaN(parseInt(this.submitForm.num)) || this.submitForm.num <= 0 || parseInt(this.submitForm
+ .num) <= 0) {
this.$message.showToast('售后数量需要大于0')
return
}
+ this.submitForm.num = parseInt(this.submitForm.num) || 1
+
if (!this.submitForm.salesType) {
this.$message.showToast('未填写售后类型')
return
@@ -759,7 +800,7 @@
<view class="flex m-t-12">
<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
<image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image>
- 拨打15974805814
+ 拨打19288780072
</view>
<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image>
--
Gitblit v1.9.3