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

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/j-icons.css

@@ -331,6 +331,14 @@
 .icon-care {
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMdSURBVHgB7ZhNbtNAFMffG4e2qpDwDZplqIQan4CECCRWFScATtDcgPQG7QmanqBLJBBKNqydbtJKbMINsuoHpPOYl5Lijxl/jkMX/m3aWOM3/9947BkboKampqamBAg5aX31O0JAR526QyBcBDkHoJ9SwvjytTdOO7955rtbT6GNwtlX57pFauQW4E633cYBkuwTgJvQdAYohlewOJ51vXmZGtPui0PIQKrA7he/DQ1xxhkgO7PfC/nuxxtvUqaGvJXdy7feLKlRogB3jA0xShkxE3OJ0Od/HIKjojXUQHRXA6HDKND67DedTeFrOp4TyVMEZ0J0N0d0XMK7DoB4idlHOE+NuboSnulKNEw9iM34yBPB8bWQg9mr8PxWDFsjv4kSPqj5+wkSyFCjr2ocBI67KgtPP09XT3sFdr/5HOQk3DMcTnt7A0hBnTswSpSpQfLjtOcNo22FrgCGR0AdoGGWjhnVyUB1Fn+CZAy/qkEgT0Ono/Ne1zYmwHNfTZ128JgEyvRICwYISeQIv2Lz7wNgBQJ1nn+f7kTbxQTwSTg8AY4vu8mPMh0PEgXCMxO1jqjQ4+AxvLntRtvFbmLEsIC6686hIEuJEhD3jdh5+K15FIu0IvfL/H8j1DdmEaDISSAwNu/Wh7MX/BXLBjoBCeFVj/5dwrWDFL4fo9lAI7DVWDYKmjZ5BwprZrkWRVblm0YGAb77lfk41MgRJ82RX2QvUwjeucYWMrUWRXe4y2y6AnJBx9Ga2yRG65BYbrufiRFERt+0FmkFli8VJKMS7aolAuHDc1/tn0xrkfExuiFgoP5E51xlEsbwKsNFb69vOs8owPfCBkpe+SqXSAp/fZ/BSOobWVsF/UXx4orJlSquu7HykBY+rX6md+KqJMqGZzJ/lbAtYSM8k+uzii0JW+GZ3N+FykrYDM/kFmCKStgOzxQSYPJKVBGeKSzAZJWoKjxTSoBJk+B9bVXhmdICTJLEqknwoK3wjBUBJkEihM3wjDUBJk3CdnjGqgBjkqgiPGNdYEVLvRIKwH3gD7lA5xc97whqampqah4bfwB4gRKgFSK1ugAAAABJRU5ErkJggg==);
 }
+/* 上拉加载 */
+.icon-up-allow {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAFPSURBVHgB7ZddSsNAEMdnN+t7j1BPoEeIR/BZBEXMq96g8Qa+BbOEQIvnKJ5Aj+AR+qxk146aKjVxN50RLJ0fLCEf+8+P7AcTAEEQhBWFrVNswIgGJmx1PzHKzLHZajYBJhQwgHLgXb6WnF9enN4AEbJgp9xXOlmSJPhTzi8+Y0ff3kCS3FiwS8675ug9VCdzLsmNBPvksuz8Cc/Ksj7kkhwsGJJr4ZIcJBgrxykZLRiSK4p6bPbMowK1cE4dZ9kJy3BHbdQxX04bjfdHHvxYJ81Vex2f+Vg87QrH7pDHbuZBwbKang0Z1i76JO/s9DrUNyjonU+BIPebZKLhINQvKKi8u10O2zNFbl2yzXt9aYLz0MSELg/7wMTQPLZq5q8QQSoiSGV3BDWo1f7oGniA/4i1sxQb7BIsf3VIX7lFhW8O9pRb5FxgQhaJIAhbyhuCrfgwlEMNCwAAAABJRU5ErkJggg==");
+}
+/* 上拉加载 */
+.icon-address {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKaSURBVHgB7ZhBkhIxFED/T+OMsxJv0OwAF8AJBKa0ypVHgCPMDYAbOCeQOQHDyoUOjSdocIFUubBvIKsplenE/JapckZ+Ot2dZb8qqqvIT3jwk58EgJKSEiMIBah/DLsovLd6lDaC8vVb/mHQnQRcgYKVkvF8+6qzhJzkEkzEPG+kpbqWXSJQcrI570whI5kE/VlYPXvmzTKIPUThVP6OJ9s3nci2i7Vg/UPoi1MRwCGNBYjkL9mzlbQSdCh3j7WkAAu03AzcyRE+nnrvbQJTBZvBeqQfbUhHLwR1nbxArdKCaR43bsKL9DgDVqlFdb3fq8m3150HUvUg9FHBGEEMgGd3i7IW9To7LqBi6AziBLpGOQWTTb89Pta07SXza9i8CSNAMWJGqJ5JGOrnO+AcwAAiDoxy560xpKBr31jXwEv+Q3ShN8AKtoOwqgC7cNQNolsh2W/9mBMBY/04mkaai77+LMgq+POOXxiIammaN49ZUaySV1z7E8M0sioz/yHVZ8gOu7IrcQ5BIZzWPSOIkD3FSgGbQj0H2QHz9JFS11AGXtDjU5K28o52Ae8l1xZX+B/DWKibi/UPYL653ktrthv+oeB/Z5p3m37rOdfXvEgULtmOf/dnK4yxSFujoa+pUcr40tDcbiy+BPTrcAF0fqQYMOzlKlZzMJB63HqxWAVcwT5AW9l0v7+b3+/HSUqfVgao5IVpcVDB/9pv1aCIIB3vhZccGJwjY30mTLmvpBbqZAB9nwDX6L3c5jJlfeRvfFpPUcAAHKBTe6VTO7SJzXRpciGZRY7IfO0sIplVjsh1L84jmUeOyP3PQhbJvHJEob8+bCSLyBGFBAmTZFE5orAgcUzShRzhRJD4V9KVnHNIsrFYT6GkxJ4/YdQTQvZUTqcAAAAASUVORK5CYII=");
+}
 
 /******** img背景图 **********/
 .j-img {

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

@@ -497,6 +497,54 @@
       }
     })
 </script>
