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/pages/detailDis/case.js | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/wechat_staff/pages/detailDis/case.js b/wechat_staff/pages/detailDis/case.js
index 9f82fd2..92ab8dd 100644
--- a/wechat_staff/pages/detailDis/case.js
+++ b/wechat_staff/pages/detailDis/case.js
@@ -1,4 +1,4 @@
-import { actionDo, getWholecaseInfo } from '../../api/index'
+import { actionDo, getWholecaseInfo,refreshEnjoy } from '../../api/index'
Page({
/**
@@ -30,9 +30,10 @@
wx.navigateTo({
url: '/pages/webView/index',
success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link, title })
- }
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ console.log(link+"--------------------")
+ res.eventChannel.emit('data',{link:link,title:title} );
+ }
})
},
openShare() {
@@ -50,11 +51,14 @@
// }
// },
handleEnjoy(e) {
+ const info = this.data.info
+ if(info.id == null ){
+ return
+ }
const enjoyList = wx.getStorageSync('enjoyList') || []
const { type, flag } = e.detail
console.log('type', type);
- console.log('flag', flag);
- const info = this.data.info
+ console.log('flag', flag);
if(type == 'enjoy'){
// 鐐瑰嚮浜嗗枩娆�
const index = enjoyList.findIndex( i => i.id === info.id )
@@ -63,7 +67,7 @@
this.setData({ info })
enjoyList.push({
...info,
- joinType: 'product',
+ joinType: '1',
timestamp: new Date().getTime()
})
}else{
@@ -72,6 +76,7 @@
enjoyList.splice(index, 1)
}
wx.setStorageSync('enjoyList', enjoyList)
+ refreshEnjoy(this)
}else{
actionDo({
id: info.id,
@@ -100,8 +105,12 @@
})
},
getDetail(id) {
+ const enjoyList = wx.getStorageSync('enjoyList') || []
getWholecaseInfo({id}).then(res => {
- this.setData({ info: res.data })
+ const index = enjoyList.findIndex( i => i.id === res.data.id )
+ this.setData({ info: {
+ ...res.data, isEnjoy: index > -1
+ }})
wx.setNavigationBarTitle({
title: res.data.title
})
@@ -125,7 +134,8 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
+
},
/**
--
Gitblit v1.9.3