From 2ddf143b4b497508b528b3a7bd766f628e9a2c26 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 08 九月 2024 18:55:20 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into v2
---
sub_pages/customer/trade/list.vue | 2 +-
sub_pages/customer/self/history.vue | 16 ++++++++--------
manifest.json | 2 +-
sub_pages/customer/self/collect.vue | 3 +++
sub_pages/customer/coupon/good-all.vue | 3 ++-
pages/home/components/home-top-flow.vue | 2 +-
sub_pages/customer/shop/shop.vue | 2 +-
pages/order/order-sale/order-sale-detail.vue | 1 +
sub_pages/customer/trade/detail.vue | 2 +-
9 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2848179..782394c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx1441324401626290",
+ "appid" : "wx6d0ecc4e18710458",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/home/components/home-top-flow.vue b/pages/home/components/home-top-flow.vue
index 20f5236..a658721 100644
--- a/pages/home/components/home-top-flow.vue
+++ b/pages/home/components/home-top-flow.vue
@@ -30,7 +30,7 @@
</view>
<view class="other-info flex">
<view class="m-r-15">
- 已售:{{ item.sales || 0 }}
+ 已售:{{ ((item.sales||0) +(item.realSales||0)) || 0 }}
</view>
<view class="m-r-15">
剩余:{{ item.stock || 0 }}
diff --git a/pages/order/order-sale/order-sale-detail.vue b/pages/order/order-sale/order-sale-detail.vue
index 6b2d097..9bd5274 100644
--- a/pages/order/order-sale/order-sale-detail.vue
+++ b/pages/order/order-sale/order-sale-detail.vue
@@ -134,6 +134,7 @@
</view>
+
<view class="info-container bg-white br-4">
<view class="form-item">
<view class="label">订单编号:</view>
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 1e4a572..f680a2d 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -1,7 +1,8 @@
<template>
<view class="good-list-container">
<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
- <image class="component-bg" src="../../../static/images/customer/coupon/good-top-bg.png"
+ <!-- ../../../static/images/customer/coupon/good-top-bg.png -->
+ <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
mode="scaleToFill" />
<view class="title">
diff --git a/sub_pages/customer/self/collect.vue b/sub_pages/customer/self/collect.vue
index f652d88..6328131 100644
--- a/sub_pages/customer/self/collect.vue
+++ b/sub_pages/customer/self/collect.vue
@@ -24,6 +24,9 @@
]
}
},
+ onShow() {
+ this.refreshList()
+ },
onLoad() {
this.listApi = '/api/collect/list'
this.getList()
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 1664760..f855a3b 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -26,7 +26,7 @@
},
onLoad() {
this.listApi = '/api/browse/history/list'
- this.page.size =30
+ this.page.size = 30
this.getList()
this.$http.request('get', '/api/code/value', {
@@ -55,13 +55,13 @@
})
})
},
- onShow() {
- // 页面显示时重新加载浏览记录数据
- this.listApi = '/api/browse/history/list'
- this.page.size =30
- this.getList()
- },
-
+ onShow() {
+ // 页面显示时重新加载浏览记录数据
+ this.listApi = '/api/browse/history/list'
+ this.page.size = 30
+ this.refreshList()
+ },
+
methods: {
async deleteExpired() {
diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue
index 598586b..8d27426 100644
--- a/sub_pages/customer/shop/shop.vue
+++ b/sub_pages/customer/shop/shop.vue
@@ -123,7 +123,7 @@
</view> -->
<view class="other-info flex" @click.stop="toDetail(item)">
<view class="m-r-15">
- 已售:{{item.sales || 0}}
+ 已售:{{ ((item.sales||0) +(item.realSales||0)) || 0}}
</view>
<view class="m-r-15">
剩余:{{item.stock || 0}}
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index ded7a1f..24cd783 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -67,7 +67,7 @@
</view>
</view>
<view class="desc m-t-12">
- <view class="m-r-15">已售:{{ dto.sales || 0 }}</view>
+ <view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
<view class=" ">{{ dto.unit || '-' }}</view>
</view>
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 77f7c5b..c433172 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -91,7 +91,7 @@
</view>
<view class="other-info flex">
<view class="m-r-15">
- 已售:{{item.sales||0}}
+ 已售:{{ ((item.sales||0) +(item.realSales||0)) ||0}}
</view>
<view class="m-r-15">
剩余:{{item.stock||0}}
--
Gitblit v1.9.3