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_jiaxuan/pages/index/index.wxml | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 9e35072..4572292 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -2,7 +2,7 @@
<view class="container">
<van-nav-bar wx:if="{{ showWhiteHead }}" border="{{ topHeadBorder }}" custom-class="top-head" fixed custom-style="opacity: {{ topHeadStyle }}">
<view slot="left" class="flex-cc search">
- <text style="color: {{font_color}};">蹇楅偊瀹堕��</text>
+ <text class="home_title" style="color: {{font_color}};">蹇楅偊瀹堕��</text>
<van-icon name="search" size="23px" color="#fff" />
<!-- <image src="/static/icon/home_ic_search_black.png" mode="widthFix"></image> -->
<!-- <text>鎼滅储</text> -->
@@ -10,14 +10,14 @@
</van-nav-bar>
<van-nav-bar wx:else border="{{ topHeadBorder }}" custom-class="top-head-transparent" fixed>
<view slot="left" class="flex-cc search">
- <text style="color: {{font_color}};">蹇楅偊瀹堕��</text>
+ <text class="home_title" style="color: {{font_color}};">蹇楅偊瀹堕��</text>
</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-id="{{ item.id }}" bindtap="bannerClick" bindload="bannerbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
+ <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" bindload="bannerbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
</swiper-item>
</block>
</swiper>
@@ -31,7 +31,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>
@@ -40,7 +40,9 @@
</view>
</view>
<!-- -->
- <authCard type="{{ member.authStatus }}" />
+ <view class="auth">
+ <authCard type="{{ member.authStatus }}" />
+ </view>
<!-- <authCard type="1" /> -->
<!-- 浜у搧瑙嗛 -->
<view class="product_video">
@@ -54,10 +56,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 poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" 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 class="play" src="../../static/icon/ic_play.png"></image>
+ </view> -->
</view>
<!-- 鏀荤暐 -->
<view class="strategy">
@@ -71,29 +74,29 @@
</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>
<!-- 鍜ㄨ -->
- <view class="consult" bindtap="jumpProConsult">
- <view class="com_header">
+ <view class="consult">
+ <view class="com_header" bindtap="jumpProConsult">
<view class="left">
<view class="name">
<image class="icon" src="../../static/icon/home_ic_zixun@2x.png"></image>
@@ -103,10 +106,11 @@
</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}}rpx" duration="{{ bannerSwiperOption.duration }}">
+ <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>
- <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>
</swiper>
@@ -122,7 +126,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>
@@ -136,5 +140,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