Merge branch 'colexiu1.3' into iteration_1.3.3

src/student/share-active/track-review-activity/index.tsx

@@ -56,9 +56,9 @@ export default defineComponent({
 
     // 判断是否在内容打开页面
     if (!browser().isApp) {
-      this.popupStatus = true
-      removeAuth()
-      return
+      // this.popupStatus = true
+      // removeAuth()
+      // return
     } else if (state.platformType === 'TEACHER') {
       this.onBackDialog('请使用酷乐秀学生端扫码打开')
       return
@@ -137,6 +137,12 @@ export default defineComponent({
       })
     },
     async onJoinActve() {
+      if (!browser().isApp) {
+        this.popupStatus = true
+        removeAuth()
+        return
+      }
+
       const activeInfo = this.activeInfo
       try {
         if (!this.checkActivityTime()) {
@@ -467,7 +473,7 @@ export default defineComponent({
               <img
                 src={getAssetsHomeFile('icon_close.png')}
                 class={styles.popupClose}
-                onClick={this.onOpenApp}
+                onClick={()=>this.popupStatus = false}
               />
             </div>