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 | 96 ++++++++++++++++-------------------------------
1 files changed, 33 insertions(+), 63 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 985d21d..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
}
@@ -91,19 +101,6 @@
this.page.current = 1
await this.getList()
uni.stopPullDownRefresh()
- },
- async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER_DEV
- let options = wx.getEnterOptionsSync();
- if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
- // 代表从收银台小程序返回
- let extraData = options.referrerInfo.extraData;
- this.$store.dispatch('sign_add', 'order')
- this.refreshList()
- return
- }
- // #endif
},
methods: {
@@ -149,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') {
@@ -185,9 +191,9 @@
url: '/pages/order/comment/order-comment?id='+item.id
})
},
-
async copyOrder(item) {
+ console.log(item)
await this.$message.confirm('是否确定再来一单')
// 发送请求
this.$message.showLoading()
@@ -313,6 +319,9 @@
this.$message.hideLoading()
if (code === 0) {
this.refreshList()
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -334,7 +343,6 @@
if (code === 0) {
//微信接口
let that = this
- // #ifndef PUB_CUSTOMER_DEV
wx.requestPayment({
...data,
async success(res) {
@@ -350,45 +358,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
- })
- // if (compareVersion(version, '2.26.2') >= 0) {
-
- // wx.openEmbeddedMiniProgram({
- // appId: 'wxef277996acc166c3',
- // extraData: param
- // })
-
- // } else {
- // wx.navigateToMiniProgram({
- // appId: 'wxef277996acc166c3',
- // extraData: param
- // })
-
- // }
- // #endif
}
@@ -547,14 +516,15 @@
<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.stop="toDetail(dto)">
+ <image class="flower-img img100 m-r-6" :src="item.flowerCover"
+ @click.stop="toDetail(dto)" >
</image>
<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
- <view class="flex1">
+ <view class="flex1" >
<view class=" flex">
<view class="title flex flex1">
@@ -641,7 +611,7 @@
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'"> 评价
+ v-if="dto.statusBackend === 'EVALUATE'"> 评价
</view>
--
Gitblit v1.9.3