Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

陶杰

2024-09-11 6d54fb64df667c0c396fc7d74aeed9e096d95f95

 pages/home/home.vue

@@ -31,29 +31,29 @@
      </view>



      <!-- banner -->

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

               <view class="swiper-item" :class="'swiper-item' + index">

                  <!-- @click="previewImg(item.url||item.image)" -->

                  <image class="home-banner-image" mode="scaleToFill" @click="clickBanner(item)"

                     :src="item.url||item.image">

                  </image>

               </view>

            </swiper-item>

         </swiper>

         <swiper class="swiper-box" @change="changeBanner" :current="0" v-if="!banners||banners.length==0">

            <swiper-item v-for="(item, index) in 1" :key="index">

               <view class="swiper-item" :class="'swiper-item' + index">

                  <image class="home-banner-image" mode="scaleToFill"

                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png">

                  </image>

               </view>

            </swiper-item>

         </swiper>

      </uni-swiper-dot>

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

            <view class="swiper-item" :class="'swiper-item' + index">

               <!-- @click="previewImg(item.url||item.image)" -->

               <image class="home-banner-image" mode="scaleToFill" @click="clickBanner(item)"

                  :src="item.url||item.image">

               </image>

            </view>

         </swiper-item>

      </swiper>

      <swiper class="swiper-box" @change="changeBanner" :current="0" v-if="!banners||banners.length==0">

         <swiper-item v-for="(item, index) in 1" :key="index">

            <view class="swiper-item" :class="'swiper-item' + index">

               <image class="home-banner-image" mode="scaleToFill"

                  src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png">

               </image>

            </view>

         </swiper-item>

      </swiper>

      <!-- </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

@@ -69,11 +69,13 @@
      <!-- 几个专区 -->

      <home-zones></home-zones>

      <!-- 置顶的花列表 -->

      <home-top-flow></home-top-flow>

      <home-top-flow ref="home_top_flow"></home-top-flow>



      <view style="min-height:180rpx">

      <view style="min-height:140rpx">

      </view>

      <common-footer flg="0"></common-footer>



      <uni-popup ref="coupon_home" type="bottom" border-radius="10px 10px 0 0">底部弹出 Popup 自定义圆角</uni-popup>



   </view>

</template>

@@ -188,7 +190,13 @@
            path: url,

         }

      },



      onReachBottom() {

         console.log('onReachBottom')

         if (this.$refs && this.$refs.home_top_flow) {

            // console.log(this.$refs.home_top_flow)

            this.$refs.home_top_flow.fun_GetMore()

         }

      },

      onLoad(options) {

         // if(options.partnerUserId){

         //    //需要前往注册了

@@ -291,7 +299,7 @@
         this.$http.request('get', '/api/pub/announcement/list/' + type, {

            params: {

               size: 5,

               // status: 'A'

               status: 'A'

            }

         }).then(res => {

            if (res.code === 0) {

@@ -329,7 +337,18 @@
            }

         })





         // let tmp = this

         // //首页优惠券

         // this.$http.request('get', '/api/v2/coupon/app' + `/home/list`).then(res => {

         //    if (res.code == 0) {

         //       var list = res.data || []

         //       var dto = list.length >= 1 ? list[0] : undefined

         //       if (dto) {

         //          // 显示弹窗图片

         //          tmp.$refs.coupon_home.open()

         //       }

         //    }

         // })

      },

      methods: {

         clickBanner(item) {