Conflicts:
	css/main/style.css
	css/main/style.less
This commit is contained in:
merelendor 2022-08-19 08:26:14 +03:00
commit 1c9f485c79
21 changed files with 194 additions and 777 deletions

View File

@ -491,8 +491,8 @@ export const getContractGraphicChangeCalculate = (calculation) =>
return new Promise((resolve, reject) =>
{
axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/contract/change/graphic/calculate`, { calculation },
axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/contract/change/graphic/calculate`, calculation,
{
withCredentials: true,
})
@ -562,10 +562,26 @@ export const getContractGraphicChangeGetCalculated = ({ dispatch, calculation })
});
}
export const signContractGraphicChange = ({ dispatch, number }) =>
export const signContractGraphicChange = (params) =>
{
console.log("ACTION", "signContractGraphicChange", params);
return new Promise((resolve, reject) =>
{
resolve();
axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/contract/change/graphic/sign`, params,
{
withCredentials: true,
})
.then(async (response) =>
{
console.log("ACTION", "signContractGraphicChange", "response.data", response.data);
resolve(response.data.comment);
})
.catch((error) =>
{
console.error("ACTION", "signContractGraphicChange", "error");
console.error(error);
reject();
});
});
}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":["style.less"],"names":[],"mappings":"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"}
{"version":3,"sources":["style.less"],"names":[],"mappings":"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"}

View File

@ -585,6 +585,10 @@ ul.custom-dots {
outline: none;
box-shadow: none !important;
border: 0;
@media all and (max-width:768px) {
margin-top: 0;
}
}
.rw-input-addon.rw-picker-btn {

View File

@ -4672,3 +4672,24 @@ main .dropdown_blocks_list .dropdown_block .block_body .fines_detail ul li {
color: #fff;
text-decoration: underline;
}
.form_field .input_with_notes {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
max-width: 320px;
margin-left: 20px;
}
@media all and (max-width: 768px) {
.form_field .input_with_notes {
margin-left: 0;
}
}
.form_field .input_with_notes input {
width: 100%;
margin-bottom: 6px;
margin-left: 0;
}
.form_field .input_with_notes span {
font-size: 12px;
margin-bottom: -14px;
}

File diff suppressed because one or more lines are too long

View File

@ -5307,3 +5307,28 @@ main .dropdown_blocks_list .dropdown_block .block_body {
}
}
}
.form_field {
.input_with_notes {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
max-width: 320px;
margin-left: 20px;
@media all and (max-width: 768px) {
margin-left: 0;
}
input {
width: 100%;
margin-bottom: 6px;
margin-left: 0;
}
span {
font-size: 12px;
margin-bottom: -14px;
}
}
}

View File

@ -5,5 +5,5 @@ export default async function handler(req, res)
{
console.log("WTF BODY");
console.log(req.body);
await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/CreateCalculation`, req.body.calculation);
await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/CreateCalculation?contract_number=${ req.body.contract_number }`, req.body);
}

View File

@ -0,0 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import CRMRequestPost from '../../../../../lib/CRMRequestPost';
export default async function handler(req, res)
{
await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/Signing?addcontract_number=${ req.body.addcontract_number }`, req.body);
}

View File

@ -223,7 +223,7 @@ class ChangeGraphicPage extends React.Component
<div className="form_field">
<input type="checkbox" hidden id="fix_pay" name="fix_pay" />
<label htmlFor="fix_pay">
Фиксировать послединий платеж
Фиксировать последний платеж
</label>
<div className="help_tooltip">
<div className="help_icon">
@ -248,13 +248,13 @@ class ChangeGraphicPage extends React.Component
<div className="form_field">
<input type="radio" hidden id="weeekend_type_1" name="weeekend_type" />
<label htmlFor="weeekend_type_1">
Фиксировать послединий платеж
Фиксировать последний платеж
</label>
</div>
<div className="form_field">
<input type="radio" hidden id="weeekend_type_2" name="weeekend_type" />
<label htmlFor="weeekend_type_2">
Фиксировать послединий платеж
Фиксировать последний платеж
</label>
</div>
</div>

