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

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -880,8 +880,10 @@ var SuperSearch = {
 			}
 		}
 		SuperSearch.reqParam["pageNum"] = parseInt(pgNum);
-		SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
-			scrollArea: $("#supersearchPage .app-layout-content-b"),
+    var isMaxHeight = $(".app-layout-content-b").height()  - $("#v-search-group .van-tabs.van-tabs--line").height()
+    $("#supersearchPage .app-layout-content-b #wrapper").css({height: isMaxHeight, 'overflow-y': 'auto'})
+    SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
+			scrollArea: $("#supersearchPage .app-layout-content-b #wrapper"),
 			loadDownFn: function(me){
 				if(SuperSearch.dropload == null){
 					SuperSearch.dropload = me;
@@ -2437,10 +2439,10 @@ var SuperSearch = {
 	},
 	showToOrder:function(flag){
 		if(flag&&!SuperSearch.dyDiv){
-			$("#wrapper").css("margin-bottom","91px");
+			$("#wrapper").css("padding-bottom","91px");
 			$("#supersearchPage .resbm").removeClass("hidden");
 		}else{
-			$("#wrapper").css("margin-bottom","52px");
+			$("#wrapper").css("padding-bottom","52px");
 			$("#supersearchPage .resbm").addClass("hidden");
 		}
 	},

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

@@ -136,6 +136,9 @@
         background-position: center;
         transition: all 0.2s;
     }
+    .app-layout-content-b {
+        overflow: hidden !important;
+    }
 
 </style>
 <div id="jyKeepComponent">

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

@@ -656,6 +656,16 @@
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
+                            <div v-show="activeTabIndex === 6">
+                                <ul class="ent-search-list-box" id="select-win-list"></ul>
+                                <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
+                                    <input type="search" id="search-win-input" placeholder="输入中标企业名称">
+                                    <div class="padding-icon">
+                                        <span class="j-icon base-icon icon-delete-gray"></span>
+                                    </div>
+                                </form>
+                                <ul class="ent-search-list-box"  id="search-win-list"></ul>
+                            </div>
                         </div>
                         <div class="pop-bottom" v-show="!isWaitBuy && isMoreSelect">
                             <van-button type="default" @click="resetCondition">重置</van-button>
@@ -935,14 +945,14 @@
                     </div>
                 </div>
                 <div class="wait-open-box hidden" data-wait-open="win">
-                    <ul class="ent-search-list-box" id="select-win-list"></ul>
+                    <ul class="ent-search-list-box" id="old-select-win-list"></ul>
                     <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
-                        <input type="search" id="search-win-input" placeholder="输入中标企业名称">
+                        <input type="search" id="old-search-win-input" placeholder="输入中标企业名称">
                         <div class="padding-icon">
                             <span class="j-icon base-icon icon-delete-gray"></span>
                         </div>
                     </form>
-                    <ul class="ent-search-list-box"  id="search-win-list"></ul>
+                    <ul class="ent-search-list-box"  id="old-search-win-list"></ul>
                 </div>
                 <div class="wait-open-box hidden" data-wait-open="buyer">
                     <div class="choose_industry">

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

@@ -10,6 +10,7 @@
     <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/share.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/wxinfocontent.css?v={{Msg "seo" "version"}}1"/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css">
 
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>
@@ -26,6 +27,9 @@
 <div class="loading_" id="loading" style="display: none;">
     <p><span></span></p>
 </div>
+<div id="jyKeepComponent">
+    <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
+</div>
 <div class="share1">
 
     <!-- 复制提示 star -->
@@ -613,6 +617,9 @@
         </div>
     </div>
 </div>
+<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
+<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
+<script src=/common-module/keep-tags/keep-tags-template.js></script>
 <script>
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -1838,6 +1845,38 @@
       {{end}}
     })
 
