Merge branch 'master' into hotfix/v4.8.52.1

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -256,8 +256,12 @@ func (this *UserAccount) CompanyAssociation() {
 		if companyCount <= count*2 && companyCount > 0 {
 			count = companyCount
 		}
+		length, _ := this.GetInteger("len") //P416 电销要求公司名称可以两字联想，剑鱼业务还是三字
+		if length < 2 {
+			length = 3
+		}
 		list := []string{}
-		if len([]rune(name)) > 2 {
+		if len([]rune(name)) >= length {
 			query := fmt.Sprintf(`{"query": {"match_phrase": {"name": "%s"}},"_source": ["name"],"size": %d}`, name, count)
 			r := elastic.Get("qyxy", "qyxy", query)
 			if r != nil {

src/web/staticres/brand/css/brand.css

@@ -1005,6 +1005,7 @@
 }
 
 .contact_us .qr_box {
+    height: 368px;
     width: 100%;
     margin-top: 40px;
     display: flex;
@@ -1015,19 +1016,34 @@
 }
 
 .qr_box .item .tit {
-    width: 88px;
+    width: 100%;
     height: 40px;
     font-style: normal;
     font-weight: 400;
     font-size: 20px;
     line-height: 40px;
-    /* identical to box height, or 200% */
     text-align: center;
     letter-spacing: 0.1em;
-    /* Font/#686868 */
     color: #686868;
-    border-bottom: 4px solid #2CB7CA;
-    margin: auto;
+    border-bottom: 1px solid #ededed;
+    white-space: nowrap;
+    position: relative;
+}
+.qr_box .item img{
+    width: 160px;
+    height:160px;
+}
+.qr_box .item .tit::after{
+    content: '';
+    height: 4px;
+    width:88px;
+    background: #2CB7CA;
+    position: absolute;
+    bottom:-1px;
+    left:calc(50% - 44px);
+}
+.qr_box .item:nth-of-type(1) .tit::after{
+    transform: translateX(0);
 }
 
 .qr_box .name {

src/web/templates/frontRouter/pc/brand/free/index.html

@@ -383,29 +383,22 @@
       <!-- <iframe src="/swordfish/frontPage/brand/free/maps" frameborder="0" style="width:100%;height:100%"  scrolling='no'></iframe> -->
       <img src="{{Msg "seo" "cdn"}}/brand/img/maps.png?v={{Msg "seo" "version"}}" alt="">
     </div>
+    {{$contactList:=(Ad "brand_contact_list" -1 .Host)}}
+    {{if $contactList}}
     <div class="qr_box">
-      <div class="item">
-        <p class="tit">客户服务</p>
-        <p class="name">服务热线</p>
-        <img src="{{Msg "seo" "cdn"}}/brand/img/kefuQR.png?v={{Msg "seo" "version"}}" alt="" class="qr">
-        <p class="phone">400-108-6670</p>
-        <p class="desc">工作日：9:00-17:40</p>
-      </div>
-      <div class="item">
-        <p class="tit">市场合作</p>
-        <p class="name">高经理</p>
-        <img src="{{Msg "seo" "cdn"}}/brand/img/gaoQR.png?v={{Msg "seo" "version"}}" alt="" class="qr">
-        <p class="phone">扫一扫，即刻咨询</p>
-        <p class="desc">jianyu360@topnet.net.cn</p>
-      </div>
-      <div class="item">
-        <p class="tit">品牌合作</p>
-        <p class="name">刘经理</p>
-        <img src="{{Msg "seo" "cdn"}}/brand/img/liuQR.png?v={{Msg "seo" "version"}}" alt="" class="qr">
-        <p class="phone">扫一扫，即刻咨询</p>
-        <p class="desc">jy@topnet.net.cn</p>
-      </div>
+      {{range $contact:=$contactList}}
+        <div class="item">
+          <p class="tit">{{$contact.S_remark}}</p>
+          <p class="name">{{$contact.O_extend.Title}}</p>
+          <img src="{{$contact.S_pic}}" alt="" class="qr">
+          <p class="phone">{{$contact.O_extend.Theme}}</p>
+          <p class="desc">{{$contact.S_link}}</p>
+        </div>
+      {{end}}
     </div>
+    {{end}}
+
+
   </div>
 </div>
 <script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>