From 00bf17838b496e6fcfed2e521f9c27f8f0e3e3c7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 05 八月 2024 18:38:20 +0800
Subject: [PATCH] ‘’
---
wechat_staff/pages/productVideo/index.wxml | 2
wechat_staff/pages/productVideo/index.wxss | 3
wechat_jiaxuan/pages/consult/consult.wxss | 11 +-
wechat_staff/pages/index/index.wxml | 2
wechat_jiaxuan/components/disProduct/index.less | 2
wechat_jiaxuan/components/disRealpic/index.less | 5
wechat_jiaxuan/pages/productVideo/index.less | 3
wechat_staff/project.private.config.json | 2
wechat_staff/components/disCase/index.wxss | 3
wechat_staff/components/disProduct/index.less | 2
wechat_jiaxuan/pages/kefu/index.js | 6
wechat_staff/pages/consult/consult.wxss | 11 +-
wechat_jiaxuan/pages/index/index.js | 3
wechat_jiaxuan/pages/consult/consult.less | 12 +-
wechat_staff/pages/productVideo/index.less | 3
wechat_jiaxuan/pages/consult/detail.js | 15 +++
wechat_jiaxuan/pages/productVideo/index.wxss | 3
wechat_jiaxuan/pages/productVideo/index.wxml | 2
wechat_jiaxuan/pages/productVideo/index.js | 38 +++++---
wechat_staff/components/disRealpic/index.less | 5
wechat_jiaxuan/components/disCase/index.wxss | 3
wechat_jiaxuan/utils/config.js | 4
wechat_staff/pages/productVideo/index.js | 27 +++++-
wechat_staff/components/disCase/index.less | 3
wechat_jiaxuan/pages/consult/detail.json | 1
wechat_staff/pages/consult/consult.less | 12 +-
wechat_staff/pages/index/index.js | 2
wechat_staff/components/disProduct/index.wxss | 2
wechat_jiaxuan/components/disCase/index.less | 3
wechat_jiaxuan/pages/index/index.wxml | 2
wechat_jiaxuan/components/disRealpic/index.wxss | 5
wechat_jiaxuan/components/disProduct/index.wxss | 2
wechat_staff/pages/kefu/index.js | 3
wechat_staff/components/disRealpic/index.wxss | 5
34 files changed, 133 insertions(+), 74 deletions(-)
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 28fa615..931c601 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -125,9 +125,10 @@
}
}
.goods_list{
+ height: calc( 100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
- height: calc( 100% - 188rpx);
.empty{
height: 100rpx;
}
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 741144a..770e9bd 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -123,9 +123,10 @@
background-color: #333333;
}
.main_content .goods_list {
+ height: calc(100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
- height: calc(100% - 188rpx);
}
.main_content .goods_list .empty {
height: 100rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index eb55065..eba7a78 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -166,7 +166,7 @@
}
}
.goods_list {
- height: calc( 100% - 182rpx);
+ height: calc( 100% - 222rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index adcc16d..12a0f9c 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -153,7 +153,7 @@
background-color: #333333;
}
.main_content .main_right .goods_list {
- height: calc(100% - 182rpx);
+ height: calc(100% - 222rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 42a7c72..a049ac5 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -136,9 +136,10 @@
}
.goods_list {
- padding: 12rpx 40rpx;
- height: calc( 100% - 188rpx);
+ height: calc( 100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
+ padding: 12rpx 40rpx;
.empty{
height: 100rpx;
}
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 9d02cc8..5bfbdbb 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -123,9 +123,10 @@
background-color: #333333;
}
.main_content .goods_list {
- padding: 12rpx 40rpx;
- height: calc(100% - 188rpx);
+ height: calc(100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
+ padding: 12rpx 40rpx;
}
.main_content .goods_list .empty {
height: 100rpx;
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index a1201f2..7fce414 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -61,21 +61,21 @@
align-items: center;
margin-left: 0;
.item {
- padding: 0 40rpx;
+ padding: 0 20rpx;
display: flex;
align-items: center;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #333333;
- height: 60rpx;
+ height: 68rpx;
+ margin-right: 24rpx;
+ line-height: 68rpx;
background: #F7F7F7;
border-radius: 8rpx;
margin-right: 24rpx;
}
.active{
- color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- font-size: 24rpx;
- font-weight: 400;
+ color: #B08771;
}
}
.content{
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index 506f6bf..32fe69d 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -58,21 +58,20 @@
margin-left: 0;
}
.second_list .item {
- padding: 0 40rpx;
+ padding: 0 20rpx;
display: flex;
align-items: center;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #333333;
- height: 60rpx;
+ height: 68rpx;
+ line-height: 68rpx;
background: #F7F7F7;
border-radius: 8rpx;
margin-right: 24rpx;
}
.second_list .active {
- color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- font-size: 24rpx;
- font-weight: 400;
+ color: #B08771;
}
.content {
padding: 0rpx 40rpx 40rpx;
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 0f8df05..2595a1a 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -1,4 +1,4 @@
-import { actionDo, getProductNewsInfo } from '../../api/index'
+import { actionDo, getProductNewsInfo, getMemberInfo } from '../../api/index'
Page({
/**
@@ -16,6 +16,9 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
+ onLoadLogin(options) {
+ this.getDetail(options.id, options.userId || '')
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
@@ -24,7 +27,7 @@
if(options.origin && options.origin == 'b'){
this.setData({ origin: 'b' })
}
- this.getDetail(options.id, options.userId || '')
+ // this.getDetail(options.id, options.userId || '')
},
handleDesign() {
wx.navigateTo({
@@ -44,6 +47,14 @@
wx.setNavigationBarTitle({
title: res.data.title
})
+ if (userId) {
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
+ wx.setStorageSync('member', res.data)
+ })
+ }
})
},
openShare() {
diff --git a/wechat_jiaxuan/pages/consult/detail.json b/wechat_jiaxuan/pages/consult/detail.json
index 1405880..e1ade56 100644
--- a/wechat_jiaxuan/pages/consult/detail.json
+++ b/wechat_jiaxuan/pages/consult/detail.json
@@ -1,6 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
+ "idCard": "../../components/idCard/index",
"mp-html": "mp-html"
},
"navigationBarTitleText": ""
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index fa9e123..cdc4ace 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -402,11 +402,12 @@
},
onPageScroll(e) {
const { videoTop, windowHeight, videoPlay } = this.data
- if(e.scrollTop - 100 > videoTop - (windowHeight / 2) && videoPlay ){
+ if(e.scrollTop + 100 > videoTop - (windowHeight / 2) && videoPlay ){
this.setData({ videoPlay: false })
let videoplay = wx.createVideoContext('myvideo', this)
videoplay.play();
}
+
let scrollTop = e.scrollTop / 100
if (scrollTop <= 0.1) {
this.setData({
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 41b71a2..efde278 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -59,7 +59,7 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
+ <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" muted 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/kefu/index.js b/wechat_jiaxuan/pages/kefu/index.js
index 7035858..7795349 100644
--- a/wechat_jiaxuan/pages/kefu/index.js
+++ b/wechat_jiaxuan/pages/kefu/index.js
@@ -12,14 +12,14 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
+ onLoadLogin(options) {
+ this.getDetail(options.id)
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
bottomLift: app.bottomLift
})
- if(options && options.id){
- this.getDetail(options.id)
- }
},
toSever () {
console.log('瀹㈡湇');
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 365508d..53f848c 100644
--- a/wechat_jiaxuan/pages/productVideo/index.js
+++ b/wechat_jiaxuan/pages/productVideo/index.js
@@ -5,6 +5,9 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ acVid: '',
+ viewIdList: [],
+
videoContext:null,
category: [],
tagCodes: '',
@@ -50,26 +53,31 @@
})
},
itemClick(e) {
- const { id} = e.currentTarget.dataset.item
- const { dataList } = this.data
+ const { id } = e.currentTarget.dataset.item
+ const { dataList, acVid, viewIdList } = this.data
+ const index = viewIdList.findIndex(i => i === id)
+ if(acVid){
+ if(id != acVid){
+ wx.createVideoContext(acVid).pause()
+ wx.createVideoContext(id).play()
+ this.setData({ acVid: id })
+ }
+ }else{
+ this.setData({ acVid: id })
+ wx.createVideoContext(id).play()
+ }
dataList.forEach(ite => {
- if(id === ite.id){
+ if(id === ite.id && index === -1){
ite.viewCount += 1
+ viewIdList.push(id)
+ actionDo({
+ actionType: 'view',
+ id: id
+ })
+ this.setData({ viewIdList })
}
})
this.setData({ dataList })
- actionDo({
- actionType: 'view',
- id: id
- })
- // let videoPlay = this.selectComponent('.videoPlay');
- // if(videoPlay){
- // videoPlay.startPlayVideo(videourl,this );
- // }
- // this.startPlayVideo(videourl)
- // wx.previewMedia({
- // sources: [{ url: videourl, type: 'video' }]
- // })
},
cateClick(e) {
const { code } = e.target.dataset
diff --git a/wechat_jiaxuan/pages/productVideo/index.less b/wechat_jiaxuan/pages/productVideo/index.less
index 770d265..7771448 100644
--- a/wechat_jiaxuan/pages/productVideo/index.less
+++ b/wechat_jiaxuan/pages/productVideo/index.less
@@ -58,6 +58,9 @@
.item{
margin-bottom: 60rpx;
position: relative;
+ video{
+ border-radius: 8rpx;
+ }
.play{
width: 60rpx;
position: absolute;
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index bcd9be0..50a7c60 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -19,7 +19,7 @@
<image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view> -->
- <video poster="{{ item.coverImage }}" data-item="{{ item }}" bindplay="itemClick" class="img_wrap" src="{{ item.videoUrl }}" show-center-play-btn show-fullscreen-btn></video>
+ <video id="{{item.id}}" 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 5e34d88..82e362c 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxss
+++ b/wechat_jiaxuan/pages/productVideo/index.wxss
@@ -56,6 +56,9 @@
margin-bottom: 60rpx;
position: relative;
}
+.content .item video {
+ border-radius: 8rpx;
+}
.content .item .play {
width: 60rpx;
position: absolute;
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index 4bccd57..ef1c60f 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,10 +1,10 @@
-export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
-// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index 1cdea78..f4240ec 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -125,9 +125,10 @@
}
}
.goods_list{
+ height: calc( 100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
- height: calc( 100% - 188rpx);
.empty{
height: 100rpx;
}
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index 83e696e..b927445 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -123,9 +123,10 @@
background-color: #333333;
}
.main_content .goods_list {
+ height: calc(100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
- height: calc(100% - 188rpx);
}
.main_content .goods_list .empty {
height: 100rpx;
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 8dec614..a6e51ad 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -167,7 +167,7 @@
}
.goods_list {
- height: calc( 100% - 182rpx);
+ height: calc( 100% - 222rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 814043e..c683bc0 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -151,7 +151,7 @@
background-color: #333333;
}
.main_content .main_right .goods_list {
- height: calc(100% - 182rpx);
+ height: calc(100% - 222rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 4f5d5cc..3459010 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -137,9 +137,10 @@
}
.goods_list {
- padding: 12rpx 40rpx;
- height: calc( 100% - 188rpx);
+ height: calc( 100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
+ padding: 12rpx 40rpx;
.empty{
height: 100rpx;
}
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index f17edc3..c303706 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -123,9 +123,10 @@
background-color: #333333;
}
.main_content .goods_list {
- padding: 12rpx 40rpx;
- height: calc(100% - 188rpx);
+ height: calc(100% - 222rpx);
+ width: 590rpx;
box-sizing: border-box;
+ padding: 12rpx 40rpx;
}
.main_content .goods_list .empty {
height: 100rpx;
diff --git a/wechat_staff/pages/consult/consult.less b/wechat_staff/pages/consult/consult.less
index 68ca6ad..258a276 100644
--- a/wechat_staff/pages/consult/consult.less
+++ b/wechat_staff/pages/consult/consult.less
@@ -51,7 +51,7 @@
.active {
color: #222222;
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
}
}
@@ -61,12 +61,14 @@
align-items: center;
margin-left: 0;
.item {
- padding: 0 40rpx;
+ padding: 0 20rpx;
display: flex;
align-items: center;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #333333;
- height: 60rpx;
+ height: 68rpx;
+ margin-right: 24rpx;
+ line-height: 68rpx;
background: #F7F7F7;
border-radius: 8rpx;
margin-right: 24rpx;
@@ -74,7 +76,7 @@
.active{
color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- font-size: 24rpx;
+ font-size: 26rpx;
font-weight: 400;
}
}
diff --git a/wechat_staff/pages/consult/consult.wxss b/wechat_staff/pages/consult/consult.wxss
index 76ce9d5..61f1dd4 100644
--- a/wechat_staff/pages/consult/consult.wxss
+++ b/wechat_staff/pages/consult/consult.wxss
@@ -49,7 +49,7 @@
}
.scroll_cate .active {
color: #222222;
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
}
.second_list {
@@ -58,12 +58,13 @@
margin-left: 0;
}
.second_list .item {
- padding: 0 40rpx;
+ padding: 0 20rpx;
display: flex;
align-items: center;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #333333;
- height: 60rpx;
+ height: 68rpx;
+ line-height: 68rpx;
background: #F7F7F7;
border-radius: 8rpx;
margin-right: 24rpx;
@@ -71,7 +72,7 @@
.second_list .active {
color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- font-size: 24rpx;
+ font-size: 26rpx;
font-weight: 400;
}
.content {
diff --git a/wechat_staff/pages/index/index.js b/wechat_staff/pages/index/index.js
index 571385e..547bff8 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -129,7 +129,7 @@
},
onPageScroll(e) {
const { videoTop, windowHeight, videoPlay } = this.data
- if(e.scrollTop > videoTop - (windowHeight / 2) && videoPlay ){
+ if(e.scrollTop + 60 > videoTop - (windowHeight / 2) && videoPlay ){
this.setData({ videoPlay: false })
let videoplay = wx.createVideoContext('myvideo', this)
videoplay.play();
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 4eb902f..2ee144d 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -62,7 +62,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 muted bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
<!-- <view bindtap="videoClick" 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" mode="widthFix"></image>
diff --git a/wechat_staff/pages/kefu/index.js b/wechat_staff/pages/kefu/index.js
index 3f700ce..cda3d5c 100644
--- a/wechat_staff/pages/kefu/index.js
+++ b/wechat_staff/pages/kefu/index.js
@@ -22,9 +22,10 @@
}
},
handleShare() {
+ const { info } = this.data
wx.navigateToMiniProgram({
appId: 'wxcd2b89fd2ff065f8',
- path: `/pages/kefu/index`,
+ path: `/pages/kefu/index?title=涓撳睘瀹㈡湇&id=${info.id}`,
envVersion: 'trial'
})
},
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index 90842e3..54ccde2 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -7,6 +7,8 @@
data: {
category: [],
tagCodes: '',
+ acVid:'',
+ viewIdList: [],
dataList: [],
total: 0,
@@ -47,17 +49,30 @@
},
itemClick(e) {
const { id } = e.currentTarget.dataset.item
- const { dataList } = this.data
+ const { dataList, acVid, viewIdList } = this.data
+ const index = viewIdList.findIndex(i => i === id)
+ if(acVid){
+ if(id != acVid){
+ wx.createVideoContext(acVid).pause()
+ wx.createVideoContext(id).play()
+ this.setData({ acVid: id })
+ }
+ }else{
+ this.setData({ acVid: id })
+ wx.createVideoContext(id).play()
+ }
dataList.forEach(ite => {
- if(id === ite.id){
+ if(id === ite.id && index === -1){
ite.viewCount += 1
+ viewIdList.push(id)
+ actionDo({
+ actionType: 'view',
+ id: id
+ })
+ this.setData({ viewIdList })
}
})
this.setData({ dataList })
- actionDo({
- actionType: 'view',
- id: id
- })
},
cateClick(e) {
const { code } = e.target.dataset
diff --git a/wechat_staff/pages/productVideo/index.less b/wechat_staff/pages/productVideo/index.less
index 9075a5d..3529745 100644
--- a/wechat_staff/pages/productVideo/index.less
+++ b/wechat_staff/pages/productVideo/index.less
@@ -78,6 +78,9 @@
color: #111111;
margin: 24rpx 0 12rpx;
}
+ video{
+ border-radius: 8rpx;
+ }
.static{
font-size: 24rpx;
color: #999999;
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index 7172ace..cf98cff 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -20,7 +20,7 @@
<image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
<image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view> -->
- <video poster="{{ item.coverImage }}" data-item="{{ item }}" bindplay="itemClick" class="img_wrap" src="{{ item.videoUrl }}" show-center-play-btn show-fullscreen-btn></video>
+ <video id="{{ item.id }}" 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_staff/pages/productVideo/index.wxss b/wechat_staff/pages/productVideo/index.wxss
index bf63316..1587773 100644
--- a/wechat_staff/pages/productVideo/index.wxss
+++ b/wechat_staff/pages/productVideo/index.wxss
@@ -76,6 +76,9 @@
color: #111111;
margin: 24rpx 0 12rpx;
}
+.content .item video {
+ border-radius: 8rpx;
+}
.content .item .static {
font-size: 24rpx;
color: #999999;
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index bdf26d0..5d51470 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -31,7 +31,7 @@
},
{
"name": "",
- "pathName": "pages/detailDis/product",
+ "pathName": "pages/productVideo/index",
"query": "id=1813372914895843329",
"launchMode": "default",
"scene": null
--
Gitblit v1.9.3