2.5.5

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
-    Version: "2.5.2",
-    IsProduction: true,
+    Version: "2.5.5",
+    //IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_share-a01.png',
@@ -10,6 +10,7 @@ App({
     AppID: "wx84b3feac6069eec3",
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
+    serverUrlServer2: "https://scoreline.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/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]",
@@ -82,10 +83,16 @@ App({
       this.globalData.IsAndroid=false;
 
       if (this.globalData.systemInfo.model.indexOf("X") >= 0
-        || this.globalData.systemInfo.model.indexOf("11") >= 0
-        || this.globalData.systemInfo.model.indexOf("12") >= 0
-        || this.globalData.systemInfo.model.indexOf("13") >= 0 
-        || this.globalData.systemInfo.model.indexOf("14") >= 0)
+      || this.globalData.systemInfo.model.indexOf("11") >= 0
+      || this.globalData.systemInfo.model.indexOf("12") >= 0
+      || this.globalData.systemInfo.model.indexOf("13") >= 0 
+      || this.globalData.systemInfo.model.indexOf("14") >= 0 
+      || this.globalData.systemInfo.model.indexOf("15") >= 0 
+      || this.globalData.systemInfo.model.indexOf("16") >= 0
+      || this.globalData.systemInfo.model.indexOf("17") >= 0
+      || this.globalData.systemInfo.model.indexOf("18") >= 0
+      || this.globalData.systemInfo.model.indexOf("19") >= 0 
+      || this.globalData.systemInfo.model.indexOf("20") >= 0)
         this.globalData.IsIPhoneX=true;
     }
 

pages/index/index.js

@@ -178,7 +178,13 @@ Page({
       } 
       else if (options.type == "helpAddInfomation") { 
         wx.setStorageSync('IsHelpAddInfomation', 1);
-      } 
+      }
+      else if (options.type=="buildcard"){
+        this.setData({ 
+          gotoType: "other", 
+          gotoUrl: "../main/cardmain?type="+options.type+"&Words="+options.Words, 
+        }); 
+      }
     }
     this.setData({
       IsRefresh: false,

pages/main/addInfomationDetail.js

@@ -216,6 +216,8 @@ Page({
               item.Content = main.encryptUrl(item.Content);
 
               str = "[图]" + item.Content + "[/图]";
+            } else if (key=="ENG_Word") {
+              str = "[特]" + item.Content + "[/特]";
             } else if (key=="LATEX_LatexName") {
               str = "[特 FS=\"64\"]" + item.Content + "[/特]";
             } else if (key=="LATEX_LatexContent") {

pages/main/cardmain.js

@@ -12,7 +12,7 @@ Page({
     IsShowOrder: false,
     IsIPad: app.globalData.IsIPad,
   },
-  onLoad: function () {
+  onLoad: function (options) {
     var that = this;
 
     var isshow=app.globalData.userInfo.isShow;
@@ -35,6 +35,7 @@ Page({
 
     canPress=true;
 
+    that.buildCardByYJBDC(options);
   },
   onPullDownRefresh: function () {
     var that = this;
@@ -251,6 +252,35 @@ Page({
       url: url,
     });
   },
+  buildCardByYJBDC:function(options){
+    if (options.type=="buildcard"){
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: "#ffffff",
+      });
+  
+      let words=options.Words.split(",");
+      wx.showModal({
+        title: '提醒',
+        content: '侦测到来自「语境背单词」小程序发来的信息，要求为您创建'+words.length+'张单词题卡。确认创建吗？',
+        complete: (res) => {
+          if (res.confirm) {
+            let param={};
+            param.FolderType=2;
+            param.Words=options.Words;
+            main.postData('BuildMiaoguoCardByYJBDC?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
+              wx.showModal({
+                title: '提醒',
+                content: '系统已为您创建'+words.length+'张日常练习的新题卡，它们被存放在名为「语境背单词」的卡单中。可在题卡栏目查阅。',
+                showCancel:false,
+                confirmText:"知道了"
+              });
+            });
+          }
+        }
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.js

@@ -1551,6 +1551,61 @@ Page({
       topBarHeight: h,
     })
   },
+  gotoYJBDC:function(){
+    let that=this;
+    wx.showLoading({
+      title: '请稍候',
+    });
+    let url="GetMiaoguoCardList2?UserID="+app.globalData.userInfo.UserID+"&IsToday=2&CardType=0&OrderType=ac.LastTime%20desc";
+    main.getData(url, function (data) {
+      if (data) {
+        let list=data.List;
+        let words=[];
+        for(let i=0;i<list.length;i++){
+          let str1=main.extractEnglishWords(list[i].Content[1].Content);
+          if (str1){
+            words.push(str1);
+          }
+          else{
+            let str2=main.extractEnglishWords(list[i].Content[2].Content);
+            if (str2){
+              words.push(str2);
+            }
+          }
+        }
+        words = [...new Set(words)];
+        //debugger;
+        if (words.length>0){
+          let content="本次练习中有"+words.length+"张单词题卡，可生成具备真实语境的英语文章，帮您换种方式深化对单词的理解、掌握其用法，进而提升背记效果。该功能需要切换到秒过新产品「语境背单词」小程序中实现。"
+          wx.showModal({
+            title: '语境背单词',
+            content: content,
+            cancelText:"取消",
+            confirmText: "继续",
+            complete: (res) => {
+              if (res.confirm) {
+                var appid="wx80059777521b897c";
+                var path="pages/index/index?SourceID="+app.globalData.ProgramID+"&goto=selectword&Words="+words.join(",");
+                wx.navigateToMiniProgram({
+                  appId: appid,
+                  path: path,
+                });
+              }
+            }
+          })
+        }
+        else{
+          let content="本次练习暂未匹配到符合条件的单词题卡，详情可咨询小组群或客服天乐。该功能能将当日练习过的符合要求的单词题卡生成英语文章，借助真实语境帮您加深理解、提升背记效率。"
+          wx.showModal({
+            title: '语境背单词',
+            content: content,
+            showCancel:true,
+            confirmText: "知道了",
+          })
+        }
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.wxml

@@ -216,6 +216,12 @@
           </view>
         </view>
       </view>
+      <view class="panelLastTime4 FlexRow" catch:tap="gotoYJBDC">
+        <view class="panelLastTime41 FlexRow">
+          <view>语境背单词</view>
+        </view>
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
       <view class="panelLastTime4 FlexRow" catchtap="resetTodayTask" >
         <view class="panelLastTime41 FlexRow">
           <image src="../images/icon_reload_1.png" class='icon_reload_1' />

pages/main/mainlist.js

@@ -1272,9 +1272,13 @@ Page({
       if (list[i].Selected)
         selectedCount++;
     }
+    let isShowSelectThis=false;
+    if (selectedCount>0)
+      isShowSelectThis=true;
     that.setData({
       List:list,
       SelectedCount:selectedCount,
+      IsShowSelectThis:isShowSelectThis,
     });
   },
   showMultipleOther: function (event) {
@@ -1301,16 +1305,18 @@ Page({
     var index=event.currentTarget.dataset.index;
     var mData = constant1.arrMultipleSaveData[index];
 
-    if (index==1 || index>=4){
+    if (index==1 || index==4 || index==5 || index==6 || index==7 || index==8){
       var content=mData.Content.replace("[SelectedCount]",that.data.SelectedCount);
-    
       wx.showModal({
         title: '提醒',
         content: content,
         confirmText:mData.ConfirmText,
         complete: (res) => {
           if (res.confirm) {
-            that.saveMultipleData(mData,that.data.List);
+            if (index<8)
+              that.saveMultipleData(mData,that.data.List);
+            else
+              that.gotoYJBDC(that.data.List);
           }
         }
       });
@@ -1351,7 +1357,10 @@ Page({
           that.saveMultipleData(mData,that.data.List);   
         }
       }
-    }    
+    }
+  },
+  selectThisFunc:function(){
+
   },
   //保存多选数据
   saveMultipleData:function(mData,list){
@@ -1523,7 +1532,32 @@ Page({
       urls: [url] // 需要预览的图片http链接列表
     });
   },
-
+  gotoYJBDC:function(list){
+    //console.log(list);
+    let words=[];
+    for(let i=0;i<list.length;i++){
+      if (list[i].Selected){
+        let str1=main.extractEnglishWords(list[i].Content[1].Content);
+        if (str1){
+          words.push(str1);
+        }
+        else{
+          let str2=main.extractEnglishWords(list[i].Content[2].Content);
+          if (str2){
+            words.push(str2);
+          }
+        }
+      }
+    }
+    //debugger;
+    words = [...new Set(words)];
+    var appid="wx80059777521b897c";
+    var path="pages/index/index?SourceID="+app.globalData.ProgramID+"&goto=selectword&Words="+words.join(",");
+    wx.navigateToMiniProgram({
+      appId: appid,
+      path: path,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/mainlist.wxml

@@ -51,7 +51,7 @@
   </view>
 
   <view class="panelList FlexColumn">
-
+    <!-- 有列表时 -->
     <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
       <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="{{CanScroll}}" data-index="{{index}}">
         <view class="CellHide2" wx:if="{{IsMultipleOptions}}" catchtap="selectedItem" data-id="{{item.MiaoguoCardID}}">
@@ -64,7 +64,6 @@
             </view>
           </view>
         </view>
-        
         <view class='CellItem'>
           <view class="panelListItem FlexColumn" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
             <view class="panelListItem1 FlexRow">
@@ -118,7 +117,6 @@
 
           </view>
         </view>
-
         <view class='{{FolderListCss}} CellHide' wx:if="{{CardType!=-2 && !PrintID}}">
           <view class="CellHide1 FlexRow">
             <view wx:if="{{item.DeleteType==0}}" class="CellHide112 CellHide111 FlexRow" bindtap="DeleteItem" data-id="{{item.MiaoguoCardID}}"><text>删除</text></view>
@@ -139,12 +137,13 @@
             <view class="CellHide111 FlexRow"><text>放回\n原处</text></view>
           </view>
         </view>
-
         <view class="CellHide3" wx:if="{{IsMultipleOptions}}" catchtap="selectedItem" data-id="{{item.MiaoguoCardID}}">
           
         </view>
       </scroll-view>
-
+      <view class="SelectThisCss FlexRow" wx:if="{{IsShowSelectThis}}" catch:tap="selectThisFunc">
+        <image src="../images/ArrowUp1.png" class="ArrowUp1"></image>选择到这里
+      </view>
     </block>
     <view class="panelMore" wx:if="{{HasPage && CardType!=-2}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}"
       data-iscollect="{{IsCollect}}" data-folderid="{{FolderID}}" data-istoday="{{IsToday}}">更多</view>
@@ -384,6 +383,11 @@
       <view class="PanelBorderTop PanelMenuItem FlexRow"
       catchtap="showMultipleNotice" data-index="7"><text>改成新题卡</text></view>
     </view>
+    <view style="height:20rpx;"></view>
+    <view class="PanelMenu FlexColumn">
+      <view class="PanelBorderTop PanelMenuItem FlexRow"
+      catchtap="showMultipleNotice" data-index="8"><text>导到语境背单词</text></view>
+    </view>
   </block>
 
   <block wx:if="{{SelectContainerStyle==2}}">
@@ -431,7 +435,6 @@
   </view>
 </view>
 
-
 <view wx:if="{{IsFolderListContainer}}" class="FolderListContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="panelTopPanel FlexColumn">
     <view class="panelTop FlexRow">

pages/main/mainlist.wxss

@@ -550,6 +550,24 @@
   z-index: 10;
 }
 
+.SelectThisCss{
+  width:200rpx;
+  height:50rpx;
+  font-size: 24rpx;
+  color:#5B677F;
+  border-radius: 30rpx;
+  background-color: #fff;
+  box-shadow: 0 1rpx 1rpx 1rpx rgba(200,200,200,0.10);
+  position: fixed;
+  left:10rpx;
+  bottom: 120rpx;
+}
+.ArrowUp1{
+  width: 14rpx;
+  height:26rpx;
+  margin-right: 20rpx;
+}
+
 /* ************************** */
 .MenuContainer{
   width: 100%;

pages/other/userbook.js

@@ -84,7 +84,7 @@ Page({
       UserID:app.globalData.userInfo.UserID,
       ShowUserID:app.globalData.userInfo.ShowUserID,
     });
-
+    
     that.init();
 
     wx.setNavigationBarColor({
@@ -118,6 +118,7 @@ Page({
         ClassDayNumber: ClassDayNumber,
       });
 
+      debugger;
       //试用
       if (app.globalData.userInfo.IsTryOut == 1 && app.globalData.userInfo.IsMember == 0){
         panelShow = 2;

project.private.config.json

@@ -7,11 +7,11 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages_test/knowledge/index",
-          "pathName": "pages_test/knowledge/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
+          "name": "语境",
+          "pathName": "pages/index/index",
+          "query": "SourceID=173&&type=buildcard&Words=Boy,girl,king,come",
+          "scene": null,
+          "launchMode": "default"
         },
         {
           "name": "分享",

utils/constant.js

@@ -42,6 +42,7 @@ module.exports = {
     {ID:5,Title:"转入日常",Content:"是否将[SelectedCount]张题卡转入日常？",ConfirmText:"转入日常",FinishedText:"转入完成",SaveFun:"UpdateMiaoguoCardWebType",Param:{CardType:"0",ListStr:"List"}},
     {ID:6,Title:"转入紧急",Content:"是否将[SelectedCount]张题卡转入紧急？",ConfirmText:"转入紧急",FinishedText:"转入完成",SaveFun:"UpdateMiaoguoCardWebType",Param:{CardType:"1",ListStr:"List"}},
     {ID:7,Title:"改成新题卡",Content:"是否将[SelectedCount]张题卡改成新题卡？更改后将在保留以往练习记录的情况下以新题卡的状态从头练习。",ConfirmText:"改成新卡",FinishedText:"更改完成",SaveFun:"ResetUserCard",Param:{CardType:0,ListStr:"List"}},
+    {ID:8,Title:"导到语境背单词",Content:"本次选择中有[SelectedCount]张单词题卡，可生成具备真实语境的英语文章，帮您换种方式深化对单词的理解、掌握其用法，进而提升背记效果。该功能需要切换到秒过新产品「语境背单词」小程序中实现。",ConfirmText:"继续"},
   ],
   arrListOrder:[{},
     {

utils/main.js

@@ -1976,6 +1976,37 @@ function showHelpImage() {
   });
 }
 
+//提取英文单词
+function extractEnglishWords(str){
+  let result="";
+  if (str.length>100)
+      result="";
+  else if (str.indexOf("[特")>=0){
+      let str3=str.substring(str.indexOf("[特")+2);
+      str3=str3.substring(str3.indexOf("]")+1,str3.indexOf("[/特]"));
+      result=str3;
+  }
+  else if (str.indexOf("[线]")>=0){
+      let str3=str.substring(str.indexOf("[线]")+3,str.indexOf("[/线]"));
+      result=str3;
+  }
+  else if (str.indexOf("[光]")>=0){
+      let str3=str.substring(str.indexOf("[光]")+3,str.indexOf("[/光]"));
+      result=str3;
+  }
+  else {
+      if (isValidString(str))
+          result=str;
+  }
+  // 去掉前后的空格和换行回车等内容
+  return result.trim();
+
+  function isValidString(str) {
+  // 正则表达式：允许大小写字母(a-zA-Z)、单引号(')、减号(-)和空格(\s)
+    return /^[a-zA-Z'\-\s]+$/.test(str);
+  }
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
@@ -2023,4 +2054,5 @@ module.exports = {
   BuildImage:buildImage,
   ShowHelpImage:showHelpImage,
   getServerSoundErrorArr:getServerSoundErrorArr,
-}
+  extractEnglishWords:extractEnglishWords,
+}