From 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 13:43:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/detailDis/case.wxml | 4
wechat_staff/pages/detailDis/case.wxss | 1
wechat_staff/pages/index/index.wxml | 4
wechat_staff/pages/index/index.wxss | 27 ++-
wechat_staff/pages/detailDis/realpic.less | 1
wechat_jiaxuan/app.wxss | 18 ++
wechat_staff/pages/kefu/fond.wxml | 5
wechat_jiaxuan/pages/detailDis/product.wxml | 17 +
wechat_jiaxuan/pages/detailDis/product.wxss | 18 ++
wechat_staff/components/disCase/index.wxss | 10 +
wechat_staff/pages/kefu/select.wxml | 3
wechat_staff/components/disCase/index.wxml | 5
wechat_staff/pages/detailDis/product.js | 25 +++
wechat_staff/components/disProduct/index.less | 10 +
wechat_staff/pages/promotion/index.wxml | 3
wechat_staff/static/images/default_empty.png | 0
wechat_staff/app.wxss | 30 +++
wechat_staff/pages/consult/consult.wxml | 3
wechat_jiaxuan/pages/detailDis/product.js | 5
wechat_staff/pages/index/index.less | 19 ++
wechat_staff/pages/detailDis/realpic.wxss | 1
wechat_staff/pages/detailDis/case.js | 14 +
wechat_staff/pages/detailDis/case.less | 1
wechat_staff/pages/userinfo/collect.wxml | 3
wechat_staff/components/disRealpic/index.less | 10 +
wechat_jiaxuan/pages/index/index.less | 27 +++
wechat_staff/pages/detailDis/realpic.wxml | 2
wechat_staff/pages/detailDis/realpic.js | 8 +
wechat_staff/pages/detailDis/product.wxss | 22 ++
wechat_staff/pages/detailDis/product.wxml | 25 +-
wechat_staff/components/disCase/index.less | 10 +
wechat_jiaxuan/pages/calculator/index.wxss | 7
wechat_jiaxuan/pages/detailDis/product.less | 18 ++
wechat_jiaxuan/pages/calculator/index.wxml | 4
wechat_staff/components/disProduct/index.wxml | 3
wechat_staff/components/disProduct/index.wxss | 10 +
wechat_jiaxuan/pages/index/index.wxml | 4
wechat_staff/pages/detailDis/product.less | 19 ++
wechat_jiaxuan/pages/index/index.wxss | 21 ++
wechat_staff/pages/store/index.wxml | 3
wechat_staff/components/disRealpic/index.wxml | 5
wechat_staff/components/disRealpic/index.wxss | 20 +
42 files changed, 393 insertions(+), 52 deletions(-)
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 3c7999d..42eeaf6 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -94,4 +94,22 @@
}
button::after {
border: none;
+}
+
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 38rpx;
+}
+
+/* 鎸囩ず鐐圭殑鏍峰紡 */
+.wx-swiper-dots .wx-swiper-dot {
+ width: 40rpx;
+ height: 4rpx;
+ background: rgba(255,255,255,0.5);
+ border-radius: 5rpx;
+}
+
+.wx-swiper-dot.wx-swiper-dot-active {
+ background: #FFFFFF;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/calculator/index.wxml b/wechat_jiaxuan/pages/calculator/index.wxml
index 168e6de..fc447c3 100644
--- a/wechat_jiaxuan/pages/calculator/index.wxml
+++ b/wechat_jiaxuan/pages/calculator/index.wxml
@@ -64,14 +64,14 @@
<!-- 璁＄畻鍣� end -->
<!-- 璁＄畻缁撴灉灞曠ず -->
- <view class="results" style="opacity: {{ showResultMoney ? '1' : '0.2' }};">
+ <view class="results" style="position: {{ showResultMoney ? 'static' : 'absolute' }}">
<view class="results-title">鏈�浼樺瑁呭垎閰嶈〃</view>
<view class="flex thead">
<view class="td name">璇︽儏</view>
<view class="td rate">鍙傝�冩瘮渚�</view>
<view class="td money">鍙傝�冧环鏍�</view>
</view>
- <view class="item" wx:for="{{ activeList }}" wx:key="index"
+ <view style="opacity: {{ showResultMoney ? '1' : '0.2' }};" class="item" wx:for="{{ activeList }}" wx:key="index"
hidden="{{ type == item.info }}">
<view class="flex th">
<view class="td name">{{ item.name }}</view>
diff --git a/wechat_jiaxuan/pages/calculator/index.wxss b/wechat_jiaxuan/pages/calculator/index.wxss
index c5c9524..5033298 100644
--- a/wechat_jiaxuan/pages/calculator/index.wxss
+++ b/wechat_jiaxuan/pages/calculator/index.wxss
@@ -1,6 +1,7 @@
/* pages/calculator/index.wxss */
.container {
overflow: auto;
+ padding-bottom: 100rpx;
}
.main_bg{
position: fixed;
@@ -91,12 +92,14 @@
}
.results {
- position: relative;
+ position: absolute;
+ width: 670rpx;
+ top: calc( 100vh - 250rpx );
z-index: 1;
background: #FFFFFF;
color: #222;
text-align: center;
- margin: 0 30rpx 60rpx;
+ margin: 0 40rpx 60rpx;
border-radius: 8rpx;
padding: 30rpx;
}
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index dabc25d..17fdea7 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -10,6 +10,7 @@
*/
data: {
bottomLift: 0,
+ current: 0,
id: '',
origin: '',
info: {},
@@ -38,6 +39,10 @@
member
})
},
+ bindchange(e) {
+ console.log('e', e.detail );
+ this.setData({ current: e.detail.current })
+ },
priviewBanner(e) {
const url = e.currentTarget.dataset.url
const {
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index aabab93..586c338 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -46,6 +46,24 @@
page {
background-color: #f7f7f7;
}
+.swiper_wrap{
+ position: relative;
+ .indicator{
+ position: absolute;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ line-height: 40rpx;
+ background: rgba(0,0,0,0.4);
+ border-radius: 21rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 999;
+ z-index: 99;
+ }
+}
.banner_swiper{
image{
width: 100%;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index d595f35..11a034b 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -2,13 +2,16 @@
<!-- 鍚嶇墖 -->
<idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
<!-- banner杞挱 -->
- <swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
- <block wx:for="{{ info.bannerImgList }}">
- <swiper-item>
- <image data-url="{{ item }}" bindtap="priviewBanner" bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
- </swiper-item>
- </block>
- </swiper>
+ <view class="swiper_wrap">
+ <swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
+ <block wx:for="{{ info.bannerImgList }}">
+ <swiper-item>
+ <image data-url="{{ item }}" bindtap="priviewBanner" bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
+ </swiper-item>
+ </block>
+ </swiper>
+ <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ </view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
<view class="desc" wx:if="{{ info.subtitle }}">{{ info.subtitle }}</view>
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index 44325d0..91008eb 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -42,6 +42,24 @@
page {
background-color: #f7f7f7;
}
+.swiper_wrap {
+ position: relative;
+}
+.swiper_wrap .indicator {
+ position: absolute;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ line-height: 40rpx;
+ background: rgba(0, 0, 0, 0.4);
+ border-radius: 21rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 999;
+ z-index: 99;
+}
.banner_swiper image {
width: 100%;
}
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index fb08923..84b775d 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -30,6 +30,30 @@
padding-top: 22rpx;
font-size: 32rpx;
}
+ .wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 0rpx;
+ }
+ /* 鎸囩ず鐐圭殑鏍峰紡 */
+ .wx-swiper-dots .wx-swiper-dot {
+ width: 60rpx;
+ height: 4rpx;
+ background: #f4f4f4;
+ margin-left: -15rpx;
+ border-radius: 5rpx;
+ }
+
+ .wx-swiper-dot.wx-swiper-dot-active {
+ background: #666666;
+ }
+ }
+ .consult_wrap{
+ .wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 10rpx;
+ }
}
.logo_wrap {
@@ -234,4 +258,5 @@
font-weight: bold;
font-size: 40rpx;
}
-}
\ No newline at end of file
+}
+
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 7998b24..15d324e 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -105,7 +105,7 @@
</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 }}" bindtap="consultClick">
<image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
@@ -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>
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index a250a57..69d919c 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -15,6 +15,7 @@
}
.container .consult_swiper {
width: 100%;
+ /* 鎸囩ず鐐圭殑鏍峰紡 */
}
.container .consult_swiper image {
width: 670rpx;
@@ -29,6 +30,26 @@
padding-top: 22rpx;
font-size: 32rpx;
}
+.container .consult_swiper .wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 0rpx;
+}
+.container .consult_swiper .wx-swiper-dots .wx-swiper-dot {
+ width: 60rpx;
+ height: 4rpx;
+ background: #f4f4f4;
+ margin-left: -15rpx;
+ border-radius: 5rpx;
+}
+.container .consult_swiper .wx-swiper-dot.wx-swiper-dot-active {
+ background: #666666;
+}
+.container .consult_wrap .wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 10rpx;
+}
.container .logo_wrap {
width: 100%;
display: flex;
diff --git a/wechat_staff/app.wxss b/wechat_staff/app.wxss
index 550bb1f..3674450 100644
--- a/wechat_staff/app.wxss
+++ b/wechat_staff/app.wxss
@@ -52,6 +52,7 @@
}
.ar_new{
width: 14rpx;
+ height: 28rpx;
margin-left: 8rpx;
}
.container {
@@ -65,3 +66,32 @@
.flex {
display: flex;
}
+.empty_wrap{
+ width: 100%;
+ height: 100%;
+ padding-top: 300rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
+}
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 38rpx;
+}
+
+/* 鎸囩ず鐐圭殑鏍峰紡 */
+.wx-swiper-dots .wx-swiper-dot {
+ width: 40rpx;
+ height: 4rpx;
+ background: rgba(255,255,255,0.5);
+ border-radius: 5rpx;
+}
+
+.wx-swiper-dot.wx-swiper-dot-active {
+ background: #FFFFFF;
+}
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index 5351968..fcdb3c7 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -183,4 +183,14 @@
}
}
}
+ .empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+ }
+ .default_empty{
+ width: 300rpx;
+ height: 300rpx;
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 43919ab..6877ba0 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -35,7 +35,7 @@
<view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
<view wx:for="{{ dataList }}" data-id="{{ item.id }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
@@ -52,6 +52,9 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index a00dc11..cb42fb8 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -180,3 +180,13 @@
.main_content .goods_list .item .info .primary {
color: var(--themeColor);
}
+.main_content .empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.main_content .default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 2557685..3bcef18 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -226,5 +226,15 @@
}
}
}
+ .empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+ }
+ .default_empty{
+ width: 300rpx;
+ height: 300rpx;
+ }
}
}
\ No newline at end of file
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index 4766265..c62e00a 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -51,6 +51,9 @@
<text>{{ item.viewCount || 0 }}</text>
</view>
</view>
+ <view wx:if="{{ datalist.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 7cac77e..6ca7903 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -202,3 +202,13 @@
.main_content .main_right .goods_list .item .info .primary {
color: var(--themeColor);
}
+.main_content .main_right .empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.main_content .main_right .default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 3bf0fcd..e1320db 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -237,4 +237,14 @@
}
}
}
+ .empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+ }
+ .default_empty{
+ width: 300rpx;
+ height: 300rpx;
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index a25d888..f8a9367 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -2,7 +2,7 @@
<view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
</view>
</view>
@@ -58,6 +58,9 @@
<text>{{ item.viewCount }}</text>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index 836d279..ce00af9 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -130,15 +130,11 @@
box-sizing: border-box;
display: flex;
flex-wrap: wrap;
- justify-content: space-around;
+ justify-content: space-around;
}
-.main_content .goods_list .lastitem {
- margin-right: auto;
-}
-
-.main_content .goods_list .item {
+.main_content .goods_list .item {
width: 324rpx;
- margin-bottom: 32rpx;
+ margin-bottom: 32rpx;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
@@ -214,3 +210,13 @@
.main_content .goods_list .item .info .primary {
color: var(--themeColor);
}
+.main_content .empty_wrap {
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.main_content .default_empty {
+ width: 300rpx;
+ height: 300rpx;
+}
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index 650f706..fd5ed45 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -38,5 +38,8 @@
</view>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 92ab8dd..5e0a0ee 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -39,6 +39,20 @@
openShare() {
this.setData({showShare: true})
},
+ priviewLayout() {
+ wx.previewImage({
+ urls: [this.data.info.layoutUlr]
+ })
+ },
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const index = e.currentTarget.dataset.index
+ const { info } = this.data
+ wx.previewImage({
+ urls: info.apiSpaceCaseVos[index].imgList,
+ current: url
+ })
+ },
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
actionDo({ actionType: 'share', id: this.data.info.id })
diff --git a/wechat_staff/pages/detailDis/case.less b/wechat_staff/pages/detailDis/case.less
index f9e84c7..00eee15 100644
--- a/wechat_staff/pages/detailDis/case.less
+++ b/wechat_staff/pages/detailDis/case.less
@@ -35,6 +35,7 @@
justify-content: center;
.icon{
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
}
diff --git a/wechat_staff/pages/detailDis/case.wxml b/wechat_staff/pages/detailDis/case.wxml
index a1d0271..2929e65 100644
--- a/wechat_staff/pages/detailDis/case.wxml
+++ b/wechat_staff/pages/detailDis/case.wxml
@@ -11,7 +11,7 @@
<image class="banner" src="{{ info.coverImage }}" mode="widthFix"></image>
</view>
<view class="h1">甯冪疆鍥�</view>
- <image class="img" src="{{ info.layoutUlr }}" mode="widthFix"></image>
+ <image bindtap="priviewLayout" class="img" src="{{ info.layoutUlr }}" mode="widthFix"></image>
<view class="analysis">
<view class="h2">妗堜緥瑙ｆ瀽</view>
<view class="text">{{ info.caseInfo }}</view>
@@ -19,7 +19,7 @@
<view class="list">
<view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
<view class="h1">{{ item.spaceName }}</view>
- <image class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
+ <image data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
<view class="content">{{ item.spaceDesc }}</view>
</view>
</view>
diff --git a/wechat_staff/pages/detailDis/case.wxss b/wechat_staff/pages/detailDis/case.wxss
index dfeb97b..d2799ac 100644
--- a/wechat_staff/pages/detailDis/case.wxss
+++ b/wechat_staff/pages/detailDis/case.wxss
@@ -35,6 +35,7 @@
}
.container .fullview_wrap .full .icon {
width: 24rpx;
+ height: 24rpx;
margin-right: 4rpx;
}
.container .img {
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index 46d697f..2169600 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -11,6 +11,7 @@
*/
data: {
bottomLift: 0,
+ current: 0,
id: '',
info: {},
member: {},
@@ -85,6 +86,30 @@
})
}
},
+ priviewBanner(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.imageurlList,
+ current: url
+ })
+ },
+ bindchange(e) {
+ console.log('e', e.detail );
+ this.setData({ current: e.detail.current })
+ },
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.imageurlList,
+ current: url
+ })
+ },
onShareAppMessage() {
console.log('鐢ㄦ埛鐐瑰嚮浜嗗垎浜�');
},
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index 15588ae..09d76bd 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -46,6 +46,24 @@
page {
background-color: #f7f7f7;
}
+.swiper_wrap{
+ position: relative;
+ .indicator{
+ position: absolute;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ line-height: 40rpx;
+ background: rgba(0,0,0,0.4);
+ border-radius: 21rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 999;
+ z-index: 99;
+ }
+}
.banner_swiper{
image{
width: 100%;
@@ -234,6 +252,7 @@
margin-right: 48rpx;
.icon {
width: 44rpx;
+ height: 44rpx;
}
}
}
\ No newline at end of file
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 0f5cd50..6b1601d 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -1,22 +1,25 @@
<view class="main_app">
- <buoyClient class="buoyClient" showPurpose="1" class="buoyClient"/>
+ <buoyClient class="buoyClient" showPurpose="1" class="buoyClient" />
<detailFooter bindenjoy="handleEnjoy" path="0" info="{{info}}" />
<!-- banner杞挱 -->
- <swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>
- <block wx:for="{{ info.bannerImgList }}">
- <swiper-item>
- <image bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
- </swiper-item>
- </block>
- </swiper>
+ <view class="swiper_wrap">
+ <swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
+ <block wx:for="{{ info.bannerImgList }}">
+ <swiper-item>
+ <image data-url="{{ item }}" bindtap="priviewBanner" bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
+ </swiper-item>
+ </block>
+ </swiper>
+ <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ </view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
<view class="desc" wx:if="{{ info.subtitle }}">{{ info.subtitle }}</view>
- <view class="text">{{ info.intro }}</view>
+ <view class="text">{{ info.intro }}</view>
</view>
<!-- video -->
<view wx:if="{{ info.video }}" class="video">
- <view class="title" >浜у搧瑙嗛</view>
+ <view class="title">浜у搧瑙嗛</view>
<view class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
<view bindtap="playVideo" class="play">鎾斁</view>
@@ -34,7 +37,7 @@
<mp-html content="{{info.content}}"></mp-html>
</view>
<view class="spaceList">
- <view class="item" wx:for="{{ info.spaceList }}">
+ <view data-url="{{ item.spaceImg }}" bindtap="priviewSpace" class="item" wx:for="{{ info.spaceList }}">
<!-- <view class="name">{{ item.spaceName }}</view> -->
<image src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
<!-- <mp-html content="{{item.spaceContent}}"></mp-html> -->
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index 0a94bed..74ed82a 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -41,6 +41,24 @@
page {
background-color: #f7f7f7;
}
+.swiper_wrap {
+ position: relative;
+}
+.swiper_wrap .indicator {
+ position: absolute;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ line-height: 40rpx;
+ background: rgba(0, 0, 0, 0.4);
+ border-radius: 21rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 999;
+ z-index: 99;
+}
.banner_swiper image {
width: 100%;
}
@@ -61,7 +79,6 @@
margin-bottom: 26rpx;
}
.main_content .text {
- line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
@@ -151,7 +168,7 @@
}
.detail .line {
display: flex;
- min-height: 32rpx;
+ height: 32rpx;
margin-bottom: 24rpx;
}
.detail .line .label {
@@ -210,4 +227,5 @@
}
.footer .item .icon {
width: 44rpx;
+ height: 44rpx;
}
diff --git a/wechat_staff/pages/detailDis/realpic.js b/wechat_staff/pages/detailDis/realpic.js
index ec8517e..3c1ae48 100644
--- a/wechat_staff/pages/detailDis/realpic.js
+++ b/wechat_staff/pages/detailDis/realpic.js
@@ -85,6 +85,14 @@
})
}
},
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const { info } = this.data
+ wx.previewImage({
+ urls: info.contentImgList,
+ current: url
+ })
+ },
getDetail(id) {
const enjoyList = wx.getStorageSync('enjoyList') || []
getRealcaseInfo({id}).then(res => {
diff --git a/wechat_staff/pages/detailDis/realpic.less b/wechat_staff/pages/detailDis/realpic.less
index 4a93520..446fd0d 100644
--- a/wechat_staff/pages/detailDis/realpic.less
+++ b/wechat_staff/pages/detailDis/realpic.less
@@ -73,6 +73,7 @@
margin-right: 48rpx;
.icon {
width: 44rpx;
+ height: 44rpx;
}
}
}
diff --git a/wechat_staff/pages/detailDis/realpic.wxml b/wechat_staff/pages/detailDis/realpic.wxml
index f972e59..9534c5d 100644
--- a/wechat_staff/pages/detailDis/realpic.wxml
+++ b/wechat_staff/pages/detailDis/realpic.wxml
@@ -4,7 +4,7 @@
<!-- -->
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
- <image class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
+ <image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>
<view class="desc">{{ info.contentText || '' }}</view>
<!-- <view class="list">
<view class="item">
diff --git a/wechat_staff/pages/detailDis/realpic.wxss b/wechat_staff/pages/detailDis/realpic.wxss
index 02d76c5..c689a98 100644
--- a/wechat_staff/pages/detailDis/realpic.wxss
+++ b/wechat_staff/pages/detailDis/realpic.wxss
@@ -70,6 +70,7 @@
}
.footer .item .icon {
width: 44rpx;
+ height: 44rpx;
}
.share_modal .btns {
min-height: 320rpx;
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index e0bdf5f..62b48cd 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -91,7 +91,7 @@
.func_lsit{
display: flex;
justify-content: space-between;
- padding: 60rpx;
+ padding: 20rpx 60rpx;
.item{
width: 120rpx;
display: flex;
@@ -262,4 +262,21 @@
}
.home_ar{
width: 44rpx;
+}
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 0rpx;
+}
+/* 鎸囩ず鐐圭殑鏍峰紡 */
+.wx-swiper-dots .wx-swiper-dot {
+ width: 60rpx;
+ height: 4rpx;
+ background: #f4f4f4;
+ margin-left: -15rpx;
+ border-radius: 5rpx;
+}
+
+.wx-swiper-dot.wx-swiper-dot-active {
+ background: #666666;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index bc5f2c0..e850ee5 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -11,7 +11,7 @@
<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">
@@ -110,7 +110,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>
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index d96c1e8..746ee1f 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -1,10 +1,3 @@
-.search_fix{
- position: fixed;
- z-index: 10000;
- width: 100%;
- height: 206rpx;
- background-color: white;
-}
.search_wrap {
display: flex;
align-items: center;
@@ -22,7 +15,7 @@
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 206rpx 40rpx;
+ margin: 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -88,7 +81,7 @@
.func_lsit {
display: flex;
justify-content: space-between;
- padding: 60rpx;
+ padding: 20rpx 60rpx;
}
.func_lsit .item {
width: 120rpx;
@@ -238,3 +231,19 @@
.home_ar {
width: 44rpx;
}
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+ position: absolute;
+ right: 0;
+ bottom: 0rpx;
+}
+/* 鎸囩ず鐐圭殑鏍峰紡 */
+.wx-swiper-dots .wx-swiper-dot {
+ width: 60rpx;
+ height: 4rpx;
+ background: #f4f4f4;
+ margin-left: -15rpx;
+ border-radius: 5rpx;
+}
+.wx-swiper-dot.wx-swiper-dot-active {
+ background: #666666;
+}
diff --git a/wechat_staff/pages/kefu/fond.wxml b/wechat_staff/pages/kefu/fond.wxml
index 6cc8193..7a81d0f 100644
--- a/wechat_staff/pages/kefu/fond.wxml
+++ b/wechat_staff/pages/kefu/fond.wxml
@@ -3,7 +3,7 @@
<view class="date">{{ day.joinDate }}</view>
<view class="list">
<view class="line" wx:for="{{ day.list }}" wx:for-index="inde" wx:for-item="item">
- <image data-id="{{item.id}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_select_sel@2x.png"></image>
+ <image data-id="{{item.id}}" bindtap="itemCheck" wx:if="{{ item.checked }}" class="icon" src="../../static/icon/ic_select_sel@2x.png"></image>
<image data-id="{{item.id}}" bindtap="itemCheck" wx:else class="icon" src="../../static/icon/ic_select@2x.png"></image>
<image data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick" class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<view class="content" data-type="{{item.joinType}}" data-id="{{item.id}}" bindtap="itemClick">
@@ -13,6 +13,9 @@
</view>
</view>
</view>
+ <view wx:if="{{ enjoyList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index 77ed7e9..1dfd008 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -71,6 +71,9 @@
</view>
</view>
</block>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
diff --git a/wechat_staff/pages/promotion/index.wxml b/wechat_staff/pages/promotion/index.wxml
index 340b0d5..a01623a 100644
--- a/wechat_staff/pages/promotion/index.wxml
+++ b/wechat_staff/pages/promotion/index.wxml
@@ -18,6 +18,9 @@
<view class="btn" bind:tap="downfile" data-index="{{item}}">绔嬪嵆鍒嗕韩</view>
</view>
</view>
+ <view wx:if="{{ list.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/store/index.wxml b/wechat_staff/pages/store/index.wxml
index 9c1ff5d..3931e8a 100644
--- a/wechat_staff/pages/store/index.wxml
+++ b/wechat_staff/pages/store/index.wxml
@@ -20,5 +20,8 @@
</view>
<view bindtap="handleEdit" data-index="{{item}}" class="edit">缂栬緫</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/collect.wxml b/wechat_staff/pages/userinfo/collect.wxml
index 2193266..793fc3a 100644
--- a/wechat_staff/pages/userinfo/collect.wxml
+++ b/wechat_staff/pages/userinfo/collect.wxml
@@ -28,5 +28,8 @@
<text>{{ item.viewCount }}</text>
</view>
</view>
+ <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/static/images/default_empty.png b/wechat_staff/static/images/default_empty.png
new file mode 100644
index 0000000..8ade02a
--- /dev/null
+++ b/wechat_staff/static/images/default_empty.png
Binary files differ
--
Gitblit v1.9.3