From d7ad4f31d11d07a74814b0e177891c6b71442f20 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 10:04:40 +0800
Subject: [PATCH] update
---
pages/order/order.vue | 226 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 197 insertions(+), 29 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 3d4c471..d5b59ea 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -1,11 +1,13 @@
<script>
export default {
+
data() {
return {
type: 'customer',
query: {
status: '',
},
+ timer: undefined,
status: [{
name: '全部',
value: ''
@@ -37,10 +39,50 @@
]
};
},
- onLoad(options) {
+ onUnload() {
+ this.timer && clearTimeout(this.timer)
+ },
+ async onLoad(options) {
this.query.status = options.status || ''
this.listApi = `/api/customer/order/list`
- this.getList()
+ await this.getList()
+ this.timer = setInterval(() => {
+ //倒计时
+ 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) {
+ //超过了5分钟
+ item.statusBackend = 'CANCEL'
+ item.statusBackend = '已取消'
+ item.status = 'CANCEL'
+ item.statusStr = '已取消'
+
+ item.bctime = ''
+ change = true
+
+ } else {
+ //相差
+ var alltime = parseInt(diff / 1000)
+ var tt = 0
+ if (alltime > 60) {
+ tt = alltime - parseInt(alltime / 60) * 60
+ } else {
+ tt = alltime
+ }
+ item.bctime = `0${parseInt(alltime / 60)}:${tt<10?'0':''}${tt}`
+ change = true
+
+ }
+ }
+ }
+ if (change)
+ this.$forceUpdate()
+ }, 1000)
},
onReachBottom() {
this.getMore()
@@ -51,6 +93,29 @@
uni.stopPullDownRefresh()
},
methods: {
+ getList_after() {
+ 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
+ if (diff <= 2000 && true) {
+ //超过了5分钟
+ item.statusBackend = 'CANCEL'
+ item.statusBackend = '已取消'
+ item.status = 'CANCEL'
+ item.statusStr = '已取消'
+
+ item.bctime = ''
+ change = true
+
+ }
+ }
+ }
+ if (change)
+ this.$forceUpdate()
+ },
toDetail(item) {
// 订单详情页面
// console.log(' toDetail item', item)
@@ -58,9 +123,15 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
- toDetailSale(item) {
+ toDetailSaleInfo(dto, flower) {
+ console.log('flower', dto, flower)
uni.navigateTo({
- url: '/pages/order/order-detail?showsales=1&id=' + item.id
+ url: '/pages/order/order-detail?showsales=1&id=' + dto.id + '&flowerId=' + flower.id
+ })
+ },
+ toOrderItemDetail(item, op, opstr) {
+ uni.navigateTo({
+ url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?opStr=${opstr}&op=${op}&orderItemId=${item.id || item.orderItemId}`
})
},
async buttonClick(item, buttontype) {
@@ -85,18 +156,64 @@
break
case 'confirm': {
await this.$message.confirm('是否确定收货')
- // 发送请求
- this.$message.showLoading()
- const {
- code
- } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
+ var tryCallWx = false
+ // #ifdef MP
+ let tmp = this
+ if (wx.openBusinessView && item.paymentTrId) {
+ tryCallWx = true
+ wx.openBusinessView({
+ businessType: 'weappOrderConfirm',
+ extraData: {
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
+ },
+ async success() {
+ //dosomething
+ // 发送请求
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.refreshList()
+ //刷新积分
+ tmp.$store.dispatch('getCurrentInfo')
+ }
+ },
+ fail(e) {
+ //dosomething
+ console.log('error fail', e)
+ tmp.$message.showToast('收货失败')
+ },
+ complete() {
+ //dosomething
+ }
+ });
+ }
+
+ // #endif
+
+ if (!tryCallWx) {
+ // 发送请求
+ this.$message.showLoading()
+ const {
+ code
+ } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ this.$message.hideLoading()
+ if (code === 0) {
+ this.refreshList()
}
- })
- this.$message.hideLoading()
- if (code === 0) {
- this.refreshList()
}
}
@@ -182,7 +299,7 @@
}
}
break
- case 'delOrder':{
+ case 'delOrder': {
await this.$message.confirm('是否删除此订单')
// 发送请求
this.$message.showLoading()
@@ -197,6 +314,7 @@
if (code === 0) {
// this.$store.dispatch('sign_add', 'order')
this.refreshList()
+
}
}
break
@@ -242,6 +360,13 @@
</view>
<view class="value" style="color: #000">{{ dto.statusBackendStr || '-' }}</view>
</view>
+ <view class="desc flex" v-if="dto.deliveryNo" @click="copyTxt(dto.deliveryNo)">
+ <view class="label">
+ 快递单号:
+ </view>
+ <view class="value">{{ dto.deliveryNo }}</view>
+ </view>
+
<view class="flex">
<view class="desc flex flex1">
<view class="label">
@@ -256,20 +381,29 @@
<view class="value">{{ dto.customerTel || '-' }}</view>
</view>
</view>
- <view class="desc flex">
- <view class="label">
- 收货地址:
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货地址:
+ </view>
+ <view class="value">{{ dto.customerAddress }}</view>
</view>
- <view class="value">{{ dto.customerAddress }}</view>
+ <view class="desc flex flex1" v-if="dto.deliveryName">
+ <view class="label">
+ 快递名称:
+ </view>
+ <view class="value">{{ dto.deliveryName }}</view>
+ </view>
</view>
+
<view class="desc flex" v-if="dto.statusBackend!=='PENDING'&&dto.statusBackend!=='CANCEL'">
<view class="label">
支付时间:
</view>
<view class="value">{{ dto.paymentTime || '-' }}</view>
</view>
- <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,index) of dto.items" :key="index">
- <view class="line-gray"></view>
+ <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 ">
<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
@@ -281,8 +415,20 @@
</image>
<view class="flex1">
<view class=" flex">
- <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
- class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
+ <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>
+ <view class="m-l-a m-r-10 flex">
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
+ v-if="item.lackNum">
+ 缺货<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'reduce','降级')"
+ v-if="item.reduceNum">
+ 降级<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ </view>
</view>
</view>
<view class="each-list">
@@ -314,6 +460,18 @@
</view>
</view>
</view>
+ <view class="line-gray"
+ v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'">
+ </view>
+ <!-- dtoId:{{dto.id}} -->
+ <!-- flowerId:{{item.id}} -->
+ <view class="flex buttons"
+ v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'">
+ <view class="button button-1 m-l-a m-r-0" @click="toDetailSaleInfo(dto,item)"
+ v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
+ </view>
+ </view>
+
</view>
<view class="line-gray"></view>
@@ -324,7 +482,7 @@
<view class="button button-0 m-l-a m-r-15" v-if="dto.statusBackend==='PENDING'"
@click="buttonClick(dto,'cancelOrder')">取消订单</view>
<view class="button button-1 m-l-15 m-r-15" v-if="dto.statusBackend==='PENDING'"
- @click="buttonClick(dto,'payAgain')">重新支付</view>
+ @click="buttonClick(dto,'payAgain')">重新支付<span v-if="dto.bctime">({{dto.bctime}})</span></view>
<view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'refund')"
v-if="dto.couldRefund">
@@ -333,10 +491,10 @@
<view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'confirm')"
v-if="dto.statusBackend ==='RECEIVE'"> 确认收货
</view>
-
- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
- v-if="dto.statusBackend === 'EVALUATE'||item.statusBackend=='COMPLETED'"> 申请售后
- </view>
+ <!-- ||item.statusBackend=='COMPLETED' -->
+ <!-- <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')"
v-if="dto.statusBackend === 'EVALUATE'"> 评价
</view>
@@ -448,6 +606,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+ flex: 1;
.level {
font-weight: 400;
@@ -456,6 +615,13 @@
line-height: 40rpx;
margin-right: 20rpx;
}
+
+ .button-icon {
+ color: #fff;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ background-color: darkred;
+ }
}
.flower-img {
@@ -463,6 +629,8 @@
height: 118rpx;
min-width: 128rpx;
min-height: 118rpx;
+
+
}
.each-list {
--
Gitblit v1.9.3