1.0.6

app.js

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

pages/main/article.js

@@ -53,7 +53,7 @@ Page({
         IsShowGuideContainer:true,
         IsShowFirstOpen2:false,
       });
-      main.showGuideContainer(that,"#btnQAndA",-124,-370,"pic_ha07",520,5,-2,-20);
+      main.showGuideContainer(that,"#btnQAndA",-61,-195,"pic_ha07",240,0);
     }
     
     let IsShowKeyword=wx.getStorageSync('IsShowKeyword');
@@ -307,12 +307,6 @@ Page({
     });
     wx.setStorageSync('IsShowLightColor', that.data.IsShowLightColor);
   },
-  closeHelp:function(){
-    this.setData({
-      IsShowFirstOpen2:false,
-    });
-    wx.setStorageSync('IsShowFirstOpen2', 2);
-  },
   selectedAnswer:function(e){
     let that=this;
     const question=e.currentTarget.dataset.question;
@@ -347,7 +341,7 @@ Page({
       });
     }
     else if (name=="IsShowQuestion"){
-      main.showGuideContainer(that,"#panelArticle",75,60,"pic_ha08",391,556);
+      main.showGuideContainer(that,"#panelArticle",38,30,"pic_ha08",196,279);
     }
   },
   setShowKeyword:function(){

pages/main/article.wxml

@@ -128,7 +128,7 @@
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
     <view class="panelHelp2 FlexColumn">
       <text class="text07">长按句子单独翻译，\n点下面做题目，右下角还有PDF</text>
-      <view class="btn3 FlexColumn" bind:tap="closeHelp">知道了</view>
+      <view class="btn3 FlexColumn" catch:tap="setDataBoolean" data-name="IsShowFirstOpen2" data-savedata="2">知道了</view>
     </view>
   </view>
 </view>

pages/main/index.js

@@ -70,7 +70,7 @@ Page({
     that.setData({
       IsShowGuideContainer:true,
     });
-    main.showGuideContainer(that,"#txtWordsInput",0,110,"pic_ha01",396,248,-5);
+    main.showGuideContainer(that,"#txtWordsInput",-5,60,"pic_ha01",196,126);
     wx.setStorageSync('IsShowGuideContainer', true);
   },
   catchTouchMove: main.catchTouchMove,

pages/main/myarticles.js

@@ -7,22 +7,35 @@ const app = getApp();
 Page({
   data: {
     IsShowRemind:false,
+    IsNew:0,
   },
   onLoad: function (options) {
     let that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-    that.getData(app.globalData.userInfo.UserID);
-
     main.checkGenerating();
+    that.getData(app.globalData.userInfo.UserID);
+  },
+  onShow:function(e){
+    let that=this;
+    if (that.data.IsNew){
+      setTimeout(function(){
+        that.getData(app.globalData.userInfo.UserID);
+      },1000);
+    }
   },
   getData:function(userID){
     wx.showLoading({
       title: '请稍候',
     });
     let that=this;
-    main.getData('GetYJBDCArticleList?UserID=' + userID, function (data) {
+    let url='GetYJBDCArticleList?UserID=' + userID;
+    //debugger;
+    if (that.data.IsNew==1)
+      url+="&IsNew=1";
+    console.log(url);
+    main.getData(url, function (data) {
       wx.hideLoading();
       if (data) {
         for(let i=0;i<data.length;i++){
@@ -37,6 +50,16 @@ Page({
   },
   goto: function (e) {
     let that=this;
+    if (e.currentTarget.dataset.readcount===0){
+      that.setData({
+        IsNew:1,
+      });
+    }
+    else{
+      that.setData({
+        IsNew:0,
+      });
+    }
     var url=e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
@@ -64,6 +87,9 @@ Page({
          wx.showToast({
            title: '删除完成',
          });
+         that.setData({
+            IsNew:1,
+         });
          that.getData(app.globalData.userInfo.UserID);
       });
     }

pages/main/myarticles.wxml

@@ -6,9 +6,11 @@
   </view>
   <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="panel10 FlexColumn"  bind:tap="goto" data-url="article?ID={{item.ID}}">
+      <view class="panel13 FlexRow" bind:tap="goto" data-url="article?ID={{item.ID}}" data-readcount="{{item.ReadCount}}">
+        <view class="panel131 FlexRow" wx:if="{{item.ReadCount==0}}">未读</view>
+        <view class="text01" >{{item.CreateTime}}</view>
+      </view>
+      <view class="panel10 FlexColumn"  bind:tap="goto" data-url="article?ID={{item.ID}}" data-readcount="{{item.ReadCount}}">
         <view class="panel11 FlexRow">
           <view class="panelLine"></view>
           <view class="panel111 FlexColumn">

pages/main/myarticles.wxss

@@ -19,11 +19,24 @@
 .panel10{
   width:100%;
 }
-.text01{
+.panel13{
   align-self: start;
+  justify-content: flex-start;
   margin: 30rpx 0 0 30rpx;
+}
+.panel131{
+  width: 88rpx;
+  height:53rpx;
+  background: #C1E1C1;
+  border-radius: 10rpx;
+  color:#004433;
   font-size: 24rpx;
+  margin-right: 20rpx;
 }
+.text01{
+  font-size: 24rpx;
+}
+
 .panel11{
   width: 100%;
   justify-content: flex-start;

pages/main/wordsinput.js

@@ -97,7 +97,7 @@ Page({
       });
       app.globalData.SelectedWords=["cat","dog","meat","fight","","happy","love","study","cry","flower"];
       that.initWords();
-      main.showGuideContainer(that,"#txtWord5",290,-457,"pic_ha02",-50,5,-5,-5);
+      main.showGuideContainer(that,"#txtWord5",134,-238,"pic_ha02",0,2);
     }
   },
   initMenu:function(){
@@ -149,7 +149,7 @@ Page({
       that.setData({
         Words:that.data.Words,
       });
-      main.showGuideContainer(that,"#btnNext",80,-260,"pic_ha03",0,0,-3,-20);
+      main.showGuideContainer(that,"#btnNext",37,-130,"pic_ha03",0,2);
     }
     else if (that.data.IsShowGuideContainer){
       return;
@@ -217,7 +217,7 @@ Page({
 
           if (wx.getStorageSync("IsShowGuideContainer")){
             
-            main.showGuideContainer(that,"#btnLevel1",165,-115,"pic_ha04",270,330,-2,0);
+            main.showGuideContainer(that,"#btnLevel1",75,-70,"pic_ha04",135,167);
           }
         }
       });
@@ -298,7 +298,7 @@ Page({
       });
       wx.setStorageSync('ArticleStyle', index);
       if (wx.getStorageSync("IsShowGuideContainer")){
-        main.showGuideContainer(that,"#btnBuild",38,-247,"pic_ha06",480,0,-5,-17);
+        main.showGuideContainer(that,"#btnBuild",20,-128,"pic_ha06",240,0);
       }
     }
     else if (id==2){
@@ -313,7 +313,7 @@ Page({
       });
       wx.setStorageSync('Grade', index);
       if (wx.getStorageSync("IsShowGuideContainer")){
-        main.showGuideContainer(that,"#btnArticleStyle1",140,-32,"pic_ha05",240,290,-1,-3);
+        main.showGuideContainer(that,"#btnArticleStyle1",75,-12,"pic_ha05",100,145);
       }
     }
     
@@ -354,7 +354,7 @@ Page({
 
       if (wx.getStorageSync("IsShowGuideContainer")){
         wx.navigateTo({
-          url: "article?ID=258&Type=Guide",
+          url: "article?ID=260&Type=Guide",
         });
         return;
       }

pages/templates/guide-container.wxml

@@ -2,12 +2,12 @@
 <!-- 显示引导模板 -->
 <template name="guide-container">
   <view wx:if="{{IsShowGuideContainer}}" class="panelGuideContainer container FlexColumn">
-    <view class="panelGuideContainerTop panelGuideContainer0" style='height:{{panelGuideContainerTop}}rpx;' catchtouchmove="catchTouchMove"></view>
-    <view class="panelGuideContainerLeft panelGuideContainer0" style='top:{{panelGuideContainerTop}}rpx;width:{{panelGuideContainerWidth1}}rpx;height:{{panelGuideContainerHeight1}}rpx;' catchtouchmove="catchTouchMove"></view>
-    <view class="panelGuideContainerRight panelGuideContainer0" style='top:{{panelGuideContainerTop}}rpx;left:{{panelGuideContainerLeft2}}rpx;height:{{panelGuideContainerHeight1}}rpx;' catchtouchmove="catchTouchMove"></view>
-    <view class="panelGuideContainerBottom panelGuideContainer0" style='top:{{panelGuideContainerTop+panelGuideContainerHeight1-1}}rpx;height:{{Containnerheight}}rpx;' catchtouchmove="catchTouchMove"></view>
-    <image class="panelGuideContainerImage {{panelGuideContainerImage}}" style="left:{{panelGuideContainerImageLeft}}rpx;top:{{panelGuideContainerImageTop}}rpx;" src="../images/{{panelGuideContainerImage}}.png" catchtouchmove="catchTouchMove">
-      <view class="panelGuideContainerClose FlexColumn" style="left:{{panelGuideContainerCloseLeft}}rpx;top:{{panelGuideContainerCloseTop}}rpx;" catchtap="closeGuideContainer"></view>
+    <view class="panelGuideContainerTop panelGuideContainer0" style='height:{{panelGuideContainerTop}}px;' catchtouchmove="catchTouchMove"></view>
+    <view class="panelGuideContainerLeft panelGuideContainer0" style='top:{{panelGuideContainerTop}}px;width:{{panelGuideContainerWidth1}}px;height:{{panelGuideContainerHeight1}}px;' catchtouchmove="catchTouchMove"></view>
+    <view class="panelGuideContainerRight panelGuideContainer0" style='top:{{panelGuideContainerTop}}px;left:{{panelGuideContainerLeft2}}px;height:{{panelGuideContainerHeight1}}px;' catchtouchmove="catchTouchMove"></view>
+    <view class="panelGuideContainerBottom panelGuideContainer0" style='top:{{panelGuideContainerTop+panelGuideContainerHeight1}}px;height:{{Containnerheight}}px;' catchtouchmove="catchTouchMove"></view>
+    <image class="panelGuideContainerImage {{panelGuideContainerImage}}" style="left:{{panelGuideContainerImageLeft}}px;top:{{panelGuideContainerImageTop}}px;" src="../images/{{panelGuideContainerImage}}.png" catchtouchmove="catchTouchMove">
+      <view class="panelGuideContainerClose FlexColumn" style="left:{{panelGuideContainerCloseLeft}}px;top:{{panelGuideContainerCloseTop}}px;" catchtap="closeGuideContainer"></view>
     </image>
   </view>
 </template>

utils/main.js

@@ -201,22 +201,18 @@ function showGuideContainer(obj,myClass,imageLeft,imageTop,imageName,closeLeft,c
       console.log("rect.top:"+rect.top);
       console.log("rect.width:"+rect.width);
       console.log("rect.height:"+rect.height);
-      rect.top-=10;
       if (offsetTop)
         rect.top+=offsetTop;
-
-      rect.height+=5;
-
       if (offsetLeft)
         rect.left+=offsetLeft;
         
-      rect.left2=(rect.left+rect.width)-5;
+      rect.left2=(rect.left+rect.width);
 
       obj.setData({
-        panelGuideContainerTop:rect.top*2,
-        panelGuideContainerWidth1:rect.left*2,
-        panelGuideContainerHeight1:rect.height*2,
-        panelGuideContainerLeft2:rect.left2*2,
+        panelGuideContainerTop:rect.top,
+        panelGuideContainerWidth1:rect.left,
+        panelGuideContainerHeight1:rect.height,
+        panelGuideContainerLeft2:rect.left2,
         panelGuideContainerCloseLeft:closeLeft,
         panelGuideContainerCloseTop:closeTop,
         panelGuideContainerImage:imageName,