+    var vKeepComponent = new Vue({
+        delimiters: ['${', '}'],
+        el: '#jyKeepComponent',
+        data: {
+            nowOpenBid: ''
+        },
+        methods: {
+            changeBid (id, type) {
+                this.nowOpenBid = id
+                this.$refs.vKeepComponent.ajaxAddKeep(id, type)
+            },
+            changeKeepStatus (type) {
+                changeCollectStatus(type)
+            }
+        }
+    })
+
+    
+    function changeCollectStatus (f) {
+        var $collButton = $('.collec_star')
+        var $icon = $collButton.children('.icon')
+        var $text = $collButton.children('.icon-text')
+        if (f) {
+            // 收藏
+            $icon.removeClass('weishoucang').addClass('shoucang')
+            $text.text('已收藏')
+        } else {
+            // 取消收藏
+            $icon.removeClass('shoucang').addClass('weishoucang')
+            $text.text('收藏')
+        }
+    }
     getCollectionState()
     function getCollectionState () {
         $.ajax({
@@ -1849,8 +1888,7 @@
             success: function (res) {
                 if (res.error_code === 0 && res.data) {
                     if (res.data.length) {
-                        $('.collec_star').children('.icon').removeClass('weishoucang').addClass('shoucang')
-                        $('.collec_star').children('.icon-text').text('已收藏')
+                        changeCollectStatus(true)
                     }
                 }
             }
@@ -1860,40 +1898,11 @@
         var $this = $(this)
         var $icon = $this.children('.icon')
         var $text = $this.children('.icon-text')
-        // 说明未收藏，点击收藏
-        var data = {
-            baction: '',
-            binfo: [{ bid: id }]
-        }
         var shoucang = $icon.hasClass('weishoucang')
-        if (shoucang) {
-            // 说明未收藏，点击收藏
-            data.baction = 'C'
-        } else {
-            data.baction = 'R'
+        // 说明未收藏，点击收藏
+        if (vKeepComponent) {
+            vKeepComponent.changeBid(id, shoucang)
         }
-        $.ajax({
-            url: '/publicapply/bidcoll/action',
-            type: 'POST',
-            contentType: 'application/json',
-            data: JSON.stringify(data),
-            success: function (res) {
-                if (res.error_code === 0 && res.data) {
-                    if (shoucang) {
-                        $icon.removeClass('weishoucang').addClass('shoucang')
-                        $text.text('已收藏')
-                        webToast("已收藏至“我的-标讯收藏”","middle", 1500);
-                        if (vKeepComponent) {
-                            vKeepComponent.changeBid(attrData.sid, !isStartStatus)
-                        }
-                    } else {
-                        $icon.removeClass('shoucang').addClass('weishoucang')
-                        $text.text('收藏')
-                        webToast("已取消收藏","middle", 1500);
-                    }
-                }
-            }
-        })
     })
 </script>
 {{include "/common/baiducc.html"}}

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

@@ -291,6 +291,7 @@
 
 .v-ent-search-group .jy-diy-pop > .van-overlay {
   position: absolute;
+  z-index: 2020;
 }
 
 .v-ent-search-group .jy-diy-pop > .van-popup {
@@ -299,7 +300,7 @@
   left: 0;
   width: 100%;
   background-color: #fff;
-  z-index: 2;
+  z-index: 2021;
 }
 
 .v-ent-search-group .jy-diy-pop .popup-content {

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

@@ -524,7 +524,7 @@ var vMainSearchComponent = new Vue({
         finished: false
       },
       activeTabIndex: 0,
-      beforeTabIndex: 0,
+      beforeTabIndex: 1,
       entTabs: [
         {
           title: ''
@@ -566,24 +566,24 @@ var vMainSearchComponent = new Vue({
           {
             title: '有联系方式',
             checked: true,
-            key: ''
+            key: 'y'
           },
           {
             title: '无联系方式',
             checked: false,
-            key: '1'
+            key: 'n'
           }
         ],
         9: [
           {
             title: '有联系方式',
             checked: true,
-            key: ''
+            key: 'y'
           },
           {
             title: '无联系方式',
             checked: false,
-            key: '1'
+            key: 'n'
           }
         ]
       },
@@ -597,6 +597,8 @@ var vMainSearchComponent = new Vue({
         industry: '',
         buyerclass: '',
         winner: '',
+        winnertel: '',
+        buyertel: '',
       },
       industryComponentKey: new Date().getTime(),
       dateComponentKey: new Date().getTime(),
@@ -631,7 +633,7 @@ var vMainSearchComponent = new Vue({
     },
     changePower (type, member) {
       this.entTabs[7].disabled = type
-      // this.entTabs[6].hide = !member
+      this.entTabs[6].hide = !member
     },
     getMoreListToStr (key) {
       if (typeof this.conditionMap[key] !== "undefined" && this.conditionMap[key].length) {
@@ -727,6 +729,21 @@ var vMainSearchComponent = new Vue({
           }
           break
         }
+        case 6: {
+          if (type) {
+            tempParams = SuperSearch.filterWin ? SuperSearch.filterWin.select : []
+          } else {
+            SuperSearch.filterWin = {}
+            // 清除中标企业
+            $("#supersearchPage #select-win-list").html('')
+            $("#supersearchPage #search-win-list").html('')
+            $("#supersearchPage #search-win-input").val('')
+          }
+          if (tempParams) {
+            this.conditionStrMap.winner = tempParams.join(',')
+          }
+          break
+        }
         case 7: {
           var tempParams = {}
           if (type) {
@@ -743,6 +760,14 @@ var vMainSearchComponent = new Vue({
           }
           break
         }
+        case 8: {
+          this.conditionStrMap.winnertel = this.getMoreListToStr(8)
+          break
+        }
+        case 9: {
+          this.conditionStrMap.buyertel = this.getMoreListToStr(9)
+          break
+        }
       }
     },
     goUpBuyPage () {
@@ -858,21 +883,21 @@ var vMainSearchComponent = new Vue({
     },
     removeFixedScroll () {
       $("#selLable").show()
-      $(".app-layout-content-b").scrollTop(0)
+      // $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").removeClass('ent-stop-scroll')
       $("#v-search-group .ent-search-list").css({height: 'unset'})
       $("#v-search-group .ent-search-pop").css({height: 'unset'})
     },
     fixedScroll () {
       $("#selLable").hide()
-      $(".app-layout-content-b").scrollTop(0)
+      // $(".app-layout-content-b").scrollTop(0)
       $(".app-layout-content-b").addClass('ent-stop-scroll')
       var isMaxHeight = $(".app-layout-content-b").height()  - $("#v-search-group .van-tabs.van-tabs--line").height()
       $("#v-search-group .ent-search-list").css({height: isMaxHeight})
       $("#v-search-group .ent-search-pop").css({height: isMaxHeight})
     },
     updateScrollTop () {
-      $(".app-layout-content-b").scrollTop(0)
+      // $(".app-layout-content-b").scrollTop(0)
     },
     selectEnt (ent) {
       console.log(ent)
@@ -931,8 +956,7 @@ var vMainSearchComponent = new Vue({
       this.checkNowPower()
       this.showEntSearch = type
       if (type) {
-        this.beforeTabIndex = 1
-        this.activeTabIndex = 1
+        this.activeTabIndex = Number(this.beforeTabIndex)
         this.togglePop(true)
         this.doQueryList()
       }

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

@@ -255,6 +255,7 @@
     height: unset;
     > .van-overlay {
       position: absolute;
+      z-index: 2020;
     }
     > .van-popup {
       position: absolute;
@@ -262,7 +263,7 @@
       left: 0;
       width: 100%;
       background-color: #fff;
-      z-index: 2;
+      z-index: 2021;
     }
     .popup-content {
       max-height: 40vh;

src/web/staticres/js/wxSupersearch.js

@@ -853,9 +853,11 @@ var SuperSearch = {
 			}
 		}
 		SuperSearch.reqParam["pageNum"] = parseInt(pgNum);
-		SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
-			scrollArea: $("#supersearchPage .app-layout-content-b"),
-			loadDownFn: function(me){
+    var isMaxHeight = $(".app-layout-content-b").height()  - $("#v-search-group .van-tabs.van-tabs--line").height()
+    $("#supersearchPage .app-layout-content-b #wrapper").css({height: isMaxHeight, 'overflow-y': 'auto'})
+    SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
+      scrollArea: $("#supersearchPage .app-layout-content-b #wrapper"),
+      loadDownFn: function(me){
 				if(SuperSearch.dropload == null){
 					SuperSearch.dropload = me;
 				}
@@ -2264,11 +2266,11 @@ var SuperSearch = {
 	},
 	showToOrder:function(flag){
 		if(flag){
-			$("#wrapper").css("margin-bottom","91px");
-			$("#supersearchPage .resbm").removeClass("hidden");
+      $("#wrapper").css("padding-bottom","91px");
+      $("#supersearchPage .resbm").removeClass("hidden");
 		}else{
-			$("#wrapper").css("margin-bottom","52px");
-			$("#supersearchPage .resbm").addClass("hidden");
+      $("#wrapper").css("padding-bottom","52px");
+      $("#supersearchPage .resbm").addClass("hidden");
 		}
 	},
 	getHomeList:function(locationCity,nReq){

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

@@ -477,6 +477,10 @@
         .icon-xuanzhong:before {
             content: "\BB";
         }
+        .app-layout-content-b {
+            overflow: hidden !important;
+        }
+
 
     </style>
 </head>

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

@@ -664,6 +664,16 @@
                             </div>
                             <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 4"></area-component>
                             <money-component extra="万元" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 2"></money-component>
+                            <div v-show="activeTabIndex === 6">
+                                <ul class="ent-search-list-box" id="select-win-list"></ul>
+                                <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
+                                    <input type="search" id="search-win-input" placeholder="输入中标企业名称">
+                                    <div class="padding-icon">
+                                        <span class="j-icon base-icon icon-delete-gray"></span>
+                                    </div>
+                                </form>
+                                <ul class="ent-search-list-box"  id="search-win-list"></ul>
+                            </div>
                         </div>
                         <div class="pop-bottom" v-show="!isWaitBuy && isMoreSelect">
                             <van-button type="default" @click="resetCondition">重置</van-button>
@@ -943,14 +953,14 @@
                     </div>
                 </div>
                 <div class="wait-open-box hidden" data-wait-open="win">
-                    <ul class="ent-search-list-box" id="select-win-list"></ul>
+                    <ul class="ent-search-list-box" id="old-select-win-list"></ul>
                     <form data-name="input-clear-box" class="search-win-box" action="javascript:return true">
-                        <input type="search" id="search-win-input" placeholder="输入中标企业名称">
+                        <input type="search" id="old-search-win-input" placeholder="输入中标企业名称">
                         <div class="padding-icon">
                             <span class="j-icon base-icon icon-delete-gray"></span>
                         </div>
                     </form>
-                    <ul class="ent-search-list-box"  id="search-win-list"></ul>
+                    <ul class="ent-search-list-box"  id="old-search-win-list"></ul>
                 </div>
                 <div class="wait-open-box hidden" data-wait-open="buyer">
                     <div class="choose_industry">

src/web/templates/weixin/wxinfocontent_rec.html

@@ -6,6 +6,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/wxcontentinfo.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/vant@2.8.2/lib/index.css">
 <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/weixin.html"}}
 <script src="{{Msg "seo" "cdn"}}/js/n_rem.js"></script>
@@ -589,7 +590,9 @@ pre {
 </style>
 </head>
 <body>
-<!--<div onclick="window.location.href='/supportJy'" style="font-size:15px;background-color: #FFB900;line-height: 50px;z-index: 2000;color: #fff;bottom: 0px;right: 0px;left:0px;position: fixed;"><img src="/images/search/laba.png" style="width: 23px;margin:0px 10px;">好几天没有推送消息了，真相是......</div>-->
+<div id="jyKeepComponent">
+    <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
+</div>
 <!-- 开启推送 -->
 <div class="open" onClick="window.location.href='/front/applysub/index'">
 	<a>一直收不到消息推送？激活一下就好！</a>
@@ -964,10 +967,9 @@ pre {
 		<span class="null-no">否</span>
 	</div>
 </div>
-<!--<script type="text/javascript">
-var ucbs_source="wx_rec",ucbsId="{{.T.obj.ucbsId}}";
-</script>
-<script type="text/javascript" src="/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
+<script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>
+<script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
+<script src=/common-module/keep-tags/keep-tags-template.js></script>
 <script>
 sessionStorage.removeItem("remind"); //开标提醒标识
 var inithgt = 45;//tab高度
@@ -2194,63 +2196,63 @@ function fromwhere(text){
   }
   return ad
 }
-    getCollectionState()
-    function getCollectionState () {
-        $.ajax({
-            url: '/publicapply/bidcoll/isColl',
-            type: 'POST',
-            data: {
-                bids: id
-            },
-            success: function (res) {
-                if (res.error_code === 0 && res.data) {
-                    if (res.data.length) {
-                        $('.collec_star').children('.icon').removeClass('weishoucang').addClass('shoucang')
-                        $('.collec_star').children('.icon-text').text('已收藏')
-                    }
-                }
-            }
-        })
-    }
-    $('.collec_star').on('click', function () {
-        var $this = $(this)
-        var $icon = $this.children('.icon')
-        var $text = $this.children('.icon-text')
-        // 说明未收藏，点击收藏
-        var data = {
-            baction: '',
-            binfo: [{ bid: id }]
-        }
-        var shoucang = $icon.hasClass('weishoucang')
-        if (shoucang) {
-            // 说明未收藏，点击收藏
-            data.baction = 'C'
-        } else {
-            data.baction = 'R'
+var vKeepComponent = new Vue({
+    delimiters: ['${', '}'],
+    el: '#jyKeepComponent',
+    data: {
+        nowOpenBid: ''
+    },
+    methods: {
+        changeBid (id, type) {
+            this.nowOpenBid = id
+            this.$refs.vKeepComponent.ajaxAddKeep(id, type)
+        },
+        changeKeepStatus (type) {
+            changeCollectStatus(type)
         }
-        $.ajax({
-            url: '/publicapply/bidcoll/action',
-            type: 'POST',
-            contentType: 'application/json',
-            data: JSON.stringify(data),
-            success: function (res) {
-                if (res.error_code === 0 && res.data) {
-                    if (shoucang) {
-                        $icon.removeClass('weishoucang').addClass('shoucang')
-                        $text.text('已收藏')
-                        EasyAlert.show("已收藏至“我的-标讯收藏”");
-                        if (vKeepComponent) {
-                            vKeepComponent.changeBid(attrData.sid, !isStartStatus)
-                        }
-                    } else {
-                        $icon.removeClass('shoucang').addClass('weishoucang')
-                        $text.text('收藏')
-                        EasyAlert.show("已取消收藏");
-                    }
+    }
+})
+
+function changeCollectStatus (f) {
+    var $collButton = $('.collec_star')
+    var $icon = $collButton.children('.icon')
+    var $text = $collButton.children('.icon-text')
+    if (f) {
+        // 收藏
+        $icon.removeClass('weishoucang').addClass('shoucang')
+        $text.text('已收藏')
+    } else {
+        // 取消收藏
+        $icon.removeClass('shoucang').addClass('weishoucang')
+        $text.text('收藏')
+    }
+}
+getCollectionState()
+function getCollectionState () {
+    $.ajax({
+        url: '/publicapply/bidcoll/isColl',
+        type: 'POST',
+        data: {
+            bids: id
+        },
+        success: function (res) {
+            if (res.error_code === 0 && res.data) {
+                if (res.data.length) {
+                    changeCollectStatus(true)
                 }
             }
-        })
+        }
     })
+}
+$('.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)
+    }
+})
 </script>
 {{include "/common/baiducc.html"}}
 </body>