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

src/components/Free.vue

@@ -342,7 +342,7 @@
       if (window["userData"]) {
         this.userData = window["userData"];
       } else {
-        let localUserData = localStorage.getItem("read_userData");
+        let localUserData = localStorage.getItem("walk_userData");
         if (localUserData) {
           window["userData"] = JSON.parse(localUserData);
           this.userData = window["userData"];

src/components/Reborn.vue

@@ -270,7 +270,7 @@
       if (window["userData"]) {
         this.userData = window["userData"];
       } else {
-        let localUserData = localStorage.getItem("read_userData");
+        let localUserData = localStorage.getItem("walk_userData");
         if (localUserData) {
           window["userData"] = JSON.parse(localUserData);
           this.userData = window["userData"];

src/components/Title.vue

@@ -54,6 +54,7 @@
   .title_container {
     font-size: 0.36rem;
     color: #ffffff;
+    z-index: 999;
   }
 
   .title_container > div {

src/components/axios/api.js

@@ -17,9 +17,8 @@ function getPlatform() {
 //打卡查询
 export function dakaStatus() { //lookOption是你要调用接口的名字，issuer,userId是传进来的参数
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaStatusPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -28,15 +27,12 @@ export function dakaStatus() { //lookOption是你要调用接口的名字，issu
 
 // 打卡操作
 export function daka(use_rebirth) { //lookOption是你要调用接口的名字，issuer,userId是传进来的参数
-
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       use_rebirth: use_rebirth || 0,
-
     }
   })
 }
@@ -44,9 +40,8 @@ export function daka(use_rebirth) { //lookOption是你要调用接口的名字
 // 打卡总计
 export function dakaRecordTotal() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaRecordsTotalPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -56,9 +51,8 @@ export function dakaRecordTotal() {
 // 打卡记录列表
 export function dakaRecordList(page, perpage) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaRecordsListPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       // 第几页(从1开始)
@@ -72,9 +66,8 @@ export function dakaRecordList(page, perpage) {
 // 打卡总计
 export function dakaRecordDetail(page, perpage, period, daka) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaRecordsDetailPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       // 第几页(从1开始)
@@ -90,9 +83,8 @@ export function dakaRecordDetail(page, perpage, period, daka) {
 // 走马灯，玩法
 export function gameInfo() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.gameInfoPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -102,9 +94,8 @@ export function gameInfo() {
 // 余额查询
 export function balanceQuery() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.balanceQueryPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -120,9 +111,8 @@ export function balanceWithdraw(money, code) {
     params["money"] = money
   }
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.balanceWithdrawPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: params
   })
 }
@@ -130,9 +120,8 @@ export function balanceWithdraw(money, code) {
 // 常见问题
 export function faq() { //lookOption是你要调用接口的名字，issuer,userId是传进来的参数
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.faqPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -142,9 +131,8 @@ export function faq() { //lookOption是你要调用接口的名字，issuer,user
 // 客服
 export function kefu() { //lookOption是你要调用接口的名字，issuer,userId是传进来的参数
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.kefuPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -154,9 +142,8 @@ export function kefu() { //lookOption是你要调用接口的名字，issuer,use
 // 关注公众号
 export function ocFollow() { //lookOption是你要调用接口的名字，issuer,userId是传进来的参数
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.ocFollowPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -177,9 +164,8 @@ export function dakaPay(days,use_contract) {
     from_type = localStorage.getItem('from_type');
   }
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaPayPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       //  platform:  ios, android, other
@@ -195,9 +181,8 @@ export function dakaPay(days,use_contract) {
 // jssdk注入
 export function jssdk(url) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.jssdkPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       //  platform:  ios, android, other
@@ -209,9 +194,8 @@ export function jssdk(url) {
 // 用户复活卡，免契约金卡信息
 export function userCards() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.userCardPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -221,9 +205,8 @@ export function userCards() {
 // 获取分享内容
 export function shareContent(from_type) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.shareContentPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       from_type: from_type || ''
@@ -234,9 +217,8 @@ export function shareContent(from_type) {
 // 获取规则内容
 export function getRule() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.getRulePath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       from_type: from_type || ''
@@ -248,9 +230,8 @@ export function getRule() {
 // 数据埋点
 export function track(key) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.trackingPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       p: `study`,
@@ -264,9 +245,8 @@ export function track(key) {
 export function liinShare(key) {
   var new_user = sessionStorage.getItem('new_user') ? 1 : 0;
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.liinShareImagePath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       new_user: new_user
@@ -277,9 +257,8 @@ export function liinShare(key) {
 // 每日分享图
 export function dailyShare(from_type) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dailyShareImagePath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       from_type: from_type || "daily_share"
@@ -290,9 +269,8 @@ export function dailyShare(from_type) {
 // 打卡排行榜
 export function dakaRank(page, per_page, period) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.dakaRankPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       page: page || 1,
@@ -305,9 +283,8 @@ export function dakaRank(page, per_page, period) {
 // 新用户
 export function firstDaka() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.firstDakaPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {}
   })
 }
@@ -315,9 +292,8 @@ export function firstDaka() {
 // 个人排名
 export function personRank(period) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.personRankInfoPath,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       period: period
     }
@@ -327,9 +303,8 @@ export function personRank(period) {
 // 用户当月打卡状态查询
 export function daka_status_list(year_month) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.daka_status_list,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       year_month: year_month || ""
     }
@@ -339,9 +314,8 @@ export function daka_status_list(year_month) {
 // 每日故事详情
 export function story_detail(story_id, story_index) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.story_detail,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       story_id: story_id,
       story_index: story_index,
@@ -352,9 +326,8 @@ export function story_detail(story_id, story_index) {
 // 每日故事列表
 export function story_list() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.story_list,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {}
   })
 }
@@ -363,9 +336,8 @@ export function story_list() {
 // 记录详情
 export function daka_records_detail(course_id) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.daka_records_detail,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
       course_id: course_id,
@@ -376,9 +348,8 @@ export function daka_records_detail(course_id) {
 // 记录详情
 export function daka_rule() {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.daka_rule,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       //传过去的参数
     }
@@ -389,9 +360,8 @@ export function daka_rule() {
 // 红包图片
 export function withdraw_img(position) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.withdraw_img,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       position: position || ""
     }
@@ -401,9 +371,8 @@ export function withdraw_img(position) {
 // 资金明细
 export function withdraw_log(page) {
   return fetch({
-    //api.Hallowmas 引用url.js里面的数据
     url: api.withdraw_log,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       page: page,
       per_page: 10
@@ -415,7 +384,7 @@ export function withdraw_log(page) {
 export function daka_index(grade) {
   return fetch({
     url: api.daka_index,
-    method: 'GET',//请求方法
+    method: 'GET',
     params: {
       grade: grade
     }

src/components/axios/fetch.js

@@ -2,7 +2,7 @@ import axios from 'axios';//引入axios
 
 export function fetch(options) {
   // if (!window['userData']) {
-  //   let user_data_str = localStorage.getItem('read_userData');
+  //   let user_data_str = localStorage.getItem('walk_userData');
   //   if (user_data_str) {
   //     window['userData'] = JSON.parse(user_data_str);
   //   }
@@ -34,7 +34,7 @@ export function fetch(options) {
         // console.log(error);
         // if (error.response.status == 401) {
         //   localStorage.setItem('last_url', location.hash.slice(1));
-        //   localStorage.setItem('read_userData', '');
+        //   localStorage.setItem('walk_userData', '');
         //   location.replace('#/Author');
         //   // this.$router.push({name:"Author"})
         // } else {

src/components/axios/url.js

@@ -77,7 +77,7 @@ export default {
   daka_records_detail: `${api}/api/v1/daka_records/detail`,
   // 25 规则详情
   daka_rule: `${api}/api/v1/daka_rule`,
-// 26 红包 /api/v1/withdraw_img
+  // 26 红包 /api/v1/withdraw_img
   withdraw_img: `${api}/api/v1/withdraw_img`,
   // 27 提现明细 /api/v1/withdraw_log
   withdraw_log: `${api}/api/v1/withdraw_log`,

src/main.js

@@ -17,7 +17,7 @@ window.wx = wx;
 
 router.beforeEach((to, from, next) => {
   // document.title = to.meta.title		//修改各个页面的title
-  var uid = localStorage.getItem('read_userData');
+  var uid = localStorage.getItem('walk_userData');
   if (location.search.match(/inviter/)) {
     let searchs = location.search.split('&');
     let search_obj = {};

src/views/Author.vue

@@ -7,6 +7,11 @@
   // var url = getToUrl();
   export default {
     name: "Author",
+    data() {
+      return {
+        uid: ""
+      };
+    },
     created() {
       document.title = "微信授权中";
       var code = this.GetUrlParame("code"); // 截取code
@@ -14,18 +19,14 @@
       if (!code) {
         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`
-        );
+        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`);
       } else {
         console.log("拿到code", code);
         console.log("请求登录");
 
         let inviter = localStorage.getItem("inviter");
-        var uid = localStorage.getItem('read_userData');
+        var uid = localStorage.getItem('walk_userData');
         if (uid && inviter == JSON.parse(uid).id) {
           inviter = "";
         }
@@ -46,7 +47,7 @@
             }
             let result = res.data;
             if (result.code == 0) {
-              localStorage.setItem("read_userData", JSON.stringify(result.data));
+              localStorage.setItem("walk_userData", JSON.stringify(result.data));
               sessionStorage.setItem("new_user", result.data.new_user);
               let last_url = localStorage.getItem("last_url") || "/";
               let url = location.href.split("#")[0];
@@ -65,11 +66,6 @@
           });
       }
     },
-    data() {
-      return {
-        uid: ""
-      };
-    },
     methods: {
       // 截取code
       GetUrlParame(parameName) {

src/views/HaveJoinedGame.vue

@@ -8,9 +8,9 @@
         <div class="game-title">5000步七日耐力赛</div>
         <div class="game-time">开赛时间：3月11日 00:00-3月17日24:00</div>
         <div class="target-people-container">
-            <img class="target-img" src="../images/ChallengeDetail/ic_shoes.png">
+            <!-- <img class="target-img" src="../images/ChallengeDetail/ic_shoes.png"> -->
             <div class="target-people-text">每日5000步达标</div>
-            <img class="people-img" src="../images/ChallengeDetail/ic_people.png">
+            <!-- <img class="people-img" src="../images/ChallengeDetail/ic_people.png"> -->
             <div class="target-people-text">已有2468人参赛</div>
         </div>
         <div class="hr"></div>
@@ -93,13 +93,55 @@
             </swiper-slide>
         </swiper>
         <div class="func-btn" @click="goOtherPage('GoXCX')">提交今日步数</div>
+        <!-- 报名成功弹框 -->
+        <!-- <div class="game-status-popup">
+          <div class="game-status-container">
+            <img class="status-icon" src="../images/HaveJoinedGame/pop_bmcg_title.png">
+            <img class="join-success-banner" src="../images/HaveJoinedGame/pop_bmcg_img.png">
+            <div class="popup-text1"><span>每日24点前</span>打开「运动打卡」小程序，手动提交今日步数，否则可能导致无法分钱哦！</div>
+            <div class="popup-text2">注：微信暂不支持小程序实时更新步数</div>
+            <div class="popup-btn1 green-btn">邀请好友来参赛</div>
+            <img class="close-btn" src="../images/common/pop_ic_close.png">
+          </div>
+        </div> -->
+        <!-- 恭喜达标弹框 -->
+        <!-- <div class="game-status-popup">
+          <div class="game-status-container">
+            <img class="status-icon" src="../images/HaveJoinedGame/pop_gxdb_title.png">
+            <div class="status-date">第2日达标</div>
+            <div class="status-money">
+              <div class="popup-text3">返还契约金</div>
+              <div class="popup-text4">1.00<span>元</span></div>
+              <div class="popup-text5">第0311期5000步7日耐力赛</div>
+            </div>
+            <div class="popup-text6">5000步达标，今天走了6823步</div>
+            <div class="popup-btn1 green-btn">炫耀一下</div>
+            <img class="close-btn" src="../images/common/pop_ic_close.png">
+          </div>
+        </div> -->
+        <!-- 你已被淘汰弹框 -->
+        <!-- <div class="game-status-popup">
+          <div class="game-status-container">
+            <img class="status-icon" src="../images/HaveJoinedGame/pop_out_title.png">
+            <div class="status-date">第3日未达标</div>
+            <div class="status-money">
+              <div class="popup-text3">扣除契约金</div>
+              <div class="popup-text4">1.00<span>元</span></div>
+              <div class="popup-text5">第0311期5000步7日耐力赛</div>
+            </div>
+            <div class="popup-text6">5000步达标，今天走了6823步</div>
+            <div class="popup-text7">已达标3天，契约金已返还至你的钱包</div>
+            <div class="popup-btn1 yellow-btn">报名下一期</div>
+            <img class="close-btn" src="../images/common/pop_ic_close.png">
+          </div>
+        </div> -->
     </div>
 </template>
 
 <script>
     import Title from "@/components/Title.vue"
-    import 'swiper/dist/css/swiper.css'
-    import {swiper, swiperSlide} from 'vue-awesome-swiper'
+    import "swiper/dist/css/swiper.css"
+    import {swiper, swiperSlide} from "vue-awesome-swiper"
 
     export default {
         name: "HaveJoinedGame",
@@ -113,17 +155,17 @@
                 rate: 50,
                 banner_list: [
                     {
-                        image: 'http://localhost:8080/img/img_card.440e4585.png',
+                        // image: "http://localhost:8080/img/img_card.440e4585.png"
                     },
                     {
-                        image: 'http://localhost:8080/img/img_card.440e4585.png',
+                        // image: "http://localhost:8080/img/img_card.440e4585.png"
                     },
                     {
-                        image: 'http://localhost:8080/img/img_card.440e4585.png',
+                        // image: "http://localhost:8080/img/img_card.440e4585.png"
                     }
                 ],
                 swiperOption: {
-                    slidesPerView: 'auto',
+                    slidesPerView: "auto",
                     centeredSlides: true,
                     spaceBetween: 10
                 }
@@ -164,7 +206,7 @@
         width: 100%;
         min-height: 100vh;
         background-color: rgb(70, 88, 149);
-        background-image: url(../images/SignUp/sy_beijing.png);
+        background-image: url(../images/HaveJoinedGame/img_card.png);
         background-repeat: no-repeat;
         background-size: 100%;
         background-position: center top;
@@ -181,70 +223,75 @@
         }
         .game-bonus-container {
             width: 6.4rem;
-            padding: .3rem 0;
+            padding: 0.3rem 0;
             box-sizing: border-box;
-            background: linear-gradient(90deg, rgba(255, 255, 255, 0), #1A285A, rgba(255, 255, 255, 0));
+            background: linear-gradient(
+                    90deg,
+                    rgba(255, 255, 255, 0),
+                    #1a285a,
+                    rgba(255, 255, 255, 0)
+            );
             margin-top: 2.38rem;
             .bonus-title {
-                font-size: .3rem;
+                font-size: 0.3rem;
                 line-height: 1;
                 color: #fff;
                 text-align: center;
             }
             .bonus-amount {
-                font-size: .64rem;
-                line-height: .8;
-                color: #FFE253;
+                font-size: 0.64rem;
+                line-height: 0.8;
+                color: #ffe253;
                 text-align: center;
-                margin-top: .26rem;
+                margin-top: 0.26rem;
             }
         }
         .game-title {
-            font-size: .36rem;
+            font-size: 0.36rem;
             line-height: 1;
             color: #fff;
             font-weight: bold;
-            margin-top: .4rem;
+            margin-top: 0.4rem;
         }
         .game-time {
-            font-size: .24rem;
+            font-size: 0.24rem;
             line-height: 1;
-            color: #D6DFFF;
-            padding: .12rem .38rem;
-            border-radius: .48rem;
-            background: #556CB6;
-            margin-top: .14rem;
+            color: #d6dfff;
+            padding: 0.12rem 0.38rem;
+            border-radius: 0.48rem;
+            background: #556cb6;
+            margin-top: 0.14rem;
         }
         .target-people-container {
             display: flex;
-            margin-top: .34rem;
+            margin-top: 0.34rem;
             .target-img {
-                width: .3rem;
-                height: .26rem;
+                width: 0.3rem;
+                height: 0.26rem;
             }
             .people-img {
-                width: .28rem;
-                height: .24rem;
-                margin-left: .5rem;
+                width: 0.28rem;
+                height: 0.24rem;
+                margin-left: 0.5rem;
             }
             .target-people-text {
-                font-size: .26rem;
+                font-size: 0.26rem;
                 line-height: 1;
                 color: #fff;
-                margin-left: .08rem;
+                margin-left: 0.08rem;
             }
         }
         .hr {
             width: 3rem;
-            height: .01rem;
-            background: #6F82C3;
-            margin-top: .5rem;
+            height: 0.01rem;
+            background: #6f82c3;
+            margin-top: 0.5rem;
         }
         .game-scroll-container {
             width: 100%;
             height: 2.68rem;
-            margin-top: .4rem;
-            padding: 0 .3rem;
+            margin-top: 0.4rem;
+            padding: 0 0.3rem;
             box-sizing: border-box;
             overflow-x: scroll;
             white-space: nowrap;
@@ -257,9 +304,9 @@
                 background-image: url(../images/ChallengeDetail/img_card.png);
                 background-repeat: no-repeat;
                 background-size: 100% 100%;
-                padding-top: .24rem;
+                padding-top: 0.24rem;
                 box-sizing: border-box;
-                margin-left: .2rem;
+                margin-left: 0.2rem;
                 display: inline-block;
                 vertical-align: top;
                 &:first-child {
@@ -267,82 +314,82 @@
                 }
                 .item-title-status {
                     width: 100%;
-                    padding: 0 .24rem 0 .3rem;
+                    padding: 0 0.24rem 0 0.3rem;
                     box-sizing: border-box;
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
                     .item-title {
-                        font-size: .3rem;
+                        font-size: 0.3rem;
                         line-height: 1;
                         color: #fff;
                     }
                     .item-status0 {
-                        padding: 0 .16rem;
+                        padding: 0 0.16rem;
                         box-sizing: border-box;
-                        background: rgba(255, 255, 255, .4);
-                        font-size: .26rem;
-                        line-height: .42rem;
+                        background: rgba(255, 255, 255, 0.4);
+                        font-size: 0.26rem;
+                        line-height: 0.42rem;
                         color: #fff;
                     }
                     .item-status1 {
-                        padding: 0 .16rem;
+                        padding: 0 0.16rem;
                         box-sizing: border-box;
-                        background: #FCF776;
-                        font-size: .26rem;
-                        line-height: .42rem;
-                        color: #703E0B;
+                        background: #fcf776;
+                        font-size: 0.26rem;
+                        line-height: 0.42rem;
+                        color: #703e0b;
                     }
                     .item-status2 {
-                        padding: 0 .16rem;
+                        padding: 0 0.16rem;
                         box-sizing: border-box;
-                        background: #A5A5A5;
-                        font-size: .26rem;
-                        line-height: .42rem;
+                        background: #a5a5a5;
+                        font-size: 0.26rem;
+                        line-height: 0.42rem;
                         color: #fff;
                     }
                 }
                 .item-income {
                     width: 100%;
-                    padding-left: .3rem;
+                    padding-left: 0.3rem;
                     box-sizing: border-box;
-                    margin-top: .4rem;
+                    margin-top: 0.4rem;
                     display: flex;
                     align-items: flex-end;
                     .item-amount {
-                        font-size: .48rem;
-                        line-height: .8;
-                        color: #FCF776;
+                        font-size: 0.48rem;
+                        line-height: 0.8;
+                        color: #fcf776;
                     }
                     .item-text {
-                        font-size: .26rem;
+                        font-size: 0.26rem;
                         line-height: 1;
-                        color: #DBF3FF;
-                        margin-left: .1rem;
+                        color: #dbf3ff;
+                        margin-left: 0.1rem;
                     }
                 }
                 .item-progress-num {
                     width: 100%;
-                    padding: 0 .3rem;
+                    padding: 0 0.3rem;
                     box-sizing: border-box;
-                    margin-top: .58rem;
+                    margin-top: 0.58rem;
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
                     .item-progress {
-                        height: .06rem;
+                        height: 0.06rem;
                         background: #fff;
                         position: relative;
                         &:after {
-                            content: '';
+                            content: "";
                             width: 2.46rem;
-                            height: .06rem;
-                            background: rgba(255, 255, 255, .5);
+                            height: 0.06rem;
+                            background: rgba(255, 255, 255, 0.5);
                             position: absolute;
                         }
                     }
                     .item-num {
-                        font-size: .26rem;
+                        font-size: 0.26rem;
                         line-height: 1;
                         color: #fff;
                     }
@@ -351,14 +398,144 @@
         }
         .func-btn {
             width: 5.6rem;
-            border-radius: .92rem;
-            background: #FABD21;
-            font-size: .4rem;
-            line-height: .92rem;
+            border-radius: 0.92rem;
+            background: #fabd21;
+            font-size: 0.4rem;
+            line-height: 0.92rem;
             color: #fff;
             font-weight: bold;
             text-align: center;
             margin-top: 1.2rem;
         }
     }
+
+    .game-status-popup {
+        position: fixed;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 998;
+        background: rgba(0, 0, 0, 0.5);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .game-status-container {
+            width: 6rem;
+            background: #fff;
+            border-radius: 0.08rem;
+            padding-bottom: 0.4rem;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            position: relative;
+            .status-icon {
+                width: 5.08rem;
+                height: 2.58rem;
+                margin-top: -1.29rem;
+            }
+            .join-success-banner {
+                width: 5.44rem;
+                height: 3.18rem;
+                margin-top: 0.3rem;
+            }
+            .status-date {
+                font-size: 0.36rem;
+                line-height: 1;
+                color: #333;
+                font-weight: bold;
+                text-align: center;
+                margin-top: 0.4rem;
+            }
+            .status-money {
+                width: 5.04rem;
+                height: 2.84rem;
+                background-image: url(../images/HaveJoinedGame/pop_gxdb_board.png);
+                background-size: 100%;
+                margin-top: 0.42rem;
+                .popup-text3 {
+                    font-size: 0.3rem;
+                    line-height: 1;
+                    color: #463a2c;
+                    text-align: center;
+                    margin-top: 0.42rem;
+                }
+                .popup-text4 {
+                    font-size: 1.2rem;
+                    line-height: 0.8;
+                    color: #fabd21;
+                    text-align: center;
+                    margin-top: 0.24rem;
+                    span {
+                        font-size: 0.3rem;
+                        line-height: 1;
+                        vertical-align: bottom;
+                    }
+                }
+                .popup-text5 {
+                    font-size: 0.24rem;
+                    line-height: 1;
+                    color: #b3aea2;
+                    text-align: center;
+                    margin-top: 0.42rem;
+                }
+            }
+            .popup-text1 {
+                width: 5.34rem;
+                font-size: 0.26rem;
+                line-height: 0.42rem;
+                color: #333;
+                text-align: center;
+                margin-top: 0.16rem;
+                span {
+                    color: #fabd21;
+                }
+            }
+            .popup-text2 {
+                font-size: 0.24rem;
+                line-height: 1;
+                color: #a5a5a5;
+                text-align: center;
+                margin-top: 0.32rem;
+            }
+            .popup-text6 {
+                font-size: 0.26rem;
+                line-height: 1;
+                color: #bfbfbf;
+                text-align: center;
+                margin: 0.4rem 0 0.34rem;
+            }
+            .popup-text7 {
+                font-size: 0.26rem;
+                line-height: 1;
+                color: #8e5b29;
+                text-align: center;
+            }
+            .popup-btn1 {
+                width: 4.6rem;
+                height: 0.8rem;
+                border-radius: 0.8rem;
+                font-size: 0.36rem;
+                line-height: 0.8rem;
+                color: #fff;
+                font-weight: bold;
+                text-align: center;
+                margin-top: 0.4rem;
+            }
+            .green-btn {
+                background: #1fdbb1;
+            }
+            .yellow-btn {
+                background: #fabd21;
+            }
+            .close-btn {
+                width: 0.58rem;
+                height: 0.58rem;
+                position: absolute;
+                bottom: -1.08rem;
+                left: 50%;
+                transform: translateX(-50%);
+            }
+        }
+    }
 </style>

src/views/PartakeChallenge.vue

 <template>
   <div class="partake-challenge-page">
-    <Title class="page-title" title="　" v-on:goback="goback" show_back="true"></Title>
+    <Title class="page-title" title="　" v-on:goback="goback" show_back="true" v-if="currentPage()==='PartakeChallenge'"></Title>
     <div class="game-title">5000步七日耐力赛</div>
     <div class="game-time">开赛时间：3月11日 00:00-3月17日24:00</div>
     <div class="game-cost">本期运动契约金：<span>21.00元/人</span></div>
@@ -30,8 +30,17 @@
           <div class="content-text">次日结算前日比赛，达标者获得对应奖励金；总奖励金为用户每日达标奖金之和。</div>
         </div>
       </div>
+      <div class="game-introduce-join-container" v-if="currentPage()!=='PartakeChallenge'">
+        <div class="auth-container">
+          <img class="auth-checked" src="../images/PartakeChallenge/ic_choose.png" v-if="true">
+          <div class="auth-uncheck" v-else></div>
+          <div class="text1">我同意</div>
+          <div class="text2" @click="goOtherPage('Rule')">《步数打卡的挑战规则协议》</div>
         </div>
-    <div class="footer-container">
+        <div class="partake-btn">立即报名</div>
+      </div>
+    </div>
+    <div class="footer-container" v-if="currentPage()==='PartakeChallenge'">
       <div class="auth-container">
         <img class="auth-checked" src="../images/PartakeChallenge/ic_choose.png" v-if="true">
         <div class="auth-uncheck" v-else></div>
@@ -63,6 +72,9 @@
       goOtherPage(pageName) {
         this.$router.push({name: pageName});
       },
+      currentPage() {
+        return this.$router.history.current.name;
+      }
     }
   }
 </script>
@@ -111,7 +123,7 @@
     .game-introduce-container {
       width: 7.1rem;
       border-radius: .08rem;
-      padding: .36rem .28rem .2rem;
+      padding: .36rem .28rem .3rem;
       box-sizing: border-box;
       background: #fff;
       margin-top: .34rem;
@@ -162,12 +174,39 @@
           }
         }
       }
+      .game-introduce-join-container {
+        .auth-container {
+          background: transparent;
+          margin-top: .26rem;
+        }
+        .partake-btn {
+          width: 5.6rem;
+          height: .92rem;
+          border-radius: .92rem;
+          background: #FABD21;
+          font-size: .4rem;
+          line-height: .92rem;
+          color: #fff;
+          font-weight: bold;
+          text-align: center;
+        }
+      }
     }
     .footer-container {
       width: 100%;
       position: fixed;
       left: 0;
       bottom: 0;
+      .partake-btn {
+        width: 100%;
+        background: #FABD21;
+        font-size: .36rem;
+        line-height: .88rem;
+        color: #fff;
+        font-weight: bold;
+        text-align: center;
+      }
+    }
     .auth-container {
       width: 100%;
       height: .52rem;
@@ -198,15 +237,5 @@
         color: #576B95;
       }
     }
-      .partake-btn {
-        width: 100%;
-        background: #FABD21;
-        font-size: .36rem;
-        line-height: .88rem;
-        color: #fff;
-        font-weight: bold;
-        text-align: center;
-      }
-    }
   }
 </style>

src/views/UserCenter.vue

@@ -36,7 +36,7 @@
       Title
     },
     created() {
-      let userData = localStorage.getItem("read_userData")
+      let userData = localStorage.getItem("walk_userData")
       if (userData) {
         this.userData = JSON.parse(userData)
       }