feat: 企业搜索新增中标区域

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

@@ -487,6 +487,23 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/money-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js'></script>
 <script>
+    window.jyUserPower = {
+      entniche: false,
+      member: false,
+      vip: 0
+    }
+    $.ajax({
+      url: '/publicapply/bidcoll/power',
+      type: 'POST'
+    }).done(function (r) {
+        if (r && r.error_msg == '' && r.data) {
+          window.jyUserPower = {
+            entniche: r.data.entniche,
+            member: r.data.member,
+            vip: r.data.vip
+          }
+        }
+    })
     var vKeepComponent = new Vue({
       delimiters: ['${', '}'],
       el: '#jyKeepComponent',

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

@@ -524,8 +524,9 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <area-component ref="areaComponent" @select="updateScrollTop" v-if="activeTabIndex === 2"></area-component>
-                                    <money-component ref="moneyComponent"  v-if="activeTabIndex === 3"></money-component>
+                                    <area-component ref="areaComponent" @select="updateScrollTop" v-show="activeTabIndex === 2"></area-component>
+                                    <money-component :radio="false" :tags="moneyTags" ref="moneyComponent"  v-show="activeTabIndex === 3"></money-component>
+                                    <area-component :multiple="false" ref="areaRadioComponent" @select="updateScrollTop" v-show="activeTabIndex === 6"></area-component>
                                 </div>
                                 <div class="pop-bottom" v-show="!isWaitBuy && isMoreSelect">
                                     <van-button type="default" @click="resetCondition">重置</van-button>

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

@@ -450,99 +450,4 @@
   overflow: hidden !important;
 }
 
-.money-component-group {
-  padding: 0 .32rem;
-  min-height: 4rem;
-}
-
-.money-component-group .van-field__control {
-  font-size: .28rem;
-  color: #171826;
-  line-height: .4rem;
-}
-
-.money-component-group .select-tag-group {
-  display: flex;
-  padding: .32rem 0;
-  flex-wrap: wrap;
-}
-
-.money-component-group .select-tag-group .select-tag-item {
-  flex-shrink: 0;
-  min-width: 1.56rem;
-  height: .72rem;
-  background: #F5F6F7;
-  border-radius: .08rem;
-  color: #5F5E64;
-  font-size: .28rem;
-  text-align: center;
-  line-height: .72rem;
-  padding: 0 0.32rem;
-  margin: 0 .2rem .2rem 0;
-}
-
-.money-component-group .select-tag-group .select-tag-item.active {
-  position: relative;
-  background: #E8FAFD;
-  color: #2ABED1;
-}
-
-.money-component-group .select-tag-group .select-tag-item.active::after {
-  content: "";
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-  width: .28rem;
-  height: .28rem;
-  background-size: 100% 100%;
-}
-
-.money-component-group .select-picker-group {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: .16rem;
-  width: 100%;
-  height: 1.04rem;
-  opacity: 1;
-  background: #f5f6f7;
-  border-radius: .08rem;
-}
-
-.money-component-group .select-picker-group.click-active {
-  position: relative;
-  background: #E8FAFD;
-}
-
-.money-component-group .select-picker-group.click-active::after {
-  content: '';
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-  width: .28rem;
-  height: .28rem;
-  background-size: 100% 100%;
-}
-
-.money-component-group .select-picker-group .line {
-  width: 12px;
-  height: 1px;
-  background: #ACACAD;
-}
-
-.money-component-group .select-picker-group .van-cell.van-field {
-  width: 2.96rem;
-  height: .72rem;
-  background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-radius: .1rem;
-  align-items: center;
-}
-
-.money-component-group .extra-text-tip {
-  color: #9B9CA3;
-}
-
 /*# sourceMappingURL=ent-search-template.css.map */

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

@@ -10,6 +10,33 @@ var vEntSearchComponent = new Vue({
       showEntSearch: false,
       showPop: false,
       showUpTip: false,
+      moneyTags: [
+        {
+          name: '100万以内',
+          value: '0-100',
+          selected: false
+        },
+        {
+          name: '100-500万',
+          value: '100-500',
+          selected: false
+        },
+        {
+          name: '500-1000万',
+          value: '500-1000',
+          selected: false
+        },
+        {
+          name: '1000-5000万',
+          value: '1000-5000',
+          selected: false
+        },
+        {
+          name: '5000万以上',
+          value: '5000-',
+          selected: false
+        }
+      ],
       listInfo: {
         value: '',
         pageNum: 0,
@@ -19,6 +46,7 @@ var vEntSearchComponent = new Vue({
         finished: false
       },
       activeTabIndex: 0,
+      beforeTabIndex: 0,
       entTabs: [
         {
           title: ''
@@ -40,7 +68,7 @@ var vEntSearchComponent = new Vue({
         },
         {
           title: '中标区域',
-          disabled: true
+          disabled: false
         },
         {
           title: '单位类型'
@@ -236,6 +264,18 @@ var vEntSearchComponent = new Vue({
           }
           break
         }
+        case 3: {
+          var tempParams = {}
+          if (type) {
+            tempParams = this.$refs.moneyComponent.onConfirm()
+          } else {
+            tempParams = this.$refs.moneyComponent.resetAll()
+          }
+          if (tempParams && tempParams.data) {
+            this.conditionStrMap.entCapital = tempParams.data
+          }
+          break
+        }
         case 4 : {
           this.conditionStrMap.entType = this.getMoreListToStr(4)
           break
@@ -244,6 +284,18 @@ var vEntSearchComponent = new Vue({
           this.conditionStrMap.entStatus = this.getMoreListToStr(5)
           break
         }
+        case 6: {
+          var tempParams = {}
+          if (type) {
+            tempParams = this.$refs.areaRadioComponent.onConfirm()
+          } else {
+            tempParams = this.$refs.areaRadioComponent.resetAll()
+          }
+          if (tempParams && tempParams.data) {
+            this.conditionStrMap.biddingArea = tempParams.data[0]
+          }
+          break
+        }
         case 7 : {
           this.conditionStrMap.entClass = this.getMoreListToStr(7)
           break
@@ -377,7 +429,8 @@ var vEntSearchComponent = new Vue({
     },
     onClickTabs (name, title) {
       console.log(name, title)
-      this.togglePop(true)
+      this.togglePop(!(name === this.beforeTabIndex && this.showPop))
+      this.beforeTabIndex = name
     },
     onSelectItem (item, index) {
       if (index < 7) {

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

@@ -406,89 +406,3 @@
 .ent-stop-scroll {
   overflow: hidden !important;
 }
-
-
-.money-component-group {
-  padding: 0 .32rem;
-  min-height: 4rem;
-
-  .van-field__control{
-    font-size: .28rem;
-    color: #171826;
-    line-height: .4rem;
-  }
-  .select-tag-group {
-    display: flex;
-    padding: .32rem 0;
-    flex-wrap: wrap;
-  }
-  .select-tag-group .select-tag-item{
-    flex-shrink: 0;
-    min-width: 1.56rem;
-    height: .72rem;
-    background: #F5F6F7;
-    border-radius: .08rem;
-    color: #5F5E64;
-    font-size: .28rem;
-    text-align: center;
-    line-height: .72rem;
-    padding: 0 0.32rem;
-    margin:0 .2rem .2rem 0;
-  }
-  .select-tag-group .select-tag-item.active{
-    position: relative;
-    background: #E8FAFD;
-    color: #2ABED1;
-  }
-  .select-tag-group .select-tag-item.active::after{
-    content: "";
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-    width: .28rem;
-    height: .28rem;
-    background-size: 100% 100%;
-  }
-  .select-picker-group{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: .16rem;
-    width: 100%;
-    height: 1.04rem;
-    opacity: 1;
-    background: #f5f6f7;
-    border-radius: .08rem;
-  }
-  .select-picker-group.click-active{
-    position: relative;
-    background: #E8FAFD;
-  }
-  .select-picker-group.click-active::after{
-    content: '';
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHHSURBVHgB7ZS/TsJQFMa/tkpIVEIMCRodIMQEZYGBB8An8AWMuOqgbm46uqFPIImzCS9gqrMDYhxYNAwODiQi/iMEe72nUkJJbe/FwuQ33Z57en49t+d+wL98VEovp1WMSUm9sgGm6grGIIKpDEVaj7zDFb1yYMFII+2QYGA47I+NDJjSbwuMsd3BuO/AtF4Ot6EVwFjead9XoAnjk0jL33J8A3JYrAuLueX5AhSF+QKUgf0ZSFZF7sGAsOg7Q198y6pkYEMDl/XKDrmHG2x9MYLz7BKS00FbXIOkyD0UhiO3nO1YFHuJeUQCk6i3O7huvPf2pDp0sion2FY8aq6rb584e6zb9oU7JKvisP1seMqctNeO4QnLlx943pctx3NK+62KYMVMwiySL9/zoi0pGEn1hNEd6/oiAZq8yMyEZoKtgRCF8e5uFBeY44UmyCmHhTiUil7UX7A2N+sJIzGGE0UG5gS15AUjGYoRV2VhP8Vb2OT/sNktLgKDohSruUzN1qGsVS0EA1iNhFB6enaHATXeXc4GJKvSGI5lrUpAPRg9mEcqYlVDiR/jh2JkLJgZEnEP4fpAg390jU/jlaYapbtc5nIw5xuaNAINUmtJBQAAAABJRU5ErkJggg==) no-repeat;
-    width: .28rem;
-    height: .28rem;
-    background-size: 100% 100%;
-  }
-  .select-picker-group .line{
-    width: 12px;
-    height: 1px;
-    background: #ACACAD;
-  }
-  .select-picker-group .van-cell.van-field {
-    width: 2.96rem;
-    height: .72rem;
-    background: #ffffff;
-    border: 1px solid rgba(0,0,0,0.10);
-    border-radius: .1rem;
-    align-items: center;
-  }
-  .extra-text-tip {
-    color: #9B9CA3;
-  }
-}