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

src/components/HelloWorld.vue

@@ -58,7 +58,7 @@
 
         wx.config({
           debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-          appId: "wx9af64967a0d40159", // 必填，公众号的唯一标识
+          appId: "wxd1aab06cc88d0a5e", // 必填，公众号的唯一标识
           timestamp: res.timestamp, // 必填，生成签名的时间戳
           nonceStr: res.nonceStr, // 必填，生成签名的随机串
           signature: res.signature, // 必填，签名

src/views/Author.vue

@@ -20,7 +20,7 @@
         let local_hash = location.hash;
         window.localStorage.setItem("local_hash", local_hash);
         let redirect_uri = encodeURIComponent(`${location.origin}${location.pathname}`);
-        location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx9af64967a0d40159&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`);
+        location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd1aab06cc88d0a5e&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`);
       } else {
         console.log("拿到code", code);
         console.log("请求登录");
@@ -54,7 +54,7 @@
               // setTimeout(() => {
               //   //   this.$router.go("/MyData");
               location.replace(
-                `https://miniapp-api.wxatech.com/app_pages/read_daka.html?#${last_url}`
+                `https://miniapp-api.wxatech.com/app_pages/walk_daka.html?#${last_url}`
               );
               // }, 60000);
             }

src/views/ChallengeDetail.vue

@@ -35,7 +35,7 @@
                 </div>
             </div>
         </div>
-        <div class="share-btn" @click="inviteFriend">邀请好友来参赛0</div>
+        <div class="share-btn" @click="inviteFriend">邀请好友来参赛</div>
         <ShareModal
                 v-on:close="closeShareModal"
                 v-if="showShareModal"

src/views/HaveJoinedGame.vue

@@ -158,7 +158,7 @@ export default {
       if (sessionStorage.getItem("bushuType")) {
         grade = sessionStorage.getItem("bushuType");
       }
-      daka_status_detail(this.$route.query.week = 20190401, grade).then(res => {
+      daka_status_detail(this.$route.query.week, grade).then(res => {
         if (res.code === 0) {
           const pageData = res.data;
           if (pageData.record_list && pageData.record_list.length) {

src/views/MainPage.vue

@@ -3,7 +3,7 @@
     <router-view/>
     <div class="bottom-bar">
       <div class="bottom-tab" @click="selectTab('SignUp')">
-        <div :class="['text', currentPage()==='SignUp'?'active':'']">7天健步挑战赛</div>
+        <div :class="['text', currentPage()==='SignUp'?'active':'']">3天健步挑战赛</div>
       </div>
       <div class="bottom-tab" @click="selectTab('nowGame')">
         <div :class="['text', (currentPage()==='MainPagePartakeChallenge'||currentPage()==='MainPageHaveJoinedGame')?'active':'']">当前比赛</div>