Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-26 4b68b41822b8da02c9a9ceba3bc6e30d4445d324

 sub_pages/supplier/flower-manage/flower-manage.vue

@@ -72,6 +72,10 @@
                           <view class="label">价格</view>

                           <view class="value">{{item.price||'-'}}</view>

                        </view>

                        <view class="each-item">

                           <view class="label">限购数量</view>

                           <view class="value">{{item.limited||'-'}}</view>

                        </view>

                     </view>

                  </view>

               </view>

@@ -158,7 +162,7 @@
      async onLoad(options) {

         this.type = options.type || 'all'

         var title = ''

         this.page.size = 5

         this.page.size = 20

         //todo 根据type切换查询条件

         if (this.type === 'delete') {

            this.listApi = '/api/supplier/flower/list/rc'