Merge remote-tracking branch 'origin/main'

xuxueyang

2024-08-11 7f693ebe71d34fd84b3618ff0d5a66f004e46db5

Merge remote-tracking branch 'origin/main'

 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)">

 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()

        },