默认提交

@@ -36,9 +36,6 @@ Page({
       isInit: false
       isInit: false
     })
     })
     return new Promise((resolve, reject) => {
     return new Promise((resolve, reject) => {
-      this.setData({
-        rankInfo: {}
-      })
       let status = this.data.status;
       let status = this.data.status;
       app.post({
       app.post({
         url: app.api.activity,
         url: app.api.activity,
@@ -46,17 +43,11 @@ Page({
           key: status
           key: status
         }
         }
       }).then((result) => {
       }).then((result) => {
-        // console.log("result:", result)
         let rankInfo = this.formatRankInfo(result, status);
         let rankInfo = this.formatRankInfo(result, status);
-        // console.log("rankInfo:", rankInfo)
-        this.setData({
-          isInit: true
-        })
-        if (rankInfo) {
         this.setData({
         this.setData({
+          isInit: true,
           rankInfo: rankInfo
           rankInfo: rankInfo
-          })
-        }
+        });
         console.log("rankInfo 1:", rankInfo);
         console.log("rankInfo 1:", rankInfo);
         resolve();
         resolve();
       })
       })
@@ -64,16 +55,13 @@ Page({
   },
   },
 
 
   /**
   /**
-   * 推广积分排行
+   * 历史积分排行
    */
    */
   queryActivityHistory() {
   queryActivityHistory() {
     this.setData({
     this.setData({
       isInit: false
       isInit: false
     })
     })
     return new Promise((resolve, reject) => {
     return new Promise((resolve, reject) => {
-      this.setData({
-        rankInfo: {}
-      })
       let status = this.data.status;
       let status = this.data.status;
       app.post({
       app.post({
         url: app.api.activityHistory,
         url: app.api.activityHistory,
@@ -88,7 +76,7 @@ Page({
           isInit: true,
           isInit: true,
           historyRankInfoList: historyRankInfoList
           historyRankInfoList: historyRankInfoList
         })
         })
-        console.log("rankInfo 2:", historyRankInfoList);
+        console.log("rankInfo 2 history:", historyRankInfoList);
         this.setHistory();
         this.setHistory();
         resolve();
         resolve();
       })
       })

@@ -112,6 +112,7 @@ $contentWidth:690px;
                 color: #666666;
                 color: #666666;
                 font-size: 24px;
                 font-size: 24px;
                 padding: 5px 0;
                 padding: 5px 0;
+                width: 100%;
               }
               }
 
 
               .t2 {}
               .t2 {}

@@ -17,18 +17,19 @@
       </view>
       </view>
       <!-- 排行 -->
       <!-- 排行 -->
       <view class="border rank">
       <view class="border rank">
-        <block wx:if="{{rankInfo && rankInfo.memberList.length > 0}}">
+        <!-- <block wx:if="{{rankInfo && rankInfo.memberList.length > 0}}"> -->
         <!-- 功能区 -->
         <!-- 功能区 -->
         <view class="rank-func">
         <view class="rank-func">
           <view class="rank-func-item">
           <view class="rank-func-item">
+            <!-- 本轮 -->
             <view wx:if="{{turnsIndex == 0}}" class="pubish">
             <view wx:if="{{turnsIndex == 0}}" class="pubish">
               <view class="t1">
               <view class="t1">
                 本轮周期：
                 本轮周期：
-                  <span>{{rankInfo.activityName}}</span>
+                <span>{{rankInfo.activityName || '-' }}</span>
               </view>
               </view>
               <view wx:if="{{status == 'promotion'}}" class="t1 t2">
               <view wx:if="{{status == 'promotion'}}" class="t1 t2">
                 本轮奖品：
                 本轮奖品：
-                  <span class="c1">{{rankInfo.prizeName}}</span>
+                <span class="c1">{{rankInfo.prizeName || '-'}}</span>
               </view>
               </view>
               <view wx:if="{{status == 'rank'}}" class="t1 t2">
               <view wx:if="{{status == 'rank'}}" class="t1 t2">
                 我的名次：
                 我的名次：
@@ -36,11 +37,12 @@
                 名
                 名
               </view>
               </view>
             </view>
             </view>
+            <!-- 历史 -->
             <view wx:else class="pubish">
             <view wx:else class="pubish">
               <picker value="{{historyIndex}}" range="{{historyRankInfoList}}" range-key="activityName" bindchange="bindHistoryChange">
               <picker value="{{historyIndex}}" range="{{historyRankInfoList}}" range-key="activityName" bindchange="bindHistoryChange">
                 <view class="func">
                 <view class="func">
                   <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
                   <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
-                    {{rankInfo.activityName}}
+                  {{rankInfo.activityName || '-'}}
                   <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
                   <image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
                   {{dateStart}}
                   {{dateStart}}
                 </view>
                 </view>
@@ -56,6 +58,7 @@
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>
+        <block wx:if="{{rankInfo}}">
           <!-- 标题 -->
           <!-- 标题 -->
           <view class="tit">
           <view class="tit">
             <view class="tt t1">名次</view>
             <view class="tt t1">名次</view>
@@ -95,7 +98,6 @@
         </block>
         </block>
         <block wx:else>
         <block wx:else>
           <view class="empty-tips" wx:if="{{isInit}}">
           <view class="empty-tips" wx:if="{{isInit}}">
-            <!-- <span class="iconfont iconempty"></span> -->
             <view class="tips">暂未开启积分排行，敬请期待</view>
             <view class="tips">暂未开启积分排行，敬请期待</view>
           </view>
           </view>
         </block>
         </block>