Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/pages/course/tag/courseTagMessage.vue

@@ -57,12 +57,10 @@ export default {
     onClick(data) {
       if (this.isTest) {
         // 知识点测试
-        const papersUrl = encodeURIComponent('zy/v2/examination/course-papers')
-        const path = `/exam/answer?type=2&tag_id=${data.id}&papersUrl=${papersUrl}`
+        const path = `/exam/answer?type=2&tag_id=${data.id}&papersUrl=zy/v2/examination/course-papers`
         if (this.isWeapp) {
-          wx.miniProgram.navigateTo({
-            url: `/pages/web/index?src=${window.location.origin}${path}`
-          })
+          const src = encodeURIComponent(`${window.location.origin}${path}`)
+          wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${src}` })
         } else {
           this.$router.push({ path })
         }

src/pages/course/tag/item.vue

@@ -65,11 +65,11 @@ export default {
     },
     // 去知识点考试页面
     toExamPage() {
-      const papersUrl = encodeURIComponent('zy/v2/examination/course-papers')
-      const path = `/exam/answer?type=2&tag_id=${this.detail.id}&papersUrl=${papersUrl}`
+      const path = `/exam/answer?type=2&tag_id=${this.detail.id}&papersUrl=zy/v2/examination/course-papers`
       if (this.isWeapp) {
+        const src = encodeURIComponent(`${window.location.origin}${path}`)
         wx.miniProgram.navigateTo({
-          url: `/pages/web/index?src=${window.location.origin}${path}`
+          url: `/pages/web/index?src=${src}`
         })
       } else {
         this.$router.push({ path })

src/pages/course/tag/list.vue

@@ -74,14 +74,12 @@ export default {
         })
     },
     onClick({ id }) {
-      const papersUrl = encodeURIComponent('zy/v2/examination/course-papers')
-      const path = `/exam/answer?type=2&tag_id=${id}&papersUrl=${papersUrl}`
+      const path = `/exam/answer?type=2&tag_id=${id}&papersUrl=zy/v2/examination/course-papers`
       if (this.isWeapp) {
         if (this.isTest) {
           // 知识点测试
-          wx.miniProgram.navigateTo({
-            url: `/pages/web/index?src=${window.location.origin}${path}`
-          })
+          const src = encodeURIComponent(`${window.location.origin}${path}`)
+          wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${src}` })
         } else {
           wx.miniProgram.navigateTo({
             url: `/pages/web/index?src=${window.location.origin}/course/tag/${id}`

src/pages/course/tag/searchTagMessage.vue

@@ -53,12 +53,10 @@ export default {
     onClick(data) {
       if (this.isTest) {
         // 知识点测试
-        const papersUrl = encodeURIComponent('zy/v2/examination/course-papers')
-        const path = `/exam/answer?type=2&tag_id=${data.id}&papersUrl=${papersUrl}`
+        const path = `/exam/answer?type=2&tag_id=${data.id}&papersUrl=zy/v2/examination/course-papers`
         if (this.isWeapp) {
-          wx.miniProgram.navigateTo({
-            url: `/pages/web/index?src=${window.location.origin}${path}`
-          })
+          const src = encodeURIComponent(`${window.location.origin}${path}`)
+          wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${src}` })
         } else {
           this.$router.push({ path })
         }

src/pages/course/tag/tagMessage.vue

@@ -74,9 +74,8 @@ export default {
     toExamPage() {
       const path = `/exam/answer?type=2&tag_id=${this.data.id}&papersUrl=zy/v2/examination/course-papers`
       if (this.isWeapp) {
-        wx.miniProgram.navigateTo({
-          url: `/pages/web/index?src=${window.location.origin}${path}`
-        })
+        const src = encodeURIComponent(`${window.location.origin}${path}`)
+        wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${src}` })
       } else {
         this.$router.push({ path })
       }