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

src/components/axios/fetch.js

@@ -18,7 +18,7 @@ export function fetch(options) {
       headers: {
         'Content-Type': 'application/json',
         // 'Authorization': window['userData']?window['userData'].token:''
-        'Authorization':"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDMxMTMzMH0.4UEG6I9K0JARU5KDMW-Xwx13DMniYelsmI-qWd97e_c"
+        'Authorization':"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDMxNzM0NH0.3yWRj-qm-Rk1PcCc7KrifJiuExlzETSBznBxrtYA3dU"
         // 'token_in_header': global_.token,//token从全局变量那里传过来
       },
       timeout: 30 * 1000 // 30秒超时

src/views/ChallengeDetail.vue

@@ -147,45 +147,6 @@
             closeShareModal () {
                 this.showShareModal = false
             },
-            //倒计时
-            countDown (times) {
-                clearInterval(grabStartTimer)
-                grabStartTimer = null
-                grabStartTimer = setInterval(function () {
-                    let day = 0,
-                        hour = 0,
-                        minute = 0,
-                        second = 0//时间默认值
-                    // console.log('times:' + times)
-                    if (times > 0) {
-                        day = Math.floor(times / (60 * 60 * 24))
-                        hour = Math.floor(times / (60 * 60)) - (day * 24)
-                        minute = Math.floor(times / 60) - (day * 24 * 60) - (hour * 60)
-                        second = Math.floor(times) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
-
-                        if (day < 1) day = ''
-                        else day = day + '天'
-                        if (hour <= 9) hour = '0' + hour
-                        if (minute <= 9) minute = '0' + minute
-                        if (second <= 9) second = '0' + second
-                        this. grabTimer = (day + hour + '时' + minute + '分' + second + '秒')
-                    } else {
-                        clearInterval(grabStartTimer)
-
-                        // that.setData({
-                        //     redpack: {
-                        //         ...that.data.redpack,
-                        //         redpackStatus: 2
-                        //     }
-                        // })
-                    }
-                    times--
-                    //
-                    //console.log(day + "天:" + hour + "小时：" + minute + "分钟：" + second + "秒");
-
-                }, 1000)
-
-            }
         }
     }
 </script>