Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/constants/index.ts

@@ -18,10 +18,18 @@ export const TOP_DOMAIN = process.env.NODE_ENV !== 'development' ? getTopDomainB
 // export const TOP_DOMAIN = getTopDomainByHost(GlobalConfig.global.siteInfo.siteUrl)
 
 /**
+ * 获取平台首页子域名
+ */
+ const getPlatformSubDomain = (defaultSubDomian: string) => {
+  const siteUrl = GlobalConfig.global.siteInfo.siteUrl
+  return siteUrl.split('.')[0] || defaultSubDomian
+}
+
+/**
  * 平台首页域名
  */
 
-export const PLATFORM_DOMAIN = `${REQUEST_HEADER}www.${TOP_DOMAIN}`
+export const PLATFORM_DOMAIN = `${REQUEST_HEADER}${getPlatformSubDomain('lx-www')}.${TOP_DOMAIN}`
 
 /**
  * 企业商城域名

src/pages/contract/coordination/details/components/SituationList.tsx

@@ -44,7 +44,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
       startTime: "",
       endTime: "",
       current: 1,
-      pageSize: 5,
+      pageSize: size,
     }
     getContracInfoList(data)
   }
@@ -204,16 +204,29 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
     getContracInfoList(data)
   };
 
+  /* 重置 */
+  const Reset = () => {
+    setPage(1);
+    const data = {
+      contractId,
+      orderNo: '',
+      orderAbstract: '',
+      startTime: "",
+      endTime: "",
+      current: page,
+      pageSize: size,
+    }
+    getContracInfoList(data)
+  }
   useEffect(() => {
     if (contractId) {
       let data = {
         contractId,
-        current: 1,
-        pageSize: 8
+        current: page,
+        pageSize: size
       }
       getContracInfoList(data)
     }
-    console.log(data, '13132131')
   }, [contractId])
   return (
     <div id='docking' className='ant-card ant-card-bordered'>
@@ -229,7 +242,7 @@ const situationList: React.FC<Iprops> = ({ contractId }) => {
               allowClear
               onSearch={onSearch}
             />
-            <Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }}> 重置 </Button>
+            <Button style={{ paddingLeft: 10, paddingRight: 10, marginLeft: 10, marginRight: 10 }} onClick={Reset}> 重置 </Button>
           </div>
         </div>
       </div>

src/pages/editor/shopEdit/index.tsx

@@ -71,7 +71,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
     return new Promise((resolve) => {
       const params: any = {
         templateId: id,
-        type: 2,
+        type: 3,
         memberId,
         roleId: memberRoleId
       }