0.9.3

app.js

@@ -5,7 +5,7 @@ App({
     //IsProduction: true,
     ShareTitle: "语境背单词",
     SharePath: "pages/index/index",
-    ShareImage: '../images/program_share-a01.png',
+    ShareImage: '../images/pic_07.png',
     ProgramID: 186,
     ProgramName: "语境背单词",
     AppID: "wx80059777521b897c",

pages/main/article.js

@@ -17,7 +17,7 @@ const app = getApp();
 Page({
   data: {
     Words:"",
-    IsShowPanelHelp:true,
+    IsShowFirstOpen:true,
     IsBuilding:false,
     IsShowLightColor:false,
     IsShowKeyword:true,//显示关键词
@@ -31,13 +31,13 @@ Page({
   },
   onLoad: function (options) {
     let that = this;
-    let words=app.globalData.SelectedWords.join(" ");
-    const hiddenhelp=wx.getStorageSync('HiddenArticleHelp');
+    let words=app.globalData.SelectedWords.join(",");
+    const hiddenhelp=wx.getStorageSync('HiddenArticleFirstOpen');
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Words:words, 
-      IsShowPanelHelp:!hiddenhelp,
+      IsShowFirstOpen:!hiddenhelp,
     });
 
     if (options.ID)
@@ -271,9 +271,9 @@ Page({
   },
   closeHelp:function(){
     this.setData({
-      IsShowPanelHelp:false,
+      IsShowFirstOpen:false,
     });
-    wx.setStorageSync('HiddenArticleHelp', true);
+    wx.setStorageSync('HiddenArticleFirstOpen', true);
   },
   selectedAnswer:function(e){
     const that=this;
@@ -353,17 +353,14 @@ Page({
   //访问服务器的GeneratePDF接口，提交this.data.Content数据，获得一个生成好的pdf文件，服务端的代码已经生成好
   generatePDF: function(e) {
     let that = this;
-    this.setData({ 
-      generatingPDF: true,
-    });
-    
+    that.data.Content.Words=that.data.Words.split(" ").join(",");
     let url = common.Encrypt("GeneratePDF");
     url =app.globalData.serverUrl + url;
     wx.request({
       url: url,
       method: "POST",
       data: {
-        Content: that.data.Content
+        Content: that.data.Content,
       },
       responseType: 'arraybuffer',  // 确保响应类型为arraybuffer
       success: function(res) {
@@ -415,9 +412,6 @@ Page({
           title: '网络错误，请稍候重试',
           icon: 'none'
         });
-      },
-      complete: function() {
-        that.setData({ generatingPDF: false });
       }
     });
   },

pages/main/article.wxml

@@ -93,7 +93,7 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowPanelHelp}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowFirstOpen}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHelp1">
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
     <view class="panelHelp2 FlexColumn">

pages/main/myarticles.wxml

@@ -7,17 +7,20 @@
   <block wx:if="{{List.length>0}}">
     <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
       <view class="text01" bind:tap="goto" data-url="article?ID={{item.ID}}">{{item.CreateTime}}</view>
-      <view class="panel11 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}">
-        <view class="panelLine"></view>
-        <view class="panel111 FlexColumn">
-          <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
-          <view class="text03">{{item.ArticleStart}}</view>
+      
+      <view class="panel10 FlexColumn"  bind:tap="goto" data-url="article?ID={{item.ID}}">
+        <view class="panel11 FlexRow">
+          <view class="panelLine"></view>
+          <view class="panel111 FlexColumn">
+            <view class="text02">{{item.LevelStr}} {{item.ArticleStyle}}</view>
+            <view class="text03">{{item.ArticleStart}}</view>
+          </view>
+        </view>
+        <view class="panel12 FlexRow">
+          <text class="text04">{{item.WordsStr}}</text>
         </view>
       </view>
-      <view class="panel12 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}">
-        <text class="text04">{{item.WordsStr}}</text>
-      </view>
-
+      
       <view class="panelBtn FlexRow">
         <view class="btn1" bind:tap="setClipboard" data-words="{{item.Words}}">复用单词</view>
         <image src="../images/sysIcon_a13.png" class="sysIcon_a13"></image>

pages/main/myarticles.wxss

@@ -16,6 +16,9 @@
   color: #C1E1C1;
   position: relative;
 }
+.panel10{
+  width:100%;
+}
 .text01{
   align-self: start;
   margin: 30rpx 0 0 30rpx;

pages/main/ocr.wxss

@@ -54,4 +54,4 @@
   width: 72rpx;
   height: 14rpx;
   background-color: #FFDD88;
-}
+}

pages/main/paste.js

@@ -57,6 +57,11 @@ Page({
       delta: 1
     });
   },
+  showExample:function(){
+    this.setData({
+      IsShowExample:!this.data.IsShowExample,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/paste.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexRow">
     <view class="text01">1行1个单词或词组</view>
-    <view class="panel11 FlexRow">
+    <view class="panel11 FlexRow" bind:tap="showExample">
       <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
       <view>范例</view>
     </view>
@@ -21,4 +21,12 @@
       <view class="panelFooter13 panelFooter10 FlexColumn" bind:tap="submit">确定</view>
     </view>
   </view>
+</view>
+
+
+<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <image src="../images/pic_h02.png" class="pic_h02"></image>
+  <image src="../images/pic_04.png" class="pic_04"></image>
+  <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
 </view>

pages/main/paste.wxss

@@ -92,4 +92,34 @@
 .text02{
   font-size:24rpx;
   margin-top: 17rpx;
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+.panelExampleBtn{
+  width: 100%;
+  height:140rpx;
+  background: #875A4B;
+  font-size: 48rpx;
+  color: #F0F0F0;
+  position: fixed;
+  bottom:0;
+}
+.pic_h02{
+  position: fixed;
+  bottom:176rpx;
+  width: 670rpx;
+  height:760rpx;
+}
+.pic_04{
+  width:100%;
+  height: 170rpx;
+  position: fixed;
+  bottom:140rpx;
 }

pages/main/selectword.js

@@ -10,6 +10,7 @@ Page({
     Count:0,
     CountMax:COUNT_MAX,
     Words:[],
+    IsShowExample:false,
   },
   onLoad: function (options) {
     var that = this;
@@ -88,6 +89,11 @@ Page({
       this.close(2);
     }
   },
+  showExample:function(){
+    this.setData({
+      IsShowExample:!this.data.IsShowExample,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/selectword.wxml

@@ -2,7 +2,7 @@
   <block wx:if="{{Words.length>0}}">
     <view class="panel1 FlexRow">
       <view class="text01">挑选单词1-{{CountMax}}个</view>
-      <view class="panel11 FlexRow">
+      <view class="panel11 FlexRow" bind:tap="showExample">
         <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
         <view>提升识别</view>
       </view>
@@ -49,3 +49,11 @@
     </view>
   </view>
 </view>
+
+
+<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <image src="../images/pic_h03.png" class="pic_h03"></image>
+  <image src="../images/pic_04.png" class="pic_04"></image>
+  <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
+</view>

pages/main/selectword.wxss

@@ -166,4 +166,34 @@
   width:10rpx;
   height:16rpx;
   margin: 0 10rpx;
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+.panelExampleBtn{
+  width: 100%;
+  height:140rpx;
+  background: #875A4B;
+  font-size: 48rpx;
+  color: #F0F0F0;
+  position: fixed;
+  bottom:0;
+}
+.pic_h03{
+  position: fixed;
+  bottom:176rpx;
+  width: 670rpx;
+  height:1258rpx;
+}
+.pic_04{
+  width:100%;
+  height: 170rpx;
+  position: fixed;
+  bottom:140rpx;
 }

pages/main/wordsinput.js

@@ -8,7 +8,8 @@ Page({
     Words:[],
     IsShowAlert:false,
     IsShowSetPanel:false,
-    IsShowPanelHelp:false,
+    IsShowFirstOpen:false,
+    IsShowExample:false,
   },
   onLoad: function (options) {
     var that = this;
@@ -19,13 +20,13 @@ Page({
     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:""}];
   
-    const hiddenhelp=wx.getStorageSync('HiddenWordInputHelp');
+    const hiddenhelp=wx.getStorageSync('HiddenWordInputFirstOpen');
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
       Grade:grade,
       ArticleStyle:ArticleStyle,
-      IsShowPanelHelp:!hiddenhelp,
+      IsShowFirstOpen:!hiddenhelp,
       KeyboardBtnName:"next",
     });
 
@@ -120,6 +121,11 @@ Page({
       IsShowSetPanel:!this.data.IsShowSetPanel,
     });
   },
+  showExample:function(){
+    this.setData({
+      IsShowExample:!this.data.IsShowExample,
+    });
+  },
   keyboardOK:function(e){
     const that=this;
     let id=e.currentTarget.dataset.id;
@@ -141,9 +147,9 @@ Page({
   },
   closeHelp:function(){
     this.setData({
-      IsShowPanelHelp:false,
+      IsShowFirstOpen:false,
     });
-    wx.setStorageSync('HiddenWordInputHelp', true);
+    wx.setStorageSync('HiddenWordInputFirstOpen', true);
   },
   selectBtn:function(e){
     const index=e.currentTarget.dataset.index;

pages/main/wordsinput.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexRow">
     <view class="text01">输入单词5-10个</view>
-    <view class="panel11 FlexRow">
+    <view class="panel11 FlexRow" bind:tap="showExample">
       <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
       <view>范例</view>
     </view>
@@ -40,7 +40,7 @@
   
 </view>
 
-<view wx:if="{{IsShowPanelHelp}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowFirstOpen}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHelp1">
     <image src="../images/sysIcon_b06.png" class="sysIcon_b06"></image>
     <view class="panelHelp2 FlexColumn">
@@ -79,4 +79,11 @@
       </view>
     </view>
   </view>
+</view>
+
+<view wx:if="{{IsShowExample}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <image src="../images/pic_h01.png" class="pic_h01"></image>
+  <image src="../images/pic_04.png" class="pic_04"></image>
+  <view class="panelExampleBtn FlexColumn" catch:tap="showExample">返回</view>
 </view>

pages/main/wordsinput.wxss

@@ -269,4 +269,26 @@
   height:60rpx;
   background: #303030;
   border-radius: 50%;
+}
+
+.panelExampleBtn{
+  width: 100%;
+  height:140rpx;
+  background: #875A4B;
+  font-size: 48rpx;
+  color: #F0F0F0;
+  position: fixed;
+  bottom:0;
+}
+.pic_h01{
+  position: fixed;
+  bottom:176rpx;
+  width: 670rpx;
+  height:950rpx;
+}
+.pic_04{
+  width:100%;
+  height: 170rpx;
+  position: fixed;
+  bottom:140rpx;
 }