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

src/components/axios/api.js

@@ -235,7 +235,7 @@ export function track(key) {
     method: 'GET',
     params: {
       //传过去的参数
-      p: `study`,
+      p: `bsdk`,
       k: `${key}`,
       u: window['userData'] ? window['userData'].id : ''
     }

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

@@ -10,7 +10,7 @@
             <div class="bonus-title" v-else>达标奖励金（元）</div>
             <div class="bonus-amount">{{pageData.bet_bonus}}</div>
         </div>
-        <div class="game-title">{{pageData.target_step}}步三日耐力赛</div>
+        <div class="game-title">{{pageData.target_step}}步3日耐力赛</div>
         <div class="game-time">开赛时间：{{pageData.start_format}} — {{pageData.end_format}}</div>
         <div class="hr"></div>
         <div class="game-info-container">
@@ -67,7 +67,7 @@
             if (window["userData"]) {
                 this.userData = window["userData"]
             } else {
-                let localUserData = localStorage.getItem("bs_userData")
+                let localUserData = localStorage.getItem("walk_userData")
                 if (localUserData) {
                     window["userData"] = JSON.parse(localUserData)
                     this.userData = window["userData"]
@@ -135,9 +135,11 @@
                         imgUrl: result.img_url, // 分享图标
                         success: function (res) {
                             console.log("option4Success", res)
+                            this.showShareModal = false
                         },
                         fail: err => {
                             console.log("option4error", err)
+                            this.showShareModal = false
                         }
                     }
                     // wx.onMenuShareTimeline(option4);

src/views/GoXCX.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="tip-title">如何完成打卡？</div>
-    <div class="tip-content">1、识别上方二维码，打开「运动打卡」小程序</div>
+    <div class="tip-content">1、识别上方二维码，打开「步步运动赚」小程序</div>
     <div class="tip-content">2、在小程序中授权获取每日微信运动步数</div>
     <div class="tip-content">3、退出小程序中，返回打卡页面</div>
     <div class="tip-content">4、成功获取每日微信运动步数，打卡成功</div>