1.0.0.23

pages/main/detail.js

@@ -45,11 +45,13 @@ Page({
       height=960;
       height2=670;
     }
+
     that.setData({
       Containnerheight: height,
       Containnerheight2: height-height2,
       IsShowAnswer: [0, 0],
       CanUndo: 1,
+      IsIphoneX: main.checkIsIPhoneX(),
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
@@ -58,6 +60,8 @@ Page({
     this.getList();
 
     this.getColor();
+
+    
   },
   onShow: function () {
     var that = this;

pages/main/detail.wxml

@@ -133,7 +133,7 @@
   <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}" bindtap="onShowAnswer" ></view>
   <view class='footer1 footer' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}"></view>
 
-  <block wx:if="{{IsShowAnswer[1]}}">
+  <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
     <view class="panelBottomAnswer0" style='background:linear-gradient({{Color.BackColor20}},{{Color.BackColor2}});'></view>
     <view class='panelBottomAnswer panelBottom FlexRow' style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
       <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
@@ -161,7 +161,8 @@
         </view>
       </view>
     </view>
-  </block>
+    <view class="iphoneX" wx:if="{{IsIphoneX}}"></view>
+  </view>
 </view>
 
 <view wx:if="{{IsShowNumberInfo}}" catchtap='closeNumberContainner' class="numberContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>

pages/main/detail.wxss

@@ -1,4 +1,4 @@
-.container {
+ .container {
   justify-content: flex-start;
   font-weight: 500;
 }
@@ -222,21 +222,31 @@
 
 /* 底部记忆选择 */
 
-.panelBottomAnswer0 {
-  height: 20rpx;
+.panelFooter{
   width: 100%;
   position: fixed;
-  bottom: 130rpx;
+  bottom: 0;
+  z-index: 10;
+}
+
+.panelBottomAnswer0 {
+  width: 100%;
+  height: 20rpx;
   z-index: 10;
 }
 
 .panelBottomAnswer {
   width: 100%;
-  position: fixed;
-  bottom: 0;
   font-size: 20rpx;
   justify-content: space-between;
   z-index: 10;
+  height:130rpx;
+}
+
+.iphoneX{
+  width: 100%;
+  height: 80rpx;
+  z-index: 10;
 }
 
 .Answer {

utils/main.js

@@ -673,6 +673,15 @@ function updateSearchList(obj){
   app.globalData.SearchItem = obj.Value;
 }
 
+function checkIsIPhoneX(){
+  var isIphoneX = false;
+  if (app.globalData.systemInfo.model.indexOf("iPhone X")>=0
+    || app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
+    isIphoneX = true;
+  }
+  return isIphoneX;
+}
+
 function getPinyin(pinyin) {
   var result = [];
   var arr = getPinyinArray();
@@ -2195,4 +2204,5 @@ module.exports = {
   getTempImage: getTempImage,
   getTaskTodayList: getTaskTodayList,
   updateSearchList: updateSearchList,
+  checkIsIPhoneX: checkIsIPhoneX,
 }