From b11a3289fd5a0c0b41fd19a97534562b35bbb468 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 22 九月 2024 20:04:39 +0800
Subject: [PATCH] update
---
sub_pages/customer/trade/list.vue | 2 +-
pages/home/supplier-home.vue | 7 ++++---
sub_pages/customer/coupon/good-all.vue | 6 +++---
sub_pages/customer/trade/trade.vue | 2 +-
pages/order/order-detail.vue | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 595d984..581e7a3 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -238,6 +238,7 @@
},
async onPullDownRefresh() {
await this.$store.dispatch('getCurrentInfo')
+ await getTj(true)
uni.stopPullDownRefresh()
},
onLoad(options) {
@@ -245,7 +246,7 @@
const urlcode = options.url && decodeURIComponent(options.url) || ''
},
onShow() {
- this.getTj()
+ this.getTj(true)
},
created() {
//公告
@@ -430,10 +431,10 @@
},
})
},
- getTj() {
+ getTj(refresh=false) {
// /api/supplier/delivery
- if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
+ if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
this.cacheUserId = this.currentInfo.id
let that = this
setTimeout(() => {
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8feb5ab..2ee8c07 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -613,8 +613,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>
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index cd9f6eb..eed5e76 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -89,11 +89,11 @@
{{item.point||'0'}}积分
</view>
<view class="m-l-10 desc-gray">
- 库存：{{item.stock||'0'}}
+ 库存：{{item.couponAmount||'0'}}
</view>
- <view class="button m-l-a m-r-15" :class="[item.stock===0?'over':'']"
+ <view class="button m-l-a m-r-15" :class="[item.couponAmount===0?'over':'']"
@click="exchange('coupon',item)">
- {{item.stock===0?'已售磬':'兑换'}}
+ {{item.couponAmount===0?'已售磬':'兑换'}}
</view>
</view>
</view>
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 5a479aa..6c5891e 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -72,7 +72,7 @@
<view class="m-l-12 info-container flex1">
<view @click.stop="toDetail(item)">
<view class="title">
- {{item.name||'-'}}
+ <view style="max-width: 240rpx;">{{item.name||'-'}}</view>
<view class="price component-price-new">
<span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 4d66227..c3a7722 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -60,7 +60,7 @@
<view class="flex1">
<view class="cateen_infos list">
<view class="title flex">
- {{item.name}}
+ <view style="max-width: 200rpx;text-align: left;">{{item.name}}</view>
<view class="desc m-l-a m-r-0">在售 {{item.stock||'0'}} 扎</view>
</view>
<view class="price">
--
Gitblit v1.9.3