Rorschach 5 лет назад
Родитель
Сommit
5b1e1fe34f
4 измененных файлов с 8 добавлено и 5 удалено
  1. 5 3
      component/hot/hot.js
  2. 1 0
      component/my/my.js
  3. 1 1
      component/my/my.wxml
  4. 1 1
      pages/user/myworks/myworks.wxml

+ 5 - 3
component/hot/hot.js

@@ -201,14 +201,15 @@ export const hotInit = (that) => {
           [myCourseStr]: recommendRes.myCourse,
           [isMessageNormal]: recommendRes.unread,
           // [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.title : '',
-          [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.title : recommendRes.annunciateMsg.title
+          // [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.title : recommendRes.annunciateMsg.title
+          [unReadMessageContent]: ''
         })
 
         return;
       }
       recommendRes.hotReader.forEach(item => {
         const temp = {};
-        temp.title = item.userRead.title;
+        temp.title = item.userRead ? item.userRead.title : '';
         temp.summary = item.userRead.summary;
         temp.img = item.userRead.iconImg;
         temp.plays = item.userRead.playAmount ? item.userRead.playAmount : 0;
@@ -231,7 +232,8 @@ export const hotInit = (that) => {
         [hotStr]: that.data.hotData.hotWorks,
         [myCourseStr]: recommendRes.myCourse,
         [isMessageNormal]: recommendRes.unread,
-        [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.title : recommendRes.annunciateMsg.title,
+        // [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.title : recommendRes.annunciateMsg.title,
+        [unReadMessageContent]: '',
         unfinishedCount: recommendRes.unfinishedCount
       })
     })

+ 1 - 0
component/my/my.js

@@ -4,6 +4,7 @@ import {
   formatDate
 } from '../../utils/util';
 export const myInit = (that) => {
+  console.log(123123123, app.globalData.isIOS)
   that.setData({
     myData: {
       title: '修改资料',

+ 1 - 1
component/my/my.wxml

@@ -51,7 +51,7 @@
           <view class="grey-point"></view>
           <image class="wallet-icon" src="{{myData.isIOS ? '../../static/vip/idcard.png' : '../../static/vip/small_crown.png'}}" />
           <view class="right_vip">
-            <view class="vip_text">{{myData.isVIP ? 'VIP会员': '激活码激活'}}</view>
+            <view class="vip_text">{{myData.isIOS ? '激活码激活': 'VIP会员'}}</view>
             <view class="{{myData.isVIP ? 'vip': 'grey'}}">
               {{myData.isVIP ? myData.isIOS ? '已激活': '已开通': myData.isIOS ? '立即激活': '立即开通'}}
             </view>

+ 1 - 1
pages/user/myworks/myworks.wxml

@@ -22,7 +22,7 @@
               <image src='../../../static/image/boy.png'></image>
             </view>
           </view>
-          <view class='avatar-birthday'>{{ wareCards.user.birthday }}</view>
+          <view class='avatar-birthday'>{{ wareCards.user.birthday ? wareCards.user.birthday : '' }}</view>
           <view class='avatar-address'>{{ wareCards.user.schoolName }}</view>
         </view>
       </view>