From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/kefu/fond.js | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index 789e2eb..904baa0 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -8,13 +8,15 @@
data: {
bottomLift: 0,
checkAll: false,
- enjoyList: []
+ enjoyList: [],
+ leftIcon: '<<',
+ rightIcon: '>>',
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
- onLoad(options) {
+ onShow(options) {
var app = getApp().globalData
this.setData({
bottomLift: app.bottomLift
@@ -24,6 +26,7 @@
item.checked = false
})
wx.setStorageSync('enjoyList', enjoyList)
+ console.log(this.data.enjoyList)
this.initData()
},
@@ -65,6 +68,7 @@
}
})
wx.setStorageSync('enjoyList', enjoyList)
+
this.initData()
},
itemClick(e) {
@@ -89,6 +93,28 @@
url: '/pages/kefu/select',
})
},
+ handleShare() {
+ const { enjoyList } = this.data
+ let info = {}
+ enjoyList.forEach(item => {
+ item.list.forEach(ite => {
+ if(ite.checked){
+ info = ite
+ }
+ })
+ })
+ let map = [
+ '/pages/detailDis/product',
+ '/pages/detailDis/case',
+ '/pages/detailDis/realpic'
+ ]
+ console.log(info.id)
+ wx.navigateToMiniProgram({
+ appId: 'wx208dd1edc0be24ee',
+ path: `${map[info.joinType]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
+ envVersion: 'release'
+ })
+ },
handleDown() {
const { enjoyList } = this.data
let obj = {}
@@ -102,8 +128,8 @@
console.log('obj', obj);
let that = this
getContentShareImg({
- articleId: obj.id + '&' + obj.joinType,
- type: '1',
+ articleId: obj.id + '_' + obj.joinType,
+ type: '0',
// pageUrl: path,
imgurl: obj.coverImage,
}).then(res => {
@@ -139,14 +165,6 @@
}
})
},
- batchDown() {
- setTimeout(() => {
- eventBus.emit('batchDown', [1,2,3])
- }, 800)
- wx.navigateTo({
- url: '/pages/download/index',
- })
- },
closeCard() {
this.setData({ isShowPoster: false })
},
@@ -178,6 +196,7 @@
}
})
wx.setStorageSync('enjoyList', enjoyListTemp)
+
that.initData()
}
}
@@ -185,11 +204,13 @@
},
checkAll() {
+ this.setData({checkAll:!this.data.checkAll})
let enjoyList = wx.getStorageSync('enjoyList') || []
enjoyList.forEach(item => {
- item.checked = !item.checked
+ item.checked = this.data.checkAll
})
wx.setStorageSync('enjoyList', enjoyList)
+
this.initData()
},
openShare() {
--
Gitblit v1.9.3