1.0.0

pages/main/default.js

@@ -155,7 +155,7 @@ Page({
 
     updateManager.onCheckForUpdate(function(res) {
       // 请求完新版本信息的回调
-      console.log(res.hasUpdate)
+      //console.log(res.hasUpdate)
     });
 
     updateManager.onUpdateReady(function() {

pages/main/default.wxml

@@ -4,14 +4,15 @@
   </scroll-view>
 
   <view class="panel FlexColumn">
+    
     <view class="line1"></view>
-    <view class="line2"></view>
     <view class="panel0 FlexRow">
-      <view class="panel00Left"></view>
       <view class="panel00 FlexColumn">
+        
         <view class="panel000 FlexRow">
+        <view class="line2"></view>
           <view class="text">选题</view>
-          <view class="text">·</view>
+          <view class="text">+</view>
           <view class="text">打印</view>
         </view>
         <view class="panel001 FlexRow">
@@ -42,14 +43,16 @@
                     登录
                   </view>
                 </button>
-                <view class="btn" wx:if="{{IsAccredit}}" >
-                  <view class="btn1">
-                    设置
+                
+                <view class="btn2 btn" bindtap='gotoAnswer' wx:if="{{!IsAccredit}}">
+                  <view class="btn3 btn1">
+                    答案
                   </view>
                 </view>
-                <view class="btn2 btn" bindtap='gotoAnswer'>
+
+                <view class="btn6 btn2 btn' " wx:if="{{IsAccredit}}" bindtap='gotoAnswer' >
                   <view class="btn3 btn1">
-                    答案
+                    对答案
                   </view>
                 </view>
               </view>
@@ -104,7 +107,6 @@
           </view>
         </view>
       </view>
-      <view class="panel00Right"></view>
     </view>
   </view>
 </view>

pages/main/default.wxss

@@ -20,19 +20,14 @@
   justify-content: flex-start;
 }
 
-.line1 {
-  width: 100%;
-  height: 10rpx;
-  background-color: rgba(0, 0, 0, 0.16);
-}
 
-.line2 {
+.line1 {
   width: 100%;
-  height: 90rpx;
+  height: 120rpx;
   background-color: #291112;
-  margin-top: 30rpx;
 }
 
+
 .panel0 {
   width: 100%;
   position: absolute;
@@ -46,26 +41,19 @@
   justify-content: flex-start;
 }
 
-.panel00Left {
-  width: 15rpx;
-  height: 90rpx;
-  background-color: #3d211b;
-  border-top-left-radius: 6rpx;
-  border-bottom-left-radius: 6rpx;
-}
-
-.panel00Right {
-  width: 15rpx;
-  height: 90rpx;
-  background-color: #3d211b;
-  border-top-right-radius: 6rpx;
-  border-bottom-right-radius: 6rpx;
-}
-
 .panel000 {
   width: 100%;
   height: 90rpx;
   background-color: #4f2921;
+  position: relative;
+}
+
+.line2 {
+  width: 100%;
+  height: 10rpx;
+  background-color: rgba(0, 0, 0, 0.30);
+  position: absolute;
+  top:0;
 }
 
 .panel000 .text {
@@ -213,6 +201,11 @@
   background-color: #3b85d0;
 }
 
+.btn6 {
+  width: 430rpx;
+  margin-left: 0rpx;
+}
+
 .panel00201 {
   width: 160rpx;
   height: 160rpx;
@@ -231,7 +224,7 @@
 
 .panel003 {
   width: 100%;
-  height: 888rpx;
+  height: 1050rpx;
   background-color: #723c30;
   box-shadow: 0px 10px 0px rgba(0, 0, 0, 0.10);
   color: #edc1b4;
@@ -275,8 +268,6 @@
   width: 140rpx;
   height: 154rpx;
   border-radius: 20rpx;
-
-  
 }
 
 .btn5 {

pages/main/detail.js

@@ -23,6 +23,7 @@ Page({
     arrPage: [],
     ShowLoading: false,
     IsDistabled: "",
+    NameClass:"",
   },
   onLoad: function (options) {
     var id = options.id;
@@ -53,13 +54,21 @@ Page({
           item = data[i].List[k];
           item.Example[0] = item.Example[0].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
           item.Example[1] = item.Example[1].replace("+", " + ").replace("-", " - ").replace("×", " × ").replace("÷", " ÷ ");
+          if (item.Name.length>12)
+            item.NameClass="text2";
           break;
         }
       }
     }
+    
     this.setData({
       QuestionTypeItem: item,
     });
+
+    //有竖式则缺省竖式
+    if (item.QuestionNumber3 > 0) {
+      this.menuClick({ currentTarget: { dataset: { id: "vertical" } } })
+    }
   },
   gotoAnswer: function (e) {
     wx.navigateTo({
@@ -362,10 +371,10 @@ Page({
               duration: 300
             });
 
-            wx.previewImage({
-              current: that.data.arrPage[0], // 当前显示图片的http链接
-              urls: that.data.arrPage // 需要预览的图片http链接列表
-            });
+            // wx.previewImage({
+            //   current: that.data.arrPage[0], // 当前显示图片的http链接
+            //   urls: that.data.arrPage // 需要预览的图片http链接列表
+            // });
 
             //存列表
             var tempList = wx.getStorageSync("AnswerList");

pages/main/detail.wxml

@@ -14,7 +14,7 @@
   <view class="line0"></view>
   <view class="line1 FlexColumn">
     <image class="makepaper_headline_illus_board FlexColumn" src="../../images/makepaper_headline_illus_board.png" />
-    <view class="text">
+    <view class="{{QuestionTypeItem.NameClass}} text">
       {{QuestionTypeItem.Name}}
     </view>
   </view>

pages/main/detail.wxss

@@ -59,6 +59,10 @@
   margin-top: -80rpx;
   font-size:42rpx;
 }
+.line1 .text2{
+  font-size:32rpx;
+  margin-top: -70rpx;
+}
 
 
 .line2 {

pages/main/item.js

@@ -10,25 +10,43 @@ Page({
   data: {
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
-    IsPlaying: true,
+    IsPlaying: 0,
+    PlayStr: "本",
+    selectTab0: "btn1",
+    selectTab1: "",
+    selectTab2: "",
   },
   onLoad: function (options) {
     this.audioCtx = wx.createAudioContext('myAudio');
 
     this.setData({
       Containnerheight: server.getWindowHeight(),
+      IsPlaying: 0,
     });
     audioArray = [];
     var id = options.id;
     this.getItem(id);
 
     wx.setNavigationBarTitle({
-      title: "试卷答案 "+id,
+      title: "试卷答案 " + id,
     });
 
   },
   scrollTop: function (e) {
     var id = Number(e.currentTarget.dataset.id);
+    var selectTab0 = "", selectTab1 = "", selectTab2 = "";
+    if (id == 0)
+      selectTab0 = "btn1";
+    else if (id == 1)
+      selectTab1 = "btn1";
+    else if (id == 2)
+      selectTab2 = "btn1";
+    this.setData({
+      selectTab0: selectTab0,
+      selectTab1: selectTab1,
+      selectTab2: selectTab2,
+    });
+
     var top = 0;
 
     var query = wx.createSelectorQuery();
@@ -62,6 +80,24 @@ Page({
           list[i].IsShowVertical = true;
           break;
         }
+
+      }
+
+      var list = item.QuestionList;
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].OperateAB == '÷' && list[i].Vertical) {
+          list[i].LineLength = list[i].A.toString().length;
+          for (var k = 0; k < list[i].Vertical[1].Array.length; k++) {
+            list[i].Vertical[1].Array[k] = "";
+          }
+          for (var k = 0; k < list[i].Vertical[2].Array.length; k++) {
+            if (list[i].Vertical[2].Array[k] =="√"){
+              list[i].Vertical[2].Array[k]="";
+              list[i].Vertical[2].Array.push("√");
+              break;
+            }
+          }
+        }
       }
 
       that.setData({
@@ -93,14 +129,14 @@ Page({
     });
   },
   playAudioStart: function () {
-    this.setData({
-      IsPlaying: !this.data.IsPlaying,
-    });
 
-    if (this.data.IsPlaying) {
+    if (this.data.IsPlaying == 1) {
       this.audioCtx.pause();
     }
-    else {
+    else if (this.data.IsPlaying == -1) {
+      this.audioCtx.play();
+    }
+    else if (this.data.IsPlaying == 0) {
       var arr = [];
       var item = this.data.AnswerItem;
       var list = item.QuestionList;
@@ -127,6 +163,14 @@ Page({
       this.playAudioAll();
     }
 
+    if (this.data.IsPlaying == 1)
+      this.data.IsPlaying = -1;
+    else
+      this.data.IsPlaying = 1;
+    this.setData({
+      IsPlaying: this.data.IsPlaying,
+    });
+
   },
   playAudioAll: function () {
     if (currentIndex >= 3) {
@@ -142,13 +186,6 @@ Page({
       console.log(url);
       this.audioCtx.setSrc(url);
       this.audioCtx.play();
-      this.scrollTop({
-        currentTarget: {
-          dataset: {
-            id: currentIndex
-          }
-        }
-      });
     }
   },
   onPlayEnded: function (e) {
@@ -156,12 +193,20 @@ Page({
     this.playAudioAll();
   },
   playPrev: function () {
-    if (currentIndex > 0 && tempCurrentIndex == currentIndex)
+    var playstr = "本";
+    if (currentIndex > 0 && tempCurrentIndex == currentIndex) {
       currentIndex--;
+    }
     else {
       tempCurrentIndex = currentIndex;
+      playstr = "前";
+      if (currentIndex <= 0)
+        playstr = "本";
     }
     this.playAudioAll();
+    this.setData({
+      PlayStr: playstr,
+    });
   },
   onShareAppMessage: function () {
     return {

pages/main/item.wxml

@@ -9,15 +9,22 @@
     <view class="panelLeft">听答案</view>
     <view class="panelRight FlexRow">
 
-      <view class="btn4 btn2" bindtap='playPrev'>
+      <view class="btn2" bindtap='playAudioStart'>
         <view class="btn3 FlexRow">
-          <image class="universalpic_rewind_white_size01" src="../../images/universalpic_rewind_white_size01.png" />
+          <view wx:if="{{IsPlaying==0 || IsPlaying==-1}}">播放</view>
+          <view wx:if="{{IsPlaying==1}}">暂停</view>
         </view>
       </view>
-      <view class="btn2" bindtap='playAudioStart'>
+
+      <view class="btn2" bindtap='playPrev' wx:if="{{IsPlaying!=0}}">
         <view class="btn3 FlexRow">
-          <image class="universalpic_play_white_size01" src="../../images/universalpic_play_white_size01.png" wx:if="{{IsPlaying}}" />
-          <image class="pause_white_size01" src="../../images/pause_white_size01.png" wx:if="{{!IsPlaying}}" />
+          <view>{{PlayStr}}列重播</view>
+        </view>
+      </view>
+
+      <view class="btn4 btn2" bindtap='playPrev' wx:if="{{IsPlaying==0}}">
+        <view class="btn5 btn3 FlexRow">
+          <view>{{PlayStr}}列重播</view>
         </view>
       </view>
     </view>
@@ -32,9 +39,9 @@
   <view class="panel0 FlexRow">
     <view class="panelLeft">题号快翻</view>
     <view class="panelRight FlexRow">
-      <view class="btn1 btn" bindtap="scrollTop" data-id="0">1</view>
-      <view class="btn" bindtap="scrollTop" data-id="1">{{AnswerItem.QuestionList.length/3+1}}</view>
-      <view class="btn" bindtap="scrollTop" data-id="2">{{AnswerItem.QuestionList.length*2/3+1}}</view>
+      <view class="{{selectTab0}} btn" bindtap="scrollTop" data-id="0">1</view>
+      <view class="{{selectTab1}} btn" bindtap="scrollTop" data-id="1">{{AnswerItem.QuestionList.length/3+1}}</view>
+      <view class="{{selectTab2}} btn" bindtap="scrollTop" data-id="2">{{AnswerItem.QuestionList.length*2/3+1}}</view>
     </view>
   </view>
 
@@ -77,7 +84,6 @@
           <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
             <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
             <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
-            <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
             <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
             <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
             <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
@@ -88,14 +94,17 @@
     <!-- 算式（除） -->
     <view class="panelRowBody panel0 FlexColumn" wx:if="{{item.Vertical && item.OperateAB=='÷' && item.IsShowVertical}}">
       <view class="panelAnswer FlexColumn">
-        <view class="panelAnswerRow FlexRow" wx:for='{{item.Vertical}}' wx:key="index">
-          <view class="panelAnswerCol FlexRow" wx:for='{{item.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
-            <view class="colNumber" wx:if="{{item.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
-            <view class="colDot" wx:if="{{item.Type=='number' && col=='.'}}">{{col}}</view>
-            <image wx:if="{{item.Type=='number' && col=='√'}}" class="formula_division_size01" src="../../images/formula_division_size01.png" />
-            <view class="colLine" wx:if="{{item.Type=='line' && col=='1'}}"></view>
-            <view class="colLineHalf" wx:if="{{item.Type=='line' && col=='0.5'}}"></view>
-            <view class="colLineNull" wx:if="{{item.Type=='line' && col==''}}"></view>
+        <view class="panelAnswerRow FlexRow" wx:for='{{item.Vertical}}' wx:for-item="itemChild" wx:key="index">
+          <view class="panelAnswerCol FlexRow" wx:for='{{itemChild.Array}}' wx:key="i" wx:for-item="col" wx:for-index="i">
+            <view class="colNumber" wx:if="{{itemChild.Type=='number' && col!='√' && col!='.'}}">{{col}}</view>
+            <view class="colDot" wx:if="{{itemChild.Type=='number' && col=='.'}}">{{col}}</view>
+            <view class="colLine" wx:if="{{itemChild.Type=='line' && col=='1'}}"></view>
+            <view class="colLineHalf" wx:if="{{itemChild.Type=='line' && col=='0.5'}}"></view>
+            <view class="colLineNull" wx:if="{{itemChild.Type=='line' && col==''}}"></view>
+            <image wx:if="{{itemChild.Type=='number' && col=='√'}}" class="formula_division_size0{{item.LineLength}} formula_division_size"
+              style='margin-left:{{ -57*item.LineLength-35 }}rpx;' 
+             src="../../images/formula_division_size0{{item.LineLength}}.png" />
+            
           </view>
         </view>
       </view>
@@ -106,6 +115,6 @@
 
   </block>
   <view wx:if="{{AnswerItem.PageCount<60}}" class="panelRowBody panel0 FlexRow" wx:for="{{[1,2,3]}}" wx:key="i"></view>
-  
+
 </view>
 <audio hidden='true' id="myAudio" bindended='onPlayEnded'></audio>

pages/main/item.wxss

@@ -44,12 +44,12 @@
 
 
 .panelRight .btn2 {
-  width: 200rpx;
+  width: 168rpx;
   height: 70rpx;
   background-color: #146392;
   border-radius: 8rpx;
   position: relative;
-  margin-left: 30rpx;
+  margin-left: 20rpx;
 }
 
 .panelRight .btn3 {
@@ -57,12 +57,20 @@
   height: 60rpx;
   background-color: #169DED;
   border-radius: 8rpx;
+  font-size:32rpx;
+  color:#fff;
 }
 
 .panelRight .btn4 {
-  width: 130rpx;
+  background-color: #D2D2D2;
+}
+
+.panelRight .btn5 {
+  background-color: #F0F0F0;
+  color:#D2D2D2;
 }
 
+
 .universalpic_play_white_size01{
   width: 25rpx;
   height: 30rpx;
@@ -162,12 +170,37 @@
   justify-content: flex-start;
 }
 
-.formula_division_size01{
-  width:27rpx;
+.formula_division_size{
   height:77rpx;
   margin: -20rpx 25rpx 0 5rpx;
 }
-
+.formula_division_size01{
+  width:114rpx;
+}
+.formula_division_size02{
+  width:171rpx;
+}
+.formula_division_size03{
+  width:228rpx;
+}
+.formula_division_size04{
+  width:285rpx;
+}
+.formula_division_size04{
+  width:285rpx;
+}
+.formula_division_size05{
+  width:342rpx;
+}
+.formula_division_size06{
+  width:399rpx;
+}
+.formula_division_size07{
+  width:456rpx;
+}
+.formula_division_size08{
+  width:513rpx;
+}
 .panelAnswer .colNumber{
   font-size:48rpx;
   margin: 10rpx 15rpx;
@@ -176,6 +209,7 @@
   height:57rpx;
   text-align: center;
 }
+
 .panelAnswer .colDot{
   font-size:48rpx;
   margin: 10rpx -8rpx 0 -5rpx;

pages/main/list.js

@@ -12,7 +12,6 @@ Page({
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
     filter: 'all',
-    IsShowMenu: false,
     CategoryID: 1,
   },
   onLoad: function (options) {
@@ -69,7 +68,7 @@ Page({
 
 
             for (var n = 0; n < arr.length; n++) {
-              //data[i].List[k].SelectItem = "";
+              data[i].List[k].SelectItem = "boxCenter";
               if (arr[n] == data[i].List[k].ID) {
                 data[i].List[k].SelectItem = "boxLeft";
               }
@@ -91,32 +90,18 @@ Page({
         }
       }
     }
-    var LineLongHeight = (list.length+1) * 190;
-    
     this.setData({
       QuestionTypeList: list,
-      LineLongHeight: LineLongHeight,
     });
 
   },
-  menuClick: function (e) {
-    this.data.filter = e.currentTarget.dataset.id;
+  openMenu: function (e) {
+    this.data.filter = e.currentTarget.dataset.filter;
     this.setData({
       filter: this.data.filter,
-      IsShowMenu: false,
     });
     this.buildList();
   },
-  closeMenu: function () {
-    this.setData({
-      IsShowMenu: false,
-    });
-  },
-  openMenu: function () {
-    this.setData({
-      IsShowMenu: true,
-    });
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/list.wxml

@@ -4,36 +4,60 @@
   <view class="line2"></view>
   <view class="line3"></view>
   <image class="questioncollection_headline_root" src="../../images/questioncollection_headline_root.png" />
-  
-  <image class="questioncollection_headline_light" src="../../images/questioncollection_headline_light.png" bindtap='openMenu'/>
-  <image class="questioncollection_headline_shelf_illus_grade0{{CategoryNum}}" src="../../images/questioncollection_headline_shelf_illus_grade0{{CategoryNum}}.png"  bindtap='openMenu' />
-  <image class="questioncollection_headline_plate" src="../../images/questioncollection_headline_plate.png" wx:if="{{filter=='vertical'}}"/>
+
+  <image class="questioncollection_headline_light" src="../../images/questioncollection_headline_light.png" />
+  <view class="panelTop FlexRow">
+    <view class="panelTopLine lineLeft lineLong FlexRow">
+      <view class="panelTopLine1 lineLong1">
+      </view>
+    </view>
+    <view class="panelTopCenter">
+      <image class="questioncollection_headline_shelf_illus_grade0{{CategoryNum}}" src="../../images/questioncollection_headline_shelf_illus_grade0{{CategoryNum}}.png" />
+    </view>
+    <view class="panelTopLine1 lineRight lineLong FlexRow">
+      <view class="panelTopLine lineLong1">
+      </view>
+    </view>
+  </view>
+  <image class="questioncollection_headline_plate01_selected" src="../../images/questioncollection_headline_plate01_selected.png" wx:if="{{filter=='all'}}" />
+  <image bindtap='openMenu' data-filter="all" class="questioncollection_headline_plate01_selected" src="../../images/questioncollection_headline_plate01_unselected.png" wx:if="{{filter=='vertical'}}" />
+  <image class="questioncollection_headline_plate02_selected" src="../../images/questioncollection_headline_plate02_selected.png" wx:if="{{filter=='vertical'}}" />
+  <image bindtap='openMenu' data-filter="vertical" class="questioncollection_headline_plate02_selected" src="../../images/questioncollection_headline_plate02_unselected.png" wx:if="{{filter=='all'}}" />
 
 
   <block wx:for="{{QuestionTypeList}}" wx:key="index">
     <image class="questioncollection_shelf_board" src="../../images/questioncollection_shelf_board.png" bindtap='gotoDetail' data-id="{{item.ID}}" />
-    <view class="{{item.SelectItem}} questioncard FlexRow" bindtap='gotoDetail' data-id="{{item.ID}}">
-      <image class=" questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
-      <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
-      <view class="title FlexColumn">
-        <view class="title1">
-          {{item.Name}}
+    <view class="questioncard FlexRow" bindtap='gotoDetail' data-id="{{item.ID}}">
+      <view class="lineLeft lineLong FlexRow">
+        <view class="lineLong1">
         </view>
-        <view class="title2 FlexRow">
-          <view class="title20 FlexRow">
-            {{item.CategoryLevel}}
+      </view>
+      <view class="{{item.SelectItem}} cardCenter FlexRow">
+        <image class="questioncollection_shelf_box" src="../../images/questioncollection_shelf_box.png" />
+        <image class="questioncard_icon" src="{{FileUrl}}questioncard_icon_grade0602_size01.png" />
+        <view class="title FlexColumn">
+          <view class="title1">
+            {{item.Name}}
           </view>
-          <view class="line"></view>
-          <view class="title21 FlexRow">
-            {{item.DifficultyName}}
+          <view class="title2 FlexRow">
+            <view class="title20 FlexRow">
+              {{item.CategoryLevel}}
+            </view>
+            <view class="line"></view>
+            <view class="title21 FlexRow">
+              {{item.DifficultyName}}
+            </view>
           </view>
         </view>
-      </view>
-      <image wx:if="{{item.SelectItem!='boxLeft'}}" class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
-      <view class="title3" wx:if="{{item.QuestionNumber3>0}}">有竖式</view>
-
-      <image wx:if="{{item.Select}}" class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" />
+        <image wx:if="{{item.SelectItem!='boxLeft'}}" class="questioncollection_shelf_box_tape" src="../../images/questioncollection_shelf_box_tape.png" />
+        <view class="title3" wx:if="{{item.QuestionNumber3>0}}">有竖式</view>
 
+        <image wx:if="{{item.Select}}" class="questioncollection_shelf_here" src="../../images/questioncollection_shelf_here.png" />
+      </view>
+      <view class="lineRight lineLong FlexRow">
+        <view class="lineLong1">
+        </view>
+      </view>
     </view>
 
   </block>
@@ -62,41 +86,24 @@
 
   </view> -->
 
-  <image class="questioncollection_shelf_footer_illus" src="../../images/questioncollection_shelf_footer_illus.png" />
-  <view class="line4"></view>
-
-  <view class="line5"></view>
-  <view class="line6" hidden="{{QuestionTypeList.length>0}}"></view>
-
-  <view class="lineLeft lineLong FlexRow" style="height:{{ LineLongHeight }}rpx;">
-    <view class="lineLong1">
-    </view>
-  </view>
-  <view class="lineRight lineLong FlexRow" style="height:{{ LineLongHeight }}rpx;">
-    <view class="lineLong2">
-    </view>
-  </view>
-
-  <view class="menu FlexColumn" wx:if="{{IsShowMenu}}">
-    <view class="text1">筛选题卡</view>
-    <view class="panel FlexRow" bindtap='menuClick' data-id="all">
-      <view>全部</view>
-      <image wx:if="{{filter=='all'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
-
+  <view class="panelBottom panelTop FlexRow">
+    
+    <view class="line4"></view>
+    <view class="panelTopLine2 lineLeft lineLong FlexRow">
+      <view class="panelTopLine3 lineLong1">
+      </view>
     </view>
-    <view class="line"></view>
-    <view class="panel FlexRow" bindtap='menuClick' data-id="vertical">
-      <view>仅竖式</view>
-      <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
-
+    <view class="panelTopCenter">
+      <image class="questioncollection_shelf_footer_illus" src="../../images/questioncollection_shelf_footer_illus.png" />
     </view>
-    <view class="line"></view>
-    <view class="line2"></view>
-    <view class="line"></view>
-    <view class="panel FlexRow" bindtap='closeMenu'>
-      <view>取消</view>
+    <view class="panelTopLine3 lineRight lineLong FlexRow">
+      <view class="panelTopLine2 lineLong1">
+      </view>
     </view>
 
   </view>
 
+  <view class="line5"></view>
+  <view class="line6" hidden="{{QuestionTypeList.length>0}}"></view>
+
 </view>

pages/main/list.wxss

@@ -43,33 +43,62 @@
   z-index: 100;
 }
 
+.panelTop {
+  margin-top: 10rpx;
+  align-items: flex-end;
+  justify-content: center;
+  width: 100%;
+  height: 160rpx;
+}
+
+.panelTopLine{
+  border-top-left-radius: 8rpx;
+}
+.panelTopLine1{
+  border-top-right-radius: 8rpx;
+}
+
+.panelTopCenter{
+  width: 630rpx;
+  height: 160rpx;
+}
+
 .questioncollection_headline_shelf_illus_grade01 {
   width: 520rpx;
   height: 160rpx;
-  margin-top: 10rpx;
 }
+
 .questioncollection_headline_shelf_illus_grade02 {
   width: 545rpx;
   height: 140rpx;
-  margin-top: 10rpx;
 }
+
 .questioncollection_headline_shelf_illus_grade03 {
   width: 580rpx;
   height: 140rpx;
-  margin-top: 10rpx;
 }
+
 .questioncollection_headline_shelf_illus_grade04 {
   width: 529rpx;
   height: 130rpx;
-  margin-top: 10rpx;
 }
 
-.questioncollection_headline_plate {
+.questioncollection_headline_plate01_selected {
   width: 112rpx;
   height: 70rpx;
   position: absolute;
-  top: 240rpx;
-  left: 60rpx;
+  top: 186rpx;
+  left: 0rpx;
+  z-index: 100;
+}
+
+.questioncollection_headline_plate02_selected {
+  width: 112rpx;
+  height: 70rpx;
+  position: absolute;
+  top: 264rpx;
+  left: 0rpx;
+  z-index: 100;
 }
 
 .questioncollection_shelf_board {
@@ -79,9 +108,14 @@
 }
 
 .questioncard {
-  width: 580rpx;
+  width: 100%;
   height: 130rpx;
   margin-top: -40rpx;
+}
+
+.cardCenter {
+  width: 590rpx;
+  height: 130rpx;
   position: relative;
   justify-content: flex-start;
 }
@@ -93,11 +127,15 @@
 }
 
 .boxLeft {
-  margin-left: -20rpx;
+  margin: 0 28rpx 0 12rpx;
+}
+
+.boxCenter {
+  margin: 0 2rpx 0 38rpx;
 }
 
 .boxRight {
-  margin-right: -20rpx;
+  margin: 0 2rpx 0 38rpx;
 }
 
 .questioncard_icon {
@@ -177,44 +215,22 @@
   height: 318rpx;
   margin-top: 0rpx;
   z-index: 10;
+  position: relative;
 }
 
-.line4 {
-  width: 100%;
-  height: 100rpx;
-  background-color: #433d3b;
-  margin-top: -50rpx;
-}
-
-.line5 {
-  width: 100%;
-  height: 50rpx;
-  background-color: #514a47;
-}
-.line6 {
-  width: 100%;
-  height: 550rpx;
-  background-color: #514a47;
-}
 
 .lineLong {
   width: 30rpx;
-  height: 540rpx;
-  border-radius: 8rpx;
+  height: 190rpx;
   background-color: #4d4d4d;
+  margin-top: -60rpx;
 }
 
 .lineLeft {
-  position: absolute;
-  top: 168rpx;
-  left: 30rpx;
   justify-content: flex-end;
 }
 
 .lineRight {
-  position: absolute;
-  top: 168rpx;
-  right: 30rpx;
   justify-content: flex-start;
 }
 
@@ -222,8 +238,6 @@
   background-color: #6b6b6b;
   height: 100%;
   width: 10rpx;
-  border-top-right-radius: 8rpx;
-  border-bottom-right-radius: 8rpx;
 }
 
 .lineLong2 {
@@ -234,43 +248,51 @@
   border-bottom-left-radius: 8rpx;
 }
 
-.menu {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  background-color: #d2d2d2;
-  z-index: 30;
+.universalpic_select_on_black {
+  height: 30rpx;
+  width: 30rpx;
+  position: absolute;
+  left: 40rpx;
+  top: 40rpx;
 }
 
-.menu .text1 {
-  font-size: 24rpx;
-  margin: 30rpx;
+.panelBottom {
+  height: 370rpx;
+  align-items: flex-start;
+
+  background-color: #3B3431;
+  position: relative;
 }
 
-.menu .panel {
-  font-size: 36rpx;
-  height: 111rpx;
-  width: 100%;
-  background-color: #fff;
+.panelTopLine2{
+  border-bottom-left-radius: 8rpx;
+  height:410rpx;
+  position: relative;
+  z-index: 10;
+}
+.panelTopLine3{
+  border-bottom-right-radius: 8rpx;
+  height:410rpx;
   position: relative;
+  z-index: 10;
 }
 
-.menu .line {
-  height: 2rpx;
+.line4 {
   width: 100%;
-  background-color: #e3e3e3;
+  height: 100rpx;
+  position: absolute;
+  bottom:0rpx;
+  background-color: #433D3B;
 }
 
-.menu .line2 {
-  height: 20rpx;
+.line5 {
   width: 100%;
-  background-color: #d2d2d2;
+  height: 50rpx;
+  background-color: #514a47;
 }
 
-.universalpic_select_on_black {
-  height: 30rpx;
-  width: 30rpx;
-  position: absolute;
-  left:40rpx;
-  top:40rpx;
-}
+.line6 {
+  width: 100%;
+  height: 550rpx;
+  background-color: #514a47;
+}

utils/main.js

@@ -284,11 +284,18 @@ function getProgramList() {
     },
     {
       id: 90,
-      Name: "注意力练习",
+      Name: "注意力游戏",
       appId: 'wxa5e33c61fe37dd01',
       path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
       imageName: "universalpic_product_zhuyili_icon_size01",
     },
+    {
+      id: 127,
+      Name: "空间智力游戏",
+      appId: 'wxaa1a8b48d9853872',
+      path: 'pages/index/game?SourceID=' + app.globalData.ProgramID,
+      imageName: "universalpic_product_kongjian_icon_size01",
+    },
   ];
 }