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

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')
-                        this.$router.push({name: "HaveJoinedGame"})
-                    }
-                })
+                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() {