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 | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index f9253cb..15d324e 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -1,18 +1,23 @@
<!-- 椤堕儴nav -->
<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" bindtap="toSearch">
- <text>蹇楅偊瀹堕��</text>
+ <view slot="left" class="flex-cc search">
+ <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> -->
</view>
</van-nav-bar>
+ <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>
+ </van-nav-bar>
<!-- banner杞挱 -->
- <swiper class="banner_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
+ <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 mode="aspectFill" src="../../static/icon/test.png"></image>
+ <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" bindload="bannerbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
</swiper-item>
</block>
</swiper>
@@ -35,10 +40,13 @@
</view>
</view>
<!-- -->
- <authCard type="1" />
+ <view class="auth">
+ <authCard type="{{ member.authStatus }}" />
+ </view>
+ <!-- <authCard type="1" /> -->
<!-- 浜у搧瑙嗛 -->
- <view class="product_video" bindtap="jumpProVideo">
- <view class="com_header">
+ <view class="product_video">
+ <view bindtap="jumpProVideo" class="com_header">
<view class="left">
<view class="name">
<image class="icon" src="../../static/icon/home_ic_zhutihuodong.png"></image>
@@ -48,7 +56,10 @@
</view>
<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="aspectFill"></image>
+ <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png"></image>
+ </view>
</view>
<!-- 鏀荤暐 -->
<view class="strategy">
@@ -62,21 +73,29 @@
</view>
</view>
<view class="line">
- <view class="line_left">
+ <view class="line_left item" data-item="{{ ZSZXCata.qwsj }}" bindtap="changeStrategy">
<image src="{{HOME_CLASS_A}}"></image>
+ <!-- <text>{{ ZSZXCata.qwsj.name }}</text> -->
</view>
<view class="line_right">
- <view class="item"><image src="{{ HOME_CLASS_B }}"></image></view>
- <view class="item"><image src="{{ HOME_CLASS_B2 }}"></image></view>
+ <view class="item" data-item="{{ ZSZXCata.cfsj }}" bindtap="changeStrategy">
+ <image src="{{ HOME_CLASS_B }}"></image>
+ <!-- <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> -->
+ </view>
</view>
</view>
- <view class="home_id">
+ <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 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>
@@ -86,16 +105,17 @@
</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 }}" duration="{{ bannerSwiperOption.duration }}">
- <block wx:for="{{ bannerList }}" wx:key="index">
- <swiper-item>
- <image mode="aspectFill" src="../../static/icon/test.png"></image>
+ <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 }}" 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" bindtap="jumpProKefu">
+ <view class="consult">
<view class="com_header">
<view class="left">
<view class="name">
@@ -105,10 +125,10 @@
<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 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 mode="aspectFill" src="../../static/icon/test.png"></image>
+ <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>
@@ -119,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