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

src/components/FollowDialog.vue

@@ -4,7 +4,7 @@
       <img src="https://cos-minigame.wxatech.com/common/study_contact_kefu.jpg" alt="">
     </div>
     <div class="follow_img" v-else>
-      <img src="https://cos-minigame.wxatech.com/common/study_follow_account1.jpg" alt="">
+      <img src="https://cos-minigame.wxatech.com/common/walk_daka_account_1.jpg" alt="">
     </div>
     <div class="close_btn" @click="closeDialog">
       <img src="../assets/ic_close3.png" alt="">

src/views/GoXCX.vue

@@ -3,7 +3,9 @@
     <Title @goback="goback" show_back="true" arrowColor="black"></Title>
     <div class="page-banner">
       <img class="bg" src="../images/GoXCX/bg_code.jpg">
-      <img class="qrcode" :src="qrcode">
+      <div class="qrcode-container">
+        <img class="qrcode" src="../images/GoXCX/qrcode_img.jpg">
+      </div>
     </div>
     <div class="tip-title">如何完成打卡？</div>
     <div class="tip-content">1、识别上方二维码，打开「运动打卡」小程序</div>
@@ -22,7 +24,6 @@
     },
     data() {
       return {
-        qrcode: '1231231231231'
       };
     },
     methods: {
@@ -46,16 +47,22 @@
         height: 6.4rem;
         display: block;
       }
-      .qrcode {
+      .qrcode-container {
         width: 3.36rem;
         height: 3.36rem;
-        background: #fff;
-        border-radius: 50%;
-        overflow: hidden;
         position: absolute;
         top: 1.82rem;
         left: 50%;
         transform: translateX(-50%);
+        background: #fff;
+        border-radius: 50%;
+        overflow: hidden;
+        padding: .16rem;
+        box-sizing: border-box;
+        .qrcode {
+          width: 100%;
+          height: 100%;
+        }
       }
     }
     .tip-title {

src/views/HaveJoinedGame.vue

@@ -69,14 +69,15 @@
                 <img class="status-icon" src="../images/HaveJoinedGame/pop_gxdb_title.png">
                 <div class="status-date">第{{popupData.days}}日达标</div>
                 <div class="status-money">
-                    <div class="popup-text3">返还契约金</div>
+                    <div class="popup-text3">{{popupData.days===3?'总奖励金':'返还契约金'}}</div>
                     <div class="popup-text4">
-                        {{popupData.money}}
+                        {{popupData.money|moneyFormatter}}
                         <span>元</span>
                     </div>
                     <div class="popup-text5">第{{popupData.week}}期{{popupData.target_steps}}步3日耐力赛</div>
                 </div>
                 <div class="popup-text6">{{popupData.target_steps}}步达标，今天走了{{popupData.step_num}}步</div>
+                <div class="popup-text7">契约金已返还至你的钱包</div>
                 <div class="popup-btn1 green-btn">邀请好友来打卡</div>
                 <img class="close-btn" src="../images/common/pop_ic_close.png" @click="closePopup()">
             </div>
@@ -89,7 +90,7 @@
                 <div class="status-money">
                     <div class="popup-text3">扣除契约金</div>
                     <div class="popup-text4">
-                        {{popupData.money}}
+                        {{popupData.money|moneyFormatter}}
                         <span>元</span>
                     </div>
                     <div class="popup-text5">第{{popupData.week}}期{{popupData.target_steps}}步3日耐力赛</div>

src/views/Record.vue

@@ -24,7 +24,7 @@
     </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-title">{{item.week}}期-{{item.target_steps}}步{{item.total_days}}日耐力赛（第{{item.days}}天）</div>
+        <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">
             <div class="item-title">累计奖励金(元)</div>