feat: 新增v2预览端

env.js

@@ -140,4 +140,27 @@ module.exports = {
       forcePasv: true
     })
   },
+  v2Preview: {
+    SITE_ID: '1',
+    BACK_GATEWAY: 'http://10.0.1.220:8100',
+    USE_ROUTE_CONFIG: true,
+    SOCKET_URL: 'ws://10.0.1.220:8100',
+    ssh: JSON.stringify({
+      user: "root",
+      // Password optional, prompted if none given
+      password: "Shushangyun520",
+      host: "10.0.1.220",
+      port: 22,
+      localRoot: path.resolve('./dist/'),
+      remoteRoot: "/home/www/lingxi/lingxi-business-platform/dist/",
+      // include: ["*", "**/*"],      // this would upload everything except dot files
+      include: ["*"],
+      // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
+      // exclude: ["dist/**/*.map", "node_modules/**", "node_modules/**/.*", ".git/**"],
+      // delete ALL existing files at destination before uploading, if true
+      deleteRemote: true,
+      // Passive mode is forced (EPSV command is not sent)
+      forcePasv: true
+    })
+  },
 }

package.json

@@ -7,6 +7,7 @@
     "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
     "upload:study": "cross-env local=study taskName=upload yarn scripts:build",
     "upload:v2": "cross-env local=v2 taskName=upload yarn scripts:build",
+    "upload:v2Preview": "cross-env local=v2Preview taskName=upload yarn scripts:build",
     "api": "god-ytt",
     "scripts:build": "node scripts/run",
     "scripts:build-yxc": "node scripts/run http://yxc-web-demo.shushangyun.com/api",
@@ -24,6 +25,7 @@
     "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.10:9400 yarn build",
     "build:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.207:9400 yarn build",
     "build:v2": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.17:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.17:9400 yarn build",
+    "build:v2Preview": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.220:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.220:9400 yarn build",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",

src/pages/logistics/components/orderSearchDetail.tsx

@@ -260,16 +260,9 @@ const detailInfo: React.FC<{}> = () => {
     try {
       const value = await form.validateFields();
       setfreightPrice(value.freight);
-<<<<<<< HEAD
-      setTaxRate(value.taxRate);
-      setvisible(true);
-    } catch {
-      message.error('请下拉到运费模块输入税率和运费！')
-=======
       setvisible(true);
     } catch {
       message.error('请下拉到运费模块输入运费！')
->>>>>>> 578e3fe8502feddf01a81cccdaf08c0a2db24cbb
     }
   }
 
@@ -440,39 +433,6 @@ const detailInfo: React.FC<{}> = () => {
                 (item: any, index: number) => {
                   return (
                     <Form {...layout} form={form}>
-<<<<<<< HEAD
-                      {item.key === 'taxRate' &&
-                        <Form.Item label={item.title} style={{ marginBottom: 0, position: 'relative' }}>
-                          <div style={{
-                            position: 'absolute',
-                            top: '7px',
-                          }}>
-                            <Checkbox checked>是</Checkbox>
-                          </div>
-                          <Form.Item
-                            label='税率'
-                            name='taxRate'
-                            rules={[{ required: true, message: '请输入税率' }]}
-                            style={{ paddingLeft: '60px' }}
-                          >
-                            <Input
-                              type='number'
-                              addonAfter='%'
-                              maxLength={25}
-                              style={{ width: '200px' }}
-                            />
-                          </Form.Item>
-                        </Form.Item>}
-                      {item.key === 'freight' &&
-                        <Form.Item label={item.title} name={item.key} rules={[{ required: true, message: '请输入运费' }]}>
-                          <Input
-                            type='number'
-                            addonBefore="¥"
-                            maxLength={25}
-                            style={{ width: '300px' }}
-                          />
-                        </Form.Item>}
-=======
                       {item.key === 'freight' &&
                         <>
                           {type === 'option' ? (
@@ -504,7 +464,6 @@ const detailInfo: React.FC<{}> = () => {
                           )}
                         </>
                       }
->>>>>>> 578e3fe8502feddf01a81cccdaf08c0a2db24cbb
                       {item.key === 'settlement' &&
                         <Form.Item label={item.title} name={item.key}>
                           <span>{item.value}</span>