commit

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

@@ -15,7 +15,8 @@ const BatchDel = props => {
     props.form.validateFields((err, values) => {
       if (!err){
         request({ ...apis.taH5SampleManager.batchDelDemands, data: { taH5Demands: taRaiseRecords }, }).then((data) => {
-          message.info("操作成功")
+          const resultMessage = '操作成功，其中'+data.successNum+'条成功删除，'+data.failNum+'条非作废/提交状态未删除。'
+          message.info(resultMessage)
           props.onSuccess(false);
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -38,7 +39,7 @@ const BatchDel = props => {
             <Button type="primary" htmlType="submit" >
               确定
             </Button>
-            <Button type="primary" onClick={props.onCancel} style={{marginLeft:'20px'}}>
+            <Button onClick={props.onCancel} style={{marginLeft:'20px'}}>
               取消
             </Button>
           </Form.Item>

src/pages/h5SampleManager/h5Demand/edit.jsx

@@ -77,9 +77,7 @@ const header = props => {
           <Button type="primary" htmlType="submit">
             保存
           </Button>
-          <Button className={channels.formButton} onClick = { go } type="primary" htmlType="submit">
-            取消
-          </Button>
+          <Button className={channels.formButton}  onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
   </>

src/pages/h5SampleManager/h5Demand/list.jsx

@@ -148,12 +148,15 @@ const header = props => {
   }
 
   function showBatchDel(e){
+  
     if (demandIds.length <= 0){
       message.info("请选择数据");
       return;
     }
     setBatchDel(e);
-    getList();
+    if(!e.visable){
+      getList()
+    }
   }
 
   function addDemandInfo(e){

src/pages/h5SampleManager/h5Sample/add.jsx

@@ -87,6 +87,7 @@ const header = props => {
               message: '请填写正确的联系方式',
               max:11,
               min:11,
+              pattern: new RegExp('^[0-9]*$'),
             },
           ],
         })(<Input/>)}

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -84,8 +84,8 @@ const header = props => {
         <Form.Item label="样例名">
           <span>{demandData.sampleName}</span>
         </Form.Item>
-        {demandData.sampleTryLink != '' && demandData.sampleTryLink != null && <Form.Item label="样例体验链接">
-          <span>{demandData.sampleTryLink}</span><span style={{ marginLeft: '10px' }}><a onClick={(e) => copyLink(demandData.sampleTryLink)} style={{ color: 'orange' }}> <img src={copyImg} height="16px" width="14px" /> 复制链接</a></span>
+        {demandData.sampleTryLink != '' && demandData.sampleTryLink != null && <Form.Item label="样例体验链接" help="请复制发送到手机，用手机微信打开，PC端打开样式比例与手机端不同，以手机端为准">
+          <span>{demandData.sampleTryLink}</span><span style={{marginLeft:'10px'}}><a onClick={(e) => copyLink(demandData.sampleTryLink)} style={{ color: 'orange' }}> <img src={copyImg} height="16px" width="14px" /> 复制链接</a></span>
         </Form.Item>}
         {demandData.sampleTryCode != '' && demandData.sampleTryCode != null && <Form.Item label="样例体验小程序码/二维码" help="请使用微信扫码查看样例体验">
           <img src={demandData.sampleTryCode} height="100px" width="120px" />
@@ -95,7 +95,7 @@ const header = props => {
           <DragableUploadImageList sampleId={sampleId}></DragableUploadImageList>
         </Form.Item>}
         <Form.Item label="样例内容">
-          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<Wangedit contenteditable={false} />) : getFieldDecorator('sampleContentLink')(<a href={demandData.sampleContentLink} target="_blank">{demandData.sampleContentLink}</a>)}
+            {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<Wangedit contenteditable={false}/>) : getFieldDecorator('sampleContentLink')(<a style={{color: "blue"}}  href={demandData.sampleContentLink} target="_blank" >{demandData.sampleContentLink}</a>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>