From d0fa02f84591a3a7b88af725b1670bcded36b84d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 11:09:30 +0800
Subject: [PATCH] lll
---
wechat_jiaxuan/pages/consult/consult.less | 6
wechat_jiaxuan/pages/discover/discover.js | 15 +--
wechat_jiaxuan/pages/userinfo/index.wxss | 2
wechat_jiaxuan/pages/consult/consult.wxss | 6
wechat_jiaxuan/pages/userinfo/index.wxml | 2
wechat_jiaxuan/pages/consult/consult.wxml | 4
wechat_jiaxuan/pages/consult/detail.js | 14 +-
wechat_jiaxuan/pages/productVideo/index.wxss | 18 ----
wechat_jiaxuan/pages/productVideo/index.wxml | 7 +
wechat_jiaxuan/pages/productVideo/index.js | 10 +-
wechat_jiaxuan/components/disProduct/index.less | 9 +
wechat_jiaxuan/pages/userinfo/index.less | 2
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/components/disProduct/index.less | 9 +
wechat_staff/components/disProduct/index.wxml | 48 ++++++-----
wechat_staff/components/disProduct/index.wxss | 9 +
wechat_jiaxuan/pages/index/index.wxml | 2
wechat_jiaxuan/components/areaSel/areaSel.wxml | 2
wechat_jiaxuan/components/disProduct/index.wxss | 9 +
wechat_jiaxuan/components/disProduct/index.wxml | 48 ++++++-----
20 files changed, 113 insertions(+), 111 deletions(-)
diff --git a/wechat_jiaxuan/components/areaSel/areaSel.wxml b/wechat_jiaxuan/components/areaSel/areaSel.wxml
index e1317ae..4c0fb6c 100644
--- a/wechat_jiaxuan/components/areaSel/areaSel.wxml
+++ b/wechat_jiaxuan/components/areaSel/areaSel.wxml
@@ -1,6 +1,6 @@
<picker mode="multiSelector" model:value="{{pickerValue}}" range-key="label" range="{{range}}" bindchange="onChange"
bindcolumnchange="columnChange">
- <view style="width:400rpx;padding-left: 30rpx;white-space: nowrap;text-overflow: ellipsis; overflow:hidden;">
+ <view style="width:400rpx;white-space: nowrap;text-overflow: ellipsis; overflow:hidden;">
<!-- 濡傛灉宸茬粡閫夋嫨浜嗛�夐」锛屽垯鏄剧ず閫夐」鐨刲abel灞炴�э紝鍚﹀垯鏄剧ずplaceholder灞炴�с�� -->
<text wx:if="{{label}}"> {{ label }} </text>
<text style="color: #999" wx:else> {{ placeholder }}</text>
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 41f58ed..7de0910 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -67,11 +67,16 @@
flex: 1;
position: relative;
height: 100%;
+ .query_wrap_scroll{
+ width: 540rpx;
+ padding-left: 40rpx;
+ }
.query_wrap {
display: flex;
- width: 100%;
+ flex-wrap: nowrap;
.item {
- width: 50%;
+ flex-shrink: 0;
+ margin-right: 48rpx;
height: 100rpx;
display: flex;
align-items: center;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index c99c55b..f9d1c5d 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -9,19 +9,21 @@
<view class="main_content">
<scroll-view class="main_left" enable-flex scroll-y>
<!-- <view class="main_left"> -->
- <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
+ <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
<!-- </view> -->
</scroll-view>
<view class="main_right">
- <view class="query_wrap">
- <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.tempParamName || item.labelName }}</view>
- <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
+ <scroll-view class="query_wrap_scroll" scroll-x>
+ <view class="query_wrap">
+ <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
+ <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
</view>
- </view>
+ </scroll-view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -36,24 +38,24 @@
<view class="separate"></view>
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
- <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" mode="aspectFit"></image>
- <image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
- </view>
- <view class="name">{{ item.title }}</view>
- <view class="info">
- <image wx:if="{{ !item.isCollection }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
- <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount || 0 }}</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>{{ math.formarCount(item.viewCount) }}</text>
- </view>
+ <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" mode="aspectFit"></image>
+ <image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
- <view wx:if="{{ datalist.length == 0 }}" class="empty_wrap">
- <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ <view class="name">{{ item.title }}</view>
+ <view class="info">
+ <image wx:if="{{ !item.isCollection }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount || 0 }}</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>{{ math.formarCount(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_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index f3311d2..973eeca 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -60,12 +60,17 @@
position: relative;
height: 100%;
}
+.main_content .main_right .query_wrap_scroll {
+ width: 540rpx;
+ padding-left: 40rpx;
+}
.main_content .main_right .query_wrap {
display: flex;
- width: 100%;
+ flex-wrap: nowrap;
}
.main_content .main_right .query_wrap .item {
- width: 50%;
+ flex-shrink: 0;
+ margin-right: 48rpx;
height: 100rpx;
display: flex;
align-items: center;
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index 0a87a65..8634bac 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -47,7 +47,7 @@
margin-left: 40rpx;
height: 60rpx;
.item {
- margin-right: 54rpx;
+ margin-right: 48rpx;
color: #666666;
flex-shrink: 0;
}
@@ -72,8 +72,8 @@
margin-right: 24rpx;
}
.active{
- background-color: var(--themeColor);
- color: #fff;
+ background: rgba(176,135,113,0.08);
+ color: #B08771;
font-size: 24rpx;
font-weight: 400;
}
diff --git a/wechat_jiaxuan/pages/consult/consult.wxml b/wechat_jiaxuan/pages/consult/consult.wxml
index 5080bc5..ac83c43 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxml
+++ b/wechat_jiaxuan/pages/consult/consult.wxml
@@ -8,14 +8,14 @@
<!-- 鍒嗙被 -->
<view class="cate_wrap">
<view class="cate_one">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+ <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.code}}" wx:for="{{ category }}" class="item {{ catalogCode == item.code ? 'active': '' }}">{{ item.name }}</view>
</view>
</scroll-view>
</view>
<view class="cate_two">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 24rpx;">
+ <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 24rpx;">
<view class="scroll_cate second_list">
<view bindtap="seCateClick" data-code="{{item.code}}" wx:for="{{ secondCategory }}" class="item {{ tagCode == item.code ? 'active': '' }}">{{ item.name }}</view>
</view>
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index 52ac598..ac29f23 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -48,7 +48,7 @@
height: 60rpx;
}
.scroll_cate .item {
- margin-right: 54rpx;
+ margin-right: 48rpx;
color: #666666;
flex-shrink: 0;
}
@@ -69,8 +69,8 @@
margin-right: 24rpx;
}
.second_list .active {
- background-color: var(--themeColor);
- color: #fff;
+ background: rgba(176, 135, 113, 0.08);
+ color: #B08771;
font-size: 24rpx;
font-weight: 400;
}
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index fa9bcc2..fd00085 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -31,6 +31,13 @@
url: '/pages/design/design',
})
},
+ onShareAppMessage() {
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ return {
+ path: '/pages/consult/detail?id=' + info.id + '&userId=' + info.users.id
+ }
+ },
getDetail(id, userId) {
getProductNewsInfo({ id, salesId: userId || null }).then(res => {
this.setData({ info: res.data })
@@ -78,13 +85,6 @@
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
}
})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/discover/discover.js b/wechat_jiaxuan/pages/discover/discover.js
index 4766b03..f219156 100644
--- a/wechat_jiaxuan/pages/discover/discover.js
+++ b/wechat_jiaxuan/pages/discover/discover.js
@@ -15,7 +15,13 @@
onLoad(options) {
let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
this.setData({menuButtonInfo})
- },
+ },
+ onShow() {
+ var app = getApp()
+ if (app.globalData.catalogCode) {
+ this.setData({ catalogCode: 'product_intro' })
+ }
+ },
tabsClick(e) {
const catalogCode = e.currentTarget.dataset.code
this.setData({catalogCode})
@@ -24,13 +30,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
},
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 99a448d..4572292 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -56,7 +56,7 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <video bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
+ <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>
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 61ab302..46298e4 100644
--- a/wechat_jiaxuan/pages/productVideo/index.js
+++ b/wechat_jiaxuan/pages/productVideo/index.js
@@ -50,7 +50,7 @@
})
},
itemClick(e) {
- const { videourl ,id} = e.currentTarget.dataset
+ const { videourl ,id} = e.currentTarget.dataset.item
const { dataList } = this.data
dataList.forEach(ite => {
if(id === ite.id){
@@ -62,10 +62,10 @@
actionType: 'view',
id: id
})
- let videoPlay = this.selectComponent('.videoPlay');
- if(videoPlay){
- videoPlay.startPlayVideo(videourl,this );
- }
+ // let videoPlay = this.selectComponent('.videoPlay');
+ // if(videoPlay){
+ // videoPlay.startPlayVideo(videourl,this );
+ // }
// this.startPlayVideo(videourl)
// wx.previewMedia({
// sources: [{ url: videourl, type: 'video' }]
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index 219e1ea..bcd9be0 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -1,7 +1,7 @@
<view class="container" >
<!-- 鍒嗙被 -->
<view>
- <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;" >
+ <scroll-view wx:if="{{ category.length > 0 }}" scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;" >
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
</view>
@@ -15,10 +15,11 @@
<!-- content -->
<view class="content" >
<view wx:for="{{ dataList }}" class="item">
- <view bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="img_wrap">
+ <!-- <view bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="img_wrap">
<image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
- </view>
+ </view> -->
+ <video poster="{{ item.coverImage }}" data-item="{{ item }}" bindplay="itemClick" class="img_wrap" src="{{ item.videoUrl }}" show-center-play-btn show-fullscreen-btn></video>
<view class="title">{{ item.title }}</view>
<view class="df_sb static">
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxss b/wechat_jiaxuan/pages/productVideo/index.wxss
index cf43650..5e34d88 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxss
+++ b/wechat_jiaxuan/pages/productVideo/index.wxss
@@ -99,21 +99,3 @@
top: 50%;
transform: translate(0, -50%);
}
-.video_content{
- position: absolute;
- top: 10rpx;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
- z-index: 9999;
-}
-.video_content .video{
- position: fixed;
- border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
- z-index: 10000;
-}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index 0b40afa..cbd07f8 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -33,10 +33,8 @@
.picker_wrap{
width: 528rpx;
display: flex;
- border: 1px solid red;
.city_picler{
flex: 1;
- border: 1px solid;
}
}
.text{
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index dd91ffb..d1ff53a 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -22,7 +22,7 @@
<view class="line">
<view class="label">鍩庡競</view>
<view class="val">
- <view class="df_ac" style="width: 100%">
+ <view class="picker" style="width: 100%">
<view class="picker_wrap">
<areaSel class="city_picler" bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�" value="{{['210000000','210500000','210501000']}}" />
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index d8b2294..f7d4173 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -36,11 +36,9 @@
.list .line .picker .picker_wrap {
width: 528rpx;
display: flex;
- border: 1px solid red;
}
.list .line .picker .picker_wrap .city_picler {
flex: 1;
- border: 1px solid;
}
.list .line .picker .text {
flex: 1;
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index f2725a3..6d3511e 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/auth/auth",
+ "pathName": "pages/productVideo/index",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index ad081d9..69ffc37 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -67,11 +67,16 @@
flex: 1;
position: relative;
height: 100%;
+ .query_wrap_scroll{
+ width: 540rpx;
+ padding-left: 40rpx;
+ }
.query_wrap {
display: flex;
- width: 100%;
+ flex-wrap: nowrap;
.item {
- width: 50%;
+ flex-shrink: 0;
+ margin-right: 48rpx;
height: 100rpx;
display: flex;
align-items: center;
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index 152cc2d..cf5b378 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -9,19 +9,21 @@
<view class="main_content">
<scroll-view class="main_left" enable-flex scroll-y>
<!-- <view class="main_left"> -->
- <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
+ <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
<!-- </view> -->
</scroll-view>
<view class="main_right">
- <view class="query_wrap">
- <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.tempParamName || item.labelName }}</view>
- <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
+ <scroll-view class="query_wrap_scroll" scroll-x>
+ <view class="query_wrap">
+ <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
+ <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
</view>
- </view>
+ </scroll-view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -36,24 +38,24 @@
<view class="separate"></view>
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
- <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" mode="aspectFit"></image>
- <image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
- </view>
- <view class="name">{{ item.title }}</view>
- <view class="info">
- <image wx:if="{{ !item.isCollection }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
- <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount || 0 }}</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>{{ format.formarCount(item.viewCount) }}</text>
- </view>
+ <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" mode="aspectFit"></image>
+ <image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
- <view wx:if="{{ datalist.length == 0 }}" class="empty_wrap">
- <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ <view class="name">{{ item.title }}</view>
+ <view class="info">
+ <image wx:if="{{ !item.isCollection }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount || 0 }}</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>{{ format.formarCount(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/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 16e97e6..37cd93e 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -60,12 +60,17 @@
position: relative;
height: 100%;
}
+.main_content .main_right .query_wrap_scroll {
+ width: 540rpx;
+ padding-left: 40rpx;
+}
.main_content .main_right .query_wrap {
display: flex;
- width: 100%;
+ flex-wrap: nowrap;
}
.main_content .main_right .query_wrap .item {
- width: 50%;
+ flex-shrink: 0;
+ margin-right: 48rpx;
height: 100rpx;
display: flex;
align-items: center;
--
Gitblit v1.9.3