bug fix

src/pages/h5SampleManager/h5Demand/components/AddDemand.jsx

@@ -28,7 +28,7 @@ const BatchDel = props => {
             <Button type="primary" onClick={() => sampleList()}>
               查看全部样例
             </Button>
-            <Button type="primary" onClick={props.onCancel} style={{marginLeft:'20px'}}>
+            <Button onClick={props.onCancel} style={{marginLeft:'20px'}}>
               取消
             </Button>
           </Form.Item>

src/pages/h5SampleManager/h5Demand/detail.jsx

@@ -98,7 +98,7 @@ const header = props => {
   return (
     <>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="样例名1">
+        <Form.Item label="样例名">
           <a onClick={() => sampleDetail(demandData.sampleId)} style={{ color: 'blue' }}>{demandData.sampleName}</a>
         </Form.Item>
         <Form.Item label="下单人">

src/pages/h5SampleManager/h5Sample/add.jsx

@@ -84,7 +84,9 @@ const header = props => {
           rules: [
             {
               required: true,
-              message: '请填写联系方式',
+              message: '请填写正确的联系方式',
+              max:11,
+              min:11,
             },
           ],
         })(<Input/>)}

src/pages/h5SampleManager/h5Sample/components/ContactInfo.jsx

@@ -57,32 +57,32 @@ class TypeForm extends React.Component {
             </div>
             <div className={styles.flexItem} style={{ justifyContent: 'space-between' }}>
               <div>
-                {this.props.type.sex != '' && <div className={styles.flexItem}>
+                {this.props.type.sex != '' && this.props.type.sex != null && <div className={styles.flexItem}>
                   <div className={styles.left}> 性别 </div>
                   <div className={styles.right} style={{ display: 'flex', alignItems: 'center' }}>{this.props.type.sex == '1' ? '男' : '女'}<img src={this.props.type.sex == '1' ? boyImg : girlImg} height="16px" width="16px" style={{ marginLeft: '5px' }} /></div>
                 </div>}
-                {this.props.type.appellation != '' && <div className={styles.flexItem}>
+                {this.props.type.appellation != '' && this.props.type.appellation != null && <div className={styles.flexItem}>
                   <div className={styles.left}><img src={cardImg} height="18px" width="24px" /></div>
                   <div className={styles.right}>{this.props.type.appellation}</div>
                 </div>}
-                {this.props.type.telephone != '' && <div className={styles.flexItem}>
+                {this.props.type.telephone != '' && this.props.type.telephone != null && <div className={styles.flexItem}>
                   <div className={styles.left}> 固话 </div>
                   <div className={styles.right}>{this.props.type.telephone}</div>
                 </div>}
-                {this.props.type.phone != '' && <div className={styles.flexItem}>
+                {this.props.type.phone != '' && this.props.type.phone != null && <div className={styles.flexItem}>
                   <div className={styles.left}> 手机 </div>
                   <div className={styles.right}>{this.props.type.phone}</div>
                 </div>}
-                {this.props.type.mail && <div className={styles.flexItem}>
+                {this.props.type.mail != '' && this.props.type.mail != null && <div className={styles.flexItem}>
                   <div className={styles.left}> 邮箱 </div>
                   <div className={styles.right}>{this.props.type.mail}</div>
                 </div>}
-                {this.props.type.address != '' && <div className={styles.flexItem}>
+                {this.props.type.address != '' && this.props.type.address != null && <div className={styles.flexItem}>
                   <div className={styles.left}> 联系地址 </div>
                   <div className={styles.right}>{this.props.type.address}</div>
                 </div>}
               </div>
-              {this.props.type.avatar != null &&
+              {this.props.type.avatar != null && this.props.type.avatar != '' &&
               <div style={{ textAlign: 'center' }}>
                 <img src={this.props.type.wxCardImg} height="80px" width="80px" />
                 <p style={{ margin: ' 0px', fontSize: '0.096rem', color: '#666' }}>扫码添加微信好友</p>

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -20,6 +20,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const header = props => {
   const sampleId  = props.location.query.id;
   const [demandData, setDemandData] = useState({})
+  const [demandNum, setDemandNum] = useState()
 
   useEffect(() => {
     getDemandData(sampleId);
@@ -29,6 +30,7 @@ const header = props => {
   const getDemandData = (demandId) => {
       request({ ...apis.taH5SampleManager.taH5SampleById, urlData: {id: sampleId} }).then((data) => {
           setDemandData(data)
+          setDemandNum(data.demandNum)
           props.form.setFieldsValue(data)
       })
   }
@@ -103,10 +105,13 @@ const header = props => {
           <Button danger  onClick={() => toCancel()} style={{marginLeft:'20px'}}>
             取消
           </Button>
-            <span style={{marginLeft:'25%'}}>已有需求单？> ></span>
+          {demandNum != 0 && <span style={{marginLeft:'25%'}}>已有{demandNum}需求单> >
             <Button danger  onClick={() => viewDemand()}>
-              查看已有需求单
+            查看已有需求单
             </Button>
+            </span>
+          }
+            
           </div>