1.0.3

app.js

@@ -1,7 +1,7 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.0",
+    Version: "1.0.3",
     //IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",

pages/main/article.js

@@ -25,6 +25,8 @@ Page({
     IsShowQuestion:false,
     IsShowTranslate:false,
     IsShowSetting:false,
+    IsShowRemind:false,
+    remindAnimation: "", // 翻译弹窗动画类
     CurrentQuestionIndex:0,
     swiperHeight: "526rpx",
     lastTapTime: 0, // 记录上一次点击的时间，用于检测双击
@@ -56,6 +58,9 @@ Page({
       IsShowLightColor:IsShowLightColor,
       IsShowKeyword:IsShowKeyword,
       IsBuildError:false,
+      Level:options.Level,
+      ArticleStyle:options.ArticleStyle,
+      IsBuilding:false,
     });
 
     if (options.ID)
@@ -71,6 +76,9 @@ Page({
         data=data[0];
         that.setData({
           Words:data.Words,
+          Level:data.Level,
+          ArticleStyle:data.ArticleStyle,
+          CreateTime:data.CreateTime,
           ID:id,
         });
         let content=data.JSONString;
@@ -81,7 +89,14 @@ Page({
   init:function(options){
     let that=this;
     let interval=0;
+    //小学初中文章生成时间短
     that.data.CountDown=30;
+    //高中大学文章生成时间长
+    if (that.data.Level>=2){
+      that.setData({
+        CountDown:60,
+      });
+    }
     interval = setInterval(function(){
       that.setData({
         CountDown:--that.data.CountDown,
@@ -96,13 +111,14 @@ Page({
     let words=app.globalData.SelectedWords.join(",");
     main.postData('GenerateArticle?UserID='+app.globalData.userInfo.UserID, {
       Words:words,
-      Level:options.Level,
-      ArticleStyle:options.ArticleStyle
+      Level:that.data.Level,
+      ArticleStyle:that.data.ArticleStyle
     }, function (data) {
       if (data){
         if (data=="-1"){
           that.setData({
             IsBuildError:true,
+            CreateTime:common.formatDateCHS(common.formatTime(new Date()),true),
           });
         }
         else{
@@ -142,9 +158,8 @@ Page({
         });
       }
     }
-
-    
     content.ArticleEnglishArr=[];
+    //debugger;
     for(let i=0;i<content.ArticleEnglish.length;i++){
       let obj=common.splitByMultipleDelimiters(content.ArticleEnglish[i],["<span class='"+hl+"'>","</span>"]);
       obj=common.removeDuplicateAndTrimStrings(obj);
@@ -204,7 +219,10 @@ Page({
     let that=this;
     const question=e.currentTarget.dataset.question;
     const index=e.currentTarget.dataset.index;
-    that.data.Content.Question[question].UserAnswer=index;
+    if (that.data.Content.Question[question].UserAnswer==index)
+      that.data.Content.Question[question].UserAnswer=-1;
+    else
+      that.data.Content.Question[question].UserAnswer=index;
     that.setData({
       Content:that.data.Content,
     });
@@ -297,6 +315,9 @@ Page({
     let that = this;
     //debugger;
     that.data.Content.Words=that.data.Words;
+    that.data.Content.Level=that.data.Level;
+    that.data.Content.ArticleStyle=that.data.ArticleStyle;
+    that.data.Content.CreateTime=that.data.CreateTime;
     let url = common.Encrypt("GeneratePDF");
     url =app.globalData.serverUrl + url;
     wx.request({
@@ -361,51 +382,59 @@ Page({
     
     if (!this.data.ID){
       wx.navigateBack({
-        delta: 2,
+        delta: 1,
       });
-    } else {
-      wx.navigateBack();
-    }
+    } 
   },
   onLongPress: function(e) {
     let that = this;
     let strType=e.currentTarget.dataset.strtype;
     let selectedIndex=e.currentTarget.dataset.index;
     let selectedIndex2=e.currentTarget.dataset.index2;
-    let content;
+    let engSentence,chnSentence;
     if (strType=="article"){
       //console.log("选中的句子索引:", selectedIndex);
       //console.log("选中的句子:", that.data.Content.ArticleEnglish[selectedIndex]);
-      content=that.data.Content.ArticleEnglish[selectedIndex];
-      content=common.ReplaceAllString(content,"<span class='highlight'>","");
-      content=common.ReplaceAllString(content,"<span class='nonelight'>","");
-      content=common.ReplaceAllString(content,"</span>","");
-      content+="\r\n"+that.data.Content.ArticleChinese[selectedIndex];
+      engSentence=that.data.Content.ArticleEnglish[selectedIndex];
+      engSentence=common.ReplaceAllString(engSentence,"<span class='highlight'>","");
+      engSentence=common.ReplaceAllString(engSentence,"<span class='nonelight'>","");
+      engSentence=common.ReplaceAllString(engSentence,"</span>","");
+      chnSentence=that.data.Content.ArticleChinese[selectedIndex];
     }
     else if (strType=="question"){
-      content=that.data.Content.Question[selectedIndex].QuestionEnglish;
-      content+="\r\n"+that.data.Content.Question[selectedIndex].QuestionChinese;
+      engSentence=that.data.Content.Question[selectedIndex].QuestionEnglish;
+      chnSentence=that.data.Content.Question[selectedIndex].QuestionChinese;
     }
     else if (strType=="option"){
-      content=that.data.Content.Question[selectedIndex].OptionsEnglish[selectedIndex2];
-      content+="\r\n"+that.data.Content.Question[selectedIndex].OptionsChinese[selectedIndex2];
+      engSentence=that.data.Content.Question[selectedIndex].OptionsEnglish[selectedIndex2];
+      chnSentence=that.data.Content.Question[selectedIndex].OptionsChinese[selectedIndex2];
     }
-    wx.showModal({
-      title: '翻译',
-      content: content,
-      showCancel:false,
-      confirmText:"知道了",
-      complete: (res) => {
-        if (res.confirm) {
-          
-        }
-      }
-    })
+    this.setData({
+      EnglishSentence:engSentence,
+      ChineseSentence:chnSentence,
+      remindAnimation: "remind-slide-up", // 添加上滑动画
+      IsShowRemind:true,
+    });
   },
-  onUnload:function(){
-    if (!this.data.ID){
-      wx.navigateBack({
-        delta: 2,
+  showRemind:function(e){
+    let that = this;
+    if (that.data.IsShowRemind) {
+      // 如果当前是显示状态，先播放下滑动画，然后再隐藏
+      that.setData({
+        remindAnimation: "remind-slide-down" // 添加下滑动画
+      });
+      
+      // 等待动画完成后再隐藏弹窗
+      setTimeout(function() {
+        that.setData({
+          IsShowRemind: false
+        });
+      }, 300); // 动画持续时间为0.3秒
+    } else {
+      // 如果当前是隐藏状态，直接显示并播放上滑动画
+      that.setData({
+        IsShowRemind: true,
+        remindAnimation: "remind-slide-up"
       });
     }
   },

pages/main/article.wxml

@@ -4,9 +4,11 @@
   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 wx:if="{{!IsBuilding && !IsBuildError}}" class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view  class="{{ThemeCSS}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexColumn">
     <!-- 完整文章 -->
     <text class="textArticle" wx:if="{{!IsShowTranslate}}" >
@@ -104,6 +106,26 @@
       <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a09.png" class="sysIcon_a03"></image>
     </view>
   </view>
+
+</view>
+
+<!-- 翻译 -->
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind FlexColumn {{remindAnimation}}">
+    <image src="../images/sysIcon_b17.png" class="sysIcon_b10"></image>
+      
+    <view class="panelRemind1 FlexRow">
+      <image src="../images/sysIcon_b18.png" class="sysIcon_b09"></image>
+      <view>中英对照</view>
+    </view>
+    <view class="panelRemind2 FlexColumn">
+      <view class="textRemind FlexColumn">
+        <text>{{EnglishSentence}}</text>
+        <text class="textRemind2">{{ChineseSentence}}</text>
+      </view>
+      <view class="btnReind1 FlexColumn" catch:tap="showRemind">关闭</view>
+    </view>
+  </view>
 </view>
 
 <!-- 显示第一次打开帮助 -->
@@ -111,39 +133,42 @@
   <view class="panelHelp1">
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
     <view class="panelHelp2 FlexColumn">
-      <text class="text07">在这里看文章\n点下面做题目，右下角还有PDF</text>
+      <text class="text07">长按句子单独翻译，\n点下面做题目，右下角还有PDF</text>
       <view class="btn3 FlexColumn" bind:tap="closeHelp">知道了</view>
     </view>
   </view>
 </view>
+</block>
+
+<!-- 显示生成出错 -->
+<view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}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>
+    <view class="textError1">抱歉，生成失败</view>
+    <view class="textError2">可能网络不畅或使用了不适合的单词</view>
+  </view>
+</view>
 
 <!-- 显示生成中 -->
-<view wx:if="{{IsBuilding}}" class="panelBuildindParent container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
+<view wx:if="{{IsBuilding}}" class="container panelBuildindParent {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}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>
-<view wx:if="{{IsBuilding}}" class="panelBuilding FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
+<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>
+<view wx:if="{{IsBuilding}}" class="panelBuilding panelBuilding{{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}rpx;'>
   <view class="panelBuilding1 FlexColumn">
     <image src="../images/pic_03.png" class="pic_03"></image>
     <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}}">生成中…差一点，就快好了</text>
-      <text class="text09">请眨眨眼，揉揉四白穴、睛明穴、攒竹穴</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>
     </view>
     <view class="panelBuilding12 FlexColumn">
       <text class="text10">Vocabulary:</text>
       <text class="text11">{{WordsStr}}</text>
     </view>
   </view>
-</view>
-
-<!-- 显示生成出错 -->
-<view wx:if="{{IsBuildError}}" class="container {{ThemeCSS}} FlexColumn" style='min-height:{{Containnerheight+140}}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>
-    <view class="textError1">抱歉，生成失败</view>
-    <view class="textError2">可能网络不畅或使用了不适合的单词</view>
-  </view>
 </view>

pages/main/article.wxss

@@ -208,89 +208,6 @@
   margin-top: 10rpx;
 }
 
-
-.panelBuildindParent{
-  z-index: 50;
-}
-
-.pic_08{
-  width: 100%;
-  position: fixed;
-  top:200rpx;
-  z-index: 50;
-}
-
-.panelBuilding{
-  z-index: 20;
-  position: fixed;
-  top:0;
-  width:100%;
-  justify-content: flex-start;
-  font-weight: 700;
-  z-index: 50;
-}
-
-.DarkColor .panelBuilding{
-  background-image: linear-gradient(180deg, rgba(0,68,51,0.70) 0%, rgba(0,20,15,0.60) 100%);
-}
-.LightColor .panelBuilding{
-  background-image: linear-gradient(180deg, rgba(208,236,211,0.50) 0%, rgba(159,180,161,0.70) 100%);
-}
-
-.panelBuilding1{
-  width: 100%;
-  position: fixed;
-  top:345rpx;
-}
-
-.pic_03{
-  width:100%;
-  height:880rpx;
-  position: absolute;
-  top:0;
-}
-.sysIcon_b08{
-  width:220rpx;
-  height:220rpx;
-  position: absolute;
-  top:337rpx;
-  z-index: 25;
-}
-
-.panelBuilding11{
-  position: absolute;
-  top: 190rpx;
-  color: #2E2E2E;
-}
-
-.text08{
-  font-size: 48rpx;
-}
-.text09{
-  font-size: 28rpx;
-  text-align: center;
-  margin-top: 20rpx;
-  font-weight: 400;
-}
-
-.panelBuilding12{
-  position: absolute;
-  top: 610rpx;
-  color: #FDAD94;
-}
-
-.text10{
-  font-size: 24rpx;
-  text-align: center;
-}
-.text11{
-  font-size: 28rpx;
-  text-align: center;
-  margin-top: 10rpx;
-  font-weight: 400;
-  width: 640rpx;
-}
-
 .panelAnswer{
   width:100%;
   position: fixed;
@@ -633,4 +550,194 @@
   position: absolute;
   right: -20rpx !important;
   left: unset !important;
+}
+
+
+.panelMenu{
+  background-color: rgba(26,67,51,0.50);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+/* 翻译 */
+.panelRemindParent{
+  background-color: rgba(26,67,51,0.10);
+  z-index: 20;
+  position: fixed;
+  top:0;
+}
+
+/* 翻译弹窗动画 */
+@keyframes slideUp {
+  from {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+@keyframes slideDown {
+  from {
+    transform: translateY(0);
+    opacity: 1;
+  }
+  to {
+    transform: translateY(100%);
+    opacity: 0;
+  }
+}
+
+.remind-slide-up {
+  animation: slideUp 0.3s ease-out forwards;
+}
+
+.remind-slide-down {
+  animation: slideDown 0.3s ease-out forwards;
+}
+
+.panelRemind{
+  width: 690rpx;
+  margin-bottom: 75rpx;
+  position: fixed;
+  bottom: 0;
+  background: #259D57;
+  box-shadow: 0 20rpx 0 0 #196F3D, 0 50rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 60rpx;
+}
+.sysIcon_b10{
+  width: 360rpx;
+  height:140rpx;
+  position: absolute;
+  right:0;
+  top:-22rpx;
+}
+.panelRemind1{
+  width: 100%;
+  justify-content: flex-start;
+  margin-top: 40rpx;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  z-index: 25rpx;
+}
+.sysIcon_b09{
+  width: 50rpx;
+  height:50rpx;
+  margin: 0 20rpx 0 50rpx ;
+}
+.panelRemind2{
+  width: 650rpx;
+  min-height:220rpx;
+  background: #FFFFFF;
+  color: #2E2E2E;
+  border-radius: 40rpx;
+  margin: 30rpx 0;
+  justify-content: flex-start;
+}
+.textRemind{
+  width:570rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  align-items: flex-start;
+  margin-top: 80rpx;
+}
+.textRemind2{
+  margin-top: 30rpx;
+  font-size: 36rpx;
+  font-weight: 400;
+}
+.btnReind1{
+  width:590rpx;
+  height:90rpx;
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  margin-top: 60rpx;
+  margin-bottom: 40rpx;
+}
+
+/* 生成中 */
+.panelBuildindParent{
+  z-index: 50;
+}
+
+.pic_08{
+  width: 100%;
+  position: fixed;
+  top:200rpx;
+  z-index: 50;
+}
+
+.panelBuilding{
+  z-index: 20;
+  position: fixed;
+  top:0;
+  width:100%;
+  justify-content: flex-start;
+  font-weight: 700;
+  z-index: 50;
+}
+
+.panelBuildingDarkColor{
+  background-image: linear-gradient(180deg, rgba(0,68,51,0.70) 0%, rgba(0,20,15,0.60) 100%);
+}
+.panelBuildingLightColor{
+  background-image: linear-gradient(180deg, rgba(208,236,211,0.50) 0%, rgba(165,221,187,0.50) 100%);
+}
+
+.panelBuilding1{
+  width: 100%;
+  position: fixed;
+  top:345rpx;
+}
+
+.pic_03{
+  width:100%;
+  height:880rpx;
+  position: absolute;
+  top:0;
+}
+.sysIcon_b08{
+  width:220rpx;
+  height:220rpx;
+  position: absolute;
+  top:347rpx;
+  z-index: 25;
+}
+
+.panelBuilding11{
+  position: absolute;
+  top: 170rpx;
+  color: #2E2E2E;
+}
+
+.text08{
+  font-size: 48rpx;
+}
+.text09{
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+  font-weight: 400;
+}
+
+.panelBuilding12{
+  position: absolute;
+  top: 610rpx;
+  color: #FDAD94;
+}
+
+.text10{
+  font-size: 24rpx;
+  text-align: center;
+}
+.text11{
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 10rpx;
+  font-weight: 400;
+  width: 640rpx;
 }

pages/main/index.wxss

@@ -115,7 +115,7 @@
   height:140rpx;
   position: absolute;
   right:0;
-  top:-20rpx;
+  top:-22rpx;
 }
 .panelRemind1{
   width: 100%;

pages/main/myarticles.js

@@ -15,8 +15,12 @@ Page({
     that.getData();
   },
   getData:function(){
+    wx.showLoading({
+      title: '请稍候',
+    });
     let that=this;
     main.getData('GetYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      wx.hideLoading();
       if (data) {
         for(let i=0;i<data.length;i++){
             let item=data[i];

pages/main/myarticles.wxss

@@ -114,7 +114,7 @@
   height:140rpx;
   position: absolute;
   right:0;
-  top:-20rpx;
+  top:-22rpx;
 }
 .panelRemind1{
   width: 100%;

pages/main/ocr.js

@@ -64,6 +64,7 @@ Page({
         const tempFilePath = res.tempFiles[0].tempFilePath
         this.setData({
           imageUrl: tempFilePath,
+          cameraActive: false,
         })
         this.performOCR(tempFilePath)
       },

pages/main/ocr.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn">
   <view class="camera-container" wx:if="{{cameraActive}}">
-    <camera device-position="back" flash="auto" class="camera"></camera>
+    <camera device-position="back" flash="auto" class="camera" wx:if="{{cameraActive}}"></camera>
     <view class="btnCamera FlexColumn" bindtap="takePhoto">
       <image src="../images/sysIcon_b05.png" class="sysIcon_b05"></image>
     </view>

pages/main/selectword.js

@@ -45,32 +45,37 @@ Page({
     });
   },
   selectWord:function(e){
-    if (this.data.Count>=this.data.CountMax){
-      wx.showToast({
-        title: '本次最多'+this.data.CountMax+"个",
-        icon:"none"
-      });
-      return ;
-    }
+    
     let word=e.currentTarget.dataset.word;
     let list=this.data.Words;
-    let count=0;
+    let count=0,index=-1;
     for(let i=0;i<list.length;i++){
         if(word==list[i].Name){
           if (list[i].CSS)
             list[i].CSS="";
           else
             list[i].CSS="Selected";
+          index=i;
         }
         if(list[i].CSS=="Selected"){
           count++;
         }
     }
-    this.setData({
-      Words:list,
-      Count:count,
-      IsShowAlert:false,
-    });
+    //debugger;
+    if (this.data.Count==this.data.CountMax && count>this.data.CountMax){
+      wx.showToast({
+        title: '本次最多'+this.data.CountMax+"个",
+        icon:"none"
+      });
+      list[index].CSS="";
+    }
+    else{
+      this.setData({
+        Words:list,
+        Count:count,
+        IsShowAlert:false,
+      });
+    }
   },
   goto: function (e) {
     let that=this;

pages/main/wordsinput.js

@@ -20,7 +20,7 @@ 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:""}];
   
     const hiddenhelp=wx.getStorageSync('HiddenWordInputFirstOpen');
 

pages/main/wordsinput.wxss

@@ -362,7 +362,7 @@
   height:140rpx;
   position: absolute;
   right:0;
-  top:-20rpx;
+  top:-22rpx;
 }
 .panelRemind1{
   width: 100%;

utils/main.js

@@ -11,6 +11,7 @@ function getData(url, callback) {
   //console.log("加密后的结果为===",url);
   wx.request({
     url: app.globalData.serverUrl + url,
+    timeout:120000,
     success: function (res) {
       if (res.statusCode)
         common.checkError(res.statusCode);
@@ -38,6 +39,7 @@ function postData(url, postData, callback) {
   wx.request({
     url: app.globalData.serverUrl + url,
     method: "POST",
+    timeout:120000,
     data: postData,
     success: function (res) {
       if (res.statusCode)