Merge branch 'main' into feature/v1.0.72

apps/bigmember_pc/.env.production

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VITE_APP_BASE_API=''
 VITE_APP_BASE_URL='/page_big_pc'
-VITE_APP_BASE_PUBLIC='/page_big_pc/'
+VITE_APP_BASE_PUBLIC='https://cdn-common.jianyu360.cn/page_big_pc/'
 VITE_APP_WORK_DESKTOP_URL='/page_workDesktop/work-bench/app/big'
-VITE_APP_GIT_BRANCH='v1.0.54.1'
+VITE_APP_GIT_BRANCH='v1.0.74'

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/.env.development

@@ -1,5 +1,6 @@
 VITE_APP_BASE_API='/api'
 VITE_APP_BASE_URL='/jy_mobile'
+VITE_APP_BASE_PUBLIC='/jy_mobile/'
 VITE_APP_IMAGE_BASE='https://web2-qmxtest.jydev.jianyu360.com'
 VITE_APP_APP_PROJECT_BASE='https://app2-jytest.jydev.jianyu360.com'
 VITE_APP_WX_PROJECT_BASE='https://jybx2-webtest.jydev.jianyu360.com'

apps/mobile/.env.production

@@ -1,6 +1,7 @@
 VITE_APP_BASE_API=''
 VITE_APP_BASE_URL='/jy_mobile'
+VITE_APP_BASE_PUBLIC='https://cdn-common.jianyu360.cn/jy_mobile/'
 VITE_APP_IMAGE_BASE=''
 VITE_APP_APP_PROJECT_BASE=''
 VITE_APP_WX_PROJECT_BASE=''
-VITE_APP_GIT_BRANCH='v1.0.62'
+VITE_APP_GIT_BRANCH='v1.0.74'

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)
         })

apps/mobile/vite.config.js

@@ -36,7 +36,7 @@ function getExternals(isDev) {
 export default defineConfig(({ mode,command }) => {
   const env = loadEnv(mode, process.cwd())
   return {
-    base: '/jy_mobile/',
+    base: env.VITE_APP_BASE_PUBLIC,
     build: {
       sourcemap: true,
       outDir: '../../dist/jy_mobile',