no message

@@ -85,7 +85,7 @@ function login() {
 }
 
 const fetch = function ({
-  loading = true,
+  loading = false,
   toast = true,
   sid = true,
   auth = true,

@@ -16,7 +16,7 @@
         </view>
       </view>
       <!-- 使用规则 -->
-      <view class="cont-wrap use-rule">
+      <view wx:if="{{item.commodityInfo}}" class="cont-wrap use-rule">
         <!-- 京东E卡可在京东商城
         <span class="link">www.jd.com</span>
         上购买自营商品（“自营商品”指在商品详情页明确标识为自营的商品），用户可在订单结算时输入E卡密码并使用。 -->

@@ -38,7 +38,7 @@
             </view>
             <view class="detail">
               <view class="t1">{{item.orderCommodityTitle}}</view>
-              <view class="t1 t2">{{item.orderCommodityPoints}}</view>
+              <view class="t1 t2">{{item.orderCommodityPoints}}积分</view>
               <view class="t1 t3">
                 <span wx:if="{{item.orderStatus == 'unaudited'}}">待审核</span>
                 <span wx:if="{{item.orderStatus == 'pass'}}">已通过</span>

@@ -43,9 +43,11 @@ Page({
         }
       }).then((result) => {
         let rankInfo = this.formatRankInfo(result, status);
-        this.setData({
-          rankInfo: rankInfo
-        })
+        if(rankInfo){
+          this.setData({
+            rankInfo: rankInfo
+          })
+        }
         console.log("rankInfo 1:", rankInfo);
         resolve();
       })
@@ -85,6 +87,7 @@ Page({
    */
   formatRankInfo(val, status) {
     let rankInfo = val;
+    if(!rankInfo) return;
     if (status == "promotion") {
       rankInfo.myMember.rank = rankInfo.myMember.promotionNo;
       rankInfo.myMember.points = rankInfo.myMember.promotionPoints;

@@ -78,7 +78,7 @@
         <!-- 省略号 -->
         <view class="etc">...</view>
         <!-- 我的排名 -->
-        <view class="my-rank">
+        <view class="my-rank" wx:if="{{rankInfo.myMember}}">
           <view class="rank-item">
             <view class="no">
               <image wx:if="{{rankInfo.myMember.rank == 1}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" />

@@ -243,7 +243,7 @@ $contentWidth: 690px;
           // 签到按钮
           &-btn {
             @include btc(280px, 68px);
-            margin: 42px auto 4px;
+            margin: 12px auto 4px;
             border-radius: 34px;
             background: #3680EB;
             font-size: 28px;
@@ -311,15 +311,30 @@ $contentWidth: 690px;
 
             &-item {
               width: 132px;
+              position: relative;
+
+
 
               .icon-wrap {
+                position: relative;
                 @extend .fcc;
-                height: 100px;
+                // width: 100px;
                 height: 100px;
 
                 .icon {
+                  // width: 64px;
                   height: 64px;
-                  height: 64px;
+                }
+
+                .rpoint {
+                  position: absolute;
+                  width: 24px;
+                  height: 24px;
+                  border-radius: 24px;
+                  right: 22px;
+                  top: 10px;
+                  background-color: #fe4b4b;
+                  z-index: 1;
                 }
               }
 

@@ -41,7 +41,7 @@
         <!-- 签到区 -->
         <view class="border sign ">
           <view class="tit">
-            <view class="t1">连续签到7天赢现金红包</view>
+            <view class="t1">签到7天赢红包</view>
             <view bindtap="onsignInRecordHandler" class="t2">
               <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
               签到记录
@@ -94,6 +94,7 @@
             </view>
             <view bindtap="onMyMessageHandler" class="func-wrap-item">
               <view class="icon-wrap">
+                <view wx:if="{{userInfo.news > 0}}" class="rpoint"></view>
                 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" />
               </view>
               <view class="txt">我的消息</view>