Merge branch 'embed_applications' of gitlab.gongsibao.com:jiangyong/zhichan into embed_applications

embed_applications/app/base/controller/impl/tmquery/tmqueryCtl.js

@@ -33,10 +33,10 @@ class tmqueryCtl extends CtlBase {
        return "";
        return "";
      }
      }
      var date =  new Date(Number(time*1000));
      var date =  new Date(Number(time*1000));
-     var month = date.getMonth();
+     var month = date.getMonth()+4;
      var year = date.getYear();
      var year = date.getYear();
-     if(month>8){
-      month = month-8;
+     if(month>12){
+      month = month-12;
       year = year+1;
       year = year+1;
      }
      }
      var y = 1900+year;
      var y = 1900+year;
@@ -1969,6 +1969,7 @@ class tmqueryCtl extends CtlBase {
         var notice_issue = buck.notice_issue;
         var notice_issue = buck.notice_issue;
         var date = that.convertDate(buck.date);
         var date = that.convertDate(buck.date);
         var enddate = that.convertDate1(buck.date);
         var enddate = that.convertDate1(buck.date);
+        console.log(date+";+++++++++++++++++++++++++"+enddate);
         var sdate = new Date(); 
         var sdate = new Date(); 
           　　 var now = new Date(enddate); 
           　　 var now = new Date(enddate); 
           　　 var days = now.getTime() - sdate.getTime(); 
           　　 var days = now.getTime() - sdate.getTime();