1.2.12

app.js

@@ -23,7 +23,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.2.10",
+    Version: "1.2.12",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

pages/index/index.js

@@ -253,17 +253,7 @@ Page({
     });
 
     updateManager.onUpdateReady(function () {
-      wx.showModal({
-        title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
-        success: function (res) {
-          if (res.confirm) {
-            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
-          }
-        }
-      });
-
+      updateManager.applyUpdate();
     });
   },
   onShareAppMessage: function () {

pages/main/index.wxml

@@ -75,6 +75,66 @@
             </view>
           </view>
         </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=7">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02037.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02038.png' class="img2" />
+            </view>
+          </view>
+        </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=8">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02041.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02042.png' class="img2" />
+            </view>
+          </view>
+        </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=9">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02039.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02040.png' class="img2" />
+            </view>
+          </view>
+        </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=10">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02043.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02044.png' class="img2" />
+            </view>
+          </view>
+        </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=11">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02045.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02046.png' class="img2" />
+            </view>
+          </view>
+        </view>
+        <view class="btn" bindtap="goto" data-url="../main/list?id=12">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../images/02047.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../images/02048.png' class="img2" />
+            </view>
+          </view>
+        </view>
       </view>
     </view>
     <view class="index7 FlexRow">

pages/main/index.wxss

@@ -71,7 +71,7 @@
 
 .index2{
   width:100%;
-  height:1486rpx;
+  height:2876rpx;
   background-color: #DFC7A4;
   justify-content: flex-start;
 }

pages/main/list.js

@@ -88,10 +88,23 @@ Page({
       imgNum = "12";
     else
       imgNum = "0" + imgNum;
+    
     this.setData({
       List: result.Units,
-      topImage: "../images/040" + imgNum + ".png"
     });
+
+    if (Number(imgNum)<=6){
+      this.setData({
+        topImage: "../images/040" + imgNum + ".png"
+      });
+    }
+    else{
+      this.setData({
+        IsRemind:false,
+      });
+      wx.setStorageSync('IsRemind', false);
+    }
+
     wx.setNavigationBarTitle({
       title: result.Name,
     });

pages/main/list.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
   <view class="top line"></view>
   <view class="top2 top line1 line"></view>
-  <image src='{{topImage}}' class="topImage" />
+  <image wx:if="{{topImage}}" src='{{topImage}}' class="topImage" />
 
   <view class="line"></view>
 

pages/main/search.js

@@ -4,8 +4,7 @@ import server from '../../utils/main';
 const app = getApp();
 
 Page({
-  data: {
-  },
+  data: {},
   onLoad: function (options) {
     this.setData({
       Height: common.getSystemHeight(),
@@ -17,22 +16,24 @@ Page({
     var result = [];
     var arr = JSON.parse(wx.getStorageSync("HanziAll"));
     for (var i = 0; i < arr.length; i++) {
-      var rnd1 = common.random(0, arr[i].Units.length - 1);
-      var rnd2 = common.random(0, arr[i].Units[rnd1].Words.length - 1);
+      if (arr[i].Units && arr[i].Units.length>0) {
+        var rnd1 = common.random(0, arr[i].Units.length - 1);
+        var rnd2 = common.random(0, arr[i].Units[rnd1].Words.length - 1);
 
-      var isfinished = false;
-      var arrReview = wx.getStorageSync("ReviewList");
-      for (var l = 0; l < arrReview.length; l++) {
-        if (arrReview[l].Word == arr[i].Units[rnd1].Words[rnd2].Name) {
-          isfinished = true;
-          break;
+        var isfinished = false;
+        var arrReview = wx.getStorageSync("ReviewList");
+        for (var l = 0; l < arrReview.length; l++) {
+          if (arrReview[l].Word == arr[i].Units[rnd1].Words[rnd2].Name) {
+            isfinished = true;
+            break;
+          }
         }
+        arr[i].Units[rnd1].Words[rnd2].BookID = arr[i].ID;
+        arr[i].Units[rnd1].Words[rnd2].UnitID = arr[i].Units[rnd1].ID;
+        arr[i].Units[rnd1].Words[rnd2].WordID = rnd2;
+        arr[i].Units[rnd1].Words[rnd2].IsFinished = isfinished;
+        result.push(arr[i].Units[rnd1].Words[rnd2]);
       }
-      arr[i].Units[rnd1].Words[rnd2].BookID = arr[i].ID;
-      arr[i].Units[rnd1].Words[rnd2].UnitID = arr[i].Units[rnd1].ID;
-      arr[i].Units[rnd1].Words[rnd2].WordID = rnd2;
-      arr[i].Units[rnd1].Words[rnd2].IsFinished = isfinished;
-      result.push(arr[i].Units[rnd1].Words[rnd2]);
     }
     return result;
   },
@@ -54,15 +55,13 @@ Page({
           wx.navigateTo({
             url: "../main/detail?Type=search",
           });
-        }
-        else {
+        } else {
           that.setData({
             IsSearchResult: true,
           });
         }
       });
-    }
-    else {
+    } else {
       that.setData({
         IsSearchResult: true,
       });
@@ -70,7 +69,11 @@ Page({
   },
   goto: function (e) {
     var word = e.currentTarget.dataset.word;
-    this.researchWord({ detail: { value: word } });
+    this.researchWord({
+      detail: {
+        value: word
+      }
+    });
   },
   onShareAppMessage: function () {
     return {