Skip to content

7
7-Eleven
Commit 4b6f271d by 高淑倩
Options

跳转集点详情

parent 65fbcbb3
Showing with 68 additions and 56 deletions
src/component/picNav/picNav.js
...@@ -43,68 +43,76 @@ Component({ ...@@ -43,68 +43,76 @@ Component({
}) })
}, },
preview(e) { preview(e) {
const { appid, path, link, item } = e.currentTarget.dataset const ev = e.currentTarget.dataset
let curItemType = ev.item
console.log('ev', curItemType)
const { memberActivateStatus } = wx.getStorageSync('_baseUserInfo') const { memberActivateStatus } = wx.getStorageSync('_baseUserInfo')
// 获取当前帐号信息 // 获取当前帐号信息
const accountInfo = utils.getAccountInfo() const accountInfo = utils.getAccountInfo()
const userInfo = wx.getStorageSync('_baseUserInfo') const userInfo = wx.getStorageSync('_baseUserInfo')
// 2019.06.14 // link row
let currentClickType = app.globalData.commonFunc.getLink(item.link.type, item) if (curItemType.link) {
if (link.type == 1) { console.log('222222222')
// 触发父组件更新页面 外部小程序 } else if (curItemType.row) {
this.setData({ console.log('3333333333')
isAuthorization: false
})
return false
} else if (!userInfo) {
// userInfo 不存在 授权弹框
this.setData({
isAuthorization: true
})
return false
} }
// 2019.06.14
// let currentClickType = app.globalData.commonFunc.getLink(item.link.type, item)
// if (link.type == 1) {
// // 触发父组件更新页面 外部小程序
// this.setData({
// isAuthorization: false
// })
// return false
// } else if (!userInfo) {
// // userInfo 不存在 授权弹框
// this.setData({
// isAuthorization: true
// })
// return false
// }
if (link.type == 2) { // if (link.type == 2) {
// 触发父组件更新页面 // // 触发父组件更新页面
wxService.nextTick(() => { // wxService.nextTick(() => {
this.triggerEvent('updatePage', { pageId: currentClickType.url }) // this.triggerEvent('updatePage', { pageId: currentClickType.url })
}) // })
} else if (link.type == 3) { // } else if (link.type == 3) {
// 预览 // // 预览
wx.previewImage({ // wx.previewImage({
current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接 // current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表 // urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`] // 需要预览的图片http链接列表
}) // })
} else if (link.type == 4) { // } else if (link.type == 4) {
wxService.router(`${currentClickType}`) // wxService.router(`${currentClickType}`)
} else if (link.type == 5) { // } else if (link.type == 5) {
if (currentClickType == 1) { // if (currentClickType == 1) {
wxService.openCard() // wxService.openCard()
} else if (currentClickType == 2) { // } else if (currentClickType == 2) {
// wxService.openCard() // // wxService.openCard()
if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) { // if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
// 手机号存在 但未激活 跳转激活领卡页面 老用户 // // 手机号存在 但未激活 跳转激活领卡页面 老用户
this.setData({ // this.setData({
isAuthorizationActiveText: '新激活领卡', // isAuthorizationActiveText: '新激活领卡',
isAuthorization: true, // isAuthorization: true,
isAuthorizationType: 3 // isAuthorizationType: 3
}, () => { // }, () => {
return false // return false
}) // })
} else { // } else {
wxService.openCard() // wxService.openCard()
} // }
} // }
} else if(link.type == 6){ // } else if(link.type == 6){
wxService.router(`${currentClickType}`) // wxService.router(`${currentClickType}`)
} else if(link.type == 7){ // } else if(link.type == 7){
// 集点详情 // // 集点详情
let pointPath = currentClickType && currentClickType.split('?')[0] // let pointPath = currentClickType && currentClickType.split('?')[0]
let pointIdParams = currentClickType && currentClickType.split('?')[1] // let pointIdParams = currentClickType && currentClickType.split('?')[1]
let pointId = pointIdParams.split('=')[1] // let pointId = pointIdParams.split('=')[1]
wxService.router(`${pointPath}`).search({ id: pointId }) // wxService.router(`${pointPath}`).search({ id: pointId })
} // }
}, },
activeTocard(e) { activeTocard(e) {
if (e.detail) { if (e.detail) {
......
src/component/tabSort/tabSort.js
...@@ -93,12 +93,14 @@ Component({ ...@@ -93,12 +93,14 @@ Component({
wxService.router(`/${currentClickType}`) wxService.router(`/${currentClickType}`)
} else if (curItemType.link.type == 7) { } else if (curItemType.link.type == 7) {
// 集点详情 // 集点详情
console.log('pointPath', currentClickType)
wxService.router(`${currentClickType}`)
} }
} else if (curItemType.row) { } else if (curItemType.row) {
let rowObj = JSON.parse(curItemType.row) let rowObj = JSON.parse(curItemType.row)
let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj) let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj)
console.log('bacccccccccc', currentClickRow) console.log('bacccccccccc', currentClickRow)
if (rowObj.type == 1) { } if (rowObj.type == 1) { }
else if (rowObj.type == 2) { } else if (rowObj.type == 2) { }
else if (rowObj.type == 3) { } else if (rowObj.type == 3) { }
......
src/utils/common.js
...@@ -72,6 +72,8 @@ HandlerLink.prototype = { ...@@ -72,6 +72,8 @@ HandlerLink.prototype = {
return `/subPackage/page/pages/h5/h5page?url=${enCodeUrl}` return `/subPackage/page/pages/h5/h5page?url=${enCodeUrl}`
} }
return `/${item.link.url}` return `/${item.link.url}`
} else if (type == 7) {
return `${item.link.url}`
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment