From 2f3b3bd2fdf08822e54ebd2ee7a86790ca46a535 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:08 +0800
Subject: [PATCH] 提交
---
wechat_jiaxuan/components/disRealpic/index.js | 66 ++++++++++-----
wechat_staff/components/videoPlay/index.less | 72 ++++--------------
wechat_jiaxuan/components/videoPlay/index.less | 72 ++++--------------
3 files changed, 75 insertions(+), 135 deletions(-)
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index de55855..24d02de 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -11,7 +11,7 @@
activeParam: [],
selParam: '',
tagCodes: [],
-
+ isLoading:false,
cateList: [],
dataList: [],
@@ -41,6 +41,10 @@
})
},
getList() {
+ 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
@@ -49,6 +53,8 @@
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total,
})
+ }).finally(()=>{
+ this.setData({isLoading:false})
})
},
scrolltoupper() {
@@ -125,47 +131,61 @@
}
},
tagClick(e) {
+ 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(index === -1){
- if(activeParam && activeParam.length > 0){
- activeParam.forEach(item => {
- const indexTemp = tagCodes.indexOf(item.labelValueCode)
- if(indexTemp > -1){
- tagCodes.splice(indexTemp, 1)
- }
- })
- }
- tagCodes.push(code)
- cateList[activeIndex].paramIndex = paramIndex
- cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
+ // if(activeParam && activeParam.length > 0){
+ // activeParam.forEach(item => {
+ // const indexTemp = tagCodes.indexOf(item.labelValueCode)
+ // if(indexTemp > -1){
+ // tagCodes.splice(indexTemp, 1)
+ // }
+ // })
+ // }
+ // tagCodes.push(code)
+ cateList[activeIndex].tempParamIndex = paramIndex
+ cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ cateList[activeIndex].tempParamCode = code
}else{
- tagCodes.splice(index, 1)
- cateList[activeIndex].paramIndex = -1
- cateList[activeIndex].paramName = ''
+ // 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({ tagCodes, cateList })
- console.log('tagCodes', tagCodes);
+ // this.setData({ pageNum: 1,dataList: [],total: 0})
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
cateList.forEach(item => {
- item.paramIndex = -1
- item.paramName = ''
+ item.tempParamIndex = item.paramIndex
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
})
- this.setData({ tagCodes: [],datalist:[],pageNum:1, activeParam: [],cateList,activeIndex: -1 })
- this.getList()
+ this.setData({ activeParam: [],cateList,activeIndex: -1 })
},
bindblur() {
this.setData({ pageNum: 1,dataList: [],total: 0})
this.getList()
},
subParam() {
- this.setData({ activeParam: [] })
+ 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){
+ codes.push(item.tempParamCode)
+ }
+ })
+ this.setData({ activeParam: [],tagCodes:codes })
this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
this.getList()
},
diff --git a/wechat_jiaxuan/components/videoPlay/index.less b/wechat_jiaxuan/components/videoPlay/index.less
index e89bf2d..8c845bd 100644
--- a/wechat_jiaxuan/components/videoPlay/index.less
+++ b/wechat_jiaxuan/components/videoPlay/index.less
@@ -1,59 +1,19 @@
-.user {
- width: 750rpx;
- padding: 0 40rpx;
- height: 148rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- .content {
- flex: 1;
- .name {
- font-size: 30rpx;
- margin-bottom: 12rpx;
- }
-
- .desc {
- font-size: 24rpx;
- color: #999999;
- }
- }
-
- .avatar {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- margin-right: 24rpx;
- }
-
- .btns{
- display: flex;
- .item{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-left: 70rpx;
- font-size: 20rpx;
- color: #333333;
- .icon{
- margin-bottom: 4rpx;
- width: 44rpx;
- height: 44rpx;
- }
- }
- }
- .btn {
- width: 118rpx;
- height: 56rpx;
- line-height: 52rpx;
- text-align: center;
- background: var(--themeColor);
+.video_content{
+ position: fixed;
+ top: 10rpx;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.2);
+ z-index: 9999;
+ .video{
+ position: fixed;
border-radius: 8rpx;
- font-weight: 500;
- font-size: 26rpx;
- color: #fff;
+ top: 50%;
+ left: 75rpx;
+ transform: translate(0, -50%);
+ width: 600rpx;
+ z-index: 10000;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/wechat_staff/components/videoPlay/index.less b/wechat_staff/components/videoPlay/index.less
index e89bf2d..8c845bd 100644
--- a/wechat_staff/components/videoPlay/index.less
+++ b/wechat_staff/components/videoPlay/index.less
@@ -1,59 +1,19 @@
-.user {
- width: 750rpx;
- padding: 0 40rpx;
- height: 148rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- .content {
- flex: 1;
- .name {
- font-size: 30rpx;
- margin-bottom: 12rpx;
- }
-
- .desc {
- font-size: 24rpx;
- color: #999999;
- }
- }
-
- .avatar {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- margin-right: 24rpx;
- }
-
- .btns{
- display: flex;
- .item{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-left: 70rpx;
- font-size: 20rpx;
- color: #333333;
- .icon{
- margin-bottom: 4rpx;
- width: 44rpx;
- height: 44rpx;
- }
- }
- }
- .btn {
- width: 118rpx;
- height: 56rpx;
- line-height: 52rpx;
- text-align: center;
- background: var(--themeColor);
+.video_content{
+ position: fixed;
+ top: 10rpx;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.2);
+ z-index: 9999;
+ .video{
+ position: fixed;
border-radius: 8rpx;
- font-weight: 500;
- font-size: 26rpx;
- color: #fff;
+ top: 50%;
+ left: 75rpx;
+ transform: translate(0, -50%);
+ width: 600rpx;
+ z-index: 10000;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
--
Gitblit v1.9.3