+<script>
+  new Vue({
+    el: '#v-ent-ent-search-group',
+    delimiters: ['@@', '@@'],
+    data: {
+      statusEnum: ['存续', '吊销', '停业', '撤销'],
+      list: [
+        {
+          name: '北京剑鱼信息技术有限公司北京剑鱼信息技术有限公司北京剑鱼信息技术有限公司北京剑鱼信息技术有限公司',
+          legal: '贾新',
+          money: '1000万元',
+          address: '北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号',
+          status: 0,
+          checked: false
+        },
+        {
+          name: '北京剑鱼信息技术有限公司',
+          legal: '贾新',
+          money: '1000万元',
+          address: '北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号',
+          status: 1,
+          checked: true
+        },
+        {
+          name: '北京剑鱼信息技术有限公司',
+          legal: '贾新',
+          money: '1000万元',
+          address: '北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号',
+          status: 2,
+          checked: false
+        },
+        {
+          name: '北京剑鱼信息技术有限公司',
+          legal: '贾新',
+          money: '1000万元',
+          address: '北京市朝阳区北四环中路华严北里健翔3号地峻峰华亭嘉园C座2011号',
+          status: 3,
+          checked: false
+        }
+      ]
+    },
+    methods: {
+      selectEnt (ent) {
+        console.log(ent)
+      }
+    }
+  })
+</script>
 <script type="text/javascript">
   var adv_url = "/datareport/page/introduce";
   var adv_img = "/jyapp/images/reportTip.png?v=51430"
