From 86f43e0be1cafe2833ec3a8d72263b567b42ac39 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 27 八月 2024 15:52:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/work/index.wxml | 2
wechat_staff/utils/config.js | 2
wechat_staff/pages/work/index.js | 16 +
wechat_staff/components/disProduct/index.wxml | 16 +
wechat_staff/pages/login/index.less | 9 +
wechat_staff/pages/login/index.wxml | 2
wechat_staff/pages/login/index.wxss | 9 +
wechat_staff/pages/kefu/select.js | 2
wechat_staff/components/disProduct/index.js | 321 ++++++++++++++++++++++++++++++++-------------
9 files changed, 272 insertions(+), 107 deletions(-)
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 7bde532..90b4a64 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -1,4 +1,8 @@
-import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+import {
+ getCatalogList,
+ getCataLogTagList,
+ getZhongTaiProductPage
+} from '../../api/index'
let touchDot = 0
Component({
/**
@@ -19,7 +23,7 @@
cateList: [],
secondCateList: [],
datalist: [],
- isLoading:false,
+ isLoading: false,
pageNum: 1,
pageSize: 10,
total: 0,
@@ -27,12 +31,14 @@
sortType: '',
catalogCode: ""
},
- attached() {
+ attached() {
this.getCatelist()
var app = getApp()
console.log('globalData', app.globalData);
- if(app.globalData.catalogCode){
- this.setData({ catalogCode: app.globalData.catalogCode })
+ if (app.globalData.catalogCode) {
+ this.setData({
+ catalogCode: app.globalData.catalogCode
+ })
setTimeout(() => {
console.log('catalogCode', this.data.catalogCode);
getApp().globalData.catalogCode = ''
@@ -45,22 +51,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 > 24){
+ if (touchMove - touchDot > 24) {
touchDot = touchMove
this.fadeOut();
}
- if(touchDot - touchMove > 24){
+ if (touchDot - touchMove > 24) {
touchDot = touchMove
setTimeout(() => {
- this.setData({ showTouch: true })
+ this.setData({
+ showTouch: true
+ })
this.fadeIn();
}, 200)
}
@@ -77,36 +87,40 @@
animationData: this.animation.export()
});
setTimeout(() => {
- this.setData({ showTouch: false });
+ this.setData({
+ showTouch: false
+ });
}, 200); // 鍔ㄧ敾鎸佺画鏃堕棿
},
- refreshCount(){
- let temData = wx.getStorageSync('conentCountTemp')
- if(temData && this.data.datalist){
- var dataList =this.data.datalist;
- dataList.forEach(item =>{
- if(item.id+'' == temData.id+'' ){
- item.viewCount = (item.viewCount ||0)+1;
- if( item.isCollection != temData.isCollection){
- if(item.isCollection){
- item.collectCount = (item.collectCount || 0)-1
- item.collectCount = item.collectCount >=0? item.collectCount :0;
- } else{
- item.collectCount = (item.collectCount || 0)+1
- }
- item.isCollection = temData.isCollection
- }
- }
- })
- this.setData({datalist:dataList})
- wx.setStorageSync('conentCountTemp',null)
+ refreshCount() {
+ let temData = wx.getStorageSync('conentCountTemp')
+ if (temData && this.data.datalist) {
+ var dataList = this.data.datalist;
+ dataList.forEach(item => {
+ if (item.id + '' == temData.id + '') {
+ item.viewCount = (item.viewCount || 0) + 1;
+ if (item.isCollection != temData.isCollection) {
+ if (item.isCollection) {
+ item.collectCount = (item.collectCount || 0) - 1
+ item.collectCount = item.collectCount >= 0 ? item.collectCount : 0;
+ } else {
+ item.collectCount = (item.collectCount || 0) + 1
+ }
+ item.isCollection = temData.isCollection
+ }
+ }
+ })
+ this.setData({
+ datalist: dataList
+ })
+ wx.setStorageSync('conentCountTemp', null)
}
},
- getCatelist(){
+ getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
}).then(res => {
- if(res.data && res.data.length > 0){
+ if (res.data && res.data.length > 0) {
this.setData({
catalogCode: this.data.catalogCode || res.data[0].code,
cateList: res.data
@@ -131,31 +145,55 @@
},
bindblur() {
console.log('澶卞幓鐒︾偣');
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({
+ pageNum: 1,
+ datalist: [],
+ total: 0
+ })
this.getList()
},
- getList() {
- const { catalogCode,tagCodes, pageNum, pageSize, sortType, query } = this.data
+ getList() {
+ const {
+ catalogCode,
+ tagCodes,
+ pageNum,
+ pageSize,
+ sortType,
+ query
+ } = this.data
getZhongTaiProductPage({
- catalogCode,pageNum,pageSize,sortType,query,tagCodes
+ catalogCode,
+ pageNum,
+ pageSize,
+ sortType,
+ query,
+ tagCodes
}).then(res => {
- if(res.data && res.data.records){
+ if (res.data && res.data.records) {
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
total: res.data.total
})
}
- }).finally(()=>{
- this.setData({isLoading:false})
+ }).finally(() => {
+ this.setData({
+ isLoading: false
+ })
})
},
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'
@@ -163,21 +201,38 @@
}
},
cateClick(e) {
- var {isLoading} = this.data
- if(isLoading){
+ var {
+ isLoading
+ } = this.data
+ if (isLoading) {
return
}
- this.setData({isLoading:true})
+ this.setData({
+ isLoading: true
+ })
const catalogCode = e.currentTarget.dataset.code
- this.setData({ catalogCode, tagCodes: [] })
- this.setData({ pageNum: 1,datalist: [],total: 0})
+ this.setData({
+ catalogCode,
+ tagCodes: []
+ })
+ this.setData({
+ pageNum: 1,
+ datalist: [],
+ total: 0
+ })
this.getTag()
this.getList()
},
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()
},
handleDetail(e) {
@@ -189,70 +244,142 @@
tagClick(e) {
const code = e.currentTarget.dataset.code
const paramIndex = e.currentTarget.dataset.index
- const { secondCateList, tagCodes, activeParam, activeIndex } = this.data
- if( secondCateList[activeIndex].tempParamIndex==null || secondCateList[activeIndex].tempParamIndex != paramIndex){
- // 鍚宲aram閲宑ode閲嶅
- // if (activeParam && activeParam.length > 0) {
- // activeParam.forEach(item => {
- // const indexTemp = tagCodes.indexOf(item.labelValueCode)
- // if (indexTemp > -1) {
- // tagCodes.splice(indexTemp, 1)
- // }
- // })
- // }
- //tagCodes.push(code)
- secondCateList[activeIndex].tempParamIndex = paramIndex
- secondCateList[activeIndex].tempParamCode = code
- secondCateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ const {
+ secondCateList,
+ tagCodes,
+ activeParam,
+ activeIndex
+ } = this.data
+ // 鐐瑰嚮瀛愭爣绛�
+ console.log('openRelLabel', secondCateList[activeIndex].openRelLabel);
+ if (secondCateList[activeIndex].openRelLabel) {
+ if (secondCateList[activeIndex].tempParamRelIndex == null || secondCateList[activeIndex].tempParamRelIndex != paramIndex) {
+ secondCateList[activeIndex].tempParamRelIndex = paramIndex
+ secondCateList[activeIndex].tempParamRelCode = code
+ secondCateList[activeIndex].tempParamRelName = activeParam[paramIndex].labelValueName
+ } else {
+ secondCateList[activeIndex].tempParamRelIndex = -1
+ secondCateList[activeIndex].tempParamRelCode = ''
+ secondCateList[activeIndex].tempParamRelName = ''
+ }
+ console.log('secondCateList', secondCateList);
} else {
- // tagCodes.splice(index, 1)
- secondCateList[activeIndex].tempParamIndex = -1
- secondCateList[activeIndex].tempParamCode = ''
- secondCateList[activeIndex].tempParamName = ''
+ // 鐐瑰嚮鐖舵爣绛�
+ const relLabel = secondCateList[activeIndex].valueVos[paramIndex].relLabel || []
+ if (relLabel.length > 0 && relLabel[0].labelCode) {
+ secondCateList[activeIndex].relLabel = relLabel[0]
+ }else{
+ secondCateList[activeIndex].relLabel = null
+ }
+ secondCateList[activeIndex].tempParamRelIndex = -1
+ secondCateList[activeIndex].tempParamRelCode = ''
+ secondCateList[activeIndex].tempParamRelName = ''
+ if (secondCateList[activeIndex].tempParamIndex == null || secondCateList[activeIndex].tempParamIndex != paramIndex) {
+ secondCateList[activeIndex].tempParamIndex = paramIndex
+ secondCateList[activeIndex].tempParamCode = code
+ secondCateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
+ } else {
+ secondCateList[activeIndex].tempParamIndex = -1
+ secondCateList[activeIndex].tempParamCode = ''
+ secondCateList[activeIndex].tempParamName = ''
+ }
}
- this.setData({ tagCodes, secondCateList })
+ this.setData({
+ tagCodes,
+ secondCateList
+ })
},
- changeShowParams(e){
- const { secondCateList } = this.data
+ changeShowParams(e) {
+ const {
+ secondCateList,
+ activeParam
+ } = this.data
const activeIndex = e.currentTarget.dataset.index
- console.log('activeIndex', activeIndex);
- console.log('activeIndex', this.data.activeIndex);
- console.log('secondCateList', secondCateList);
- if(activeIndex === this.data.activeIndex){
- this.setData({ activeIndex: -1, activeParam: [] })
- }else{
- this.setData({
+ const type = e.currentTarget.dataset.type || ''
+ // console.log('activeIndex', activeIndex);
+ // 閽堝鏈夊瓙闆嗙殑label
+ if (type && type == 'child') {
+ if (secondCateList[activeIndex].openRelLabel) {
+ secondCateList[activeIndex].openRelLabel = false
+ this.setData({
+ activeIndex,
+ activeParam: [],
+ secondCateList
+ })
+ } else {
+ secondCateList[activeIndex].openRelLabel = true
+ this.setData({
+ activeParam: secondCateList[activeIndex].relLabel.valueVos,
+ secondCateList,
+ activeIndex
+ })
+ }
+ return
+ }
+ // 闈炲瓙闆嗙殑label
+ secondCateList[activeIndex].openRelLabel = false
+ this.setData({ secondCateList })
+ if (activeIndex === this.data.activeIndex && activeParam.length > 0) {
+ this.setData({
+ activeIndex: -1,
+ activeParam: []
+ })
+ } else {
+ this.setData({
activeIndex,
activeParam: secondCateList[activeIndex].valueVos
})
}
- console.log('activeParam', this.data.activeParam);
- // this.setData({showTwo: false})
},
cancelParam() {
- const { secondCateList } = this.data
- secondCateList.forEach(item => {
+ const {
+ secondCateList
+ } = this.data
+ secondCateList.forEach(item => {
item.tempParamIndex = item.paramIndex
- item.tempParamName = item.paramName
- item.tempParamCode = item.paramCode
+ item.tempParamName = item.paramName
+ item.tempParamCode = item.paramCode
+ item.relLabel = null
+ item.openRelLabel = false
+ item.tempParamRelIndex = null
+ item.tempParamRelCode = null
+ item.tempParamRelName = null
})
// this.setData({ tagCodes: [], activeParam: [], secondCateList, activeIndex: -1 })
- this.setData({ activeParam: [],activeIndex: -1 ,secondCateList})
+ this.setData({
+ activeParam: [],
+ activeIndex: -1,
+ secondCateList
+ })
},
subParam() {
- const { secondCateList } = this.data
+ const {
+ secondCateList
+ } = this.data
var codes = []
secondCateList.forEach(item => {
- item.paramIndex = item.tempParamIndex
- item.paramName = item.tempParamName
+ 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 })
+ item.openRelLabel = false
+ if(item.tempParamRelIndex > -1 && item.tempParamRelCode){
+ return codes.push(item.tempParamRelCode)
+ }
+ if (item.paramIndex > -1 && item.tempParamCode) {
+ codes.push(item.paramCode)
+ }
+ })
+ this.setData({
+ tagCodes: codes
+ })
+ this.setData({
+ pageNum: 1,
+ activeParam: [],
+ activeIndex: -1,
+ datalist: [],
+ total: 0
+ })
this.getList()
},
}
-})
+})
\ No newline at end of file
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index 0484dc6..5a467dd 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -15,15 +15,21 @@
<view class="main_right">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
- <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.tempParamName || item.labelName }}</view>
- <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
- </view>
+ <block wx:for="{{ secondCateList }}">
+ <view class="item" data-index="{{index}}" bindtap="changeShowParams">
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
+ <van-icon name="{{ index == activeIndex && !item.openRelLabel && activeParam.length > 0 ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view wx:if="{{item.relLabel && item.relLabel.labelCode}}" data-type="child" data-index="{{index}}" class="item" bindtap="changeShowParams">
+ <view class="name">{{ item.tempParamRelName || item.relLabel.labelName }}</view>
+ <van-icon name="{{ index == activeIndex && item.openRelLabel && activeParam.length > 0? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ </block>
</view>
</scroll-view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ (!secondCateList[activeIndex].openRelLabel && secondCateList[activeIndex].tempParamIndex === index) || (secondCateList[activeIndex].openRelLabel && secondCateList[activeIndex].tempParamRelIndex === index) ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index 9e287d9..f3eb41d 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -58,6 +58,8 @@
icon: 'none'
})
}, 500)
+ const temp = enjoyList.filter(i => !i.checked)
+ wx.setStorageSync('enjoyList', temp)
this.setData({
customer: {},
total: 0,
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index 225cc23..f485360 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -101,4 +101,13 @@
color: #fff;
}
}
+}
+.tip{
+ position: fixed;
+ bottom: 108rpx;
+ left: 0;
+ width: 100%;
+ text-align: center;
+ font-size: 26rpx;
+ color: #666666;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 78c244f..6b4c706 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -45,4 +45,6 @@
</view>
</view>
</van-popup>
+ <!-- -->
+ <view class="tip">鏈皬绋嬪簭鍔熻兘浠呴檺浜庡織閭﹀灞呭強缁忛攢鍟嗗憳宸ヤ娇鐢�</view>
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/login/index.wxss b/wechat_staff/pages/login/index.wxss
index f68f586..164a697 100644
--- a/wechat_staff/pages/login/index.wxss
+++ b/wechat_staff/pages/login/index.wxss
@@ -102,3 +102,12 @@
justify-content: center;
color: #fff;
}
+.tip {
+ position: fixed;
+ bottom: 108rpx;
+ left: 0;
+ width: 100%;
+ text-align: center;
+ font-size: 26rpx;
+ color: #666666;
+}
diff --git a/wechat_staff/pages/work/index.js b/wechat_staff/pages/work/index.js
index 390702e..ef07618 100644
--- a/wechat_staff/pages/work/index.js
+++ b/wechat_staff/pages/work/index.js
@@ -28,13 +28,23 @@
onShow() {
this.initData()
},
- subscribeMessage: function () {
+ subscribe: function () {
// 鏄剧ず鍔犺浇鎻愮ず
- // 璋冪敤璁㈤槄娑堟伅鐨凙PI
+ let that = this
wx.requestSubscribeMessage({
tmplIds: ['A_jEWoyl0Uu_l5J-zwlwx_FcbUirlsS6Peu4JW6a7Gc'],
success: (res) => {
- console.log('res', res);
+ if (res['A_jEWoyl0Uu_l5J-zwlwx_FcbUirlsS6Peu4JW6a7Gc'] === 'accept') {
+ that.submitClock();
+ } else if (res['A_jEWoyl0Uu_l5J-zwlwx_FcbUirlsS6Peu4JW6a7Gc'] === 'reject') {
+ // 鐢ㄦ埛鍘嗗彶鎿嶄綔鏈夎缃簡鎷掔粷 or 鍏抽棴浜嗚闃呮秷鎭殑涓伙紙鎬伙級寮�鍏筹紝瀵艰嚧鏃犳硶鎺ㄩ��
+ // console.log(res, '0 鎷掔粷 or 鍏抽棴浜嗚闃呮秷鎭殑涓伙紙鎬伙級寮�鍏�---');
+ } else {
+ wx.showToast({
+ title: '鎺堟潈璁㈤槄娑堟伅鏈夎',
+ icon: 'none'
+ });
+ }
},
fail: () => {
reject();
diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index 1ac0c29..0a75c06 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -36,7 +36,7 @@
</view>
</view>
<!-- index.wxml -->
- <button bindtap="subscribeMessage">璁㈤槄娑堟伅</button>
+ <!-- <button bindtap="subscribe">璁㈤槄娑堟伅</button> -->
</view>
<!-- 璇︽儏 -->
<van-popup show="{{ showCard }}" closeable round bind:close="onClose">
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index 1376c89..5675486 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,4 +1,4 @@
-// export const baseUrl = 'http://192.168.0.135:10027'
+// export const baseUrl = 'http://192.168.0.136:10027'
// 娴嬭瘯鏈嶅姟鍣�
// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// 鐢熶骇鏈嶅姟鍣�
--
Gitblit v1.9.3