分支合并

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

@@ -295,13 +295,13 @@ body .loading_ p span {
 }
 
 .toolbar .tool_bottom {
-    height: 20px;
     display: flex;
     margin-top: 13px;
     align-items: center;
     justify-content: space-between;
 }
 
+<<<<<<< HEAD
 .toolbar .refer_stand{
   display: flex;
   justify-content: space-between;
@@ -323,6 +323,20 @@ body .loading_ p span {
   margin-right: 4px;
   width: 24px;
   height: 24px;
+=======
+.toolbar .tool_bottom.new_layout.free_user {
+  justify-content:flex-start;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-top: .32rem;
+}
+
+.toolbar .tool_bottom.new_layout.free_user .collec_star{
+  margin-left: 0;
+}
+.toolbar .tool_bottom.new_layout.free_user .timebefore{
+  margin-top: .24rem;
+>>>>>>> master
 }
 
 .forecast {

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

@@ -2260,7 +2260,7 @@
         if((subtype==='询价' || subtype==="招标") && userId){
             if(title !==''){
                 $('.time_label').addClass('new_layout')
-                $('.tool_bottom').css({'justify-content':'flex-start'})
+                $('.tool_bottom').addClass('new_layout free_user')
                 $('.forecast').css('display','flex')
             }else{
                 $('.time_label').css({'justify-content':'space-between'})

src/jfw/modules/bigmember/src/service/chatShare/obtainDetails.go

@@ -329,6 +329,6 @@ func (this *ChatShareProject) ProposedConstruction() (res []ForwardData, err err
 		}
 		res = append(res, ForwardData{Label: constructionKeys[v], Value: qutil.InterfaceToStr(qutil.If(qutil.InterfaceToStr((*data)[0][v]) == "", "--", (*data)[0][v]))})
 	}
-	res = append(res, ForwardData{Label: constructionKeys["referer"], Value: fmt.Sprintf("%s/succbi/nzj/app/nzj.app/nzj_detail_1.spg?pid=%s", this.Host(), pid)})
+	res = append(res, ForwardData{Label: constructionKeys["referer"], Value: fmt.Sprintf("https://%s/succbi/nzj/app/nzj.app/nzj_detail_1.spg?pid=%s", this.Host(), pid)})
 	return
 }