From 3ac33e0ea28357bac078ac93404ac02ad9a61738 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 七月 2024 18:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 4014420..04cfb41 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -1,8 +1,9 @@
 <view class="container">
   <view style="height: {{clientTop - 2}}px;"></view>
+  <buoyClient />
   <view class="search_wrap">
     <image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
-    <input  model:value="{{ searchValue }}" placeholder="鎼滅储"  type="text"/>
+    <input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
   </view>
   <view class="everyday">
     <view class="header" bindtap="promotionClick">
@@ -40,7 +41,8 @@
     <view class="item">
       <image src="../../static/icon/home_ic_shijing@2x 2.png"></image>
       <view class="text">瀹炴櫙</view>
-    </view><view class="item">
+    </view>
+    <view class="item">
       <image src="../../static/icon/home_ic_zixun.png"></image>
       <view class="text">璧勮</view>
     </view>
@@ -49,17 +51,20 @@
   <!--  -->
   <!-- 浜у搧瑙嗛  -->
   <view class="product_video">
-    <view class="com_header">
+    <view bindtap="jumpProVideo" class="com_header">
       <view class="left">
         <view class="name">
-          <image class="icon" src="../../static/home_ic_chanpinshiping@2x.png"></image>
+          <image class="icon" src="../../static/icon/home_ic_zhutihuodong.png"></image>
           <text>浜у搧瑙嗛</text>
         </view>
         <view class="desc">浼橀�夋椿鍔紝鎶㈠厛涓�姝�</view>
       </view>
-      <image class="home_ar" src="../../static/home_ar@2x.png" mode="widthFix"></image>
+      <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
     </view>
-    <video controls class="main_video" src="https://vdept3.bdstatic.com/mda-njed6187hpegim0d/cae_h264/1665826435448713448/mda-njed6187hpegim0d.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1720440602-0-0-f249e56273037ad05b8f7066fd0973ca&bcevod_channel=searchbox_feed&pd=1&cr=0&cd=0&pt=3&logid=0601949156&vid=646246476325419292&klogid=0601949156&abtest=101830_1-17451_2"></video>
+    <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>
   </view>
   <!-- 鏀荤暐 -->
   <view class="strategy">
@@ -73,24 +78,24 @@
       </view>
     </view>
     <view class="line">
-      <view class="line_left item" data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy">
+      <view class="line_left item" data-item="{{ ZSZXCata.qwsj }}" bindtap="changeStrategy">
         <image src="{{HOME_CLASS_A}}"></image>
-        <text>{{ ZSZXCata.jdId.name }}</text>
+        <!-- <text>{{ ZSZXCata.qwsj.name }}</text> -->
       </view>
       <view class="line_right">
         <view class="item" data-item="{{ ZSZXCata.cfsj }}" bindtap="changeStrategy">
           <image src="{{ HOME_CLASS_B }}"></image>
-          <text>{{ ZSZXCata.cfsj.name }}</text>
+          <!-- <text>{{ ZSZXCata.cfsj.name }}</text> -->
         </view>
         <view class="item" data-item="{{ ZSZXCata.snsj }}" bindtap="changeStrategy">
           <image src="{{ HOME_CLASS_B2 }}"></image>
-          <text>{{ ZSZXCata.snsj.name }}</text>
+          <!-- <text>{{ ZSZXCata.snsj.name }}</text> -->
         </view>
       </view>
     </view>
-    <view data-item="{{ ZSZXCata.qwsj.code }}" 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.qwsj.name }}</text>
+      <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
     </view>
   </view>
   <!-- service -->
@@ -98,19 +103,19 @@
     <view class="com_header">
       <view class="left">
         <view class="name">
-          <image class="icon" src="../../static/home_ic_fuwu@2x.png"></image>
+          <image class="icon" src="../../static/icon/home_ic_fuwu@2x.png"></image>
           <view>瀹氬埗鏈嶅姟</view>
         </view>
         <view class="desc">璁捐韩澶勫湴涓轰綘鎬濊檻鏇村锛岄櫔浼翠綘鐨勭編濂界敓娲�</view>
       </view>
     </view>
-    <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
-    <block wx:for="{{ bannerList }}" wx:key="index">
-      <swiper-item>
-        <image mode="aspectFill" src="../../static/test.png"></image>
-      </swiper-item>
-    </block>
-  </swiper>
+    <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>
   </view>
   <!-- logo -->
   <view class="logo_wrap">

--
Gitblit v1.9.3