2.5.10

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.5.5",
+    Version: "2.5.10",
     //IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -12,6 +12,7 @@ App({
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlServer2: "https://scoreline.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
+    serverUrlLocalhost2: "http://localhost:3000/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",

pages/main/addInfomationDetail.js

@@ -64,6 +64,38 @@ Page({
       data.LATEX.LatexContent2=str2;
     }
 
+    //生成书的链接
+    if (data.CHN && data.CHN.Book){
+      let arr=[];
+      for(let i=0;i<data.CHN.Book.length;i++){
+        let item=data.CHN.Book[i];
+        let LibraryName1=item.substring(9,12);
+        let LibraryName2=item.substring(12,13);
+        let str="../../pages_test/knowledge/package?Category=语文&LibraryName1="+LibraryName1+"&LibraryName2="+LibraryName2+"学期";
+        let obj={};
+        obj.Name=item;
+        obj.Url=str;
+        arr.push(obj);
+      }
+      data.CHN.Book=arr;
+    }
+
+    //生成书的链接
+    if (data.ENG && data.ENG.Book){
+      let arr=[];
+      for(let i=0;i<data.ENG.Book.length;i++){
+        let item=data.ENG.Book[i];
+        let LibraryName1=item.substring(9,12);
+        let LibraryName2=item.substring(12,15);
+        let str="../../pages_test/knowledge/package?Category=English&LibraryName1="+LibraryName1+"&LibraryName2="+LibraryName2;
+        let obj={};
+        obj.Name=item;
+        obj.Url=str;
+        arr.push(obj);
+      }
+      data.ENG.Book=arr;
+    }
+
     if (data.CHN && data.CHN.KaitiArr) {
       if (data.CHN.KaitiArr.length == 1) {
         data.CHN.KaitiWidth = "";
@@ -104,7 +136,15 @@ Page({
         }];
         var obj2 = main.changeStringToView(obj);
         var str = obj2.Field[1][0].Content;
-        item.push(str);
+        if (str && common.checkIsArray(str))
+            item.push(str);
+        else {
+            let obj3 = {};
+            obj3.ChildID=0;
+            obj3.key = "normal";
+            obj3.value = str;
+            item.push([obj3]);
+        }
         item[1] = common.ReplaceAllString(item[1], "<b>", "");
         item[1] = common.ReplaceAllString(item[1], "</b>", "");
       }
@@ -440,6 +480,12 @@ Page({
       IsHelp: true,
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   closeHelp0: function () {
     this.setData({
       IsHelp: false,

pages/main/addInfomationDetail.wxml

@@ -39,7 +39,14 @@
       </view>
       <view></view>
     </view>
-    <text wx:if="{{Result.CHN.Book}}" class="panelRemark">该内容出现在\n<block wx:for="{{Result.CHN.Book}}" wx:key="*this">《{{item}}》\n</block>除了自制题卡还可以试一试语文「知识检验」</text>
+    <view wx:if="{{Result.CHN.Book}}" class="panelRemark panelRemark_1 FlexColumn">
+      <view style="height: 10rpx;"></view>
+      <view class="panelRemark1 FlexRow" wx:for="{{Result.CHN.Book}}" wx:key="*this" bind:tap="goto" data-url="{{item.Url}}">
+        <view class="panelRemark11">{{item.Name}}</view>
+        <image class="sysIcon_a08" src='../images/sysIcon_a08.png' />
+      </view>
+      <view style="height: 10rpx;"></view>
+    </view>
   </block>
 
   <!-- 拼音 -->
@@ -459,7 +466,24 @@
       </view>
       <view></view>
     </view>
-    <text wx:if="{{Result.ENG.WordFrequency.Max}}" class="panelRemark">该单词大约在 {{Result.ENG.WordFrequency.Max}} 词频范围内\n除了自制题卡还可以试一试英语「知识检验」</text>
+    <view style="height: 10rpx;"></view>
+    <view wx:if="{{Result.ENG.WordFrequency.Max}}" class="panelRemark FlexRow" style="justify-content: flex-start;">
+      <view class="panelRemark1 FlexRow" bind:tap="goto" data-url="../../pages_test/knowledge/package?Category=English&LibraryName1=高频单词&LibraryName2=&BookImageName=picZs_en_gpWords_cov&LibraryName=高频单词">
+        <view class="panelRemark11">知识包 高频单词{{Result.ENG.WordFrequency.Max}}范围</view>
+        <image class="sysIcon_a08" src='../images/sysIcon_a08.png' />
+      </view>
+      <view class="panelRemark1 panelRemark10 FlexRow" bind:tap="goto" data-url="../../pages/other/webview?PageID=11">
+        <view class="panelRemark11">CEFR {{Result.ENG.CEFR_Level}}</view>
+        <view class="panelRemark12 FlexRow"><image class="sysIcon_b09" src='../images/sysIcon_b09.png' /></view>
+      </view>
+    </view>
+    <view wx:if="{{Result.ENG.Book}}" class="panelRemark panelRemark_1 FlexColumn">
+      <view class="panelRemark1 FlexRow" wx:for="{{Result.ENG.Book}}" wx:key="*this" bind:tap="goto" data-url="{{item.Url}}">
+        <view class="panelRemark11">{{item.Name}}</view>
+        <image class="sysIcon_a08" src='../images/sysIcon_a08.png' />
+      </view>
+      <view style="height: 10rpx;"></view>
+    </view>
   </block>
 
   <!-- 音标 -->
@@ -514,9 +538,9 @@
   <block wx:if="{{Result.ENG.ParaphraseEng && Result.ENG.ParaphraseEng.length>0}}">
     <view class="panelTitle FlexColumn">
       <view class="panelTitle1 FlexRow">
-        <view class="panelTitle11">英英翻译</view>
+        <view class="panelTitle11">英英解释</view>
       </view>
-      <view class="panelTitle2" wx:if="{{Result.CHN}}">翻译结果来自网络，仅供参考，正确程度自行评估</view>
+      <view class="panelTitle2" wx:if="{{Result.ENG.ParaphraseEng}}">翻译结果来自网络，仅供参考，正确程度自行评估</view>
     </view>
     <view class="panelItem0 FlexRow">
       <block wx:for="{{Result.ENG.ParaphraseEng}}" wx:key="ParaphraseList" wx:if="{{item.ParaphraseList}}">

pages/main/addInfomationDetail.wxss

@@ -121,7 +121,7 @@
 
 .panelItem{
   width:710rpx;
-  height:100rpx;
+  min-height:100rpx;
   border-radius: 10rpx;
   background-color: #fff;
   margin-bottom: 20rpx;
@@ -179,6 +179,7 @@
 
 .panelItemText2{
   max-width:490rpx;
+  margin: 20rpx 0;
 }
 
 .panelItemTextLatex{
@@ -195,13 +196,49 @@
 }
 
 .panelRemark{
-  width: 670rpx;
+  width: 690rpx;
+  align-items: flex-start;
   font-size:24rpx;
   color:#4D4D4D;
-  padding-bottom: 20rpx;
+}
+
+.panelRemark_1{
   border-bottom:1rpx solid #d2d2d2;
 }
 
+.panelRemark1{
+  background: #FFFFFF;
+  border: 3rpx solid #4D4D4D;
+  border-radius: 25rpx;
+  height:50rpx;
+  margin-bottom: 20rpx;
+}
+.panelRemark10{
+  margin-left: 20rpx;
+}
+.panelRemark11{
+  margin-left: 20rpx;
+}
+
+.panelRemark12{
+  margin-left: 20rpx;
+  margin: 0 10rpx;
+  width: 34rpx;
+  height:34rpx;
+  background-color: #4D4D4D;
+  border-radius: 50%;
+}
+
+.sysIcon_a08{
+  width: 16rpx;
+  height:16rpx;
+  margin:0 20rpx 0 10rpx;
+}
+.sysIcon_b09{
+  width: 20rpx;
+  height:20rpx;
+}
+
 .panelRemark2{
   width: 670rpx;
   font-size:24rpx;
@@ -261,6 +298,9 @@
   border-top-right-radius: 0;
 }
 
+.panelItem .textLine {
+  text-decoration: underline;
+}
 
 .panelLine3{
   width:710rpx;

pages/main/detail.js

@@ -1558,6 +1558,7 @@ Page({
     });
     let url="GetMiaoguoCardList2?UserID="+app.globalData.userInfo.UserID+"&IsToday=2&CardType=0&OrderType=ac.LastTime%20desc";
     main.getData(url, function (data) {
+      wx.hideLoading();
       if (data) {
         let list=data.List;
         let words=[];

pages/main/mainlist.js

@@ -1707,7 +1707,7 @@ Page({
       // 找出当前在视口中可见的项
       for(var i = 0; i < list.length; i++) {
         var item = res[i];
-        if(item && item.top < screenHeight-120 && item.bottom > 120) {
+        if(item && item.top < screenHeight-110 && item.bottom > 140) {
           visibleItems.push({
             index: i,
             top: item.top,

pages/main/mainlist.wxml

@@ -149,10 +149,10 @@
     <view class="panelMore" wx:if="{{HasPageDelete && CardType==-2}}" bindtap='gotoNextPageDelete' data-id="{{List[List.length-1].MiaoguoCardID}}">更多</view>
     <view class="panelEnd" wx:if="{{!HasPageDelete && List.length>0 && CardType==-2}}">到底了</view>
     <view class="SelectThisUpCss FlexRow" wx:if="{{IsShowSelectThisUp}}" catch:tap="selectThisFunc" data-selecttype="down">
-      <image src="../images/ArrowUp1.png" class="ArrowUp1"></image>选择到这里
+      <image src="../images/ArrowUp1.png" class="ArrowUp1"></image>连选到这里
     </view>
     <view class="SelectThisUpCss SelectThisDownCss FlexRow" wx:if="{{IsShowSelectThisDown}}" catch:tap="selectThisFunc" data-selecttype="up">
-      <image src="../images/ArrowDown1.png" class="ArrowUp1"></image>选择到这里
+      <image src="../images/ArrowDown1.png" class="ArrowUp1"></image>连选到这里
     </view>
   </view>
 

pages/main/mainlist.wxss

@@ -554,13 +554,13 @@
   width:200rpx;
   height:50rpx;
   font-size: 24rpx;
-  color:#5B677F;
+  color:#4d4d4d;
   border-radius: 30rpx;
   background-color: #fff;
   box-shadow: 0 1rpx 1rpx 1rpx rgba(200,200,200,0.10);
   position: fixed;
   left:10rpx;
-  bottom: 120rpx;
+  bottom: 140rpx;
   z-index: 20;
 }
 

pages/other/grade.js

@@ -6,7 +6,8 @@ const app = getApp();
 Page({
   data: {
     IsIPad:"",
-    AgeList:[{Name:"学龄前",Grade:0},{},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初一",Grade:7},{Name:"初二",Grade:8},{Name:"初三",Grade:9},{},{Name:"高中",Grade:10},{Name:"大学及成人",Grade:100}],
+    AgeList:[{Name:"学龄前",Grade:0},{},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"七年级",Grade:7},{Name:"八年级",Grade:8},{Name:"九年级",Grade:9},{Name:"高中",Grade:10},{Name:"大学及成人",Grade:100}],
+    UpperAndLowerSemesters:[{ID:0,Name:"上学期"},{ID:1,Name:"下学期"}],
   },
   onLoad: function (options) {
     this.setData({
@@ -16,8 +17,9 @@ Page({
   setGrade:function(e){
     var that=this;
     var grade=e.currentTarget.dataset.grade;
-    console.log(grade);
-    var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade;
+    var ul=e.currentTarget.dataset.ul;
+    //console.log(grade);
+    var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade+'&UpperAndLowerSemesters='+ul;
     main.getData(url, function (data) {
       setTimeout(function(){
         wx.navigateBack({

pages/other/grade.wxml

@@ -7,9 +7,15 @@
   <text class="textGrade{{IsIPad}}">请选择孩子的年级</text>
   <text class="textGrade2">以后可在设置中修改。暑假建议选下一年级。</text>
   <view class="panelGrade FlexRow">
-  <block wx:for="{{AgeList}}" wx:key="*this">
-    <view wx:if="{{item.Name}}" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
-    <view wx:if="{{!item.Name}}" class="btnGrade2" ></view>
-  </block>
+    <block wx:for="{{AgeList}}" wx:key="index">
+      <block wx:if="{{index>1 && index<=10}}" wx:for="{{UpperAndLowerSemesters}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">
+        <view wx:if="{{item.Name}}" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}" data-ul="{{itemChild.ID}}">{{item.Name}} {{itemChild.Name}}</view>
+      </block>
+      <block wx:if="{{index<=1 || index>10}}">
+        <view wx:if="{{item.Name}}" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}" data-ul="0">{{item.Name}}</view>
+        <view wx:if="{{!item.Name}}" class="btnGrade2" ></view>
+      </block>
+    </block>
   </view>
+  <view style="height:100rpx;"></view>
 </view>

pages/other/grade.wxss

@@ -1,13 +1,13 @@
 .container {
   background-color: #0B8457;
-  position: fixed;
+  position: absolute;
   top:120rpx;
   color:#fff;
 }
 
 .container_iPad {
   background-color: #0B8457;
-  position: fixed;
+  position: absolute;
   top:0rpx;
   color:#fff;
 }
@@ -42,7 +42,6 @@
   margin-top: 10rpx;
   text-align: center;
   font-size: 28rpx;
-  color: #48FFBB;
 }
 
 .textGrade_iPad{

pages/other/userbook.js

@@ -117,8 +117,6 @@ Page({
         EarlyBirdTimeEnd: earlyBirdTimeEnd,
         ClassDayNumber: ClassDayNumber,
       });
-
-      debugger;
       //试用
       if (app.globalData.userInfo.IsTryOut == 1 && app.globalData.userInfo.IsMember == 0){
         panelShow = 2;