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

env.js

@@ -94,7 +94,7 @@ module.exports = {
       forcePasv: true
     })
   },
-  207: {
+  study: {
     SITE_ID: '1',
     BACK_GATEWAY: 'http://10.0.1.207:8100',
     USE_ROUTE_CONFIG: true,
@@ -106,7 +106,7 @@ module.exports = {
       host: "10.0.1.207",
       port: 22,
       localRoot: path.resolve('./dist/'),
-      remoteRoot: "/home/www/lingxi/lingxi-business-platform/dist/",
+      remoteRoot: "/home/www/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)
@@ -116,5 +116,5 @@ module.exports = {
       // Passive mode is forced (EPSV command is not sent)
       forcePasv: true
     })
-  }
+  },
 }

package.json

@@ -5,7 +5,7 @@
     "upload:scm": "cross-env local=scm taskName=upload yarn scripts:build",
     "upload:10": "cross-env local=10 taskName=upload yarn scripts:build",
     "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
-    "upload:207": "cross-env local=207 taskName=upload yarn scripts:build",
+    "upload:study": "cross-env local=study 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",
@@ -21,7 +21,7 @@
     "build:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn build",
     "build:all": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn build",
     "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:207": "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: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",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",
@@ -30,7 +30,7 @@
     "start:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn start",
     "start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=true SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn start",
     "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.10:9400 yarn start",
-    "start:207": "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 start",
+    "start: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 start",
     "start:25": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.25:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.25:9400 yarn start"
   },
   "lint-staged": {

src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx

@@ -111,6 +111,7 @@ const EvaluateOrder: React.FC = () => {
       orderNo: orderInfo.orderNo, 
       orderType: orderInfo.type, 
       commentSubmitDetailList: payload, 
+      shopId: orderInfo.shopId,
     }).then(res => {
       if (res.code === 1000) {
         setUnsaved(false);

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx

@@ -111,6 +111,7 @@ const EvaluateOrder: React.FC = () => {
       orderNo: orderInfo.orderNo, 
       orderType: orderInfo.type, 
       commentSubmitDetailList: payload, 
+      shopId: orderInfo.shopId,
     }).then(res => {
       if (res.code === 1000) {
         setUnsaved(false);