1

src/components/axios/fetch.js

@@ -18,7 +18,7 @@ export function fetch(options) {
       //所有的请求都会带上这些配置，比如全局都要用的身份信息等。
       headers: {
         'Content-Type': 'application/json',
-        'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDU2MjA2Mn0.eHkAuqQpoZb34KbCAyVzNaunn4Knn77jfC0N5DG5JD0"
+        'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLCJvcGVuX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsInVuaW9uX2lkIjoiMTExMTExMTExMTExMTExMTExMTExMTExMTExMSIsImV4cCI6MTU1NDg4OTkzN30.Wrb10H0dVKPr4RzVfuzxrHzM_MTad4So4nzvC0qRuGo"
         // 'token_in_header': global_.token,//token从全局变量那里传过来
       },
       timeout: 30 * 1000 // 30秒超时

src/views/HaveJoinedGame.vue

@@ -27,14 +27,14 @@
             <div class="item-title">第{{item.days}}天</div>
             <div :class="item.status===0?'item-status0':item.status===1?'item-status1':item.status===2?'item-status2':'item-status2'">{{item.status===0?'未开始':item.status===1?'比赛中':item.status===2?'已结束':'已淘汰'}}</div>
           </div>
-          <div class="item-income" v-if="item.yj_money">
-            <div class="item-amount">{{item.yj_money|moneyFormatter}}</div>
-            <div class="item-text">(元) 预计收益</div>
-          </div>
-          <div class="item-income" v-else-if="item.money">
+          <div class="item-income" v-if="item.money">
             <div class="item-amount">{{item.money|moneyFormatter}}</div>
             <div class="item-text">(元) 收益</div>
           </div>
+          <div class="item-income" v-else-if="item.yj_money">
+            <div class="item-amount">{{item.yj_money|moneyFormatter}}</div>
+            <div class="item-text">(元) 预计收益</div>
+          </div>
           <div class="item-income" v-else style="visibility: hidden;">
             <div class="item-amount">0.00</div>
             <div class="item-text">(元)</div>