跳转集点详情

src/component/picNav/picNav.js

@@ -43,68 +43,76 @@ Component({
       })
     },
     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 accountInfo = utils.getAccountInfo()
       const userInfo = wx.getStorageSync('_baseUserInfo')
 
-      //  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
+      // link row
+      if (curItemType.link) {
+console.log('222222222')
+      } else if (curItemType.row) {
+        console.log('3333333333')
       }
+      //  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) {
-        // 触发父组件更新页面
-        wxService.nextTick(() => {
-          this.triggerEvent('updatePage', { pageId: currentClickType.url })
-        })
-      } else if (link.type == 3) {
-        // 预览
-        wx.previewImage({
-          current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
-          urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`]  // 需要预览的图片http链接列表
-        })
-      } else if (link.type == 4) {
-        wxService.router(`${currentClickType}`)
-      } else if (link.type == 5) {
-        if (currentClickType == 1) {
-          wxService.openCard()
-        } else if (currentClickType == 2) {
-          // wxService.openCard()
-          if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
-            // 手机号存在 但未激活 跳转激活领卡页面 老用户
-            this.setData({
-              isAuthorizationActiveText: '新激活领卡',
-              isAuthorization: true,
-              isAuthorizationType: 3
-            }, () => {
-              return false
-            })
-          } else {
-            wxService.openCard()
-          }
-        }
-      } else if(link.type == 6){
-        wxService.router(`${currentClickType}`)
-      } else if(link.type == 7){
-        // 集点详情
-        let pointPath = currentClickType && currentClickType.split('?')[0]
-        let pointIdParams = currentClickType && currentClickType.split('?')[1]
-        let pointId = pointIdParams.split('=')[1]
-        wxService.router(`${pointPath}`).search({ id: pointId })
-      }
+      // if (link.type == 2) {
+      //   // 触发父组件更新页面
+      //   wxService.nextTick(() => {
+      //     this.triggerEvent('updatePage', { pageId: currentClickType.url })
+      //   })
+      // } else if (link.type == 3) {
+      //   // 预览
+      //   wx.previewImage({
+      //     current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
+      //     urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`]  // 需要预览的图片http链接列表
+      //   })
+      // } else if (link.type == 4) {
+      //   wxService.router(`${currentClickType}`)
+      // } else if (link.type == 5) {
+      //   if (currentClickType == 1) {
+      //     wxService.openCard()
+      //   } else if (currentClickType == 2) {
+      //     // wxService.openCard()
+      //     if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
+      //       // 手机号存在 但未激活 跳转激活领卡页面 老用户
+      //       this.setData({
+      //         isAuthorizationActiveText: '新激活领卡',
+      //         isAuthorization: true,
+      //         isAuthorizationType: 3
+      //       }, () => {
+      //         return false
+      //       })
+      //     } else {
+      //       wxService.openCard()
+      //     }
+      //   }
+      // } else if(link.type == 6){
+      //   wxService.router(`${currentClickType}`)
+      // } else if(link.type == 7){
+      //   // 集点详情
+      //   let pointPath = currentClickType && currentClickType.split('?')[0]
+      //   let pointIdParams = currentClickType && currentClickType.split('?')[1]
+      //   let pointId = pointIdParams.split('=')[1]
+      //   wxService.router(`${pointPath}`).search({ id: pointId })
+      // }
     },
     activeTocard(e) {
       if (e.detail) {

src/component/tabSort/tabSort.js

@@ -93,12 +93,14 @@ Component({
 					wxService.router(`/${currentClickType}`)
 				} else if (curItemType.link.type == 7) {
 					// 集点详情
+					console.log('pointPath',  currentClickType)
+				  wxService.router(`${currentClickType}`)
 				}
 			} else if (curItemType.row) {
 				let rowObj = JSON.parse(curItemType.row)
 				let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj)
 				console.log('bacccccccccc', currentClickRow)
-				
+
 				if (rowObj.type == 1) { }
 				else if (rowObj.type == 2) { }
 				else if (rowObj.type == 3) { }

src/utils/common.js

@@ -72,6 +72,8 @@ HandlerLink.prototype = {
         return `/subPackage/page/pages/h5/h5page?url=${enCodeUrl}`
       }
       return `/${item.link.url}`
+    } else if (type == 7) {
+      return `${item.link.url}`
     }
   }
 }