Merge branch 'dev/v4.8.17_tsz2' of qmx/jy into feature/v4.8.17

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -858,6 +858,22 @@ pre {
     align-items: center;
     justify-content: space-between;
 }
+.time_label.new_layout {
+  justify-content:flex-start;
+  flex-direction: column-reverse;
+  align-items: flex-start;
+  margin-top: .32rem;
+}
+.time_label.new_layout .collec_star{
+  margin-left: 0;
+}
+
+.time_label.new_layout .timebefore_vip{
+  margin-top: .24rem;
+}
+.time_label .forward-com {
+  background-size: .32rem .32rem;
+}
 
 .fatNav {
     height: .96rem;

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

@@ -464,26 +464,26 @@
                     <!-- 标签列表 -->
                     <div class="collec_list"></div>
                     <div class="time_label">
-                        <script>
-                            var l_publishtime = {{.T.obj.l_publishtime}};
-                            if(l_publishtime != ""){
-                                var tdf = utils.dateFromNow(Number(l_publishtime+"000"))
-                                if(tdf != null){
-                                    // document.write("<div class='timebefore_vip'><i class='glyphicon bofangjilu'></i>"+tdf+"</div>");
-                                    document.write("<div class='timebefore_vip'>"+tdf+"</div>");
-                                }
-                            }
-                        </script>
-                        <div class="right-container">
-                            <div class="collec_star">
-                                <span class="icon weishoucang"></span>
-                                <span class="icon-text">收藏</span>
-                            </div>
-                            {{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important;display: none">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
-                            <div class="forward-share">
-                              <forwardshare :params="params"></forwardshare>
-                            </div>
-                        </div>
+                      <script>
+                          var l_publishtime = {{.T.obj.l_publishtime}};
+                          if(l_publishtime != ""){
+                              var tdf = utils.dateFromNow(Number(l_publishtime+"000"))
+                              if(tdf != null){
+                                  // document.write("<div class='timebefore_vip'><i class='glyphicon bofangjilu'></i>"+tdf+"</div>");
+                                  document.write("<div class='timebefore_vip'>"+tdf+"</div>");
+                              }
+                          }
+                      </script>
+                      <div class="right-container">
+                          <div class="collec_star">
+                              <span class="icon weishoucang"></span>
+                              <span class="icon-text">收藏</span>
+                          </div>
+                          {{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important;display: none">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
+                          <div class="forward-share">
+                            <forwardshare :params="params"></forwardshare>
+                          </div>
+                      </div>
                     </div>
                 {{else}}
                     <!--非付费用户-->
@@ -2099,7 +2099,7 @@
     function initShowForecast() {
         if((subtype==='询价' || subtype==="招标") && userId){
             if(title !==''){
-                $('.time_label').css({'justify-content':'flex-start'})
+                $('.time_label').addClass('new_layout')
                 $('.tool_bottom').css({'justify-content':'flex-start'})
                 $('.forecast').css('display','flex')
             }else{