From 7f693ebe71d34fd84b3618ff0d5a66f004e46db5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 11 八月 2024 22:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
pages/notice/list.vue | 13 ++++++++++++-
pages/home/components/home-category.vue | 1 +
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/pages/home/components/home-category.vue b/pages/home/components/home-category.vue
index 0ff549c..a162895 100644
--- a/pages/home/components/home-category.vue
+++ b/pages/home/components/home-category.vue
@@ -3,6 +3,7 @@
<view class="flex">
<view class="t1">{{today}}（今日）第一场交易中</view>
<view class="t2">当前在售</view>
+ <!-- 加了/api/customer/flower/up/stock -->
</view>
<view class="m-t-12 flex">
<view class="item" v-for="(item,index) of list" :key="index" @click.stop="toList(item)">
diff --git a/pages/notice/list.vue b/pages/notice/list.vue
index 97c5448..dadee79 100644
--- a/pages/notice/list.vue
+++ b/pages/notice/list.vue
@@ -29,7 +29,18 @@
},
onLoad() {
// this.list = [{},{}]
- this.listApi = '/api/pub/announcement/list'
+ var type = ''
+ // #ifdef PUB_CUSTOMER
+ type = 'customer'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ type = 'supplier'
+ // #endif
+ // #ifdef PUB_PARTNER
+ type = 'partner'
+ // #endif
+
+ this.listApi = '/api/pub/announcement/list/'+type
this.getList()
},
--
Gitblit v1.9.3