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

src/views/PartakeChallenge.vue

@@ -2,33 +2,19 @@
     <div class="partake-challenge-page">
         <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>
+        <div class="game-title">{{daka_info.target_step}}步七日耐力赛</div>
+        <div class="game-time">开赛时间：{{daka_info.start_format}}-{{daka_info.end_format}}</div>
+        <div class="game-cost">本期运动契约金：<span>{{daka_info.money}}元/人</span></div>
         <div class="game-introduce-container">
             <div class="game-introduce-title">
                 <img src="../images/PartakeChallenge/ic_3.png">
                 步赚取运动奖励金
             </div>
-            <div class="game-introduce-section">
-                <img class="section-icon" src="../images/PartakeChallenge/ic_join.png">
+            <div class="game-introduce-section" v-for="(item,index) in daka_faq">
+                <img class="section-icon" :src="require(`../images/PartakeChallenge/q${index+1}.png`)">
                 <div class="section-content">
-                    <div class="content-title">报名参赛</div>
-                    <div class="content-text">支付7.00元运动契约金，即可加入5000步日耐力赛，契约金平均分配到每个比赛日，每日结算1次。</div>
-                </div>
-            </div>
-            <div class="game-introduce-section">
-                <img class="section-icon" src="../images/PartakeChallenge/ic_suc.png">
-                <div class="section-content">
-                    <div class="content-title">运动达标</div>
-                    <div class="content-text">每日走满5000步即可达标，获得当日奖励资格；未达标用户将失去后续比赛的参赛资格，其契约金将继续作为奖励金奖励达标用户。</div>
-                </div>
-            </div>
-            <div class="game-introduce-section">
-                <img class="section-icon" src="../images/PartakeChallenge/ic_money.png">
-                <div class="section-content">
-                    <div class="content-title">获得奖励</div>
-                    <div class="content-text">次日结算前日比赛，达标者获得对应奖励金；总奖励金为用户每日达标奖金之和。</div>
+                    <div class="content-title">{{item[0]}}</div>
+                    <div class="content-text">{{item[1]}}</div>
                 </div>
             </div>
             <div class="game-introduce-join-container" v-if="currentPage()!=='PartakeChallenge'">
@@ -97,7 +83,16 @@
                 modalTitle: "",
                 modalDesc: "",
                 modalShown: false,
-                argeement: true
+                argeement: true,
+                daka_info: {
+                    start_format: '',
+                    end_format: '',
+                    money: 0,
+                    target_step: 3000
+                },
+                daka_faq: {
+
+                }
             }
         },
         created () {
@@ -205,6 +200,9 @@
                 console.log(grade)
                 daka_info(grade).then(res=>{
                     console.log('立即参与',res)
+                    console.log(typeof res.data.daka_info)
+                    this.daka_info = res.data.daka_info
+                    this.daka_faq  = res.data.daka_faq
                 })
             }
         }

src/views/Rule.vue

@@ -9,7 +9,7 @@
     <div class="content1-container">
       <div class="content1-item">• 为督促大家运动，每位用户报名均需提供契约金</div>
       <div class="content1-item">• 当期比赛结束后不达标的用户将被扣除契约金，作为达标奖金</div>
-      <div class="content1-item">• 当期比赛结束后达标用户将平分达标奖金的30%，作为激励</div>
+      <div class="content1-item">• 当期比赛结束后达标用户将平分达标奖金，作为激励</div>
       <div class="content1-item">• 奖金赛中每个账号只能接受一台设备上报的步数</div>
       <div class="content1-item">• 由于微信对网页暂不支持时时步数同步，所以最终结算步数为用户在小程序页面中“提交今日步数”为准。</div>
     </div>

src/views/SignUp.vue

@@ -15,7 +15,7 @@
       <img class="corner-marker" src="../images/SignUp/home_tag_bsz.png" v-if="item.status===0">
       <img class="corner-marker" src="../images/SignUp/home_tag_zmz.png" v-if="item.status===1">
       <img class="corner-marker" src="../images/SignUp/home_tag_yjs.png" v-if="item.status===2">
-      <div class="card-title">3天健步挑战赛</div>
+      <div class="card-title">{{item.target_step}}步3天耐力赛 第{{item.action}}期</div>
       <div class="card-time">{{item.already_join===1?'已参赛':'未参赛'}} {{item.period_start}} - {{item.period_end}}</div>
       <div class="card-info">
         <div class="info-item" v-if="item.status===0||item.status===2">
@@ -34,13 +34,14 @@
       <div class="card-btn" v-if="item.status===1&&item.already_join===0" data-item="item"
            @click="goOtherPage('PartakeChallenge')">
         <div class="btn-title">参与挑战</div>
-        <div class="card-btn-tip">（每日目标{{item.target_step}}步）</div>
-      </div>
-      <div class="card-btn" :style="item.status!==1? item.status === 2 ? 'background:#ccc'
-      :'background:#32A1F6' : ''"
-           v-else
-           @click="goWhereDetail(item)">{{item.status===1?'已报名':'查看详情'}}
+        <!--<div class="card-btn-tip">（每日目标{{item.target_step}}步）</div>-->
       </div>
+      <div class="card-btn" :style="item.status!==1?'background:#32A1F6;':''"
+           v-if="item.status===1&&item.already_join===1"
+           @click="goWhereDetail(item)">已报名</div>
+      <div class="card-btn statusnormal" v-if="item.status===2 || item.status===3 || item.status===0"
+           @click="goWhereDetail(item)">{{(item.status===2 || item.status===0)
+        ?'查看详情': '已淘汰'}}</div>
     </div>
   </div>
 </template>
@@ -122,8 +123,11 @@
       getPageData(grade = 1) {
         daka_index(grade).then(res => {
           if (res.code === 0) {
+              res.data.forEach(item => {
+                  item.action = item.week.substring(item.week.length - 4)
+              })
             this.gameList = res.data;
-            console.log(this.gameList);
+            console.log('gameList',this.gameList);
           }
         });
       },
@@ -333,7 +337,7 @@
       right: -0.02rem;
     }
     .card-title {
-      font-size: 0.36rem;
+      font-size: 0.34rem;
       line-height: 1;
       color: #fff;
       margin-top: 0.28rem;
@@ -382,6 +386,13 @@
         }
       }
     }
+    .statusnormal{
+      background: transparent !important;
+      box-shadow: 0 0 0 0 !important;
+      background: url("../images/SignUp/detail_bg.png") no-repeat !important;
+      background-position: 130px !important;
+      background-size: 14px 14px !important;
+    }
     .card-btn {
       width: 4rem;
       height: 0.88rem;