Merge branch 'dev' of http://192.168.0.200:3000/suf/domestic--e-commerc-c into dev

src/api/myFinancing/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取企业列表
 export function getList(data) {
   return request({
-    url: '/financing/list',
+    url: '/financing/information/findBySearch',
     method: 'post',
     data
   })

src/store/modules/constant.js

@@ -22,7 +22,13 @@ export default {
       enterpriseCertificateType: [], // 企业证件种类
       idCard: [], // 个人证件类型
       registerCountry: [], // 注册国家
-      occupationTypes: [] // 职业类型
+      occupationTypes: [], // 职业类型
+      bocomCustomerStatus: [], // 会员信息管理 - 客户状态
+      bocomCustomerStages: [], // 会员信息管理 - 客户阶段
+      bocomApiInterface: [], // 会员接口管理 -
+      bocomTransState: [], // 会员账户-资金管理-交易记录-交易状态
+      bocomTransRecordsFundSource: [], // 会员账户-资金管理-交易记录-资金来源
+      bocomVipAccountStatus: [] // 会员账户-搜索-会员账户状态
     }
   },
   mutations: {

src/styles/element/ruleForm.scss

@@ -205,7 +205,7 @@ $orangeColor: #E9423A;
 /* disable开始 */
 .el-textarea.is-disabled .el-textarea__inner,
 .el-input.is-disabled .el-input__inner,
-.el-range-editor.is-disabled input{
+.el-range-editor.is-disabled input {
   // background-color: #fff;
   color: #333;
 }

src/views/accountCenter/openInfoManage/mainContentTable.js

@@ -35,7 +35,7 @@ export default {
         },
         {
           label: '阶段',
-          prop: 'stage',
+          prop: 'stageStr',
           showTooltip: true
         },
         {
@@ -144,7 +144,7 @@ export default {
           } else if (item.category === 'reason') {
             return rowPower.includes(row.customerStatus)
           } else {
-            if (rowPower.includes(row.stage)) {
+            if (rowPower.includes(row.stageStr)) {
               return true
             }
           }

src/views/myFinancing/financingMain.vue

@@ -4,14 +4,13 @@
       <div class="left" />
       <div class="right">
         <div>
-          <el-input v-model="search.fastSearch" placeholder="请输入企业名称" />
+          <el-input v-model="search.fastSearch" placeholder="请输入企业名称/合同编号" />
         </div>
-        <div>
+        <!-- <div>
           <el-input v-model="search.searchNumber" placeholder="请输入合同编号" />
-        </div>
-
+        </div> -->
         <div>
-          <el-select v-model="search.statusCode" placeholder="请选择状态" clearable>
+          <el-select v-model="search.status" placeholder="请选择状态" clearable>
             <el-option
               v-for="item in constant.projectInitiationStatus"
               :key="item.code"
@@ -47,9 +46,8 @@ export default {
     return {
       count: 0,
       search: {
-        searchNumber: '',
-        statusCode: '',
-        fastSearch: ''
+        fastSearch: '',
+        status: ''
       },
       tableData: [{ id: 111, businessNumber: '2131231' }],
       columns: [