Task：指引功能/状态接口对接

pages/home/index.vue

@@ -296,11 +296,11 @@
       </view>
     </view>
     <!-- v9 老用户弹窗 -->
-      <!-- :show="isOldUser && oldUserPopup.image && lotteryCanDraw" -->
 
     <u-popup
       mode="center"
       bgColor="transparent"
+      :show="isOldUser && oldUserPopup.image && lotteryCanDraw"
     >
       <view class="popup-old-user flex flex-col ai-center">
         <image
@@ -338,7 +338,7 @@
       @ok="handleOk"
       paddingBottom="200rpx"
     />
-    <FunctionGuide :maxStep="15" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
+    <FunctionGuide :maxStep="15" @hide="setGuide('index')" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
     <xdd-tabbar :curr-index="0" @getElementData="elementData" @getIcon="getIcon"/>
   </view>
 </template>
@@ -416,6 +416,7 @@ export default {
     // uni.hideTabBar()
     const _this = this
     _this.init()
+    _this.queryGuide('index')
     uni.getSystemInfo({
       success: (e) => {
         let statusBar = 0
@@ -443,6 +444,7 @@ export default {
     this.scrollTop = e.scrollTop
   },
   methods: {
+
     elementData(e) {
       this.tabIconPostion = e
     },
@@ -1341,6 +1343,20 @@ export default {
       this.$yrouter.push('/pages/shop/GoodSearch/index')
     },
     goGoodsCon(item) {
+      if(item.isFarmerShop) {
+        if (item.farmerShopId === 0) {
+          uni.showToast({
+            title: '店铺装修中~',
+            icon: 'none',
+            duration: 3000
+          })
+          return
+        }
+        uni.navigateTo({
+          url: '/pagesInn/inn/farmerStore?id=' + item.farmerShopId + '&isQianxian=1&from=famous&isFarmer=1'
+        })
+        return
+      }
       this.$yrouter.push({
         path: '/pages/shop/GoodsCon/index',
         query: {

pages/home/landMark.vue

@@ -84,7 +84,7 @@
       @changeFun="changeFun"
       @ok="handleOk"
     />
-    <FunctionGuide :maxStep="2" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
+    <FunctionGuide @hide="setGuide('landmarkGoodsIndex')" :maxStep="2" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
   </view>
 </template>
 
@@ -152,6 +152,7 @@ export default {
       this.sceneId = decodeURIComponent(opts.scene).split('&')[0].split('=')[1]
     }
     this.getNavList()
+    this.queryGuide('landmarkGoodsIndex')
   },
   onHide() {
     this.pageToHideHandle()
@@ -218,10 +219,10 @@ export default {
             tipsPosition: '420rpx',
             btnGroupPosition: '',
             position: {
-              top: res.top*2 + 'rpx',
-              left: res.left*2 + 'rpx',
-              width:  `${res.width*2}rpx`,
-              height:  `${res.height*2}rpx`,
+              top: res.top + 'px',
+              left: res.left + 'px',
+              width:  `${res.width}px`,
+              height:  `${res.height}px`,
             }
           })
         })
@@ -283,9 +284,9 @@ export default {
             btnGroupPosition: '',
             position: {
               top: (res.top - res.height + 41)*2 + 'rpx',
-              left: res.left*2 + 'rpx',
-              width:  `${res.width*2}rpx`,
-              height:  `${(res.height+41)*2}rpx`,
+              left: res.left + 'px',
+              width:  `${res.width}px`,
+              height:  `${(res.height+41)}px`,
             }
           })
         })