Merge branch 'feature/v1.0.67' into dev/v1.0.67_zsy

apps/bigmember_pc/src/views/portrayal/components/EntForm.vue

@@ -88,7 +88,8 @@ export default {
           },
           {
             label: '注册资本',
-            main: data.capital
+            // main: data.capital || ''
+            main: '-'
           },
           {
             label: '纳税人识别号',

apps/bigmember_pc/src/views/portrayal/components/EntSubVipForm.vue

@@ -94,7 +94,8 @@ export default {
           },
           {
             label: '注册资本',
-            main: data.capital || ''
+            // main: data.capital || ''
+            main: '-'
           },
           {
             label: '纳税人识别号',

apps/bigmember_pc/src/views/search/ent/constant/search-filters.js

@@ -137,21 +137,21 @@ function createSearchEntMoreSchema() {
         hooks: {}
       }
     },
-    {
-      key: 'entCapital',
-      label: '注册资本',
-      defaultVal: '',
-      _name: 'entCapital',
-      _type: 'component',
-      expand: {
-        component: EntamountRangeData,
-        props: {
-          options: entPriceList,
-          placeholder: '注册资本'
-        },
-        hooks: {}
-      }
-    },
+    // {
+    //   key: 'entCapital',
+    //   label: '注册资本',
+    //   defaultVal: '',
+    //   _name: 'entCapital',
+    //   _type: 'component',
+    //   expand: {
+    //     component: EntamountRangeData,
+    //     props: {
+    //       options: entPriceList,
+    //       placeholder: '注册资本'
+    //     },
+    //     hooks: {}
+    //   }
+    // },
     {
       key: 'entType',
       label: '企业类型',

apps/bigmember_pc/src/views/search/ent/model/base.js

@@ -196,7 +196,7 @@ export default function () {
           {
             key: '注册资本：',
             value: v.capital ? v.capital : '-',
-            show: true
+            show: false
           },
           {
             key: '成立日期：',
@@ -395,6 +395,7 @@ export default function () {
       params = apiParams
       sessionStorage.removeItem('ent-search-filter-storage')
     }
+    listState.pageNum = 1
     return doQuery(params).then(() => {
       if (inResourceBI && list.value) {
         const idArr = list.value.map((v) => {

apps/bigmember_pc/src/views/search/purchase/model/base.js

@@ -99,6 +99,7 @@ export default function () {
       params = apiParams
       sessionStorage.removeItem('purchase-search-filter-storage')
     }
+    listState.pageNum = 1
     return doQuery(params).then(() => {
       if (list.value) {
         const idArr = list.value.map(v => {

apps/mobile/src/components/ad/SwipeFloor.vue

@@ -237,7 +237,7 @@ $swiper-floor-item-font-size: 11px;
     color: $swiper-floor-item-color;
     .van-image {
       width: $swiper-floor-item-width;
-      height: 40px;
+      height: 44px;
     }
     span {
       margin-top: 4px;

apps/mobile/src/components/home/list.vue

@@ -20,7 +20,7 @@
     </div> -->
     <div class="flex flex-items-center van-hairline--bottom home-list-header">
       <h3 class="header-title">商机推荐</h3>
-      <div class="flex flex-items-center header-value">
+      <div class="flex flex-items-center header-value" v-if="!isSubCount">
         <span class="header-desc">完善信息，推荐更准</span>
         <span
           class="flex flex-items-center header-set"
@@ -236,7 +236,7 @@ export default {
     showToSettingTip() {
       return this.showTip === 2 && this.showSetTip
     },
-    ...mapGetters('user', ['isLogin', 'isFree', 'vSwitch'])
+    ...mapGetters('user', ['isLogin', 'isFree', 'vSwitch', 'isSubCount'])
   },
   watch: {
     showToSettingTip(n) {

apps/mobile/src/components/message/message-card.vue

@@ -10,11 +10,7 @@
           <AppIcon name="youbian" size="14" color="#c0c4cc" />
         </div>
       </div> -->
-      <div
-        class="message-card"
-        :class="{ 'have-one': list.length === 1 }"
-        ref="msgCard"
-      >
+      <div class="message-card" ref="msgCard">
         <div
           class="message-group"
           :style="{
@@ -35,7 +31,7 @@
               <template #title>
                 <span class="icon iconfont icon-nav_un_message"></span>
                 <span class="type">{{ item.type }}</span>
-                <span class="flex-1 title">{{ item.title }}</span>
+                <span class="flex-1 title van-ellipsis">{{ item.title }}</span>
               </template>
               <template #default>
                 <span class="time">{{ item.time }}</span>

apps/mobile/src/components/search/bidding/filters.vue

@@ -1398,7 +1398,6 @@ export default {
       }, 300)
     },
     handleScroll: throttle(function () {
-      console.log(this.markClickScroll, 'scroll')
       if (this.markClickScroll) return
       const cellItems = document.querySelectorAll('.more-filter-item')
       const offsetTopArr = []
@@ -1422,6 +1421,9 @@ export default {
 ::v-deep {
   .van-dropdown-menu__title {
     color: $gray_9;
+    &--active {
+      color: $main;
+    }
   }
   .highlight {
     color: $main;
@@ -1460,6 +1462,8 @@ export default {
     .cell-title {
       display: flex;
       align-items: center;
+      font-size: 12px;
+      font-weight: bold;
     }
   }
 }
@@ -1488,6 +1492,7 @@ export default {
     .j-row-cell-content {
       padding: 12px 0;
     }
+    .j-row-cell-hd .cell-title,
     .cell-title-text,
     .van-cell__title,
     .search-mode-filter-label-text {

apps/mobile/src/components/selector/money-input-group/index.vue

@@ -3,7 +3,8 @@
     <van-field
       type="number"
       v-model="inputMap.start"
-      :placeholder="placeholder"
+      :maxlength="maxLength.start"
+      :placeholder="placeholder.start"
       :class="{ focus: focus.start && hoverBorderHighlight }"
       @click.stop="onClick('start')"
       @input="onInput('start')"
@@ -17,8 +18,9 @@
     <div class="line"></div>
     <van-field
       type="number"
+      :maxlength="maxLength.end"
       v-model="inputMap.end"
-      :placeholder="placeholder"
+      :placeholder="placeholder.end"
       :class="{ focus: focus.end && hoverBorderHighlight }"
       @click.stop="onClick('end')"
       @input="onInput('end')"
@@ -44,13 +46,23 @@ export default {
       type: Boolean,
       default: true
     },
-    placeholder: {
-      type: String,
-      default: '请输入金额'
-    },
     extra: {
       type: String,
       default: '万'
+    },
+    placeholder: {
+      type: Object,
+      default: () => ({
+        start: '请输入金额',
+        end: '请输入金额'
+      })
+    },
+    maxLength: {
+      type: Object,
+      default: () => ({
+        start: 10,
+        end: 10
+      })
     }
   },
   data() {

apps/mobile/src/data/bidding.js

@@ -10,11 +10,11 @@ export const biddingSearchListType = [
 // 招标搜索范围
 export const biddingSearchScope = [
   {
-    label: '标题搜索',
+    label: '标题',
     key: 'title'
   },
   {
-    label: '正文搜索',
+    label: '正文',
     key: 'content'
   },
   {

apps/mobile/src/ui/project-cell/index.vue

@@ -19,7 +19,7 @@
         </span>
         <span v-html="getTitle"></span>
         <span v-if="filetext_search" style="padding-left: 8px"
-          >(<span class="highlight-text-orange">{{ setKeyLength }}</span
+          >(<span class="highlight-text-orange-bd">{{ setKeyLength }}</span
           >在附件中)</span
         >
       </div>

apps/mobile/src/views/search/result/bidding/index.vue

@@ -38,7 +38,7 @@
         @confirm="onFilterConfirm"
         @reset="doSearch"
         @open="doOpen"
-        :defaultFilterState="defaultFilterState"
+        :defaultFilterState="noChangeDefaultFilterState"
         :dropdownMenuMaxHeight="conf.maxHeight"
         :infoTypeSourceConf="activeSearchGroupInfo"
         :topSearch="topSearch"
@@ -2223,8 +2223,10 @@ export default {
           vSwitch: this.vSwitch,
           match_way: wordsMode
         }
+        const loading = this.$toast.loading({ duration: 0 })
         try {
           const { flag } = await setUserSubInfo(params)
+          loading.clear()
           if (flag === 'y') {
             this.saveState()
             openAppOrWxPage(LINKS.关键词列表)
@@ -2371,8 +2373,14 @@ export default {
     // 保存筛选条件
     async saveFilterToHistory() {
       const params = this.getSaveFilterToHistoryParams()
-
-      if (!params.searchvalue) {
+      // 如未输入关键词（包含顶部搜索框及更多筛选条件设置的多关键词、采购单位、中标单位和招标代理机构）则toast提示“请输入关键词”
+      if (
+        !params.searchvalue &&
+        !params.additionalWords &&
+        !params.buyer &&
+        !params.winner &&
+        !params.agency
+      ) {
         return this.$toast('请先输入关键词')
       }
       const { savedFilterListMaxCount: maxCount } = this.conf
@@ -2474,27 +2482,25 @@ export default {
        * */
       let labelList = formattedList
         .filter((v) => {
-          if (v.label === '搜索范围：') {
-            v.text = v.text.replace(/搜索/g, '')
-          }
-          if (v.label === '信息类型：') {
+          if (v.label.includes('信息类型')) {
             const isChecked = deepCompareInfoType(v.text)
-            // console.log(isChecked, '是否全选')
             v.text = isChecked ? '' : v.text
           }
           if (this.topSearch.input) {
             return v && v.text
           } else {
-            return (
-              v.label !== '搜索范围：' && v.label !== '信息类型：' && v.text
-            )
+            return !v.label.includes('搜索范围') && v.text
           }
         })
         .map((item) => item.text)
       if (searchModeText && this.topSearch.input) {
         labelList = [searchModeText].concat(labelList)
       }
-      if (searchGroup > 0) {
+      // console.log(formattedList, 'formattedList')
+      const isHaveInfoType = formattedList.some((v) =>
+        v.label.includes('信息类型')
+      )
+      if (searchGroup > 0 && !isHaveInfoType) {
         labelList = labelList.concat(this.activeSearchGroupInfo.title)
       }
       let label = ''
@@ -3299,4 +3305,7 @@ export default {
   left: 12px;
   right: 12px;
 }
+.customer-corner {
+  z-index: 10;
+}
 </style>

apps/mobile/src/views/search/result/company/index.vue

@@ -41,7 +41,7 @@
           />
         </DropdownLayout>
       </van-dropdown-item>
-      <van-dropdown-item
+      <!-- <van-dropdown-item
         ref="money"
         title="注册资本"
         :title-class="selected.money ? 'selected' : ''"
@@ -60,7 +60,7 @@
             :default-val="defaultVal.money"
           />
         </DropdownLayout>
-      </van-dropdown-item>
+      </van-dropdown-item> -->
       <van-dropdown-item
         ref="more"
         title="更多筛选"
@@ -270,8 +270,8 @@ export default {
           statusColor:
             this.statusColors[this.statusEnum.indexOf(v.company_status) || 0],
           tags: {
-            '法定代表人：': v.legal_person,
-            '注册资本：': v.capital ? v.capital : ''
+            '法定代表人：': v.legal_person
+            // '注册资本：': v.capital ? v.capital : ''
           },
           address: v.company_address,
           zhiMa: v.zhima_labels
@@ -303,7 +303,8 @@ export default {
     ...mapActions('search', ['setHistory']),
     closeDropDown() {
       return new Promise((resolve) => {
-        const refArr = ['scope', 'area', 'money', 'more']
+        // const refArr = ['scope', 'area', 'money', 'more']
+        const refArr = ['scope', 'area', 'more']
         refArr.forEach((v) => {
           this.$refs[v].toggle(false)
         })