Merge branch 'dev4.5' of http://192.168.3.207:8080/qmx/jy into dev4.5

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -547,9 +547,7 @@
                             >
                                 <div class="ent-search-item" v-for="(item, i) in list" :key="i" @click="selectEnt(item)">
                                     <div class="ent-info-top">
-                                        <div class="ent-info-head">
-                                            <span class="ent-info-status" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
-                                        </div>
+                                        <div class="ent-info-head" :style="{'background-color': item.color}">@@item.abbr@@</div>
                                         <div class="ent-info-keep">
                                             <div class="ent-row">
                                                 <div class="ent-name van-ellipsis">@@item.name@@</div>
@@ -564,7 +562,8 @@
                                             <div class="ent-line-box"></div>
                                         </div>
                                     </div>
-                                    <div class="ent-info-bottom">
+                                    <div class="ent-info-bottom ent-row">
+                                        <span class="ent-info-status" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
                                         <div  class="ent-row ent-address">
                                             <div class="van-multi-ellipsis--l2">@@item.address@@</div>
                                             <i class="j-icon base-icon icon-address"></i>

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

@@ -174,8 +174,8 @@
                 }
             </script>
             <div class="toolbar">
-                {{if .T.isVip}}
-                    <!--VIP-->
+                {{if or .T.isVip .T.isEntniche .T.isMember }}
+                    <!--付费用户-->
                     <div class="type_label clearfix">
                         <script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="tag area">'+area+'</span>');}</script>
                         <script>
@@ -260,7 +260,7 @@
                         </div>
                     </div>
                 {{else}}
-                    <!--非VIP-->
+                    <!--非付费用户-->
                     <div class="tool_top">
                         <script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="tag area">'+area+'</span>');}</script>
                         <script>
