Merge branch 'develop' into 'test'

src/components/Input/ImagePicker/ImagePicker.js

@@ -96,6 +96,7 @@ class ImagePicker extends Component {
       const { aspectRatio } = this.state;
       const ctx = this.canvas.getContext('2d');
       const fileUrl = this.createObjectURL(file);
+      ctx.clearRect(0, 0, 590, 334);
       const img = new Image();
       img.onload = () => {
         console.log(img.width, img.height);

src/containers/App.js

@@ -132,23 +132,23 @@ class App extends Component {
             <Route
               path="/publicCar"
               render={props =>
-                this.validateUserinfo(props, 'CSXY0003', PublicCar)
+                this.validateUserinfo(props, 'CSHQ0003', PublicCar)
               }
             />
             <Route
               path="/publicCarDeal"
               render={props =>
-                this.validateUserinfo(props, 'CSXY0004', PublicCarDeal)
+                this.validateUserinfo(props, 'CSHQ0004', PublicCarDeal)
               }
             />
             <Route
               path="/Repair"
-              render={props => this.validateUserinfo(props, 'CSXY0001', Repair)}
+              render={props => this.validateUserinfo(props, 'CSHQ0001', Repair)}
             />
             <Route
               path="/RepairDeal"
               render={props =>
-                this.validateUserinfo(props, 'CSXY0002', RepairDeal)
+                this.validateUserinfo(props, 'CSHQ0002', RepairDeal)
               }
             />
             <Route component={NoMatch} />

src/containers/Home/Index.js

@@ -36,25 +36,25 @@ export class Index extends React.Component {
         <div className={styles.iconBox}>
           <div
             className={styles.iconItem}
-            onClick={() => this.validate('CSXY0001', '/Repair')}
+            onClick={() => this.validate('CSHQ0001', '/Repair')}
           >
             <img src={repairIcon} alt="" />
           </div>
           <div
             className={styles.iconItem}
-            onClick={() => this.validate('CSXY0003', '/publicCar')}
+            onClick={() => this.validate('CSHQ0003', '/publicCar')}
           >
             <img src={publicCarIcon} alt="" />
           </div>
           <div
             className={styles.iconItem}
-            onClick={() => this.validate('CSXY0002', '/RepairDeal')}
+            onClick={() => this.validate('CSHQ0002', '/RepairDeal')}
           >
             <img src={repairDealIcon} alt="" />
           </div>
           <div
             className={styles.iconItem}
-            onClick={() => this.validate('CSXY0004', '/publicCarDeal')}
+            onClick={() => this.validate('CSHQ0004', '/publicCarDeal')}
           >
             <img src={publicCarDealIcon} alt="" />
           </div>

src/containers/Login/Login.js

@@ -130,6 +130,7 @@ class Login extends Component {
       })
       .catch(err => {
         console.log(err);
+        Toast.fail(err.msg || '登陆失败！');
       });
   };
 

src/containers/Repair/components/style.css

@@ -70,6 +70,10 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.listValueMutLine {
+  white-space: pre-wrap;
+  word-break: break-all;
+}
 .listLabel {
   white-space: nowrap;
 }