From 52787adceb282c1914589c7ceb252bdb03e2df36 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 11:26:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_staff/pages/index/index.wxml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 5391ba8..356b2f4 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -1,17 +1,17 @@
 <view class="container" > 
-  <view class="search_fix">
-    <view style="height: {{clientTop - 2}}px;"></view>
+  <view style="height: {{ clientHeight +  clientTop + 6}}px;" class="search_fix">
+    <view style="height: {{clientTop - 3}}px;"></view>
     <view class="search_wrap">
       <image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
       <input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
     </view>
   </view>
-  <view class="everyday"  >
+  <view class="everyday"  style="margin-top: {{ clientHeight +  clientTop + 20}}px;">
     <view class="header" bindtap="promotionClick">
       <view class="title">姣忔棩涓婃柊</view>
       <view class="more">
         <text class="placeholder9">鏌ョ湅鏇村</text>
-        <image class="ar_new" src="../../static/ar_new@2x.png" mode="widthFix"></image>
+        <image class="ar_new" src="../../static/ar_new@2x.png"></image>
       </view>
     </view>
     <view class="desc">
@@ -62,10 +62,11 @@
       </view>
       <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
     </view>
-    <view class="video_wrap">
-      <image class="img" src="{{ productVideo[0].coverImage }}" mode="widthFix"></image>
-      <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
-    </view>
+    <video bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
+    <!-- <view bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
+      <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
+      <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+    </view> -->
   </view>
   <!-- 鏀荤暐 -->
   <view class="strategy">
@@ -110,7 +111,7 @@
         <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 }}">
+    <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>
@@ -122,4 +123,5 @@
   <view class="logo_wrap">
     <image src="../../static/home_logo@2x.png" class="logo" mode="widthFix"></image>
   </view>
+  <videoPlay class="videoPlay"/>
 </view>
\ No newline at end of file

--
Gitblit v1.9.3