1.0.0

app.js

@@ -15,7 +15,7 @@ App({
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
-    ShareTitle:"识字，让阅读赢在起点",
+    ShareTitle:"赢在阅读起跑线",
     userInfo: null,
     fileUrl: "https://www.kylx365.com/",
     serverUrl: "https://www.kylx365.com/apiData/",

pages/main/cooperation.js

@@ -31,19 +31,28 @@ Page({
   },
   save: function () {
     if (this.data.Name.length > 0 && this.data.Contact.length > 0) {
-      var that = this;
-      server.getData('AddChannel?Name='
-        + this.data.Name + '&Contact='
-        + this.data.Contact + '&ProgramID='
-        + app.globalData.ProgramID + '&UserID='
-        + app.globalData.userInfo.UserID, function (data) {
-          if (data) {
-            that.setData({
-              IsInput: false,
-              ChannelID: data.insertId,
-            });
-          }
-        });
+      if (common.IsChinese(this.data.Contact)) {
+        wx.showToast({
+          title: '请输入有效信息',
+          icon: 'success',
+          duration: 2000
+        })
+      }
+      else {
+        var that = this;
+        server.getData('AddChannel?Name='
+          + this.data.Name + '&Contact='
+          + this.data.Contact + '&ProgramID='
+          + app.globalData.ProgramID + '&UserID='
+          + app.globalData.userInfo.UserID, function (data) {
+            if (data) {
+              that.setData({
+                IsInput: false,
+                ChannelID: data.insertId,
+              });
+            }
+          });
+      }
     }
     else {
       wx.showToast({
@@ -55,7 +64,7 @@ Page({
   },
   setClipboardData: function () {
     wx.setClipboardData({
-      data: '小程序AppID:' + app.globalData.AppID+' 小程序启动Path:pages/index/index?SourceID=' + this.data.ChannelID,
+      data: '小程序AppID:' + app.globalData.AppID + ' 小程序启动Path:pages/index/index?SourceID=' + this.data.ChannelID,
       success: function (res) {
         wx.getClipboardData({
           success: function (res) {

pages/main/cooperation.wxml

@@ -44,6 +44,7 @@
     </view>
 
     <view class="text6">红色部分请勿遗漏，便于了解相互转化</view>
+    <view class="text8" bindtap='setClipboardData'>复制到剪贴板</view>
     <view class="line2"></view>
     <text class="text7">由于微信规则限制，在满500个名额后，将为具有优质内容的或提供教育相关资源的公众号优先保留关联席位，敬请海涵。</text>
 

pages/main/cooperation.wxss

@@ -136,11 +136,17 @@
 }
 
 
+.text8{
+  font-size:28rpx;
+  margin-top:70rpx;
+  color:#A20602;
+}
+
 .line2{
   width: 600rpx;
   height:3rpx;
   background-color: #593613;
-  margin-top:140rpx;
+  margin-top:30rpx;
 }
 
 .text7{

pages/main/detail.js

@@ -20,7 +20,7 @@ Page({
     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 }],
+    SpeakerArray: [{ name: "温柔姐姐(推荐)", value: "woman", isShow: true }, { name: "爽朗哥哥", value: "man", isShow: false }, { name: "古韵叔叔", value: "oldman", isShow: false }, { name: "可爱妹妹", value: "sister", isShow: false }],
 
   },
   onLoad: function (options) {
@@ -49,7 +49,6 @@ Page({
       CurrentIndex: wordID,
       IsFinished: isfinished,
       IsHelpPosition1: 0,
-      IsHelpPosition2: 0,
       IsReview: false,
       IsShowWordDetail: false,
       ShowMenu: "sort",
@@ -91,6 +90,8 @@ Page({
       });
     });
 
+    common.getStorageValue(that, "IsHelpPosition1", 1, function () {});
+
     if (this.data.WordType == "normal")
       this.submitData();
 
@@ -102,6 +103,13 @@ Page({
       RecordID: insertID,
       HanziNumber: hanziNumber,
     }, function (data) { });
+
+    if (this.data.IsHelpPosition1 == 1) {
+      this.setData({
+        IsHelpPosition1: 2,
+      });
+      wx.setStorageSync('IsHelpPosition1', 2);
+    }
   },
   submitData: function (content) {
     if (app.globalData.userInfo && app.globalData.userInfo.UserID) {
@@ -226,7 +234,7 @@ Page({
           result.IsReview = false;
 
           for (var l = 0; l < arrReview.length; l++) {
-            if (arrReview[l].Word == result.Name) {
+            if (arrReview[l].Name == result.Name) {
               result.IsReview = true;
               break;
             }
@@ -272,6 +280,13 @@ Page({
     if (e && e.currentTarget.dataset.click)
       click = e.currentTarget.dataset.click;
 
+    if (click && this.data.IsHelpPosition1 == 1) {
+      this.setData({
+        IsHelpPosition1: 2,
+      });
+      wx.setStorageSync('IsHelpPosition1', 2);
+    }
+
     var url = app.globalData.audioUrlBaidu;
     url = url.replace("[token]", app.globalData.BaiduToken);
     url = url.replace("per=0", "per=" + this.data.audioPer[this.data.SpeakerMan]);
@@ -282,7 +297,7 @@ Page({
           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");
+        url = url.replace("spd=3", "spd=4");
       }
       else {
 
@@ -405,20 +420,22 @@ Page({
   },
   getImageError: function () {
     var that = this;
-    that.data.List[that.data.CurrentIndex].WordUrl = "";
-
     that.setData({
-      List: that.data.List,
       IsImageError: true,
     });
-
   },
   getImageDownload: function () {
     var that = this;
+    wx.showLoading({
+      title: '请稍等',
+    })
     server.getData('SearchHanzi?Word=' + that.data.List[that.data.CurrentIndex].Name, function (data) {
-      wx.redirectTo({
-        url: "./detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
-      });
+      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,
+        });
+      }, 5000);
     });
   },
   showWordDetailHandler: function (e) {

pages/main/detail.wxml

@@ -140,6 +140,12 @@
   </view>
 </view>
 
+<!-- 帮助 -->
+<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>
+
 <!-- 设置 -->
 <view class="settingContainer container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
 
@@ -170,7 +176,7 @@
   <view class="title1">
     <view class="title1_1">点读</view>
   </view>
-  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker">
+  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker" wx:if="{{!IsAutoPage}}">
     <view class="title2_1">语音</view>
     <view class="title2_2 FlexRow">
       <view>{{SpeakerTitle}}</view>
@@ -192,7 +198,7 @@
     <view class="line1"></view>
   </view>
 
-  <view class="title3 FlexRow">
+  <view class="title3 FlexRow" wx:if="{{!IsAutoPage}}">
     <view class="title2_1 FlexColumn">
       <view>组词播报</view>
       <view class="title3_2">“中国的国”，以词语形式播报</view>
@@ -200,7 +206,7 @@
     </view>
     <switch class='title2_2' checked="{{IsAudioLengthChecked}}" bindchange="settingAudioLength" />
   </view>
-  <view class="line FlexColumn">
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
     <view class="line1"></view>
   </view>
   <view class="title3 FlexRow">
@@ -214,13 +220,13 @@
     <view class="line1"></view>
   </view>
 
-  <view class="title3 FlexRow" wx:if="{{IsAutoPage}}">
+  <view class="title2 FlexRow" wx:if="{{IsAutoPage}}">
     <view class="title2_1 FlexColumn">
       <view>播放间隔秒数</view>
     </view>
 
     <view class="title2_2 FlexRow">
-      <picker bindchange="bindPickerChange" value="{{IntervalSecondIndex}}" range="{{arrIntervalSecond}}">
+      <picker class="picker" bindchange="bindPickerChange" value="{{IntervalSecondIndex}}" range="{{arrIntervalSecond}}">
         <view>
           {{arrIntervalSecond[IntervalSecondIndex]}} 秒
         </view>

pages/main/detail.wxss

@@ -73,6 +73,7 @@
   font-family: 'GB Pinyinok-C';
   font-weight: normal;
   font-style: normal;
+  height:88rpx;
 }
 
 .main .wordImage{
@@ -159,7 +160,7 @@
 }
 
 .detail .right{
-  margin: 30rpx;
+  margin: 60rpx;
 }
 
 .detail .line2{
@@ -177,7 +178,7 @@
 
 
 .detail .content2{
-  margin: 30rpx 20rpx 30rpx 40rpx;
+  margin: 30rpx 20rpx 30rpx 30rpx;
   background-color: #fff;
   align-items: flex-start;
   flex-wrap: wrap;
@@ -298,6 +299,12 @@
   font-size: 48rpx;
   color: #f0f0f0;
 }
+.settingContainer .picker{
+  text-align: right;
+  width:200rpx;
+  height:100rpx;
+  line-height: 100rpx;
+}
 
 .settingMenu {
   position: fixed;
@@ -428,4 +435,31 @@
 }
 
 
+.help {
+  position: fixed;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0);  
+  z-index: 100;
+}
+
+.help .help1 {
+  margin-top: 350rpx;
+  /* background-color: rgba(255, 255, 255, 0.3);  */
+  width: 100%;
+  height: 300rpx;
+  z-index: 100;
+}
+
+.helpGif {
+  width: 114rpx;
+  height: 170rpx;
+  position: fixed;
+  z-index: 100;
+}
+
+.helpPosition1 {
+  left: 327rpx;
+  top: 588rpx;
+}
+
 

pages/main/index.js

@@ -38,6 +38,8 @@ Page({
       });
     }
 
+    common.getStorageValue(this, "IsRemind", true, function () {});
+
     this.updateProgram();
   },
   onShow: function () {

pages/main/index.wxml

@@ -141,7 +141,7 @@
       </view>
     </view>
 
-    <view class="index9 FlexRow" wx:if="{{IsMember==0 || (IsMember==1 && NewUserNumber>=NewUserNumberMax)}}">
+    <view class="index9 FlexRow" wx:if="{{(IsMember==0 && IsShow==0) || (IsMember==1 && NewUserNumber>=NewUserNumberMax)}}">
       <image src='../../images/02016.png' class="imgWave" />
     </view>
   </block>

pages/main/list.js

@@ -17,6 +17,7 @@ Page({
       IsShowNav1: true,
       BookID: bookID,
       IsShowPayInfo:false,
+      IsShow: app.globalData.IsShow,
     });
   },
   onShow: function () {
@@ -35,10 +36,10 @@ Page({
           var item = result.Units[j];
           if (app.globalData.userInfo.IsMember == 1)
             item.IsLocked = 0;
-          var rnd = common.random(2, 5);
-          item.Example = "";
-          for (var k = 0; k < rnd; k++)
-            item.Example += item.Words[k].Name;
+          // var rnd = common.random(2, 5);
+          // 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++) {

pages/main/list.wxml

@@ -21,9 +21,11 @@
       <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-islocked='{{item.IsLocked}}' data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' wx:for="{{List}}" wx:key="index">
         <view class="btn1 FlexRow">
           <view class="left FlexRow">
-            <image wx:if="{{item.IsLocked==0 && !item.IsFinished}}" src='../../images/04007.png' class="img04007" />
-            <image wx:if="{{item.IsLocked==0 && item.IsFinished}}" src='../../images/04006.png' class="img04007" />
-            <image wx:if="{{item.IsLocked==1}}" src='../../images/04005.png' class="img04005" />
+            <image wx:if="{{IsShow==1 && item.IsLocked==0 && !item.IsFinished}}" src='../../images/04007.png' class="img04007" />
+            <image wx:if="{{IsShow==1 && item.IsLocked==0 && item.IsFinished}}" src='../../images/04006.png' class="img04007" />
+            <image wx:if="{{IsShow==1 && item.IsLocked==1}}" src='../../images/04005.png' class="img04005" />
+            <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" />
             <view class="title">{{item.Example}}</view>
           </view>
           <view class="right FlexColumn">
@@ -71,13 +73,6 @@
       </view>
     </view>
   </view>
-  <view class="text1">邀请6位新用户可获得永久有效期</view>
-  <text class="text2">* 购买前后均可获得，\n如在购买前已满额，在购买后立即生效。</text>
-  <view class="text3 FlexRow" catchtap="gotoNewUser">
-    <image src="../../images/Triangle.png" class="Triangle" />
-    <view>试试看</view>
-  </view>
-  
   <view class="close FlexColumn" catchtap='close'>
     <image src='../../images/02024.png' class="closeImage" />
   </view>

pages/main/list.wxss

@@ -108,6 +108,7 @@
 .list2 .title {
   margin-left: 30rpx;
   font-size:58rpx;
+  font-weight: 450;
 }
 
 .list2 .line {
@@ -194,7 +195,7 @@
   height: 420rpx;
   background-color: #F19805;
   border-radius: 40rpx;
-  margin-top: 242rpx;
+  margin-top: 352rpx;
   box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
 }
 .PayInfo .btn1 {
@@ -217,19 +218,6 @@
   width: 518rpx;
   height: 167rpx;
 }
-.PayInfo .text1 {
-  font-size:32rpx;
-  margin-top: 80rpx;
-}
-.PayInfo .text2 {
-  font-size:20rpx;
-  margin-top: 20rpx;
-  text-align: center;
-}
-.PayInfo .text3 {
-  font-size:36rpx;
-  margin-top: 30rpx;
-}
 .PayInfo .panel2 {
   width: 100%;
   height: 120rpx;

pages/main/search.js

@@ -69,19 +69,8 @@ Page({
     }
   },
   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
-   
-    wx.setStorageSync('SelectedRandom', false);
-    wx.setStorageSync('IsAutoPage', false);
-    
-    wx.navigateTo({
-      url: "./detail?Type=search&bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
-    });
+    var word = e.currentTarget.dataset.word;
+    this.researchWord({detail:{value:word}});
   },
   onShareAppMessage: function () {
     return {

pages/main/search.wxml

@@ -9,7 +9,7 @@
     <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 class="box" wx:for="{{ExampleArray}}" wx:key="index" bindtap="goto" data-word='{{item.Name}}' >{{item.Name}}</view>
     </view>
   </block>
 </view>

utils/main.js

@@ -14,8 +14,9 @@ function getData(url, callback) {
       callback(data);
     },
     fail: function () {
-      wx.redirectTo({
-        url: './error',
+      wx.showToast({
+        title: '网络故障，请稍候再试！',
+        duration: 3000
       });
     },
   });
@@ -36,12 +37,9 @@ function postData(url, postData, callback) {
     },
     fail: function () {
       wx.showToast({
-        title: '服务器忙，请稍候再试！',
+        title: '网络故障，请稍候再试！',
         duration: 3000
       });
-      wx.redirectTo({
-        url: './error',
-      });
     },
   });
 }

utils/util.js

@@ -232,9 +232,10 @@ function checkError(err) {
       wx.navigateTo({
         url: '../About/ErrorPage',
         fail: function (e) {
-          wx.reLaunch({
-            url: '../index/start',
-          })
+          wx.showToast({
+            title: '网络故障，请稍候再试！',
+            duration: 3000
+          });
         }
       });
       break;