fix

pages/historyDetail/historyDetail.wxml

@@ -97,17 +97,22 @@
   <view id="common">
     <view id="commonTitle">常用应用</view>
     <view id="commonList">
-      <view class="commonItem" wx:for="{{appList}}" wx:key>
+      <view class="commonItem" wx:for="{{appList}}" wx:key wx:if="{{item.title!=null}}">
         <image wx:if="{{item.icon}}" src="{{item.icon}}" />
         <!-- <view wx:else class="commonItemNo"></view> -->
         <image wx:else src="../../assets/appNull.png" />
         <text>{{item.title}}</text>
       </view>
-      <view wx:if="{{appList.length<5}}" class="commonItemNo">空</view>
+      <!-- <view wx:if="{{appList.length<5}}" class="commonItemNo">空</view>
       <view wx:if="{{appList.length<4}}" class="commonItemNo">空</view>
       <view wx:if="{{appList.length<3}}" class="commonItemNo">空</view>
       <view wx:if="{{appList.length<2}}" class="commonItemNo">空</view>
-      <view wx:if="{{appList.length<1}}" class="commonItemNo">空</view>
+      <view wx:if="{{appList.length<1}}" class="commonItemNo">空</view> -->
+      <view wx:if="{{appList[4].title==null}}" class="commonItemNo">空</view>
+      <view wx:if="{{appList[3].title==null}}" class="commonItemNo">空</view>
+      <view wx:if="{{appList[2].title==null}}" class="commonItemNo">空</view>
+      <view wx:if="{{appList[1].title==null}}" class="commonItemNo">空</view>
+      <view wx:if="{{appList[0].title==null}}" class="commonItemNo">空</view>
     </view>
   </view>
 </view>

pages/index/index.wxml

@@ -248,31 +248,31 @@
     <!-- <view id="indexBottomText" hidden="{{!isLoading}}">底下没有了~</view> -->
 
     <!-- 更新训练计划弹窗 -->
-    <view id="mustUpdate" catchtouchmove="preventTouchMove" hidden="{{mustUpdate}}">
-      <view id="mustUpdateBox" wx:if="{{status==2}}">
+    <cover-view id="mustUpdate" catchtouchmove="preventTouchMove" hidden="{{mustUpdate}}">
+      <cover-view id="mustUpdateBox" wx:if="{{status==2}}">
         <!-- 内容 -->
-        <view id="mustUpdateCon">
-          <view id="mustUpdateTitle">尊敬的家长您好</view>
-          <view id="mustUpdateDes">请前往“训练计划”更新训练计划，否则护眼仪将暂时无法正常使用。</view>
-        </view>
+        <cover-view id="mustUpdateCon">
+          <cover-view id="mustUpdateTitle">尊敬的家长您好</cover-view>
+          <cover-view id="mustUpdateDes">请前往“训练计划”更新训练计划，否则护眼仪将暂时无法正常使用。</cover-view>
+        </cover-view>
         <!-- 按钮组 -->
-        <view id="mustUpdateBtn">
-          <text id="lastGoBtn" bindtap="lastGo">稍后前往</text>
-          <text id="nowGoBtn" bindtap="nowGo">一键前往</text>
-        </view>
-      </view>
-      <view id="mustUpdateBox" wx:else>
+        <cover-view id="mustUpdateBtn">
+          <cover-view id="lastGoBtn" bindtap="lastGo">稍后前往</cover-view>
+          <cover-view id="nowGoBtn" bindtap="nowGo">一键前往</cover-view>
+        </cover-view>
+      </cover-view>
+      <cover-view id="mustUpdateBox" wx:else>
         <!-- 内容 -->
-        <view id="mustUpdateCon">
-          <view id="mustUpdateTitle">尊敬的家长您好</view>
-          <view id="mustUpdateDes">因您长时间未更新视力信息，眼保仪已被暂时锁定。为了保障孩子的训练成效，请您立即前往"训练计划"更新“视力数据”！</view>
-        </view>
+        <cover-view id="mustUpdateCon">
+          <cover-view id="mustUpdateTitle">尊敬的家长您好</cover-view>
+          <cover-view id="mustUpdateDes">因您长时间未更新视力信息，眼保仪已被暂时锁定。为了保障孩子的训练成效，请您立即前往"训练计划"更新“视力数据”！</cover-view>
+        </cover-view>
         <!-- 按钮组 -->
-        <view id="mustUpdateBtn">
-          <text id="nowGoBtn" bindtap="nowGo">立即前往</text>
-        </view>
-      </view>
-    </view>
+        <cover-view id="mustUpdateBtn">
+          <cover-view id="nowGoBtn" bindtap="nowGo">立即前往</cover-view>
+        </cover-view>
+      </cover-view>
+    </cover-view>
   </view>
   <cover-view id="guide" wx:if="{{guideStatus==0}}" hidden="{{guideStatus==1}}" catchtouchmove="preventTouchMove" bindtap="guide">
     <cover-image id="guide1" hidden="{{guideId!=1}}" src="../../assets/guide1.png"></cover-image>

pages/index/index.wxss

@@ -616,6 +616,7 @@ page{
   color: #888888;
   padding: 0 40rpx 30rpx;
   text-align: center;
+  white-space: normal;
 }
 #mustUpdateBox{
   width: 560rpx;
@@ -636,14 +637,22 @@ page{
   border-top: 2rpx solid #E5E5E5;
   overflow: hidden;
 }
-#mustUpdateBtn>text{
+/* #mustUpdateBtn>text{
   text-align: center;
   width: 49.2%;
   padding: 25rpx 0;
-}
+} */
 #lastGoBtn{
+  text-align: center;
+  width: 49.2%;
+  padding: 25rpx 0;
   border-right: 2rpx solid #E5E5E5;
 }
+#nowGoBtn{
+  text-align: center;
+  width: 49.2%;
+  padding: 25rpx 0;
+}
 
 
 #guide{