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
---
pages/home/home.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 21a16f3..ee5afe5 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,8 +31,8 @@
</view>
<!-- banner -->
- <uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="currentBanner"
- :mode="'dot'" :dots-styles="dotsStyles[0]" field="content">
+ <!-- <uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="currentBanner"
+ :mode="'dot'" :dots-styles="dotsStyles[0]" field="content"> -->
<swiper class="swiper-box" @change="changeBanner" :interval="10000" :circular="true" :current="0"
v-if="banners&&banners.length>0" :autoplay="true">
<swiper-item v-for="(item, index) in banners" :key="index">
@@ -53,7 +53,7 @@
</view>
</swiper-item>
</swiper>
- </uni-swiper-dot>
+ <!-- </uni-swiper-dot> -->
<!-- tip -->
<view class="m-t-12" @click="getNoticeMore">
<uni-notice-bar class="notice-bar" color="#333" background-color="#fff" show-get-more show-icon
@@ -71,7 +71,7 @@
<!-- 置顶的花列表 -->
<home-top-flow></home-top-flow>
- <view style="min-height:200rpx">
+ <view style="min-height:140rpx">
</view>
<common-footer flg="0"></common-footer>
@@ -250,8 +250,8 @@
}
}
this.banners = result
- }
- console.log('this.banners',this.banners)
+ }
+ console.log('this.banners', this.banners)
}
})
@@ -277,10 +277,21 @@
}, 2000)
//公告
- this.$http.request('get', '/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.$http.request('get', '/api/pub/announcement/list/' + type, {
params: {
size: 5,
- // status: 'A'
+ status: 'A'
}
}).then(res => {
if (res.code === 0) {
--
Gitblit v1.9.3