Feat:优惠券对接

pages/home/index.vue

@@ -66,10 +66,10 @@
     </view>
     <!-- 快捷跳转块v4end -->
 
-<!--    <view style="padding-bottom:20rpx;background: #fff;">-->
-      <!--      转盘-->
-      <!--      <image class="home-luck" :src="`${webUrl}/20220519145845818243.png`" mode="scaleToFill" @click="goLuck"></image>-->
-<!--    </view>-->
+    <!--    <view style="padding-bottom:20rpx;background: #fff;">-->
+    <!--      转盘-->
+    <!--      <image class="home-luck" :src="`${webUrl}/20220519145845818243.png`" mode="scaleToFill" @click="goLuck"></image>-->
+    <!--    </view>-->
 
     <!-- 伴手礼精品 -->
     <!--    <view class="wrapper hot" v-if="likeInfo.length > 0">-->
@@ -244,7 +244,7 @@
     <!-- v9 老用户弹窗 -->
     <u-popup :show="isOldUser" mode="center" bgColor="transparent">
       <view class="popup-old-user flex flex-col ai-center">
-        <image class="main" :src="oldUserPopup.image" mode="scaleToFill" @click="$global.commonJump(oldUserPopup.url)"/>
+        <image class="main" :src="oldUserPopup.image" mode="scaleToFill" @click="tapOld()"/>
         <view class="icon-box flex jc-center ai-center" @click="changeOldPopup(false)">
           <image :src="webUrl+'/20230608112219219303.png'" mode="scaleToFill"/>
         </view>
@@ -314,7 +314,7 @@ import hxNavbar from "@/components/hx-navbar/hx-navbar.vue"
 import imgBox from '@/components/imageTypeSet/imagebox.vue'
 import LsSwiper from '@/components//ls-swiper/index.vue'
 
-import {noticeDetail, noticeList} from "@/api/user";
+import {getCouponReceive, noticeDetail, noticeList} from "@/api/user";
 import {getHomeData, getShareImage} from '@/api/public';
 import {getHomeHotelList} from "@/api/inn.js";
 import {getProducts} from "@/api/store";
@@ -457,6 +457,7 @@ export default {
   },
   onLoad: function (options) {
     that = this;
+    this.init();
     getShareImage().then(({data}) => this.shareAppImg = data);
     uni.getSystemInfo({
       success: (e) => {
@@ -522,7 +523,6 @@ export default {
       this.getUnreadMsgList();
     }
 
-    this.init();
     //获取团购商品
     this.getGroupGoods();
   },
@@ -668,6 +668,7 @@ export default {
     msgConfirm: function () {
       that.$refs.popup.close();
     },
+
     getHotelList: function () {
       let that = this;
 
@@ -829,6 +830,36 @@ export default {
 
     goFestival() {
       uni.navigateTo({url: '/pkg_product/views/festival'})
+    },
+    tapOld() {
+      this.isOldUser =false
+      const {type, text, jumpTime, pageLevel, url, params, couponId} = this.oldUserPopup
+      if (couponId != null) {
+        getCouponReceive(couponId).then(res => {
+          if (res.status === 200) {
+            uni.showToast({
+              title: text,
+              icon: 'none',
+              success: () => {
+              }
+            })
+          }
+        }).catch((err) => {
+          uni.showToast({
+            title: err.data.msg+'',
+            icon: 'none',
+            duration:3000
+          })
+        })
+      }
+      // type 1-定时跳转，2-点击跳转，3-不跳转
+      if (type === 1) {
+        setTimeout(() => {
+          this.$global.levelJump(pageLevel, url, params)
+        }, jumpTime * 1000)
+      } else if (type === 2) {
+        this.$global.levelJump(pageLevel, url, params)
+      }
     }
   }
 };
@@ -1735,8 +1766,8 @@ export default {
 
       .swiper {
         position: absolute;
-        left:20rpx;
-        bottom:20rpx;
+        left: 20rpx;
+        bottom: 20rpx;
         width: 296rpx;
         height: 72rpx;
         overflow: hidden;

pages/home/landMark.vue

@@ -27,7 +27,7 @@ export default {
       return 718 / (this.mapData?.mapImageWidth || 1);
     }
   },
-  onShow() {
+  onLoad() {
     this.getNavList();
   },
   onReachBottom() {
@@ -91,6 +91,7 @@ export default {
         <view class="search-box flex ai-center">
           <input type="text" v-model="keyword" placeholder="搜索商品" placeholder-style="color:#999"
                  @confirm="search()"/>
+          <image :src="webUrl+'/20231223183627184005.png'" mode="scaleToFill" style="width:30rpx;height:30rpx"/>
         </view>
 
         <view class="map-box">