1.0.6

app.js

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

pages/main/article.js

@@ -118,13 +118,10 @@ Page({
   init:function(options){
     let that=this;
     let interval=0;
-    that.data.CountDown=30;
-    //1.5文章生成时间长
-    if (that.data.AIVersion=="1.5"){
-      that.setData({
-        CountDown:60,
-      });
-    }
+    that.data.CountDown=options.BuildSecond;
+    that.setData({
+      CountDown:that.data.CountDown,
+    });
     interval = setInterval(function(){
       that.setData({
         CountDown:--that.data.CountDown,

pages/main/article.wxml

@@ -19,7 +19,8 @@
       </view>
     </view>
   </view>
-
+  <view style="width: 100%;height:700rpx;" wx:if="{{IsShowQuestion}}"></view>
+  
   <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow">
       <view class="panelFooter11 panelFooter10 FlexColumn" bind:tap="showData" data-name="IsShowTranslate">

pages/main/article.wxss

@@ -1,3 +1,12 @@
+pages .DarkColor{
+  background-color: #004433;
+  color:#C1E1C1;
+}
+pages .LightColor{
+  background-color: #D0ECD3;
+  color:#151815;
+}
+
 .DarkColor{
   background-color: #004433;
   color:#C1E1C1;

pages/main/wordsinput.js

@@ -53,6 +53,7 @@ Page({
   onHide:function(e){
     this.getInputData();
   },
+  
   initWords:function(){
     let that = this;
     app.globalData.SelectedWords=common.removeDuplicateAndTrimStrings(app.globalData.SelectedWords);
@@ -102,40 +103,41 @@ Page({
   },
   initMenu:function(){
     let that = this;
-    let GradeArr=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
-    let grade=wx.getStorageSync('Grade');
-    if (grade && grade>=0 && grade<=3){
-      for(let i=0;i<GradeArr.length;i++){
-        GradeArr[i].CSS="";
-        if (grade==i)
-          GradeArr[i].CSS="Selected";
+    main.getData('GetYJBDCGenerateConfig?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      let GradeArr=data.Level;
+      let grade=wx.getStorageSync('Grade');
+      if (grade && grade>=0 && grade<=3){
+        for(let i=0;i<GradeArr.length;i++){
+          GradeArr[i].CSS="";
+          if (grade==i)
+            GradeArr[i].CSS="Selected";
+        }
       }
-    }
 
-    let ArticleStyleArr=[{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:""}];
-    let ArticleStyle=wx.getStorageSync('ArticleStyle');
-    if (ArticleStyle && ArticleStyle>=0 && ArticleStyle<=12){
-      for(let i=0;i<ArticleStyleArr.length;i++){
-        ArticleStyleArr[i].CSS="";
-        if (ArticleStyle==i)
-          ArticleStyleArr[i].CSS="Selected";
+      let ArticleStyleArr=data.ArticleStyle;
+      let ArticleStyle=wx.getStorageSync('ArticleStyle');
+      if (ArticleStyle && ArticleStyle>=0 && ArticleStyle<=12){
+        for(let i=0;i<ArticleStyleArr.length;i++){
+          ArticleStyleArr[i].CSS="";
+          if (ArticleStyle==i)
+            ArticleStyleArr[i].CSS="Selected";
+        }
       }
-    }
 
-    let AIVersionArr=[{Version:"1.0",Content:"词句丰富，结构简明\n平均30秒生成",CSS:"Selected"},{Version:"1.5",Content:"深度表达，更多要素\n平均60秒生成",CSS:""}];
-    let AIVersion=wx.getStorageSync('AIVersion');
-    if (AIVersion && AIVersion>=0 && AIVersion<=2){
-      for(let i=0;i<AIVersionArr.length;i++){
-        AIVersionArr[i].CSS="";
-        if (AIVersion==i)
-          AIVersionArr[i].CSS="Selected";
+      let AIVersionArr=data.AIVersion;
+      let AIVersion=wx.getStorageSync('AIVersion');
+      if (AIVersion && AIVersion>=0){
+        for(let i=0;i<AIVersionArr.length;i++){
+          AIVersionArr[i].CSS="";
+          if (AIVersion==i)
+            AIVersionArr[i].CSS="Selected";
+        }
       }
-    }
-
-    that.setData({
-      GradeArr:GradeArr,
-      ArticleStyleArr:ArticleStyleArr,
-      AIVersionArr:AIVersionArr,
+      that.setData({
+        GradeArr:GradeArr,
+        ArticleStyleArr:ArticleStyleArr,
+        AIVersionArr:AIVersionArr,
+    });  
     });
   },
   bindKeyInput: function (e) {
@@ -347,14 +349,13 @@ Page({
       arr=this.data.AIVersionArr;
       for(let i=0;i<arr.length;i++){
         if (arr[i].CSS=="Selected"){
-          url+="&AIVersion="+arr[i].Version;
+          url+="&AIVersion="+arr[i].Version+"&BuildSecond="+arr[i].BuildSecond;
           break;
         }
       }
-
       if (wx.getStorageSync("IsShowGuideContainer")){
         wx.navigateTo({
-          url: "article?ID=260&Type=Guide",
+          url: "article?ID=1&Type=Guide",
         });
         return;
       }

pages/main/wordsinput.wxml

@@ -88,12 +88,14 @@
     </view>
     <view class="panelMenu11 FlexColumn">
       <view class="text04 text05">模型</view>
-      <view class="panelMenu111 FlexRow">
-        <view class="btn btn4 btn{{item.CSS}} FlexRow" wx:for="{{AIVersionArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="2" data-index="{{index}}">
-          <view class="btn41">{{item.Version}}</view>
-          <text>{{item.Content}}</text>
+      <scroll-view scroll-x="true" class="panelMenu1110">
+        <view class="panelMenu1111 panelMenu11110 FlexRow" style="width: {{358*(AIVersionArr.length+2)}}rpx;">
+          <view class="btn btn4 btn{{item.CSS}} FlexRow" wx:for="{{AIVersionArr}}" 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>
+      </scroll-view>
     </view>
     <view id="btnBuild" class="btn2 FlexRow" catch:tap="goto" data-url="article">
       <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>

pages/main/wordsinput.wxss

@@ -298,6 +298,9 @@
   justify-content: flex-start;
   align-items: flex-start;
 }
+.panelMenu11110{
+  height:166rpx;
+}
 
 .btn{
   margin: 0 20rpx 20rpx 0;
@@ -320,6 +323,7 @@
   font-size: 36rpx;
 }
 .btn4{
+  width: 332rpx;
   height:126rpx;
   margin: 0 20rpx 0 0;
   font-size: 24rpx;