1.0.0

app.js

@@ -12,7 +12,7 @@ App({
   },
   globalData: {
     Version: "1.0.0",
-    IsProduction: true,
+    IsProduction: false,
     userInfo: null,
     fileUrl: "https://www.kylx365.com/",
     serverUrl: "https://www.kylx365.com/apiData/",
@@ -20,6 +20,7 @@ App({
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     imageUrl: "https://hanzi-1253256735.file.myqcloud.com",
     audioUrl: "https://pinyin.kylx365.com",
+    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     systemInfo: null,
@@ -29,6 +30,7 @@ App({
     DayNumber: 0,//使用天数
     PayMoney: 9.8,//产品销售价
     TestScoreMax: 0,//测试最高分
+    BaiduToken:"",//百度开发平台token
     IsShow: 0,
   }
 })

app.json

@@ -3,6 +3,8 @@
     "pages/index/index",
     "pages/main/list",
     "pages/main/detail",
+    "pages/main/search",
+    "pages/main/about",
     "pages/main/index"
   ],
   "window": {

pages/index/index.js

@@ -2,37 +2,165 @@ import common from '../../utils/util';
 import server from '../../utils/main';
 
 const app = getApp()
+var timeout2, timeout3;
 
 Page({
   data: {
     FileUrl: "../../",
     ImageAll: ["../../images/01003.png", "../../images/01004.png", "../../images/01005.png"],
-    indexImage:0,
+    indexImage: 0,
   },
   onReady: function (e) {
   },
-  onLoad: function () {
+  onLoad: function (options) {
+    if (options) {
+      if (options.UserID) {
+        console.log("UserID:" + options.UserID);
+        app.globalData.introducer = options.UserID;
+      }
+      if (options.SourceID) {
+        console.log("SourceID:" + options.SourceID);
+        app.globalData.SourceID = options.SourceID;
+      }
+      // 扫码介绍人
+      if (options.scene) {
+        var scene = decodeURIComponent(options.scene);
+        console.log("scene:" + scene);
+        var introducer = 0;
+        if (scene.indexOf("UserID") >= 0)
+          introducer = scene.substr(scene.indexOf("UserID") + 7);
+        console.log("introducer:" + introducer);
+        app.globalData.introducer = scene;
+      }
+    }
     this.setData({
       Height: common.getSystemHeight(),
-      indexImage:common.random(0,2),
+      indexImage: common.random(0, 2),
     });
 
-    setTimeout(function(){
-      wx.redirectTo({
-        url: '../main/index'
-      })
-    },2000);
+    this.getUserInfo();
+    
+  },
+  //得到用户信息
+  getUserInfo: function (cb) {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        app.globalData.userInfo = {};
+        app.globalData.userInfo.Code = res0.code;
+        //console.log("Code:" + res0.code);
+
+        wx.getSetting({
+          scope: "scope.userInfo",
+          success(res) {
+            if (!res.authSetting['scope.userInfo']) {
+              app.globalData.userInfo.nickName = "陌生用户";
+              app.globalData.userInfo.language = "";
+              app.globalData.userInfo.gender = "0";
+              app.globalData.userInfo.city = "";
+              app.globalData.userInfo.province = "";
+              app.globalData.userInfo.country = "";
+              app.globalData.userInfo.avatarUrl = "../../images/FACE.png";
+              that.login(app.globalData.userInfo);
+            }
+            else {
+              wx.getUserInfo({
+                withCredentials: false,
+                success: function (res) {
+                  app.globalData.userInfo = res.userInfo;
+
+                  app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+                  app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+                  app.globalData.userInfo.Code = res0.code;
+                  that.login(app.globalData.userInfo);
 
-    this.getHanzi();
+                },
+                fail: function (res) {
+                  that.login(app.globalData.userInfo);
+                }
+              });
+
+            }
+          }
+        });
+      },
+      fail: function () {
+        timeout2 = setTimeout(function () {
+          that.getUserInfo();
+          console.log("reboot:" + new Date().getTime());
+        }, 2000);
+      }
+    });
   },
-  getHanzi: function () {
+
+  login: function (param) {
+    var that = this;
+
+    server.getLocalHost(function () {
+      server.postData('HanziLogin', {
+        Code: param.Code,
+        NickName: param.nickName,
+        Language: param.language,
+        Gender: param.gender,
+        City: param.city,
+        Province: param.province,
+        Country: param.country,
+        AvatarUrl: param.avatarUrl,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+        Brand: app.globalData.systemInfo.brand,
+        Model: app.globalData.systemInfo.model,
+        PixelRatio: app.globalData.systemInfo.pixelRatio,
+        ScreenWidth: app.globalData.systemInfo.screenWidth,
+        ScreenHeight: app.globalData.systemInfo.screenHeight,
+        WindowWidth: app.globalData.systemInfo.windowWidth,
+        WindowHeight: app.globalData.systemInfo.windowHeight,
+        WXLanguage: app.globalData.systemInfo.language,
+        WXVersion: app.globalData.systemInfo.version,
+        System: app.globalData.systemInfo.system,
+        Platform: app.globalData.systemInfo.platform,
+        SDKVersion: app.globalData.systemInfo.SDKVersion,
+        ProgramVersion: app.globalData.Version,
+      }, function (data) {
+        //console.log("UserInfo:" + data);
+        if (!data) {
+          timeout3 = setTimeout(function () {
+            that.getUserInfo();
+            console.log("reboot:" + new Date().getTime());
+          }, 2000);
+        }
+        else {
+          app.globalData.userInfo = data;
+          //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
+          
+          that.getHanzi(function(){
+            setTimeout(function () {
+              wx.redirectTo({
+                url: '../main/index'
+              })
+            }, 2000);
+          });
+        }
+      });
+
+    });
+  },
+  getHanzi: function (callback) {
     var that = this;
     var time = wx.getStorageSync("HanziUpdateTime");
     server.getData('GetHanziAll?UpdateTime=' + time, function (data) {
       if (data) {
-        var arr = common.Decrypt(data.List);
-        wx.setStorageSync("HanziAll", arr);
-        wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+        if (data.List) {
+          var arr = common.Decrypt(data.List);
+          wx.setStorageSync("HanziAll", arr);
+          wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+        }
+        app.globalData.BaiduToken = data.String;
+        callback();
       }
     });
   },
@@ -42,7 +170,7 @@ Page({
       path: 'pages/index/index',
       imageUrl: '../../images/07001.png',
       success: function (res) {
-        
+
       },
       fail: function (err) {
         console.log(err);

pages/main/about.js

@@ -0,0 +1,42 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ListProgram: [],
+  },
+  onLoad: function (options) {
+    this.setData({
+      ListProgram: server.getProgramList(),
+    })
+  },
+  switchProgram: function (e) {
+    wx.navigateToMiniProgram({
+      appId: e.currentTarget.dataset.appid,
+      path: e.currentTarget.dataset.path,
+      extraData: {
+      },
+      success(res) {
+        // 打开成功
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '识字练习——让阅读赢在起点',
+      path: 'pages/index/index',
+      imageUrl: '../../images/07001.png',
+      success: function (res) {
+
+      },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
+})

pages/main/about.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#F5E2BE",
+  "navigationBarTitleText": "关于",
+  "backgroundColor": "#F5E2BE",
+  "enablePullDownRefresh": false
+}

pages/main/about.wxml

@@ -0,0 +1,5 @@
+<view class="container FlexColumn">
+  <image src="../../images/06001.png" class="bg" />
+
+  <view class="btn" wx:for="{{ListProgram}}" wx:key="index" style='left:{{item.left}}rpx;top:{{item.top}}rpx;' bindtap='switchProgram' data-appid="{{item.appId}}" data-path="{{item.path}}"></view>
+</view>

pages/main/about.wxss

@@ -0,0 +1,17 @@
+.container {
+  background-color: #F5E2BE;
+  justify-content: flex-start;
+  color: #872439;
+}
+
+.bg{
+  width:100%;
+  height:3081rpx;
+  margin-top: 40rpx;
+}
+
+.btn{
+  width:216rpx;
+  height:284rpx;
+  position: absolute;
+}

pages/main/detail.js

@@ -3,8 +3,11 @@ import server from '../../utils/main';
 import pinyin from '../../utils/pinyin';
 
 const app = getApp();
-var wordNumber = 0;
-
+var isEditSetting = [];//是否修改设置
+var intervalAutoPage = 0;
+var insertID = 0, hanziNumber = 0;
+var isClickFinished = true;//可以点击学会了
+var isClickReview = true;//可以点击要复习
 Page({
   data: {
     IsAutoPlay: true,//是否自动播放
@@ -13,75 +16,257 @@ Page({
     PlayChecked: "checked",
     PageChecked: "",
     IsFinished: false,//是否练会了
-    arrIntervalSecond: [3, 4, 5, 6, 7, 8, 9, 10],//播放间隔秒数组
+    arrIntervalSecond: [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],//播放间隔秒数组
+    audioPer: [0, 1, 3, 4],//音色
     IntervalSecondIndex: 2,//播放间隔秒数索引
     IsImageError: false,
+    SpeakerArray: [{ name: "温柔姐姐", value: "woman", isShow: true }, { name: "爽朗哥哥", value: "man", isShow: false }, { name: "激情叔叔", value: "oldman", isShow: false }, { name: "搞怪妹妹", value: "sister", isShow: false }],
+
   },
   onLoad: function (options) {
-    var bookID = options.bookid;
-    var unitID = options.id;
+    var bookID = options.bookid || 0;
+    var unitID = options.unitid || 0;
+    var wordID = options.wordid || 0;
     this.audioCtx = wx.createAudioContext('myAudio');
+    hanziNumber = 0;
+    isClickFinished = true;
+    isClickReview = true;
+    var isfinished = options.isfinished;
+    if (!isfinished || isfinished == "false")
+      isfinished = false;
+    else if (isfinished == "true")
+      isfinished = true;
+
+    if (!options.Type) {
+      options.Type = "normal";
+    }
 
     this.setData({
       Height: common.getSystemHeight(),
       IsShowPrev: false,
       IsShowNext: true,
-      CurrentIndex: 0,
-      IsFinished: false,
+      CurrentIndex: wordID,
+      IsFinished: isfinished,
       IsHelpPosition1: 0,
       IsHelpPosition2: 0,
       IsReview: false,
+      IsShowWordDetail: false,
+      ShowMenu: "sort",
       UnitID: unitID,
       BookID: bookID,
+      selectedRandom: false,
+      SpeakerTitle: this.data.SpeakerArray[0].name,
+      SpeakerMan: 0,
+      ShowPinyin: true,
+      IsAudioLengthChecked: true,//显示组词播放音
+      WordType: options.Type,
     });
 
-    this.init();
+    var that = this;
+    common.getStorageValue(that, "IsAutoPlay", true, function () {
+      common.getStorageValue(that, "IsAutoPage", false, function () {
+        common.getStorageValue(that, "selectedRandom", false, function () {
+          common.getStorageValue(that, "ShowPinyin", true, function () {
+            common.getStorageValue(that, "IntervalSecondIndex", 2, function () {
+              common.getStorageValue(that, "IsAudioLengthChecked", true, function () {
+                common.getStorageValue(that, "SpeakerMan", 0, function () {
+                  that.settingPlay(null, that.data.IsAutoPlay);
+                  that.settingPage(null, that.data.IsAutoPage);
+                  that.settingSort(null, that.data.selectedRandom.toString());
+                  that.settingShowPinyin(null, that.data.ShowPinyin);
+                  that.settingAudioLength(null, that.data.IsAudioLengthChecked);
+                  that.settingSpeaker(null, that.data.SpeakerMan);
+                  if (that.data.WordType == "normal")
+                    that.init();
+                  else if (that.data.WordType == "review")
+                    that.initReview();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+
+    if (this.data.WordType == "normal")
+      this.submitData();
+
+  },
+  onUnload: function () {
+    clearInterval(intervalAutoPage);
+
+    server.postData('UpdateHanziRecord', {
+      RecordID: insertID,
+      HanziNumber: hanziNumber,
+    }, function (data) { });
+  },
+  submitData: function (content) {
+    if (app.globalData.userInfo && app.globalData.userInfo.UserID) {
+      server.postData('AddHanziRecord', {
+        UserID: app.globalData.userInfo.UserID,
+        Category: this.data.BookID,
+        Content: this.data.UnitID,
+      }, function (data) {
+        //console.log(data.insertId);
+        insertID = data.insertId;
+      });
+    }
   },
   init: function () {
     var arr = JSON.parse(wx.getStorageSync("HanziAll"));
-
+    var arrReview = wx.getStorageSync("ReviewList");
+    var title = "";
     var result;
     for (var i = 0; i < arr.length; i++) {
       if (arr[i].ID == this.data.BookID) {
-        result = arr[i];
-        for (var j = 0; j < result.Units.length; j++) {
-          var item = result.Units[j];
-          if (item.ID == this.data.UnitID){
-            for(var k=0;k<item.Words.length;k++){
+        for (var j = 0; j < arr[i].Units.length; j++) {
+          var item = arr[i].Units[j];
+          if (item.ID == this.data.UnitID) {
+            for (var k = 0; k < item.Words.length; k++) {
               if (item.Words[k].Pinyin.indexOf(",") > 0)
                 item.Words[k].Pinyin = item.Words[k].Pinyin.substr(0, item.Words[k].Pinyin.indexOf(","));
 
-              item.Words[k].WordUrl = app.globalData.imageUrl+"/images/hanzi"+item.Words[k].Name+".jpg";
+              item.Words[k].WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Words[k].Name + ".jpg";
+
+              item.Words[k].IsReview = false;
+
+              title = arr[i].Name.replace("识字能力", "");
+              title += " " + item.Name;
+              for (var l = 0; l < arrReview.length; l++) {
+                if (arrReview[l].Word == item.Words[k].Name) {
+                  item.Words[k].IsReview = true;
+                  break;
+                }
+              }
             }
-            result=item;
+            result = item;
             break;
           }
         }
         break;
       }
     }
+
+    if (this.data.selectedRandom) {
+      result.Words = common.randomArray(result.Words);
+    }
+
+    var obj = {
+      Title: result.Name,
+      Title2: "到底了",
+      IsEnd: true,
+    }
+    result.Words.push(obj);
+
     this.setData({
       List: result.Words,
     });
 
-    this.restart();
+    this.restart(this.data.CurrentIndex);
+
+    wx.setNavigationBarTitle({
+      title: title
+    });
+  },
+  initReview: function () {
+    var arr = JSON.parse(wx.getStorageSync("HanziAll"));
+    var arrReview = wx.getStorageSync("ReviewList");
+    var title = "";
+    var result = [];
+    for (var l = 0; l < arrReview.length; l++) {
+      for (var i = 0; i < arr.length; i++) {
+        for (var j = 0; j < arr[i].Units.length; j++) {
+          var item = arr[i].Units[j];
+          for (var k = 0; k < item.Words.length; k++) {
+            if (arrReview[l].Word == item.Words[k].Name && arrReview[l].WordID == item.Words[k].ID) {
+              if (item.Words[k].Pinyin.indexOf(",") > 0)
+                item.Words[k].Pinyin = item.Words[k].Pinyin.substr(0, item.Words[k].Pinyin.indexOf(","));
+
+              item.Words[k].WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Words[k].Name + ".jpg";
+              item.Words[k].IsReview = false;
+              item.Words[k].IsReview = true;
+              result.push(item.Words[k]);
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    if (this.data.selectedRandom) {
+      result = common.randomArray(result);
+    }
+
+    var obj = {
+      Title: "复习",
+      Title2: "到底了",
+      IsEnd: true,
+    }
+    result.push(obj);
+
+    this.setData({
+      List: result,
+    });
+
+    this.restart(this.data.CurrentIndex);
+
+    wx.setNavigationBarTitle({
+      title: "复习"
+    });
   },
   playAudio: function (e) {
     //console.log("playAudio");
     var click = false;
-    if (e)
+    if (e && e.currentTarget.dataset.click)
       click = e.currentTarget.dataset.click;
 
+    var url = app.globalData.audioUrlBaidu;
+    url = url.replace("[token]", app.globalData.BaiduToken);
+    url = url.replace("per=0", "per=" + this.data.audioPer[this.data.SpeakerMan]);
 
     if ((click || this.data.IsAutoPlay) && !(click && this.data.IsAutoPage)) {
-      var pinyinItem = this.data.List[this.data.CurrentIndex].Pinyin;
-      if (pinyinItem) {
-        pinyinItem = pinyin.getPinyinName(pinyinItem);
-        this.audioCtx.setSrc(app.globalData.audioUrl + "/sounds/" + pinyinItem + ".m4a");
-        this.audioCtx.play();
+      if (this.data.CurrentIndex == this.data.List.length - 1) {
+        if (this.data.WordType == "review")
+          url = url.replace("[word]", "本次复习" + this.data.List[this.data.CurrentIndex].Title2);
+        else
+          url = url.replace("[word]", "本章节" + this.data.List[this.data.CurrentIndex].Title2);
+        url = url.replace("spd=3", "spd=6");
       }
+      else {
+
+        var pinyinItem = this.data.List[this.data.CurrentIndex].Pinyin;
+        if (e && e.currentTarget.dataset.pinyin)
+          pinyinItem = e.currentTarget.dataset.pinyin;
+        if (pinyinItem) {
+          pinyinItem = pinyin.getPinyinName(pinyinItem);
+
+          var Name = this.data.List[this.data.CurrentIndex].Name;
+          var CombineWords = this.data.List[this.data.CurrentIndex].CombineWords;
+
+
+          if ((e && e.currentTarget.dataset.pinyin) || !this.data.IsAudioLengthChecked) {
+            url = url.replace("[word]", Name + "(" + pinyinItem + ")");
+            url = url.replace("spd=3", "spd=1");
+          }
+          else {
+            url = url.replace("[word]", Name + "(" + pinyinItem + ")," + CombineWords + "的" + Name + "(" + pinyinItem + ")");
+          }
+
+        }
+      }
+      this.audioCtx.setSrc(url);
+      this.audioCtx.play();
     }
   },
+  startAutoPage: function () {
+    var that = this;
+    clearInterval(intervalAutoPage);
+    var second = this.data.arrIntervalSecond[this.data.IntervalSecondIndex] * 1000;
+    //console.log("second:" + second);
+    intervalAutoPage = setInterval(function () {
+      that.nextHandler();
+    }, second);
+  },
   prevHandler: function () {
     if (this.data.IsShowPrev && !this.data.IsAutoPage) {
       var index = this.data.CurrentIndex;
@@ -98,7 +283,7 @@ Page({
 
       this.playAudio();
 
-      wordNumber++;
+      hanziNumber++;
     }
   },
   nextHandler: function (e) {
@@ -117,15 +302,20 @@ Page({
       }
       this.setCurrentWord(index, isShowPrev, isShowNext);
 
-      if (isShowNext)
-        this.playAudio();
+      this.playAudio();
 
-      wordNumber++;
+      hanziNumber++;
     }
   },
-  restart: function () {
+  restart: function (index) {
     var that = this;
-    var index = 0;
+    if (!index)
+      index = 0;
+
+    var isShowPrev = true;
+    if (index == 0)
+      isShowPrev = false;
+
 
     if (that.data.wordType == "review") {
       for (var i = 0; i < that.data.List.length - 1; i++) {
@@ -137,10 +327,10 @@ Page({
       });
     }
 
-    this.setCurrentWord(index, false, true);
+    this.setCurrentWord(index, isShowPrev, true);
 
     this.playAudio();
-    wordNumber++;
+    hanziNumber++;
 
     if (this.data.IsAutoPage) {
       this.startAutoPage();
@@ -156,16 +346,16 @@ Page({
     }, second);
   },
   setCurrentWord: function (index, isShowPrev, isShowNext) {
-    
     this.setData({
       CurrentIndex: index,
       IsShowPrev: isShowPrev,
       IsShowNext: isShowNext,
+      IsShowWordDetail: false,
     });
   },
-  getImageError:function(){
+  getImageError: function () {
     this.setData({
-      IsImageError:true,
+      IsImageError: true,
     });
   },
   getImageDownload: function () {
@@ -173,4 +363,304 @@ Page({
       IsImageError: false,
     });
   },
-})
+  showWordDetailHandler: function (e) {
+    var that = this;
+    if (this.data.IsShowNext && !this.data.IsAutoPage) {
+      this.data.IsShowWordDetail = !this.data.IsShowWordDetail;
+      this.setData({
+        IsShowWordDetail: this.data.IsShowWordDetail,
+      });
+
+      if (this.data.IsShowWordDetail) {
+        var id = e.currentTarget.dataset.id;
+        server.getData('GetHanziDetail?ID=' + id, function (data) {
+          if (data) {
+            //var data = common.Decrypt(data);
+            //data=JSON.parse(data);
+            data.Antonym = data.Antonym.join(" ");
+            data.Synonym = data.Synonym.join(" ");
+            that.setData({
+              Detail: data,
+            });
+          }
+        });
+      }
+    }
+  },
+  //显示设置菜单
+  showSettingMenu: function (e) {
+    var status = e.currentTarget.dataset.status;
+    this.setData({
+      isShowSettingMenu: true,
+      ShowMenu: status,
+    });
+  },
+  //打开设置界面
+  openSetting: function () {
+    this.setData({
+      IsShowSetting: true,
+    });
+    isEditSetting = [];
+
+    clearInterval(intervalAutoPage);
+  },
+  closeSetting: function () {
+    var that = this;
+    this.setData({
+      IsShowSetting: false,
+    });
+
+    if (isEditSetting.length > 0) {
+      for (var i = 0; i < isEditSetting.length; i++) {
+        if (isEditSetting[i] == "page" || isEditSetting[i] == "sort") {
+          that.data.CurrentIndex = 0;
+          if (that.data.WordType == "normal")
+            that.init();
+          else if (that.data.WordType == "review")
+            that.initReview();
+
+          break;
+        }
+        else if (isEditSetting[i] == "speaker") {
+          that.playAudio();
+          break;
+        }
+      }
+    }
+    else {
+      if (this.data.IsAutoPage) {
+        this.startAutoPage();
+      }
+    }
+  },
+  closeSettingMenu: function () {
+    this.setData({
+      isShowSettingMenu: false,
+    });
+  },
+
+  settingSort: function (e, b) {
+    isEditSetting.push("sort");
+    var result = b;
+    if (e)
+      result = e.currentTarget.dataset.id;
+
+    var title = "";
+    var selectedRandom = true;
+    if (result == "false") {
+      title = "课文排序";
+      selectedRandom = false;
+    }
+    else {
+      title = "随机排序";
+    }
+    this.setData({
+      isShowSettingMenu: false,
+      SortTitle: title,
+      selectedRandom: selectedRandom,
+    });
+    wx.setStorageSync('selectedRandom', selectedRandom);
+  },
+  settingSpeaker: function (e, b) {
+    isEditSetting.push("speaker");
+    var result = b;
+    if (e)
+      result = e.currentTarget.dataset.id;
+    for (var i = 0; i < this.data.SpeakerArray.length; i++) {
+      this.data.SpeakerArray[i].isShow = false;
+      if (i == result)
+        this.data.SpeakerArray[i].isShow = true;
+    }
+
+    this.setData({
+      SpeakerMan: result,
+      isShowSettingMenu: false,
+      SpeakerTitle: this.data.SpeakerArray[result].name,
+      SpeakerArray: this.data.SpeakerArray,
+    });
+    wx.setStorageSync('SpeakerMan', result);
+  },
+  settingShowPinyin: function (e, b) {
+    var result = !this.data.ShowPinyin;
+    if (b != undefined)
+      result = b;
+    this.setData({
+      ShowPinyin: result,
+    });
+    wx.setStorageSync('ShowPinyin', result);
+  },
+  settingPlay: function (e, b) {
+    isEditSetting.push("play");
+    var result = !this.data.IsAutoPlay;
+    if (b != undefined)
+      result = b;
+
+    var PlayChecked = "";
+    if (result)
+      PlayChecked = "checked";
+    this.setData({
+      IsAutoPlay: result,
+      isShowSettingMenu: false,
+      PlayChecked: PlayChecked,
+    });
+    wx.setStorageSync('IsAutoPlay', result);
+  },
+  settingAudioLength: function (e, b) {
+    var result = !this.data.IsAudioLengthChecked;
+    if (b != undefined)
+      result = b;
+    this.setData({
+      IsAudioLengthChecked: result,
+    });
+    wx.setStorageSync('IsAudioLengthChecked', result);
+  },
+  settingPage: function (e, b) {
+    isEditSetting.push("page");
+    var result = !this.data.IsAutoPage;
+    if (b != undefined)
+      result = b;
+
+    if (result) {
+      this.data.PageChecked = "checked";
+      this.data.IsAutoPlay = true;
+      this.data.PlayChecked = "checked";
+    }
+    else {
+      clearInterval(intervalAutoPage);
+      this.data.PageChecked = "";
+    }
+
+    this.setData({
+      IsAutoPlay: this.data.IsAutoPlay,
+      IsAutoPage: result,
+      isShowSettingMenu: false,
+      PageChecked: this.data.PageChecked,
+      IsAutoPlay: this.data.IsAutoPlay,
+      PlayChecked: this.data.PlayChecked,
+    });
+    wx.setStorageSync('IsAutoPage', result);
+  },
+  bindPickerChange: function (e) {
+    this.setData({
+      IntervalSecondIndex: e.detail.value
+    });
+    wx.setStorageSync('IntervalSecondIndex', Number(e.detail.value));
+    isEditSetting.push("page");
+  },
+  updateFinish: function () {
+    var that = this;
+    if (isClickFinished) {
+      this.setData({
+        IsFinished: !this.data.IsFinished,
+      });
+      isClickFinished = false;
+
+      app.globalData.IsRefreshFinished = true;
+
+      if (!this.data.IsFinished) {
+        that.setRemind("取消", "");
+      }
+      else {
+        that.setRemind("学过了", "Remind3");
+      }
+
+      server.postData('UpdateHanziFinished', {
+        IsFinished: this.data.IsFinished,
+        UserID: app.globalData.userInfo.UserID,
+        Category: this.data.BookID,
+        Title: this.data.UnitID,
+      }, function (data) {
+        server.getData('GetHanziFinishedData?UserID=' + app.globalData.userInfo.UserID, function (data) {
+          if (data) {
+            wx.setStorageSync("FinishedList", data);
+          }
+        });
+      });
+    }
+  },
+  setRemind: function (str, css) {
+    var that = this;
+    that.setData({
+      RemindStr: str,
+      RemindCss: css,
+    })
+    that.animateOpacity(1, "animationData", 500);
+    setTimeout(function () {
+      isClickReview = true;
+      isClickFinished = true;
+      that.animateOpacity(0, "animationData", 500);
+    }, 1000);
+  },
+  //动画淡入淡出
+  animateOpacity: function (opacity, obj, duration) {
+    var animation = wx.createAnimation({
+      duration: duration,
+      timingFunction: 'ease',
+    });
+
+    //this.animation = animation;
+    animation.opacity(opacity).step();
+    this.setData({
+      animationData: animation.export(),
+    });
+  },
+
+  reviewHandler: function () {
+    var that = this;
+    if (this.data.IsShowNext && !this.data.IsAutoPage) {
+      if (isClickReview) {
+        this.data.List[this.data.CurrentIndex].IsReview = !this.data.List[this.data.CurrentIndex].IsReview;
+
+        this.setData({
+          List: this.data.List,
+        });
+
+        isClickReview = false;
+
+        var status = "add";
+        if (!this.data.List[this.data.CurrentIndex].IsReview) {
+          status = "delete";
+          that.setRemind("取消", "");
+        }
+        else {
+          that.setRemind("添加到复习", "Remind2");
+        }
+
+        server.postData('UpdateHanziReview', {
+          UserID: app.globalData.userInfo.UserID,
+          Word: this.data.List[this.data.CurrentIndex].Name,
+          WordID: this.data.List[this.data.CurrentIndex].ID,
+          Status: status,
+        }, function (data) {
+
+          server.getData('GetHanziReviewList?UserID=' + app.globalData.userInfo.UserID, function (data) {
+            if (data) {
+              wx.setStorageSync("ReviewList", data);
+            }
+          });
+
+        });
+      }
+    }
+    else {
+      if (that.data.CurrentIndex == that.data.List.length - 1)
+        that.restart();
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '识字练习——让阅读赢在起点',
+      path: 'pages/index/index',
+      imageUrl: '../../images/07001.png',
+      success: function (res) {
+
+      },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
+});

pages/main/detail.wxml

@@ -1,9 +1,103 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
-  <view class="main FlexColumn" bindtap='playAudio' data-click="true" >
-    <view class="pinyin">{{List[CurrentIndex].Pinyin}}</view>
-    <image binderror='getImageError' wx:if="{{!IsImageError}}" src='{{List[CurrentIndex].WordUrl}}' class="wordImage" />
-    <image catchtap='getImageDownload' wx:if="{{IsImageError}}" src='../../images/05014.png' class="wordImage" />
+  <view class="main FlexColumn" bindtap='playAudio' data-click="true">
+    <block wx:if="{{CurrentIndex<List.length-1}}">
+      <view class="pinyin">
+        <block wx:if="{{ShowPinyin}}">
+          {{List[CurrentIndex].Pinyin}}
+        </block>
+      </view>
+      <image binderror='getImageError' wx:if="{{!IsImageError}}" src='{{List[CurrentIndex].WordUrl}}' class="wordImage" />
+      <image catchtap='getImageDownload' wx:if="{{IsImageError}}" src='../../images/05014.png' class="wordImage" />
+    </block>
+    <block wx:if="{{CurrentIndex==List.length-1}}">
+      <view class="hanziEnd FlexColumn" wx:if="{{hanziType!='review'}}">
+        <view wx:if="{{WordType!='review'}}">章节</view>
+        <view class="hanziEnd2">{{List[CurrentIndex].Title}}</view>
+        <view class="hanziEnd3">{{List[CurrentIndex].Title2}}</view>
+      </view>
+
+      <view class="finished FlexColumn" catchtap='updateFinish' wx:if="{{WordType!='review' && IsFinished}}">
+        <view class="finished1 FlexColumn" >
+          <image src='../../images/05010.png' class="btnImage04006" />
+        </view>
+      </view>
+      <view class="finished2 finished FlexColumn" catchtap='updateFinish' wx:if="{{WordType!='review' && !IsFinished}}">
+        <view class="finished3 finished1 FlexColumn" >
+          <image src='../../images/05011.png' class="btnImage04006" />
+        </view>
+      </view>
+    </block>
+
+    <view class="{{RemindCss}} Remind" animation="{{animationData}}">{{RemindStr}}</view>
+
+  </view>
+  <view class="detail" wx:if="{{IsShowWordDetail}}">
+    <image src='{{Detail.BiShunUrl}}' class="bishun" />
+    <view class="line"></view>
+    <view class="title2 title FlexRow">
+      <view class="title1">汉语拼音</view>
+    </view>
+    <view class="content FlexRow">
+      <view class="pinyin FlexRow" wx:for="{{Detail.PinYin}}" wx:key="index" catchtap='playAudio' data-click="true" data-pinyin="{{item.pinyin}}">
+        <view>{{item.pinyin}}</view>
+        <image src='../../images/05008.png' class="btnImage05008" />
+      </view>
+    </view>
+    <view class="title FlexRow">
+      <view class="title1">汉字结构</view>
+    </view>
+    <view class="content FlexColumn">
+      <view class="content1 FlexRow">
+        <view class="left">部首</view>
+        <view class="right">{{Detail.BuShou}}</view>
+      </view>
+      <view class="line2 FlexRow">
+        <view class="line3"></view>
+      </view>
+      <view class="content1 FlexRow">
+        <view class="left">笔画</view>
+        <view class="right">{{Detail.BiHua}}</view>
+      </view>
+    </view>
+    <view class="title FlexRow">
+      <view class="title1">基本释义</view>
+    </view>
+    <view class="content FlexColumn">
+      <view class="content2 FlexColumn" wx:for="{{Detail.PinYin}}" wx:key="index" wx:for-item="item">
+        <view class="pinyin2 FlexRow" wx:if="{{Detail.PinYin.length>1}}">[
+          <view class="pinyin3">{{item.pinyin}}</view>]</view>
+        <text class="explain FlexColumn" wx:for="{{item.explain}}" wx:key="i" wx:for-item="itemChild">{{itemChild}}</text>
+      </view>
+    </view>
+    <view class="title FlexRow">
+      <view class="title1">相关组词</view>
+    </view>
+    <view class="content FlexColumn">
+      <view class="content2 FlexRow">
+        <text class="combineWords" wx:for="{{Detail.CombineWords}}" wx:key="i">{{item}}</text>
+      </view>
+    </view>
+    <view class="title FlexRow" wx:if="{{Detail.Antonym || Detail.Synonym}}">
+      <view class="title1">近反义词</view>
+    </view>
+    <view class="content FlexColumn">
+      <view class="content1 FlexRow" wx:if="{{Detail.Antonym}}">
+        <view class="left">反义词</view>
+        <view class="right">{{Detail.Antonym}}</view>
+      </view>
+      <view class="line2 FlexRow" wx:if="{{Detail.Synonym}}">
+        <view class="line3"></view>
+      </view>
+      <view class="content1 FlexRow" wx:if="{{Detail.Synonym}}">
+        <view class="left">近义词</view>
+        <view class="right">{{Detail.Synonym}}</view>
+      </view>
+    </view>
+    <view class="bottom1">
+
+    </view>
   </view>
+
   <view class="bottom FlexColumn">
     <view class="bottom1 FlexRow">
       <view class="btn FlexColumn" bindtap='prevHandler'>
@@ -17,9 +111,9 @@
       <view class="btn FlexColumn" bindtap='openSetting'>
         <image src='../../images/05004.png' class="btnImage05004" />
       </view>
-      <view class="btn FlexColumn" bindtap='showWordHandler'>
-        <image src='../../images/05005.png' wx:if="{{IsShowWordCurrent && IsShowNext && !IsAutoPage}}" class="btnImage05005" />
-        <image src='../../images/05006.png' wx:if="{{!IsShowWordCurrent && IsShowNext && !IsAutoPage}}" class="btnImage05006" />
+      <view class="btn FlexColumn" bindtap='showWordDetailHandler' data-id='{{List[CurrentIndex].ID}}'>
+        <image src='../../images/05005.png' wx:if="{{!IsShowWordDetail && IsShowNext && !IsAutoPage}}" class="btnImage05005" />
+        <image src='../../images/05006.png' wx:if="{{IsShowWordDetail && IsShowNext && !IsAutoPage}}" class="btnImage05006" />
       </view>
       <view class="btn FlexColumn" bindtap='nextHandler' data-status="click">
         <image src='../../images/05007.png' class="btnImage05001" wx:if="{{IsShowNext && !IsAutoPage}}" />
@@ -28,4 +122,139 @@
   </view>
 </view>
 
+<!-- 设置 -->
+<view class="settingContainer container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
+
+  <view class="title1">
+    <view class="title1_1">汉字显示</view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="sort">
+    <view class="title2_1">顺序</view>
+    <view class="title2_2 FlexRow">
+      <view>{{SortTitle}}</view>
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+
+  <view class="title1">
+    <view class="title1_1">汉字朗读</view>
+  </view>
+  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker">
+    <view class="title2_1">发音人</view>
+    <view class="title2_2 FlexRow">
+      <view>{{SpeakerTitle}}</view>
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+  <view class="title3 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>连贯演示</view>
+      <view class="title3_2">间隔 {{arrIntervalSecond[IntervalSecondIndex]}} 秒连续翻页并播放读音，不能点读</view>
+    </view>
+    <switch class='title2_2' checked="{{PageChecked}}" bindchange="settingPage" />
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+
+  <view class="title3 FlexRow" wx:if="{{IsAutoPage}}">
+    <view class="title2_1 FlexColumn">
+      <view>播放间隔秒数</view>
+    </view>
+
+    <view class="title2_2 FlexRow">
+      <picker bindchange="bindPickerChange" value="{{IntervalSecondIndex}}" range="{{arrIntervalSecond}}">
+        <view>
+          {{arrIntervalSecond[IntervalSecondIndex]}} 秒
+        </view>
+      </picker>
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+
+  </view>
+
+
+  <view class="title3 FlexRow" wx:if="{{!IsAutoPage}}">
+    <view class="title2_1 FlexColumn">
+      <view>默认播放读音</view>
+    </view>
+    <switch class='title2_2' checked="{{PlayChecked}}" bindchange="settingPlay" />
+  </view>
+
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
+    <view class="line1"></view>
+  </view>
+
+  <view class="title3 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>默认显示拼音</view>
+    </view>
+    <switch class='title2_2' checked="{{ShowPinyin}}" bindchange="settingShowPinyin" />
+  </view>
+
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
+    <view class="line1"></view>
+  </view>
+
+  <view class="title3 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>组词播报</view>
+      <view class="title3_2">“中国的国”，以组词形式播报</view>
+
+    </view>
+    <switch class='title2_2' checked="{{IsAudioLengthChecked}}" bindchange="settingAudioLength" />
+  </view>
+
+
+  <view class="bottom FlexColumn" bindtap='closeSetting'>
+    <view class="bottom1 FlexRow">
+      返回
+    </view>
+  </view>
+
+</view>
+
+<!-- 设置菜单 -->
+<view class="settingMenu container FlexColumn" style="height:{{Height}}rpx;" wx:if="{{isShowSettingMenu}}">
+  <view class="settingMenu1 FlexColumn">
+    <block wx:if="{{ShowMenu=='sort'}}">
+      <view class="settingMenuBasic2 FlexColumn">
+        <image class="settingMenuIcon" src="../../images/303.png" />
+        <view class="word2">选择汉字显示顺序</view>
+      </view>
+      <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="false">
+        <view class="word">按课文顺序排序</view>
+        <image class="SelectLogo" src="../../images/012.png" hidden="{{selectedRandom}}" />
+      </view>
+      <view style='height:2rpx'></view>
+      <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="true">
+        <view class="word">随机排序</view>
+        <image class="SelectLogo" src="../../images/012.png" hidden="{{!selectedRandom}}" />
+      </view>
+    </block>
+
+    <block wx:if="{{ShowMenu=='speaker'}}">
+      <view class="settingMenuBasic2 FlexColumn">
+        <image class="settingMenuIcon" src="../../images/130.png" />
+        <view class="word2">选择发音人</view>
+      </view>
+      <block wx:for="{{SpeakerArray}}" wx:key="index">
+        <view style='height:2rpx'></view>
+        <view class="settingMenuBasic FlexColumn" bindtap='settingSpeaker' data-id="{{index}}">
+          <view class="word">{{item.name}}</view>
+          <image class="SelectLogo" src="../../images/012.png" hidden="{{!item.isShow}}" />
+        </view>
+      </block>
+    </block>
+    <view style='height:20rpx'></view>
+    <view class="settingMenuBasic" bindtap='closeSettingMenu'>取消</view>
+  </view>
+</view>
+
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio"></audio>

pages/main/detail.wxss

@@ -4,15 +4,16 @@
   font-weight: 500;
 }
 
-.bottom{
+.container .bottom{
   width:100%;
   height:160rpx;
   position: fixed;
   bottom:0;
   background-color: #CDB797;
   justify-content: flex-end;
+  z-index: 100;
 }
-.bottom1{
+.container .bottom1{
   width:100%;
   height:140rpx;
   background-color: #1B1B1B;
@@ -22,37 +23,37 @@
   color: #f0f0f0;
 }
 
-.bottom1 .btn{
+.container .bottom1 .btn{
   width:20%;
   height:120rpx;
 }
 
-.bottom1 .btnImage05004{
+.container .bottom1 .btnImage05004{
   width:36rpx;
   height:36rpx;
 }
 
-.bottom1 .btnImage05005{
+.container .bottom1 .btnImage05005{
   width:45rpx;
   height:44rpx;
 }
 
-.bottom1 .btnImage05002{
+.container .bottom1 .btnImage05002{
   width:32rpx;
   height:34rpx;
 }
 
-.bottom1 .btnImage05006{
+.container .bottom1 .btnImage05006{
   width:42rpx;
   height:44rpx;
 }
 
-.bottom1 .btnImage022{
+.container .bottom1 .btnImage022{
   width:40rpx;
   height:40rpx;
 }
 
-.bottom1 .btnImage05001{
+.container .bottom1 .btnImage05001{
   width:33rpx;
   height:40rpx;
 }
@@ -63,6 +64,7 @@
   position: fixed;
   top:0;
   left:0;
+  min-height:1050rpx;
 }
 
 .main .pinyin{
@@ -72,8 +74,356 @@
   font-weight: normal;
   font-style: normal;
 }
+
 .main .wordImage{
   margin-top: 40rpx;
+  margin-right: 10rpx;
   width:366rpx;
   height:370rpx;
-}
+}
+
+.detail{
+  width:100%;
+  justify-content: flex-start;
+  position: absolute;
+  top:0;
+  left:0;
+  z-index: 10;
+  overflow-x: hidden;
+}
+.detail .bishun{
+  width:758rpx;
+  height:758rpx;
+  position: absolute;
+  top:-4rpx;
+  left:-4rpx;
+  z-index: 10;
+}
+.detail .line{
+  width:100%;
+  height:10rpx;
+  position: absolute;
+  top:748rpx;
+  background-color: #F0F0F0;
+  z-index: 20;
+}
+.detail .title{
+  width:100%;
+  height:125rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  background-color: #F0F0F0;
+}
+.detail .title1{
+  margin: 50rpx 0 0 30rpx;
+  font-size:32rpx;
+}
+.detail .title2{
+  margin-top: 751rpx;
+}
+
+.detail .content{
+  width:100%;
+  background-color: #fff;
+  justify-content: flex-start;
+  align-items: flex-start;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+
+.detail .pinyin{
+  min-width:201rpx;
+  height:74rpx;
+  border-radius: 10rpx;
+  border:1rpx solid #979797;
+  margin: 50rpx 0 50rpx 40rpx;
+
+}
+.detail .btnImage05008{
+  width:41rpx;
+  height:34rpx;
+  margin-left: 20rpx;
+}
+
+
+.detail .content1{
+  width:100%;
+  justify-content: space-between;
+}
+
+.detail .left{
+  margin: 30rpx;
+}
+
+.detail .right{
+  margin: 30rpx;
+}
+
+.detail .line2{
+  width:100%;
+  height:1rpx;
+  background-color: #fff;
+  justify-content: flex-end;
+}
+
+.detail .line3{
+  width:720rpx;
+  height:1rpx;
+  background-color: #D2D2D2;
+}
+
+
+.detail .content2{
+  margin: 30rpx 20rpx 30rpx 40rpx;
+  background-color: #fff;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+
+.detail .pinyin2{
+  font-weight: 600;
+  font-size:30rpx;
+  justify-content: flex-start;
+}
+.detail .pinyin3{
+  font-family: 'GB Pinyinok-C';
+  font-weight: normal;
+  font-style: normal;
+  margin: 0 10rpx;
+}
+
+.detail .explain{
+  align-items: flex-start;
+  margin-bottom: 5rpx;
+}
+
+.detail .bottom1{
+  width: 100%;
+  background-color: #fff;
+  height:160rpx;
+}
+
+.detail .combineWords{
+  margin-right: 30rpx;
+}
+
+.settingContainer {
+  position: fixed;
+  top: 0;
+  background-color: #E3E3E3;
+  color: #1e1e1e;
+  z-index: 200;
+}
+
+.settingContainer .title1 {
+  width: 100%;
+  height: 125rpx;
+  background-color: #E3E3E3;
+}
+
+.settingContainer .title1_1 {
+  margin: 50rpx 0 0 30rpx;
+  font-size: 32rpx;
+}
+
+.settingContainer .title2 {
+  width: 100%;
+  background-color: #F8F8F8;
+  font-size: 28rpx;
+  height: 100rpx;
+  justify-content: space-between;
+  font-weight: 400;
+}
+
+.settingContainer .title2_1 {
+  margin-left: 30rpx;
+  align-items: flex-start;
+}
+
+.settingContainer .title2_2 {
+  margin-right: 30rpx;
+}
+
+.Arrow {
+  width: 16rpx;
+  height: 26rpx;
+  margin: 0 0 0 30rpx;
+}
+
+.settingContainer .title3 {
+  width: 100%;
+  background-color: #F8F8F8;
+  font-size: 28rpx;
+  height: 139rpx;
+  justify-content: space-between;
+  font-weight: 400;
+}
+
+.settingContainer .title3_2 {
+  font-size: 24rpx;
+}
+
+.settingContainer .line {
+  width: 100%;
+  height: 2rpx;
+  background-color: #F8F8F8;
+  align-items: flex-end;
+}
+
+.settingContainer .line1 {
+  width: 720rpx;
+  height: 1rpx;
+  background-color: #E3E3E3;
+}
+
+.settingContainer .bottom {
+  width:100%;
+  height:160rpx;
+  position: fixed;
+  bottom:0;
+  background-color: #CDB797;
+  justify-content: flex-end;
+}
+.settingContainer .bottom1{
+  width:100%;
+  height:140rpx;
+  background-color: #1B1B1B;
+  text-align: center;
+  line-height: 140rpx;
+  font-size: 48rpx;
+  color: #f0f0f0;
+}
+
+.settingMenu {
+  position: fixed;
+  top: 0;
+  background-color: rgba(46, 49, 55, 0.9);
+  z-index: 300;
+}
+
+.settingMenu1 {
+  width: 100%;
+  justify-content: flex-end;
+  position: fixed;
+  bottom: 0;
+  background-color: #d2d2d2;
+}
+
+.settingMenuBasic {
+  width: 100%;
+  height: 110rpx;
+  line-height: 110rpx;
+  text-align: center;
+  background-color: #fff;
+  color: #1e1e1e;
+  font-size: 36rpx;
+  font-weight: 400;
+  position: relative;
+}
+
+.settingMenuBasic2 {
+  width: 100%;
+  color: #1e1e1e;
+  font-weight: 600;
+  height: 173rpx;
+  background-color: #d2d2d2;
+  font-size: 24rpx;
+  justify-content: center;
+  align-items: center;
+}
+
+.settingMenuIcon {
+  width: 80rpx;
+  height: 60rpx;
+  margin-bottom: 23rpx;
+}
+
+.SelectLogo {
+  width: 40rpx;
+  height: 40rpx;
+  position: absolute;
+  left: 40rpx;
+  top: 35rpx;
+}
+
+.main .hanziEnd {
+  font-family: 'Century Gothic';
+  font-weight: bold;
+  font-style: normal;
+  color: #1e1e1e;
+  font-size:36rpx;
+  margin-top:102rpx;
+}
+
+.main .hanziEnd2 {
+  border-bottom:6rpx solid #1e1e1e;
+  min-width: 144rpx;
+  margin-top:20rpx;
+  padding-bottom: 20rpx;
+  text-align: center;
+  font-size:48rpx;
+}
+
+.main .hanziEnd3 {
+  margin-top:20rpx;
+  font-size:48rpx;
+}
+
+.main .btnImage04006{
+  width:60rpx;
+  height:95rpx;
+}
+
+.main .finished{
+  margin-top: 170rpx;
+  width:200rpx;
+  height:200rpx;
+  background-color: #CDB797;
+  border-radius: 50%;
+}
+
+.main .finished1{
+  width:176rpx;
+  height:176rpx;
+  background-color: #F5E2BE;
+  border-radius: 50%;
+}
+.main .finished2{
+  background-color: #D2D2D2;
+}
+
+.main .finished3{
+  background-color: #F0F0F0;
+}
+
+
+.main .Remind{
+  min-width: 108rpx;
+  height:60rpx;
+  background-color: #262626;
+  color:#D2D2D2;
+  text-align: center;
+  line-height: 60rpx;
+  font-size:24rpx;
+  position: fixed;
+  top:946rpx;
+  left:323rpx;
+  z-index: 20;
+  opacity: 0;
+  border-radius: 30rpx;
+}
+
+.main .Remind2{
+  width:180rpx;
+  left:287rpx;
+}
+.main .Remind3{
+  width:132rpx;
+  left:310rpx;
+}
+
+
+

pages/main/index.js

@@ -2,36 +2,14 @@ import common from '../../utils/util';
 import server from '../../utils/main';
 
 const app = getApp();
+var interval = 0;
+var isPaying = false;
+var hanziNumber = 0;
 
 Page({
   data: {
     Version: app.globalData.Version,
-    ListProgram: [
-      {
-        ImageUrl: "03001.png",
-        ImageUrl2: "02018.png",
-        appId: 'wx46a7b4c420e6d38f',
-        path: 'pages/index/start?SourceID=106',
-      },
-      {
-        ImageUrl: "03002.png",
-        ImageUrl2: "02020.png",
-        appId: 'wxb54a6d5aff836ee3',
-        path: 'pages/index/index?SourceID=106',
-      },
-      {
-        ImageUrl: "03003.png",
-        ImageUrl2: "02019.png",
-        appId: 'wx331e8dd070f01d0e',
-        path: 'pages/index/index?SourceID=106',
-      },
-      {
-        ImageUrl: "03004.png",
-        ImageUrl2: "02021.png",
-        appId: 'wxa5e33c61fe37dd01',
-        path: 'pages/index/index?SourceID=106',
-      },
-    ],
+    ListProgram: server.getProgramList(),
     NickName: "陌生用户",
     IsMember: false,
     AvatarUrl: "",
@@ -48,7 +26,187 @@ Page({
   onLoad: function () {
     this.setData({
       Height: common.getSystemHeight(),
-      indexImage: common.random(0, 2),
+      NickName: app.globalData.userInfo.NickName,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+    });
+
+    if (app.globalData.userInfo && app.globalData.userInfo.NickName != "陌生用户") {
+      this.setData({
+        IsAccredit: true,
+      });
+    }
+  },
+  onShow: function () {
+    this.getData();
+    if (app.globalData.userInfo.IsMember == 1) {
+      this.setData({
+        IsMember: true,
+      });
+    }
+    if (!this.data.IsAccredit) {
+      var IsRemindAccredit = wx.getStorageSync("IsRemindAccredit");
+      if (IsRemindAccredit == 1) {
+        this.getAccredit();
+        wx.removeStorageSync('IsRemindAccredit');
+      }
+    }
+  },
+  getAccredit: function () {
+    if (!this.data.IsAccredit) {
+
+      var that = this;
+      wx.getSetting({
+        success(res) {
+          if (!res.authSetting['scope.userInfo']) {
+            wx.authorize({
+              scope: 'scope.userInfo',
+              success() {
+                that.getUserInfo();
+              },
+              fail() {
+                wx.openSetting({
+                  success(res) {
+                    that.getUserInfo();
+                  }
+                });
+              }
+            })
+          }
+        }
+      })
+    }
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        wx.getUserInfo({
+          withCredentials: false,
+          success: function (res) {
+            app.globalData.userInfo = res.userInfo;
+
+            app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+            // that.hasGetShareInfo(app.globalData.userInfo);
+            that.setData({
+              IsAccredit: true,
+              NickName: app.globalData.userInfo.NickName,
+              AvatarUrl: app.globalData.userInfo.AvatarUrl
+            });
+
+            app.globalData.userInfo.Code = res0.code;
+            that.login(app.globalData.userInfo);
+
+          },
+          fail: function (res) {
+            //console.log("getUserInfo:fail");
+            app.globalData.userInfo.NickName = "陌生用户";
+            app.globalData.userInfo.AvatarUrl = "../../images/FACE.png";
+            app.globalData.userInfo.language = "";
+            app.globalData.userInfo.gender = "0";
+            app.globalData.userInfo.city = "";
+            app.globalData.userInfo.province = "";
+            app.globalData.userInfo.country = "";
+            // that.hasGetShareInfo(app.globalData.userInfo);
+            that.setData({
+              IsAccredit: false,
+            });
+          }
+        });
+      },
+      fail: function () {
+        that.setData({
+          IsAccredit: false,
+        });
+      }
+    });
+  },
+  login: function (param) {
+    var that = this;
+    server.getLocalHost(function () {
+      server.postData('HanziLogin', {
+        Code: param.Code,
+        NickName: param.nickName,
+        Language: param.language,
+        Gender: param.gender,
+        City: param.city,
+        Province: param.province,
+        Country: param.country,
+        AvatarUrl: param.avatarUrl,
+        ProgramVersion: app.globalData.Version,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+      }, function (data) {
+
+      });
+    });
+  },
+  getData: function () {
+    var that = this;
+    server.getData('GetHanziRecordData?UserID=' + app.globalData.userInfo.UserID + "&Version=" + app.globalData.Version, function (data) {
+      if (data) {
+
+        if (!data.DayNumber)
+          data.DayNumber = 0;
+        var finishedCount = 0;
+        if (data.FinishedList)
+          finishedCount = data.FinishedList.length;
+        var reviewCount = 0;
+        if (data.ReviewList)
+          reviewCount = data.ReviewList.length;
+
+        hanziNumber = 0;
+        var arr = JSON.parse(wx.getStorageSync("HanziAll"));
+        for (var k = 0; k < data.FinishedList.length; k++) {
+          for (var i = 0; i < arr.length; i++) {
+            var b1 = false;
+            for (var j = 0; j < arr[i].Units.length; j++) {
+              var item = arr[i].Units[j];
+              if (item.ID == data.FinishedList[k].UnitID) {
+                hanziNumber += item.Words.length;
+
+                for (var n = 0; n < item.Words.length; n++) {
+                  for (var l = 0; l < data.ReviewList.length; l++) {
+                    if (data.ReviewList[l].WordID == item.Words[n].ID) {
+                      hanziNumber--;
+                    }
+                  }
+                }
+
+                b1 = true;
+                break;
+              }
+
+            }
+            if (b1)
+              break;
+          }
+        }
+
+        that.setData({
+          DayNumber: data.DayNumber,
+          HanziNumber: hanziNumber,
+          FinishedCount: finishedCount,
+          ReviewCount: reviewCount,
+          IsShow: data.IsShow,
+        });
+
+        wx.setStorageSync("FinishedList", data.FinishedList);
+        wx.setStorageSync("ReviewList", data.ReviewList);
+
+        if (data.DayNumber2)
+          app.globalData.DayNumber = data.DayNumber2;
+        else
+          app.globalData.DayNumber = data.DayNumber;
+
+        if (data.IsShow)
+          app.globalData.IsShow = data.IsShow;
+
+      }
     });
   },
   selectNav: function (e) {
@@ -73,7 +231,50 @@ Page({
   goto: function (e) {
     var id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: "./list?id="+id,
+      url: "./list?id=" + id,
     });
   },
+  gotoSearch: function (e) {
+    wx.navigateTo({
+      url: "./search",
+    });
+  },
+  gotoAbout: function () {
+    wx.navigateTo({
+      url: "./about"
+    });
+  },
+  gotoReview: function () {
+    var id = "review";
+    wx.navigateTo({
+      url: './detail?Type=' + id,
+    });
+  },
+  switchProgram: function (e) {
+    wx.navigateToMiniProgram({
+      appId: e.currentTarget.dataset.appid,
+      path: e.currentTarget.dataset.path,
+      extraData: {
+      },
+      success(res) {
+        // 打开成功
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '识字练习——让阅读赢在起点',
+      path: 'pages/index/index',
+      imageUrl: '../../images/07001.png',
+      success: function (res) {
+
+      },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
 })

pages/main/index.wxml

@@ -59,7 +59,7 @@
     </view>
     <view class="index8 FlexColumn">
       <image src='../../images/02013.png' class="img" />
-      <view class="index8_1">
+      <view class="index8_1" bindtap='gotoSearch'>
         搜一搜，输入一个字
       </view>
     </view>
@@ -90,7 +90,7 @@
         <view class="index3_1 FlexColumn">
           <view class="index3_1_1 FlexRow">
             <view class="number" wx:if="{{!IsAccredit}}">-</view>
-            <view class="number" wx:if="{{IsAccredit}}">{{PhonicsNumber}}</view>
+            <view class="number" wx:if="{{IsAccredit}}">{{HanziNumber}}</view>
           </view>
           <view class="index3_1_2 FlexRow">总共识字
           </view>

pages/main/index.wxss

@@ -3,6 +3,7 @@
   justify-content: flex-start;
   font-weight: 500;
   color:#1e1e1e;
+  overflow-x:hidden;
 }
 
 .index1{

pages/main/list.js

@@ -16,10 +16,15 @@ Page({
       IsShowNav1:true,
       BookID:bookID,
     });
+    
+  },
+  onShow:function(){
     this.init();
   },
   init:function(){
     var arr=JSON.parse(wx.getStorageSync("HanziAll"));
+    var arrReview = wx.getStorageSync("ReviewList");
+    var arrFinished = wx.getStorageSync("FinishedList");
 
     var result;
     for (var i = 0; i < arr.length; i++) {
@@ -31,6 +36,24 @@ Page({
           item.Example ="";
           for(var k=0;k<rnd;k++)
             item.Example += item.Words[k].Name;
+          
+          item.IsFinished = false;
+          for (var k = 0; k < arrFinished.length; k++) {
+            if (item.ID == arrFinished[k].UnitID) {
+              item.IsFinished = true;
+              break;
+            }
+          }
+
+          for (var k = 0; k < item.Words.length; k++) {
+            item.Words[k].ReviewCss = "";
+            for (var l = 0; l < arrReview.length; l++) {
+              if (arrReview[l].WordID == item.Words[k].ID) {
+                item.Words[k].ReviewCss = "boxSelect";
+                break;
+              }
+            }
+          }
         }
         break;
       }
@@ -42,6 +65,7 @@ Page({
     wx.setNavigationBarTitle({
       title: result.Name,
     });
+    
   },
   selectNav: function (e) {
     var id = e.currentTarget.dataset.id;
@@ -63,9 +87,65 @@ Page({
   },
   goto: function (e) {
     var bookid = e.currentTarget.dataset.bookid;
-    var id = e.currentTarget.dataset.id;
+    var unitid = e.currentTarget.dataset.unitid;
+    var wordid = e.currentTarget.dataset.wordid;
+    var isfinished = e.currentTarget.dataset.isfinished;
+    if (!wordid)
+      wordid=0
+    else{
+      wx.setStorageSync('selectedRandom', false);
+    }
     wx.navigateTo({
-      url: "./detail?bookid="+bookid+"&id=" + id,
+      url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
     });
   },
+  getFinished: function () {
+    var that = this;
+    server.getData('GetHanziFinishedData?Category=' + this.data.BookID + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        var list = that.data.List;
+        var arrReview = wx.getStorageSync("ReviewList");
+
+        for (var i = 0; i < list.length; i++) {
+          list[i].IsFinished = false;
+          for (var j = 0; j < data.length; j++) {
+            if (list[i].ID == data[j].Title) {
+              list[i].IsFinished = true;
+              break;
+            }
+          }
+
+          var item=list[i];
+          for (var k = 0; k < item.Words.length; k++) {
+            item.Words[k].ReviewCss = "";
+            for (var l = 0; l < arrReview.length; l++) {
+              if (arrReview[l].WordID == item.Words[k].ID) {
+                item.Words[k].ReviewCss = "boxSelect";
+                break;
+              }
+            }
+          }
+        }
+        that.setData({
+          List: list,
+        })
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: '识字练习——让阅读赢在起点',
+      path: 'pages/index/index',
+      imageUrl: '../../images/07001.png',
+      success: function (res) {
+
+      },
+      fail: function (err) {
+        console.log(err);
+      },
+      complete: function (res) {
+        console.log(res);
+      },
+    }
+  },
 })

pages/main/list.json

@@ -1,5 +1,6 @@
 {
   "navigationBarBackgroundColor": "#f0f0f0",
   "navigationBarTitleText": "",
+  "backgroundColor": "#dfc7a4",
   "enablePullDownRefresh": false
 }

pages/main/list.wxml

@@ -18,10 +18,11 @@
     <view class="line2 line">
     </view>
     <view class="list2 FlexColumn">
-      <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-id='{{item.ID}}' wx:for="{{List}}" wx:key="index">
+      <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' wx:for="{{List}}" wx:key="index">
         <view class="btn1 FlexRow">
           <view class="left FlexRow">
-            <image src='../../images/04007.png' class="img04007" />
+            <image wx:if="{{!item.IsFinished}}" src='../../images/04007.png' class="img04007" />
+            <image wx:if="{{item.IsFinished}}" src='../../images/04006.png' class="img04007" />
             <view class="title">{{item.Example}}</view>
           </view>
           <view class="right FlexColumn">
@@ -48,7 +49,7 @@
         <view class="title1">{{item.Name}}</view>
       </view>
       <view class="table FlexRow">
-      <view class="box" wx:for="{{item.Words}}" wx:for-item="itemChild">{{itemChild.Name}}</view>
+      <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" bindtap="goto" data-bookid='{{BookID}}' data-unitid='{{item.ID}}' data-wordid='{{i}}' data-isfinished='{{item.IsFinished}}'>{{itemChild.Name}}</view>
       </view>
     </view>
     

pages/main/list.wxss

@@ -142,20 +142,22 @@
   font-size:28rpx;
 }
 .group .table{
-  margin: 30rpx 24rpx 60rpx 30rpx;
+  margin: 40rpx 20rpx 60rpx 30rpx;
   font-size:48rpx;
   justify-content: flex-start;
   align-items: flex-start;
   flex-wrap: wrap;
+  /* background-color: #000; */
 }
 .group .box{
-  margin: 0 6rpx 6rpx 0;
+  margin: 0 7rpx 7rpx 0;
   background-color: #fff;
-  width:110rpx;
-  height:110rpx;
+  width:106rpx;
+  height:106rpx;
+  line-height: 106rpx;
   text-align: center;
-  line-height: 110rpx;
   font-weight: 400;
+  border:1rpx solid #CDB797;
 }
 .group .boxSelect{
   color:#fff;

pages/main/search.js

@@ -0,0 +1,94 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Height: common.getSystemHeight(),
+      ExampleArray: this.getExampleArray(),
+      IsSearchResult: false,
+    });
+  },
+  getExampleArray:function(){
+    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);
+      
+      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]);
+    }
+    return result;
+  },
+  researchWord: function (e) {
+    var result=false;
+    var word = e.detail.value;
+    if (word) {
+      console.log(word);
+      var arr = JSON.parse(wx.getStorageSync("HanziAll"));
+      for (var i = 0; i < arr.length; i++) {
+        for (var j = 0; j < arr[i].Units.length; j++) {
+          var item = arr[i].Units[j];
+          for (var n = 0; n < item.Words.length; n++) {
+            if (word == item.Words[n].Name) {
+              var bookid = arr[i].ID;
+              var unitid = item.ID;
+              var wordid = n;
+
+              var isfinished = false;
+              var arrReview = wx.getStorageSync("ReviewList");
+              for (var l = 0; l < arrReview.length; l++) {
+                if (arrReview[l].Word == word) {
+                  isfinished=true;
+                  break;
+                }
+              }
+              wx.navigateTo({
+                url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
+              });
+              result=true;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    if (!result){
+      this.setData({
+        IsSearchResult: true,
+      });
+    }
+  },
+  goto: function (e) {
+    var bookid = e.currentTarget.dataset.bookid;
+    var unitid = e.currentTarget.dataset.unitid;
+    var wordid = e.currentTarget.dataset.wordid;
+    var isfinished = e.currentTarget.dataset.isfinished;
+    if (!wordid)
+      wordid = 0
+    else {
+      wx.setStorageSync('selectedRandom', false);
+      wx.setStorageSync('IsAutoPage', false);
+    }
+    wx.navigateTo({
+      url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
+    });
+  },
+})

pages/main/search.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#F5E2BE",
+  "navigationBarTitleText": "搜索",
+  "backgroundColor": "#F5E2BE",
+  "enablePullDownRefresh": false
+}

pages/main/search.wxml

@@ -0,0 +1,15 @@
+<view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
+  <view class="search1 FlexColumn">
+    <input class="input" placeholder="" maxlength="1" focus="true" confirm-type="search" bindconfirm="researchWord" />
+  </view>
+  <block wx:if="{{IsSearchResult}}">
+    <image class="image04009" src="../../images/04009.png" />
+    <view class="search2">暂未收录</view>
+    <text class="search3">换个常用字试试吧\n更多字逐步更新中</text>
+    <view class="line"></view>
+    <view class="search4">推荐几个常用字</view>
+    <view class="search5 FlexRow">
+      <view class="box" wx:for="{{ExampleArray}}" wx:key="index" bindtap="goto" data-bookid='{{item.BookID}}' data-unitid='{{item.UnitID}}' data-wordid='{{item.WordID}}' data-isfinished='{{item.IsFinished}}'>{{item.Name}}</view>
+    </view>
+  </block>
+</view>

pages/main/search.wxss

@@ -0,0 +1,73 @@
+.container {
+  background-color: #f0f0f0;
+  justify-content: flex-start;
+  font-weight: 500;
+  color:#1e1e1e;
+}
+
+.search1{
+  width:100%;
+  height:116rpx;
+  background-color: #F5E2BE;
+  
+}
+.search1 .input{
+  width:690rpx;
+  height:70rpx;
+  line-height: 70rpx;
+  background-color: #ffffff;
+  border-radius: 10rpx;
+  text-align: center;
+  font-size:36rpx;
+  color:#1e1e1e;
+  /* padding-left: 20rpx; */
+}
+
+
+.image04009{
+  width:130rpx;
+  height:130rpx;
+  margin-top: 170rpx;
+}
+
+.search2{
+  margin-top: 30rpx;
+  font-size:48rpx;
+  color:#9B9B9B;
+}
+
+.search3{
+  font-size:24rpx;
+  color:#9B9B9B;
+  width:264rpx;
+  text-align: center;
+}
+
+.line{
+  margin-top: 60rpx;
+  background-color: #9B9B9B;
+  width:458rpx;
+  height:6rpx;
+}
+
+.search4{
+  margin-top: 66rpx;
+  font-size:36rpx;
+  color:#9B9B9B;
+}
+
+.search5{
+  margin-top: 30rpx;
+}
+
+.search5 .box{
+  width:110rpx;
+  height:110rpx;
+  background-color: #fff;
+  border:1rpx solid #CDB797;
+  font-size:48rpx;
+  text-align: center;
+  line-height: 110rpx;
+  font-weight: 400;
+  margin: 0 3rpx;
+}

project.config.json

@@ -48,7 +48,19 @@
 					"id": 2,
 					"name": "详情页",
 					"pathName": "pages/main/detail",
-					"query": "bookid=1&id=1"
+					"query": "bookid=1&unitid=1&wordid=0"
+				},
+				{
+					"id": -1,
+					"name": "\b搜索",
+					"pathName": "pages/main/search",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "\b关于",
+					"pathName": "pages/main/about",
+					"query": ""
 				}
 			]
 		}

utils/main.js

@@ -118,10 +118,47 @@ function payMoney(payType, money, callback) {
   });
 }
 
+function getProgramList(){
+  return [
+    {
+      ImageUrl: "03001.png",
+      ImageUrl2: "02018.png",
+      appId: 'wx46a7b4c420e6d38f',
+      path: 'pages/index/start?SourceID=106',
+      left: 117,
+      top: 837,
+    },
+    {
+      ImageUrl: "03002.png",
+      ImageUrl2: "02020.png",
+      appId: 'wxb54a6d5aff836ee3',
+      path: 'pages/index/index?SourceID=106',
+      left: 117,
+      top: 1181,
+    },
+    {
+      ImageUrl: "03003.png",
+      ImageUrl2: "02019.png",
+      appId: 'wx331e8dd070f01d0e',
+      path: 'pages/index/index?SourceID=106',
+      left: 425,
+      top: 837,
+    },
+    {
+      ImageUrl: "03004.png",
+      ImageUrl2: "02021.png",
+      appId: 'wxa5e33c61fe37dd01',
+      path: 'pages/index/index?SourceID=106',
+      left: 117,
+      top: 1525,
+    },
+  ];
+}
 
 module.exports = {
   getData: getData,
   postData: postData,
   payMoney: payMoney,
   getLocalHost: getLocalHost,
+  getProgramList: getProgramList,
 }

utils/pinyin.js

@@ -227,7 +227,6 @@ const getPinyinArray = function () {
     ['dao3', 'dǎo', ['岛']],
     ['dao4', 'dào', ['到']],
     ['dao5', 'dao', ['']],
-    ['de', 'de', ['嘚']],
     ['de2', 'dé', ['得']],
     ['de5', 'de', ['的']],
     ['dei3', 'děi', ['得']],
@@ -609,10 +608,9 @@ const getPinyinArray = function () {
     ['lao3', 'lǎo', ['老']],
     ['lao4', 'lào', ['涝']],
     ['lao5', 'lao', ['']],
-    ['le', 'le', ['了']],
     ['le1', 'lē', ['肋']],
     ['le4', 'lè', ['乐']],
-    ['le5', 'le', ['']],
+    ['le5', 'le', ['了']],
     ['lei1', 'lēi', ['勒']],
     ['lei2', 'léi', ['雷']],
     ['lei3', 'lěi', ['磊']],
@@ -1484,8 +1482,10 @@ const getPinyinArray = function () {
 function getPinyinName(pinyin){
   var arr=getPinyinArray();
   for(var i=0;i<arr.length;i++){
-    if (arr[i][1]==pinyin)
+    if (arr[i][1]==pinyin){
+      
       return arr[i][0];
+    }
   }
   return "";
 }