yee 8 år sedan
förälder
incheckning
38c1fdf51f

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 25 - 25
build/admin/servicesManage/patent.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
build/user/account/index.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
build/user/account/services.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 5 - 5
build/user/account/services.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
build/user/account/set.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 8 - 8
build/user/account/set.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
build/user/login.css


+ 6 - 2
js/component/account/index/content.jsx

@@ -38,9 +38,11 @@ const Content = React.createClass({
             dataType: "json",
             url: globalConfig.context + "/api/user/homePage",
             success: function (data) {
-                if (data.data.personPortraitUrl && data.data.nickname) {
+                if (data.data && data.data.personPortraitUrl && data.data.nickname) {
                     this.setState({
                         personPortraitUrl: data.data.personPortraitUrl,
+                        logoUrl:data.data.logoUrl,
+                        type:data.data.type,
                         nickname: data.data.nickname,
                         lvl: data.data.lvl,
                         number: data.data.number
@@ -78,7 +80,9 @@ const Content = React.createClass({
                                 <div className="index-userdata clearfix">
                                     <p className="acc-title">{this.state.number}</p>
                                     <div className="userdata-img">
-                                        <img src={globalConfig.staticHost + "/upload" + this.state.personPortraitUrl} alt="" />
+                                        {this.state.type == 0 ?
+                                        <img src={globalConfig.staticHost + "/upload" + this.state.personPortraitUrl} alt="" /> : 
+                                        <img src={globalConfig.staticHost + "/upload" + this.state.logoUrl} alt="" />}
                                     </div>
                                     <div className="userdata-content">
                                         {(() => {

+ 2 - 1
js/component/account/services/patent.jsx

@@ -162,6 +162,7 @@ const Patent = React.createClass({
     },
     closeDesc(e) {
         this.state.showDesc = e;
+        this.loadData();
     },
     search() {
         this.state.searchNum;
@@ -182,7 +183,7 @@ const Patent = React.createClass({
             <div className="patent-content" >
                 <div className="content-title">
                     <span>专利申请管理</span>
-                    {userData.type == '0' ? <span></span> : <PatentAdd />}
+                    {userData.type == '0' ? <span></span> : <PatentAdd closeDesc={this.closeDesc}/>}
                 </div>
                 <Alert style={{ display: this.state.AlertDis }} className="patent-alert" message={this.state.warningText}
                     type="info"

+ 0 - 7
js/component/account/services/patent.less

@@ -123,11 +123,4 @@
             }
         }
     }
-}
-.ant-select-dropdown {
-    .ant-select-dropdown-menu {
-        li:first-child{
-            display: none;
-        }
-    }
 }

+ 3 - 1
js/component/account/services/patentAdd.jsx

@@ -43,7 +43,7 @@ class Avatar extends React.Component {
                 className="avatar-uploader"
                 name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/api/user/patent/upload"}
+                action={globalConfig.context + "/techservice/patent/patentFile"}
                 data={{ 'sign': this.props.name }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
@@ -236,11 +236,13 @@ const PatentAdd = React.createClass({
         this.setState({
             visible: false,
         });
+        this.props.closeDesc(false);
     },
     handleCancel(e) {
         this.setState({
             visible: false,
         });
+        this.props.closeDesc(false);
     },
     spinChange(e) {
         this.setState({

+ 8 - 8
js/component/account/services/patentDesc.jsx

@@ -44,7 +44,7 @@ const PatentDesc = React.createClass({
                     )
                 };
                 this.setState({
-                    stepList:this.state.stepList
+                    stepList: this.state.stepList
                 });
             }.bind(this),
         });
@@ -62,7 +62,7 @@ const PatentDesc = React.createClass({
         this.props.closeDesc(false);
     },
     downloadFile(url, type) {
-        window.open(globalConfig.context + "/open/downloadFile?path=" + url + "?sign=" + type)
+        window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + url + "&sign=" + type)
     },
     confirmButton() {
         this.setState({
@@ -114,24 +114,24 @@ const PatentDesc = React.createClass({
                             </div>
                             <div>
                                 <span>专利相关材料:</span>
-                                {theData.patentWritingUrl !== null && theData.patentWritingUrl !== '' ?
+                                {theData.patentWritingUrl !== null && theData.patentWritingUrl !== undefined && theData.patentWritingUrl !== '' ?
                                     <p className="download-file">
-                                        <a href="" onClick={this.downloadFile.bind(this, theData.patentWritingUrl, "patent_writing_url")}>专利稿件</a>
+                                        <a href="" onClick={this.downloadFile.bind(this, theData.patentWritingUrl, "patent_writing")}>专利稿件</a>
                                         {theData.confirmState == '0' ?
                                             <Button onClick={this.confirmButton}>确认稿件</Button> : <span></span>
                                         }
                                     </p> :
                                     <span></span>
                                 }
-                                {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== '' ?
+                                {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== undefined && theData.authorizationNoticeUrl !== '' ?
                                     <p className="download-file">
-                                        <a href="" onClick={this.downloadFile.bind(this, theData.authorizationNoticeUrl, "authorization_notice_url")}>授权通知书</a>
+                                        <a href="" onClick={this.downloadFile.bind(this, theData.authorizationNoticeUrl, "authorization_notice")}>授权通知书</a>
                                     </p> :
                                     <span></span>
                                 }
-                                {theData.patentCertificateUrl !== null && theData.patentCertificateUrl !== '' ?
+                                {theData.patentCertificateUrl !== null && theData.patentCertificateUrl !== undefined && theData.patentCertificateUrl !== '' ?
                                     <p className="download-file">
-                                        <a href="" onClick={this.downloadFile.bind(this, theData.patentCertificateUrl, "patent_certificate_url")}>专利证书</a>
+                                        <a href="" onClick={this.downloadFile.bind(this, theData.patentCertificateUrl, "patent_certificate")}>专利证书</a>
                                     </p> :
                                     <span></span>
                                 }

+ 1 - 1
js/component/account/set/ablt.jsx

@@ -97,7 +97,7 @@ const Base = React.createClass({
             dataType: "json",
             url: globalConfig.context + "/api/user/ability",
             success: function (data) {
-                if (data.data.abilityLabel) {
+                if (data.data && data.data.abilityLabel) {
                     this.setState({
                         abltArr: data.data.abilityLabel.split(","),
                     });

+ 1 - 1
js/component/account/set/base.jsx

@@ -198,7 +198,7 @@ const BaseFrom = Form.create()(React.createClass({
                     >
                     {getFieldDecorator('birth', {
                         rules: [{ type: 'object', message: '请选择日期!' }],
-                        initialValue: moment(this.state.birth, 'YYYY/MM') || null
+                        initialValue: !this.state.birth ? null : moment( this.state.birth , 'YYYY/MM') 
                     })(
                         <MonthPicker />
                         )}

+ 3 - 2
js/component/account/set/changeMobile.jsx

@@ -38,9 +38,9 @@ const ChangePw = React.createClass({
                     message.success('修改成功!马上跳转到登录页面,请重新登录!');
                     setInterval(function () {
                         $.ajax({
-                            method: "POST",
+                            method: "get",
                             dataType: "json",
-                            url: globalConfig.context + "/login",
+                            url: globalConfig.context + "./login",
                         }).done(function (data) {
                             window.location.href = "../login.html"
                         });
@@ -78,6 +78,7 @@ const ChangePw = React.createClass({
                     "mobile": this.state.mobile
                 },
                 success: function (data) {
+                    let _me = this;
                     if (data.error.length == 0) {
                         message.success('验证码发送成功!');
                         this.setState({

+ 1 - 1
js/component/account/set/changeModal.less

@@ -18,7 +18,7 @@
                 text-align: right;
                 padding-right: 6px;
                 display: inline-block;
-                width: 24%;
+                width: 25%;
             }
             input {
                 width:70%;

+ 3 - 1
js/component/account/set/edu.jsx

@@ -95,6 +95,8 @@ const EduFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
+            xueweiPicUrl : '',
+            xueliPicUrl : ''
         };
     },
     componentDidMount() {
@@ -211,7 +213,7 @@ const EduFrom = Form.create()(React.createClass({
                     {getFieldDecorator('xueliPic')(
                         <Avatar name="xueliPic" urlData={this.xueliPicUrl} />
                     )}
-                    <p>{this.state.xueliPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.xueliPicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{ this.state.xueliPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.xueliPicUrl)}>下载证书</Button> : ""}</p>
                 </FormItem>
                 <FormItem
                     {...formItemLayout}

+ 3 - 1
js/component/account/set/pfs.jsx

@@ -98,6 +98,8 @@ const PfsFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
+            zigePicUrl : '',
+            zhichengPicUrl :''
         };
     },
     componentWillMount() {
@@ -243,7 +245,7 @@ const PfsFrom = Form.create()(React.createClass({
                 </FormItem>
                 <div className="set-explain">
                     <p>要求2M 以下的jpg、jpeg格式的图片。该资料不会公开展示,仅作为审核材料使用。</p>
-                    <p>{this.state.zhichengPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.zhichengPicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{ this.state.zhichengPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.zhichengPicUrl)}>下载证书</Button> : ""}</p>
                 </div>
                 <FormItem
                     {...formItemLayout}

+ 13 - 12
js/component/account/set/tech.jsx

@@ -25,7 +25,7 @@ const TechFrom = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data && data.data.searchAreaCategory && data.data.specialty ) {
                     this.setState({
-                        techpeople:data.data.technicalPeopleNum,
+                        techpeople: data.data.technicalPeopleNum,
                         techzoneArr : data.data.searchAreaCategory.split(","),
                         haveskill : data.data.specialty.split(",")
                     });
@@ -35,7 +35,7 @@ const TechFrom = Form.create()(React.createClass({
             this.props.spinState(false);
         }.bind(this));
     },
-    componentDidMount() {
+    componentWillMount() {
         this.getData();
     },
     handleSubmit(e) {
@@ -106,31 +106,32 @@ const TechFrom = Form.create()(React.createClass({
     },
     addskill(e) {
         let _me = this;
-        let theskill = _me.props.form.getFieldValue('skill')
+        let theSkillArr = _me.state.haveskill;
+        let theskill = _me.props.form.getFieldValue('skill');
         if (theskill !== undefined) {
-            if (_me.state.skillArr.length > 0) {
+            if (_me.state.haveskill.length > 0) {
                 let thebool = true;
-                _me.state.skillArr.map(function (item, i) {
+                _me.state.haveskill.map(function (item, i) {
                     if (item === theskill) {
                         thebool = false
                     };
                 });
                 if (thebool) {
-                    _me.state.skillArr.push(theskill);
+                    theSkillArr =  _me.state.haveskill.concat(theskill);
                 }
-            } else if (_me.state.skillArr.length === 0) {
-                _me.state.skillArr.push(theskill);
-            }
+            } else if (_me.state.haveskill.length === 0) {
+                theSkillArr =  _me.state.haveskill.concat(theskill);
+            };
             this.setState({
-                haveskill: _me.state.skillArr
+                haveskill: theSkillArr
             });
         };
     },
     deleteskill(e) {
         let _me = this.state;
-        _me.skillArr.map(function (item, i) {
+        _me.haveskill.map(function (item, i) {
             if (item === e) {
-                _me.skillArr.splice(i, 1);
+                _me.haveskill.splice(i, 1);
             }
         });
     },

+ 8 - 7
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -13,7 +13,7 @@ class Avatar extends React.Component {
         }
     }
     handleChange(info) {
-        if (!this.props.oid || this.props.oid === "") {
+        if ( !this.props.oid || this.props.oid === "") {
             message.warning('请先选择公司!');
             return;
         };
@@ -62,7 +62,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                 let _me = this;
                 for (var item in data.data) {
                     _me.state.companyOption.push(
-                        <Select.Option value={data.data[item]} key={item}>{data.data[item]}</Select.Option>
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
                     )
                 };
             }.bind(this),
@@ -87,7 +87,7 @@ const PatentAddFrom = Form.create()(React.createClass({
     },
     handleSubmit(e) {
         e.preventDefault();
-        if (!this.state.companyName || this.state.companyName === "") {
+        if ( !this.state.companyName || this.state.companyName === "") {
             message.warning('请先选择公司!');
             return;
         };
@@ -98,7 +98,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/patent/managerApplyPatent",
+                    url: globalConfig.context + "/techservice/patent/manageApplyPatent",
                     data: {
                         'uid':this.state.companyId,
                         'firstInventorIdNumber': values.firstInventorID,
@@ -154,16 +154,17 @@ const PatentAddFrom = Form.create()(React.createClass({
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
             labelCol: { span: 3 },
-            wrapperCol: { span: 12 },
+            wrapperCol: { span: 14 },
         };
         const _me = this;
         return (
             <Form horizontal onSubmit={this.handleSubmit} className="person-form">
                 <Select placeholder="选择公司" 
                 filterOption={(input, option) => { 
-                    this.state.companyId = option.key;
+                    this.setState({companyId : option.key});
                     option.props.value.indexOf(input) >= 0;
                 }}
+                onChange={(e)=>{ this.state.companyName = e;}}
                 showSearch={true} style={{ width: 200 }} >{this.state.companyOption}</Select>
                 <FormItem
                     labelCol={{ span: 24 }}
@@ -229,7 +230,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     {getFieldDecorator('avatar')(
                         <Avatar urlData={this.avatarUrl} name='patent_prory_statement' oid={this.state.companyName} />
                     )}
-                    <span>请上传专利代理委托书</span><a onClick={() => { window.open(globalConfig.context + "/techservice/patent/downLoadTemplate") }}>模板下载</a>
+                    <span>请上传专利代理委托书</span><a onClick={() => { window.open(globalConfig.context + "/techservice/patent/downloadTemplate") }}>模板下载</a>
                 </FormItem>
                 <FormItem>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>

+ 40 - 9
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -123,8 +123,8 @@ const PatentDesc = React.createClass({
             )
         });
     },
-    downloadPic(type) {
-        window.open(globalConfig.context + "/open/downLoadPicture?path=" + type)
+    downloadFile(url, type) {
+        window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + url + "&sign=" + type)
     },
     showModal() {
         this.setState({
@@ -180,8 +180,8 @@ const PatentDesc = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         let _me = this;
-        this.state.patentStateAdd ='';
-        this.state.adminName ='';
+        this.state.patentStateAdd = '';
+        this.state.adminName = '';
         this.state.recordTime = '';
         this.state.adminOption = [];
         this.state.patentProcessList = [];
@@ -229,7 +229,7 @@ const PatentDesc = React.createClass({
                             ]}
                             className="patent-desc-content">
                             <div>
-                                <p className="widthHalf"><span>公司名称:</span>{theData.companyName}</p>
+                                <p className="widthHalf"><span>公司名称:</span>{theData.unitName}</p>
                                 <p className="widthHalf"><span>公司组织机构代码:</span>{theData.companyNum}</p>
                             </div>
                             <div>
@@ -277,10 +277,41 @@ const PatentDesc = React.createClass({
                                 <p className="widthThird"><span>国籍:</span>中国</p>
                             </div>
                             <div className="clearfix">
-                                <p>材料管理:
-                                    <span>{theData.patentProryStatementUrl !== null ? <a onClick={this.downloadPic.bind(this, theData.patentProryStatementUrl)}>专利代理委托书</a> : ""}</span>
-                                    <span>{theData.lastYearTaxReportUrl !== null ? <a onClick={this.downloadPic.bind(this, theData.lastYearTaxReportUrl)}>上年度纳税表</a> : ""}</span>
-                                </p>
+                                <div>材料管理:
+                                    {theData.patentWritingUrl !== null && theData.patentWritingUrl !== undefined && theData.patentWritingUrl !== '' ?
+                                    <p className="download-file">
+                                        <a href="" onClick={this.downloadFile.bind(this, theData.patentWritingUrl, "patent_writing")}>专利稿件</a>
+                                        {theData.confirmState == '0' ?
+                                            <Button onClick={this.confirmButton}>确认稿件</Button> : <span></span>
+                                        }
+                                    </p> :
+                                    <span></span>
+                                    }
+                                    {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== undefined && theData.authorizationNoticeUrl !== '' ?
+                                        <p className="download-file">
+                                            <a href="" onClick={this.downloadFile.bind(this, theData.authorizationNoticeUrl, "authorization_notice")}>授权通知书</a>
+                                        </p> :
+                                        <span></span>
+                                    }
+                                    {theData.patentCertificateUrl !== null && theData.patentCertificateUrl !== undefined && theData.patentCertificateUrl !== '' ?
+                                        <p className="download-file">
+                                            <a href="" onClick={this.downloadFile.bind(this, theData.patentCertificateUrl, "patent_certificate")}>专利证书</a>
+                                        </p> :
+                                        <span></span>
+                                    }
+                                    {theData.patentProryStatementUrl !== null && theData.patentProryStatementUrl !== undefined && theData.patentProryStatementUrl !== '' ?
+                                        <p className="download-file">
+                                            <a href="" onClick={this.downloadFile.bind(this, theData.patentProryStatementUrl, "patent_prory_statement")}>专利代理委托书</a>
+                                        </p> :
+                                        <span></span>
+                                    }
+                                    {theData.lastYearTaxReportUrl !== null && theData.lastYearTaxReportUrl !== undefined && theData.lastYearTaxReportUrl !== '' ?
+                                        <p className="download-file">
+                                            <a href="" onClick={this.downloadFile.bind(this, theData.lastYearTaxReportUrl, "last_year_taxReport")}>专利代理委托书</a>
+                                        </p> :
+                                        <span></span>
+                                    }
+                                </div>
                                 <Avatar urlData={this.getPatentWritingUrl} name='patent_writing' oid={theData.oid}/>
                                 <Avatar urlData={this.getAuthorizationNoticeUrl} name='authorization_notice' oid={theData.oid}/>
                                 <Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' oid={theData.oid}/>

+ 5 - 3
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -29,7 +29,7 @@ const Patent = React.createClass({
                 locationProvince: this.state.province,
                 unitName: this.state.unitName,
                 patentCatagory: this.state.patentType,
-                patentState: this.state.searchState,
+                patentState: this.state.patentState,
                 createTime: this.state.createTime,
                 patentApplicationDate: this.state.startTime,
                 authorizedDate: this.state.endTime,
@@ -63,7 +63,7 @@ const Patent = React.createClass({
                         endTime: thisdata.authorizedDate,
                         orgCode: thisdata.orgCode,
                         province:thisdata.locationProvince,
-                        companyAddress: thisdata.locationProvince + '/' + thisdata.locationCity + '/' + thisdata.locationArea,
+                        companyAddress: thisdata.locationProvince || thisdata.locationCity || thisdata.locationArea ? thisdata.locationProvince + '/' + thisdata.locationCity + '/' + thisdata.locationArea : '',
                         companyContacts: thisdata.contacts, //联系人
                         firstInventorName: thisdata.firstInventorName,
                         firstInventorNationality: thisdata.firstInventorNationality, //国籍
@@ -282,6 +282,8 @@ const Patent = React.createClass({
         this.state.endTime = [];
         this.state.startTime = [];
         this.state.author = '';
+        this.state.searchKey = '';
+        this.state.searchValue = '';
         this.loadData();
     },
     exportComposite() {
@@ -346,7 +348,7 @@ const Patent = React.createClass({
                         <Select.Option value="patentName">专利名称</Select.Option>
                     </Select>
                     <Input value={this.state.searchValue} onChange={this.searchSelect} />
-                    <Select placeholder="专利状态" value={this.state.searchState} style={{ width: 200 }} onChange={(e) => { this.setState({ searchState: e }); }}>{this.state.patentStateOption}</Select>
+                    <Select placeholder="专利状态" value={this.state.patentState} style={{ width: 200 }} onChange={(e) => { this.setState({ patentState: e }); }}>{this.state.patentStateOption}</Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button type="ghost" onClick={this.exportComposite}>导出</Button>

+ 2 - 2
js/component/manageCenter/servicesManage/patent/express.jsx

@@ -43,10 +43,10 @@ const Express = React.createClass({
                         authorizationIssueTime:thisdata.authorizationIssueTimeFormattedDate,
                         authorizationTrackingNumber:thisdata.authorizationTrackingNumber,
                         authorization:[thisdata.authorizationReceiveTimeFormattedDate,thisdata.authorizationIssueTimeFormattedDate],
-                        certificateReceiveTime:thisdata.certificateReceiveTimeFormattedDate,
+                        certificateRecieveTime:thisdata.certificateRecieveTimeFormattedDate,
                         certificateIssueTime:thisdata.certificateIssueTimeFormattedDate,
                         certificateTrackingNumber:thisdata.certificateTrackingNumber,
-                        certificate:[thisdata.certificateReceiveTimeFormattedDate,thisdata.certificateIssueTimeFormattedDate],
+                        certificate:[thisdata.certificateRecieveTimeFormattedDate,thisdata.certificateIssueTimeFormattedDate],
                         rid:thisdata.rid,
                         pid:thisdata.pid
                     });

+ 1 - 1
js/component/manageCenter/servicesManage/patent/payment.jsx

@@ -119,7 +119,7 @@ const Payment = React.createClass({
                     dataIndex: 'annualFeeState',
                     key: 'annualFeeState',
                     render: text => {
-                        if (text === '0') {
+                        if (text == '0') {
                             return '未缴费'
                         }
                     },

+ 11 - 9
js/component/tools.js

@@ -1,3 +1,4 @@
+import {message} from 'antd';
 import {
     provinceList,
     patentTypeList,
@@ -80,15 +81,16 @@ module.exports = {
         reader.readAsDataURL(img);
     },
     beforeUpload: function (file) {
-        const isJPG = file.type === 'image/jpeg';
-        if (!isJPG) {
-            message.error('You can only upload JPG file!');
-        }
-        const isLt2M = file.size / 1024 / 1024 < 2;
-        if (!isLt2M) {
-            message.error('Image must smaller than 2MB!');
-        }
-        return isJPG && isLt2M;
+        // debugger
+        // const isJPG = file.type === 'image/jpeg/document';
+        // if (!isJPG) {
+        //     message.error('You can only upload JPG file!');
+        // }
+        // const isLt2M = file.size / 1024 / 1024 < 2;
+        // if (!isLt2M) {
+        //     message.error('Image must smaller than 2MB!');
+        // }
+        // return isJPG && isLt2M;
     },
     getTime: function (e, t) {
         if (e && !t) {