From 1ae423f71a056e06a1f8908c6ae048d865e8ff47 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 11:43:43 +0800
Subject: [PATCH] b端
---
wechat_jiaxuan/pages/userinfo/mysub.js | 5
wechat_jiaxuan/pages/consult/consult.wxss | 34 ++--
wechat_jiaxuan/pages/detailDis/realpic.js | 16 ++
wechat_jiaxuan/pages/consult/consult.wxml | 2
wechat_jiaxuan/components/disProduct/index.js | 4
wechat_jiaxuan/pages/productVideo/index.less | 15 ++
wechat_jiaxuan/app.json | 1
wechat_jiaxuan/pages/detailDis/product.wxml | 4
wechat_jiaxuan/pages/detailDis/realpic.wxml | 4
wechat_jiaxuan/pages/store/staff.wxss | 10 +
wechat_jiaxuan/pages/userinfo/collect.js | 13 -
wechat_jiaxuan/pages/homeId/index.js | 19 +-
wechat_jiaxuan/pages/store/staff.less | 10 +
wechat_jiaxuan/pages/userinfo/collect.json | 3
wechat_jiaxuan/pages/consult/consult.js | 7
wechat_jiaxuan/pages/store/staff.wxml | 10
wechat_jiaxuan/pages/store/store.wxml | 4
wechat_jiaxuan/pages/webView/index.js | 19 +-
wechat_jiaxuan/pages/calculator/index.js | 2
wechat_jiaxuan/pages/homeId/index.json | 3
wechat_jiaxuan/pages/userinfo/mysub.json | 3
wechat_jiaxuan/pages/index/index.js | 14 +
wechat_jiaxuan/pages/auth/auth.js | 4
wechat_jiaxuan/pages/detailDis/product.js | 31 ++++
wechat_jiaxuan/pages/consult/consult.less | 34 ++--
wechat_jiaxuan/components/disCase/index.js | 4
wechat_jiaxuan/pages/productVideo/index.wxss | 15 ++
wechat_jiaxuan/pages/productVideo/index.wxml | 4
wechat_jiaxuan/pages/productVideo/index.js | 43 +++--
wechat_jiaxuan/pages/store/store.js | 2
wechat_staff/static/icon/ic_720.png | 0
wechat_jiaxuan/components/disCase/index.wxml | 2
wechat_jiaxuan/pages/detailDis/case.wxml | 6
wechat_jiaxuan/pages/userinfo/favorite.js | 20 --
wechat_jiaxuan/components/disRealpic/index.js | 4
wechat_jiaxuan/pages/detailDis/case.js | 22 +++
wechat_jiaxuan/project.private.config.json | 2
wechat_jiaxuan/pages/consult/consult.json | 3
wechat_jiaxuan/components/disRealpic/index.wxml | 2
wechat_jiaxuan/pages/productVideo/index.json | 3
wechat_jiaxuan/pages/store/staff.js | 9 +
wechat_jiaxuan/pages/userinfo/favorite.json | 3
wechat_jiaxuan/components/disProduct/index.wxml | 2
43 files changed, 285 insertions(+), 132 deletions(-)
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index 9414c87..1fa43dc 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -31,6 +31,7 @@
"window": {
"navigationBarTitleText": "蹇楅偊瀹堕��",
"navigationBarTextStyle": "black",
+ "backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#fff",
"navigationStyle": "default"
},
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 3e13e89..ac0a0ea 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -54,6 +54,10 @@
}
})
},
+ scrolltoupper() {
+ this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.getList()
+ },
scrolltolower() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 9177b3a..a8c7ddc 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -35,7 +35,7 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="scrolltoupper" 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>
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 30e7d2b..6a8d494 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -93,6 +93,10 @@
})
}
},
+ scrolltoupper() {
+ this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.getList()
+ },
cateClick(e) {
const catalogCode = e.currentTarget.dataset.code
this.setData({ catalogCode, tagCodes: [] })
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 6cd5b57..4b9fa34 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -36,7 +36,7 @@
<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">
+ <scroll-view bindscrolltoupper="scrolltoupper" 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>
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 80fa13c..0aea630 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -51,6 +51,10 @@
})
})
},
+ scrolltoupper() {
+ this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.getList()
+ },
scrolltolower() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 0e3776b..c358027 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -36,7 +36,7 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="scrolltoupper" bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index e95273d..7c47de8 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -58,9 +58,7 @@
}).then((res) => {
if(res.code == 200){
wx.setStorageSync('member', res.data)
- wx.switchTab({
- url: '/pages/index/index',
- })
+ wx.navigateBack()
}
})
})
diff --git a/wechat_jiaxuan/pages/calculator/index.js b/wechat_jiaxuan/pages/calculator/index.js
index e8ef0df..cb7f226 100644
--- a/wechat_jiaxuan/pages/calculator/index.js
+++ b/wechat_jiaxuan/pages/calculator/index.js
@@ -92,7 +92,9 @@
binDingPhone({
phone: res.data
}).then((res) => {
+ this.setData({ userPhone: res.data })
if(res.code == 200){
+ this.setData()
wx.setStorageSync('member', res.data)
this.submit()
}
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 16c7463..1da566b 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -35,6 +35,11 @@
})
}
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
getCate() {
getCatalogList({catalogCode: 'product_info'}).then(res => {
this.setData({ category: res.data })
@@ -60,7 +65,7 @@
actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.content,
+ url: '/pages/webView/index',
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
diff --git a/wechat_jiaxuan/pages/consult/consult.json b/wechat_jiaxuan/pages/consult/consult.json
index 1fc1ce6..27ca13f 100644
--- a/wechat_jiaxuan/pages/consult/consult.json
+++ b/wechat_jiaxuan/pages/consult/consult.json
@@ -2,5 +2,6 @@
"usingComponents": {
"idCard": "../../components/idCard/index"
},
- "navigationBarTitleText": "璧勮"
+ "navigationBarTitleText": "璧勮",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index 14e1a4b..99aee9b 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -6,36 +6,38 @@
width: 100%;
z-index: 99;
top: 0;
+ height: 96rpx;
+ padding-bottom: 24rpx;
background-color: #fff;
+ .search_wrap{
+ width: 670rpx;
+ height: 72rpx;
+ margin: 0rpx auto;
+ border-radius: 8rpx;
+ padding: 0 40rpx 0rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+ image{
+ width: 28rpx;
+ margin-right: 16rpx;
+ }
+ }
}
.cate_wrap{
background-color: #fff;
.cate_one{
position: fixed;
- top: 96rpx;
+ top: 94rpx;
background-color: #fff;
width: 100%;
}
.cate_two{
position: fixed;
- top: 156rpx;
+ top: 154rpx;
background-color: #fff;
padding-top: 30rpx;
width: 100%;
- }
-}
-.search_wrap{
- width: 670rpx;
- height: 72rpx;
- margin: 0rpx auto 24rpx;
- border-radius: 8rpx;
- padding: 0 40rpx;
- display: flex;
- align-items: center;
- background-color: #F7F7F7;
- image{
- width: 28rpx;
- margin-right: 16rpx;
}
}
.scroll_cate {
diff --git a/wechat_jiaxuan/pages/consult/consult.wxml b/wechat_jiaxuan/pages/consult/consult.wxml
index 5bdb475..c5d6470 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxml
+++ b/wechat_jiaxuan/pages/consult/consult.wxml
@@ -23,7 +23,7 @@
</view>
</view>
<!-- content -->
- <view class="content" style="padding-top: {{ secondCategory.length > 0 ? 276 : 186 }}rpx;">
+ <view class="content" style="padding-top: {{ secondCategory.length > 0 ? 274 : 184 }}rpx;">
<view wx:for="{{ dataList }}" class="item" bindtap="itemClick" data-item="{{item}}">
<image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
<view class="title">{{ item.title }}</view>
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index f8dba92..346b4c4 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -6,37 +6,39 @@
width: 100%;
z-index: 99;
top: 0;
+ height: 96rpx;
+ padding-bottom: 24rpx;
background-color: #fff;
+}
+.home_top .search_wrap {
+ width: 670rpx;
+ height: 72rpx;
+ margin: 0rpx auto;
+ border-radius: 8rpx;
+ padding: 0 40rpx 0rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+}
+.home_top .search_wrap image {
+ width: 28rpx;
+ margin-right: 16rpx;
}
.cate_wrap {
background-color: #fff;
}
.cate_wrap .cate_one {
position: fixed;
- top: 96rpx;
+ top: 94rpx;
background-color: #fff;
width: 100%;
}
.cate_wrap .cate_two {
position: fixed;
- top: 156rpx;
+ top: 154rpx;
background-color: #fff;
padding-top: 30rpx;
width: 100%;
-}
-.search_wrap {
- width: 670rpx;
- height: 72rpx;
- margin: 0rpx auto 24rpx;
- border-radius: 8rpx;
- padding: 0 40rpx;
- display: flex;
- align-items: center;
- background-color: #F7F7F7;
-}
-.search_wrap image {
- width: 28rpx;
- margin-right: 16rpx;
}
.scroll_cate {
display: flex;
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b07edbd..b3c66d1 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -52,17 +52,37 @@
handleAction(e){
const actionType = e.currentTarget.dataset.code
const { info } = this.data
+ const member = wx.getStorageSync('member')
+ if (member.authStatus == '0') {
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
actionDo({
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
this.setData({info})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
})
})
},
+ 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
+ })
+ },
getDetail(id, userId) {
getWholecaseInfo({id, salesId: userId || null}).then(res => {
this.setData({ info: res.data })
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
index 58c1914..929e470 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxml
+++ b/wechat_jiaxuan/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-index="{{index}}" 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>
@@ -27,7 +27,7 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
<image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<view class="name">鏀惰棌</view>
</button>
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 2827a2e..acd6c6d 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -34,16 +34,42 @@
member
})
},
+ priviewBanner(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.bannerImgList,
+ current: url
+ })
+ },
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.spaceList,
+ current: url
+ })
+ },
handleAction(e) {
const actionType = e.currentTarget.dataset.code
const {
info
} = this.data
+ const member = wx.getStorageSync('member')
+ if (member.authStatus == '0') {
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
actionDo({
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
this.setData({
info
})
@@ -54,7 +80,8 @@
},
getDetail(id, userId) {
getProductInfo({
- id, salesId: userId || null
+ id,
+ salesId: userId || null
}).then(res => {
this.setData({
info: res.data
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index d4294e6..719ec03 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -5,7 +5,7 @@
<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>
+ <image data-url="{{ item }}" bindtap="priviewBanner" bindload="bannerbindload" mode="widthFix" src="{{ item }}"></image>
</swiper-item>
</block>
</swiper>
@@ -37,7 +37,7 @@
<view class="spaceList">
<view class="item" wx:for="{{ info.spaceList }}">
<!-- <view class="name">{{ item.spaceName }}</view> -->
- <image src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
+ <image data-url="{{ item.spaceImg }}" bindtap="priviewSpace" src="{{ item.spaceImg }}" mode="widthFix" class="img"></image>
<!-- <mp-html content="{{item.spaceContent}}"></mp-html> -->
</view>
</view>
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index c62d0be..fe22e58 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -31,11 +31,17 @@
handleAction(e){
const actionType = e.currentTarget.dataset.code
const { info } = this.data
+ const member = wx.getStorageSync('member')
+ if (member.authStatus == '0') {
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
actionDo({
actionType,
id: this.data.info.id
}).then(res => {
- info.collection = !info.collection
+ info.isCollection = !info.isCollection
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
})
@@ -50,6 +56,14 @@
})
})
},
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const { info } = this.data
+ wx.previewImage({
+ urls: info.contentImgList,
+ current: url
+ })
+ },
playVideo() {
wx.previewMedia({
sources: [{ url: this.data.info.video, type: 'video' }]
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
index a1e0b86..42e48c0 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxml
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -3,7 +3,7 @@
<idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
<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">
@@ -15,7 +15,7 @@
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
<button class="item btn">
- <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.collection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <image data-code="collect_cancel" bindtap="handleAction" wx:if="{{ info.isCollection }}" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
<image wx:else data-code="collect" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
<view class="name">鏀惰棌</view>
</button>
diff --git a/wechat_jiaxuan/pages/homeId/index.js b/wechat_jiaxuan/pages/homeId/index.js
index 8a633b7..03b2ca0 100644
--- a/wechat_jiaxuan/pages/homeId/index.js
+++ b/wechat_jiaxuan/pages/homeId/index.js
@@ -36,6 +36,11 @@
})
}
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
getList(){
const { code, tagCodes, pageSize, pageNum } = this.data
pageZSZXContentList({
@@ -62,7 +67,11 @@
}
if(item.contentType == 'link'){
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.content,
+ url: '/pages/webView/index',
+ success: function(res) {
+ console.log('鍙戝嚭浜嬩欢');
+ res.eventChannel.emit('data',{link:item.content} );
+ }
})
}
if(item.contentType == 'page'){
@@ -117,14 +126,6 @@
onUnload() {
},
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
diff --git a/wechat_jiaxuan/pages/homeId/index.json b/wechat_jiaxuan/pages/homeId/index.json
index 2303215..0a97a2d 100644
--- a/wechat_jiaxuan/pages/homeId/index.json
+++ b/wechat_jiaxuan/pages/homeId/index.json
@@ -1,3 +1,4 @@
{
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 701604f..a871c96 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -8,7 +8,9 @@
getZhongTaiVideoPage,
getZhongTaiProductNewsPage
} from '../../api/index'
-const { HYEventBus } = require('hy-event-store')
+const {
+ HYEventBus
+} = require('hy-event-store')
const eventBus = new HYEventBus()
Page({
@@ -93,7 +95,6 @@
url: '/pages/calculator/index'
})
break;
-
case '2':
wx.navigateTo({
url: '/pages/design/design'
@@ -256,7 +257,7 @@
} = e.currentTarget.dataset
const item = e.currentTarget.dataset.item
console.log('item', item);
- if(item.openType){
+ if (item.openType) {
actionDo({
actionType: 'view',
id: item.id
@@ -272,7 +273,12 @@
}
if (item.openType == 'link') {
wx.navigateTo({
- url: '/pages/webView/index?link=' + item.openContent,
+ url: '/pages/webView/index',
+ success: function (res) {
+ res.eventChannel.emit('data', {
+ link: item.content
+ });
+ }
})
}
if (item.openType == 'page') {
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 640bda1..4db093b 100644
--- a/wechat_jiaxuan/pages/productVideo/index.js
+++ b/wechat_jiaxuan/pages/productVideo/index.js
@@ -6,8 +6,9 @@
*/
data: {
category: [],
- activeCate: '',
- seActiveCate: '',
+ tagCodes: '',
+ videoUrl: '',
+ showVideo: false,
dataList: [],
total: 0,
@@ -15,19 +16,35 @@
pageNum: 1,
},
+ onReachBottom() {
+ console.log('瑙﹀簳浜嬩欢');
+ const { total, dataList, pageNum } = this.data
+ if(total > dataList.length){
+ this.setData({ pageNum: pageNum + 1 })
+ this.getList()
+ }else{
+ wx.showToast({
+ title: '鏆傛棤鏇村鏁版嵁',
+ icon: 'none'
+ })
+ }
+ },
getList() {
- const { pageSize, pageNum } = this.data
+ const { pageSize, pageNum, tagCodes } = this.data
getZhongTaiVideoPage({
- pageSize,pageNum
+ pageSize,pageNum, tagCodes: tagCodes ? [tagCodes] : null
}).then(res => {
- this.setData({ dataList: res.data.records })
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records],
+ total: res.data.total
+ })
})
},
getTagList() {
getCataLogTagList({
catalogCode: 'video_rec'
}).then(res => {
- this.setData({ category: res.data.valueVos })
+ this.setData({ category: res.data })
})
},
itemClick(e) {
@@ -37,8 +54,10 @@
})
},
cateClick(e) {
- const { index } = e.target.dataset
- console.log(index);
+ const { code } = e.target.dataset
+ this.setData({ tagCodes: code })
+ this.setData({ total: 0, dataList: [], pageNum: 1 })
+ this.getList()
},
seCateClick(e) {
const { index } = e.target.dataset
@@ -83,14 +102,6 @@
onPullDownRefresh() {
},
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/wechat_jiaxuan/pages/productVideo/index.json b/wechat_jiaxuan/pages/productVideo/index.json
index 5322f4c..121b10c 100644
--- a/wechat_jiaxuan/pages/productVideo/index.json
+++ b/wechat_jiaxuan/pages/productVideo/index.json
@@ -1,3 +1,6 @@
{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index"
+ },
"navigationBarTitleText": "浜у搧瑙嗛"
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/productVideo/index.less b/wechat_jiaxuan/pages/productVideo/index.less
index 9075a5d..770d265 100644
--- a/wechat_jiaxuan/pages/productVideo/index.less
+++ b/wechat_jiaxuan/pages/productVideo/index.less
@@ -68,9 +68,11 @@
}
.img_wrap{
width: 100%;
+ height: 376rpx;
position: relative;
.img{
width: 100%;
+ height: 376rpx;
}
}
.title{
@@ -87,4 +89,17 @@
}
}
}
+}
+.video_wrap{
+ position: fixed;
+ width: 100%;
+ height: 100vh;
+ z-index: 999;
+ video{
+ width: 100%;
+ position: fixed;
+ z-index: 9999;
+ top: 50%;
+ transform: translate(0, -50%);
+ }
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index af7be5b..d6c1608 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -3,7 +3,7 @@
<view>
<scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
- <view bindtap="cateClick" data-index="{{index}}" wx:for="{{ category }}" class="item {{ index == 0 ? 'active': '' }}">{{ item }}</view>
+ <view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
</view>
</scroll-view>
<!-- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
@@ -16,7 +16,7 @@
<view class="content">
<view wx:for="{{ dataList }}" class="item">
<view class="img_wrap">
- <image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
+ <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxss b/wechat_jiaxuan/pages/productVideo/index.wxss
index bf63316..5e34d88 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxss
+++ b/wechat_jiaxuan/pages/productVideo/index.wxss
@@ -66,10 +66,12 @@
}
.content .item .img_wrap {
width: 100%;
+ height: 376rpx;
position: relative;
}
.content .item .img_wrap .img {
width: 100%;
+ height: 376rpx;
}
.content .item .title {
font-size: 30rpx;
@@ -84,3 +86,16 @@
width: 26rpx;
margin-right: 10rpx;
}
+.video_wrap {
+ position: fixed;
+ width: 100%;
+ height: 100vh;
+ z-index: 999;
+}
+.video_wrap video {
+ width: 100%;
+ position: fixed;
+ z-index: 9999;
+ top: 50%;
+ transform: translate(0, -50%);
+}
diff --git a/wechat_jiaxuan/pages/store/staff.js b/wechat_jiaxuan/pages/store/staff.js
index b57c4c5..b360fda 100644
--- a/wechat_jiaxuan/pages/store/staff.js
+++ b/wechat_jiaxuan/pages/store/staff.js
@@ -6,7 +6,7 @@
*/
data: {
bottomLift: 0,
- isShow: true,
+ isShow: false,
info: {}
},
@@ -28,10 +28,15 @@
getDetail(id) {
usersDetailByIamId({iamId: id}).then(res => {
this.setData({ info: res.data })
+ if(res.data && res.data.qrcodeImgFull){
+ this.setData({ isShow: true })
+ }
})
},
openModal() {
- this.setData({isShow: true})
+ if(this.data.info.qrcodeImgFull){
+ this.setData({ isShow: true })
+ }
},
onClose() {
this.setData({isShow: false})
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index aee25cf..e8fcae7 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -27,6 +27,14 @@
margin-bottom: 40rpx;
color: #333333;
position: relative;
+ .text{
+ width: 100%;
+ overflow : hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
.icon{
position: absolute;
background: #F7F7F7;
@@ -114,10 +122,12 @@
.line {
display: flex;
+ align-items: flex-start;
font-size: 30rpx;
margin-bottom: 42rpx;
.icon {
width: 30rpx;
+ margin-top: 6rpx;
}
.label {
color: #777777;
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index e74eccf..9e354a1 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -9,11 +9,11 @@
<view class="tag">瀵艰喘</view>
<!-- <view class="tag">{{ info.jobDate || '-' }}骞寸粡楠�</view> -->
</view>
- <image bindtap="openModal" class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
+ <image wx:if="{{ info.qrcodeImgFull }}" bindtap="openModal" class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
</view>
<view class="desc">
<image src="../../static/icon/mingpian_ic_edit@2x.png" mode="widthFix"></image>
- <view>{{ info.slogans }}</view>
+ <view class="text">{{ info.slogans }}</view>
<view class="icon"></view>
</view>
<view class="static">
@@ -34,17 +34,17 @@
<view class="line">
<image class="icon" src="../../static/icon/mingpian_ic_phone@2x.png" mode="widthFix"></image>
<text class="label">鑱旂郴鐢佃瘽</text>
- <text class="val">{{ info.phone }}</text>
+ <text class="val">{{ info.phone || '--' }}</text>
</view>
<view class="line">
<image class="icon" src="../../static/icon/mingpian_ic_mendian@2x.png" mode="widthFix"></image>
<text class="label">闂ㄥ簵鍚嶇О</text>
- <text class="val">{{ info.shopName }}</text>
+ <text class="val">{{ info.shopName || '--' }}</text>
</view>
<view class="line">
<image class="icon" src="../../static/icon/mingpian_ic_dizhi@2x.png" mode="widthFix"></image>
<text class="label">闂ㄥ簵鍦板潃</text>
- <text class="val">{{ info.shopAddress }}</text>
+ <text class="val">{{ info.shopAddress || '--' }}</text>
</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 91693be..8858e2b 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -28,6 +28,14 @@
color: #333333;
position: relative;
}
+.container .desc .text {
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+}
.container .desc .icon {
position: absolute;
background: #F7F7F7;
@@ -102,11 +110,13 @@
}
.guide .line {
display: flex;
+ align-items: flex-start;
font-size: 30rpx;
margin-bottom: 42rpx;
}
.guide .line .icon {
width: 30rpx;
+ margin-top: 6rpx;
}
.guide .line .label {
color: #777777;
diff --git a/wechat_jiaxuan/pages/store/store.js b/wechat_jiaxuan/pages/store/store.js
index d01e39b..23577e3 100644
--- a/wechat_jiaxuan/pages/store/store.js
+++ b/wechat_jiaxuan/pages/store/store.js
@@ -72,6 +72,8 @@
},
userDetail(e) {
const iamId = e.currentTarget.dataset.id
+ console.log('e', e);
+ console.log('iamId', iamId);
wx.navigateTo({
url: `/pages/store/staff?id=${iamId}`,
})
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index fc308df..1ba2382 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -27,9 +27,9 @@
</view>
<scroll-view scroll-x style="width: 640rpx">
<view class="user_list">
- <view bindtap="userDetail" data-id="{{ item.iamId }}" class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
+ <view bindtap="userDetail" data-id="{{ user.iamId }}" class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
<view class="info">
- <image class="avatar" src="{{ user.imgurlFull ? user.imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
+ <image class="avatar" src="{{ user.imgurlFull ? user.imgurlFull : '../../static/images/default_avatar.png' }}" ></image>
<view class="text">
<view class="name">{{ user.name }}</view>
<view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate || 5 }}骞寸粡楠�</view>
diff --git a/wechat_jiaxuan/pages/userinfo/collect.js b/wechat_jiaxuan/pages/userinfo/collect.js
index da9ee29..2e40648 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.js
+++ b/wechat_jiaxuan/pages/userinfo/collect.js
@@ -17,6 +17,11 @@
onLoad(options) {
this.getList()
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
@@ -101,14 +106,6 @@
onUnload() {
},
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
diff --git a/wechat_jiaxuan/pages/userinfo/collect.json b/wechat_jiaxuan/pages/userinfo/collect.json
index 8fd3e9f..aef1638 100644
--- a/wechat_jiaxuan/pages/userinfo/collect.json
+++ b/wechat_jiaxuan/pages/userinfo/collect.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎴戞敹钘忕殑"
+ "navigationBarTitleText": "鎴戞敹钘忕殑",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.js b/wechat_jiaxuan/pages/userinfo/favorite.js
index e5d8b73..dbe7813 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.js
+++ b/wechat_jiaxuan/pages/userinfo/favorite.js
@@ -17,6 +17,11 @@
onLoad(options) {
this.getList()
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], pageNum: 1, total: 0 })
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
@@ -101,21 +106,6 @@
onUnload() {
},
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
onShareAppMessage() {
}
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.json b/wechat_jiaxuan/pages/userinfo/favorite.json
index 484bcff..2c3e213 100644
--- a/wechat_jiaxuan/pages/userinfo/favorite.json
+++ b/wechat_jiaxuan/pages/userinfo/favorite.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎴戝枩娆㈢殑"
+ "navigationBarTitleText": "鎴戝枩娆㈢殑",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.js b/wechat_jiaxuan/pages/userinfo/mysub.js
index c545e33..fa703a1 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.js
+++ b/wechat_jiaxuan/pages/userinfo/mysub.js
@@ -15,6 +15,11 @@
onLoad(options) {
this.getList()
},
+ onPullDownRefresh: function () {
+ console.log('涓嬫媺鍒锋柊');
+ this.setData({ dataList: [], page: 1, total: 0 })
+ this.getList()
+ },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, page } = this.data
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.json b/wechat_jiaxuan/pages/userinfo/mysub.json
index 82e93f8..ccb8e04 100644
--- a/wechat_jiaxuan/pages/userinfo/mysub.json
+++ b/wechat_jiaxuan/pages/userinfo/mysub.json
@@ -1,4 +1,5 @@
{
"usingComponents": {},
- "navigationBarTitleText": "鎴戠殑棰勭害"
+ "navigationBarTitleText": "鎴戠殑棰勭害",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/webView/index.js b/wechat_jiaxuan/pages/webView/index.js
index 530c487..000d2cd 100644
--- a/wechat_jiaxuan/pages/webView/index.js
+++ b/wechat_jiaxuan/pages/webView/index.js
@@ -14,18 +14,13 @@
onLoad: function (options) {
let that = this
const eventChannel = this.getOpenerEventChannel()
-
- if (options.link) {
- that.setData({ link: options.link, id: options.id })
- } else {
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('acceptDataFromOpenerPage', function(data) {
- console.log('鍙傛暟', data)
- if (data.title) wx.setNavigationBarTitle({ title: data.title })
- that.setData({ link: data.link, id: data.id })
- // saveBannerLookNum({ id: data.id })
- })
- }
+
+ eventChannel.on('acceptDataFromOpenerPage', function(data) {
+ console.log('鍙傛暟', data)
+ if (data.title) wx.setNavigationBarTitle({ title: data.title })
+ that.setData({ link: data.link, id: data.id })
+ // saveBannerLookNum({ id: data.id })
+ })
},
/**
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index fe80c7c..9e41f95 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/store/info",
+ "pathName": "pages/productVideo/index",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/static/icon/ic_720.png b/wechat_staff/static/icon/ic_720.png
new file mode 100644
index 0000000..7c47d5a
--- /dev/null
+++ b/wechat_staff/static/icon/ic_720.png
Binary files differ
--
Gitblit v1.9.3