1.2.16

app.js

@@ -23,8 +23,9 @@ App({
     }
   },
   globalData: {
-    Version: "1.2.13",
+    Version: "1.2.16",
     IsProduction: true,
+    //IsProduction: false,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
     ProgramName: "语文识字",

package4/main/activate.js

@@ -9,7 +9,7 @@ Page({
   },
   onLoad: function (options) {
     var text0 = "", text1 = "", text2 = "", text3 = "";
-    text0 = "会员登录";
+    text0 = "会员登录";
     text1 = "无需注册，微信授权即可登录";
     text2 = "去登录";
     text3 = "注意：会员登录后可使用付费功能。授权微信用户信息即可一键登录。为保障消费权益，购买后请尽快授权用户信息。登录后才能正常使用统计、排行、我的订单、套装、礼品卡等功能。";

package4/main/activate.wxml

@@ -1,10 +1,10 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <image src="../images/accredit.png" class="bg" />
-  <text class="text0">{{Text0}}</text>
-  <text class="text1">{{Text1}}</text>
+  <text class="text0">{{Text0}}</text>
+  <text class="text1">{{Text1}}</text>
   <view class="btn">
     <button  class="btn1" catchtap="getUserInfo">{{Text2}}</button>
   </view>
   <view class="line2 {{ipad}}"></view>
-  <text class="text3">{{Text3}}</text>
+  <text class="text3">{{Text3}}</text>
 </view>

package4/main/activateFinish.wxml

@@ -15,7 +15,7 @@
   <view class="panelItem FlexRow" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2}}" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>
     <view class="Left FlexRow">
       <image src='../images/{{item.ImageUrl}}' class="img" />
-      <view class="title1">
+      <view class="title1">
         {{item.Name}}
       </view>
     </view>

package4/main/paylist.wxml

@@ -1,14 +1,14 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view style='height:50rpx'></view>
-  <view class="panel1 FlexColumn" wx:for="{{PayList}}" wx:key="index" wx:if="{{PayList.length>0}}">
+  <view class="panel1 FlexColumn" wx:for="{{PayList}}" wx:key="index" wx:if="{{PayList.length>0}}">
     <view class="item0 item FlexRow">
       <view class="left FlowColumn">
-        <view class="title0 FlexRow">
-          <view class="title0_1">支付时间</view>
+        <view class="title0 FlexRow">
+          <view class="title0_1">支付时间</view>
           <view>{{item.PayEndTime}}</view>
         </view>
-        <view class="title0 FlexRow">
-          <view class="title0_1">交易单号</view>
+        <view class="title0 FlexRow">
+          <view class="title0_1">交易单号</view>
           <view>{{item.TradeNo}}</view>
         </view>
       </view>
@@ -19,10 +19,10 @@
       <view class="item FlexRow">
         <view class="left FlexRow">
           <image src='../images/{{item.ImageName}}.png' class="img" />
-          <view class="title1">
+          <view class="title1">
             {{item.Name}}
           </view>
-          <view class="title2">
+          <view class="title2">
           </view>
         </view>
         <view class="right">
@@ -37,10 +37,10 @@
       <view class="item FlexRow">
         <view class="left FlexRow">
           <image src='../images/{{itemChild.ImageName}}' class="img" />
-          <view class="title1">
+          <view class="title1">
             {{itemChild.ProductName}}
           </view>
-          <view class="title2">
+          <view class="title2">
           </view>
         </view>
         <view class="right">

pages/index/index.js

@@ -25,7 +25,7 @@ Page({
         console.log("SourceID:" + options.SourceID);
         app.globalData.SourceID = options.SourceID;
       }
-      // 扫码介绍人
+      // 扫码介绍人
       if (options.scene) {
         var scene = decodeURIComponent(options.scene);
         console.log("scene:" + scene);
@@ -177,7 +177,7 @@ Page({
   getHanzi: function (callback) {
     var that = this;
     var time = wx.getStorageSync("HanziUpdateTime");
-    server.getData('GetHanziAll?UpdateTime=' + time, function (data) {
+    server.getData('GetHanziAll0124?UpdateTime=' + time, function (data) {
       if (data) {
         if (data.List) {
           var arr = common.Decrypt(data.List);

pages/main/accredit.js

@@ -9,7 +9,7 @@ Page({
   },
   onLoad: function (options) {
     var text0 = "", text1 = "", text2 = "", text3 = "";
-    text0 = "会员登录";
+    text0 = "会员登录";
     text1 = "无需注册，微信授权即可登录";
     text2 = "去登录";
     text3 = "注意：会员登录后可使用付费功能。授权微信用户信息即可一键登录。为保障消费权益，购买后请尽快授权用户信息。登录后才能正常使用统计、排行、我的订单、套装、礼品卡等功能。";

pages/main/accredit.wxml

@@ -1,10 +1,10 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <image src="../images/accredit.png" class="bg" />
-  <text class="text0">{{Text0}}</text>
-  <text class="text1">{{Text1}}</text>
+  <text class="text0">{{Text0}}</text>
+  <text class="text1">{{Text1}}</text>
   <view class="btn">
     <button open-type="getUserInfo" class="btn1" bindgetuserinfo="goto">{{Text2}}</button>
   </view>
   <view class="line2 {{ipad}}"></view>
-  <text class="text3">{{Text3}}</text>
+  <text class="text3">{{Text3}}</text>
 </view>

pages/main/detail.js

@@ -12,7 +12,7 @@ Page({
   data: {
     IsAutoPlay: true,//是否自动播放
     IsAutoPage: false,//是否自动翻页
-    SortTitle: "课本一致",//排序
+    SortTitle: "课本一致",//排序
     PlayChecked: "checked",
     PageChecked: "",
     IsFinished: false,//是否练会了
@@ -489,7 +489,7 @@ Page({
   getImageDownload: function () {
     var that = this;
     wx.showLoading({
-      title: '请稍等',
+      title: '请稍等',
     })
     server.getData('SearchHanzi?Word=' + that.data.List[that.data.CurrentIndex].Name, function (data) {
       setTimeout(function () {
@@ -551,7 +551,7 @@ Page({
       }
     }
   },
-  //显示设置菜单
+  //显示设置菜单
   showSettingMenu: function (e) {
     var status = e.currentTarget.dataset.status;
     this.setData({
@@ -777,7 +777,7 @@ Page({
       that.animateOpacity(0, "animationData", 500);
     }, 1000);
   },
-  //动画淡入淡出
+  //动画淡入淡出
   animateOpacity: function (opacity, obj, duration) {
     var animation = wx.createAnimation({
       duration: duration,
@@ -810,7 +810,7 @@ Page({
           that.setRemind("取消", "");
         }
         else {
-          that.setRemind("添加到复习", "Remind2");
+          that.setRemind("添加到复习", "Remind2");
         }
 
         server.postData('UpdateHanziReview', {

pages/main/detail.wxml

@@ -62,24 +62,24 @@
     <view class="title FlexRow">
       <view class="title1">汉字结构</view>
     </view>
-    <view class="content FlexColumn">
-      <view class="content1 FlexRow">
-        <view class="left">部首</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="content1 FlexRow">
+        <view class="left">笔画</view>
         <view class="right">{{Detail.BiHua}}</view>
       </view>
     </view>
     <view class="title FlexRow">
-      <view class="title1">基本释义</view>
+      <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="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>
@@ -89,22 +89,22 @@
       <view class="title1">相关组词</view>
     </view>
     <view class="content FlexColumn">
-      <view class="content2 FlexRow">
+      <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="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="content1 FlexRow" wx:if="{{Detail.Synonym}}">
         <view class="left">近义词</view>
         <view class="right">{{Detail.Synonym}}</view>
       </view>
@@ -159,7 +159,7 @@
 <view class="settingContainer container FlexColumn" style='min-height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
 
   <view class="title1">
-    <view class="title1_1">内容</view>
+    <view class="title1_1">内容</view>
   </view>
   <view class="line FlexColumn">
     <view class="line1"></view>
@@ -193,10 +193,10 @@
   </view>
 
   <view class="title1">
-    <view class="title1_1">点读</view>
+    <view class="title1_1">点读</view>
   </view>
   <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker" wx:if="{{!IsAutoPage}}">
-    <view class="title2_1">语音</view>
+    <view class="title2_1">语音</view>
     <view class="title2_2 FlexRow">
       <view>{{SpeakerTitle}}</view>
       <image src='../images/Arrow.png' class="Arrow" />
@@ -208,7 +208,7 @@
   </view>
   <view class="title2 FlexRow" wx:if="{{!IsAutoPage}}">
     <view class="title2_1 FlexColumn">
-      <view>自动播报</view>
+      <view>自动播报</view>
     </view>
     <switch class='title2_2' checked="{{PlayChecked}}" bindchange="settingPlay" />
   </view>
@@ -219,7 +219,7 @@
 
   <view class="title3 FlexRow" wx:if="{{!IsAutoPage}}">
     <view class="title2_1 FlexColumn">
-      <view>组词播报</view>
+      <view>组词播报</view>
       <view class="title3_2">“中国的国”，以词语形式播报</view>
 
     </view>
@@ -240,7 +240,7 @@
   </view>
   <view class="title3 FlexRow">
     <view class="title2_1 FlexColumn">
-      <view>连贯演示</view>
+      <view>连贯演示</view>
       <view class="title3_2">间隔 {{arrIntervalSecond[IntervalSecondIndex]}} 秒连续翻页并播放读音，不能点读</view>
     </view>
     <switch class='title2_2' checked="{{PageChecked}}" bindchange="settingPage" />
@@ -251,7 +251,7 @@
 
   <view class="title2 FlexRow" wx:if="{{IsAutoPage}}">
     <view class="title2_1 FlexColumn">
-      <view>播放间隔秒数</view>
+      <view>播放间隔秒数</view>
     </view>
 
     <view class="title2_2 FlexRow">
@@ -280,7 +280,7 @@
     <block wx:if="{{ShowMenu=='sort'}}">
       <view class="settingMenuBasic2 FlexColumn">
         <image class="settingMenuIcon" src="../images/303.png" />
-        <view class="word2">选择章节内汉字的排列顺序</view>
+        <view class="word2">选择章节内汉字的排列顺序</view>
       </view>
       <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="false">
         <view class="word">课本一致</view>
@@ -296,7 +296,7 @@
     <block wx:if="{{ShowMenu=='speaker'}}">
       <view class="settingMenuBasic2 FlexColumn">
         <image class="settingMenuIcon" src="../images/130.png" />
-        <view class="word2">选择语音风格</view>
+        <view class="word2">选择语音风格</view>
       </view>
       <block wx:for="{{SpeakerArray}}" wx:key="index">
         <view style='height:2rpx'></view>

pages/main/index.js

@@ -60,7 +60,7 @@ Page({
         Url: "../main/list?id=12",
       },
     ],
-    NickName: "陌生用户",
+    NickName: "陌生用户",
     IsMember: 1,
     NewUserNumber: 2,
     AvatarUrl: "",
@@ -68,7 +68,6 @@ Page({
     ReviewCount: "0",
     FinishedCount: "0",
     IsAccredit: false,
-    IsRemind: false,
     IsMemberForeverRemind: 0,
     IsMiaoguoAD: false,
     IsMiaoguoAD2:0,
@@ -94,17 +93,7 @@ Page({
       NickName: app.globalData.userInfo.NickName,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
-
-    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
-      this.setData({
-        IsRemind:true,
-      });
-    }
-    else{
-      this.setData({
-        IsRemind:false,
-      });
-    }
+    
     if (wx.getStorageSync("HasActivate") == 1) {
       wx.navigateTo({
         url: '../../package4/main/activate',

pages/main/index.wxml

@@ -1,221 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  <!-- <view class="index0 FlexColumn">
-    <image src='../images/home_banner_header_sz.png' class="home_banner_header_sz" bindtap='goto' data-id="topAD" data-url='../../package4/main/newuser' wx:if="{{IsMiaoguoAD && IsMember==1 && IsShow==1}}" />
-    <view class="index1 FlexRow">
-      <view class="{{NavClass1}} nav FlexColumn" bindtap='selectNav' data-id="1">
-        <image src='../images/02003.png' class="img3" />
-      </view>
-      <image src='../images/02001.png' class="img" />
-      <view class="{{NavClass2}} nav FlexColumn" bindtap='selectNav' data-id="2">
-        <image src='../images/02002.png' class="img2" />
-      </view>
-      <image src='../images/02004.gif' class="hand" wx:if="{{IsRemind}}" bindtap='selectNav' data-id="2" />
-    </view>
-  </view>
-  <block wx:if="{{NavClass2=='nav2'}}">
-    <view class="index2 FlexRow">
-      <view class="index2_1 FlexRow">
-        <view class="btn" bindtap="goto" data-url="../main/list?id=1">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02005.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02009.png' class="img2" />
-            </view>
-          </view>
-        </view>
-        <view class="btn" bindtap="goto" data-url="../main/list?id=2">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02006.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02010.png' class="img2" />
-            </view>
-          </view>
-        </view>
-        <view class="btn" bindtap="goto" data-url="../main/list?id=3">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02007.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02011.png' class="img2" />
-            </view>
-          </view>
-        </view>
-        <view class="btn" bindtap="goto" data-url="../main/list?id=4">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02008.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02012.png' class="img2" />
-            </view>
-          </view>
-        </view>
-        <view class="btn" bindtap="goto" data-url="../main/list?id=5">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02031.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02032.png' class="img2" />
-            </view>
-          </view>
-        </view>
-        <view class="btn" bindtap="goto" data-url="../main/list?id=6">
-          <view class="btn1">
-            <view class="panel1 FlexRow">
-              <image src='../images/02035.png' class="img" />
-            </view>
-            <view class="panel2 FlexRow">
-              <image src='../images/02036.png' class="img2" />
-            </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">
-      <image src='../images/02017.png' class="imgWave" />
-    </view>
-    <view class="index8 FlexColumn">
-      <image src='../images/02013.png' class="img" />
-      <view class="index8_1" bindtap='gotoSearch'>
-        输入一个字
-      </view>
-    </view>
-
-    <view class="index3 FlexColumn">
-      <image src='{{AvatarUrl}}' class="Avatar" bindtap="gotoMemberCenter">
-        <view class="gear FlexRow">
-          <image src='../images/02022.png' class="img" />
-        </view>
-      </image>
-      <view class="NickName" bindtap="gotoMemberCenter">{{NickName}}</view>
-      <view class="Member2 Member" wx:if="{{IsMember==0}}" bindtap="gotoMemberCenter">非会员</view>
-      <view class="Member" wx:if="{{IsMember==1}}" bindtap="gotoMemberCenter">付费会员</view>
-      <view class="index3_0 FlexRow">
-        <view class="index3_1 FlexColumn">
-          <view class="index3_1_1 FlexRow">
-            <view class="number" wx:if="{{!IsAccredit}}">-</view>
-            <view class="number" wx:if="{{IsAccredit}}">{{DayNumber}}</view>
-          </view>
-          <view class="index3_1_2 FlexRow">持续天数
-          </view>
-        </view>
-
-        <view class="index3_1 FlexColumn">
-          <view class="index3_1_1 FlexRow">
-            <view class="number" wx:if="{{!IsAccredit}}">-</view>
-            <view class="number" wx:if="{{IsAccredit}}">{{FinishedCount}}</view>
-          </view>
-          <view class="index3_1_2 FlexRow">已学章节
-          </view>
-        </view>
-        <view class="index3_1 FlexColumn">
-          <view class="index3_1_1 FlexRow">
-            <view class="number" wx:if="{{!IsAccredit}}">-</view>
-            <view class="number" wx:if="{{IsAccredit}}">{{HanziNumber}}</view>
-          </view>
-          <view class="index3_1_2 FlexRow">总共识字
-          </view>
-        </view>
-      </view>
-      <view class="btn5 btn3 btn" wx:if="{{ReviewCount==0}}" bindtap="gotoReview">
-        <view class="btn4 btn1">复习</view>
-      </view>
-      <view class="btn8 btn6 btn" wx:if="{{ReviewCount>0}}" bindtap="gotoReview">
-        <view class="btn7 btn1"> 复习
-          <view class="ReviewCount">{{ReviewCount}}</view>
-        </view>
-      </view>
-      <view class="btn8 btn6 btn" bindtap="gotoTest">
-        <view class="btn7 btn1">测试</view>
-      </view>
-
-      <button class="Circle FlexColumn" open-type="share">
-        <image src='../images/02015.png' class="Share" />
-        <view class="">分享</view>
-      </button>
-    </view>
-  </block>
-
-  <block wx:if="{{NavClass1=='nav2'}}">
-    <view class="index6 FlexColumn">
-      <image wx:if="{{item.ImageUrl}}" src='../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
-    </view>
-    <view style="height:100rpx;"></view>
-  </block>
-  <view class="index5 FlexColumn" wx:if="{{NavClass1!='nav2' && IsShow==1}}">
-    <image mode="widthFix" src='../images/home_banner_footer.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
-  </view> -->
+  
   <view class="panelTop FlexRow">
     <view class="Avatar FlexColumn">
       <image src='../images/userface_default.png' class="AvatarImage" bindtap="gotoMemberCenter">
       </image>
-      <image wx:if="{{!IsRemind}}" src='{{AvatarUrl}}' class="AvatarImage1" bindtap="gotoMemberCenter">
+      <image src='{{AvatarUrl}}' class="AvatarImage1" bindtap="gotoMemberCenter">
       </image>
     </view>
     
@@ -227,7 +16,7 @@
     <view class="panelTop1 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
       <view class="number" wx:if="{{IsAccredit}}">{{FinishedCount}}</view>
-      <view class="panelTop11 FlexRow">已学章节</view>
+      <view class="panelTop11 FlexRow">已学章节</view>
     </view>
     <view class="panelTop1 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
@@ -235,7 +24,6 @@
       <view class="panelTop11 FlexRow">总共识字</view>
     </view>
     <image src='../images/home_header_bg.png' class="home_header_bg" />
-    <image wx:if="{{IsRemind}}" src='../images/message_home_01.png' class="message_home_01" />
   </view>
   <view class="panelTop2 FlexRow" wx:if="{{IsMember==0 && IsShow==1}}" bindtap="goto" data-url="../../package4/main/buyad">
     <view class="panelTop21">帐户已过期，点这里升级到正式版</view>
@@ -335,21 +123,6 @@
           
 </view>
 
-<!-- <view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
-  <view class="btn" bindtap='goto' data-url='../../package4/main/newuser' data-id="topAD">
-    <view class="btn1 FlexColumn">
-      <image src='../images/home_banner_window.png' class="home_banner_window" />
-      <view class="btn2">了解一下</view>
-    </view>
-  </view>
-  <view class="close2 FlexColumn" bindtap='close' data-num="1">
-    以后再看
-  </view>
-  <view class="close FlexColumn" bindtap='close' data-num="0">
-    <image src='../images/02024.png' class="closeImage" />
-  </view>
-</view> -->
-
 <view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
   <view class="btn">
     <view class="btn1 FlexColumn" catchtap="showMiaoguo">

pages/main/list.js

@@ -8,7 +8,7 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    var bookID = options.id;
+    var bookID = Number(options.id)+60;
     this.setData({
       Height: common.getSystemHeight(),
       NavClass1: "nav1",
@@ -17,7 +17,6 @@ Page({
       BookID: bookID,
       IsShow: app.globalData.userInfo.IsShow,
     });
-    common.getStorageValue(this, "IsRemind", true, function () { });
   },
   onShow: function () {
     if (app.globalData.IsRefresh) {
@@ -82,27 +81,16 @@ Page({
       }
     }
     var imgNum = this.data.BookID;
-    if (imgNum == 5)
-      imgNum = "11";
-    else if (imgNum == 6)
-      imgNum = "12";
-    else
-      imgNum = "0" + imgNum;
-    
+        
     this.setData({
       List: result.Units,
     });
 
-    if (Number(imgNum)<=6){
-      this.setData({
-        topImage: "../images/040" + imgNum + ".png"
-      });
-    }
-    else{
+    if (Number(imgNum)<=64){
+
       this.setData({
-        IsRemind:false,
+        topImage: "../images/0400" + (Number(imgNum)-60).toString() + ".png"
       });
-      wx.setStorageSync('IsRemind', false);
     }
 
     wx.setNavigationBarTitle({
@@ -125,9 +113,7 @@ Page({
         NavClass1: "nav2",
         NavClass2: "nav1",
         IsShowNav1: false,
-        IsRemind:false
       });
-      wx.setStorageSync('IsRemind', false);
     }
   },
   goto: function (e) {

pages/main/list.wxml

@@ -27,16 +27,16 @@
             <image wx:if="{{IsShow==0 && item.IsLocked==0 && !item.IsFinished}}" src='../images/04007.png' class="img04007" />
             <image wx:if="{{IsShow==0 && item.IsLocked==0 && item.IsFinished}}" src='../images/04006.png' class="img04007" />
             <image wx:if="{{IsShow==0 && item.IsLocked==1}}" src='../images/04007.png' class="img04007" />
-            <view class="title">{{item.Example}}</view>
+            <view class="title">{{item.Title}}</view>
           </view>
           <view class="right FlexColumn">
             <view class="right1 FlexRow">
-              <view class="line"></view>
-              <view class="title2">{{item.Name}}</view>
+              <view class="line"></view>
+              <view class="title2">{{item.Name}}</view>
             </view>
             <view class="right2 FlexRow">
               <image src='../images/04008.png' class="img04008" />
-              <view class="title3">{{item.WordLength}}个</view>
+              <view class="title3">{{item.WordLength}}个</view>
             </view>
           </view>
         </view>
@@ -61,6 +61,4 @@
     <view class="line4 line">
     </view>
   </block>
-  <image src='../images/02004.gif' class="hand" wx:if="{{IsRemind}}" />
-
 </view>

pages/main/review.wxml

@@ -2,7 +2,7 @@
 <view class="container FlexColumn" wx:if="{{!IsEdit && List.length>0}}" style='min-height:{{Height}}rpx;'>
   <view class="panel FlexRow">
     <view class="title">复习内容</view>
-    <view class="btn" bindtap='startEdit'>整理</view>
+    <view class="btn" bindtap='startEdit'>整理</view>
   </view>
   <view class="panel2 panel FlexRow" wx:for="{{List}}" wx:key="index" bindtap='gotoReview' data-id="{{index}}">
     <view class="Name">{{item.Name}}</view>
@@ -36,6 +36,6 @@
   <view style='height:150rpx'></view>
   <view class="bottom2 bottom FlexColumn" bindtap='cancelHanzi'>
     <view>取消复习</view>
-    <view class="text1">已选 {{SelectedCount}} 个汉字</view>
+    <view class="text1">已选 {{SelectedCount}} 个汉字</view>
   </view>
 </view>

pages/main/setcombine.wxml

@@ -15,7 +15,7 @@
   <view style='height:200rpx;'></view>
   <view class="bottom FlexColumn" bindtap='save'>
     <view class="bottom1 FlexRow">
-      完成
+      完成
     </view>
   </view>
 </view>

pages/main/test.js

@@ -146,7 +146,7 @@ Page({
     }
     content = '您孩子的识字数大约是' + count + '个，建议从《' + book+'》学习起。';
     if (count == 0) {
-      content = '您孩子的识字数未知，建议从《' + book +'》学习起。';
+      content = '您孩子的识字数未知，建议从《' + book +'》学习起。';
     }
     if (isFinished == 1) {
       content = '您孩子的识字数大约是' + count + '个，实在太优秀了！建议自行搜索文字学习。';

pages/main/test.wxml

@@ -3,7 +3,7 @@
 
   <view class="panelTop0 FlexRow">
     <view class='left'>得分：{{AnswerTrue}} / {{List.length}}</view>
-    <view class='right'>错误：{{AnswerError}} / {{AnswerErrorMax}}</view>
+    <view class='right'>错误：{{AnswerError}} / {{AnswerErrorMax}}</view>
   </view>
 
   <view class="panelTop FlexRow">
@@ -16,7 +16,7 @@
 
     <view class="Name">{{item.options}}</view>
   </view>
-  <view class="bottom FlexRow" >
+  <view class="bottom FlexRow" >
     <text class="bottom1" bindtap='getResult'>退出\n测试</text>
     <view class="bottom2" bindtap='gotoOK' data-id="0">确认</view>
   </view>

project.config.json

@@ -1,79 +1,73 @@
 {
-  "description": "项目配置文件。",
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
     "urlCheck": false,
     "es6": true,
     "postcss": true,
     "minified": true,
     "newFeature": true,
+    "scopeDataCheck": false,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
+    "useApiHook": false,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
+    "useIsolateContext": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true,
+    "useStaticServer": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.3.0",
   "appid": "wx313a8f2c0741efe1",
   "projectname": "%E8%AF%86%E5%AD%97",
-  "isGameTourist": false,
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "currentL": -1,
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
-          "id": -1,
           "name": "首页",
           "pathName": "pages/main/index",
           "query": ""
         },
         {
-          "id": -1,
           "name": "列表",
           "pathName": "pages/main/list",
           "query": ""
         },
         {
-          "id": 2,
           "name": "详情页",
           "pathName": "pages/main/detail",
           "query": "bookid=1&unitid=1&wordid=0"
         },
         {
-          "id": -1,
           "name": "\b搜索",
           "pathName": "pages/main/search",
           "query": ""
         }
       ]
     }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

utils/cryptojs.js

@@ -1,3 +1,16 @@
+import BlockModes from '../utils/lib/BlockModes';
+import DES from '../utils/lib/DES';
+import AES from '../utils/lib/AES';
+import HMAC from '../utils/lib/HMAC';
+import MARC4 from '../utils/lib/MARC4';
+import MD5 from '../utils/lib/MD5';
+import PBKDF2 from '../utils/lib/PBKDF2';
+import PBKDF2Async from '../utils/lib/PBKDF2Async';
+import Rabbit from '../utils/lib/Rabbit';
+import SHA1 from '../utils/lib/SHA1';
+import SHA256 from '../utils/lib/SHA256';
+import CryptoMath from '../utils/lib/CryptoMath';
+
 var Crypto = exports.Crypto = require('./lib/Crypto').Crypto;
 
 [ 'CryptoMath'

utils/main.js

@@ -15,7 +15,7 @@ function getData(url, callback) {
     },
     fail: function () {
       wx.showToast({
-        title: '网络故障，请稍候再试！',
+        title: '网络故障，请稍候再试！',
         duration: 3000
       });
     },
@@ -37,7 +37,7 @@ function postData(url, postData, callback) {
     },
     fail: function () {
       wx.showToast({
-        title: '网络故障，请稍候再试！',
+        title: '网络故障，请稍候再试！',
         duration: 3000
       });
     },
@@ -96,7 +96,7 @@ function payMoney(payType, buyType, money, detail, callback) {
                 }
                 else {
                   wx.showToast({
-                    title: '服务器忙，请稍候再试！',
+                    title: '服务器忙，请稍候再试！',
                     duration: 3000
                   });
                 }
@@ -108,7 +108,7 @@ function payMoney(payType, buyType, money, detail, callback) {
       } else {
         console.log('获取用户登录态失败！' + res.errMsg);
         wx.showToast({
-          title: '服务器忙，请稍候再试！',
+          title: '服务器忙，请稍候再试！',
           duration: 3000
         });
       }

utils/pinyin.js

@@ -84,7 +84,7 @@ const getPinyinArray = function () {
     ['bu4', 'bù', ['不']],
     ['bu5', 'bu', ['']],
     ['ca1', 'cā', ['擦']],
-    ['ca3', 'cǎ', ['礤']],
+    ['ca3', 'cǎ', ['礤']],
     ['cai1', 'cāi', ['猜']],
     ['cai2', 'cái', ['才']],
     ['cai3', 'cǎi', ['彩']],

utils/util.js

@@ -216,7 +216,7 @@ function checkError(err) {
     case 504:
     case 505:
       wx.showToast({
-        title: '网络故障，请稍候再试！',
+        title: '网络故障，请稍候再试！',
         duration: 3000
       });
       break;