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_jiaxuan/pages/detailDis/case.js | 167 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 110 insertions(+), 57 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b3c66d1..3a5e508 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -1,4 +1,11 @@
-import { actionDo, getWholecaseInfo } from '../../api/index'
+import {
+ actionDo,
+ getWholecaseInfo,
+ getMemberInfo
+} from '../../api/index'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
/**
@@ -6,54 +13,92 @@
*/
data: {
bottomLift: 0,
+ origin: '',
showShare: false
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
- var app = getApp().globalData
- this.setData({
- bottomLift: app.bottomLift
- })
+ onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
id: options.id
})
- const member = wx.getStorageSync('member')
- this.setData({id: options.id, member})
},
- priviewFull(){
- let { panorama: link, title } = this.data.info
+ onUnload() {
+ console.log('璇︽儏杩涜浜嗛攢姣�');
+ setTimeout(() => {
+ eventBus.emit('caseDeBack', this.data.info)
+ }, 500)
+ },
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
+ onLoad(options) {
+ var app = getApp().globalData
+ this.setData({
+ bottomLift: app.bottomLift
+ })
+
+ if (options.origin && options.origin == 'b') {
+ this.setData({
+ origin: 'b'
+ })
+ }
+ const member = wx.getStorageSync('member')
+ this.setData({
+ id: options.id,
+ member
+ })
+ },
+ priviewFull() {
+ let {
+ panorama: link,
+ title
+ } = this.data.info
wx.navigateTo({
url: '/pages/webView/index',
- success: function(res) {
+ success: function (res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', { link, title })
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ link,
+ title
+ })
}
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({
+ showShare: true
+ })
},
handleShare() {
console.log('鐐瑰嚮浜嗗垎浜�');
- actionDo({ actionType: 'share', id: this.data.info.id })
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
},
- // onShareAppMessage: function () {
- // // let { productDetail, userInfo } = this.data
- // return {
- // title: productDetail.title,
- // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
- // }
- // },
- handleAction(e){
+ onShareAppMessage: function () {
+ let {
+ info
+ } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ if(info.users && info.users.id){
+ return {
+ path: '/pages/detailDis/case?id=' + info.id + '&userId=' + info.users.id
+ }
+ }else{
+ return {
+ path: '/pages/detailDis/case?id=' + info.id
+ }
+ }
+ },
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const { info } = this.data
+ const {
+ info
+ } = this.data
const member = wx.getStorageSync('member')
- if (member.authStatus == '0') {
+ if (!member.phone) {
return wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -63,9 +108,12 @@
id: this.data.info.id
}).then(res => {
info.isCollection = !info.isCollection
- this.setData({info})
+ this.setData({
+ info
+ })
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
})
})
},
@@ -77,52 +125,64 @@
priviewSpace(e) {
const url = e.currentTarget.dataset.url
const index = e.currentTarget.dataset.index
- const { info } = this.data
+ const {
+ info
+ } = this.data
wx.previewImage({
urls: info.apiSpaceCaseVos[index].imgList,
current: url
})
},
getDetail(id, userId) {
- getWholecaseInfo({id, salesId: userId || null}).then(res => {
- this.setData({ info: res.data })
+ getWholecaseInfo({
+ id,
+ salesId: userId || null
+ }).then(res => {
+ this.setData({
+ info: res.data
+ })
wx.setNavigationBarTitle({
title: res.data.title
- })
+ })
+ if (userId) {
+ getMemberInfo().then(res => {
+ this.setData({
+ member: res.data
+ })
+ wx.setStorageSync('member', res.data)
+ })
+ }
})
},
handleDesign() {
+ const { member } = this.data
+ if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
wx.navigateTo({
url: '/pages/design/design',
})
},
playVideo() {
wx.previewMedia({
- sources: [{ url: this.data.info.video, type: 'video' }]
+ sources: [{
+ url: this.data.info.video,
+ type: 'video'
+ }]
})
},
onClose() {
- this.setData({showShare: false})
+ this.setData({
+ showShare: false
+ })
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
},
@@ -139,11 +199,4 @@
onReachBottom() {
},
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
--
Gitblit v1.9.3