From 1cee3a660c5f8e5f4290ae894c2898c4966a834d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 18:33:33 +0800
Subject: [PATCH] ''
---
wechat_jiaxuan/pages/userinfo/index.wxml | 4
wechat_staff/pages/discover/discover.wxml | 2
wechat_staff/pages/homeId/index.less | 2
wechat_jiaxuan/components/disProduct/index.less | 9
wechat_jiaxuan/pages/detailDis/product.wxml | 17 -
wechat_jiaxuan/pages/discover/discover.less | 12
wechat_staff/project.private.config.json | 4
wechat_jiaxuan/pages/discover/discover.wxss | 7
wechat_staff/pages/kefu/select.wxml | 2
wechat_staff/components/disCase/index.wxml | 4
wechat_jiaxuan/static/icon/wx.gif | 0
wechat_jiaxuan/pages/consult/detail.wxml | 16 -
wechat_staff/pages/consult/consult.wxml | 12
wechat_jiaxuan/pages/homeId/index.wxss | 3
wechat_jiaxuan/pages/consult/detail.js | 14
wechat_jiaxuan/pages/productVideo/index.js | 2
wechat_staff/components/disRealpic/index.less | 9
wechat_jiaxuan/pages/index/index.less | 82 +++-
wechat_staff/pages/homeId/index.wxss | 2
wechat_jiaxuan/components/disCase/index.wxss | 8
wechat_staff/pages/kefu/select.wxss | 4
wechat_jiaxuan/pages/userinfo/index.less | 6
wechat_staff/components/disCase/index.less | 9
wechat_staff/pages/kefu/select.less | 4
wechat_jiaxuan/pages/detailDis/case.js | 92 ++++-
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/pages/consult/consult.less | 25
wechat_staff/components/disProduct/index.wxss | 7
wechat_jiaxuan/components/disCase/index.less | 9
wechat_jiaxuan/components/disRealpic/index.wxml | 4
wechat_jiaxuan/pages/index/index.wxss | 26 +
wechat_staff/pages/discover/discover.less | 11
wechat_jiaxuan/components/disProduct/index.wxml | 4
wechat_staff/components/disRealpic/index.wxss | 8
wechat_staff/pages/productVideo/index.wxml | 9
wechat_staff/pages/consult/consult.js | 30 +
wechat_jiaxuan/pages/userinfo/index.wxss | 6
wechat_jiaxuan/pages/detailDis/realpic.js | 89 ++++-
wechat_staff/pages/discover/discover.wxss | 7
wechat_jiaxuan/components/disProduct/index.js | 7
wechat_staff/pages/index/index.wxml | 5
wechat_jiaxuan/pages/homeId/index.less | 2
wechat_jiaxuan/components/disRealpic/index.less | 10
wechat_staff/pages/kefu/fond.js | 8
wechat_staff/pages/consult/detail.js | 6
wechat_staff/components/disCase/index.wxss | 8
wechat_jiaxuan/pages/discover/discover.wxml | 2
wechat_staff/components/disProduct/index.less | 8
wechat_staff/pages/kefu/select.js | 16
wechat_staff/components/detailFooter/index.js | 13
wechat_staff/pages/consult/consult.wxss | 27
wechat_jiaxuan/pages/index/index.js | 27 +
wechat_jiaxuan/pages/auth/auth.js | 72 +++-
wechat_jiaxuan/pages/detailDis/product.js | 10
wechat_jiaxuan/pages/userinfo/index.js | 3
wechat_jiaxuan/pages/homeId/index.wxml | 6
wechat_jiaxuan/components/disCase/index.wxml | 4
wechat_staff/pages/homeId/index.wxml | 4
wechat_jiaxuan/api/index.js | 7
wechat_staff/pages/productVideo/index.js | 23
wechat_staff/components/disProduct/index.wxml | 4
wechat_jiaxuan/pages/index/index.wxml | 54 +-
wechat_jiaxuan/components/disRealpic/index.wxss | 8
wechat_jiaxuan/components/disProduct/index.wxss | 7
wechat_staff/components/disRealpic/index.wxml | 4
65 files changed, 518 insertions(+), 390 deletions(-)
diff --git a/wechat_jiaxuan/api/index.js b/wechat_jiaxuan/api/index.js
index f8a3a98..e47aae7 100644
--- a/wechat_jiaxuan/api/index.js
+++ b/wechat_jiaxuan/api/index.js
@@ -70,13 +70,6 @@
data
})
}
-// 涓彴 鍒嗕韩
-export const shareContent = (data) => {
- return request({
- url: '/web/customer/shareContent',
- data
- })
-}
// 蹇楄瑁呬慨 鍐呭
export const pageZSZXContentList = (data) => {
return request({
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index b8b7ee2..ea5382d 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -17,20 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
}
-
-.home_top{
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content{
height: 100%;
- padding-top: 120rpx;
.query_wrap_scroll{
width: 750rpx;
padding: 0 40rpx;
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index d5d6dd4..53beed2 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -1,12 +1,12 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 65dbd4f..22d6cb0 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -17,19 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
height: 100%;
- padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
width: 750rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 396306d..c67db66 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -24,7 +24,8 @@
total: 0,
query: '',
sortType: '',
- catalogCode: ""
+ catalogCode: "",
+ scrollTop: 0
},
pageLifetimes: {
show: function() {
@@ -120,10 +121,6 @@
icon: 'none'
})
}
- },
- scrolltoupper() {
- this.setData({ pageNum: 1, datalist: [], total: 0 })
- this.getList()
},
cateClick(e) {
var {isLoading} = this.data
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 7de0910..50bfd4d 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -10,7 +10,6 @@
display: flex;
align-items: center;
background-color: #F7F7F7;
-
image {
width: 28rpx;
height: 28rpx;
@@ -27,16 +26,8 @@
}
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
-
.main_content {
display: flex;
- padding-top: 120rpx;
height: 100%;
.main_left {
width: 160rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index f9d1c5d..0c14b19 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -1,11 +1,11 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="main_left" enable-flex scroll-y>
<!-- <view class="main_left"> -->
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 973eeca..7a1475a 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -22,15 +22,8 @@
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
display: flex;
- padding-top: 120rpx;
height: 100%;
}
.main_content .main_left {
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 4ccc41d..8e7cc8e 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -15,24 +15,16 @@
margin-right: 16rpx;
}
}
-
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
}
-.home_top{
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content{
height: 100%;
- padding-top: 120rpx;
-
.query_wrap_scroll {
width: 750rpx;
padding: 0 40rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 1985f82..cd3c2ee 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -1,5 +1,5 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
@@ -7,7 +7,7 @@
</view>
<!-- -->
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 9cce23e..3d093ee 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -17,19 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
height: 100%;
- padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
width: 750rpx;
diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index e15e1e1..cbc6b96 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -18,7 +18,7 @@
privacyHtml: '',
activeHtml: ''
},
- initData(){
+ initData() {
var app = getApp().globalData
this.setData({
bottomLift: app.bottomLift
@@ -43,48 +43,72 @@
handleJudge(e) {
const flag = e.currentTarget.dataset.flag
console.log(e);
- this.setData({ agreementFalg: flag, showModal: false })
+ this.setData({
+ agreementFalg: flag,
+ showModal: false
+ })
},
loginIn() {
- const { agreementFalg } = this.data
- if(!agreementFalg) return wx.showToast({
+ const {
+ agreementFalg
+ } = this.data
+ if (!agreementFalg) return wx.showToast({
title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
icon: 'none',
duration: 2000
})
},
- getPhoneNumber (e) {
+ getPhoneNumber(e) {
console.log(e.detail)
console.log(e.detail.iv)
console.log(e.detail.encryptedData)
- const data = { ...e.detail }
- getWxMiniPhone({
- encryptedData: data.encryptedData,
- iv: data.iv,
- sessionKey: wx.getStorageSync('sessionKey') || data.iv,
- }).then(res => {
- binDingPhone({
- phone: res.data
- }).then((res) => {
- if(res.code == 200){
- wx.setStorageSync('member', res.data)
- wx.navigateBack()
- }
+ const data = {
+ ...e.detail
+ }
+ if (e.detail && e.detail.iv) {
+ getWxMiniPhone({
+ encryptedData: data.encryptedData,
+ iv: data.iv,
+ sessionKey: wx.getStorageSync('sessionKey') || data.iv,
+ }).then(res => {
+ binDingPhone({
+ phone: res.data
+ }).then((res) => {
+ if (res.code == 200) {
+ const tempPath = wx.getStorageSync('tempPath') || ''
+ wx.setStorageSync('member', res.data)
+ if (tempPath) {
+ wx.redirectTo({
+ url: tempPath,
+ })
+ } else {
+ wx.navigateBack()
+ }
+ }
+ })
})
- })
+ }
+
},
- onOpen(e){
+ onOpen(e) {
console.log('e', e);
- const { serviceHtml, privacyHtml } = this.data
- const { index } = e.target.dataset
+ const {
+ serviceHtml,
+ privacyHtml
+ } = this.data
+ const {
+ index
+ } = e.target.dataset
let activeHtml = index == '0' ? serviceHtml : privacyHtml
this.setData({
activeHtml,
showModal: true
})
},
- onClose(){
- this.setData({showModal: false})
+ onClose() {
+ this.setData({
+ showModal: false
+ })
},
agreementChange(e) {
this.setData({
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index fd00085..0f8df05 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -1,4 +1,4 @@
-import { shareContent, getProductNewsInfo } from '../../api/index'
+import { actionDo, getProductNewsInfo } from '../../api/index'
Page({
/**
@@ -51,15 +51,11 @@
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- shareContent(this.data.info.id)
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
},
- // onShareAppMessage: function () {
- // // let { productDetail, userInfo } = this.data
- // return {
- // title: productDetail.title,
- // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
- // }
- // },
onClose() {
this.setData({showShare: false})
},
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index b92ee1c..ec4f9e2 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -28,20 +28,4 @@
</view>
</view>
</view>
- <!-- -->
- <van-popup position="bottom" show="{{ showShare }}" bind:close="onClose">
- <view class="share_modal">
- <view class="btns">
- <button open-type="share" class="item" bindtap="handleShare">
- <image src="../../static/icon/wechat.png"></image>
- <view>鍙戦�佸ソ鍙�</view>
- </button>
- <button class="item">
- <image src="../../static/icon/download.png"></image>
- <view>涓嬭浇娴锋姤</view>
- </button>
- </view>
- <view bindtap="onClose" class="cancel">鍙栨秷</view>
- </view>
- </van-popup>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index 4d8e372..b5a3cb3 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -1,5 +1,10 @@
-import { actionDo, getWholecaseInfo } from '../../api/index'
-import { eventBus } from '../../utils/eventBus'
+import {
+ actionDo,
+ getWholecaseInfo
+} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
/**
@@ -10,7 +15,7 @@
origin: '',
showShare: false
},
- onLoadLogin(options){
+ onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
@@ -28,40 +33,60 @@
this.setData({
bottomLift: app.bottomLift
})
-
- if(options.origin && options.origin == 'b'){
- this.setData({ origin: 'b' })
+
+ if (options.origin && options.origin == 'b') {
+ this.setData({
+ origin: 'b'
+ })
}
const member = wx.getStorageSync('member')
- this.setData({id: options.id, member})
+ this.setData({
+ id: options.id,
+ member
+ })
},
- priviewFull(){
- let { panorama: link, title } = this.data.info
+ priviewFull() {
+ let {
+ panorama: link,
+ title
+ } = this.data.info
wx.navigateTo({
url: '/pages/webView/index',
- success: function(res) {
+ success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link, title })
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link,
+ title
+ })
}
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({
+ showShare: true
+ })
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- actionDo({ actionType: 'share', id: this.data.info.id })
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
},
onShareAppMessage: function () {
- let { info } = this.data
+ let {
+ info
+ } = this.data
console.log('鐐瑰嚮浜嗗垎浜�')
return {
path: '/pages/detailDis/case?id=' + info.id + '&userId=' + info.users.id
}
},
- handleAction(e){
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const { info } = this.data
+ const {
+ info
+ } = this.data
const member = wx.getStorageSync('member')
if (member.authStatus == '0') {
return wx.navigateTo({
@@ -73,7 +98,9 @@
id: this.data.info.id
}).then(res => {
info.isCollection = !info.isCollection
- this.setData({info})
+ this.setData({
+ info
+ })
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
icon: "none"
@@ -88,18 +115,32 @@
priviewSpace(e) {
const url = e.currentTarget.dataset.url
const index = e.currentTarget.dataset.index
- const { info } = this.data
+ 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 })
+ getWholecaseInfo({
+ id,
+ salesId: userId || null
+ }).then(res => {
+ this.setData({
+ info: res.data
+ })
wx.setNavigationBarTitle({
title: res.data.title
- })
+ })
+ if (userId) {
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
+ })
+ }
})
},
handleDesign() {
@@ -109,11 +150,16 @@
},
playVideo() {
wx.previewMedia({
- sources: [{ url: this.data.info.video, type: 'video' }]
+ sources: [{
+ url: this.data.info.video,
+ type: 'video'
+ }]
})
},
onClose() {
- this.setData({showShare: false})
+ this.setData({
+ showShare: false
+ })
},
/**
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 4c4970b..45c126b 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -107,9 +107,13 @@
wx.setNavigationBarTitle({
title: res.data.title
})
- getMemberInfo().then(res => {
- this.setData({ member: res.data })
- })
+ if(userId){
+ getMemberInfo().then(res => {
+ this.setData({ member: res.data })
+ })
+ }else{
+ this.setData({ member: wx.getStorageSync('member') })
+ }
})
},
playVideo() {
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index f5bb0eb..3de3cca 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -74,20 +74,5 @@
</view>
</view>
</view>
- <!-- -->
- <van-popup position="bottom" show="{{ showShare }}" bind:close="onClose">
- <view class="share_modal">
- <view class="btns">
- <button open-type="share" class="item" bindtap="handleShare">
- <image src="../../static/icon/wechat.png"></image>
- <view>鍙戦�佸ソ鍙�</view>
- </button>
- <button class="item" bindtap="handleDown">
- <image src="../../static/icon/download.png"></image>
- <view>涓嬭浇娴锋姤</view>
- </button>
- </view>
- <view bindtap="onClose" class="cancel">鍙栨秷</view>
- </view>
- </van-popup>
+
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index adf82fa..c2c1b6f 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -1,5 +1,10 @@
-import { getRealcaseInfo, actionDo } from '../../api/index'
-import { eventBus } from '../../utils/eventBus'
+import {
+ getRealcaseInfo,
+ actionDo
+} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
data: {
bottomLift: 0,
@@ -10,7 +15,7 @@
showShare: false
},
- onLoadLogin(options){
+ onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
@@ -28,15 +33,22 @@
this.setData({
bottomLift: app.bottomLift
})
- if(options.origin && options.origin == 'b'){
- this.setData({ origin: 'b' })
+ if (options.origin && options.origin == 'b') {
+ this.setData({
+ origin: 'b'
+ })
}
const member = wx.getStorageSync('member')
- this.setData({id: options.id, member})
+ this.setData({
+ id: options.id,
+ member
+ })
},
- handleAction(e){
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const { info } = this.data
+ const {
+ info
+ } = this.data
const member = wx.getStorageSync('member')
if (member.authStatus == '0') {
return wx.navigateTo({
@@ -52,20 +64,36 @@
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
icon: "none"
})
- this.setData({info})
+ this.setData({
+ info
+ })
})
},
getDetail(id, userId) {
- getRealcaseInfo({id, salesId: userId || null}).then(res => {
- this.setData({ info: res.data })
+ getRealcaseInfo({
+ id,
+ salesId: userId || null
+ }).then(res => {
+ this.setData({
+ info: res.data
+ })
wx.setNavigationBarTitle({
title: res.data.title
- })
+ })
+ if (userId) {
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
+ })
+ }
})
},
priviewSpace(e) {
const url = e.currentTarget.dataset.url
- const { info } = this.data
+ const {
+ info
+ } = this.data
wx.previewImage({
urls: info.contentImgList,
current: url
@@ -73,11 +101,17 @@
},
playVideo() {
wx.previewMedia({
- sources: [{ url: this.data.info.video, type: 'video' }]
+ sources: [{
+ url: this.data.info.video,
+ type: 'video'
+ }]
})
},
bannerbindload(e) {
- const { height, width } = e.detail
+ const {
+ height,
+ width
+ } = e.detail
let activeHeight = height * 670 / width
this.setData({
bannerHeight: activeHeight
@@ -89,11 +123,16 @@
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({
+ showShare: true
+ })
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- actionDo({ actionType: 'share', id: this.data.info.id })
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
// shareContent({id: this.data.info.id || this.data.id}).then(res => {
// this.setData({showShare: false})
// })
@@ -106,10 +145,14 @@
// }
// },
onClose() {
- this.setData({showShare: false})
+ this.setData({
+ showShare: false
+ })
},
handleDown() {
- let { info } = this.data
+ let {
+ info
+ } = this.data
wx.showToast({
title: '涓嬭浇涓�',
icon: 'loading'
@@ -117,7 +160,7 @@
console.log('info.picUrls', info)
wx.downloadFile({
url: info.picUrls,
- success (res) {
+ success(res) {
// console.log(res)
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
@@ -136,7 +179,7 @@
}
})
},
- fail (err) {
+ fail(err) {
console.log(err.errMsg)
wx.showToast({
title: '涓嬭浇澶辫触',
@@ -155,7 +198,9 @@
},
onShareAppMessage: function () {
- let { info } = this.data
+ let {
+ info
+ } = this.data
console.log('鐐瑰嚮浜嗗垎浜�')
return {
path: '/pages/detailDis/realpic?id=' + info.id + '&userId=' + info.users.id
diff --git a/wechat_jiaxuan/pages/discover/discover.less b/wechat_jiaxuan/pages/discover/discover.less
index 06df3a0..42ae6e0 100644
--- a/wechat_jiaxuan/pages/discover/discover.less
+++ b/wechat_jiaxuan/pages/discover/discover.less
@@ -3,7 +3,6 @@
display: flex;
align-items: center;
padding: 0 40rpx;
- // border: 1px solid red;
.item{
width: 76rpx;
font-size: 32rpx;
@@ -26,12 +25,13 @@
}
}
.home_tab{
- position: fixed;
z-index: 999;
width: 100%;
background-color: #fff;
}
-
-// .main_content{
-// padding-top: 200rpx;
-// }
\ No newline at end of file
+.container{
+ height: 100vh;
+ .main_content{
+ overflow: hidden;
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 9aa518a..9867ed1 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -17,7 +17,7 @@
</view>
</view>
<!-- -->
- <view class="main_content" style="height: 100vh">
+ <view class="main_content" style="height: calc( 100% - {{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px );">
<disProduct menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'product_intro' }}" />
<disCase menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'whole_case' }}" />
<disRealpic menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'real_case' }}" />
diff --git a/wechat_jiaxuan/pages/discover/discover.wxss b/wechat_jiaxuan/pages/discover/discover.wxss
index 9ac8a0c..748d000 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxss
+++ b/wechat_jiaxuan/pages/discover/discover.wxss
@@ -24,8 +24,13 @@
background: linear-gradient(270deg, rgba(255, 255, 255, 0.56) 0%, rgba(206, 144, 111, 0.88) 100%);
}
.home_tab {
- position: fixed;
z-index: 999;
width: 100%;
background-color: #fff;
}
+.container {
+ height: 100vh;
+}
+.container .main_content {
+ overflow: hidden;
+}
diff --git a/wechat_jiaxuan/pages/homeId/index.less b/wechat_jiaxuan/pages/homeId/index.less
index c84a6df..3701217 100644
--- a/wechat_jiaxuan/pages/homeId/index.less
+++ b/wechat_jiaxuan/pages/homeId/index.less
@@ -59,7 +59,7 @@
}
}
.content{
- padding: 80rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
.item{
margin-bottom: 60rpx;
.img{
diff --git a/wechat_jiaxuan/pages/homeId/index.wxml b/wechat_jiaxuan/pages/homeId/index.wxml
index 0fd5ff0..895adcc 100644
--- a/wechat_jiaxuan/pages/homeId/index.wxml
+++ b/wechat_jiaxuan/pages/homeId/index.wxml
@@ -1,15 +1,15 @@
<view class="container">
<!-- 鍒嗙被 -->
- <view class="home_tabs">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+ <view wx:if="{{ tagList && tagList.length > 0 }}" class="home_tabs">
+ <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelValueCode}}" wx:for="{{ tagList }}" class="item {{ tagCodes == item.labelValueCode ? 'active': '' }}">{{ item.labelValueName }}</view>
</view>
</scroll-view>
</view>
<!-- content -->
- <view class="content">
+ <view class="content" style="padding-top: {{ tagList && tagList.length > 0 ? 80 : 0 }}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/homeId/index.wxss b/wechat_jiaxuan/pages/homeId/index.wxss
index 08b9f05..e74c5a6 100644
--- a/wechat_jiaxuan/pages/homeId/index.wxss
+++ b/wechat_jiaxuan/pages/homeId/index.wxss
@@ -2,7 +2,6 @@
background-color: #fff;
}
.home_tabs {
- width: 100%;
height: 80rpx;
position: fixed;
background-color: #fff;
@@ -56,7 +55,7 @@
font-weight: 400;
}
.content {
- padding: 80rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
}
.content .item {
margin-bottom: 60rpx;
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 710f6ed..8c5d047 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -12,6 +12,7 @@
eventBus
} from '../../utils/eventBus'
const app = getApp()
+var touchDot = 0; //瑙︽懜鏃剁殑鍘熺偣
Page({
/**
@@ -21,6 +22,8 @@
// 椤堕儴nav
topHeadStyle: 1,
top: 0,
+ open: false,
+ desc: true,
font_color: '#ffffff',
ZSZXCata: {},
@@ -56,6 +59,10 @@
// 宸茬粡鐧诲綍锛屽彲浠ヨ蛋渚濊禆token鐨勯�昏緫浜�
console.log('棣栭〉鐨刼nLoadLogin', options, `{"token":"${app.globalData.token}"}`);
this.initData()
+ const member = wx.getStorageSync('member')
+ this.setData({
+ member
+ })
},
onReady() {
const windowInfo = wx.getWindowInfo()
@@ -75,7 +82,6 @@
this.setData({
member
})
-
eventBus.once("reloadHome", () => {
console.log('reloadHome');
this.onLoad()
@@ -121,6 +127,7 @@
url: '/pages/design/design'
})
} else {
+ wx.setStorageSync('tempPath', '/pages/auth/auth')
wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -375,6 +382,24 @@
id
})
},
+ hdBtn() {
+ this.setData({ showWhiteHead: true, open: true,font_color: "#000000", sty: '',topHeadStyle: 1, desc: false })
+ },
+ touchStart: function (e) {
+ touchDot = e.touches[0].pageY;
+ },
+ touchMove: function (e) {
+ var touchMove = e.touches[0].pageY;
+ if (touchMove - touchDot <= 0 && this.data.top <= 1 && this.data.desc) {
+ this.setData({ showWhiteHead: true, open: false, desc: false })
+ setTimeout(() => {
+ this.setData({ open: true, sty: '' })
+ }, 1000)
+ }
+ if (touchMove - touchDot >= 50 && this.data.top <= 1 && !this.data.desc) {
+ this.setData({ showWhiteHead: false, open: false, desc: true, sty: 'overflow: hidden;' })
+ }
+ },
onPageScroll(e) {
const { videoTop, windowHeight, videoPlay } = this.data
if(e.scrollTop - 100 > videoTop - (windowHeight / 2) && videoPlay ){
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 15cd49b..df4c5cd 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -4,37 +4,62 @@
overflow-x: hidden;
min-height: 100vh;
- .banner_swiper {
- height: 600rpx;
+ .banner-bax {
+ position: relative;
width: 100%;
-
- image {
+ margin: 0 auto 0;
+ .banner_swiper {
+ transition: height 1s;
+ height: 100vh;
width: 100%;
- height: 100%;
- display: block;
+
+ image {
+ width: 100%;
+ height: 100%;
+ display: block;
+ }
+ }
+ .on{
+ height: calc(100vh - 300rpx);
}
}
+ .wxImg {
+ width: 54rpx;
+ height: 54rpx;
+ display: block;
+ position: absolute;
+ bottom: 50rpx;
+ left: 50%;
+ z-index: 1;
+ margin-left: -27rpx;
+ }
+
+
.consult_swiper {
width: 100%;
+
image {
width: 670rpx;
height: 376rpx;
}
- .scroll_text{
+
+ .scroll_text {
height: 100rpx;
width: 670rpx;
white-space: nowrap;
- overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ overflow: hidden; //鏂囨湰瓒呭嚭闅愯棌
text-overflow: ellipsis;
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;
@@ -43,13 +68,15 @@
margin-left: -16rpx;
border-radius: 5rpx;
}
-
+
.wx-swiper-dot.wx-swiper-dot-active {
background: #666666;
}
}
- .consult_wrap{
+
+ .consult_wrap {
height: 476rpx;
+
.wx-swiper-dots.wx-swiper-dots-horizontal {
position: absolute;
right: 0;
@@ -64,6 +91,7 @@
align-items: center;
padding: 0 0 60rpx;
background-color: #fff;
+
.logo {
width: 246rpx;
}
@@ -74,6 +102,7 @@
right: 28rpx;
bottom: 60rpx;
width: 146rpx;
+ height: 146rpx;
}
.function_wrap {
@@ -82,6 +111,7 @@
justify-content: space-between;
background-color: #fff;
padding: 40rpx;
+
.item {
width: 214rpx;
height: 232rpx;
@@ -118,6 +148,7 @@
.product_video {
padding: 34rpx 40rpx 44rpx;
background-color: #fff;
+
.video_wrap {
width: 670rpx;
position: relative;
@@ -137,7 +168,8 @@
height: 376rpx;
}
}
- video{
+
+ video {
width: 100%;
}
@@ -146,14 +178,17 @@
.strategy {
padding: 44rpx 40rpx;
background: #F7F7F7;
- .item{
+
+ .item {
position: relative;
+
image {
width: 100%;
height: 100%;
position: absolute;
}
- text{
+
+ text {
color: #fff;
position: absolute;
bottom: 40rpx;
@@ -162,27 +197,28 @@
font-weight: 500;
}
}
-
+
.line {
display: flex;
justify-content: space-between;
-
+
.line_left {
width: 324rpx;
height: 340rpx;
}
-
+
.line_right {
.item {
width: 322rpx;
height: 160rpx;
+
&:nth-last-child(1) {
margin-top: 20rpx;
}
}
}
}
-
+
.home_id {
width: 670rpx;
height: 240rpx;
@@ -207,16 +243,19 @@
align-items: center;
width: 670rpx;
margin-bottom: 42rpx;
+
.left {
font-weight: 600;
font-size: 34rpx;
color: #111111;
line-height: 34rpx;
flex: 1;
+
.name {
display: flex;
align-items: center;
margin-bottom: 10rpx;
+
.icon {
width: 36rpx;
height: 36rpx;
@@ -238,10 +277,12 @@
}
}
-.auth{
+
+.auth {
background-color: #fff;
}
-.home_title{
+
+.home_title {
font-weight: 600;
font-size: 38rpx;
}
@@ -259,5 +300,4 @@
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 4572292..41b71a2 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -11,16 +11,19 @@
<van-nav-bar wx:else border="{{ topHeadBorder }}" custom-class="top-head-transparent" fixed>
<view slot="left" class="flex-cc search">
<text class="home_title" style="color: {{font_color}};">蹇楅偊瀹堕��</text>
- </view>
+ </view>茠
</van-nav-bar>
<!-- banner杞挱 -->
- <swiper class="banner_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{bannerImgHeight}}rpx" duration="{{ bannerSwiperOption.duration }}">
- <block wx:for="{{ bannerList }}" wx:key="index">
- <swiper-item>
- <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" bindload="bannerbindload" mode="widthFix" src="{{ item.coverImage }}"></image>
- </swiper-item>
- </block>
- </swiper>
+ <view class="banner-bax">
+ <image wx:if="{{ !showWhiteHead }}" src="/static/icon/wx.gif" class="wxImg" mode="widthFix" bindtap="hdBtn"></image>
+ <swiper class="banner_swiper {{showWhiteHead?'on':''}}" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
+ <block wx:for="{{ bannerList }}" wx:key="index">
+ <swiper-item>
+ <image data-item="{{ item }}" data-id="{{ item.id }}" bindtap="bannerClick" mode="aspectFill" src="{{ item.coverImage }}"></image>
+ </swiper-item>
+ </block>
+ </swiper>
+ </view>
<!-- -->
<view class="function_wrap">
<view class="item" data-type="0" bindtap="changePath">
@@ -89,10 +92,9 @@
</view>
</view>
</view>
- <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
+ <!-- <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
<image src="{{HOME_CLASS_C}}"></image>
- <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
- </view>
+ </view> -->
</view>
<!-- 鍜ㄨ -->
<view class="consult">
@@ -107,13 +109,13 @@
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
<swiper class="consult_swiper consult_wrap" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
- <block wx:for="{{ consultList }}" wx:key="index">
- <swiper-item data-id="{{ item }}" bindtap="consultClick">
- <image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
- <view class="scroll_text">{{ item.title }}</view>
- </swiper-item>
- </block>
- </swiper>
+ <block wx:for="{{ consultList }}" wx:key="index">
+ <swiper-item data-id="{{ item }}" bindtap="consultClick">
+ <image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
+ <view class="scroll_text">{{ item.title }}</view>
+ </swiper-item>
+ </block>
+ </swiper>
</view>
<!-- service -->
<view class="consult">
@@ -127,18 +129,18 @@
</view>
</view>
<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>
- </swiper-item>
- </block>
- </swiper>
+ <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>
+ </swiper-item>
+ </block>
+ </swiper>
</view>
<!-- logo -->
<view class="logo_wrap">
<image src="../../static/icon/home_logo@2x.png" class="logo" mode="widthFix"></image>
</view>
<!-- active -->
- <image class="active_baoming" data-type="2" bindtap="changePath" src="../../static/icon/ic_float_baoming@2x.png" mode="widthFix"></image>
-<videoPlay class="videoPlay"/>
+ <image class="active_baoming" data-type="2" bindtap="changePath" src="../../static/icon/ic_float_baoming@2x.png"></image>
+ <videoPlay class="videoPlay" />
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index d890b43..2328805 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -4,14 +4,33 @@
overflow-x: hidden;
min-height: 100vh;
}
-.container .banner_swiper {
- height: 600rpx;
+.container .banner-bax {
+ position: relative;
+ width: 100%;
+ margin: 0 auto 0;
+}
+.container .banner-bax .banner_swiper {
+ transition: height 1s;
+ height: 100vh;
width: 100%;
}
-.container .banner_swiper image {
+.container .banner-bax .banner_swiper image {
width: 100%;
height: 100%;
display: block;
+}
+.container .banner-bax .on {
+ height: calc(100vh - 300rpx);
+}
+.container .wxImg {
+ width: 54rpx;
+ height: 54rpx;
+ display: block;
+ position: absolute;
+ bottom: 50rpx;
+ left: 50%;
+ z-index: 1;
+ margin-left: -27rpx;
}
.container .consult_swiper {
width: 100%;
@@ -69,6 +88,7 @@
right: 28rpx;
bottom: 60rpx;
width: 146rpx;
+ height: 146rpx;
}
.container .function_wrap {
width: 100%;
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 46298e4..365508d 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.item
+ const { id} = e.currentTarget.dataset.item
const { dataList } = this.data
dataList.forEach(ite => {
if(id === ite.id){
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
index c4c145d..34e0e04 100644
--- a/wechat_jiaxuan/pages/userinfo/index.js
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -86,9 +86,6 @@
title: '淇濆瓨鎴愬姛',
icon: 'none'
})
- setTimeout(() => {
- wx.navigateBack()
- }, 500)
})
},
initData() {
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
index cbd07f8..f3a9d1b 100644
--- a/wechat_jiaxuan/pages/userinfo/index.less
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -41,6 +41,12 @@
flex: 1;
}
}
+ .df_ac{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 480rpx;
+ }
.label{
width: 110rpx;
font-size: 30rpx;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 3c98730..951f6b7 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -42,8 +42,8 @@
<view class="line">
<view class="label">鍦板潃</view>
<view class="val" bindtap="changeAddr">
- <view class="df_ac" wx:if="{{address}}">{{ address }}</view>
- <view class="df_ac placeholder9">璇烽�夋嫨鍦板潃</view>
+ <view class="df_ac" wx:if="{{address}}">{{ address }}{{ address }}</view>
+ <view wx:else class="df_ac placeholder9">璇烽�夋嫨鍦板潃</view>
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
index f7d4173..c5d99dc 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxss
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -43,6 +43,12 @@
.list .line .picker .text {
flex: 1;
}
+.list .line .df_ac {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 480rpx;
+}
.list .line .label {
width: 110rpx;
font-size: 30rpx;
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 6d3511e..1573b90 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
},
{
"name": "",
- "pathName": "pages/productVideo/index",
+ "pathName": "pages/detailDis/product",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_jiaxuan/static/icon/wx.gif b/wechat_jiaxuan/static/icon/wx.gif
new file mode 100644
index 0000000..6116145
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/wx.gif
Binary files differ
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index 6d78a1a..7991f46 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -1,5 +1,6 @@
import {
- getContentShareImg
+ getContentShareImg,
+ actionDo
} from '../../api/index'
Component({
/**
@@ -37,6 +38,10 @@
'/pages/consult/detail',//璧勮璇︽儏
]
const { info, path} = this.data
+ actionDo({
+ actionType: 'share',
+ id: info.id
+ })
wx.navigateToMiniProgram({
appId: 'wxcd2b89fd2ff065f8',
path: `${map[path]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
@@ -67,7 +72,7 @@
info,
path
} = this.data
- let that = this
+
getContentShareImg({
articleId: `${info.id}_${path}`,
type: '0',
@@ -128,6 +133,10 @@
wx.setStorageSync('downloadConfig', {
path: this.data.path,id: this.data.info.id
})
+ actionDo({
+ actionType: 'download',
+ id: this.data.info.id
+ })
wx.navigateTo({
url: '/pages/download/index',
}, 1000)
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index fcdb3c7..dd507b5 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -17,20 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
}
-
-.home_top{
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content{
height: 100%;
- padding-top: 120rpx;
.query_wrap_scroll{
width: 750rpx;
padding: 0 40rpx;
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 79f64e4..85dd8a4 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -1,12 +1,12 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index cb42fb8..8e783b7 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -17,19 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
height: 100%;
- padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
width: 750rpx;
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 69ffc37..b531431 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -27,16 +27,8 @@
}
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
-
.main_content {
display: flex;
- padding-top: 120rpx;
height: 100%;
.main_left {
width: 160rpx;
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index cf5b378..bb5bfd9 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -1,11 +1,11 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="main_left" enable-flex scroll-y>
<!-- <view class="main_left"> -->
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 37cd93e..79f1f9f 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -22,15 +22,8 @@
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
display: flex;
- padding-top: 120rpx;
height: 100%;
}
.main_content .main_left {
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index d509c70..f306d69 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -15,23 +15,16 @@
margin-right: 16rpx;
}
}
-
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
}
-.home_top{
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content{
height: 100%;
- padding-top: 120rpx;
.query_wrap_scroll {
width: 750rpx;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index f10a0d9..60aca1f 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -1,5 +1,5 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
@@ -7,7 +7,7 @@
</view>
<!-- -->
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index b7793c6..e811af7 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -17,19 +17,13 @@
.app {
height: 100%;
width: 100%;
+ overflow-y: hidden;
}
.app .home_content {
height: 100%;
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
.main_content {
height: 100%;
- padding-top: 120rpx;
}
.main_content .query_wrap_scroll {
width: 750rpx;
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index 26539bb..b1f84a0 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -1,4 +1,5 @@
import { getZhongTaiProductNewsPage, getCatalogList,actionDo,refreshEnjoy } from '../../api/index'
+let touchDot = 0
Page({
/**
@@ -7,6 +8,7 @@
data: {
category: [],
secondCategory: [],
+ showCate: true,
catalogCode: '',
tagCode: '',
@@ -15,6 +17,7 @@
total: 0,
pageNum: 1,
pageSize: 10,
+ scrollTop: 0
// height: 0,
// top: 0,
@@ -22,12 +25,12 @@
onLoad(options) {
this.getCate()
},
- onReachBottom() {
+ bindscrolltolower() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
if(total > dataList.length){
this.setData({ pageNum: pageNum + 1 })
- this.getList()
+ this.getList(false)
}else{
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
@@ -80,7 +83,7 @@
})
}
},
- getList() {
+ getList(showCate = true) {
const { pageNum, pageSize, catalogCode, tagCode, query } = this.data
getZhongTaiProductNewsPage({
pageNum, pageSize, query, catalogCode: tagCode || catalogCode
@@ -88,7 +91,8 @@
if(res.data){
this.setData({
dataList: [ ...this.data.dataList, ...res.data.records ],
- total: res.data.total
+ total: res.data.total,
+ showCate
})
}
@@ -119,10 +123,20 @@
onReady() {
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
+ touchstart(e){
+ // touchDot = e.touches[0].pageY;
+ console.log('寮�濮�', e);
+ },
+ touchmove(e) {
+ // var touchMove = e.touches[0].pageY;
+ console.log('touchMove', e);
+ // if(touchDot - touchMove > 60){
+ // this.setData({ showCate: false })
+ // }
+ // if(touchMove - touchDot > 60){
+ // this.setData({ showCate: true })
+ // }
+ },
onShow() {
refreshEnjoy(this)
},
diff --git a/wechat_staff/pages/consult/consult.less b/wechat_staff/pages/consult/consult.less
index 14e1a4b..411ce20 100644
--- a/wechat_staff/pages/consult/consult.less
+++ b/wechat_staff/pages/consult/consult.less
@@ -1,8 +1,10 @@
.container {
background-color: #fff;
}
+page{
+ overflow: hidden;
+}
.home_top{
- position: fixed;
width: 100%;
z-index: 99;
top: 0;
@@ -11,17 +13,13 @@
.cate_wrap{
background-color: #fff;
.cate_one{
- position: fixed;
- top: 96rpx;
background-color: #fff;
- width: 100%;
}
.cate_two{
- position: fixed;
- top: 156rpx;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
background-color: #fff;
- padding-top: 30rpx;
- width: 100%;
}
}
.search_wrap{
@@ -40,9 +38,9 @@
}
.scroll_cate {
display: flex;
- align-items: center;
+ line-height: 88rpx;
margin-left: 40rpx;
- height: 60rpx;
+ height: 88rpx;
.item {
margin-right: 54rpx;
color: #666666;
@@ -57,6 +55,8 @@
}
.second_list {
+ display: flex;
+ align-items: center;
.item {
padding: 0 40rpx;
display: flex;
@@ -69,14 +69,15 @@
margin-right: 24rpx;
}
.active{
- background-color: var(--themeColor);
+ background: rgba(176,135,113,0.08);
color: #fff;
font-size: 24rpx;
font-weight: 400;
}
}
.content{
- padding: 260rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
+ height: calc( 100vh - 200rpx );
.item{
margin-bottom: 60rpx;
.img{
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index 287470e..40f45e0 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -10,15 +10,15 @@
</view>
<!-- 鍒嗙被 -->
<view class="cate_wrap">
- <view class="cate_one">
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+ <view wx:if="{{ category && category.length > 0 }}" class="cate_one">
+ <scroll-view scroll-x="true">
<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;">
+ <view wx:if="{{showCate && secondCategory && secondCategory.length > 0}}" class="cate_two">
+ <scroll-view scroll-x="true">
<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>
@@ -26,7 +26,7 @@
</view>
</view>
<!-- content -->
- <view class="content" style="padding-top: {{ secondCategory.length > 0 ? 276 : 186 }}rpx;">
+ <scroll-view scroll-y enhanced class="content" bindscrolltolower="bindscrolltolower" binddragging="touchmove" binddragstart="touchstart">
<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>
@@ -41,6 +41,6 @@
<view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
<image class="default_empty" src="../../static/images/default_empty.png"></image>
</view>
- </view>
+ </scroll-view>
</view>
<wxs module="format" src="../../utils/format.wxs"></wxs>
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/consult.wxss b/wechat_staff/pages/consult/consult.wxss
index f8dba92..0d487c1 100644
--- a/wechat_staff/pages/consult/consult.wxss
+++ b/wechat_staff/pages/consult/consult.wxss
@@ -1,8 +1,10 @@
.container {
background-color: #fff;
}
+page {
+ overflow: hidden;
+}
.home_top {
- position: fixed;
width: 100%;
z-index: 99;
top: 0;
@@ -12,17 +14,13 @@
background-color: #fff;
}
.cate_wrap .cate_one {
- position: fixed;
- top: 96rpx;
background-color: #fff;
- width: 100%;
}
.cate_wrap .cate_two {
- position: fixed;
- top: 156rpx;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
background-color: #fff;
- padding-top: 30rpx;
- width: 100%;
}
.search_wrap {
width: 670rpx;
@@ -40,9 +38,9 @@
}
.scroll_cate {
display: flex;
- align-items: center;
+ line-height: 88rpx;
margin-left: 40rpx;
- height: 60rpx;
+ height: 88rpx;
}
.scroll_cate .item {
margin-right: 54rpx;
@@ -53,6 +51,10 @@
color: #222222;
font-weight: 500;
font-size: 30rpx;
+}
+.second_list {
+ display: flex;
+ align-items: center;
}
.second_list .item {
padding: 0 40rpx;
@@ -66,13 +68,14 @@
margin-right: 24rpx;
}
.second_list .active {
- background-color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
color: #fff;
font-size: 24rpx;
font-weight: 400;
}
.content {
- padding: 260rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
+ height: calc(100vh - 200rpx);
}
.content .item {
margin-bottom: 60rpx;
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index 7d9f427..55ba4f7 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -1,4 +1,4 @@
-import { shareContent, getProductNewsInfo } from '../../api/index'
+import { shareContent, getProductNewsInfo, actionDo } from '../../api/index'
Page({
/**
@@ -23,6 +23,10 @@
this.getDetail(options.id)
},
handleDesign() {
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
wx.navigateToMiniProgram({
appId: 'wxcd2b89fd2ff065f8',
path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
diff --git a/wechat_staff/pages/discover/discover.less b/wechat_staff/pages/discover/discover.less
index 06df3a0..a8e0597 100644
--- a/wechat_staff/pages/discover/discover.less
+++ b/wechat_staff/pages/discover/discover.less
@@ -26,12 +26,13 @@
}
}
.home_tab{
- position: fixed;
z-index: 999;
width: 100%;
background-color: #fff;
}
-
-// .main_content{
-// padding-top: 200rpx;
-// }
\ No newline at end of file
+.container{
+ height: 100vh;
+ .main_content{
+ overflow: hidden;
+ }
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/discover/discover.wxml b/wechat_staff/pages/discover/discover.wxml
index 7f87f4b..13443c8 100644
--- a/wechat_staff/pages/discover/discover.wxml
+++ b/wechat_staff/pages/discover/discover.wxml
@@ -18,7 +18,7 @@
</view>
</view>
<!-- -->
- <view class="main_content" style="height: 100vh">
+ <view class="main_content" style="height: calc( 100% - {{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px );">
<disProduct class="disProduct" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'product_intro' }}" />
<disCase class="disCase" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'whole_case' }}" />
<disRealpic class="disRealpic" menuButtonInfo="{{ menuButtonInfo }}" wx:if="{{ catalogCode == 'real_case' }}" />
diff --git a/wechat_staff/pages/discover/discover.wxss b/wechat_staff/pages/discover/discover.wxss
index 9ac8a0c..748d000 100644
--- a/wechat_staff/pages/discover/discover.wxss
+++ b/wechat_staff/pages/discover/discover.wxss
@@ -24,8 +24,13 @@
background: linear-gradient(270deg, rgba(255, 255, 255, 0.56) 0%, rgba(206, 144, 111, 0.88) 100%);
}
.home_tab {
- position: fixed;
z-index: 999;
width: 100%;
background-color: #fff;
}
+.container {
+ height: 100vh;
+}
+.container .main_content {
+ overflow: hidden;
+}
diff --git a/wechat_staff/pages/homeId/index.less b/wechat_staff/pages/homeId/index.less
index c84a6df..3701217 100644
--- a/wechat_staff/pages/homeId/index.less
+++ b/wechat_staff/pages/homeId/index.less
@@ -59,7 +59,7 @@
}
}
.content{
- padding: 80rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
.item{
margin-bottom: 60rpx;
.img{
diff --git a/wechat_staff/pages/homeId/index.wxml b/wechat_staff/pages/homeId/index.wxml
index 99bac2e..f9ed7f3 100644
--- a/wechat_staff/pages/homeId/index.wxml
+++ b/wechat_staff/pages/homeId/index.wxml
@@ -1,7 +1,7 @@
<view class="container">
<!-- 鍒嗙被 -->
- <view class="home_tabs" style="width: 100%;">
+ <view wx:if="{{tagList && tagList.length > 0 }}" class="home_tabs" style="width: 100%;">
<scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelValueCode}}" wx:for="{{ tagList }}" class="item {{ tagCodes == item.labelValueCode ? 'active': '' }}">{{ item.labelValueName }}</view>
@@ -9,7 +9,7 @@
</scroll-view>
</view>
<!-- content -->
- <view class="content">
+ <view class="content" style="padding-top: {{ tagList && tagList.length > 0 ? 80 : 0 }}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_staff/pages/homeId/index.wxss b/wechat_staff/pages/homeId/index.wxss
index 14329e9..e74c5a6 100644
--- a/wechat_staff/pages/homeId/index.wxss
+++ b/wechat_staff/pages/homeId/index.wxss
@@ -55,7 +55,7 @@
font-weight: 400;
}
.content {
- padding: 80rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
}
.content .item {
margin-bottom: 60rpx;
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 356b2f4..4eb902f 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -95,10 +95,9 @@
</view>
</view>
</view>
- <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
+ <!-- <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
<image src="{{HOME_CLASS_C}}"></image>
- <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
- </view>
+ </view> -->
</view>
<!-- service -->
<view class="consult">
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index 0761903..d14d877 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -165,14 +165,6 @@
}
})
},
- batchDown() {
- setTimeout(() => {
- eventBus.emit('batchDown', [1,2,3])
- }, 800)
- wx.navigateTo({
- url: '/pages/download/index',
- })
- },
closeCard() {
this.setData({ isShowPoster: false })
},
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index 7bd8777..f73eda1 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -51,11 +51,19 @@
platId: customer.platSourceId,
platSource: customer.platSource
}).then(res => {
- setTimeout(() => {
- wx.showToast({
- title: '缁戝畾鎴愬姛',icon: 'none'
+ if (res.code == 200) {
+ setTimeout(() => {
+ wx.showToast({
+ title: '缁戝畾鎴愬姛',
+ icon: 'none'
+ })
+ }, 500)
+ }else{
+ return wx.showToast({
+ title: res.message,
+ icon: 'none'
})
- }, 500)
+ }
this.setData({
customer: {}
})
diff --git a/wechat_staff/pages/kefu/select.less b/wechat_staff/pages/kefu/select.less
index 812fa81..1c6837e 100644
--- a/wechat_staff/pages/kefu/select.less
+++ b/wechat_staff/pages/kefu/select.less
@@ -90,6 +90,10 @@
}
.val{
color: #333333;
+ width: 420rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
.source{
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index 05250b2..7d815d5 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -25,7 +25,7 @@
<view class="checked_wrap">
<image data-item="{{ item }}" bindtap="itemCheck" wx:if="{{ customer.platSourceId == item.platSourceId }}" class="icon" src="../../static/icon/ic_video@2x.png" mode="widthFix"></image>
<image wx:else data-item="{{ item }}" bindtap="itemCheck" class="icon" src="../../static/icon/ic_select@2x.png" mode="widthFix"></image>
- <image class="avatar" src="../../static/images/default_avatar.png"></image>
+ <image class="avatar" src="{{ item.headPortrait ? item.headPortrait : '../../static/images/default_avatar.png' }}"></image>
</view>
<!-- -->
<view class="content">
diff --git a/wechat_staff/pages/kefu/select.wxss b/wechat_staff/pages/kefu/select.wxss
index 0deedb2..a6f2ead 100644
--- a/wechat_staff/pages/kefu/select.wxss
+++ b/wechat_staff/pages/kefu/select.wxss
@@ -92,6 +92,10 @@
}
.list .item .line .val {
color: #333333;
+ width: 420rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.list .item .source {
margin-top: 12rpx;
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index b0a9afb..90842e3 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -46,25 +46,18 @@
})
},
itemClick(e) {
- const { videourl, id } = e.currentTarget.dataset
+ const { id } = e.currentTarget.dataset.item
+ const { dataList } = this.data
+ dataList.forEach(ite => {
+ if(id === ite.id){
+ ite.viewCount += 1
+ }
+ })
+ this.setData({ dataList })
actionDo({
actionType: 'view',
id: id
})
- var dataList = this.data.dataList;
- dataList.forEach(item =>{
- if(item.id == id){
- item.viewCount = (item.viewCount||0) +1
- }
- })
- this.setData({dataList:dataList})
- let videoPlay = this.selectComponent('.videoPlay');
- if(videoPlay){
- videoPlay.startPlayVideo(videourl,this );
- }
- // wx.previewMedia({
- // sources: [{ url: videourl, type: 'video' }]
- // })
},
cateClick(e) {
const { code } = e.target.dataset
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index 0ce81d1..7172ace 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -2,12 +2,12 @@
<buoyClient class="buoyClient"/>
<!-- 鍒嗙被 -->
<view>
- <scroll-view scroll-x="true" style="weight: 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>
</scroll-view>
- <!-- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
+ <!-- <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 28rpx;">
<view class="scroll_cate second_list">
<view bindtap="seCateClick" data-index="{{index}}" wx:for="{{ secondCategory }}" class="item {{ index == 0 ? 'active': '' }}">{{ index }}{{ item }}</view>
</view>
@@ -16,10 +16,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="widthFix"></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_staff/project.private.config.json b/wechat_staff/project.private.config.json
index ddc3435..ed6bbaa 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -45,7 +45,7 @@
},
{
"name": "",
- "pathName": "pages/kefu/fond",
+ "pathName": "pages/consult/consult",
"query": "",
"launchMode": "default",
"scene": null
@@ -60,5 +60,5 @@
]
}
},
- "libVersion": "3.3.5"
+ "libVersion": "3.5.1"
}
\ No newline at end of file
--
Gitblit v1.9.3