View File

@ -14,10 +14,6 @@ export default class Comparison extends React.Component
super(props);
this.state = {
date: null,
car: null,
contract_date: null,
agreement: null,
rules: null,
loading: false,
calculation: null,
today: moment(),
@ -70,17 +66,24 @@ export default class Comparison extends React.Component
_handle_onOptions = () =>
{
this.props.onOptions();
if(this.props.editable)
{
this.props.onOptions();
}
else
{
this.props.onBack();
}
}
_handle_onSignPaper = () =>
{
this.props.onSign(0);
}
_handle_onSignEDMS = () =>
_handle_onSignEDO = () =>
{
this.props.onSign(1);
}
_handle_onMixedPayment = (index) =>
@ -293,9 +296,11 @@ export default class Comparison extends React.Component
<button className="button button-blue" onClick={ this._handle_onSignPaper }>
Согласовать и подписать в бумажном виде
</button>
<button className="button button-blue" onClick={ this._handle_onSignEDMS }>
{/*}
<button className="button button-blue" onClick={ this._handle_onSignEDO }>
Согласовать и подписать по ЭДО
</button>
{*/}
</div>
</article>
);

View File

@ -12,15 +12,14 @@ export default class Comparison extends React.Component
render()
{
const { number, signer, signatories } = this.props;
const { number, comment } = this.props;
return (
<article className="compare">
<div className="compare_message">
<p>
Дополнительное соглашение отправлено на согласование. После согласования документ появится на странице <br />
<Link href={`/contract/${ number }/agreement`}>«Документы по договору» </Link>
</p>
<p>{ comment }</p>
<br/>
<p>Перейти в раздел <Link href={`/contract/${ number }/agreement`}>«Документы по договору» </Link></p>
</div>
</article>
);

View File

@ -104,7 +104,7 @@ class FixLastPayment extends React.Component
<div className="form_field">
<input type="checkbox" hidden id="fix_pay" name="fix_pay" checked={ value } onChange={ this._handle_onChange }/>
<label htmlFor="fix_pay">
Фиксировать послединий платеж
Фиксировать последний платеж
</label>
<div className="help_tooltip">
<div className="help_icon">
@ -296,9 +296,11 @@ class SumSelector extends React.Component
return (
<div className="form_field">
<label>Увеличить платеж на (ЧДП)</label>
<input type="number" placeholder="Укажите сумму" defaultValue={ value } onChange={ this._handle_onChange }/>
<div style={{ position: "absolute", left: 214, top: 46, fontSize: 12 }}>от { numeral(min).format(' ., ') }&nbsp;</div>
<div style={{ position: "absolute", left: 440, top: 46, fontSize: 12 }}>до { numeral(max).format(' ., ') }&nbsp;</div>
<div className="input_with_notes">
<input type="number" placeholder="Укажите сумму" defaultValue={ value } onChange={ this._handle_onChange }/>
<span>от { numeral(min).format(' ., ') }&nbsp;</span>
<span>до { numeral(max).format(' ., ') }&nbsp;</span>
</div>
<div className="help_tooltip">
<div className="help_icon">
<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg">
@ -373,9 +375,11 @@ class InsurancePriceSelector extends React.Component
return (
<div className="form_field">
<label>Сумма пролонгации</label>
<div className="input_with_notes">
<input type="number" placeholder="Укажите сумму" defaultValue={ value } onChange={ this._handle_onChange }/>
<div style={{ position: "absolute", left: 214, top: 46, fontSize: 12 }}>от { numeral(min).format(' ., ') }&nbsp;</div>
<div style={{ position: "absolute", left: 440, top: 46, fontSize: 12 }}>до { numeral(max).format(' ., ') }&nbsp;</div>
<span>от { numeral(min).format(' ., ') }&nbsp;</span>
<span>до { numeral(max).format(' ., ') }&nbsp;</span>
</div>
<div className="help_tooltip">
<div className="help_icon">
<svg width={ 24 } height={ 24 } fill="none" xmlns="http://www.w3.org/2000/svg">
@ -516,6 +520,18 @@ export default class Options extends React.Component
event.preventDefault();
console.log(this.props);
const selected = {
number_planpayment: options.number_planpayment.value,
};
if(number_paydate !== null) { selected.number_paydate = moment(number_paydate).format(); }
if(period_new !== null) { selected.period_new = period_new; }
if(fix_last_payment_available !== null) { selected.fix_last_payment_available = fix_last_payment_available; }
if(date_offset_type !== null) { selected.date_offset_type = date_offset_type; }
if(sum !== null) { selected.sum = sum; }
if(insurance_price_result !== null) { selected.insurance_price_result = insurance_price_result; }
//if(early_redemption_change !== null) { selected.early_redemption_change = early_redemption_change; }
if(datefrom !== null) { selected.datefrom = moment(datefrom).format(); }
if(!sending)
{
const v = {};
@ -523,17 +539,7 @@ export default class Options extends React.Component
const payload = {
...{ contract_number: number },
...v,
...{
number_paydate: number_paydate !== null ? moment(number_paydate).format() : null,
period_new,
fix_last_payment_available,
date_offset_type,
sum: sum === null ? 0 : sum,
insurance_price_result: insurance_price_result === null ? 0 : insurance_price_result,
datefrom: datefrom !== null ? moment(datefrom).format() : null,
early_redemption_change: false,
number_planpayment: options.number_planpayment.value,
}
...selected
};
console.log(payload);
@ -545,20 +551,11 @@ export default class Options extends React.Component
console.log("calculationcalculationcalculationcalculationcalculation");
console.log(calculation);
/*
onCalculate()
.then(() =>
{
})
.catch(() =>
{
this.setState({ sending: false, });
});
*/
onCalculate(calculation.addcontract_number);
})
.catch(() =>
{
this.setState({ sending: false, });
});
});
}

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from "next/head";
import Image from "next/image";
import { connect } from "react-redux";
@ -23,12 +22,14 @@ import VariantsList from "./components/VariantsList";
import Final from "./components/Final";
import {
getContractInfo,
getContractGraphicChange,
getContractGraphicChangeVariants,
getContractGraphicChangeGetCurrent,
getContractGraphicChangeGetCalculated,
getContractGraphicChangeSignatories,
getContractInfo,
getContractGraphicChange,
getContractGraphicChangeVariants,
getContractGraphicChangeGetCurrent,
getContractGraphicChangeGetCalculated,
getContractGraphicChangeSignatories,
getContractGraphicChangeCalculationsList,
signContractGraphicChange,
} from "../../../actions";
import Options from "./components/Options";
import Comparison from "./components/Comparison";
@ -41,9 +42,6 @@ class ChangeGraphicPage extends React.Component
this.state = {
date: null,
car: null,
contract_date: null,
agreement: null,
rules: null,
loading: false,
mode_options: false,
mode_comparison: false,
@ -70,6 +68,8 @@ class ChangeGraphicPage extends React.Component
options: null,
current: null,
calculated: null,
comment: null,
editable: false,
};
}
@ -79,9 +79,6 @@ class ChangeGraphicPage extends React.Component
return {
date: nextProps.date,
car: nextProps.car,
contract_date: nextProps.contract_date,
agreement: nextProps.agreement,
rules: nextProps.rules,
signatories: nextProps.signatories,
calculations: nextProps.calculations,
variants: nextProps.variants,
@ -194,6 +191,11 @@ class ChangeGraphicPage extends React.Component
});
}
_handle_onBack = () =>
{
this.setState({ mode_options: false, mode_comparison: false });
}
_handle_onOptions = () =>
{
this.setState({ mode_options: true, mode_comparison: false });
@ -204,14 +206,50 @@ class ChangeGraphicPage extends React.Component
this.setState({ signer: signer_id });
}
_handle_onCalculate = () =>
_handle_onSign = (type) =>
{
this.setState({ mode_options: false, mode_comparison: true });
const { calculation_id, signer, } = this.state;
const { number, } = this.props;
this.setState({ loading: true }, () =>
{
signContractGraphicChange({
contract_number: number,
addcontract_number: calculation_id,
signatoryid: signer,
type
})
.then((comment) =>
{
this.setState({ loading: false, mode_final: true, mode_options: false, mode_comparison: false, comment });
})
.catch(() =>
{
this.setState({ loading: false, });
});
});
}
_handle_onCalculation = (calculation_id) =>
_handle_onCalculate = (calculation_id) =>
{
this.setState({ loading: true, mode_options: false, calculation_id: calculation_id }, () =>
const { dispatch, number } = this.props;
getContractGraphicChangeCalculationsList({ dispatch, number })
.then(() =>
{
setTimeout(() =>
{
this._handle_onCalculation(calculation_id, true);
}, 100);
})
.catch(() =>
{
});
}
_handle_onCalculation = (calculation_id, editable = false) =>
{
this.setState({ editable: editable, loading: true, mode_options: false, calculation_id: calculation_id }, () =>
{
const { dispatch, number } = this.props;
@ -228,7 +266,7 @@ class ChangeGraphicPage extends React.Component
render()
{
const { loading, mode_options, mode_comparison, mode_calculation, mode_final, date, car, contract_date, agreement, rules, signer, signatories, calculations, calculation_id, variants, variants_loading, variants_selected, variants_types, variants_unavailable, options, current, calculated, } = this.state;
const { loading, mode_options, mode_comparison, mode_calculation, mode_final, date, car, signer, signatories, calculations, calculation_id, editable, variants, variants_loading, variants_selected, variants_types, variants_unavailable, options, current, calculated, comment } = this.state;
const { number } = this.props;
return (
@ -267,7 +305,7 @@ class ChangeGraphicPage extends React.Component
<>
{ mode_final ? (
<div className="aside_container about">
<Final number={ number }/>
<Final number={ number } comment={ comment }/>
</div>
) : (
<div className="aside_container about">
@ -276,9 +314,13 @@ class ChangeGraphicPage extends React.Component
signatories={ signatories }
calculations={ calculations }
calculation_id={ calculation_id }
editable={ editable }
current={ current }
calculated={ calculated }
onOptions={ this._handle_onOptions } onSigner={ this._handle_onSigner }
onBack={ this._handle_onBack }
onOptions={ this._handle_onOptions }
onSigner={ this._handle_onSigner }
onSign={ this._handle_onSign }
/>
</div>
) }
@ -359,11 +401,8 @@ class ChangeGraphicPage extends React.Component
function mapStateToProps(state, ownProps)
{
return {
contract_date: state.contract.date,
date: state.contract.date,
car: state.contract.car,
agreement: state.contract.agreement,
rules: state.contract.rules,
signatories: state.contract.change.signatories,
calculations: state.contract.change.calculations,
variants: state.contract.change.variants,

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from "next/head";
import Image from "next/image";
@ -186,8 +185,6 @@ class ContractDocumentsPage extends React.Component
_handle_onPeriodDate_end = (date) =>
{
console.log("_handle_onPeriodDate_end", "date", date);
const {
valid_date_start,
valid_date_end,
@ -227,7 +224,6 @@ class ContractDocumentsPage extends React.Component
_handle_onGroup = (group) =>
{
console.log("group", group);
const opened = [...this.state.opened];
if (opened.indexOf(group) < 0)
@ -266,8 +262,6 @@ class ContractDocumentsPage extends React.Component
.slice(0, opened.indexOf(type) > -1 ? documents.length : 3)
.map((doc, index) =>
{
console.log("doc", doc);
return (
<div className="row" key={index}>
<p
@ -337,29 +331,14 @@ class ContractDocumentsPage extends React.Component
_handle_onPenaltiesShow = (date) =>
{
console.log("_handle_onPenaltiesShow", "date", date);
const { number } = this.props;
window.scrollTo(0, 0);
this.setState({ penalties: true, penalties_date: date, penalties_result: undefined }, () =>
{
ReactDOM.findDOMNode(this).parentNode.style.height = "100%";
ReactDOM.findDOMNode(this).parentNode.style.display = "flex";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "column";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "spaceBetween";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "stretch";
document.documentElement.style.height = "100%";
document.documentElement.style.display = "flex";
document.documentElement.style.flexDirection = "column";
document.body.style.height = "100%";
document.body.style.display = "flex";
document.body.style.flexDirection = "column";
getContractPenalties({ number, date })
.then((result) =>
{
console.log("result", result);
this.setState({ penalties_result: result });
})
.catch(() =>
@ -373,18 +352,6 @@ class ContractDocumentsPage extends React.Component
{
this.setState({ penalties: false, penalties_result: undefined }, () =>
{
ReactDOM.findDOMNode(this).parentNode.style.height = "unset";
ReactDOM.findDOMNode(this).parentNode.style.display = "unset";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "unset";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "unset";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "unset";
document.documentElement.style.height = "unset";
document.documentElement.style.display = "unset";
document.documentElement.style.flexDirection = "unset";
document.body.style.height = "unset";
document.body.style.display = "unset";
document.body.style.flexDirection = "unset";
});
}
@ -409,12 +376,6 @@ class ContractDocumentsPage extends React.Component
penalties_result,
} = this.state;
console.log("documentsdocumentsdocumentsdocumentsdocuments");
console.log(documents);
console.log("opened");
console.log(opened);
return (
<React.Fragment>
<Head>
@ -423,7 +384,7 @@ class ContractDocumentsPage extends React.Component
</Head>
<Header { ...this.props }/>
{ penalties ? (
<main style={{ height: "100%", display: "flex", flexDirection: "column" }}>
<main>
<section>
<div className="clear"></div>
<div className="container">

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from 'next/head';
import Image from 'next/image';
import Link from "next/link";
@ -42,19 +41,6 @@ class IndexPage extends React.Component
componentDidMount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "100%";
ReactDOM.findDOMNode(this).parentNode.style.display = "flex";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "column";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "spaceBetween";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "stretch";
document.documentElement.style.height = "100%";
document.documentElement.style.display = "flex";
document.documentElement.style.flexDirection = "column";
document.body.style.height = "100%";
document.body.style.display = "flex";
document.body.style.flexDirection = "column";
this.setState({ loading: true }, () =>
{
getUsers({ dispatch: this.props.dispatch })
@ -69,22 +55,6 @@ class IndexPage extends React.Component
});
}
componentWillUnmount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "unset";
ReactDOM.findDOMNode(this).parentNode.style.display = "unset";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "unset";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "unset";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "unset";
document.documentElement.style.height = "unset";
document.documentElement.style.display = "unset";
document.documentElement.style.flexDirection = "unset";
document.body.style.height = "unset";
document.body.style.display = "unset";
document.body.style.flexDirection = "unset";
}
render()
{
const { user, users } = this.state;
@ -99,7 +69,7 @@ class IndexPage extends React.Component
/>
</Head>
<Header { ...this.props }/>
<main style={{ flex: 1, display: "flex", flexDirection: "column" }}>
<main>
<section>
<div className="clear"></div>
<div className="container">

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from 'next/head';
import Image from 'next/image';
import Link from "next/link";
@ -46,34 +45,10 @@ class IndexPage extends React.Component
componentDidMount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "100%";
ReactDOM.findDOMNode(this).parentNode.style.display = "flex";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "column";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "spaceBetween";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "stretch";
document.documentElement.style.height = "100%";
document.documentElement.style.display = "flex";
document.documentElement.style.flexDirection = "column";
document.body.style.height = "100%";
document.body.style.display = "flex";
document.body.style.flexDirection = "column";
}
componentWillUnmount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "unset";
ReactDOM.findDOMNode(this).parentNode.style.display = "unset";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "unset";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "unset";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "unset";
document.documentElement.style.height = "unset";
document.documentElement.style.display = "unset";
document.documentElement.style.flexDirection = "unset";
document.body.style.height = "unset";
document.body.style.display = "unset";
document.body.style.flexDirection = "unset";
}
_handle_onPasswordSubmit = (event) =>
@ -163,7 +138,7 @@ class IndexPage extends React.Component
/>
</Head>
<Header { ...this.props }/>
<main style={{ flex: 1, display: "flex", flexDirection: "column" }}>
<main>
<section>
<div className="clear"></div>
<div className="container">

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from 'next/head';
import Image from 'next/image';
import Link from "next/link";
@ -52,34 +51,6 @@ class IndexPage extends React.Component
componentDidMount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "100%";
ReactDOM.findDOMNode(this).parentNode.style.display = "flex";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "column";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "spaceBetween";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "stretch";
document.documentElement.style.height = "100%";
document.documentElement.style.display = "flex";
document.documentElement.style.flexDirection = "column";
document.body.style.height = "100%";
document.body.style.display = "flex";
document.body.style.flexDirection = "column";
}
componentWillUnmount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "unset";
ReactDOM.findDOMNode(this).parentNode.style.display = "unset";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "unset";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "unset";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "unset";
document.documentElement.style.height = "unset";
document.documentElement.style.display = "unset";
document.documentElement.style.flexDirection = "unset";
document.body.style.height = "unset";
document.body.style.display = "unset";
document.body.style.flexDirection = "unset";
}
_handle_onPhoneSubmit = (event) =>
@ -194,7 +165,7 @@ class IndexPage extends React.Component
/>
</Head>
<Header { ...this.props }/>
<main style={{ flex: 1, display: "flex", flexDirection: "column" }}>
<main>
<section>
<div className="clear"></div>
<div className="container">

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from "next/head";
import Image from "next/image";
import { connect } from "react-redux";

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from "next/head";
import Image from "next/image";
import { connect } from "react-redux";

View File

@ -1,5 +1,4 @@
import React from "react";
import * as ReactDOM from 'react-dom';
import Head from "next/head";
import Image from "next/image";
import { connect } from "react-redux";
@ -49,19 +48,6 @@ class SupportRequestPage extends React.Component
{
console.log("CDM", "SupportRequestPage", this.state);
ReactDOM.findDOMNode(this).parentNode.style.height = "100%";
ReactDOM.findDOMNode(this).parentNode.style.display = "flex";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "column";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "spaceBetween";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "stretch";
document.documentElement.style.height = "100%";
document.documentElement.style.display = "flex";
document.documentElement.style.flexDirection = "column";
document.body.style.height = "100%";
document.body.style.display = "flex";
document.body.style.flexDirection = "column";
if (!this.state.loading)
{
this.setState({ loading: true }, () =>
@ -79,22 +65,6 @@ class SupportRequestPage extends React.Component
}
}
componentWillUnmount()
{
ReactDOM.findDOMNode(this).parentNode.style.height = "unset";
ReactDOM.findDOMNode(this).parentNode.style.display = "unset";
ReactDOM.findDOMNode(this).parentNode.style.flexDirection = "unset";
ReactDOM.findDOMNode(this).parentNode.style.justifyContent = "unset";
ReactDOM.findDOMNode(this).parentNode.style.alignItems = "unset";
document.documentElement.style.height = "unset";
document.documentElement.style.display = "unset";
document.documentElement.style.flexDirection = "unset";
document.body.style.height = "unset";
document.body.style.display = "unset";
document.body.style.flexDirection = "unset";
}
componentDidUpdate(prevProps, prevState)
{
}
@ -171,7 +141,7 @@ class SupportRequestPage extends React.Component
<meta name="description" content="ЛК Эволюция автолизинга" />
</Head>
<Header { ...this.props } />
<main style={{ flex: 1, display: "flex", flexDirection: "column" }}>
<main>
<section>
<div className="clear"></div>
<div className="container">