Merge branch 'dev/v4.8.30_zxl' of qmx/jy into feature/v4.8.30

src/jfw/front/shorturl.go

@@ -16,6 +16,7 @@ import (
 	"app.yhyue.com/moapp/jypkg/public"
 
 	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/date"
 
 	. "app.yhyue.com/moapp/jybase/mongodb"
 
@@ -212,6 +213,9 @@ func (s *Short) Article(stype, id string) error {
 						obj["entIds"] = winnerIdArr
 					}
 				}
+				if obj["publishtime"] != nil {
+					obj["publishtimeShorDate"] = time.Unix(util.Int64All(obj["publishtime"]), 0).Format(date.Date_Short_Layout)
+				}
 				s.T["url"] = s.Uri()
 				s.T["obj"] = obj
 
@@ -526,9 +530,10 @@ func (s *Short) Article(stype, id string) error {
 				}
 			} else {
 				obj = map[string]interface{}{
-					"title":   obj["title"],
-					"_id":     obj["_id"],
-					"subtype": obj["subtype"],
+					"title":    obj["title"],
+					"_id":      obj["_id"],
+					"subtype":  obj["subtype"],
+					"stypeadd": obj["stypeadd"],
 				}
 			}
 
@@ -537,6 +542,7 @@ func (s *Short) Article(stype, id string) error {
 			if ssOpenid != nil {
 				obj["ucbsId"] = encrypt.EncodeArticleId2ByCheck("ucbs#" + ssOpenid.(string) + "#" + id)
 			}
+
 			s.T["obj"] = obj
 			s.T["url"] = s.Uri()
 			return s.Render("/pc/biddetail_rec.html", &s.T)
@@ -1008,6 +1014,9 @@ func (s *Short) NologinArticle(stype, id string) error {
 				obj = Filter(obj)
 				obj["description"] = fmt.Sprintf("%s，%s。", obj["title"], baseInfo(obj))
 			}
+			if obj["publishtime"] != nil {
+				obj["publishtimeShorDate"] = time.Unix(util.Int64All(obj["publishtime"]), 0).Format(date.Date_Short_Layout)
+			}
 			s.T["obj"] = obj
 			s.T["url"] = s.Uri()
 			s.T["newBidInfoList"] = tg.GetNewBidInfo()

src/jfw/modules/app/src/app/front/shorturl.go

@@ -322,7 +322,9 @@ func NoLoginArticle(stype, sid string) map[string]interface{} {
 			obj["buyerperson"] = ""
 			obj["buyertel"] = ""
 		}
-
+		if obj["l_publishtime"] != nil {
+			obj["publishtimeShorDate"] = time.Unix(util.Int64All(obj["publishtime"]), 0).Format(date.Date_Short_Layout)
+		}
 		obj["winnerTitle"] = obj["winner"]
 		obj["buyerTitle"] = obj["buyer"]
 		obj["projectnameTitle"] = obj["projectname"]

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -576,12 +576,9 @@
                             </div>
                         </div>
                         <script>
-                            var l_publishtime = {{.T.obj.l_publishtime}};
+                            var l_publishtime = {{.T.obj.publishtimeShorDate}};
                             if(l_publishtime != "" && l_publishtime!=null){
-                                var tdf = new Date(parseInt(l_publishtime*1000)).pattern('yyyy-MM-dd');
-                                if(tdf != null){
-                                    document.write("<span class='timebefore'>"+tdf+"</span>");
-                                }
+                                    document.write("<span class='timebefore'>"+l_publishtime+"</span>");
                             }
                         </script>
                     </div>

src/web/staticres/public-pc/js/article-content.js

@@ -1127,7 +1127,7 @@ $(function(){
   $(".otherinfo .com-time").each(function(){
     var thisValue = $(this).attr("data-value");
     if(thisValue != "" && thisValue != "0" && thisValue != 0){
-      var diff = new Date(parseInt(l_publishtime*1000)).pattern('yyyy-MM-dd');
+      var diff = new Date(parseInt(thisValue*1000)).pattern('yyyy-MM-dd');
       if(diff != null){
         $(this).text(diff);
       }
@@ -1842,7 +1842,7 @@ if (amount!=""){
 }
 //
 if(publishtime != "" && typeof(publishtime) != "undefined"){
-  var diff =new Date(parseInt(publishtime*1000)).pattern('yyyy-MM-dd');
+  var diff =goTemplateData.params.obj.publishtimeShorDate
   if(diff != null){
     $(".com-statusbar").append('<span class="com-time"><i class="glyphicon bofangjilu"></i>'+diff+'</span>');
   }

src/web/staticres/tags/js/no-login-detail.js

@@ -1467,7 +1467,7 @@ if (amount && amount!="" && amount !== '略'){
 }
 //
 if(publishtime != ""){
-  var diff =new Date(parseInt(publishtime*1000)).pattern('yyyy-MM-dd');
+  var diff =goTemplateData.params.obj.publishtimeShorDate
   if(diff != null){
     $(".com-statusbar").append('<span class="com-time"><i class="glyphicon bofangjilu"></i>'+diff+'</span>');
   }