Merge remote-tracking branch 'remotes/origin/mutou' into dev_yijun

src/components/NoticeBonus.vue

 <template>
+    <div>
         <div class="notice_bonus" v-if="isShowNotice">
             <img class="icon_container" src="../images/components/NoticeBonus/sy_guangbo.png" alt="">
             <div ref="container" class="msg_container">
@@ -9,6 +10,7 @@
                 <div :class="['notice_msg', startAnimate?'msg2':'']">{{msg2}}</div>
             </div>
         </div>
+    </div>
 </template>
 
 <style>
@@ -122,13 +124,13 @@
 </style>
 
 <script>
-  import {gameInfo} from "@/components/axios/api";
+    import {gameInfo} from "@/components/axios/api"
 
     export default {
         name: "NoticeBonus",
         data() {
             return {
-        isShowNotice:false,
+                isShowNotice: false,
                 notice_list: [],
                 gameInfo: {
                     "fly_top": [],
@@ -140,7 +142,7 @@
                 msg1: "",
                 msg2: "",
 
-      };
+            }
         },
         // props: ["notice_list"],
         // computed: {
@@ -151,12 +153,12 @@
         methods: {
             stopScroll(e) {
                 console.log(e)
-        e.preventDefault();
+                e.preventDefault()
             },
             getGameInfo(nonRefresh) {
                 gameInfo().then(result => {
                     console.log("result", result)
-          if (result.code == 0) {
+                    if (result.code == 0 && result.data.lenght > 0) {
                         let fly_bot = result.data.fly_bot
                         let fly_top = result.data.fly_top
                         let len = Math.max(fly_bot.length, fly_top.length)
@@ -171,7 +173,7 @@
                         this.msg2 = this.notice_list[1]
                         console.log("this.notice_list", this.notice_list)
 
-            this.isShowNotice=true
+                        this.isShowNotice = true
                     }
                 })
             },
@@ -204,5 +206,5 @@
         mounted() {
             this.msgAnimate()
         }
-  };
+    }
 </script>

src/components/axios/fetch.js

@@ -30,16 +30,16 @@ export function fetch(options) {
         resolve(response.data);//把请求到的数据发到引用请求的地方
       })
       .catch(error => {
-        // console.log('请求异常信息：', error);
-        // console.log(error);
-        // if (error.response.status == 401) {
-        //   localStorage.setItem('last_url', location.hash.slice(1));
-        //   localStorage.setItem('walk_userData', '');
-        //   location.replace('#/Author');
-        //   // this.$router.push({name:"Author"})
-        // } else {
-        //   reject(error);
-        // }
+        console.log('请求异常信息：', error);
+        console.log(error);
+        if (error.response.status == 401) {
+          localStorage.setItem('last_url', location.hash.slice(1));
+          localStorage.setItem('walk_userData', '');
+          location.replace('#/Author');
+          // this.$router.push({name:"Author"})
+        } else {
+          reject(error);
+        }
 
       });
   });

src/views/ChallengeDetail.vue

@@ -189,12 +189,14 @@
             width: 6.4rem;
             padding: 0.3rem 0;
             box-sizing: border-box;
-            background: linear-gradient(
-                    90deg,
-                    rgba(255, 255, 255, 0),
-                    #1a285a,
-                    rgba(255, 255, 255, 0)
-            );
+            background: url("../images/SignUp/shadow-bg.png") no-repeat center center;
+            background-size: contain;
+            /*background: linear-gradient(*/
+            /*        90deg,*/
+            /*        rgba(255, 255, 255, 0),*/
+            /*        #1a285a,*/
+            /*        rgba(255, 255, 255, 0)*/
+            /*);*/
             margin-top: 2.38rem;
             .bonus-title {
                 font-size: 0.3rem;
@@ -279,7 +281,7 @@
             color: #fff;
             font-weight: bold;
             text-align: center;
-            margin-top: 2.24rem;
+            margin-top: 1.1rem;
         }
     }
 </style>

src/views/PartakeChallenge.vue

@@ -171,12 +171,15 @@
                 this.modalShown = true
             },
             showSuccess () {
-                this.showModal("温馨提示", "报名成功", {
-                    scb: () => {
                 sessionStorage.setItem('userHaveJoinGame', 'true')
+                sessionStorage.setItem('userHavePaidGame', 'true');
                 this.$router.push({name: "HaveJoinedGame"})
-                    }
-                })
+                // this.showModal("温馨提示", "报名成功", {
+                //     scb: () => {
+                //         sessionStorage.setItem('userHaveJoinGame', 'true')
+                //         sessionStorage.setItem('userHavePaidGame', 'true');
+                //     }
+                // })
             },
             closeFree () {
                 this.showFreeModal = false

src/views/SignUp.vue

@@ -86,7 +86,7 @@
                 this.getPageData(grade)
             }else{
                 // console.log('grade 0',grade)
-                this.getPageData()
+                this.getPageData(this.choosedLevel)
             }
         },
         mounted() {