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

src/components/Free.vue

@@ -307,7 +307,7 @@
       },
       // 立即报名
       joinFree() {
-        let days = this.days || 0
+        // let days = this.days || 0
         // this.queryPayImage();
         // dakaPay(days, 1).then(response => {
         //   console.log("报名状态", response);

src/components/axios/api.js

@@ -151,7 +151,7 @@ export function ocFollow() { //lookOption是你要调用接口的名字，issuer
 }
 
 // 报名支付
-export function dakaPay(grade,days,use_contract) {
+export function dakaPay(days,use_contract) {
   let now = new Date();
   let year = now.getFullYear();
   let month = now.getMonth() + 1;
@@ -173,8 +173,7 @@ export function dakaPay(grade,days,use_contract) {
       use_contract: use_contract || 0,
       inviter_id: inviter || '',
       from_type: from_type || '',
-      days: days || 0,
-      grade: grade || 0
+      days: days || 0
     }
   })
 }
@@ -382,12 +381,11 @@ export function withdraw_log(page) {
 }
 
 // 首页数据
-export function daka_index(grade) {
+export function daka_index() {
   return fetch({
     url: api.daka_index,
     method: 'GET',
     params: {
-      grade: grade
     }
   })
 }
@@ -403,13 +401,12 @@ export function select_user_signup() {
 }
 
 // 比赛详情
-export function daka_status_detail(week, grade) {
+export function daka_status_detail(week) {
   return fetch({
     url: api.daka_status_detail,
     method: 'GET',
     params: {
-      week: week,
-      grade: grade
+      week: week
     }
   })
 }
@@ -425,12 +422,11 @@ export function pop_up_windows() {
 }
 
 //参与挑战
-export function daka_info(grade){
+export function daka_info(){
   return fetch({
       url: api.daka_info,
       method: 'GET',
       params: {
-          grade: grade
       }
   })
 }

src/views/PartakeChallenge.vue

@@ -120,7 +120,7 @@
                 if (this.$route.query.nextGame) {
                     nextGame = 2
                 }
-                dakaPay(sessionStorage.getItem("bushuType"), nextGame).then(response => {
+                dakaPay(nextGame).then(response => {
                     if (response.code == 1) {
                         this.showModal("温馨提示", response.msg)
                         return
@@ -196,12 +196,7 @@
                 this.argeement = !this.argeement
             },
             getPageData(){
-                let grade  = 1
-                if(sessionStorage.getItem('bushuType')){
-                    grade = sessionStorage.getItem('bushuType')
-                }
-                console.log(grade)
-                daka_info(grade).then(res=>{
+                daka_info().then(res=>{
                     console.log('daka_info',res)
                     if(res.code == 0){
                         console.log('立即参与',res)

src/views/Record.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="card-container-list" @scroll="onScroll">
-      <div class="card-item" v-for="(item,index) in recordList.records" @click="goWhereDetail(item.week, item.grade)">
+      <div class="card-item" v-for="(item,index) in recordList.records" @click="goWhereDetail(item.week)">
         <div class="card-title">{{item.week}}期-{{item.target_steps}}步{{item.total_days}}日耐力赛<template v-if="item.days">（第{{item.days}}天）</template></div>
         <div class="card-detail-container">
           <div class="detail-item">
@@ -85,8 +85,7 @@
         sessionStorage.setItem("selectedRecord", JSON.stringify(item));
         this.$router.push({name: "RecordDetail"})
       },
-      goWhereDetail(week, grade) {
-        sessionStorage.setItem('bushuType', grade);
+      goWhereDetail(week) {
         this.$router.push({
           name: 'HaveJoinedGame',
           query: {

src/views/Rule.vue

 <template>
   <div class="rule-page">
     <Title class="page-title" title="活动规则与协议" titleColor="#000" @goback="goback" show_back="true" arrowColor="black"></Title>
-        <div class="section-title">挑战玩法：</div>
-        <img class="game-way-img" v-if="bushuType == 1" src="../images/Rule/img_rule_0.png">
-        <img class="game-way-img" v-if="bushuType == 2" src="../images/Rule/img_rule_1.png">
-        <img class="game-way-img" v-if="bushuType == 3" src="../images/Rule/img_rule_2.png">
     <div class="section-title">参赛须知：</div>
     <div class="content1-container">
       <div class="content1-item">• 为督促大家运动，每位用户报名均需提供契约金</div>
@@ -25,49 +21,36 @@
     <div class="content2-item">奖金派发时仅派发到小数点后两位，由此可能造成的奖金结余将在合并至本组下期比赛奖金中一并派发；</div>
     <div class="content2-item">由于不可抗力因素导致当期比赛因故无法进行的，平台有权取消当期比赛’并将在指定时间内将运动契约金原路退还给报名成功用户；</div>
     <div class="ps">注：Apple不是本赛事赞助者</div>
-        <br>
   </div>
 </template>
 
 <script>
-    import Title from "@/components/Title.vue"
+import Title from "@/components/Title.vue";
 
-    export default {
+export default {
   name: "Rule",
   components: {
-            Title,
+    Title
   },
   data() {
-            return {
-                bushuType: 0
-            }
-        },
-        mounted() {
-            if (this.$route.params.level) {
-                this.bushuType = this.$route.params.level
-            } else {
-                let LastLevel = Number(sessionStorage.getItem('bushuType'))
-                if (LastLevel) {
-                    this.bushuType = LastLevel
-                }
-            }
-
+    return {};
   },
+  mounted() {},
   methods: {
     goback() {
-                history.go(-1)
-            },
+      history.go(-1);
     }
   }
+};
 </script>
 <style lang="less" scoped>
-    .rule-page {
+.rule-page {
   width: 100%;
   background: #fff;
   display: flex;
   flex-direction: column;
   align-items: center;
-        padding-top: .96rem;
+  padding-top: 0.96rem;
 
   .page-title {
     font-weight: bold;
@@ -80,62 +63,55 @@
 
   .section-title {
     width: 6.72rem;
-            font-size: .3rem;
+    font-size: 0.3rem;
     line-height: 1;
     color: #333;
     font-weight: bold;
     text-align: left;
-            margin-top: .44rem;
-        }
-
-        .game-way-img {
-            width: 6.15rem;
-            height: 1.09rem;
-            margin-top: .3rem;
-            margin-bottom: .14rem;
+    margin-top: 0.44rem;
   }
 
   .content1-container {
     width: 6.7rem;
-            margin-top: .2rem;
+    margin-top: 0.2rem;
 
     .content1-item {
-                font-size: .26rem;
-                line-height: .44rem;
+      font-size: 0.26rem;
+      line-height: 0.44rem;
       color: #5a5a5a;
     }
   }
 
   .section2-title {
     width: 6.72rem;
-            font-size: .26rem;
+    font-size: 0.26rem;
     line-height: 1;
     color: #333;
-            margin-top: .4rem;
+    margin-top: 0.4rem;
   }
 
   .content2-title {
     width: 6.72rem;
-            font-size: .26rem;
-            line-height: .44rem;
+    font-size: 0.26rem;
+    line-height: 0.44rem;
     color: #333;
-            margin-top: .2rem;
+    margin-top: 0.2rem;
   }
 
   .content2-item {
     width: 6.72rem;
-            font-size: .26rem;
-            line-height: .44rem;
+    font-size: 0.26rem;
+    line-height: 0.44rem;
     color: #5a5a5a;
-            margin-top: .14rem;
+    margin-top: 0.14rem;
   }
 
   .ps {
     width: 6.72rem;
-            font-size: .26rem;
+    font-size: 0.26rem;
     line-height: 1;
-            color: #A5A5A5;
-            margin: .4rem 0 .26rem;
-        }
+    color: #a5a5a5;
+    margin: 0.4rem 0 0.6rem;
   }
+}
 </style>
\ No newline at end of file