From cb623fcefa72d5b54b1e536aa84c3f3851743975 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 20 十一月 2024 11:01:43 +0800
Subject: [PATCH] update 打印可能的空白（不能确定是不是纸张大小超出还是空数据的问题，已经提交了
---
pages/order/order-detail.vue | 242 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 208 insertions(+), 34 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 6018509..cbc4434 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -14,6 +14,8 @@
// #ifdef PUB_PARTNER
type: 'partner',
// #endif
+ salesTypeDef: 0,
+ salesTypeList: [],
};
},
onUnload() {
@@ -31,6 +33,7 @@
orderId: this.id,
// imageList: [],
videoList: [],
+ salesType: '',
reason: '',
// orderItems: [],
orderItemId: options.flowerId || '',
@@ -39,11 +42,20 @@
}
this.showSales = options.showsales && true || false
+ if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {
- if (this.dto.statusBackend === '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
//计算倒计时
@@ -70,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
}
@@ -83,8 +97,82 @@
}
+
+ this.$http.request('get', '/api/code/value', {
+ params: {
+ type: 'after_sale_type'
+ }
+ }).then(res => {
+ var data = res.data;
+
+ let tmpData = data.map(item => ({
+ value: item.value,
+ label: item.label
+ }));
+
+ // 将 '全部' 选项插入到 tmpData 的开头
+ this.salesTypeList = tmpData;
+ this.salesTypeList.unshift({
+ label: '全部',
+ value: ''
+ });
+
+ })
+
},
methods: {
+ // 商品评论
+ commentButtonClick(){
+ // 跳转的到评论列表
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?orderId='+this.id
+ })
+ },
+ 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
+ },
async getDetail() {
this.$message.showLoading()
@@ -108,6 +196,27 @@
// description: 'descriptiondescriptiondescriptiondescriptiondescription'
// }]
}
+ if (this.dto.statusBackend === 'PENDING') {
+ 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 * 5
+ var diff = new Date(this.dto.createTime).getTime() - nowdate
+
+ if (diff <= 2000 && true) {
+ //超过了5分钟
+ this.dto.statusBackend = 'CANCEL'
+ this.dto.statusBackendStr = '已取消'
+ this.dto.status = 'CANCEL'
+ this.dto.statusStr = '已取消'
+ this.dto.bctime = ''
+ this.$forceUpdate()
+ }
+ }
+
}
},
async callTel() {
@@ -165,24 +274,37 @@
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()
- const {
- code
- } = await tmp.$http.request('get',
- '/api/customer/order/receive/confirm', {
- params: {
- id: tmp.id,
- }
- })
- tmp.$message.hideLoading()
- if (code === 0) {
- tmp.getDetail()
+ if (info.extraData && info.extraData.status === 'fail') {
+ tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
+
+ } else if (info.extraData && info.extraData.status === 'cancel') {
+
+ } else {
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: tmp.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.getDetail()
+ tmp.$store.dispatch('getCurrentInfo')
+ }
+
}
+
},
fail(e) {
//dosomething
@@ -211,6 +333,8 @@
this.$message.hideLoading()
if (code === 0) {
this.getDetail()
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -375,8 +499,15 @@
// 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
}
if (!this.submitForm.reason) {
@@ -443,9 +574,11 @@
<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 ">
- <image class="icon-dp" src="/static/common/icon-dp.png"></image>
- {{ item.supplierName || ''}}
+ <view class="supplier-name " >
+ <view @click.stop="openbrand(item)" style="display: inline-block;">
+ <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
+ {{ item.supplierName|| '' }} >
+ </view>
</view>
<!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
<!-- itemId:{{item.id}} -->
@@ -454,10 +587,9 @@
<!-- @click="changeSalesOrderItem(item)" -->
<!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
- @click="previewImg(item.flowerCover)">
- </image>
- <view class="flex1">
+ <!-- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"></image> -->
+ <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="toFlowerDetail(item)"></image>
+ <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 || ''}}
@@ -516,7 +648,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>
@@ -562,11 +694,29 @@
</view>
</view>
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
- <view class="form-item">
- <view class="label">订单金额:</view>
- <view class="value">{{ dto.totalAmount || '-' }}</view>
+ <view class="form-item flex">
+ <view class="label">商品金额:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
</view>
- <view class="form-item">
+ <view class="form-item flex">
+ <view class="label">运费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item flex">
+ <view class="label">打包费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">优惠:</view>
+ <view class="value m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">实际支付:</view>
+ <view class="value m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -574,11 +724,23 @@
<view class="label">商品金额:</view>
<view class="value">{{ dto.flowerAmount || '-' }}</view>
</view>
+
<view class="form-item">
- <view class="label">运费:</view>
- <view class="value">{{ dto.transportFee || '-' }}</view>
+ <view class="label">折扣类型:</view>
+ <view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
</view>
-
+ <view class="form-item">
+ <view class="label">优惠金额（每扎）:</view>
+ <view class="value">￥{{ dto.memberDiscountAmount || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">优惠券:</view>
+ <view class="value">{{ dto.memberCouponName || '-' }}</view>
+ </view> -->
+ <!-- <view class="form-item">
+ <view class="label">优惠金额:</view>
+ <view class="value">{{ dto.memberCouponAmount || '-' }}</view>
+ </view> -->
</view>
<view class="info-container bg-white br-4 m-t-12"
v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
@@ -601,7 +763,8 @@
</view>
<view class="each-item" style="min-width: unset;max-width: unset;">
<view class="label" style="min-width: 55rpx;">描述</view>
- <view class="value" style="word-break: break-all;text-align: left;">{{ item.description || '-' }}
+ <view class="value" style="word-break: break-all;text-align: left;">
+ {{ item.description || '-' }}
</view>
</view>
</view>
@@ -647,6 +810,17 @@
class="form-input"></input>
</view>
</view>
+
+ <view class="form-item">
+ <view class="form-item-label require">
+ 售后类型
+ </view>
+ <view class="form-item-value">
+ <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label"
+ :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
+ </view>
+ </view>
+
<view class="form-item">
<view class="form-item-label require">
理由
--
Gitblit v1.9.3