@@ -837,7 +885,11 @@
             window.event.returnValue = false;
             //超级搜索
             if(SuperSearch.isMyPage){
-                if (!$(".tabs-box").hasClass('hidden') && $(".tabs-box .tabs-nav .active").index() !== 0) {
+              var isNowIndex = $(".tabs-box .tabs-nav .active").index()
+                if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
+                    if (isNowIndex === 1) {
+
+                    }
                     return
                 }
                 var max=$("#supersearchPage .maxMrice").val(),min=$("#supersearchPage .minMrice").val();

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

@@ -489,6 +489,203 @@
                 <ul class="history-list-box"></ul>
             </div>
             <div class="tabs-content-page">
+                <!---->
+                <style>
+                    #v-ent-ent-search-group {
+                        display: block !important;
+                        background-color: rgba(0, 0, 0, 0.05);
+                    }
+                    #v-ent-ent-search-group .ent-search-item {
+                        margin-top: 8px;
+                        display: flex;
+                        flex-direction: column;
+                        padding: 0.32rem;
+                        background-color: #fff;
+                    }
+                    #v-ent-ent-search-group .ent-search-list {
+                        display: flex;
+                        flex-direction: column;
+                    }
+                    .ent-info-head {
+                        flex-shrink: 0;
+                        position: relative;
+                        width: 1.68rem;
+                        height: 1.68rem;
+                        background: rgba(0, 0, 0, 0.05);
+                        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;
+                    }
+                    .ent-info-top {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: space-between;
+                    }
+                    .ent-row {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: space-between;
+                    }
+                    .ent-search-list .j-icon {
+                        flex-shrink: 0;
+                        width: 0.4rem;
+                        height: 0.4rem;
+                    }
+                    .ent-info-keep .ent-name {
+                        font-family: PingFang SC;
+                        font-style: normal;
+                        font-weight: 500;
+                        font-size: 0.32rem;
+                        line-height: 0.48rem;
+                        color: #171826;
+                        max-width: 4.3rem;
+                    }
+                    .ent-info-keep .fill-icon-box {
+                        padding: 0.12rem;
+                        padding-right: 0;
+                    }
+                    .ent-info-keep {
+                        margin-left: 0.24rem;
+                        flex: 1;
+                    }
+                    .ent-more span {
+                        color: #2ABED1;
+                        margin-top: 0.08rem;
+                    }
+                    .ent-more {
+                        font-family: PingFang SC;
+                        font-style: normal;
+                        font-weight: 500;
+                        font-size: 0.26rem;
+                        line-height: 0.36rem;
+                        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;
+                        height: 0.02rem;
+                        background: rgba(0, 0, 0, 0.05);
+                        border-radius: 0.08rem;
+                    }
+                    .ent-address > div{
+                        font-family: PingFang SC;
+                        font-style: normal;
+                        font-weight: normal;
+                        font-size: 0.22rem;
+                        line-height: 0.32rem;
+                        color: #5F5E64;
+                        max-width: 4.22rem;
+                        margin-right: 0.32rem;
+                    }
+                    .up-button {
+                        margin: 0 auto;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        justify-content: center;
+                        width: 4.98rem;
+                        height: 0.64rem;
+                        border: 1px solid #2ABED1;
+                        box-sizing: border-box;
+                        border-radius: 0.08rem;
+
+                        font-family: PingFang SC;
+                        font-style: normal;
+                        font-weight: 500;
+                        font-size: 0.26rem;
+                        line-height: 0.48rem;
+                        color: #2ABED1;
+
+                    }
+                    .ent-more-tip .j-icon {
+                        margin-right: 0.08rem;
+                    }
+                    .ent-more-tip {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: center;
+                        font-family: PingFang SC;
+                        font-style: normal;
+                        font-weight: 500;
+                        font-size: 0.28rem;
+                        line-height: 0.4rem;
+                        color: #9B9CA3;
+                    }
+
+
+                </style>
+                <div id="v-ent-ent-search-group" v-cloak>
+                    <div class="ent-search-list">
+                        <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-keep">
+                                    <div class="ent-row">
+                                        <div class="ent-name van-ellipsis">@@item.name@@</div>
+                                        <div class="fill-icon-box">
+                                            <i class="j-icon base-icon icon-no-favorite"></i>
+                                        </div>
+                                    </div>
+                                    <div class="ent-more">
+                                        <div>法定代表人: <span>@@item.legal@@</span></div>
+                                        <div>注册资本: <span>@@item.money@@</span></div>
+                                    </div>
+                                    <div class="ent-line-box"></div>
+                                </div>
+                            </div>
+                            <div class="ent-info-bottom">
+                                <div  class="ent-row ent-address">
+                                    <div class="van-multi-ellipsis--l2">@@item.address@@</div>
+                                    <i class="j-icon base-icon icon-address"></i>
+                                </div>
+
+                            </div>
+                        </div>
+
+                        <div class="up-button">升级会员，查看更多搜索结果</div>
+                        <div class="ent-more-tip">
+                            <i class="j-icon base-icon icon-up-allow"></i>
+                            <span>上拉查看更多搜索结果</span>
+                        </div>
+                    </div>
+                </div>
+                <!---->
                 <ul class="ent-search-list-box"  id="search-ent-list"></ul>
                 <div class="del_ent_history">
                     <div class="history-title-box">

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -248,12 +248,12 @@ Vue.component('keep-component', {
         this.ajaxGetAllTags()
       }
     },
-    ajaxFn: function (url, data, callback) {
+    ajaxFn: function (url, data, callback, type) {
       return $.ajax({
         type: 'post',
         url: this.baseAjaxURL + url,
-        contentType: "application/json;charset=utf-8",
-        data: JSON.stringify(data),
+        contentType: type ? 'application/x-www-form-urlencoded' : "application/json;charset=utf-8",
+        data: type ? data : JSON.stringify(data),
         dataType: "json",
         success: typeof callback === 'function' ? callback.bind(this) : new Function()
       })
@@ -344,7 +344,7 @@ Vue.component('keep-component', {
           this.$toast(r.error_msg)
           this.isAddLoading = false
         }
-      })
+      }, true)
     }
   }
 })