Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/manage/store/own_list.js

@@ -26,6 +26,13 @@ import areaData from '@/assets/area.json';
 import defaultSettings from '@/defaultSettings';
 
 let pageSize = list_com_page_size_10;
+
+const businessStateList = [
+    { key: 1, name: `${sldComLanguage('资质审核')}` },
+    { key: 2, name: `${sldComLanguage('装修筹备')}` },
+    { key: 3, name: `${sldComLanguage('经营中')}` },
+    { key: 4, name: `${sldComLanguage('暂停经营')}` },
+]
 @connect(({ store, global }) => ({
   store, global
 }))
@@ -34,22 +41,32 @@ export default class OwnList extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      search_data: [{
-        type: 'input',
-        label: `${sldComLanguage('店铺名称')}`,
-        name: 'storeName',
-        placeholder: `${sldComLanguage('请输入店铺名称')}`,
-      }, {
-        type: 'select',
-        label: `${sldComLanguage('店铺状态')}`,
-        name: 'state',
-        placeholder: `${sldComLanguage('请选择店铺状态')}`,
-        sel_data: [
-          { key: '', name: `${sldComLanguage('全部')}` },
-          { key: '1', name: `${sldComLanguage('开启')}` },
-          { key: '2', name: `${sldComLanguage('关闭')}` },
-        ],
-      }],
+      search_data: [
+        {
+          type: 'input',
+          label: `${sldComLanguage('店铺名称')}`,
+          name: 'storeName',
+          placeholder: `${sldComLanguage('请输入店铺名称')}`,
+        }, 
+        {
+          type: 'select',
+          label: `${sldComLanguage('店铺状态')}`,
+          name: 'state',
+          placeholder: `${sldComLanguage('请选择店铺状态')}`,
+          sel_data: [
+            { key: '', name: `${sldComLanguage('全部')}` },
+            { key: '1', name: `${sldComLanguage('开启')}` },
+            { key: '2', name: `${sldComLanguage('关闭')}` },
+          ],
+        },
+        {
+          type: 'select',
+          label: `${sldComLanguage('经营状态')}`,
+          name: 'businessState',
+          placeholder: `${sldComLanguage('请选择经营状态')}`,
+          sel_data: businessStateList
+        }
+      ],
       initLoading: false,
       submiting: false,
       data: {},//列表数据
@@ -207,6 +224,17 @@ export default class OwnList extends Component {
           ),
         },
         {
+          title: `${sldComLanguage('经营状态')}`,
+          dataIndex: 'businessState',
+          align: 'center',
+          width: 80,
+          render: (text, record) => (
+            <span>
+              { businessStateList.find(item => item.key == text)?.name }
+            </span>
+          ),
+        },
+        {
           title: `${sldComLanguage('操作')}`,
           align: 'center',
           width: 100,

xinkeaboard-admin/src/pages/manage/store/settled_store_list_data.js

@@ -25,6 +25,12 @@ import router from 'umi/router';
 import SldModal from '@/components/SldModal/SldModal';
 
 let pageSize = list_com_page_size_10;
+const businessStateList = [
+    { key: 1, name: `${sldComLanguage('资质审核')}` },
+    { key: 2, name: `${sldComLanguage('装修筹备')}` },
+    { key: 3, name: `${sldComLanguage('经营中')}` },
+    { key: 4, name: `${sldComLanguage('暂停经营')}` },
+]
 @connect(({ store, share }) => ({
   store, share,
 }))
@@ -69,7 +75,26 @@ export default class SettledStoreListData extends Component {
         label: `${sldComLanguage('店主账号')}`,
         name: 'vendorName',
         placeholder: `${sldComLanguage('请输入店主账号')}`,
-      }, {
+      }, 
+      {
+          type: 'select',
+          label: `${sldComLanguage('店铺状态')}`,
+          name: 'state',
+          placeholder: `${sldComLanguage('请选择店铺状态')}`,
+          sel_data: [
+            { key: '', name: `${sldComLanguage('全部')}` },
+            { key: '1', name: `${sldComLanguage('开启')}` },
+            { key: '2', name: `${sldComLanguage('关闭')}` },
+          ],
+        },
+        {
+          type: 'select',
+          label: `${sldComLanguage('经营状态')}`,
+          name: 'businessState',
+          placeholder: `${sldComLanguage('请选择经营状态')}`,
+          sel_data: businessStateList
+        },
+      {
         type: 'select',
         label: `${sldComLanguage('店铺等级')}`,
         name: 'storeGradeId',
@@ -78,17 +103,9 @@ export default class SettledStoreListData extends Component {
         diy: true,
         sele_key: 'gradeId',
         sele_name: 'gradeName',
-      }, {
-        type: 'select',
-        label: `${sldComLanguage('店铺状态')}`,
-        name: 'state',
-        placeholder: `${sldComLanguage('请选择店铺状态')}`,
-        sel_data: [
-          { key: '', name: `${sldComLanguage('全部')}` },
-          { key: '1', name: `${sldComLanguage('开启')}` },
-          { key: '2', name: `${sldComLanguage('关闭')}` },
-        ],
-      }],
+      }, 
+        
+      ],
       formValues: {},//搜索条件
       columns: [
         {
@@ -146,6 +163,17 @@ export default class SettledStoreListData extends Component {
           },
         },
         {
+          title: `${sldComLanguage('经营状态')}`,
+          dataIndex: 'businessState',
+          align: 'center',
+          width: 80,
+          render: (text, record) => (
+            <span>
+              { businessStateList.find(item => item.key == text)?.name }
+            </span>
+          ),
+        },
+        {
           title: `${sldComLanguage('操作')}`,//操作
           align: 'center',
           width: 100,