1.0.1

app.json

@@ -4,11 +4,11 @@
     "pages/main/list",
     "pages/main/detail",
     "pages/main/search",
-    "pages/main/about",
-    "pages/main/cooperation",
-    "pages/main/payfinished",
-    "pages/main/paylist",
-    "pages/main/newuserlist",
+    "pages/about/about",
+    "pages/about/cooperation",
+    "pages/about/payfinished",
+    "pages/about/paylist",
+    "pages/about/newuserlist",
     "pages/main/index"
   ],
   "window": {

pages/main/about.js

@@ -12,7 +12,7 @@ Page({
       ListProgram: server.getProgramList(),
     });
 
-    if (options.id =="Cooperation"){
+    if (options.id == "Cooperation") {
       wx.pageScrollTo({
         scrollTop: 905
       });
@@ -32,7 +32,7 @@ Page({
   },
   getAppID: function (e) {
     wx.navigateTo({
-      url: "./cooperation"
+      url: "../about/cooperation"
     });
   },
   onShareAppMessage: function () {

pages/main/payfinished.js

@@ -18,12 +18,12 @@ Page({
   },
   gotoPayList: function () {
     wx.navigateTo({
-      url: './paylist',
+      url: '../about/paylist',
     });
   },
   gotoNewUserList: function () {
     wx.navigateTo({
-      url: './newuserlist',
+      url: '../about/newuserlist',
     });
   },
   onShareAppMessage: function () {

pages/main/paylist.js

@@ -5,7 +5,7 @@ const app = getApp();
 
 Page({
   data: {
-    PayList:[],
+    PayList: [],
   },
   onLoad: function (options) {
     this.setData({
@@ -17,8 +17,8 @@ Page({
     var that = this;
     server.getData('GetHanziUserPayInfoList?UserID=' + app.globalData.userInfo.UserID, function (data) {
       if (data) {
-        var list=[];
-        for(var i=data.List.length-1;i>=0;i--){
+        var list = [];
+        for (var i = data.List.length - 1; i >= 0; i--) {
           list.push(data.List[i]);
         }
         var serviceTime = data.ProductServiceTime;

pages/main/detail.js

@@ -66,22 +66,25 @@ Page({
     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();
-                  else if (that.data.WordType == "search")
-                    that.initSearch();
+          common.getStorageValue(that, "ShowHanzi", true, 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.settingShowHanzi(null, that.data.ShowHanzi);
+                    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();
+                    else if (that.data.WordType == "search")
+                      that.initSearch();
+                  });
                 });
               });
             });
@@ -90,7 +93,7 @@ Page({
       });
     });
 
-    common.getStorageValue(that, "IsHelpPosition1", 1, function () {});
+    common.getStorageValue(that, "IsHelpPosition1", 1, function () { });
 
     if (this.data.WordType == "normal")
       this.submitData();
@@ -415,8 +418,8 @@ Page({
       IsShowPrev: isShowPrev,
       IsShowNext: isShowNext,
       IsShowWordDetail: false,
+      ShowHanzi: wx.getStorageSync("ShowHanzi"),
     });
-
   },
   getImageError: function () {
     var that = this;
@@ -433,7 +436,7 @@ Page({
       setTimeout(function () {
         wx.hideLoading();
         wx.redirectTo({
-          url: "./detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
+          url: "../main/detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
         });
       }, 5000);
     });
@@ -582,6 +585,20 @@ Page({
     });
     wx.setStorageSync('SpeakerMan', result);
   },
+  settingShowHanzi: function (e, b) {
+    var result = !this.data.ShowHanzi;
+    if (b != undefined)
+      result = b;
+    this.setData({
+      ShowHanzi: result,
+    });
+    wx.setStorageSync('ShowHanzi', result);
+  },
+  showHanziFunction: function () {
+    this.setData({
+      ShowHanzi: true,
+    });
+  },
   settingShowPinyin: function (e, b) {
     var result = !this.data.ShowPinyin;
     if (b != undefined)

pages/main/detail.wxml

@@ -8,6 +8,15 @@
       </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="ShowHanziContainer FlexRow" wx:if="{{!ShowHanzi}}">
+        <view class="btn FlexRow" bindtap='playAudio' data-click="true">
+          <image src='../../images/05019.png' class="image05019" />
+        </view>
+        <view class="line"></view>
+        <view class="btn FlexRow" catchtap='showHanziFunction'>
+          <image src='../../images/05020.png' class="image05020" />
+        </view>
+      </view>
     </block>
     <block wx:if="{{CurrentIndex==List.length-1}}">
       <view class="hanziEnd FlexColumn" wx:if="{{hanziType!='review'}}">
@@ -31,7 +40,7 @@
     <view class="{{RemindCss}} Remind" animation="{{animationData}}">{{RemindStr}}</view>
 
   </view>
-  <view class="detail" wx:if="{{IsShowWordDetail}}" >
+  <view class="detail" wx:if="{{IsShowWordDetail}}">
     <block wx:if="{{Detail.BiShunUrl}}">
       <image src='{{Detail.BiShunUrl}}' class="bishun" />
       <view class="line"></view>
@@ -142,12 +151,12 @@
 
 <!-- 帮助 -->
 <view class="help container FlexColumn" style="height:{{Height}}rpx;" wx:if="{{IsHelpPosition1==1}}">
-  <view wx:if="{{IsHelpPosition1==1}}" class="help1" bindtap='playAudio' data-click="true" ></view>
-  <image wx:if="{{IsHelpPosition1==1}}" src='../../images/05012.gif' class="helpPosition1 helpGif" bindtap='playAudio' data-click="true"  />
+  <view wx:if="{{IsHelpPosition1==1}}" class="help1" bindtap='playAudio' data-click="true"></view>
+  <image wx:if="{{IsHelpPosition1==1}}" src='../../images/05012.gif' class="helpPosition1 helpGif" bindtap='playAudio' data-click="true" />
 </view>
 
 <!-- 设置 -->
-<view class="settingContainer container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
+<view class="settingContainer container FlexColumn" style='min-height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
 
   <view class="title1">
     <view class="title1_1">内容</view>
@@ -168,7 +177,17 @@
 
   <view class="title2 FlexRow">
     <view class="title2_1 FlexColumn">
-      <view>拼音显示</view>
+      <view>显示汉字</view>
+    </view>
+    <switch class='title2_2' checked="{{ShowHanzi}}" bindchange="settingShowHanzi" />
+  </view>
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
+    <view class="line1"></view>
+  </view>
+
+  <view class="title2 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>显示拼音</view>
     </view>
     <switch class='title2_2' checked="{{ShowPinyin}}" bindchange="settingShowPinyin" />
   </view>
@@ -206,6 +225,16 @@
     </view>
     <switch class='title2_2' checked="{{IsAudioLengthChecked}}" bindchange="settingAudioLength" />
   </view>
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
+    <view class="line1"></view>
+  </view>
+  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker" wx:if="{{!IsAutoPage}}">
+    <view class="title2_1">首选词语</view>
+    <view class="title2_2 FlexRow">
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+
   <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
     <view class="line1"></view>
   </view>
@@ -235,7 +264,7 @@
     </view>
 
   </view>
-
+  <view style='height:200rpx;'></view>
 
   <view class="bottom FlexColumn" bindtap='closeSetting'>
     <view class="bottom1 FlexRow">

pages/main/detail.wxss

@@ -83,6 +83,33 @@
   height:370rpx;
 }
 
+.main .ShowHanziContainer{
+  width: 100%;
+  position: fixed;
+  top:320rpx;
+  left:0;
+  background-color: #F0F0F0;
+}
+.main .ShowHanziContainer .btn{
+  width: 48%;
+  height:404rpx;
+}
+.main .ShowHanziContainer .line{
+  width: 4rpx;
+  height:120rpx;
+  background-color: #D2D2D2;
+}
+.main .ShowHanziContainer .image05019{
+  width:123rpx;
+  height:103rpx;
+}
+.main .ShowHanziContainer .image05020{
+  width:100rpx;
+  height:100rpx;
+}
+
+
+
 .detail{
   width:100%;
   justify-content: flex-start;
@@ -214,7 +241,7 @@
 }
 
 .settingContainer {
-  position: fixed;
+  position: absolute;
   top: 0;
   background-color: #E3E3E3;
   color: #1e1e1e;

pages/main/index.js

@@ -21,7 +21,7 @@ Page({
     NavClass1: "",
     NavClass2: "nav2",
     IsRemind: false,
-    IsMemberForeverRemind:false,
+    IsMemberForeverRemind: false,
   },
   onReady: function (e) {
   },
@@ -38,13 +38,13 @@ Page({
       });
     }
 
-    common.getStorageValue(this, "IsRemind", true, function () {});
+    common.getStorageValue(this, "IsRemind", true, function () { });
 
     this.updateProgram();
   },
   onShow: function () {
     this.getData();
-    
+
     if (!this.data.IsAccredit) {
       var IsRemindAccredit = wx.getStorageSync("IsRemindAccredit");
       if (IsRemindAccredit == 1) {
@@ -208,7 +208,7 @@ Page({
         wx.setStorageSync("ReviewList", data.ReviewList);
 
         common.getStorageValue(that, "IsMemberForeverRemind", 0, function () {
-          if (that.data.IsMemberForeverRemind==0 && that.data.NewUserNumber >= app.globalData.NewUserNumberMax){
+          if (that.data.IsMemberForeverRemind == 0 && that.data.NewUserNumber >= app.globalData.NewUserNumberMax) {
             that.setData({
               IsMemberForeverRemind: 1,
             });
@@ -223,7 +223,7 @@ Page({
 
         if (data.IsShow)
           app.globalData.IsShow = data.IsShow;
-        
+
         app.globalData.userInfo.IsMember = data.IsMember;
 
       }
@@ -251,36 +251,36 @@ Page({
   goto: function (e) {
     var id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: "./list?id=" + id,
+      url: "../main/list?id=" + id,
     });
   },
   gotoSearch: function (e) {
     wx.navigateTo({
-      url: "./search",
+      url: "../main/search",
     });
   },
   gotoAbout: function (e) {
-    var id=e.currentTarget.dataset.id;
+    var id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: "./about?id="+id
+      url: "../about/about?id=" + id
     });
   },
   gotoReview: function () {
     var id = "review";
     wx.navigateTo({
-      url: './detail?Type=' + id,
+      url: '../main/detail?Type=' + id,
     });
   },
   gotoNewUser: function () {
     wx.navigateTo({
-      url: './newuserlist',
+      url: '../about/newuserlist',
     });
   },
   gotoPayList: function () {
     wx.navigateTo({
-      url: './paylist',
+      url: '../about/paylist',
     });
-  }, 
+  },
   close: function () {
     this.setData({
       IsMemberForeverRemind: 2,
@@ -293,7 +293,7 @@ Page({
       var money = app.globalData.PayMoney;
       server.payMoney(3, money, function () {
         wx.navigateTo({
-          url: './payfinished',
+          url: '../about/payfinished',
         });
       });
       setTimeout(function () {
@@ -334,6 +334,23 @@ Page({
 
     });
   },
+  updateMember: function () {
+    if (app.globalData.userInfo.UserID == 1) {
+      if (app.globalData.userInfo.IsMember == 1) {
+        app.globalData.userInfo.IsMember = 0;
+        this.setData({
+          IsMember: false,
+        });
+      }
+      else {
+        app.globalData.userInfo.IsMember = 1;
+        this.setData({
+          IsMember: true,
+        });
+      }
+
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/list.js

@@ -16,7 +16,7 @@ Page({
       NavClass2: "nav2",
       IsShowNav1: true,
       BookID: bookID,
-      IsShowPayInfo:false,
+      IsShowPayInfo: false,
       IsShow: app.globalData.IsShow,
     });
   },
@@ -49,6 +49,8 @@ Page({
             }
           }
 
+          item.WordLength = item.Words.length;
+
           for (var k = 0; k < item.Words.length; k++) {
             item.Words[k].ReviewCss = "";
             for (var l = 0; l < arrReview.length; l++) {
@@ -58,6 +60,18 @@ Page({
               }
             }
           }
+
+          if (item.WordLength % 6 > 0) {
+            var count = 6 - (item.WordLength % 6);
+            console.log(count);
+            for (var n = 0; n < count; n++) {
+              var obj = {
+                Name: "",
+                ReviewCss: "boxNull",
+              };
+              item.Words.push(obj);
+            }
+          }
         }
         break;
       }
@@ -97,18 +111,22 @@ Page({
       });
     }
     else {
-      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);
+      var word = e.currentTarget.dataset.word;
+      if (word) {
+        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.navigateTo({
+          url: "../main/detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
+        });
       }
-      wx.navigateTo({
-        url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
-      });
     }
   },
   getFinished: function () {
@@ -151,7 +169,7 @@ Page({
       var money = app.globalData.PayMoney;
       server.payMoney(3, money, function () {
         wx.navigateTo({
-          url: './payfinished',
+          url: '../about/payfinished',
         });
       });
       setTimeout(function () {
@@ -161,7 +179,7 @@ Page({
   },
   gotoNewUser: function () {
     wx.navigateTo({
-      url: './newuserlist',
+      url: '../about/newuserlist',
     });
   },
   close: function () {

pages/main/list.wxml

@@ -35,7 +35,7 @@
             </view>
             <view class="right2 FlexRow">
               <image src='../../images/04008.png' class="img04008" />
-              <view class="title3">{{item.Words.length}}个</view>
+              <view class="title3">{{item.WordLength}}个</view>
             </view>
           </view>
         </view>
@@ -52,7 +52,11 @@
         <view class="title1">{{item.Name}}</view>
       </view>
       <view class="table FlexRow">
-        <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" bindtap="goto" data-islocked='{{item.IsLocked}}' data-bookid='{{BookID}}' data-unitid='{{item.ID}}' data-wordid='{{i}}' data-isfinished='{{item.IsFinished}}'>{{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-islocked='{{item.IsLocked}}' 
+        data-bookid='{{BookID}}' data-unitid='{{item.ID}}' 
+        data-wordid='{{i}}' data-word='{{itemChild.Name}}' data-isfinished='{{item.IsFinished}}'
+        >{{itemChild.Name}}</view>
       </view>
     </view>
 

pages/main/list.wxss

@@ -155,15 +155,15 @@
   font-size:28rpx;
 }
 .group .table{
-  margin: 40rpx 20rpx 60rpx 30rpx;
+  margin: 40rpx 20rpx 60rpx 20rpx;
   font-size:48rpx;
-  justify-content: flex-start;
+  /* justify-content: flex-start; */
   align-items: flex-start;
   flex-wrap: wrap;
   /* background-color: #000; */
 }
 .group .box{
-  margin: 0 7rpx 7rpx 0;
+  margin: 0 3rpx 7rpx 3rpx;
   background-color: #fff;
   width:106rpx;
   height:106rpx;
@@ -179,6 +179,12 @@
   width:106rpx;
   height:106rpx;
 }
+.group .boxNull{
+  background-color: #F5E2BE;
+  border:1rpx solid #F5E2BE;
+  width:106rpx;
+  height:106rpx;
+}
 
 
 .PayInfo{

pages/main/search.js

@@ -52,10 +52,10 @@ Page({
           wx.setStorageSync('IsAutoPage', false);
 
           wx.navigateTo({
-            url: "./detail?Type=search",
+            url: "../main/detail?Type=search",
           });
         }
-        else{
+        else {
           that.setData({
             IsSearchResult: true,
           });
@@ -70,7 +70,7 @@ Page({
   },
   goto: function (e) {
     var word = e.currentTarget.dataset.word;
-    this.researchWord({detail:{value:word}});
+    this.researchWord({ detail: { value: word } });
   },
   onShareAppMessage: function () {
     return {

project.config.json

@@ -59,13 +59,13 @@
 				{
 					"id": -1,
 					"name": "\b关于",
-					"pathName": "pages/main/about",
+					"pathName": "pages/about/about",
 					"query": ""
 				},
 				{
 					"id": 5,
 					"name": "\b活动",
-					"pathName": "pages/main/paylist",
+					"pathName": "pages/about/paylist",
 					"query": ""
 				}
 			]

utils/util.js

@@ -229,14 +229,9 @@ function checkError(err) {
     case 503:
     case 504:
     case 505:
-      wx.navigateTo({
-        url: '../About/ErrorPage',
-        fail: function (e) {
-          wx.showToast({
-            title: '网络故障，请稍候再试！',
-            duration: 3000
-          });
-        }
+      wx.showToast({
+        title: '网络故障，请稍候再试！',
+        duration: 3000
       });
       break;
   }