From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/components/detailFooter/index.js | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index f2ffc03..108ad93 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -1,8 +1,6 @@
import {
getContentShareImg
} from '../../api/index'
-const { HYEventBus } = require('hy-event-store')
-const eventBus = new HYEventBus()
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -56,8 +54,8 @@
} = this.data
let that = this
getContentShareImg({
- articleId: path + '&' + info.id,
- type: '1',
+ articleId: `${info.id}_${path}`,
+ type: '0',
// pageUrl: path,
imgurl: info.coverImage,
}).then(res => {
@@ -83,11 +81,27 @@
that.setData({
isShowPoster: false
})
- wx.showToast({
- title: '淇濆瓨鎴愬姛',
- icon: 'success',
- duration: 2000
+ wx.setClipboardData({
+ data: ' >>绮惧搧妗堜緥<<\n'
+ +' 馃绮剧泭姹傜簿锛屽搧璐ㄧ敓娲火煡嘰n'
+ +'姹囬泦鍏ㄥ浗浼樼璁捐甯堣幏濂栨渚媆n'
+ +'馃憠鍚勭椋庢牸鐏垫劅妗堜緥涓婁竾濂楌煈圽n'
+ +' 鎬绘湁涓�濂楄兘鎵撳姩鎮紝閫傚悎鎮�',
+ success: function (res) {
+ wx.getClipboardData({
+ success: function (res) {
+ wx.showToast({
+ title: '鏂囨宸插鍒舵垚鍔燂紝鍘诲垎浜惂'
+ })
+ }
+ })
+ }
})
+ // wx.showToast({
+ // title: '淇濆瓨鎴愬姛',
+ // icon: 'success',
+ // duration: 2000
+ // })
}
})
@@ -95,12 +109,14 @@
})
},
batchDown() {
- setTimeout(() => {
- eventBus.emit('batchDown', [1,2,3])
- }, 1000)
+ const downloadList = this.data.info.imageurlList || []
+ wx.setStorageSync('downloadList', downloadList)
+ wx.setStorageSync('downloadConfig', {
+ path: this.data.path,id: this.data.info.id
+ })
wx.navigateTo({
url: '/pages/download/index',
- })
+ }, 1000)
},
closeCard() {
this.setData({ isShowPoster: false })
--
Gitblit v1.9.3