From d41f1f707dc643b726a42b9d2a63b186dd9e4f28 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 06 八月 2024 16:12:38 +0800
Subject: [PATCH] ll
---
wechat_staff/pages/productVideo/index.wxss | 81 ++++
wechat_jiaxuan/pages/consult/consult.wxss | 4
wechat_jiaxuan/components/disProduct/index.less | 2
wechat_jiaxuan/pages/store/staff.wxss | 14
wechat_jiaxuan/pages/store/staff.less | 4
wechat_staff/app.wxss | 2
wechat_jiaxuan/pages/consult/detail.js | 4
wechat_jiaxuan/pages/productVideo/index.wxss | 81 ++++
wechat_jiaxuan/pages/productVideo/index.js | 74 +++
wechat_jiaxuan/components/disCase/index.wxss | 2
wechat_staff/components/disProduct/index.js | 24
wechat_jiaxuan/pages/detailDis/case.js | 12
wechat_staff/pages/consult/consult.less | 4
wechat_jiaxuan/components/areaSel/areaSel.js | 3
wechat_jiaxuan/components/disCase/index.less | 2
wechat_jiaxuan/pages/sets/index.js | 8
wechat_jiaxuan/pages/store/info.wxml | 1
wechat_staff/api/index.js | 3
wechat_staff/pages/productVideo/index.wxml | 31 +
wechat_staff/pages/consult/consult.js | 14
wechat_staff/components/disRealpic/index.js | 25
wechat_jiaxuan/pages/detailDis/realpic.js | 4
wechat_jiaxuan/components/disProduct/index.js | 24
wechat_jiaxuan/pages/sets/index.wxml | 2
wechat_jiaxuan/pages/store/info.less | 12
wechat_jiaxuan/components/disRealpic/index.less | 2
wechat_jiaxuan/pages/productVideo/index.less | 86 ++++
wechat_staff/utils/request.js | 4
wechat_jiaxuan/app.wxss | 2
wechat_staff/pages/consult/detail.js | 2
wechat_jiaxuan/pages/consult/consult.js | 15
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_staff/pages/login/index.js | 12
wechat_staff/pages/consult/consult.wxss | 4
wechat_jiaxuan/pages/index/index.js | 67 ++
wechat_jiaxuan/pages/auth/auth.js | 11
wechat_jiaxuan/pages/detailDis/product.js | 4
wechat_jiaxuan/pages/consult/consult.less | 4
wechat_staff/app.js | 21
wechat_staff/pages/productVideo/index.less | 86 ++++
wechat_jiaxuan/components/disCase/index.js | 16
wechat_jiaxuan/pages/productVideo/index.wxml | 4
wechat_staff/components/videoPlay/index.wxml | 2
wechat_jiaxuan/api/index.js | 2
wechat_staff/pages/productVideo/index.js | 68 +++
wechat_staff/components/disCase/index.js | 16
wechat_jiaxuan/components/disRealpic/index.js | 278 +++++++++----
wechat_staff/pages/index/index.js | 6
wechat_jiaxuan/components/disRealpic/index.wxss | 2
wechat_jiaxuan/components/videoPlay/index.wxml | 2
wechat_jiaxuan/components/disProduct/index.wxss | 2
wechat_jiaxuan/pages/store/info.wxss | 12
52 files changed, 914 insertions(+), 255 deletions(-)
diff --git a/wechat_jiaxuan/api/index.js b/wechat_jiaxuan/api/index.js
index e47aae7..6e897d6 100644
--- a/wechat_jiaxuan/api/index.js
+++ b/wechat_jiaxuan/api/index.js
@@ -205,7 +205,7 @@
return request({
url: '/web/customer/actionDo',
data,
- loading: '0'
+ loading: data.actionType == 'view' ? '0' : '1'
})
}
// 鎴戠殑 棰勭害鍒楄〃
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index a4c6a09..cb2e17a 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -10,7 +10,7 @@
--themeColor:#B08771;
color: #111111;
}
-image{
+image,video{
display: flex;
border-radius: 8rpx;
}
diff --git a/wechat_jiaxuan/components/areaSel/areaSel.js b/wechat_jiaxuan/components/areaSel/areaSel.js
index a7c8613..a7cad08 100644
--- a/wechat_jiaxuan/components/areaSel/areaSel.js
+++ b/wechat_jiaxuan/components/areaSel/areaSel.js
@@ -17,7 +17,6 @@
observer(selectedValues) {
if (selectedValues && selectedValues.length) {
this.resetValus(selectedValues)
- console.log("--------------------",this.data.value)
this.setLabel();
}
}
@@ -49,7 +48,6 @@
if (!this.data.value.length) {
this.initRange();
}
- console.log(this.data.addressList)
}else{
getArea({
"level": "",
@@ -133,7 +131,6 @@
label:tlable
});
this.setData({value:temVal,label:tlable})
- console.log("--------------------",this.data.value)
}
})
}
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index 60a366a..7769bf1 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -69,12 +69,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ }, 200)
}
},
fadeIn: function () {
@@ -90,7 +94,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
getCatelist() {
const { catalogCode } = this.data
@@ -113,7 +117,7 @@
getZhongTaiWholecasePage({
catalogCode, pageNum, pageSize, tagCodes, sortType, query
}).then(res => {
- if (res.data) {
+ if (res.data && res.data.records) {
this.setData({
total: res.data.total,
dataList: [...this.data.dataList, ...res.data.records],
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 6ed88f2..91b0286 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -52,7 +52,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
padding: 30rpx 40rpx;
.item {
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 1cf0e02..4953a1c 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -54,7 +54,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
padding: 30rpx 40rpx;
}
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index 36c966b..e2cecb3 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -82,12 +82,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ }, 200)
}
},
fadeIn: function () {
@@ -103,7 +107,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
getCatelist() {
getCatalogList({
@@ -142,10 +146,12 @@
getZhongTaiProductPage({
catalogCode, pageNum, pageSize, sortType, query, tagCodes
}).then(res => {
- this.setData({
- datalist: [...this.data.datalist, ...res.data.records],
- total: res.data.total
- })
+ if (res.data && res.data.records) {
+ this.setData({
+ datalist: [...this.data.datalist, ...res.data.records],
+ total: res.data.total
+ })
+ }
}).finally(()=>{
that.setData({isLoading:false})
})
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index eba7a78..ad28a33 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -90,7 +90,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
.item {
width: 154rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 12a0f9c..6c7b93f 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -85,7 +85,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
}
.main_content .main_right .query_form .list .item {
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 7f8fef7..443057c 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -1,5 +1,11 @@
-import { getCataLogTagList, getZhongTaiRealcasePage, actionDo } from '../../api/index'
-import { eventBus } from '../../utils/eventBus'
+import {
+ getCataLogTagList,
+ getZhongTaiRealcasePage,
+ actionDo
+} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
let touchDot = 0
Component({
/**
@@ -17,7 +23,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
- isLoading:false,
+ isLoading: false,
cateList: [],
dataList: [],
@@ -28,25 +34,27 @@
catalogCode: 'real_case'
},
pageLifetimes: {
- show: function() {
+ show: function () {
// 椤甸潰琚睍绀�
console.log('缁勪欢琚睍绀�');
eventBus.once('realpicDeBack', (info) => {
const dataList = this.data.dataList
dataList.forEach(item => {
- if(item.id === info.id){
- if(item.isCollection != info.isCollection){
- if(!item.isCollection){
- item.collectCount = (item.collectCount || 0)+1
- }else if(item.collectCount >0){
- item.collectCount = (item.collectCount || 0)-1
- }
+ if (item.id === info.id) {
+ if (item.isCollection != info.isCollection) {
+ if (!item.isCollection) {
+ item.collectCount = (item.collectCount || 0) + 1
+ } else if (item.collectCount > 0) {
+ item.collectCount = (item.collectCount || 0) - 1
+ }
}
item.isCollection = info.isCollection
- item.viewCount ++
+ item.viewCount++
}
})
- this.setData({ dataList })
+ this.setData({
+ dataList
+ })
})
},
},
@@ -59,20 +67,26 @@
},
methods: {
bindscrolltoupper() {
- this.setData({ showTouch: true })
+ this.setData({
+ showTouch: true
+ })
this.fadeIn();
},
- touchstart(e){
+ touchstart(e) {
touchDot = e.detail.scrollTop;
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if (touchDot - touchMove > 16) {
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if (touchDot - touchMove > 16) {
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ }, 200)
}
},
fadeIn: function () {
@@ -87,15 +101,19 @@
animationData: this.animation.export()
});
setTimeout(() => {
- this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ this.setData({
+ showTouch: false
+ });
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
- getCatelist(){
- const { catalogCode } = this.data
+ getCatelist() {
+ const {
+ catalogCode
+ } = this.data
getCataLogTagList({
catalogCode
}).then(res => {
- if(res.data && res.data.length > 0){
+ if (res.data && res.data.length > 0) {
this.setData({
cateList: res.data
})
@@ -106,33 +124,61 @@
})
},
getList() {
- if(this.data.isLoading){
+ if (this.data.isLoading) {
return
}
- this.setData({isLoading:true})
- const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
+ this.setData({
+ isLoading: true
+ })
+ const {
+ sortType,
+ query,
+ tagCodes,
+ pageNum,
+ pageSize,
+ catalogCode
+ } = this.data
getZhongTaiRealcasePage({
- catalogCode,tagCodes,pageNum,pageSize, sortType,query
+ catalogCode,
+ tagCodes,
+ pageNum,
+ pageSize,
+ sortType,
+ query
}).then(res => {
+ if (res.data && res.data.records) {
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records],
+ total: res.data.total,
+ })
+ }
+ }).finally(() => {
this.setData({
- dataList: [...this.data.dataList, ...res.data.records],
- total: res.data.total,
+ isLoading: false
})
- }).finally(()=>{
- this.setData({isLoading:false})
})
},
scrolltoupper() {
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({
+ pageNum: 1,
+ datalist: [],
+ total: 0
+ })
this.getList()
},
scrolltolower() {
console.log('瑙﹀簳浜嬩欢');
- const { total, dataList, pageNum } = this.data
- if(total > dataList.length){
- this.setData({ pageNum: pageNum + 1 })
+ const {
+ total,
+ dataList,
+ pageNum
+ } = this.data
+ if (total > dataList.length) {
+ this.setData({
+ pageNum: pageNum + 1
+ })
this.getList()
- }else{
+ } else {
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
icon: 'none'
@@ -140,35 +186,46 @@
}
},
videoClick(e) {
- const { videourl } = e.currentTarget.dataset
-
- let videoPlay = this.selectComponent('.videoPlay');
- if(videoPlay){
- videoPlay.startPlayVideo(videourl,this );
- }
- console.log(videourl+"-------------------------------------")
+ const {
+ videourl
+ } = e.currentTarget.dataset
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if (videoPlay) {
+ videoPlay.startPlayVideo(videourl, this);
+ }
+ console.log(videourl + "-------------------------------------")
// wx.previewMedia({
// sources: [{ url: videourl, type: 'video' }]
// })
},
- priviewFull(e){
+ priviewFull(e) {
const item = e.currentTarget.dataset.item
console.log('item', item);
wx.navigateTo({
url: '/pages/webView/index?link=' + item.openContent,
- success: function(res) {
+ success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link: item.openContent,
+ title: item.title
+ })
}
})
},
statusChange(e) {
const sortType = e.currentTarget.dataset.status
- this.setData({sortType})
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({
+ sortType
+ })
+ this.setData({
+ pageNum: 1,
+ dataList: [],
+ total: 0
+ })
this.getList()
},
- handleAction(e){
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
const id = e.currentTarget.dataset.id
actionDo({
@@ -181,98 +238,137 @@
handleDetail(e) {
const item = e.currentTarget.dataset.item
console.log('item', item);
- if(item.openType == 'video'){
-
- let videoPlay = this.selectComponent('.videoPlay');
- if(videoPlay){
- videoPlay.startPlayVideo(item.openContent,this );
- }
+ if (item.openType == 'video') {
+
+ let videoPlay = this.selectComponent('.videoPlay');
+ if (videoPlay) {
+ videoPlay.startPlayVideo(item.openContent, this);
+ }
// wx.previewMedia({
// sources: [{ url: item.openContent, type: 'video' }]
// })
}
- if(item.openType == 'link'){
+ if (item.openType == 'link') {
wx.navigateTo({
url: '/pages/webView/index?link=' + item.openContent,
- success: function(res) {
+ success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent})
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link: item.openContent
+ })
}
})
}
- if(item.openType == 'page'){
+ if (item.openType == 'page') {
wx.navigateTo({
url: '/pages/detailDis/realpic?id=' + item.id,
})
}
},
tagClick(e) {
- if(this.data.isLoading){
+ if (this.data.isLoading) {
return
}
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
- const { cateList, tagCodes, activeParam, activeIndex } = this.data
- const index = tagCodes.indexOf(code)
- if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
+ const {
+ cateList,
+ tagCodes,
+ activeParam,
+ activeIndex
+ } = this.data
+ const index = tagCodes.indexOf(code)
+ if (cateList[activeIndex].tempParamIndex == null || cateList[activeIndex].tempParamIndex != paramIndex) {
cateList[activeIndex].tempParamIndex = paramIndex
cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
cateList[activeIndex].tempParamCode = code
- }else{
+ } else {
// tagCodes.splice(index, 1)
cateList[activeIndex].tempParamIndex = -1
cateList[activeIndex].tempParamName = null
cateList[activeIndex].tempParamCode = null
}
// this.setData({ pageNum: 1,dataList: [],total: 0})
- this.setData({ cateList })
+ this.setData({
+ cateList
+ })
},
cancelParam() {
- const { cateList } = this.data
+ const {
+ cateList
+ } = this.data
cateList.forEach(item => {
item.tempParamIndex = item.paramIndex
- item.tempParamName = item.paramName
- item.tempParamCode = item.paramCode
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ activeParam: [],cateList,activeIndex: -1 })
+ this.setData({
+ activeParam: [],
+ cateList,
+ activeIndex: -1
+ })
},
bindblur() {
- this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({
+ pageNum: 1,
+ dataList: [],
+ total: 0
+ })
this.getList()
},
subParam() {
- const { cateList } = this.data
- var codes =[]
- cateList.forEach(item => {
+ const {
+ cateList
+ } = this.data
+ var codes = []
+ cateList.forEach(item => {
item.paramIndex = item.tempParamIndex
- item.paramName = item.tempParamName
- item.paramCode = item.tempParamCode
- if(item.tempParamIndex >-1 && item.tempParamCode){
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if (item.tempParamIndex > -1 && item.tempParamCode) {
codes.push(item.tempParamCode)
}
- })
- this.setData({ activeParam: [],tagCodes:codes })
- this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
+ })
+ this.setData({
+ activeParam: [],
+ tagCodes: codes
+ })
+ this.setData({
+ pageNum: 1,
+ activeIndex: -1,
+ dataList: [],
+ total: 0
+ })
this.getList()
},
- changeShowParams(e){
- const { cateList } = this.data
+ changeShowParams(e) {
+ const {
+ cateList
+ } = this.data
const activeIndex = e.currentTarget.dataset.index
- if(activeIndex === this.data.activeIndex){
- this.setData({ activeIndex: -1, activeParam: [], selParam: '' })
- }else{
- this.setData({
+ if (activeIndex === this.data.activeIndex) {
+ this.setData({
+ activeIndex: -1,
+ activeParam: [],
+ selParam: ''
+ })
+ } else {
+ this.setData({
activeIndex,
activeParam: cateList[activeIndex].valueVos
})
}
-
+
// this.setData({showTwo: false})
},
- changeTwo(){
+ changeTwo() {
const showTwo = !this.data.showTwo
- this.setData({showTwo})
- this.setData({showOne: false})
+ this.setData({
+ showTwo
+ })
+ this.setData({
+ showOne: false
+ })
},
}
-})
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 276d2ff..b82c113 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -59,7 +59,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
.item {
width: 202rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 362f263..caac04d 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -55,7 +55,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 680rpx;
+ max-height: 480rpx;
overflow: auto;
}
.main_content .query_param .list .item {
diff --git a/wechat_jiaxuan/components/videoPlay/index.wxml b/wechat_jiaxuan/components/videoPlay/index.wxml
index 3ea0b5f..217387a 100644
--- a/wechat_jiaxuan/components/videoPlay/index.wxml
+++ b/wechat_jiaxuan/components/videoPlay/index.wxml
@@ -1,5 +1,5 @@
<view wx:if="{{ isVShow }}" bind:tap="onClose" class="video_content">
<view class="video">
- <video id="myVideo" src="{{videoSrc}}" autoplay show-play-btn ></video>
+ <video id="myVideo" src="{{videoSrc}}" show-fullscreen-btn="{{false}}" autoplay show-play-btn ></video>
</view>
</view >
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/auth/auth.js b/wechat_jiaxuan/pages/auth/auth.js
index caf56bd..694c102 100644
--- a/wechat_jiaxuan/pages/auth/auth.js
+++ b/wechat_jiaxuan/pages/auth/auth.js
@@ -79,6 +79,17 @@
wx.setStorageSync('member', res.data)
if (tempPath) {
wx.setStorageSync('tempPath', '')
+ if (tempPath == '/pages/webView/index') {
+ wx.navigateTo({
+ url: '/pages/webView/index',
+ success: function (res) {
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link: wx.getStorageSync('testUrl')
+ })
+ }
+ })
+ return
+ }
wx.redirectTo({
url: tempPath,
})
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 161b04e..5162839 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -138,12 +138,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showCate: true })
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showCate: true })
+ this.fadeIn();
+ }, 200)
}
},
fadeIn: function () {
@@ -151,6 +155,7 @@
this.setData({
animationData: this.animation.export()
});
+
},
fadeOut: function () {
this.animation.opacity(0).step();
@@ -159,7 +164,7 @@
});
setTimeout(() => {
this.setData({ showCate: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index 7fce414..ac03db4 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -31,8 +31,10 @@
}
.cate_two{
position: absolute;
+ width: 750rpx;
+ left: 0rpx;
line-height: 88rpx;
- margin-left: 40rpx;
+ padding: 0 40rpx;
height: 88rpx;
z-index: 999;
background-color: #fff;
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index 32fe69d..d4efa1f 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -30,8 +30,10 @@
}
.cate_wrap .cate_two {
position: absolute;
+ width: 750rpx;
+ left: 0rpx;
line-height: 88rpx;
- margin-left: 40rpx;
+ padding: 0 40rpx;
height: 88rpx;
z-index: 999;
background-color: #fff;
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 43feaf0..c320ac0 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -19,6 +19,9 @@
onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
},
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
@@ -32,6 +35,7 @@
handleDesign() {
const { member } = this.data
if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
return wx.navigateTo({
url: '/pages/auth/auth',
})
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index 346d447..22fd0ba 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -29,6 +29,9 @@
eventBus.emit('caseDeBack', this.data.info)
}, 500)
},
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
@@ -148,6 +151,7 @@
handleDesign() {
const { member } = this.data
if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
return wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -169,14 +173,6 @@
showShare: false
})
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 143689d..cc5c0d8 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -31,6 +31,9 @@
id: options.id
})
},
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
onUnload() {
console.log('璇︽儏杩涜浜嗛攢姣�');
setTimeout(() => {
@@ -138,6 +141,7 @@
handleDesign() {
const { member } = this.data
if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
return wx.navigateTo({
url: '/pages/auth/auth',
})
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index ec70eba..bbbe022 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -23,6 +23,9 @@
id: options.id
})
},
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
onUnload() {
console.log('璇︽儏杩涜浜嗛攢姣�');
setTimeout(() => {
@@ -122,6 +125,7 @@
handleDesign() {
const { member } = this.data
if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
return wx.navigateTo({
url: '/pages/auth/auth',
})
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index d6602fa..69f06e2 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -73,7 +73,10 @@
rect.bottom // 鑺傜偣鐨勪笅杈圭晫鍧愭爣
}).exec(res => {
console.log(windowInfo.windowHeight)
- this.setData({ videoTop: res[0].top,windowHeight: windowInfo.windowHeight})
+ this.setData({
+ videoTop: res[0].top,
+ windowHeight: windowInfo.windowHeight
+ })
})
}, 2000)
},
@@ -89,7 +92,6 @@
})
},
onLoad(options) {
- console.log(options)
this.initDictData()
// this.initData()
},
@@ -110,6 +112,7 @@
}
})
} else {
+ wx.setStorageSync('tempPath', '/pages/webView/index')
wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -156,8 +159,10 @@
initData() {
// 杞挱
getHomeBanner().then(res => {
- if(res.data){
- this.setData({ bannerList: res.data })
+ if (res.data) {
+ this.setData({
+ bannerList: res.data
+ })
}
})
// 浜у搧瑙嗛
@@ -200,9 +205,12 @@
code: 'WX_MINI_CONFIG',
label: 'ZBOM_STYLE_TEST_URL'
}).then(res => {
- this.setData({
- testUrl: res.data.code
- })
+ if (res.data) {
+ this.setData({
+ testUrl: res.data.code
+ })
+ wx.setStorageSync('testUrl', res.data.code)
+ }
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
@@ -376,34 +384,61 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
bindVideoPlay() {
- const { id } = this.data.productVideo[0]
+ const {
+ id
+ } = this.data.productVideo[0]
actionDo({
actionType: 'view',
id
})
},
hdBtn() {
- this.setData({ showWhiteHead: true, open: true,font_color: "#000000", sty: '',topHeadStyle: 1, desc: false })
+ this.setData({
+ showWhiteHead: true,
+ open: true,
+ font_color: "#000000",
+ sty: '',
+ topHeadStyle: 1,
+ desc: false
+ })
},
- touchStart: function (e) {
+ 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 })
+ this.setData({
+ showWhiteHead: true,
+ open: false,
+ desc: false
+ })
setTimeout(() => {
- this.setData({ open: true, sty: '' })
+ 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;' })
+ 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 ){
- this.setData({ videoPlay: false })
+ const {
+ videoTop,
+ windowHeight,
+ videoPlay
+ } = this.data
+ if (e.scrollTop + 100 > videoTop - (windowHeight / 2) && videoPlay) {
+ this.setData({
+ videoPlay: false
+ })
let videoplay = wx.createVideoContext('myvideo', this)
videoplay.play();
}
diff --git a/wechat_jiaxuan/pages/productVideo/index.js b/wechat_jiaxuan/pages/productVideo/index.js
index 00bbf85..084b2f1 100644
--- a/wechat_jiaxuan/pages/productVideo/index.js
+++ b/wechat_jiaxuan/pages/productVideo/index.js
@@ -11,6 +11,7 @@
activeIndex: -1,
activeParam: [],
tagCodes: [],
+
videoContext:null,
category: [],
videoUrl: '',
@@ -22,6 +23,58 @@
pageSize: 10,
pageNum: 1,
+ },
+ changeShowParams(e) {
+ const { category } = this.data
+ const activeIndex = e.currentTarget.dataset.index
+ if (activeIndex === this.data.activeIndex) {
+ this.setData({ activeIndex: -1, activeParam: [] })
+ } else {
+ this.setData({
+ activeIndex,
+ activeParam: category[activeIndex].valueVos
+ })
+ }
+ },
+ cancelParam() {
+ const { category } = this.data
+ category.forEach(item => {
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
+ })
+ this.setData({ activeParam: [],activeIndex: -1 ,category})
+ },
+ subParam() {
+ const { category } = this.data
+ var codes = []
+ category.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if( item.paramIndex>-1 && item.tempParamCode){
+ codes.push( item.tempParamCode)
+ }
+ })
+ this.setData({tagCodes:codes})
+ this.setData({ pageNum: 1, activeParam: [] ,activeIndex: -1, dataList: [], total: 0 })
+ this.getList()
+ },
+ tagClick(e) {
+ const code = e.currentTarget.dataset.code
+ const paramIndex = e.currentTarget.dataset.index
+ const { category, tagCodes, activeParam, activeIndex } = this.data
+ const index = tagCodes.indexOf(code)
+ if ( category[activeIndex].tempParamIndex==null || category[activeIndex].tempParamIndex != paramIndex) {
+ category[activeIndex].tempParamIndex = paramIndex
+ category[activeIndex].tempParamCode = code
+ category[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ } else {
+ category[activeIndex].tempParamIndex = -1
+ category[activeIndex].tempParamCode = ''
+ category[activeIndex].tempParamName = ''
+ }
+ this.setData({ category })
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
@@ -41,17 +94,22 @@
getZhongTaiVideoPage({
pageSize,pageNum, tagCodes
}).then(res => {
- this.setData({
- dataList: [...this.data.dataList, ...res.data.records],
- total: res.data.total
- })
+ if(res.data && 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 })
+ if(res.data){
+ this.setData({ category: [...res.data] })
+ }
+
})
},
itemClick(e) {
@@ -83,7 +141,11 @@
},
cateClick(e) {
const { code, index } = e.target.dataset
- this.setData({ tagCodes: [code], activeIndex: index })
+ if(this.data.activeIndex === index){
+ this.setData({ tagCodes: [], activeIndex: -1 })
+ }else{
+ this.setData({ tagCodes: [code], activeIndex: index })
+ }
this.setData({ total: 0, dataList: [], pageNum: 1 })
this.getList()
},
diff --git a/wechat_jiaxuan/pages/productVideo/index.less b/wechat_jiaxuan/pages/productVideo/index.less
index 7771448..e4d3132 100644
--- a/wechat_jiaxuan/pages/productVideo/index.less
+++ b/wechat_jiaxuan/pages/productVideo/index.less
@@ -105,4 +105,90 @@
top: 50%;
transform: translate(0, -50%);
}
+}
+.query_wrap_scroll{
+ width: 750rpx;
+ padding-left: 40rpx;
+}
+.query_wrap {
+ display: flex;
+ flex-wrap: nowrap;
+ .item {
+ flex-shrink: 0;
+ margin-right: 48rpx;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ .name {
+ margin-right: 12rpx;
+ }
+ }
+}
+
+.query_form {
+ position: absolute;
+ z-index: 999;
+ background-color: #fff;
+ width: 750rpx;
+ overflow: hidden;
+ .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ max-height: 680rpx;
+ overflow: auto;
+ .item {
+ width: 210rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 20rpx;
+ margin-bottom: 24rpx;
+
+ &:nth-of-type(3n) {
+ margin-right: 0;
+ }
+ }
+
+ .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+ }
+ }
+
+ .btns {
+ display: flex;
+ width: 750rpx;
+ .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .sub {
+ background: var(--themeColor);
+ color: #fff;
+ }
+ }
+}
+.shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,.5);
+ z-index: 99;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index 1477f04..da3856c 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -9,7 +9,7 @@
<block wx:if="{{ category.length > 1 }}">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
- <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
+ <view data-index="{{index}}" wx:for="{{ category }}" class="item" bindtap="changeShowParams">
<view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
</view>
@@ -17,7 +17,7 @@
</scroll-view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ category[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxss b/wechat_jiaxuan/pages/productVideo/index.wxss
index 82e362c..4a1a0cb 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxss
+++ b/wechat_jiaxuan/pages/productVideo/index.wxss
@@ -102,3 +102,84 @@
top: 50%;
transform: translate(0, -50%);
}
+.query_wrap_scroll {
+ width: 750rpx;
+ padding-left: 40rpx;
+}
+.query_wrap {
+ display: flex;
+ flex-wrap: nowrap;
+}
+.query_wrap .item {
+ flex-shrink: 0;
+ margin-right: 48rpx;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+}
+.query_wrap .item .name {
+ margin-right: 12rpx;
+}
+.query_form {
+ position: absolute;
+ z-index: 999;
+ background-color: #fff;
+ width: 750rpx;
+ overflow: hidden;
+}
+.query_form .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ max-height: 680rpx;
+ overflow: auto;
+}
+.query_form .list .item {
+ width: 210rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 20rpx;
+ margin-bottom: 24rpx;
+}
+.query_form .list .item:nth-of-type(3n) {
+ margin-right: 0;
+}
+.query_form .list .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+}
+.query_form .btns {
+ display: flex;
+ width: 750rpx;
+}
+.query_form .btns .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.query_form .btns .sub {
+ background: var(--themeColor);
+ color: #fff;
+}
+.shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
index f0012fe..45e6bc8 100644
--- a/wechat_jiaxuan/pages/sets/index.js
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -39,11 +39,17 @@
title: '娉ㄩ攢鎴愬姛',
})
that.setData({
- showLogout: true
+ showLogout: true,
+ show: false
})
})
},
appClose() {
+ this.setData({
+ showLogout: false
+ })
+ },
+ backHome() {
wx.login({
timeout: 5000,
success: (res) => {
diff --git a/wechat_jiaxuan/pages/sets/index.wxml b/wechat_jiaxuan/pages/sets/index.wxml
index 8043299..16f9867 100644
--- a/wechat_jiaxuan/pages/sets/index.wxml
+++ b/wechat_jiaxuan/pages/sets/index.wxml
@@ -30,7 +30,7 @@
<view class="text">浣犳槸鍚﹁閫�鍑鸿灏忕▼搴忓悧</view>
<view class="btns">
<navigator class="btn cancel" target="miniProgram" open-type="exit">纭閫�鍑�</navigator>
- <view class="btn" bindtap="appClose">杩斿洖棣栭〉</view>
+ <view class="btn" bindtap="backHome">杩斿洖棣栭〉</view>
</view>
</view>
</van-popup>
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index f1eae58..42ed794 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -50,8 +50,8 @@
.main_content {
position: relative;
bottom: 80rpx;
- padding: 0 40rpx 240rpx;
- height: 100%;
+ padding: 0 40rpx 0rpx;
+ height: calc( 100% - 480rpx );
overflow: hidden;
background-color: #fff;
padding-top: 80rpx;
@@ -61,7 +61,7 @@
margin-bottom: 38rpx;
}
.list {
- height: calc( 100% - 420rpx );
+ height: calc( 100% - 92rpx );
padding: 20rpx;
margin: 0 -40rpx;
padding-bottom: 12rpx;
@@ -76,9 +76,6 @@
padding: 0 30rpx;
display: flex;
align-items: center;
- &:nth-last-of-type(1){
- margin-bottom: 100rpx;
- }
.content {
flex: 1;
@@ -113,6 +110,9 @@
border: 1rpx solid var(--themeColor);
}
}
+ .empty{
+ height: 80rpx;
+ }
}
}
.empty_wrap{
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 6c7863f..111785e 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -29,6 +29,7 @@
<view wx:if="{{ info.usersList.length == 0 }}" class="empty_wrap">
<image class="default_empty" src="../../static/images/default_empty.png"></image>
</view>
+ <view class="empty"></view>
</scroll-view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
index afe8e85..c1c1037 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -47,8 +47,8 @@
.main_content {
position: relative;
bottom: 80rpx;
- padding: 0 40rpx 240rpx;
- height: 100%;
+ padding: 0 40rpx 0rpx;
+ height: calc(100% - 480rpx);
overflow: hidden;
background-color: #fff;
padding-top: 80rpx;
@@ -59,7 +59,7 @@
margin-bottom: 38rpx;
}
.main_content .list {
- height: calc(100% - 420rpx);
+ height: calc(100% - 92rpx);
padding: 20rpx;
margin: 0 -40rpx;
padding-bottom: 12rpx;
@@ -75,9 +75,6 @@
padding: 0 30rpx;
display: flex;
align-items: center;
-}
-.main_content .list .item:nth-last-of-type(1) {
- margin-bottom: 100rpx;
}
.main_content .list .item .content {
flex: 1;
@@ -108,6 +105,9 @@
color: var(--themeColor);
border: 1rpx solid var(--themeColor);
}
+.main_content .list .empty {
+ height: 80rpx;
+}
.empty_wrap {
padding-top: 100rpx;
}
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index c4fe07c..3d57a33 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -5,8 +5,8 @@
position: relative;
z-index: -1;
}
-.container {
- padding: 0rpx 40rpx 140rpx;
+.containe {
+ padding: 0rpx 40rpx 60rpx;
position: relative;
bottom: 70rpx;
z-index: 1;
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index dba38ff..1444035 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -1,7 +1,7 @@
<view class="app">
<!-- <navBar></navBar> -->
<image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
- <view class="container">
+ <view class="containe">
<image class="avatar" src="{{ info.imgurlFull ? info.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view class="name_wrap">
<view class="left">
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 5a009ea..0ee5616 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -5,19 +5,19 @@
position: relative;
z-index: -1;
}
-.container {
- padding: 0rpx 40rpx 140rpx;
+.containe {
+ padding: 0rpx 40rpx 60rpx;
position: relative;
bottom: 70rpx;
z-index: 1;
}
-.container .avatar {
+.containe .avatar {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
border: 4rpx solid #FFFFFF;
}
-.container .desc {
+.containe .desc {
display: flex;
align-items: center;
padding: 0 30rpx;
@@ -28,7 +28,7 @@
color: #333333;
position: relative;
}
-.container .desc .text {
+.containe .desc .text {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
@@ -36,7 +36,7 @@
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
-.container .desc .icon {
+.containe .desc .icon {
position: absolute;
background: #F7F7F7;
width: 32rpx;
@@ -45,7 +45,7 @@
top: -16rpx;
transform: rotate(45deg);
}
-.container .desc image {
+.containe .desc image {
width: 32rpx;
margin-right: 20rpx;
}
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 603175d..cbca5dc 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -142,7 +142,8 @@
export const actionDo = (data) => {
return request({
url: '/web/customer/actionDo',
- data
+ data,
+ loading: data.actionType == 'view' ? '0' : '1'
})
}
// 鑾峰彇瀹㈡埛-娼滃鍒楄〃
diff --git a/wechat_staff/app.js b/wechat_staff/app.js
index 8b77696..fab7e6b 100644
--- a/wechat_staff/app.js
+++ b/wechat_staff/app.js
@@ -13,15 +13,20 @@
if (WindowInfo.safeArea.top > 20) {
this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
}
- let users = wx.getStorageSync('token')
- if(users ==null){
- wx.navigateTo({
+ },
+ onShow() {
+ let users = wx.getStorageSync('token')
+ if (users == null) {
+ wx.redirectTo({
url: '/pages/login/index',
})
- wx.showLoading({title: '鎺堟潈鐧诲綍涓�'})
- }else{
- getMemberInfo({goLogin:true}).then(res => {
- })
+ wx.showLoading({
+ title: '鎺堟潈鐧诲綍涓�'
+ })
+ } else {
+ getMemberInfo({
+ goLogin: true
+ }).then(res => {})
}
- },
+ },
})
\ No newline at end of file
diff --git a/wechat_staff/app.wxss b/wechat_staff/app.wxss
index 3674450..4ae6440 100644
--- a/wechat_staff/app.wxss
+++ b/wechat_staff/app.wxss
@@ -7,7 +7,7 @@
--themeColor:#B08771;
color: #111111;
}
-image{
+image,video{
display: flex;
border-radius: 8rpx;
}
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 91d15ed..bd0a568 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -45,12 +45,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchMove - touchDot > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 20){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ })
}
},
fadeIn: function () {
@@ -66,7 +70,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
@@ -111,7 +115,7 @@
getZhongTaiWholecasePage({
catalogCode,pageNum,pageSize,tagCodes, sortType,query
}).then(res => {
- if(res.data){
+ if(res.data || res.data.records){
this.setData({
total: res.data.total,
dataList: [...this.data.dataList, ...res.data.records],
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index fc5464f..08538c9 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -53,12 +53,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchMove - touchDot > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 20){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ })
}
},
fadeIn: function () {
@@ -74,7 +78,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
@@ -135,10 +139,12 @@
getZhongTaiProductPage({
catalogCode,pageNum,pageSize,sortType,query,tagCodes
}).then(res => {
- this.setData({
- datalist: [...this.data.datalist, ...res.data.records],
- total: res.data.total
- })
+ if(res.data || res.data.records){
+ this.setData({
+ datalist: [...this.data.datalist, ...res.data.records],
+ total: res.data.total
+ })
+ }
}).finally(()=>{
this.setData({isLoading:false})
})
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index ea13ece..fe78505 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -43,12 +43,16 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
+ if(touchMove - touchDot > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showTouch: true })
+ if(touchDot - touchMove > 16){
+ touchDot = touchMove
+ setTimeout(() => {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ })
}
},
fadeIn: function () {
@@ -64,7 +68,7 @@
});
setTimeout(() => {
this.setData({ showTouch: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
@@ -107,16 +111,17 @@
if(this.data.isLoading){
return
}
-
this.setData({isLoading:true})
const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
getZhongTaiRealcasePage({
catalogCode,tagCodes,pageNum,pageSize, sortType,query
}).then(res => {
- this.setData({
- dataList: [...this.data.dataList, ...res.data.records],
- total: res.data.total,
- })
+ if(res.data || res.data.records){
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records],
+ total: res.data.total
+ })
+ }
}).finally(()=>{
this.setData({isLoading:false})
})
diff --git a/wechat_staff/components/videoPlay/index.wxml b/wechat_staff/components/videoPlay/index.wxml
index 53e118b..07d129d 100644
--- a/wechat_staff/components/videoPlay/index.wxml
+++ b/wechat_staff/components/videoPlay/index.wxml
@@ -1,5 +1,5 @@
<view wx:if="{{ isVShow }}" bind:tap="onClose" class="video_content">
<view class="video">
- <video id="myVideo" src="{{videoSrc}}" autoplay show-play-btn ></video>
+ <video id="myVideo" src="{{videoSrc}}" show-fullscreen-btn="{{false}}" autoplay show-play-btn ></video>
</view>
</view >
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index 0d760fe..f4cbd5d 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -136,13 +136,15 @@
},
touchmove(e) {
var touchMove = e.detail.scrollTop;
- if(touchMove - touchDot > 60){
- // this.setData({ showCate: false })
+ if(touchMove - touchDot > 16){
+ touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 60){
- this.fadeIn();
- this.setData({ showCate: true })
+ if(touchDot - touchMove > 20){
+ setTimeout(() => {
+ this.setData({ showCate: true })
+ this.fadeIn();
+ },200)
}
},
fadeIn: function () {
@@ -158,7 +160,7 @@
});
setTimeout(() => {
this.setData({ showCate: false });
- }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ }, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
onShow() {
refreshEnjoy(this)
diff --git a/wechat_staff/pages/consult/consult.less b/wechat_staff/pages/consult/consult.less
index 258a276..af5c84d 100644
--- a/wechat_staff/pages/consult/consult.less
+++ b/wechat_staff/pages/consult/consult.less
@@ -31,8 +31,10 @@
}
.cate_two{
position: absolute;
+ width: 750rpx;
+ left: 0;
+ padding: 0 40rpx;
line-height: 88rpx;
- margin-left: 40rpx;
height: 88rpx;
z-index: 999;
background-color: #fff;
diff --git a/wechat_staff/pages/consult/consult.wxss b/wechat_staff/pages/consult/consult.wxss
index 61f1dd4..1a8ff54 100644
--- a/wechat_staff/pages/consult/consult.wxss
+++ b/wechat_staff/pages/consult/consult.wxss
@@ -30,8 +30,10 @@
}
.cate_wrap .cate_two {
position: absolute;
+ width: 750rpx;
+ left: 0;
+ padding: 0 40rpx;
line-height: 88rpx;
- margin-left: 40rpx;
height: 88rpx;
z-index: 999;
background-color: #fff;
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index ef324bb..55ba4f7 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -27,8 +27,6 @@
actionType: 'share',
id: this.data.info.id
})
- console.log(`/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`);
- return
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/index/index.js b/wechat_staff/pages/index/index.js
index 547bff8..8507d8d 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -49,8 +49,6 @@
rect.top // 鑺傜偣鐨勪笂杈圭晫鍧愭爣
rect.bottom // 鑺傜偣鐨勪笅杈圭晫鍧愭爣
}).exec(res => {
- console.log('res', res);
- console.log(windowInfo.windowHeight)
this.setData({ videoTop: res[0].top,windowHeight: windowInfo.windowHeight})
})
}, 2000)
@@ -61,7 +59,7 @@
fileType: '0'
}).then(res => {
this.setData({
- DailyUpdates: res.data
+ DailyUpdates: res.data || {}
})
})
// 浜у搧瑙嗛
@@ -69,7 +67,7 @@
pageSize: 1,
pageNum: 1
}).then(res => {
- if (res.data.records && res.data.records.length > 0) {
+ if (res.data && res.data.records && res.data.records.length > 0) {
this.setData({
productVideo: res.data.records
})
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index ec188bb..8ec8fb0 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -56,6 +56,9 @@
}, 1000)
})
},
+ onShow(){
+ wx.hideHomeButton()
+ },
handleJudge(e) {
const flag = e.currentTarget.dataset.flag
console.log(e);
@@ -163,7 +166,7 @@
}
})
} else {
- wx.navigateTo({
+ wx.redirectTo({
url: '/pages/login/index',
})
wx.hideLoading()
@@ -258,13 +261,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
},
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index 54ccde2..f5c70c7 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -5,8 +5,12 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ activeIndex: -1,
+ activeParam: [],
+ tagCodes: [],
+
category: [],
- tagCodes: '',
+ tagCodes: [],
acVid:'',
viewIdList: [],
@@ -15,6 +19,58 @@
pageSize: 10,
pageNum: 1,
+ },
+ changeShowParams(e) {
+ const { category } = this.data
+ const activeIndex = e.currentTarget.dataset.index
+ if (activeIndex === this.data.activeIndex) {
+ this.setData({ activeIndex: -1, activeParam: [] })
+ } else {
+ this.setData({
+ activeIndex,
+ activeParam: category[activeIndex].valueVos
+ })
+ }
+ },
+ cancelParam() {
+ const { category } = this.data
+ category.forEach(item => {
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
+ })
+ this.setData({ activeParam: [],activeIndex: -1 ,category})
+ },
+ subParam() {
+ const { category } = this.data
+ var codes = []
+ category.forEach(item => {
+ item.paramIndex = item.tempParamIndex
+ item.paramName = item.tempParamName
+ item.paramCode = item.tempParamCode
+ if( item.paramIndex>-1 && item.tempParamCode){
+ codes.push( item.tempParamCode)
+ }
+ })
+ this.setData({tagCodes:codes})
+ this.setData({ pageNum: 1, activeParam: [] ,activeIndex: -1, dataList: [], total: 0 })
+ this.getList()
+ },
+ tagClick(e) {
+ const code = e.currentTarget.dataset.code
+ const paramIndex = e.currentTarget.dataset.index
+ const { category, tagCodes, activeParam, activeIndex } = this.data
+ const index = tagCodes.indexOf(code)
+ if ( category[activeIndex].tempParamIndex==null || category[activeIndex].tempParamIndex != paramIndex) {
+ category[activeIndex].tempParamIndex = paramIndex
+ category[activeIndex].tempParamCode = code
+ category[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ } else {
+ category[activeIndex].tempParamIndex = -1
+ category[activeIndex].tempParamCode = ''
+ category[activeIndex].tempParamName = ''
+ }
+ this.setData({ category })
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
@@ -32,7 +88,7 @@
getList() {
const { pageSize, pageNum, tagCodes } = this.data
getZhongTaiVideoPage({
- pageSize,pageNum, tagCodes: tagCodes ? [tagCodes] : []
+ pageSize,pageNum, tagCodes
}).then(res => {
this.setData({
dataList: [...this.data.dataList, ...res.data.records],
@@ -75,8 +131,12 @@
this.setData({ dataList })
},
cateClick(e) {
- const { code } = e.target.dataset
- this.setData({ tagCodes: code })
+ const { code, index } = e.target.dataset
+ if(this.data.activeIndex === index){
+ this.setData({ tagCodes: [], activeIndex: -1 })
+ }else{
+ this.setData({ tagCodes: [code], activeIndex: index })
+ }
this.setData({ total: 0, dataList: [], pageNum: 1 })
this.getList()
},
diff --git a/wechat_staff/pages/productVideo/index.less b/wechat_staff/pages/productVideo/index.less
index 3529745..e118f10 100644
--- a/wechat_staff/pages/productVideo/index.less
+++ b/wechat_staff/pages/productVideo/index.less
@@ -90,4 +90,90 @@
}
}
}
+}
+.query_wrap_scroll{
+ width: 750rpx;
+ padding-left: 40rpx;
+}
+.query_wrap {
+ display: flex;
+ flex-wrap: nowrap;
+ .item {
+ flex-shrink: 0;
+ margin-right: 48rpx;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ .name {
+ margin-right: 12rpx;
+ }
+ }
+}
+
+.query_form {
+ position: absolute;
+ z-index: 999;
+ background-color: #fff;
+ width: 750rpx;
+ overflow: hidden;
+ .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ max-height: 680rpx;
+ overflow: auto;
+ .item {
+ width: 210rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 20rpx;
+ margin-bottom: 24rpx;
+
+ &:nth-of-type(3n) {
+ margin-right: 0;
+ }
+ }
+
+ .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+ }
+ }
+
+ .btns {
+ display: flex;
+ width: 750rpx;
+ .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .sub {
+ background: var(--themeColor);
+ color: #fff;
+ }
+ }
+}
+.shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,.5);
+ z-index: 99;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index cf98cff..289b0fb 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -2,24 +2,35 @@
<buoyClient class="buoyClient"/>
<!-- 鍒嗙被 -->
<view>
- <scroll-view wx:if="{{ category.length > 0 }}" scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
+ <scroll-view wx:if="{{ category.length > 0 && category.length == 1 }}" 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 bindtap="cateClick" data-index="{{index}}" data-code="{{item.labelValueCode}}" wx:for="{{ category[0].valueVos }}" class="item {{ activeIndex == index ? 'active': '' }}">{{ item.labelValueName }}</view>
</view>
</scroll-view>
- <!-- <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>
+ <block wx:if="{{ category.length > 1 }}">
+ <scroll-view class="query_wrap_scroll" scroll-x>
+ <view class="query_wrap">
+ <view data-index="{{index}}" wx:for="{{ category }}" class="item" bindtap="changeShowParams">
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
+ <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ </view>
+ </scroll-view>
+ <view wx:if="{{ activeParam.length > 0 }}" class="query_form">
+ <view class="list">
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ category[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ </view>
+ <view class="btns">
+ <view class="btn" bindtap="cancelParam">鍙栨秷</view>
+ <view class="btn sub" bindtap="subParam">纭</view>
+ </view>
</view>
- </scroll-view> -->
+ <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
+ </block>
</view>
<!-- content -->
<view class="content">
<view wx:for="{{ dataList }}" class="item">
- <!-- <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> -->
<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>
diff --git a/wechat_staff/pages/productVideo/index.wxss b/wechat_staff/pages/productVideo/index.wxss
index 1587773..4e479e0 100644
--- a/wechat_staff/pages/productVideo/index.wxss
+++ b/wechat_staff/pages/productVideo/index.wxss
@@ -87,3 +87,84 @@
width: 26rpx;
margin-right: 10rpx;
}
+.query_wrap_scroll {
+ width: 750rpx;
+ padding-left: 40rpx;
+}
+.query_wrap {
+ display: flex;
+ flex-wrap: nowrap;
+}
+.query_wrap .item {
+ flex-shrink: 0;
+ margin-right: 48rpx;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+}
+.query_wrap .item .name {
+ margin-right: 12rpx;
+}
+.query_form {
+ position: absolute;
+ z-index: 999;
+ background-color: #fff;
+ width: 750rpx;
+ overflow: hidden;
+}
+.query_form .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ max-height: 680rpx;
+ overflow: auto;
+}
+.query_form .list .item {
+ width: 210rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 20rpx;
+ margin-bottom: 24rpx;
+}
+.query_form .list .item:nth-of-type(3n) {
+ margin-right: 0;
+}
+.query_form .list .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+}
+.query_form .btns {
+ display: flex;
+ width: 750rpx;
+}
+.query_form .btns .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.query_form .btns .sub {
+ background: var(--themeColor);
+ color: #fff;
+}
+.shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
diff --git a/wechat_staff/utils/request.js b/wechat_staff/utils/request.js
index 6056b6b..c0a2b74 100644
--- a/wechat_staff/utils/request.js
+++ b/wechat_staff/utils/request.js
@@ -23,8 +23,8 @@
if (res.data.code && (res.data.code == 5112 || res.data.code == 5111)) {
if(options.data && options.data.goLogin){
console.log("==================")
- wx.navigateTo({
- url: '/pages/login/index',
+ wx.redirectTo({
+ url: '/pages/login/index',
})
}
}
--
Gitblit v1.9.3