From e5d380f112e97532656e8f15c38f554f49015da1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 22:42:36 +0800
Subject: [PATCH] update 打印机丢失问题
---
pages/order/order.vue | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index e62584c..d5b59ea 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -93,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)
@@ -100,9 +123,15 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
- toDetailSale(dto, flower) {
+ toDetailSaleInfo(dto, flower) {
+ console.log('flower', dto, flower)
uni.navigateTo({
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) {
@@ -130,29 +159,32 @@
var tryCallWx = false
// #ifdef MP
let tmp = this
- if (wx.openBusinessView&&false) {
+ if (wx.openBusinessView && item.paymentTrId) {
tryCallWx = true
wx.openBusinessView({
businessType: 'weappOrderConfirm',
extraData: {
- merchant_id: '1230000109',
- merchant_trade_no: '1234323JKHDFE1243252',
- transaction_id: '420123123123123123123'
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
},
- success() {
+ async success() {
//dosomething
// 发送请求
tmp.$message.showLoading()
const {
code
- } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
- }
- })
+ } = 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) {
@@ -282,6 +314,7 @@
if (code === 0) {
// this.$store.dispatch('sign_add', 'order')
this.refreshList()
+
}
}
break
@@ -369,8 +402,8 @@
</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>
@@ -382,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">
@@ -415,9 +460,14 @@
</view>
</view>
</view>
- <view class="line-gray"></view>
- <view class="flex buttons">
- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto,item)"
+ <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>
@@ -556,6 +606,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+ flex: 1;
.level {
font-weight: 400;
@@ -564,6 +615,13 @@
line-height: 40rpx;
margin-right: 20rpx;
}
+
+ .button-icon {
+ color: #fff;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ background-color: darkred;
+ }
}
.flower-img {
@@ -571,6 +629,8 @@
height: 118rpx;
min-width: 128rpx;
min-height: 118rpx;
+
+
}
.each-list {
--
Gitblit v1.9.3