Merge branch 'develop' into 'test'

src/containers/Login/Login.js

@@ -192,7 +192,7 @@ class Login extends Component {
 
           <div className={styles.btnBox}>
             <Button className={styles.okbtn} onClick={this.loginHandle}>
-              登陆
+              登录
             </Button>
             <Button className={styles.canclbtn}>取消</Button>
           </div>

src/containers/PublicCar/components/PublicCarItem.js

@@ -123,7 +123,11 @@ class PublicCarItem extends Component {
                 >
                   <div className={styles.listLabel}>派车车牌：</div>
                   <div className={styles.listValue}>
-                    {data.dealResult === 1 ? '待处理后显示' : data.carPlate}
+                    {data.dealResult === 1
+                      ? '待处理后显示'
+                      : data.carPlate
+                        ? data.carPlate
+                        : '无'}
                   </div>
                 </div>,
                 data.dealResult === 3 ? (
@@ -132,7 +136,9 @@ class PublicCarItem extends Component {
                     className={`${styles.listLine} ${styles.dealedColor}`}
                   >
                     <div className={styles.listLabel}>处理意见：</div>
-                    <div className={styles.listValue}>{data.dealOpinion}</div>
+                    <div className={styles.listValueMutLine}>
+                      {data.dealOpinion}
+                    </div>
                   </div>
                 ) : null,
               ]

src/containers/PublicCarDeal/index.js

@@ -282,7 +282,7 @@ class PublicCarDeal extends Component {
                     onChange={this.onSelectHandle}
                     defaultValue="-1"
                   >
-                    <option disabled value="-1" />
+                    <option disabled value="-1" >请选择</option>
                     {carPlateList.map(i => (
                       <option key={i.value} value={i.lable}>
                         {i.lable}
@@ -296,7 +296,7 @@ class PublicCarDeal extends Component {
                 <span className={styles.dialogLabel}>处理结果</span>
                 <TextareaItem
                   className={styles.textarea}
-                  placeholder="输入报修地址"
+                  placeholder="输入处理结果"
                   rows={3}
                   count={50}
                   value={dealOpinion}

src/containers/PublicCarDeal/style.css

@@ -68,7 +68,9 @@
   outline: none;
   width: 100%;
   height: 100%;
-  background-color: #f2f2f2;
+  background-color: transparent;
+  position: relative;
+  z-index: 2;
 }
 .textarea {
   background-color: #f2f2f2;

src/containers/Repair/ReprtRepair.js

@@ -133,6 +133,10 @@ class ReprtRepair extends Component {
       Toast.fail('请输入报修人电话！');
       return;
     }
+    if (applyForm.repairCellphone.length !== 11) {
+      Toast.fail('请输入正确电话！');
+      return;
+    }
     if (!applyForm.applyIdentity) {
       Toast.fail('请选择报修人身份！');
       return;

src/containers/Repair/components/RepairItem.js

@@ -71,7 +71,7 @@ class RepairItem extends Component {
                   </div>
                 </div>,
                 <div key="address" className={styles.listLineArea}>
-                  <div className={styles.listLabel}>报修事项：</div>
+                  <div className={styles.listLabel}>报修地址：</div>
                   <div className={styles.listValueMutLine}>{data.address}</div>
                 </div>,
                 <div key="name" className={styles.listLine}>