From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_jiaxuan/pages/index/index.wxml |   67 +++++++++++++++++----------------
 1 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 7998b24..caf3a14 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -11,16 +11,19 @@
   <van-nav-bar wx:else border="{{ topHeadBorder }}" custom-class="top-head-transparent" fixed>
     <view slot="left" class="flex-cc search">
       <text class="home_title" style="color: {{font_color}};">蹇楅偊瀹堕��</text>
-    </view>
+    </view>茠
   </van-nav-bar>
   <!-- banner杞挱 -->
-  <swiper class="banner_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{bannerImgHeight}}rpx" duration="{{ bannerSwiperOption.duration }}">
-    <block wx:for="{{ bannerList }}" wx:key="index">
-      <swiper-item>
-        <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" bindload="bannerbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
-      </swiper-item>
-    </block>
-  </swiper>
+  <view class="banner-bax">
+    <image wx:if="{{ !showWhiteHead }}" src="/static/icon/wx.gif" class="wxImg" mode="widthFix" bindtap="hdBtn"></image>
+    <swiper class="banner_swiper {{showWhiteHead?'on':''}}" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
+      <block wx:for="{{ bannerList }}" wx:key="index">
+        <swiper-item>
+          <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" mode="aspectFill" src="{{ item.coverImage }}"></image>
+        </swiper-item>
+      </block>
+    </swiper>
+  </view>
   <!--  -->
   <view class="function_wrap">
     <view class="item" data-type="0" bindtap="changePath">
@@ -31,7 +34,7 @@
     <view class="item" data-type="2" bindtap="changePath">
       <image class="img" src="../../static/icon/home_ic_liangchi@2x.png"></image>
       <view class="name">鍏嶈垂閲忓昂</view>
-      <view class="placeholder9">鍒嗘瀽灏忓府鎵�</view>
+      <view class="placeholder9">涓�瀵逛竴璁捐鏈嶅姟</view>
     </view>
     <view class="item" data-type="1" bindtap="changePath">
       <image class="img" src="../../static/icon/home_ic_yusuan@2x.png"></image>
@@ -56,10 +59,11 @@
       </view>
       <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
     </view>
-    <view class="video_wrap">
+    <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" show-mute-btn muted src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
+    <!-- <view  bindtap="videoClick" data-id="{{ productVideo[0].id }}" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
       <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
-      <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png"></image>
-    </view>
+      <image class="play" src="../../static/icon/ic_play.png"></image>
+    </view> -->
   </view>
   <!-- 鏀荤暐 -->
   <view class="strategy">
@@ -88,10 +92,9 @@
         </view>
       </view>
     </view>
-    <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
+    <!-- <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
       <image src="{{HOME_CLASS_C}}"></image>
-      <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
-    </view>
+    </view> -->
   </view>
   <!-- 鍜ㄨ -->
   <view class="consult">
@@ -105,14 +108,14 @@
       </view>
       <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
     </view>
-    <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight + 100}}rpx" duration="{{ bannerSwiperOption.duration }}">
-    <block wx:for="{{ consultList }}" wx:key="index">
-      <swiper-item data-id="{{ item }}" bindtap="consultClick">
-        <image bindload="consultbindload"  mode="aspectFill" src="{{ item.coverImage }}"></image>
-        <view class="scroll_text">{{ item.title }}</view>
-      </swiper-item>
-    </block>
-  </swiper>
+    <swiper class="consult_swiper consult_wrap" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
+      <block wx:for="{{ consultList }}" wx:key="index">
+        <swiper-item data-id="{{ item }}" bindtap="consultClick">
+          <image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
+          <view class="scroll_text">{{ item.title }}</view>
+        </swiper-item>
+      </block>
+    </swiper>
   </view>
   <!-- service -->
   <view class="consult">
@@ -125,19 +128,19 @@
         <view class="desc">璁捐韩澶勫湴涓轰綘鎬濊檻鏇村锛岄櫔浼翠綘鐨勭編濂界敓娲�</view>
       </view>
     </view>
-    <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{serviceHeight}}rpx" duration="{{ bannerSwiperOption.duration }}">
-    <block wx:for="{{ serviceList }}" wx:key="index">
-      <swiper-item>
-        <image bindload='goserHeight' data-id="{{ item.id }}" data-title="{{item.title}}" bindtap="seriveClick" mode="widthFix" src="{{ item.fileList[0].fileurlFull }}"></image>
-      </swiper-item>
-    </block>
-  </swiper>
+    <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{serviceHeight + 22}}rpx" duration="{{ bannerSwiperOption.duration }}">
+      <block wx:for="{{ serviceList }}" wx:key="index">
+        <swiper-item>
+          <image bindload='goserHeight' data-id="{{ item.id }}" data-title="{{item.title}}" bindtap="seriveClick" mode="widthFix" src="{{ item.fileList[0].fileurlFull }}"></image>
+        </swiper-item>
+      </block>
+    </swiper>
   </view>
   <!-- logo -->
   <view class="logo_wrap">
     <image src="../../static/icon/home_logo@2x.png" class="logo" mode="widthFix"></image>
   </view>
   <!-- active -->
-  <image class="active_baoming" data-type="2" bindtap="changePath" src="../../static/icon/ic_float_baoming@2x.png" mode="widthFix"></image>
-<videoPlay class="videoPlay"/>
+  <image class="active_baoming" data-type="2" bindtap="changePath" src="../../static/icon/ic_float_baoming@2x.png"></image>
+  <videoPlay class="videoPlay" />
 </view>
\ No newline at end of file

--
Gitblit v1.9.3