update merge

xuxueyang

2024-09-14 4beea1ee97f194ef35d477e18604dd91436acfa3

 pages/home/home.vue

@@ -78,7 +78,10 @@
      <uni-popup ref="coupon_home" type="center" border-radius="10px 10px 0 0">

         <view class="coupon-container" style="width: 690rpx;">

            <view class="coupont-item all">

               <view class="flex container img100">

               <!-- <view class="flex container img100"> -->

               <!-- <view class="flex container img100"   :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'cover', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->

               <view class="flex container img100"   :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: 'contain', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }">

                  <!-- <view class="flex container img100"   :style="{ backgroundImage: `url(${dto_home_coupon.imageUrl})`, backgroundSize: '100%', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }"> -->

                  <view class="info-price">

                     <view class="price1">

                        {{dto_home_coupon.maxDiscountAmount?(`${dto_home_coupon.maxDiscountAmount}折`):(`￥${dto_home_coupon.couponDiscountValue}`)}}

@@ -244,6 +247,11 @@
      },

      methods: {

         async getCoupon(item) {

            if (!this.currentInfo.id) {

               await this.$message.confirm('请先前往登录')

               this.$storage.removeItem('cache_home_show_coupon')

               return

            }

            this.$message.showLoading()

            const {

               code,

@@ -406,23 +414,33 @@
               }

            })





            let tmp = this

            var value = this.$storage.getItem('cache_home_show_coupon')

            if (!value || true) {

               //首页优惠券

               this.$storage.setItem('cache_home_show_coupon', '1')

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

                  if (res.code == 0) {

                     var list = res.data || []

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

                     if (dto) {

                        // 显示弹窗图片

                        this.dto_home_coupon = dto

                        tmp.$refs.coupon_home.open()

                     }

            //延迟2秒

            setTimeout(() => {

               if (tmp.currentInfo.id) {

                  var value = tmp.$storage.getItem('cache_home_show_coupon')

                  if (!value) {

                     //首页优惠券

                     tmp.$storage.setItem('cache_home_show_coupon', '1')

                     var u = '/api/v2/coupon/app/home/alert'

                     // u = '/api/v2/coupon/app/home/list'

                     tmp.$http.request('get', u).then(res => {

                        if (res.code == 0) {

                           // var list = res.data || {}

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

                           var dto = res.data || undefined

                           if (dto) {

                              // 显示弹窗图片

                              tmp.dto_home_coupon = dto

                              tmp.$refs.coupon_home.open()

                           }

                        }

                     })

                  }

               })

            }

               }

            }, 1200)



         },



         clickBanner(item) {