From 77640a4888fb47e7bf276adbd1d1193d656eacdb Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 9 Dec 2021 11:34:25 +0800
Subject: [PATCH] 到体验测试关注公众号

---
 pages/index/index/index.js   | 21 ++++++++++++---------
 pages/index/index/index.wxml | 17 +++++++++++------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 2b747ba..f7a6153 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -87,7 +87,16 @@ Page({
   },
 
   onLoad: async function (tt) {
-    var th = this;
+      // onLoad生命周期内判断
+      let obj = wx.getLaunchOptionsSync()
+      if (obj.scene === 1011 ||
+          obj.scene === 1047 ||
+          obj.scene === 1089 ||
+          obj.scene === 1038) {
+         this.setData({is_ok_h5:1})
+      }
+
+      var th = this;
     var first_leader = tt.first_leader;
     if (!first_leader && tt.scene) {
       var first_leader_str = decodeURIComponent(tt.scene);
@@ -383,6 +392,7 @@ Page({
       var json_d = JSON.parse(e.switch_list);
       th.setData({ is_closecoupon: json_d.is_closecoupon })
       th.setData({ is_topstore: json_d.is_show_storeselect })
+      th.setData({is_gz_h5:json_d.is_gz_h5})
     }, 1)
 
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -616,14 +626,7 @@ Page({
         });
       }
     })
-		
-		
-		
-		
-		
-		
-		
-		
+
     //---调用信息---
     // this.requestRecommend();
     this.setData({
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 2f75180..9bbd82c 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,9 +1,6 @@
 <!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> -->
 <!-- <full_screen id="full_screen"></full_screen> -->
 
-<official-account></official-account>
-
-
 <!-- 全屏控制 -->
 <view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
 	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
@@ -14,14 +11,17 @@
 
 <view class="container rel nor" wx:if="{{ishow}}">
   <block wx:if="{{banner}}">
-    <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image>
+    <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image><!-- 红色背景 -->
   </block>
-	<view class="top-bar">
+
+  <view class="top-bar">
+        <!-- 顶部关注公众号 -->
+        <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+
 		<!-- 控制要不要显示顶部门店选择 -->
 		<block wx:if="{{is_topstore}}">
 		   <store_select style="z-index: 999;"></store_select>
 		</block>
-		
 		<!--搜索框-->
 		<!-- <view class="search-box {{scrollTop>10?'search-fixed':''}} flex-center white " style="top:{{is_topstore?88:0}}rpx"> -->
 		<view class="search-box flex-center white">
@@ -409,6 +409,9 @@
 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
   <!-- 置顶层 -->	
   <view class="dis_top">
+      <!-- 关注公众号的显示 -->
+      <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+
 	  <block wx:for="{{template_arr}}" >
 		   <block wx:if="{{item.content.is_top==1}}">			   
 			    <!--如果是搜索框的时候 --> 
@@ -423,6 +426,8 @@
   </view>
   <!-- 撑开层 -->	
   <view>
+       <!-- 关注层的撑开 -->
+       <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
 	   <block wx:for="{{template_arr}}" >
            <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}">
 		       <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view>
--
libgit2 0.21.4