Commit 7a26f894 authored by 熊成伟's avatar 熊成伟

debug

parent 7ec0a042
......@@ -2,12 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/StepCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/StepCard/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/StepCard/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/StepCard/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/layout/CommonLayout.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/layout/CommonLayout.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Work/Work.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/Work.jsx" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -21,20 +21,32 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="8" selection-start-line="8" selection-end-line="9" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="58" column="28" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
<state relative-caret-position="92">
<caret line="69" column="44" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="44" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/layout/BlankLayout.jsx">
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
<state relative-caret-position="150">
<caret line="15" column="68" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="68" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
......@@ -42,11 +54,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
<state relative-caret-position="-250">
<caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
......@@ -55,22 +67,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="14" column="61" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="61" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
<state relative-caret-position="25">
<caret line="46" column="35" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
</state>
</provider>
</entry>
......@@ -110,6 +110,9 @@
<find>am-tab-bar-tab-title</find>
<find>console.log</find>
<find>contract-operate_recodeMain</find>
<find>auto-step-content-flow</find>
<find>auto-step-content-head</find>
<find>step-content-wrapper</find>
</findStrings>
<replaceStrings>
<replace>this.props</replace>
......@@ -161,9 +164,12 @@
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
<option value="$PROJECT_DIR$/src/index.css" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.less" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
</list>
</option>
......@@ -189,17 +195,6 @@
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="img" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
......@@ -215,7 +210,8 @@
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="layout" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="WorkCard" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
......@@ -248,8 +244,8 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\即时通讯\create-react-app\public\img" />
<recent name="F:\即时通讯\create-react-app\public\img\test" />
<recent name="F:\即时通讯\create-react-app\public\img" />
<recent name="F:\即时通讯\create-react-app\src\components\TopTabs" />
<recent name="F:\即时通讯\create-react-app\src\components\TopNotice" />
<recent name="F:\即时通讯\create-react-app\src" />
......@@ -285,7 +281,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="76727000" />
<option name="totallyTimeSpent" value="78345000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -490,23 +486,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-183">
<caret line="46" column="35" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="8" selection-start-line="8" selection-end-line="9" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
......@@ -524,16 +503,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1325">
<caret line="60" column="59" selection-start-line="60" selection-start-column="57" selection-end-line="60" selection-end-column="59" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1650">
......@@ -541,16 +510,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TodoCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
......@@ -591,16 +550,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
......@@ -617,52 +566,102 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
<state relative-caret-position="498">
<caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="14" column="61" selection-start-line="14" selection-start-column="45" selection-end-line="14" selection-end-column="61" />
<state relative-caret-position="175">
<caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.less">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="58" column="28" selection-start-line="58" selection-start-column="28" selection-end-line="58" selection-end-column="28" />
<state relative-caret-position="250">
<caret line="10" column="36" selection-start-line="10" selection-start-column="36" selection-end-line="10" selection-end-column="36" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="60" column="59" selection-start-line="60" selection-start-column="57" selection-end-line="60" selection-end-column="59" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/BlankLayout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
<caret line="7" column="27" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="27" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
<state relative-caret-position="150">
<caret line="15" column="68" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="68" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="69" column="44" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
<state relative-caret-position="-250">
<caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="46" column="35" selection-start-line="46" selection-start-column="35" selection-end-line="46" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="8" selection-start-line="8" selection-end-line="9" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
......
import React from 'react';
import './index.less'
const data = [{}, {}, {}, {s: '1'}, {}]
const data = [{}, {}, {}, {s: '1'}, {s: '111', result: '11111'}]
const Index = () => {
return (
<div>
<div className="auto-step">
<ul className="auto-step-card">
{
data.map((item, index) => (
......@@ -13,8 +13,13 @@ const Index = () => {
<div className="auto-step-item-title-name">发起申请(拟稿)</div>
</div>
<div className={`auto-step-content ${item.s ? '' : 'step-success'}`}>
<div className="step-content-wrapper">
<div className="auto-step-content-flow">
1111111111
<div className="auto-step-content-head">
<img src="/img/test/test-2.png" alt="" className="step-content-head-img"/>
<span>赵依安</span>
</div>
<span>2020-04-09 08:44:36</span>
</div>
{item.result && (
<div className="auto-step-content-result">
......@@ -22,6 +27,7 @@ const Index = () => {
</div>
)}
</div>
</div>
</li>
))
......
.auto-step{
background: #ffffff;
border-radius: 6px;
padding: 15px;
}
.auto-step-item-title{
display: flex;
align-items: center;
......@@ -19,7 +24,7 @@
display: block;
width: 16px;
height: 16px;
background: url("/img/step-success.png") center;
background: url("/img/step-current.png") center;
background-size: cover;
}
.auto-step-item-title.step-future::before{
......@@ -54,83 +59,37 @@
background-color: rgba(228, 228, 228, 1);
}
.auto-step-card > .auto-step-item:last-child .auto-step-content::before{
background-color: #ffffff;
}
.step-content-wrapper{
display: flex;
flex-direction: column;
width: 100%;
padding: 17px 0;
border-bottom: 1px solid rgba(0, 0, 0, 0.02);
}
.auto-step-content-flow{
display: flex;
justify-content: space-between;
padding: 0 15px;
}
.auto-step-content-head{
display: flex;
align-items: flex-start;
}
.step-content-head-img{
width: 30px;
height: 30px;
margin-right: 7px;
}
.auto-step-content-result{
margin-top: 15px;
line-height: 41px;
border-radius: 7px;
background: rgba(0, 0, 0, 0.12);
padding: 0 15px;
}
//.contract-operate_recode_date{
// margin-left: 56px;
// height:100%;
// display:flex;
// flex-direction: column;
// //justify-content: space-around;
// li{
// width:100%;
// //:nth-child(1){
// // width:119px;
// // height:16px;
// // font-size: 12px;
// // color: #333333;
// //}
// :nth-child(2){
// display: inline-block;
// width: 8px;
// height: 8px;
// background-color: #D8D8D8;
// border-radius: 50%;
// margin: 0 50px;
// &:after {
// content: '';
// display: block;
// clear: both;
// width: 1px;
// height: 111px;
// background-color: #D8D8D8;
// margin: 8px auto;
// }
// }
// :nth-child(3){
// font-size: 12px;
// color: #333333;
// display: inline-block;
// width: 170px;
// height: 16px;
// }
// }
// li:last-child {
// :nth-child(1) {
// font-size: 12px;
// color: #09B9C1;
// display: inline-block;
// width: 119px;
// height: 16px;
// }
// :nth-child(2) {
// display: inline-block;
// width: 8px;
// height: 8px;
// //background-color: $c991;
// border-radius: 50%;
// &:after {
// content: '';
// display: none;
// }
// }
//
// :nth-child(3) {
// font-size: 12px;
// //color: $c991;
// letter-spacing: 0;
// display: inline-block;
// width: 170px;
// height: 16px;
// }
// }
//}
......@@ -7,8 +7,11 @@ const CommonLayout = (props) => {
return (
<div>
<div className="common-layout-content">
<div>
{props.children}
</div>
</div>
<Footer {...props}/>
</div>
);
......
import React from 'react';
import {WhiteSpace} from 'antd-mobile'
import {WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/TodoCard'
import TopSearch from '../../components/TopSearch'
......@@ -8,7 +8,7 @@ const Backlog = (props) => {
props.history.push(`/blank/example/1`)
}
return (
<div>
<WingBlank>
<WhiteSpace/>
<TopSearch/>
{
......@@ -21,9 +21,7 @@ const Backlog = (props) => {
))
}
{/*<Step direction="horizontal"/>*/}
</div>
</WingBlank>
);
};
......
import React, {Component} from 'react';
import {List, WhiteSpace} from 'antd-mobile';
import {List, WhiteSpace, WingBlank} from 'antd-mobile';
import TopSearch from '../../components/TopSearch'
const Item = List.Item;
......@@ -7,7 +7,7 @@ const Item = List.Item;
class Communicate extends Component {
render() {
return (
<div>
<WingBlank>
<WhiteSpace/>
<TopSearch/>
<WhiteSpace/>
......@@ -15,7 +15,7 @@ class Communicate extends Component {
<Item>通讯录</Item>
<Item arrow="horizontal" multipleLine onClick={() => {}}>Title</Item>
</List>
</div>
</WingBlank>
);
}
}
......
import React from 'react';
import {WhiteSpace} from 'antd-mobile'
import {WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/TodoCard'
import TopNotice from '../../components/TopNotice'
const Notice = () => {
return (
<div>
<WingBlank>
<WhiteSpace/>
<TopNotice/>
<WhiteSpace/>
<TodoCard/>
</div>
</WingBlank>
);
};
......
import React, {Component} from 'react';
import {WhiteSpace} from "antd-mobile";
import {WingBlank} from 'antd-mobile'
import {WhiteSpace, WingBlank} from "antd-mobile";
import TopSearch from '../../components/TopSearch'
import WorkCard from '../../components/WorkCard'
const data = Array.from(new Array(7)).map((_val, i) => ({
id: `name${i}`,
icon: '/img/test/test.png',
text: `name${i}`,
}));
const data2 = Array.from(new Array(7)).map((_val, i) => ({
id: `name2${i}`,
icon: '/img/test/test-1.png',
text: `name${i}`,
}));
class Work extends Component {
state = {
addStatus: false
......@@ -15,24 +25,17 @@ class Work extends Component {
workSearch = (val) => {
console.log(val)
};
itemAdd = () => {
itemAdd = (id) => {
console.log('add')
}
itemSlice = () => {
itemSlice = (id) => {
console.log('slice')
}
render() {
const {addStatus} = this.state;
//测试数据
const data = Array.from(new Array(7)).map((_val, i) => ({
icon: '/img/test/test.png',
text: `name${i}`,
}));
const data2 = Array.from(new Array(7)).map((_val, i) => ({
icon: '/img/test/test-1.png',
text: `name${i}`,
}));
return (
<WingBlank>
<WhiteSpace/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment