Merge branch 'master' into dev

pages/index/index.vue

@@ -612,8 +612,18 @@ export default {
         });
       } else if (swiper.jumpType == 3) {
         //内部接口
+        const { jumpUrl } = swiper
+        const map = ["pages/index/index", "pages/course/index", "pages/learn/index", "pages/questionBank/index"]
+        const isSwitch = map.find(e => jumpUrl.includes(e))
+        // tab页
+        if (isSwitch) {
+          uni.switchTab({
+            url: jumpUrl
+          })
+          return
+        }
         uni.navigateTo({
-          url: swiper.jumpUrl,
+          url: jumpUrl,
         });
       } else if (swiper.jumpType == 4) {
         //外部接口