diff --git a/src/subpages/guide/components/wgts/film.js b/src/subpages/guide/components/wgts/film.js index ffc8cacd6..c98735e4c 100644 --- a/src/subpages/guide/components/wgts/film.js +++ b/src/subpages/guide/components/wgts/film.js @@ -1,7 +1,6 @@ import React, { Component } from 'react' import Taro, { getCurrentInstance } from '@tarojs/taro' import { View, Video } from '@tarojs/components' -import { linkPage } from './helper' import './film.scss' @@ -25,8 +24,6 @@ export default class WgtFilm extends Component { }) } - handleClickItem = linkPage - resolveSize({ width, height, ratio: tRatio } = {}, screenWidth, base = {}) { const aspectRatios = [16 / 9, 9 / 16, 4 / 3, 3 / 4, 1 / 1] const { proportion = 0 } = base diff --git a/src/subpages/guide/components/wgts/heading.js b/src/subpages/guide/components/wgts/heading.js index e9f55c7b5..292ee1f1b 100644 --- a/src/subpages/guide/components/wgts/heading.js +++ b/src/subpages/guide/components/wgts/heading.js @@ -1,7 +1,6 @@ import React, { Component } from 'react' import Taro, { getCurrentInstance } from '@tarojs/taro' import { View } from '@tarojs/components' -import { linkPage } from './helper' import './writing.scss' @@ -22,8 +21,6 @@ export default class WgtHeading extends Component { } } - handleClickItem = linkPage - handleSwiperChange = (e) => { const { current } = e.detail diff --git a/src/subpages/guide/components/wgts/helper.js b/src/subpages/guide/components/wgts/helper.js index 7be80c139..df6246d4b 100644 --- a/src/subpages/guide/components/wgts/helper.js +++ b/src/subpages/guide/components/wgts/helper.js @@ -1,13 +1,13 @@ import Taro from '@tarojs/taro' -import { WGTS_NAV_MAP } from '@/consts' -export function linkPage(type, id, item) { +export function linkPage(item) { + const { id } = item // console.log('[首页模版点击:linkPage]-type',type) // console.log('[首页模版点击:linkPage]-id', id) // console.log('[首页模版点击:linkPage]-item',item) let url = '' - switch (type) { + switch (item.linkPage) { case 'goods': url = '/subpages/guide/item/espier-detail?id=' + id break @@ -33,8 +33,8 @@ export function linkPage(type, id, item) { // return // } - let is_arr = Array.isArray(type) //活动 ['activity','满折/满减/满赠/限时特惠/任选'] - is_arr && (url = `/guide/item/promotion-list?type=${type[1]}&id=${id}`) + let is_arr = Array.isArray(item.linkPage) //活动 ['activity','满折/满减/满赠/限时特惠/任选'] + is_arr && (url = `/guide/item/promotion-list?type=${item.linkPage[1]}&id=${id}`) Taro.navigateTo({ url diff --git a/src/subpages/guide/components/wgts/imghot-zone.js b/src/subpages/guide/components/wgts/imghot-zone.js index 9cdb706cd..493fa80cd 100644 --- a/src/subpages/guide/components/wgts/imghot-zone.js +++ b/src/subpages/guide/components/wgts/imghot-zone.js @@ -31,7 +31,7 @@ function WgtImgHotZone(props) { return } - linkPage(item.linkPage, item.id, item) + linkPage(item) } const onClickAddCart = async (id) => { if (!S.getAuthToken()) { diff --git a/src/subpages/guide/components/wgts/limittime-slider.js b/src/subpages/guide/components/wgts/limittime-slider.js index 822990a70..dd72fca69 100644 --- a/src/subpages/guide/components/wgts/limittime-slider.js +++ b/src/subpages/guide/components/wgts/limittime-slider.js @@ -75,7 +75,7 @@ export default class WgtLimittimeSlider extends Component { > diff --git a/src/subpages/guide/components/wgts/navigation.js b/src/subpages/guide/components/wgts/navigation.js index 71b883593..2d568688f 100644 --- a/src/subpages/guide/components/wgts/navigation.js +++ b/src/subpages/guide/components/wgts/navigation.js @@ -14,9 +14,7 @@ export default class WgtNavigation extends Component { info: null } - handleClickItem(item, index) { - linkPage(item.linkPage, item.id) - } + handleClickItem = linkPage render() { const { info } = this.props diff --git a/src/subpages/guide/components/wgts/showcase.js b/src/subpages/guide/components/wgts/showcase.js index 79b4600f0..9d0f68bd4 100644 --- a/src/subpages/guide/components/wgts/showcase.js +++ b/src/subpages/guide/components/wgts/showcase.js @@ -17,9 +17,7 @@ export default class WgtShowCase extends Component { navigateTo = navigateTo - handleClickItem(item, index) { - linkPage(item.linkPage, item.id, item) - } + handleClickItem = linkPage render() { const { info } = this.props diff --git a/src/subpages/guide/components/wgts/slider-hotzone/index.js b/src/subpages/guide/components/wgts/slider-hotzone/index.js index d878a3ba8..0c90a7750 100644 --- a/src/subpages/guide/components/wgts/slider-hotzone/index.js +++ b/src/subpages/guide/components/wgts/slider-hotzone/index.js @@ -56,7 +56,7 @@ export default class WgtSliderHotzone extends Component { return } - linkPage(item.linkPage, item.id, item) + linkPage(item) } onClickAddCart = async (id) => { if (!S.getAuthToken()) {