Merge branch 'dev' into feature-zyw

d6493893 · 赵雅纹 · 5c096e62 · 3084d050 · d6493893 · d6493893
Commit d6493893 authored Jun 15, 2019 by 赵雅纹
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

bottom.js src/component/bottom/bottom.js +2 -1

imageSwiper.js src/component/imageSwiper/imageSwiper.js +2 -1

picNav.js src/component/picNav/picNav.js +2 -1

No files found.
--- a/src/component/bottom/bottom.js
+++ b/src/component/bottom/bottom.js
@@ -76,7 +76,8 @@ Component({
          wxService.router(`${currentClickType}`)
        } else if (link.type == 5) {
          if (currentClickType == 1) {
-            wxService.openCardList()
+            // wxService.openCardList()
+            wxService.openCard()
          } else if (currentClickType == 2) {
            wxService.openCard()
          }

--- a/src/component/imageSwiper/imageSwiper.js
+++ b/src/component/imageSwiper/imageSwiper.js
@@ -65,7 +65,8 @@ Component({
        wxService.router(`${currentClickType}`)
      } else if (link.type == 5) {
        if (currentClickType == 1) {
-          wxService.openCardList()
+          // wxService.openCardList()
+          wxService.openCard()
        } else if (currentClickType == 2) {
          wxService.openCard()
        }

--- a/src/component/picNav/picNav.js
+++ b/src/component/picNav/picNav.js
@@ -72,7 +72,8 @@ Component({
        wxService.router(`${currentClickType}`)
      } else if (link.type == 5) {
        if (currentClickType == 1) {
-          wxService.openCardList()
+          // wxService.openCardList()
+          wxService.openCard()
        } else if (currentClickType == 2) {
          wxService.openCard()
        }