1.0.4

app.js

@@ -2,7 +2,7 @@
 App({
   globalData: {
     Version: "1.0.4",
-    IsProduction: true,
+    //IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",
     ShareImage: '../images/pic_07.png',

pages/main/article.js

@@ -56,12 +56,13 @@ Page({
       Containnerheight: main.getWindowHeight(),
       Words:words,
       WordsStr:wordsStr,
+      Level:options.Level,
+      ArticleStyle:options.ArticleStyle,
+      AIVersion:options.AIVersion,
       IsShowFirstOpen:!hiddenhelp,
       IsShowLightColor:IsShowLightColor,
       IsShowKeyword:IsShowKeyword,
       IsBuildError:false,
-      Level:options.Level,
-      ArticleStyle:options.ArticleStyle,
       IsBuilding:false,
     });
 
@@ -70,6 +71,12 @@ Page({
     else  
       that.init(options);
     that.setTheme();
+
+    // //测试
+    // that.setData({
+    //   IsBuilding:true,
+    // });
+    // that.getChoicenessArticle();
   },
   getArticleByID:function(id){
     let that=this;
@@ -91,10 +98,9 @@ Page({
   init:function(options){
     let that=this;
     let interval=0;
-    //小学初中文章生成时间短
     that.data.CountDown=30;
-    //高中大学文章生成时间长
-    if (that.data.Level>=2){
+    //1.5文章生成时间长
+    if (that.data.AIVersion=="1.5"){
       that.setData({
         CountDown:60,
       });
@@ -114,7 +120,8 @@ Page({
     main.postData('GenerateArticle?UserID='+app.globalData.userInfo.UserID, {
       Words:words,
       Level:that.data.Level,
-      ArticleStyle:that.data.ArticleStyle
+      ArticleStyle:that.data.ArticleStyle,
+      AIVersion:that.data.AIVersion
     }, function (data) {
       if (data){
         if (data=="-1"){
@@ -134,6 +141,20 @@ Page({
         clearInterval(interval);
       }
     });
+
+    that.getChoicenessArticle();
+  },
+
+  //得到精选文章
+  getChoicenessArticle:function(){
+    let that=this;
+    main.getData('GetYJBDCArticleList?IsChoiceness=1', function (data) {
+      if (data) {
+        that.setData({
+          ChoicenessList:data,
+        });
+      }
+    });
   },
   
   updateData:function(content){
@@ -373,7 +394,12 @@ Page({
       success: function(res) {
         // 将arraybuffer转为临时文件
         const fsm = wx.getFileSystemManager();
-        const tempFilePath = `${wx.env.USER_DATA_PATH}/temp_${Date.now()}.pdf`;
+        let time=common.formatTime(new Date(),"-");
+        time=common.ReplaceAllString(time,"-","");
+        time=common.ReplaceAllString(time,":","");
+        time=common.ReplaceAllString(time," ","_");
+        time=time.substring(2,time.length-2);        
+        const tempFilePath = `${wx.env.USER_DATA_PATH}/语境背单词_${time}.pdf`;
         
         try {
           fsm.writeFileSync(
@@ -418,12 +444,9 @@ Page({
     });
   },
   // 处理导航栏返回按钮点击事件
-  back: function() {
-    if (this.data.IsBuilding) {
-      return; // 如果正在生成文章，不执行返回操作
-    }
-    
+  onUnload: function() {
     if (!this.data.ID){
+      app.globalData.SelectedWords=[];
       wx.navigateBack({
         delta: 1,
       });
@@ -463,6 +486,13 @@ Page({
       showAnimation: 'remind-slide-down'
     });
   },
+  goto: function (e) {
+    let that=this;
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/article.json

@@ -1,7 +1,4 @@
 {
-  "navigationBarTitleText": "文章",
-  "navigationStyle": "custom",
-  "usingComponents": {
-    "navigation-bar": "/components/navigation-bar/navigation-bar"
-  }
+  "navigationBarTitleText":"文章",
+  "usingComponents": {}
 }

pages/main/article.wxml

@@ -1,11 +1,3 @@
-<navigation-bar
-  title="文章"
-  back="{{!IsBuilding}}"
-  background="{{ThemeCSS === 'DarkColor' ? '#004433' : '#D0ECD3'}}"
-  color="{{ThemeCSS === 'DarkColor' ? '#ffffff' : '#151815'}}"
-  extClass="fixed-nav {{ThemeCSS}}"
-  bind:back="back"
-></navigation-bar>
 <block wx:if="{{!IsBuilding && !IsBuildError}}">
 <!-- 正常文章 -->
 <view  class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
@@ -142,7 +134,7 @@
 </block>
 
 <!-- 显示生成出错 -->
-<view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
+<view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="{{ThemeCSS}} panelError FlexColumn">
     <image  wx:if="{{ThemeCSS=='DarkColor'}}"  src="../images/sysIcon_b14.png" class="sysIcon_b14"></image>
     <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_b15.png" class="sysIcon_b14"></image>
@@ -152,7 +144,7 @@
 </view>
 
 <!-- 显示生成中 -->
-<view wx:if="{{IsBuilding}}" class="container panelBuildindParent {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
+<view wx:if="{{IsBuilding}}" class="container panelBuildindParent {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 </view>
 <image wx:if="{{IsBuilding && ThemeCSS=='DarkColor'}}" src="../images/pic_08.png" mode="widthFix" class="pic_08"></image>
 <image wx:if="{{IsBuilding && ThemeCSS=='LightColor'}}" src="../images/pic_09.png" mode="widthFix" class="pic_08"></image>
@@ -162,14 +154,21 @@
     <image src="../images/sysIcon_b08.gif" class="sysIcon_b08"></image>
     <view class="panelBuilding11 FlexColumn">
       <text class="text08" wx:if="{{CountDown>0}}">生成中…{{CountDown}}秒</text>
-      <text class="text08" wx:if="{{CountDown==0 && (Level=='0' || Level=='1')}}">生成中…差一点，就快好了</text>
-      <text class="text08" wx:if="{{CountDown==0 && (Level=='2' || Level=='3')}}">再等一等，就差一点点了</text>
-      <text class="text09" wx:if="{{Level=='0' || Level=='1'}}">请眨眨眼，揉揉四白穴、睛明穴、攒竹穴</text>
-      <text class="text09" wx:if="{{Level=='2' || Level=='3'}}">高中和大学的文章生成时间比小学和初中更长，\n这是由于单词水平要求更高且内容更为复杂。</text>
+      <text class="text08" wx:if="{{CountDown==0 && AIVersion=='1.0'}}">生成中…差一点，就快好了</text>
+      <text class="text08" wx:if="{{CountDown==0 && AIVersion=='1.5'}}">再等一等，就差一点点了</text>
+      <text class="text09">用1.0生成文章平均30秒，用1.5平均60秒，\n这是由于1.5的单词水平更高、思考更为深入。</text>
     </view>
     <view class="panelBuilding12 FlexColumn">
-      <text class="text10">Vocabulary:</text>
-      <text class="text11">{{WordsStr}}</text>
+      <text class="text10">生成后会通知您，等待时可看看这些范文:</text>
+      <view class="panelBuilding121 FlexRow">
+        <view class="panelBuilding1211 FlexRow" wx:for="{{ChoicenessList}}" wx:key="index" catch:tap="goto" data-url="./article?ID={{item.ID}}">
+          <image src="../images/sysIcon_a17.png" class="sysIcon_a17"></image>
+          <view class="panelBuilding12111 FlexColumn">
+            <view class="panelBuilding1211text">{{item.ArticleTitle}}</view>
+            <view class="panelBuilding1211text2">{{item.LevelStr}} {{item.ArticleStyle}}</view>
+          </view>
+        </view>
+      </view>
     </view>
   </view>
 </view>

pages/main/article.wxss

@@ -28,7 +28,7 @@
 
 .panel1{
   width:670rpx;
-  margin: 180rpx 0 250rpx 0; /* 增加上边距，确保内容不会被导航栏遮挡 */
+  margin: 40rpx 0 250rpx 0; /* 增加上边距，确保内容不会被导航栏遮挡 */
   justify-content: flex-start;
   align-items: flex-start;
 }
@@ -185,7 +185,7 @@
 
 
 .panelError{
-  margin-top: 560rpx;
+  margin-top: 420rpx;
   font-size: 28rpx;
 }
 
@@ -654,53 +654,80 @@
 .panelBuilding1{
   width: 100%;
   position: fixed;
-  top:345rpx;
+  top:160rpx;
 }
 
 .pic_03{
   width:100%;
-  height:880rpx;
+  height:1050rpx;
   position: absolute;
   top:0;
 }
 .sysIcon_b08{
-  width:220rpx;
-  height:220rpx;
+  width:100%;
+  height:150rpx;
   position: absolute;
-  top:347rpx;
+  top: 353rpx;
   z-index: 25;
 }
 
 .panelBuilding11{
   position: absolute;
-  top: 170rpx;
+  top: 150rpx;
+  left:100rpx;
   color: #2E2E2E;
+  align-items: flex-start;
 }
 
 .text08{
   font-size: 48rpx;
 }
 .text09{
-  font-size: 28rpx;
-  text-align: center;
+  font-size: 24rpx;
+  text-align: left;
   margin-top: 20rpx;
   font-weight: 400;
 }
 
 .panelBuilding12{
   position: absolute;
-  top: 610rpx;
+  top: 533rpx;
   color: #FDAD94;
+  align-items: flex-start;
 }
 
 .text10{
+  margin-left: 30rpx;
   font-size: 24rpx;
   text-align: center;
 }
-.text11{
+
+.panelBuilding121{
+  flex-wrap: wrap;
+  margin-top: 30rpx;
+}
+
+.panelBuilding1211{
+  width: 300rpx;
+  min-height: 140rpx;
+  margin: 0 25rpx 20rpx 25rpx;
+  align-items: flex-start;
+}
+.sysIcon_a17{
+  width:30rpx;
+  height:30rpx;
+  margin: 5rpx 20rpx 0 0;
+}
+.panelBuilding12111{
+  align-items: flex-start;
+}
+.panelBuilding1211text{
+  width:250rpx;
   font-size: 28rpx;
-  text-align: center;
-  margin-top: 10rpx;
   font-weight: 400;
-  width: 640rpx;
+}
+.panelBuilding1211text2{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
 }

pages/main/wordsinput.js

@@ -21,7 +21,10 @@ Page({
       grade=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
     let ArticleStyle=wx.getStorageSync('ArticleStyle');
     if (!ArticleStyle)
-      ArticleStyle=[{Name:"随机",CSS:"Selected"},{Name:"童话",CSS:""},{Name:"科幻",CSS:""},{Name:"奇幻",CSS:""},{Name:"旅行",CSS:""},{Name:"动物",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"校园生活",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"成长",CSS:""},{Name:"人生励志",CSS:""},{Name:"环保",CSS:""}];
+      ArticleStyle=[{Name:"随机",CSS:"Selected"},{Name:"童话",CSS:""},{Name:"奇幻",CSS:""},{Name:"动物",CSS:""},{Name:"校园生活",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"成长",CSS:""},{Name:"科幻",CSS:""},{Name:"环保",CSS:""},{Name:"旅行",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"人生励志",CSS:""}];
+    let AIVersion=wx.getStorageSync('AIVersion');
+    if (!AIVersion)
+      AIVersion=[{Version:"1.0",Content:"基础词汇，结构简明\n平均30秒生成",CSS:"Selected"},{Version:"1.5",Content:"词句丰富，深度表达\n平均60秒生成",CSS:""}];
   
     const hiddenhelp=wx.getStorageSync('HiddenWordInputFirstOpen');
 
@@ -29,6 +32,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
       Grade:grade,
       ArticleStyle:ArticleStyle,
+      AIVersion:AIVersion,
       IsShowFirstOpen:!hiddenhelp,
       KeyboardBtnName:"next",
     });
@@ -199,6 +203,9 @@ Page({
     let arr=this.data.Grade;
     if (id==1)
       arr=this.data.ArticleStyle;
+    else if (id==2)
+      arr=this.data.AIVersion;
+      
     for(let i=0;i<arr.length;i++){
       arr[i].CSS="";
       if (i==index)
@@ -210,6 +217,12 @@ Page({
       });
       wx.setStorageSync('ArticleStyle', arr);
     }
+    else if (id==2){
+      this.setData({
+        AIVersion:arr,
+      });
+      wx.setStorageSync('AIVersion', arr);
+    }
     else{
       this.setData({
         Grade:arr,
@@ -244,6 +257,13 @@ Page({
           break;
         }
       }
+      arr=this.data.AIVersion;
+      for(let i=0;i<arr.length;i++){
+        if (arr[i].CSS=="Selected"){
+          url+="&AIVersion="+arr[i].Version;
+          break;
+        }
+      }
     }
 
     

pages/main/wordsinput.wxml

@@ -6,7 +6,7 @@
         <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
         <view>示范</view>
       </view>
-      <view class="panel112 FlexRow" bind:tap="clearInput" data-id="0">清空全部</view>
+      <view class="panel112 FlexRow" bind:tap="clearInput" data-id="0">清空</view>
     </view>
   </view>
   <view class="panel10 FlexRow" wx:if="{{IsShowAlert}}">
@@ -63,15 +63,26 @@
       <view class="text04">要求</view>
     </view>
     <view class="panelMenu11 FlexColumn">
-      <view class="text04 text05">接近哪个年龄段的单词水平</view>
+      <view class="text04 text05">单词水平</view>
       <view class="panelMenu111 FlexRow">
         <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{Grade}}" wx:key="index" capture-bind:tap="selectBtn" data-id="0" data-index="{{index}}">{{item.Name}}</view>
       </view>
     </view>
     <view class="panelMenu11 FlexColumn">
-      <view class="text04 text06">短文主题</view>
+      <view class="text04 text06">主题</view>
+      <scroll-view scroll-x="true" class="panelMenu1110">
+        <view class="panelMenu1111 FlexRow">
+          <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyle}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="panelMenu11 FlexColumn">
+      <view class="text04 text05">模型</view>
       <view class="panelMenu111 FlexRow">
-        <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyle}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
+        <view class="btn btn4 btn{{item.CSS}} FlexRow" wx:for="{{AIVersion}}" wx:key="index" capture-bind:tap="selectBtn" data-id="2" data-index="{{index}}">
+          <view class="btn41">{{item.Version}}</view>
+          <text>{{item.Content}}</text>
+        </view>
       </view>
     </view>
     <view class="btn2 FlexRow" catch:tap="goto" data-url="article">

pages/main/wordsinput.wxss

@@ -21,7 +21,7 @@
   margin-left: 40rpx;
 }
 .panel112{
-  width: 136rpx;
+  width: 88rpx;
   height:73rpx;
   border: 3rpx solid #C1E1C1;
   border-radius: 20rpx;
@@ -226,6 +226,7 @@
   background: #1E1E1E;
   border-radius: 60rpx 60rpx 0 0;
   position: fixed;
+  color:#F0F0F0;
   bottom:0;
   justify-content: flex-start;
 }
@@ -245,12 +246,24 @@
   margin: 20rpx 0 0 40rpx;
 }
 .panelMenu111{
-  width:720rpx;
-  flex-wrap: wrap;
+  width:100%;
   margin: 30rpx 0 0 30rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }
+.panelMenu1110{
+  width:100%;
+  margin: 30rpx 0 -20rpx 0;
+  white-space: nowrap;
+}
+.panelMenu1111{
+  width:1108rpx;
+  height:260rpx;
+  margin-left: 20rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
 
 .btn{
   margin: 0 20rpx 20rpx 0;
@@ -260,15 +273,9 @@
   border: 6rpx solid #303030;
   box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.20);
   border-radius: 20rpx;
-  color:#D2D2D2;
+  color:#C1E1C1;
   font-size: 28rpx;
 }
-.btnSelected{
-  background: #0D4433;
-  border: 6rpx solid #C1E1C1;
-  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.10);
-  color: #C1E1C1;
-}
 
 .btn2{
   width: 650rpx;
@@ -278,6 +285,24 @@
   margin: 60rpx 0;
   font-size: 36rpx;
 }
+.btn4{
+  height:126rpx;
+  margin: 0 10rpx;
+  font-size: 24rpx;
+}
+
+.btnSelected{
+  background: #0D4433;
+  border: 6rpx solid #C1E1C1;
+  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.10);
+  color: #C1E1C1;
+}
+
+.btn41{
+  margin: 0 20rpx 0 0;
+  font-size: 28rpx;
+}
+
 .sysIcon_b01{
   width:40rpx;
   height:40rpx;