From 1d782559b682f7eb7a374c2e8017ff65cb941e52 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 17:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/order/order-detail.vue | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 39 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 4340a8b..d868488 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -41,45 +41,49 @@
pictureList: []
}
this.showSales = options.showsales && true || false
- this.timer = setInterval(() => {
- //倒计时
- var nowdate = new Date().getTime() - 1000 * 60 * 5
- var change = false
- //计算倒计时
- var diff = new Date(this.dto.createTime).getTime() - nowdate
- console.log('diff', diff)
- if (diff <= 2000 && true) {
- //超过了5分钟
- this.dto.statusBackend = 'CANCEL'
- this.dto.statusBackendStr = '已取消'
- this.dto.status = 'CANCEL'
- this.dto.statusStr = '已取消'
+ if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {
- this.dto.bctime = ''
- // console.log('change cancel', this.dto)
- change = true
- clearInterval(this.timer)
- this.timer = undefined
- } else {
- //相差
- var alltime = parseInt(diff / 1000)
- var tt = 0
- if (alltime > 60) {
- tt = alltime - parseInt(alltime / 60) * 60
+
+ this.timer = setInterval(() => {
+ //倒计时
+ var nowdate = new Date().getTime() - 1000 * 60 * 5
+ var change = false
+
+ //计算倒计时
+ var diff = new Date(this.dto.createTime).getTime() - nowdate
+ console.log('diff', diff)
+ if (diff <= 2000 && true) {
+ //超过了5分钟
+ this.dto.statusBackend = 'CANCEL'
+ this.dto.statusBackendStr = '已取消'
+ this.dto.status = 'CANCEL'
+ this.dto.statusStr = '已取消'
+
+ this.dto.bctime = ''
+ // console.log('change cancel', this.dto)
+ change = true
+ clearInterval(this.timer)
+ this.timer = undefined
} else {
- tt = alltime
+ //相差
+ var alltime = parseInt(diff / 1000)
+ var tt = 0
+ if (alltime > 60) {
+ tt = alltime - parseInt(alltime / 60) * 60
+ } else {
+ tt = alltime
+ }
+ this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ change = true
+
}
- this.dto.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
- change = true
-
- }
- if (change)
- this.$forceUpdate()
- }, 1000)
-
+ if (change)
+ this.$forceUpdate()
+ }, 1000)
+ }
}
@@ -107,6 +111,49 @@
},
methods: {
+
+ openbrand(item) {
+ //也要判断一下是否重复进入
+ //判断堆栈，如果是店铺，就直接返回
+ //或者是：从商铺到列表再到详情，再到商铺，这种也不行
+ const pages = getCurrentPages();
+ console.log('toShopping', pages)
+ if (pages && pages.length >= 2) {
+ if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
+ uni.navigateBack()
+ return
+ }
+ }
+ if (pages && pages.length >= 3) {
+ if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
+ pages[pages.length - 2].route === "sub_pages/customer/trade/list"
+ ) {
+ uni.navigateBack({
+ delta: 2
+ })
+ return
+ }
+ }
+
+ if (pages.length >= 10) {
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ }
+
+ },
+
+ toFlowerDetail(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
+ })
+ },
salesTypeChange(e) {
this.submitForm.salesType = e.value
},
@@ -206,9 +253,12 @@
extraData: {
// merchant_id: '',
// merchant_trade_no: '',
+ merchant_id: '1661512517',
+ merchant_trade_no: tmp.id || '',
transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
},
- async success() {
+ async success(info) {
+ console.log('info', info)
//dosomething
// 发送请求
tmp.$message.showLoading()
@@ -489,7 +539,7 @@
<view v-for="(item,index) of list" :key="index">
<view class="flower-info m-b-20 m-t-12 br-4"
v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
- <view class="supplier-name ">
+ <view class="supplier-name " @click.stop="openbrand(item)">
<image class="icon-dp" src="/static/common/icon-dp.png"></image>
{{ item.supplierName || ''}}
</view>
@@ -503,7 +553,7 @@
<image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
@click="previewImg(item.flowerCover)">
</image>
- <view class="flex1">
+ <view class="flex1" @click.stop="toFlowerDetail(item)">
<view class=" flex">
<view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
@@ -562,7 +612,7 @@
</view>
<view class="form-item">
<view class="label">下单日期:</view>
- <view class="value">{{ dto.paymentTime || '-' }}</view>
+ <view class="value">{{ dto.createTime || '-' }}</view>
</view>
<view class="form-item" v-if="dto.cancelTime&&(dto.status==='CANCEL'||dto.status==='REFUND')">
<view class="label">取消时间:</view>
@@ -609,8 +659,8 @@
</view>
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
<view class="form-item flex">
- <view class="label">订单金额:</view>
- <view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
+ <view class="label">商品金额:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
</view>
<view class="form-item flex">
<view class="label">运费:</view>
--
Gitblit v1.9.3