From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/index/index.wxml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 6d1d5fb..15d324e 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -57,8 +57,8 @@
<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>
+ <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>
</view>
<!-- 鏀荤暐 -->
@@ -105,10 +105,10 @@
</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 }}">
+ <swiper class="consult_swiper consult_wrap" 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.id }}" bindtap="consultClick">
- <image bindload="consultbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
+ <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>
@@ -125,7 +125,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>
@@ -139,5 +139,5 @@
</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"/>
</view>
\ No newline at end of file
--
Gitblit v1.9.3