bug fixes

src/pages/course/learn/item.vue

@@ -72,12 +72,7 @@ export default {
     },
     handleClick(data) {
       if (this.isWeapp) {
-        let url = `/pages/course/item?id=${this.courseId}&chapter_id=${data.id}`
-        // 未开通
-        if (!data.free && !this.isVip) {
-          url = `/pages/web/index?src=${window.location.origin}/pay`
-        }
-        wx.miniProgram.navigateTo({ url })
+        wx.miniProgram.navigateTo({ url: `/pages/course/item?id=${this.courseId}&chapter_id=${data.id}` })
       } else {
         window.alert('请在微信小程序中打开')
       }

src/pages/course/player/item.vue

@@ -53,12 +53,7 @@ export default {
     },
     handleClick(data) {
       if (this.isWeapp) {
-        let url = `/pages/course/player?course_id=${this.courseId}&chapter_id=${data.id}`
-        // 未开通
-        if (!data.free && !this.isVip) {
-          url = `/pages/web/index?src=${window.location.origin}/pay`
-        }
-        wx.miniProgram.navigateTo({ url })
+        wx.miniProgram.navigateTo({ url: `/pages/course/player?course_id=${this.courseId}&chapter_id=${data.id}` })
       } else {
         window.alert('请在微信小程序中打开')
       }

src/pages/course/tag/components/courseTagMessage.vue

@@ -34,7 +34,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['isWeapp', 'isAndroid', 'isIos', 'isVip']),
+    ...mapState(['isWeapp', 'isAndroid', 'isIos', 'isVip', 'isLogin']),
     hasMore() {
       return this.data.tag ? this.data.tag.length > this.maxCount : false
     },
@@ -59,14 +59,16 @@ export default {
   },
   methods: {
     onClick(data) {
+      // 未登录
+      if (!data.free && !this.isLogin) {
+        this.isWeapp ? wx.miniProgram.navigateTo({ url: '/pages/login/index' }) : this.$router.push({ name: 'login' })
+        return
+      }
       // 未开通
       if (!data.free && !this.isVip) {
-        if (this.isWeapp) {
-          const url = `/pages/web/index?src=${window.location.origin}/pay`
-          wx.miniProgram.navigateTo({ url })
-        } else {
-          this.$router.push({ name: 'pay' })
-        }
+        this.isWeapp
+          ? wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${window.location.origin}/pay` })
+          : this.$router.push({ name: 'pay' })
         return
       }
       if (this.isTest) {

src/pages/course/tag/components/searchTagMessage.vue

@@ -45,6 +45,9 @@ export default {
     isVip() {
       return this.$store.state.isVip
     },
+    isLogin() {
+      return this.$store.state.isLogin
+    },
     hasMore() {
       return this.data.length > this.maxCount
     },
@@ -57,14 +60,17 @@ export default {
   },
   methods: {
     onClick(data) {
+      // 未登录
+      if (!data.free && !this.isLogin) {
+        this.isWeapp ? wx.miniProgram.navigateTo({ url: '/pages/login/index' }) : this.$router.push({ name: 'login' })
+        return
+      }
       // 未开通
       if (!data.free && !this.isVip) {
-        if (this.isWeapp) {
-          const url = `/pages/web/index?src=${window.location.origin}/pay`
-          wx.miniProgram.navigateTo({ url })
-        } else {
-          this.$router.push({ name: 'pay' })
-        }
+        this.isWeapp
+          ? wx.miniProgram.navigateTo({ url: `/pages/web/index?src=${window.location.origin}/pay` })
+          : this.$router.push({ name: 'pay' })
+        return
       }
       if (this.isTest) {
         // 知识点测试

src/pages/my/alarm/index.vue

@@ -26,7 +26,10 @@
       <div class="qrcode">
         <p>开启学习提醒功能，需先关注紫荆职教公众号。</p>
         <div class="ui-button" style="margin:40px 0 10px;">
-          <a href="https://mp.weixin.qq.com/s/xcWMbYk5NgzUF3qxLzGTMg">关注公众号</a>
+          <a
+            href="https://mp.weixin.qq.com/s/xcWMbYk5NgzUF3qxLzGTMg"
+            @click="followPopupVisible = false"
+          >关注公众号</a>
         </div>
       </div>
     </van-popup>

src/pages/my/learn/item.vue

@@ -57,12 +57,7 @@ export default {
     },
     handleClick(data) {
       if (this.isWeapp) {
-        let url = `/pages/course/item?id=${this.courseId}&chapter_id=${data.id}`
-        // 未开通
-        if (!data.free && !this.isVip) {
-          url = `/pages/web/index?src=${window.location.origin}/pay`
-        }
-        wx.miniProgram.navigateTo({ url })
+        wx.miniProgram.navigateTo({ url: `/pages/course/item?id=${this.courseId}&chapter_id=${data.id}` })
       } else {
         window.alert('请在微信小程序中打开')
       }