@@ -1897,7 +1897,6 @@
     $('.collec_star').on('click', function () {
         var $this = $(this)
         var $icon = $this.children('.icon')
-        var $text = $this.children('.icon-text')
         var shoucang = $icon.hasClass('weishoucang')
         // 说明未收藏，点击收藏
         if (vKeepComponent) {

src/web/staticres/common-module/ent-search/ent-search-template.css

@@ -25,36 +25,55 @@
   border: 0.5px solid rgba(0, 0, 0, 0.05);
   box-sizing: border-box;
   border-radius: 0.08rem;
+  font-weight: 500;
+  font-size: 0.48rem;
+  line-height: 0.56rem;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 0.1rem 0 0.2rem;
+  letter-spacing: 0.1rem;
+  color: #fff;
 }
 
-.ent-info-head .ent-info-status.status-1 {
-  background: #FB483D;
-}
-
-.ent-info-head .ent-info-status.status-2 {
-  background: #FF9F40;
-}
-
-.ent-info-head .ent-info-status.status-3 {
-  background: #9B9CA3;
+.ent-info-bottom {
+  display: flex;
+  flex-direction: row;
+  margin-top: 0.24rem;
+  justify-content: space-between;
 }
 
-.ent-info-head .ent-info-status {
-  position: absolute;
-  top: 0.08rem;
-  left: 0.08rem;
-  background: #2ABED1;
+.ent-info-bottom .ent-info-status {
+  background: transparent;
   border-radius: 0.08rem;
   font-family: PingFang SC;
   font-style: normal;
   font-weight: 500;
   font-size: 0.24rem;
   line-height: 0.36rem;
-  color: #FFFFFF;
+  color: #2ABED1;
+  border: 0.01rem solid #2ABED1;
   padding: 0 0.08rem;
   display: inline-block;
 }
 
+.ent-info-bottom .ent-info-status.status-1 {
+  color: #FB483D;
+  border-color: #FB483D;
+}
+
+.ent-info-bottom .ent-info-status.status-1 {
+  color: #FF9F40;
+  border-color: #FF9F40;
+}
+
+.ent-info-bottom .ent-info-status.status-1 {
+  color: #9B9CA3;
+  border-color: #9B9CA3;
+}
+
 .ent-info-top {
   display: flex;
   flex-direction: row;
@@ -110,13 +129,6 @@
   margin-top: 0.2rem;
 }
 
-.ent-info-bottom {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-end;
-  margin-top: 0.24rem;
-}
-
 .ent-line-box {
   margin-top: 0.24rem;
   width: 4.22rem;

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -78,6 +78,7 @@ var vEntSearchComponent = new Vue({
         }
       ],
       statusEnum: ['存续', '吊销', '停业', '撤销'],
+      statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
       list: [],
       conditionMap: {
         1: [
@@ -356,6 +357,8 @@ var vEntSearchComponent = new Vue({
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
               name: v.company_name,
+              abbr: (v.company_abbr || v.company_name).slice(0, 4),
+              color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
               money: v.capital,
               address: v.company_address,

src/web/staticres/common-module/ent-search/ent-search-template.scss

@@ -22,31 +22,50 @@
   border: 0.5px solid rgba(0, 0, 0, 0.05);
   box-sizing: border-box;
   border-radius: 0.08rem;
-}
-.ent-info-head .ent-info-status.status-1 {
-  background: #FB483D;
-}
-.ent-info-head .ent-info-status.status-2 {
-  background: #FF9F40;
-}
-.ent-info-head .ent-info-status.status-3 {
-  background: #9B9CA3;
-}
-.ent-info-head .ent-info-status {
-  position: absolute;
-  top: 0.08rem;
-  left: 0.08rem;
-  background: #2ABED1;
-  border-radius: 0.08rem;
-  font-family: PingFang SC;
-  font-style: normal;
   font-weight: 500;
-  font-size: 0.24rem;
-  line-height: 0.36rem;
-  color: #FFFFFF;
-  padding: 0 0.08rem;
-  display: inline-block;
+  font-size: 0.48rem;
+  line-height: 0.56rem;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 0.1rem 0 0.2rem;
+  letter-spacing: 0.1rem;
+  color: #fff;
+}
+.ent-info-bottom {
+  display: flex;
+  flex-direction: row;
+  margin-top: 0.24rem;
+  justify-content: space-between;
+  .ent-info-status {
+    background: transparent;
+    border-radius: 0.08rem;
+    font-family: PingFang SC;
+    font-style: normal;
+    font-weight: 500;
+    font-size: 0.24rem;
+    line-height: 0.36rem;
+    color: #2ABED1;
+    border: 0.01rem solid #2ABED1;
+    padding: 0 0.08rem;
+    display: inline-block;
+    &.status-1 {
+      color: #FB483D;
+      border-color: #FB483D;
+    }
+    &.status-1 {
+      color: #FF9F40;
+      border-color: #FF9F40;
+    }
+    &.status-1 {
+      color: #9B9CA3;
+      border-color: #9B9CA3;
+    }
+  }
 }
+
 .ent-info-top {
   display: flex;
   flex-direction: row;
@@ -94,12 +113,6 @@
   color: #5F5E64;
   margin-top: 0.2rem;
 }
-.ent-info-bottom {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-end;
-  margin-top: 0.24rem;
-}
 .ent-line-box {
   margin-top: 0.24rem;
   width: 4.22rem;

src/web/templates/weixin/search/tabSearch.html

@@ -555,9 +555,7 @@
                             >
                                 <div class="ent-search-item" v-for="(item, i) in list" :key="i" @click="selectEnt(item)">
                                     <div class="ent-info-top">
-                                        <div class="ent-info-head">
-                                            <span class="ent-info-status" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
-                                        </div>
+                                        <div class="ent-info-head" :style="{'background-color': item.color}">@@item.abbr@@</div>
                                         <div class="ent-info-keep">
                                             <div class="ent-row">
                                                 <div class="ent-name van-ellipsis">@@item.name@@</div>
@@ -572,7 +570,8 @@
                                             <div class="ent-line-box"></div>
                                         </div>
                                     </div>
-                                    <div class="ent-info-bottom">
+                                    <div class="ent-info-bottom ent-row">
+                                        <span class="ent-info-status" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
                                         <div  class="ent-row ent-address">
                                             <div class="van-multi-ellipsis--l2">@@item.address@@</div>
                                             <i class="j-icon base-icon icon-address"></i>

src/web/templates/weixin/wxinfocontent_rec.html

@@ -683,8 +683,8 @@ pre {
           type=""
         }
 
-        {{if .T.isVip}}
-          // VIP用户
+        {{if or .T.isVip .T.isEntniche .T.isMember }}
+          // 付费用户
 				  var buyerclass={{.T.obj.buyerclass}};
           if(buyerclass){
             document.write("<span class='tag buyerclass'>"+ buyerclass+"</span>");
@@ -2247,7 +2247,6 @@ function getCollectionState () {
 $('.collec_star').on('click', function () {
     var $this = $(this)
     var $icon = $this.children('.icon')
-    var $text = $this.children('.icon-text')
     var shoucang = $icon.hasClass('weishoucang')
     if (vKeepComponent) {
         vKeepComponent.changeBid(id, shoucang)