Merge branch 'master' of http://gitlab.logwire.cn/joechan.chen/wechat

src/common/commonview/singleitem/index.js

@@ -6,6 +6,7 @@ import {Picker,DatePicker} from 'antd-mobile'
 import moment from 'moment'
 import pickdown from '../../../assets/pickdown.png'
 import datepick from '../../../assets/datepick.png'
+import dele from '../../../assets/delete.png'
 
 export default class SingleItem extends Component{
     constructor(props){
@@ -132,13 +133,14 @@ export function SinglePicker(props){
 export function SingleDatePicker(props){
     const CustomChildren = ({ extra, onClick, children,outerStyle }) => (       
         <div      
-            onClick={onClick}
+            
             style={{ backgroundColor: 'transparent',height: '.6rem', lineHeight: '.6rem' }}>
-            <div style={{ float:'left',height: '100%',width:'80%' }}>
+            <div onClick={onClick} style={{ float:'left',height: '100%',width:'80%' }}>
                 <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',marginLeft:'.4rem' }}>{children}</div>
             </div>
-            <div style={{float:'right',height:'100%',width:'15%',marginTop:'.06rem',marginRight:'0.2rem'}}>
-                <img src={datepick} />
+            <div onClick={children=="请选择"?props.del:v=>{
+                props.onChange()}}  style={{float:'right',height:'100%',width:'15%',marginTop:'.06rem',marginRight:'0.2rem'}}>
+                <img src={children=="请选择"?datepick:dele} />
             </div>
         </div>
     );