Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

config/config.ts

@@ -14,7 +14,8 @@ export default defineConfig({
   // 如需写入环境变量 需在config中先写入
   define: {
     "process.env.SITE_ID": process.env.SITE_ID,
-    "process.env.BACK_GATEWAY": process.env.BACK_GATEWAY
+    "process.env.BACK_GATEWAY": process.env.BACK_GATEWAY,
+    'process.env.SOCKET_URL': process.env.SOCKET_URL
   },
   locale: {
     antd: true,

package.json

@@ -18,8 +18,8 @@
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
-    "start:cross": "cross-env SITE_ID=352 yarn start",
-    "start:cross-dev": "cross-env SITE_ID=352 yarn start",
+    "start:cross": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:8100 yarn start",
+    "start:cross-dev": "cross-env SITE_ID=352 SOCKET_URL=ws://10.0.0.25:8100 yarn start",
     "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 yarn start"
   },
   "lint-staged": {

src/constants/index.ts

 export const NOT_CHANGE_VALUE = 'hello, world'
+// socket的链接地址， 默认会使用后端接口网关地址
+export const SOCKET_URL = process.env.SOCKET_URL || process.env.BACK_GATEWAY?.replace('http', 'ws') || "ws://10.0.0.25:9400"
 
 // 会员角色类型
 export const MEMBER_ROLE_LISTS = [

src/pages/platformSettlement/corporateAccount/index.tsx

@@ -147,8 +147,8 @@ const CorporateAccount = () => {
             message: '请填写账号名称',
             dataIndex: 'name',
             image: company,
-            value: data.name,
-            cacheValue:  data.name,
+            value: data && data.name || '',
+            cacheValue: data && data.name || '',
             isEdit: false,
             canEdit: true
           },