{
+
{
this.state.total < 1 ? '0秒' : this.state.total + '秒'
}
)
diff --git a/src/models/Message/chatBox.js b/src/models/Message/chatBox.js
new file mode 100755
index 0000000..98b7cd6
--- /dev/null
+++ b/src/models/Message/chatBox.js
@@ -0,0 +1,134 @@
+/*
+* @Author: chengbs
+* @Date: 2018-06-06 18:35:54
+* @Last Modified by: baosheng
+* @Last Modified time: 2018-07-03 00:45:51
+*/
+import React, { Component } from 'react'
+import ReactDOM from 'react-dom'
+import { Button, InputItem, Toast } from 'antd-mobile'
+import { Header, Content } from 'Components'
+// import NewIcon from 'Components/NewIcon'
+import * as urls from 'Contants/urls'
+import history from 'Util/history'
+import UserInfo from './userInfo'
+import style from './style.css'
+
+let bfscrolltop = document.body.scrollTop
+// let whight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
+let interval = null
+class ChatBox extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ meg: '',
+ respon: [],
+ megArray: [],
+ infoVisible: false
+ }
+ this.handleData = this.handleData.bind(this)
+ this.sendMessage = this.sendMessage.bind(this)
+ this.handleSeeInfo = this.handleSeeInfo.bind(this)
+ this.handleInfoBack = this.handleInfoBack.bind(this)
+ this.handleFocus = this.handleFocus.bind(this)
+ this.handleBlur = this.handleBlur.bind(this)
+ }
+ componentDidMount() {
+ }
+ handleData(val) {
+ this.setState({
+ meg: val
+ })
+ }
+ sendMessage(e) {
+ e.preventDefault()
+ const that = this
+ let message = this.state.meg
+ if (message === '') {
+ Toast.info('不能发送空白消息哦', 1)
+ } else {
+ this.setState({
+ megArray: [...this.state.megArray, message]
+ })
+ fetch('http://www.tuling123.com/openapi/api?key=84336120aa964b6e9f302791cf4a90f7&info=' + message, {
+ method: 'POST',
+ type: 'cors'
+ }).then(function(response) {
+ return response.json()
+ }).then(function(detail) {
+ return (that.setState({
+ respon: [...that.state.respon, detail.text]
+ }, () => {
+ let el = ReactDOM.findDOMNode(that.refs.msgList)
+ el.scrollTop = el.scrollHeight
+ }))
+ })
+ this.state.meg = ''
+ }
+ // return false
+ }
+ handleSeeInfo() {
+ console.log('handleSeeInfo')
+ this.setState({
+ infoVisible: true
+ })
+ }
+ handleInfoBack() {
+ this.setState({
+ infoVisible: false
+ })
+ console.log('handleInfoBack')
+ }
+ handleFocus() {
+ // let fhight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
+ interval = setInterval(function() {
+ document.body.scrollTop = document.body.scrollHeight
+ }, 100)
+ }
+ handleBlur() {
+ clearInterval(interval)
+ document.body.scrollTop = bfscrolltop
+ }
+ render() {
+ let { meg, megArray, respon, infoVisible } = this.state
+ return (
+
+
+
{
+ history.push(urls.MESSAGE)
+ }}
+ title='小明'
+ leftIcon='icon-back'
+ leftTitle1='返回'
+ rightIcon='icon-morentouxiangicon'
+ rightClick={this.handleSeeInfo}
+ />
+
+
+
+ {megArray.map((elem, index) => (
+
+
{elem}
+
{respon[index]}
+
)
+ )}
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default ChatBox
diff --git a/src/models/Message/index.js b/src/models/Message/index.js
old mode 100644
new mode 100755
index abb0313..bb5adfe
--- a/src/models/Message/index.js
+++ b/src/models/Message/index.js
@@ -2,16 +2,58 @@
* @Author: chengbs
* @Date: 2018-04-08 16:16:58
* @Last Modified by: chengbs
-* @Last Modified time: 2018-04-08 16:17:20
+* @Last Modified time: 2018-06-06 18:41:18
*/
import React, { Component } from 'react'
-import Header from 'Components/Header'
+import { Header, Content } from 'Components'
+import NewIcon from 'Components/NewIcon'
+import * as urls from 'Contants/urls'
+import history from 'Util/history'
+import style from './style.css'
class Message extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {}
+
+ this.handleSysNotice = this.handleSysNotice.bind(this)
+ }
+ handleSysNotice() {
+ history.push(urls.SYSNOTICE)
+ }
+ handleMesage() {
+ history.push(urls.CHATBOX)
+ }
render() {
- return
-
-
+ return (
+
+
+
+
+
+ -
+
+
+
+
+ -
+
消息通知下午4：20
+ 您直接在线接单就可以了。
+
+
+
+ -
+
小明
+
+
江西华夏建筑有限公司下午 2:23
+
您直接在线接单就可以了。
+
+
+
+
+ )
}
}
diff --git a/src/models/Message/style.css b/src/models/Message/style.css
new file mode 100755
index 0000000..c5d39bc
--- /dev/null
+++ b/src/models/Message/style.css
@@ -0,0 +1,294 @@
+/*
+* @Author: chengbs
+* @Date: 2018-06-06 15:32:13
+* @Last Modified by: baosheng
+* @Last Modified time: 2018-07-07 20:34:47
+*/
+ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+dl, dt, dd, p, span {
+ margin: 0;
+ padding: 0;
+}
+.notice-box {
+ padding: 15px;
+ height: 50px;
+ & dl {
+ overflow: hidden;
+ & dt {
+ float: left;
+ & span {
+ display: block;
+ width: 50px;
+ height: 50px;
+ line-height: 64px;
+ background: rgba(4, 103, 224, 1);
+ border-radius: 50%;
+ text-align: center;
+ & .notice-icon {
+ width: 30px;
+ height: 30px;
+ }
+ }
+ }
+ & dd {
+ float: left;
+ width: 280px;
+ margin-left: 10px;
+ & p {
+ width: 100%;
+ font-size: 14px;
+ color: rgba(49, 63, 72, 1);
+ height: 30px;
+ line-height: 30px;
+ & em {
+ float: right;
+ font-style: normal;
+ font-size: 12px;
+ color: rgba(195, 205, 212, 1);
+ }
+ }
+ & span {
+ font-size: 12px;
+ color: rgba(138, 150, 160, 1);
+ }
+ }
+ }
+}
+
+html:not([data-scale]) .usr-header {
+ &:global(.my-full-border:before) {
+ border-radius: 50%;
+ }
+}
+
+.mesg-list {
+ & li {
+ padding: 15px;
+ height: 50px;
+ overflow: hidden;
+ & .usr-header {
+ float: left;
+ width: 50px;
+ height: 50px;
+ line-height: 50px;
+ text-align: center;
+ border-radius: 50%;
+ color: rgba(138, 150, 160, 1);
+ font-size: 16px;
+ margin-right: 10px;
+ }
+ & .msg-box {
+ float: left;
+ width: 280px;
+ & p {
+ height: 30px;
+ line-height: 30px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ & em {
+ float: right;
+ font-style: normal;
+ color: rgba(195, 205, 212, 1);
+ font-size: 12px;
+ }
+ }
+ & span {
+ font-size: 12px;
+ color: rgba(138, 150, 160, 1);
+ }
+ }
+ }
+}
+
+/* sysNotice */
+.notice-list {
+ & li {
+ padding: 16px 30px;
+ &.new {
+ & h4 {
+ &:before{
+ display: inline-block;
+ content:'';
+ width: 8px;
+ height: 8px;
+ background: rgba(4, 103, 224, 1);
+ border-radius: 50%;
+ margin-left: -11px;
+ margin-right: 5px;
+ }
+ }
+ }
+ & h4 {
+ height: 40px;
+ line-height: 40px;
+ color: rgba(51, 51, 51, 1);
+ font-size: 16px;
+ font-weight: normal;
+ }
+ & p {
+ line-height: 24px;
+ font-size: 14px;
+ color: rgba(153, 153, 153, 1);
+ }
+ }
+}
+
+/* chatbox */
+/*:global(.pageBox) {
+ &.chatBox {
+ & :global(.animated) {
+ overflow: hidden;
+ }
+ }
+}*/
+
+.chat-form {
+ width: 100%;
+ height: 100%;
+}
+
+.chatbox-header {
+ & :global(.rightIcon) {
+ width: 30px;
+ height: 30px;
+ }
+}
+
+.content {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ background: rgba(138, 150, 160, 0.1);
+ & .msg-list {
+ padding: 5px;
+ flex: 1 1 auto;
+ /*flex: 0 0 auto;*/
+ overflow: auto;
+ overflow-y:scroll;
+ -webkit-overflow-scrolling:touch;
+ & .container {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ & .message {
+ background-color: rgba(4, 103, 224, 1);
+ font-size: 14px;
+ color: #fff;
+ padding: 8px 10px;
+ border-radius: 12px;
+ align-self: flex-end;
+ max-width: 80%;
+ margin-top: 10px;
+ }
+ & .response {
+ background-color: #fff;
+ padding: 8px 10px;
+ border-radius: 12px;
+ align-self: flex-start;
+ margin: 10px;
+ margin-left: 5px;
+ max-width: 80%;
+ }
+ }
+ }
+
+ & .fixedBottom {
+ align-items: center;
+ display: flex;
+ width: 100%;
+ padding: 2px 0;
+ flex: 0 0 auto;
+ background: #fff;
+ & :global(.am-list-item) {
+ &.send-input {
+ border: none;
+ outline: none;
+ flex: 1;
+ height: 35px;
+ text-indent: 10px;
+ padding-left: 4px;
+ & :global(.am-input-control input) {
+ font-size: 14px;
+ }
+ }
+ }
+ & .send-button {
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 70px;
+ padding: 5px;
+ height: 34px;
+ line-height: 24px;
+ font-size: 14px;
+ background: rgba(4, 103, 224, 1);
+ }
+ }
+}
+
+html:not([data-scale]) .fixedBottom :global(.am-list-item:not(:last-child) .am-list-line::after) {
+ height: 0;
+}
+
+/* userInfo */
+.user-info-page {
+ & .header {
+ width: 100%;
+ height: 280px;
+ background: url(../../assets/cover.png) no-repeat center center;
+ & .back-icon {
+ margin-top: 10px;
+ margin-left: 5px;
+ width: 30px;
+ height: 30px;
+ }
+ }
+ & .title {
+ width: 100%;
+ height: 60px;
+ line-height: 60px;
+ background: rgba(249, 249, 249, 1);
+ color: rgba(49, 63, 72, 1);
+ font-size: 16px;
+ text-indent: 24px;
+ }
+ & .info-list {
+ display: block;
+ padding-left: 24px;
+ margin-top: 16px;
+ & dt {
+ height: 30px;
+ line-height: 30px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 11px;
+ }
+ & dd {
+ height: 18px;
+ line-height: 18px;
+ font-size: 16px;
+ color: rgba(47, 47, 47, 1);
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/models/Message/sysNotice.js b/src/models/Message/sysNotice.js
new file mode 100755
index 0000000..07c0d0a
--- /dev/null
+++ b/src/models/Message/sysNotice.js
@@ -0,0 +1,46 @@
+/*
+* @Author: chengbs
+* @Date: 2018-06-06 18:10:34
+* @Last Modified by: chengbs
+* @Last Modified time: 2018-06-06 18:34:18
+*/
+import React, { Component } from 'react'
+import { Header, Content } from 'Components'
+import * as urls from 'Contants/urls'
+import history from 'Util/history'
+import style from './style.css'
+
+class SysNotice extends Component {
+ render() {
+ return (
+
+
{
+ history.push(urls.MESSAGE)
+ }}
+ title='系统通知'
+ leftIcon='icon-back'
+ leftTitle1='返回'
+ />
+
+
+ -
+
新的抢标通知！
+ 您的招标项目已经有25个人抢单了，请您抓紧时间确认服务商开始工作。
+
+ -
+
新的抢标通知！
+ 您的招标项目已经有25个人抢单了，请您抓紧时间确认服务商开始工作。
+
+ -
+
新的抢标通知！
+ 您的招标项目已经有25个人抢单了，请您抓紧时间确认服务商开始工作。
+
+
+
+
+ )
+ }
+}
+
+export default SysNotice
diff --git a/src/models/Message/userInfo.js b/src/models/Message/userInfo.js
new file mode 100755
index 0000000..e067618
--- /dev/null
+++ b/src/models/Message/userInfo.js
@@ -0,0 +1,35 @@
+/*
+* @Author: chengbs
+* @Date: 2018-06-07 10:59:30
+* @Last Modified by: chengbs
+* @Last Modified time: 2018-06-07 11:44:00
+*/
+import React, { Component } from 'react'
+import { Icon } from 'antd-mobile'
+import style from './style.css'
+class UserInfo extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {}
+ }
+ render() {
+ return (
+
+
+
+
+
浙江亚雀信息科技有限公司
+
+ - 手机号码
+ - 15888246633
+
+
+ - 邮箱
+ - 34767573@qq.com
+
+
+ )
+ }
+}
+
+export default UserInfo
diff --git a/src/models/Mine/Authenticate/company/index.js b/src/models/Mine/Authenticate/company/index.js
new file mode 100755
index 0000000..3b776af
--- /dev/null
+++ b/src/models/Mine/Authenticate/company/index.js
@@ -0,0 +1,104 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-29 17:35:30
+ * @Title: 企业资格认证
+ */
+import React, { Component } from 'react'
+import { InputItem, Button, Toast, ImagePicker } from 'antd-mobile'
+import { createForm } from 'rc-form'
+import * as urls from 'Contants/urls'
+import { Header, Content, NewIcon } from 'Components'
+import style from './style.css'
+
+class Company extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ img: []
+ }
+ }
+
+ componentDidMount() {
+ }
+ handleChange = (img) => {
+ this.setState({ img })
+ }
+ handleSubmit = () => {
+ const validateAry = ['title', 'person', 'phone', 'license']
+ const { validateFields, getFieldError } = this.props.form
+ validateFields((err, value) => {
+ if (!err) {
+ console.info('success', value)
+ } else {
+ const validateErr = validateAry.find(item => err[item])
+ if (validateErr) {
+ Toast.fail(getFieldError(validateErr), 1)
+ }
+ }
+ })
+ }
+
+ render() {
+ const { img } = this.state
+ const { getFieldProps } = this.props.form
+ return
+
{
+ this.props.match.history.push(urls.AUTHENTICATE)
+ }}
+ />
+
+
+
+
+ }
+}
+
+export default createForm()(Company)
diff --git a/src/models/Mine/Authenticate/company/style.css b/src/models/Mine/Authenticate/company/style.css
new file mode 100755
index 0000000..2b1b80a
--- /dev/null
+++ b/src/models/Mine/Authenticate/company/style.css
@@ -0,0 +1,97 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-29 17:37:09
+* @Title: 企业资格认证
+*/
+.company {
+ height: 100%;
+ position: relative;
+ & .input {
+ padding-top: 10px;
+ & >.title {
+ padding-left: 15px;
+ height: 20px;
+ line-height: 20px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ & :global(.am-list-item .am-input-control input) {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ }
+ & .up-img {
+ display: inline-block;
+ margin: 15px;
+ & > div {
+ position: relative;
+ display: inline-block;
+ height: 79px;
+ width: 79px;
+ & .img-picker {
+ position: absolute;
+ z-index: 0;
+ display: inline-block;
+ width: 79px;
+ height: 79px;
+ border-radius: 3px;
+ border: 1Px dashed rgba(138, 150, 160, 0.5);
+ & :global(.am-image-picker-list) {
+ padding: 0;
+ margin: 0;
+ display: inline-block;
+ width: 79px;
+ height: 79px;
+ & :global(.am-flexbox-item:not(:first-child)) {
+ display: none;
+ }
+ & :global(.am-flexbox-item:first-child) {
+ margin: 0;
+ & :global(.am-image-picker-item.am-image-picker-upload-btn) {
+ opacity: 0;
+ }
+ & :global(.am-image-picker-item .am-image-picker-item-content) {
+ width: 78px;
+ height: 78px;
+ border-radius: 3px;
+ }
+ }
+ }
+ }
+ & .icon {
+ position: absolute;
+ left: 28px;
+ top: 18px;
+ width: 24px;
+ height: 19px;
+ z-index: -1;
+ }
+ & .title {
+ position: absolute;
+ left: 10px;
+ top: 48px;
+ width: 60px;
+ text-align: center;
+ color: rgba(138, 150, 160, 0.5);
+ font-size: 10px;
+ z-index: -1;
+ }
+ }
+ }
+ & .submit {
+ margin: 16px;
+ font-size: 18px;
+ position: absolute !important;
+ height: 47px;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ font-family: PingFangSC-Regular;
+ }
+}
diff --git a/src/models/Mine/Authenticate/index.js b/src/models/Mine/Authenticate/index.js
new file mode 100755
index 0000000..52c749d
--- /dev/null
+++ b/src/models/Mine/Authenticate/index.js
@@ -0,0 +1,28 @@
+import React, { Component } from 'react'
+import { Button } from 'antd-mobile'
+import { Header, Content } from 'Components'
+import * as urls from 'Contants/urls'
+import style from './style.css'
+
+class Authenticate extends Component {
+ render() {
+ return
+ }
+}
+
+export default Authenticate
diff --git a/src/models/Mine/Authenticate/personal/index.js b/src/models/Mine/Authenticate/personal/index.js
new file mode 100755
index 0000000..c9b746a
--- /dev/null
+++ b/src/models/Mine/Authenticate/personal/index.js
@@ -0,0 +1,150 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-29 17:40:03
+ * @Title: 个人资格认证
+ */
+import React, { Component } from 'react'
+import { ImagePicker, Button, InputItem, Toast } from 'antd-mobile'
+import { createForm } from 'rc-form'
+import { Header, Content, NewIcon } from 'Components'
+import * as urls from 'Contants/urls'
+import style from './style.css'
+
+class Personal extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ idUp: [], // 身份证正面
+ idDown: [], // 身份证反面
+ PCLL: [], // 专业证书
+ submitParams: {}
+ }
+ }
+
+ componentDidMount() {
+ }
+
+ handleChange = (files, type) => {
+ const { submitParams } = this.state
+ submitParams[type] = files[0] && files[0].url
+ this.setState({
+ [type]: files,
+ submitParams
+ }, () => {
+ console.log(submitParams)
+ })
+ }
+ handleSubmit = () => {
+ const { submitParams } = this.state
+ const validateAry = ['person', 'phone']
+ const imghAry = [
+ { key: 'idUp', message: '请上传身份证正面照片' },
+ { key: 'idDown', message: '请上传身份证反面照片' },
+ { key: 'PCLL', message: '请上传专业技术证书照片' }
+ ]
+ const { validateFields, getFieldError } = this.props.form
+ validateFields((err, value) => {
+ if (!err) {
+ const imgErr = imghAry.find(item => !submitParams[item.key])
+ if (imgErr) {
+ Toast.fail(imgErr.message, 1)
+ } else {
+ console.info('success', { ...value, ...submitParams })
+ }
+ } else {
+ const validateErr = validateAry.find(item => err[item])
+ if (validateErr) {
+ Toast.fail(getFieldError(validateErr), 1)
+ }
+ }
+ })
+ }
+
+ render() {
+ const { idUp, idDown, PCLL } = this.state
+ const { getFieldProps } = this.props.form
+ return
+
{
+ this.props.match.history.push(urls.AUTHENTICATE)
+ }}
+ />
+
+
+
+
+
+
+ 实名认证
+ 查看示例图
+
+
+
+
+ 身份证正面
+ this.handleChange(files, 'idUp')}
+ onImageClick={(index, fs) => console.log(index, fs)}
+ selectable={idUp.length < 1}
+ />
+
+
+
+
+
+ 身份证反面
+ this.handleChange(files, 'idDown')}
+ onImageClick={(index, fs) => console.log(index, fs)}
+ selectable={idDown.length < 1}
+ />
+
+
+
+
+
+ 职称认证
+ 查看示例图
+
+
+
+
+ 专业技术资格证
+ this.handleChange(files, 'PCLL')}
+ onImageClick={(index, fs) => console.log(index, fs)}
+ selectable={PCLL.length < 1}
+ />
+
+
+
+
+
+ }
+}
+
+export default createForm()(Personal)
+
diff --git a/src/models/Mine/Authenticate/personal/style.css b/src/models/Mine/Authenticate/personal/style.css
new file mode 100755
index 0000000..8e475db
--- /dev/null
+++ b/src/models/Mine/Authenticate/personal/style.css
@@ -0,0 +1,115 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-29 17:43:18
+* @Title: 个人资格认证
+*/
+.personal {
+ height: 100%;
+ & .input {
+ padding-top: 10px;
+ & >.title {
+ padding-left: 15px;
+ height: 20px;
+ line-height: 20px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ & :global(.am-list-item .am-input-control input) {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ }
+ & .item {
+ font-family: PingFang-SC-Medium;
+ padding: 28px 24px 24px;
+ & .header {
+ & .title {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ }
+ & .example {
+ float: right;
+ height: 17px;
+ line-height: 17px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 12px;
+ }
+ }
+ & .up-img {
+ display: inline-block;
+ & > div {
+ position: relative;
+ display: inline-block;
+ height: 79px;
+ width: 79px;
+ margin: 12px 24px 0 0;
+ & .img-picker {
+ position: absolute;
+ z-index: 0;
+ display: inline-block;
+ width: 79px;
+ height: 79px;
+ border-radius: 3px;
+ border: 1Px dashed rgba(138, 150, 160, 0.5);
+ & :global(.am-image-picker-list) {
+ padding: 0;
+ margin: 0;
+ display: inline-block;
+ width: 79px;
+ height: 79px;
+ & :global(.am-flexbox-item:not(:first-child)) {
+ display: none;
+ }
+ & :global(.am-flexbox-item:first-child) {
+ margin: 0;
+ & :global(.am-image-picker-item.am-image-picker-upload-btn) {
+ opacity: 0;
+ }
+ & :global(.am-image-picker-item .am-image-picker-item-content) {
+ width: 78px;
+ height: 78px;
+ border-radius: 3px;
+ }
+ }
+ }
+ }
+ & .icon {
+ position: absolute;
+ left: 28px;
+ top: 18px;
+ width: 24px;
+ height: 19px;
+ z-index: -1;
+ }
+ & .title {
+ position: absolute;
+ left: 10px;
+ top: 48px;
+ width: 60px;
+ text-align: center;
+ color: rgba(138, 150, 160, 0.5);
+ font-size: 10px;
+ z-index: -1;
+ }
+ }
+ }
+ }
+ & .submit {
+ margin: 16px;
+ font-size: 18px;
+ position: absolute !important;
+ height: 47px;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ font-family: PingFangSC-Regular;
+ }
+}
diff --git a/src/models/Mine/Authenticate/style.css b/src/models/Mine/Authenticate/style.css
new file mode 100755
index 0000000..1964fda
--- /dev/null
+++ b/src/models/Mine/Authenticate/style.css
@@ -0,0 +1,19 @@
+.Authenticate {
+ position: relative;
+ height: 100%;
+ & .link-personal {
+ position: absolute;
+ top: 50%;
+ height: 47px;
+ line-height: 47px;
+ margin: 14px;
+ margin-top: -100px;
+ }
+ & .link-company {
+ position: absolute;
+ top: 50%;
+ height: 47px;
+ line-height: 47px;
+ margin: 14px;
+ }
+}
diff --git a/src/models/Mine/Check/index.js b/src/models/Mine/Check/index.js
new file mode 100755
index 0000000..bc11cb3
--- /dev/null
+++ b/src/models/Mine/Check/index.js
@@ -0,0 +1,164 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-22 18:16:38
+ * @Title: 考勤管理
+ */
+import React, { Component } from 'react'
+import { List, Steps, Button, Picker, Toast, Icon } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import { getQueryString } from 'Contants/tooler'
+import style from './style.css'
+
+const Item = List.Item
+const Brief = Item.Brief
+const Step = Steps.Step
+
+class Check extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ data: {},
+ status: 0,
+ time: '',
+ visible: false,
+ pickerValue: [],
+ projects: [
+ {
+ label: '莫干山项目',
+ value: '2013',
+ },
+ {
+ label: '拱墅区项目',
+ value: '2014',
+ },
+ ],
+ position: {}, // 定位信息
+ inPosition: true // 是否在范围内
+ }
+ }
+
+ componentWillMount() {
+ this._getPosition()
+ setInterval(() => {
+ const { data } = this.state
+ let status = 0
+ if (data.checkInTime) {
+ status = 1
+ } else if (Number(new Date().Format('hh')) >= 18) {
+ status = 1
+ }
+ this.setState({
+ time: new Date().Format('hh:mm:ss'),
+ status
+ })
+ }, 1000)
+ }
+
+ _getPosition () {
+ if (navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition((position) => { // 定位数据获取成功响应
+ Toast.success('纬度: ' + position.coords.latitude + '\n' +
+ '经度: ' + position.coords.longitude + '\n' +
+ '海拔: ' + position.coords.altitude + '\n' +
+ '水平精度: ' + position.coords.accuracy + '\n' +
+ '垂直精度: ' + position.coords.altitudeAccura)
+ this.setState({ position })
+ }, (error) => { // 定位数据获取失败响应
+ switch (error.code) {
+ case error.PERMISSION_DENIED:
+ Toast.fail('您拒绝对获取地理位置的请求')
+ break
+ case error.POSITION_UNAVAILABLE:
+ Toast.fail('位置信息是不可用的')
+ break
+ case error.TIMEOUT:
+ Toast.fail('请求您的地理位置超时')
+ break
+ case error.UNKNOWN_ERROR:
+ Toast.fail('未知错误')
+ break
+ }
+ })
+ } else {
+ Toast('您的浏览器不支持使用HTML 5来获取地理位置服务')
+ }
+ }
+
+ handleCheckTime = () => {
+ const { status, data } = this.state
+ if (status) {
+ setTimeout(() => {
+ data.checkOutTime = new Date().Format('hh:mm:ss')
+ this.setState({
+ data
+ })
+ })
+ } else {
+ data.checkInTime = new Date().Format('hh:mm:ss')
+ this.setState({
+ data,
+ status: 1
+ })
+ }
+ }
+ handelSelect = (v) => {
+ this.setState({ pickerValue: v, visible: false })
+ console.log(v)
+ }
+
+ render() {
+ const { data, status, time, projects, inPosition } = this.state
+ return
+
{
+ this.props.match.history.push(urls[getQueryString('url')])
+ }}
+ rightClick={() => {
+ this.props.match.history.push(urls.MINE)
+ }}
+ />
+
+
+
this.setState({ pickerValue: v })}
+ onChange={v => this.setState({ pickerValue: v })}
+ onOk={this.handelSelect}
+ >
+ -
+ {data.title}
项目组:{data.subtitle}
+
+
+
+
今天继续向梦想出发吧
+
+ {data.checkInTime ? 打卡时间: {data.checkInTime}{(data.checkInTime.split(':')[0] >= 9 && data.checkInTime.split(':')[1] > 0) &&
+ < span className={style.tip}>迟到} : '未打卡'}}/>
+ {(status || data.checkInTime) ? {data.checkOutTime ? 打卡时间: {data.checkOutTime}{data.checkOutTime.split(':')[0] < 18 &&
+ < span className={style.tip}>早退} : '未打卡'}}/> : null}
+
+
+
{inPosition ?
已加入考勤范围：浙江省杭州…
:
未进入考勤范围
}
+
+
+
+ }
+}
+
+export default Check
diff --git a/src/models/Mine/Check/style.css b/src/models/Mine/Check/style.css
new file mode 100755
index 0000000..fc93d8e
--- /dev/null
+++ b/src/models/Mine/Check/style.css
@@ -0,0 +1,90 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-22 18:02:53
+* @Title: 考勤管理
+*/
+.check {
+ & .title {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 16px;
+ }
+ & .subtitle {
+ height: 21px;
+ line-height: 21px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 15px;
+ }
+ & :global(.am-list-thumb img) {
+ width: 35.74px;
+ height: 35.94px;
+ border-radius: 50%;
+ }
+ & .check-info {
+ padding-left: 12px;
+ & .prompt {
+ padding: 20px 0;
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ }
+ & .tip {
+ color: rgba(4, 103, 224, 1);
+ display: inline-block;
+ width: 36px;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
+ border-radius: 4px;
+ margin-left: 10px;
+ border: 1Px solid rgba(4, 103, 224, 1);
+ }
+ & .btn {
+ display: inline-block;
+ width: 130px;
+ height: 130px;
+ line-height: normal;
+ border-radius: 50%;
+ background-color: rgba(4, 103, 224, 1);
+ box-shadow: 0px 2px 4px 0px rgba(4, 103, 224, 0.5);
+ white-space: normal;
+ & .btn-title {
+ display: inline-block;
+ width: 100%;
+ position: absolute;
+ left: 0;
+ top: 40%;
+ height: 28px;
+ line-height: 28px;
+ color: rgba(255, 255, 255, 1);
+ font-size: 20px;
+ }
+ & .time {
+ display: inline-block;
+ position: absolute;
+ letter-spacing: 1Px;
+ top: 63%;
+ left: 0;
+ width: 100%;
+ height: 20px;
+ line-height: 20px;
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ }
+ }
+ & .position-info {
+ padding-top: 10px;
+ text-align: center;
+ & span{
+ vertical-align: middle;
+ padding-left: 5px;
+ }
+ & svg{
+ vertical-align: middle;
+ font-size: 0;
+ }
+ }
+ }
+}
diff --git a/src/models/Mine/Invoice/detail/index.js b/src/models/Mine/Invoice/detail/index.js
new file mode 100755
index 0000000..d248259
--- /dev/null
+++ b/src/models/Mine/Invoice/detail/index.js
@@ -0,0 +1,108 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-22 10:52:31
+ * @Title: 发票详情
+ */
+import React, { Component } from 'react'
+import { Radio, InputItem, Button } from 'antd-mobile'
+import { createForm } from 'rc-form'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import style from './style.css'
+import { getQueryString } from 'Contants/tooler'
+
+class Detail extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ id: getQueryString('id'),
+ data: {},
+ checked: '个人'
+ }
+ }
+
+ componentDidMount() {
+ setTimeout(() => {
+ this.setState({
+ data: {
+ title: '个人',
+ target: '杭州市西湖区莫干山有限公司',
+ money: '100,000',
+ time: '2018-05-01 14:20:00',
+ value: '杭州市西湖区莫干山项目'
+ }
+ })
+ })
+ }
+
+ handelRadio = (e, checked) => {
+ this.setState({ checked })
+ }
+ handelSubmit = () => {
+ this.props.form.validateFields((err, value) => {
+ if (!err) {
+ value.avatar = this.state.avatar[0] && this.state.avatar[0].url
+ console.info('success', value)
+ }
+ })
+ }
+
+ render() {
+ const { data, checked } = this.state
+ const { getFieldProps } = this.props.form
+ return
+
{
+ this.props.match.history.push(urls.INVOICE)
+ }}
+ />
+
+
+
+
+
发票抬头
+
this.handelRadio(e, '个人')} checked={checked === '个人'}>个人
+
this.handelRadio(e, '企业')} checked={checked === '企业'}>企业
+
+
+
+
+
+
+
+
+
+
+ }
+}
+
+export default createForm()(Detail)
diff --git a/src/models/Mine/Invoice/detail/style.css b/src/models/Mine/Invoice/detail/style.css
new file mode 100755
index 0000000..bff8fb5
--- /dev/null
+++ b/src/models/Mine/Invoice/detail/style.css
@@ -0,0 +1,58 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-22 10:53:15
+* @Title: 发票详情
+*/
+.detail {
+ & .info {
+ padding: 5px 0 5px 24px;
+ & > div {
+ margin-top: 8px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ font-family: PingFangSC-Regular;
+ & .title {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ font-family: PingFangSC-Regular;
+ }
+ }
+ & :global(.am-list-item .am-input-control input) {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ & .my-radio {
+ display: inline-block;
+ margin: 20px;
+ & >span {
+ vertical-align: middle;
+ }
+ & :global(.am-radio.am-radio-checked) {
+ background-color: #108ee9;
+ border: 1PX solid #108ee9;
+ }
+ & :global(.am-radio-inner:after) {
+ border-color: #FFF;
+ }
+ & :global(.am-radio) {
+ padding: 2.5px;
+ border: 1PX solid #ccc;
+ border-radius: 50%;
+ margin-right: 5px;
+ }
+ }
+ }
+ & .active {
+ margin: 16px;
+ height: 47px;
+ line-height: 47px;
+ border-radius: 8px;
+ font-family: PingFangSC-Regular;
+ }
+}
diff --git a/src/models/Mine/Invoice/index.js b/src/models/Mine/Invoice/index.js
new file mode 100755
index 0000000..67a7161
--- /dev/null
+++ b/src/models/Mine/Invoice/index.js
@@ -0,0 +1,84 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-22 10:49:12
+ * @Title: 申请发票
+ */
+import React, { Component } from 'react'
+import {} from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import { addCommas } from 'Contants/tooler'
+import style from './style.css'
+
+class Invoice extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ data: []
+ }
+ }
+
+ componentDidMount() {
+ setTimeout(() => {
+ this.setState({
+ data: [
+ {
+ date: '2018年5月',
+ list: [
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', id: 1, time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', id: 2, time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', id: 3, time: '5月1日-5月6日（6天）' },
+ ]
+ },
+ {
+ date: '2018年4月',
+ id: 2,
+ list: [
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ ]
+ },
+ {
+ date: '2018年3月',
+ id: 3,
+ list: [
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ { title: '江西景德镇一期', money: '100000', value: '上门给客户做家具安装，前期有培训，不拖欠工资，包住宿，有老师傅带，收入稳定。', time: '5月1日-5月6日（6天）' },
+ ]
+ }
+ ]
+ })
+ })
+ }
+
+ render() {
+ const { data } = this.state
+ return
+
{
+ this.props.match.history.push(urls.MINE)
+ }}
+ />
+
+
+
我的发票
+ {data.map((item, index) =>
+
{item.date}
+ {(item.list || []).map((list, index) =>
this.props.match.history.push(urls.INVOICEDETAIL + `?id=${list.id}`)}>
+
+
+
工作内容
{list.value}
¥{addCommas(list.money)}
+
)}
+
)}
+
+ }
+}
+
+export default Invoice
diff --git a/src/models/Mine/Invoice/style.css b/src/models/Mine/Invoice/style.css
new file mode 100755
index 0000000..589671f
--- /dev/null
+++ b/src/models/Mine/Invoice/style.css
@@ -0,0 +1,63 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-22 10:50:16
+* @Title: 申请发票
+*/
+.invoice {
+ background-color: #f6f7f8;
+ & .header {
+ position: relative;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ padding: 9px 0 10px 24px;
+ font-family: PingFangSC-Regular;
+ & .date {
+ position: absolute;
+ right: 25px;
+ top: 18px;
+ }
+ }
+ & .item {
+ & .title {
+ height: 17px;
+ line-height: 17px;
+ padding: 12px 24px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 12px;
+ font-family: PingFangSC-Regular;
+ }
+ & .list {
+ background-color: #ffffff;
+ padding: 15px 0 12px 24px;
+ margin-bottom: 24px;
+ & >div {
+ display: flex;
+ padding: 5px 0;
+ min-height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ font-family: PingFangSC-Regular;
+ & .left {
+ width: 56px;
+ }
+ & .right {
+ padding: 0 16px 0 24px;
+ flex: 1;
+ }
+ & >div {
+ color: rgba(49, 63, 72, 1);
+ & .money {
+ text-align: right;
+ padding-top: 6px;
+ height: 33px;
+ line-height: 33px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 24px;
+ font-family: PingFangSC-Regular;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/models/Mine/MyWorkList/index.js b/src/models/Mine/MyWorkList/index.js
new file mode 100755
index 0000000..12d2571
--- /dev/null
+++ b/src/models/Mine/MyWorkList/index.js
@@ -0,0 +1,130 @@
+import React, { Component } from 'react'
+import { Tabs, SegmentedControl } from 'antd-mobile'
+import { Header, Content, NewIcon, RefreshList } from 'Components'
+import * as urls from 'Contants/urls'
+import { addCommas } from 'Contants/tooler'
+import style from './style.css'
+
+const tabs = [
+ { title: '全部' },
+ { title: '待确认' },
+ { title: '待开工' },
+ { title: '施工中' },
+ { title: '待验收' }
+]
+
+class MyWorkList extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ loading: true,
+ actives: [
+ { title: '查看详情', callBack: this.handleDetail },
+ { title: '电话', icon: 'icon-phone', callBack: this.handleCall },
+ { title: '聊天', icon: 'icon-message_pre', callBack: this.handleWeChat }
+ ],
+ data: [],
+ }
+ }
+
+ componentDidMount() {
+ this.handleChange('', 0)
+ }
+
+ handleChange = (tab, index) => {
+ }
+ handleSegmentedChange = (value) => {
+ console.log(value)
+ }
+ handleDetail = () => {
+ this.props.match.history.push('/Home')
+ }
+ handleCall = () => {
+ console.log('电话')
+ }
+ handleWeChat = () => {
+ console.log('微信')
+ }
+
+ genData = async (status, value) => {
+ console.log(status, value)
+ function timeout(ms) {
+ return new Promise((resolve, reject) => {
+ setTimeout(resolve, ms, 'done')
+ })
+ }
+
+ const data = await timeout(1000).then((value) => {
+ const dataArr = []
+ for (let i = 0; i < 10; i++) {
+ dataArr.push({
+ title: '杭州莫干山工程',
+ date: '4月1日-4月6日',
+ day: '6',
+ address: '杭州莫干山工程',
+ code: '123123',
+ money: '500000',
+ status: '待确认'
+ })
+ }
+ return dataArr
+ })
+ this.setState({
+ loading: false,
+ })
+ return data
+ }
+
+ render() {
+ const { loading } = this.state
+ console.log(loading)
+ const row = (rowData, sectionID, rowID) => {
+ return (
+
{
+ this.props.match.history.push(urls.ORDERDETAIL + '?url=MYWORKLIST')
+ }} key={rowID}>
+
{rowData.title}{rowData.status}
+
+
工期：{rowData.date}
+
天数：{rowData.day}
+
施工地址：{rowData.address}
去这里
+
工单号：{rowData.code}
+
+
快单：¥{addCommas(rowData.money)}
+
+ )
+ }
+ console.log(this.state.height)
+ return
+
{
+ this.props.match.history.push(urls.MINE)
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+}
+
+export default MyWorkList
diff --git a/src/models/Mine/MyWorkList/style.css b/src/models/Mine/MyWorkList/style.css
new file mode 100755
index 0000000..471981f
--- /dev/null
+++ b/src/models/Mine/MyWorkList/style.css
@@ -0,0 +1,117 @@
+.my-work-list {
+ & .segmented {
+ position: fixed;
+ padding: 12px 7.5px;
+ box-sizing: border-box;
+ background: #ffffff;
+ border-radius: 0;
+ width: 100%;
+ height: 55px;
+ z-index: 2;
+ & :global(.am-segment-item-selected) {
+ background: #0467E0;
+ }
+ & :global(.am-segment-item) {
+ color: #0467E0;
+ border: 1Px solid #0467E0;
+ }
+ }
+ & :global(.am-tabs-default-bar-tab) {
+ width: 24px;
+ height: 42px;
+ line-height: 42px;
+ font-size: 12px;
+ text-align: center;
+ color: #666;
+ opacity: 0.5;
+ }
+ & :global(.am-tabs-default-bar-tab-active) {
+ color: #0467E0;
+ opacity: 1;
+ }
+ & :global(.am-tabs-default-bar.am-tabs-default-bar-animated.am-tabs-default-bar-top) {
+ position: fixed;
+ top: 55px;
+ height: 42px;
+ }
+ & :global(.am-tabs-pane-wrap.am-tabs-pane-wrap-active),& :global(.am-tabs-pane-wrap.am-tabs-pane-wrap-inactive) {
+ padding-top: 97px;
+ }
+ & .item {
+ background-color: rgba(250, 250, 250, 1);
+ & .title {
+ padding: 10px 10px 10px 24px;
+ height: 36px;
+ background-color: #FFF;
+ & .left {
+ display: inline-block;
+ color: rgba(49, 63, 72, 1);
+ min-width: 80px;
+ height: 16px;
+ font-size: 12px;
+ }
+ & .right {
+ float: right;
+ height: 16px;
+ margin: 0 10px;
+ min-width: 36px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 12px;
+ }
+ }
+ & .desc {
+ padding: 7.5px 0 7.5px 24px;
+ height: 110px;
+ color: #313F48;
+ font-size: 12px;
+ border-left: 2px solid rgba(4, 103, 224, 1);
+ & >div {
+ height: 15px;
+ margin: 5px 10px 5px 0;
+ line-height: 15px;
+ & >span {
+ display: inline-block;
+ vertical-align: top;
+ min-width: 100px;
+ height: 100%;
+ }
+ }
+ & .address {
+ & .link {
+ color: #0467E0;
+ padding-left: 19px;
+ padding-right: 9px;
+ }
+ & .icon {
+ width: 24px;
+ height: 24px;
+ vertical-align: top;
+ }
+ }
+ }
+ & .money {
+ text-align: right;
+ height: 43px;
+ line-height: 43px;
+ min-width: 105px;
+ color: rgba(4, 103, 224, 1);
+ background-color: #ffffff;
+ padding-right: 20px;
+ font-size: 14px;
+ }
+ }
+}
+:global(.am-tabs-pane-wrap) {
+ -webkit-overflow-scrolling : touch;
+}
+
+.loading {
+ & >*>* {
+ border-radius: 5px;
+ color: transparent!important;
+ background: #EEE!important;
+ & >* {
+ display: none;
+ }
+ }
+}
diff --git a/src/models/Mine/PersonalData/index.js b/src/models/Mine/PersonalData/index.js
new file mode 100755
index 0000000..c5a3710
--- /dev/null
+++ b/src/models/Mine/PersonalData/index.js
@@ -0,0 +1,192 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-28 13:52:28
+ * @Title: 编辑个人资料
+ */
+import React, { Component } from 'react'
+import { InputItem, ImagePicker, Picker, List, Toast, DatePicker } from 'antd-mobile'
+import { createForm } from 'rc-form'
+import * as urls from 'Contants/urls'
+import api from 'Util/api'
+import { Header, Content, NewIcon } from 'Components'
+import addressOptions from 'Contants/address-options'
+import style from './style.css'
+
+class PersonalData extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ avatar: [],
+ data: {}
+ }
+ }
+
+ componentDidMount() {
+ (async () => {
+ const data = await api.Mine.Personaldara.info({ hasInfo: 1 }) || {}
+ let avatar = []
+ data['small_avatar'] && avatar.push({ url: data['small_avatar'] })
+ this.setState({
+ data,
+ avatar
+ }, () => {
+ this.labelFocusInst.focus()
+ })
+ })()
+ }
+
+ handleAvatarChange = async (avatar) => {
+ if (avatar[0]) {
+ let formData = new FormData()
+ formData.append('avatar', avatar[0].file)
+ const data = await api.Mine.Personaldara.avatar(formData) || {}
+ if (data.small) {
+ avatar[0].url = data.small
+ } else {
+ avatar = []
+ }
+ this.setState({ avatar })
+ } else {
+ this.setState({ avatar })
+ }
+ }
+ handelSubmit = () => {
+ this.props.form.validateFields(async (err, value) => {
+ const validateAry = ['gender', 'birthday', 'ssq', 'street', 'address']
+ if (!err) {
+ value.province = value.ssq[0]
+ value.city = value.ssq[1]
+ value.area = value.ssq[2]
+ value.gender = value.gender[0]
+ value.birthday = value.birthday.Format('yyyy-MM-dd')
+ delete value.ssq
+ const data = await api.Mine.Personaldara.edit(value)
+ data && this.props.match.history.push(urls.MINE)
+ } else {
+ for (let value of validateAry) {
+ if (err[value]) {
+ Toast.fail(this.props.form.getFieldError(value), 1)
+ return
+ }
+ }
+ }
+ })
+ }
+
+ render() {
+ const { getFieldProps } = this.props.form
+ const { data, avatar } = this.state
+ data.info = data.info || {}
+ return
+
{
+ this.props.match.history.push(urls.MINE)
+ }}
+ rightClick={this.handelSubmit}
+ />
+
+
+
+
+
+ {data.realName}
+
+
+
+
+ 性别
+
+
+ 出生日期
+
+
+ 省·市·区／县
+
+ {
+ this.labelFocusInst = el
+ }}
+ >街道
+ 地址
+
+
+ }
+}
+
+export default createForm()(PersonalData)
diff --git a/src/models/Mine/PersonalData/style.css b/src/models/Mine/PersonalData/style.css
new file mode 100755
index 0000000..420aa91
--- /dev/null
+++ b/src/models/Mine/PersonalData/style.css
@@ -0,0 +1,105 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-28 13:59:57
+* @Title: 编辑个人资料
+*/
+.personal-data-header {
+ & :global(.usr-hdleft-title-second) {
+ color: rgba(153, 153, 153, 1);
+ }
+}
+
+.personal-data {
+ & .item {
+ font-family: PingFang-SC-Medium;
+ padding: 16px 0 2px 0;
+ & .up-img {
+ display: inline-block;
+ & > div {
+ position: relative;
+ display: inline-block;
+ height: 72px;
+ width: 72px;
+ margin: 0;
+ & .img-picker {
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 0;
+ height: 72px;
+ width: 72px;
+ display: inline-block;
+ box-shadow: 0 0 1Px rgba(138, 150, 160, 0.5);
+ border-radius: 50%;
+ overflow: hidden;
+ & :global(.am-image-picker-list) {
+ padding: 0;
+ margin: 0;
+ display: inline-block;
+ width: 72px;
+ height: 72px;
+ & :global(.am-flexbox) {
+ margin: 0;
+ }
+ & :global(.am-flexbox-item:not(:first-child)) {
+ display: none;
+ }
+ & :global(.am-flexbox-item:first-child) {
+ margin: 0;
+ & :global(.am-image-picker-item.am-image-picker-upload-btn) {
+ opacity: 0;
+ }
+ & :global(.am-image-picker-item-remove) {
+ left: 50%;
+ top: 50%;
+ right: auto;
+ bottom: auto;
+ margin-top: -7.5px;
+ margin-left: -7.5px;
+ }
+ & :global(.am-image-picker-item .am-image-picker-item-content) {
+ width: 72px;
+ height: 72px;
+ border-radius: 50%;
+ }
+ }
+ }
+ }
+ & .icon {
+ position: absolute;
+ left: 25px;
+ top: 18px;
+ width: 24px;
+ height: 19px;
+ z-index: -1;
+ }
+ & .title {
+ position: absolute;
+ left: 7px;
+ top: 48px;
+ width: 60px;
+ text-align: center;
+ color: rgba(138, 150, 160, 0.5);
+ font-size: 10px;
+ z-index: -1;
+ }
+ }
+ }
+ }
+ & .header {
+ display: flex;
+ & .avatar {
+ flex: 1;
+ text-align: center;
+ }
+ & .describe {
+ flex: 2;
+ padding-top: 30px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 16px;
+ text-align: left;
+ }
+ }
+ & .content {
+ }
+}
diff --git a/src/models/Mine/SetUp/index.js b/src/models/Mine/SetUp/index.js
new file mode 100755
index 0000000..79f4db3
--- /dev/null
+++ b/src/models/Mine/SetUp/index.js
@@ -0,0 +1,57 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-28 16:43:20
+ * @Title: 我的设置
+ */
+import React, { Component } from 'react'
+import { List, Button } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import api from 'Util/api'
+import style from './style.css'
+
+const Item = List.Item
+
+class SetUp extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {}
+ this.handleSignOut = this.handleSignOut.bind(this)
+ }
+
+ componentDidMount() {
+ }
+
+ async handleSignOut() {
+ const data = await api.auth.loginout({}) || false
+ if (data) {
+ this.props.match.history.push(urls.LOGIN)
+ }
+ }
+
+ render() {
+ return
+ }
+}
+
+export default SetUp
diff --git a/src/models/Mine/SetUp/security/index.js b/src/models/Mine/SetUp/security/index.js
new file mode 100755
index 0000000..ccaab33
--- /dev/null
+++ b/src/models/Mine/SetUp/security/index.js
@@ -0,0 +1,58 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-28 17:07:54
+ * @Title: 账户与安全
+ */
+import React, { Component } from 'react'
+import { List } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import style from './style.css'
+
+const Item = List.Item
+
+class Security extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ data: {}
+ }
+ }
+
+ componentDidMount() {
+ setTimeout(() => {
+ this.setState({
+ data: {
+ id: 'G26753',
+ password: true,
+ fingerprint: false,
+ }
+ })
+ })
+ }
+
+ render() {
+ const { data } = this.state
+ return
+ }
+}
+
+export default Security
diff --git a/src/models/Mine/SetUp/security/style.css b/src/models/Mine/SetUp/security/style.css
new file mode 100755
index 0000000..f32a7a1
--- /dev/null
+++ b/src/models/Mine/SetUp/security/style.css
@@ -0,0 +1,22 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-28 17:08:50
+* @Title: 账户与安全
+*/
+.security {
+ & :global(.am-list-item .am-list-line .am-list-content) {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ & :global(.am-list-item .am-list-line .am-list-extra) {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 12px;
+ font-family: PingFangSC-Regular;
+ }
+}
diff --git a/src/models/Mine/SetUp/style.css b/src/models/Mine/SetUp/style.css
new file mode 100755
index 0000000..36752a6
--- /dev/null
+++ b/src/models/Mine/SetUp/style.css
@@ -0,0 +1,31 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-28 16:43:00
+* @Title: 我的设置
+*/
+.set-up {
+ & :global(.am-list-item .am-list-line .am-list-content) {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ text-align: left;
+ font-family: PingFangSC-Regular;
+ }
+ & .btn {
+ margin-top: 60px;
+ height: 48px;
+ line-height: 48px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 15px;
+ font-family: PingFangSC-Regular;
+ border-radius: 0!important;
+ border-left: none!important;
+ border-right: none!important;
+ &:before {
+ border-radius: 0!important;
+ border-left: none!important;
+ border-right: none!important;
+ }
+ }
+}
diff --git a/src/models/Mine/account/detail/index.js b/src/models/Mine/account/detail/index.js
new file mode 100755
index 0000000..1278f9d
--- /dev/null
+++ b/src/models/Mine/account/detail/index.js
@@ -0,0 +1,82 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-21 15:16:51
+ * @Title: 账户详情
+ */
+import React, { Component } from 'react'
+import { Tabs, List } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import { addCommas } from 'Contants/tooler'
+import style from './style.css'
+
+const tabs = [
+ { title: '全部' },
+ { title: '收入' },
+ { title: '提现' }
+]
+const Item = List.Item
+const Brief = Item.Brief
+
+class Detail extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ data: []
+ }
+ }
+
+ componentDidMount() {
+ this.handleChange('', 0)
+ }
+
+ handleChange = (tab, index) => {
+ const { data } = this.state
+ data[index] = Array.from(new Array(20)).map(() => ({
+ title: '收入',
+ date: '2017-12-13 18:00:00',
+ address: '莫干山项目',
+ money: '+0.06',
+ allMoney: '1231',
+ status: index
+ }))
+ setTimeout(() => {
+ this.setState({ data })
+ }, 500)
+ }
+
+ _getLists(key) {
+ const { data } = this.state
+ return
{data[key] && data[key].map((item, index) => - {item.money}{addCommas(item.allMoney)}}>{tabs[item.status].title}{item.address}{item.date}
)}
+ }
+
+ render() {
+ return
+
{
+ this.props.match.history.push(urls.ACCOUNT)
+ }}
+ />
+
+
+
+ {this._getLists(0)}
+
+
+ {this._getLists(1)}
+
+
+ {this._getLists(2)}
+
+
+
+
+ }
+}
+
+export default Detail
diff --git a/src/models/Mine/account/detail/style.css b/src/models/Mine/account/detail/style.css
new file mode 100755
index 0000000..5a07e73
--- /dev/null
+++ b/src/models/Mine/account/detail/style.css
@@ -0,0 +1,62 @@
+.detail {
+ font-family: PingFang-SC-Medium;
+ & :global(.am-tabs-default-bar-tab) {
+ width: 24px;
+ height: 42px;
+ line-height: 42px;
+ font-size: 12px;
+ text-align: center;
+ color: #666;
+ opacity: 0.5;
+ }
+ & :global(.am-tabs-default-bar-tab-active) {
+ color: #0467E0;
+ opacity: 1;
+ }
+ & :global(.am-tabs-default-bar.am-tabs-default-bar-animated.am-tabs-default-bar-top) {
+ position: fixed;
+ height: 42px;
+ }
+ & :global(.am-tabs-pane-wrap.am-tabs-pane-wrap-active), & :global(.am-tabs-pane-wrap.am-tabs-pane-wrap-inactive) {
+ padding-top: 42px;
+ }
+ & .status {
+ vertical-align: middle;
+ height: 20px;
+ line-height: 20px;
+ margin-right: 12px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ font-family: PingFang-SC-Bold;
+ }
+ & .date {
+ height: 17px;
+ line-height: 17px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 12px;
+ font-family: PingFangSC-Regular;
+ }
+ & .money {
+ height: 21px;
+ line-height: 21px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 15px;
+ font-family: PingFang-SC-Bold;
+ }
+ & .all-money {
+ height: 17px;
+ line-height: 17px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 12px;
+ font-family: PingFangSC-Regular;
+ }
+ & .address {
+ vertical-align: middle;
+ padding: 3px 5px;
+ color: rgba(255, 255, 255, 1);
+ font-size: 10px;
+ font-family: PingFangSC-Regular;
+ border-radius: 2px;
+ background-color: rgba(4, 103, 224, 1);
+ }
+}
diff --git a/src/models/Mine/account/index.js b/src/models/Mine/account/index.js
new file mode 100755
index 0000000..ac15a52
--- /dev/null
+++ b/src/models/Mine/account/index.js
@@ -0,0 +1,59 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-21 14:53:46
+ * @Title: 我的账户
+ */
+import React, { Component } from 'react'
+import { Button } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import { addCommas } from 'Contants/tooler'
+import style from './style.css'
+
+class Account extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {}
+ }
+
+ componentDidMount() {
+ setTimeout(() => {
+ this.setState({
+ moneyA: 300000,
+ moneyB: 200000
+ })
+ })
+ }
+
+ render() {
+ const { moneyA, moneyB } = this.state
+ return
+
{
+ this.props.match.history.push(urls.ACCOUNTDETAIL)
+ }}
+ leftClick1={() => {
+ this.props.match.history.push(urls.MINE)
+ }}
+ />
+
+
+
账户余额（元）
+
{addCommas(moneyA)}
+
冻结金额 ¥{addCommas(moneyB)}元
+
+
+ }
+}
+
+export default Account
diff --git a/src/models/Mine/account/recharge/index.js b/src/models/Mine/account/recharge/index.js
new file mode 100755
index 0000000..aea855f
--- /dev/null
+++ b/src/models/Mine/account/recharge/index.js
@@ -0,0 +1,87 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-21 15:10:11
+ * @Title: 充值
+ */
+import React, { Component } from 'react'
+import { List, InputItem, Toast, Button } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import { addCommas } from 'Contants/tooler'
+import style from './style.css'
+
+const Item = List.Item
+const Brief = Item.Brief
+
+class Rechange extends Component {
+ state = {
+ title: '招商银行',
+ img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1526905577349&di=a3da7639f5b20d172a5ceb18756d0ef5&imgtype=jpg&src=http%3A%2F%2Fimg3.imgtn.bdimg.com%2Fit%2Fu%3D2765035733%2C1282524408%26fm%3D214%26gp%3D0.jpg',
+ subtitle: '尾号8843',
+ maxMoney: 500000,
+ hasError: false,
+ value: '',
+ }
+ onErrorClick = () => {
+ if (this.state.hasError) {
+ Toast.info('超出最大金额')
+ }
+ }
+ onChange = (value) => {
+ if (value > this.state.maxMoney) {
+ this.setState({
+ hasError: true,
+ }, () => {
+ Toast.info('超出最大金额')
+ })
+ } else {
+ this.setState({
+ hasError: false,
+ })
+ }
+ this.setState({
+ value,
+ })
+ }
+ componentDidMount() {
+ }
+
+ render() {
+ const { title, img, subtitle, maxMoney, hasError, value } = this.state
+ return
+
{
+ this.props.match.history.push(urls.ACCOUNT)
+ }}
+ />
+
+
+
- {}}
+ >
+ {title}{subtitle}
+
+
该卡本次最多充值{addCommas(maxMoney)}元
+
金额
+
+
+ }
+}
+
+export default Rechange
diff --git a/src/models/Mine/account/recharge/style.css b/src/models/Mine/account/recharge/style.css
new file mode 100755
index 0000000..927a926
--- /dev/null
+++ b/src/models/Mine/account/recharge/style.css
@@ -0,0 +1,57 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-21 17:42:54
+* @Title: 充值
+*/
+.rechange {
+ background-color: #f6f7f8;
+ height: 100%;
+ & .title {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 16px;
+ font-family: PingFangSC-Regular;
+ }
+ & .subtitle {
+ height: 21px;
+ line-height: 21px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 15px;
+ font-family: PingFangSC-Regular;
+ }
+ & :global(.am-list-thumb img) {
+ width: 35.74px;
+ height: 35.94px;
+ border-radius: 50%;
+ }
+ & .max-money {
+ padding-left: 15px;
+ margin: 10px 0;
+ width: 181px;
+ height: 17px;
+ line-height: 16.98px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ font-family: PingFangSC-Regular;
+ }
+ & .disabled-btn {
+ height: 46.94px;
+ line-height: 46.94px;
+ margin: 15px;
+ border-radius: 4.99px;
+ background-color: rgba(138, 150, 160, 1);
+ &:before {
+ display: none;
+ }
+ }
+ & .primary-btn {
+ height: 46.94px;
+ line-height: 46.94px;
+ margin: 15px;
+ border-radius: 4.99px;
+ }
+ & :global(.am-list-line:after) {
+ display: none!important;
+ }
+}
diff --git a/src/models/Mine/account/style.css b/src/models/Mine/account/style.css
new file mode 100755
index 0000000..f4d992a
--- /dev/null
+++ b/src/models/Mine/account/style.css
@@ -0,0 +1,56 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-21 14:54:01
+* @Title: 我的账户
+*/
+.account {
+ padding-top: 40px;
+ text-align: center;
+ font-family: PingFang-SC-Medium;
+ border-bottom: 1Px solid #F4F4F4;
+ & .title {
+ height: 17px;
+ line-height: 17px;
+ color: rgba(28, 40, 51, 1);
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ & .money {
+ height: 67px;
+ line-height: 67px;
+ color: rgba(28, 40, 51, 1);
+ font-size: 48px;
+ margin-bottom: 4px;
+ }
+ & .tip {
+ padding-left: 66px;
+ height: 23px;
+ line-height: 23px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 13px;
+ text-align: left;
+ }
+ & .btns {
+ margin: 12px 0 26px;
+ & .reChange-btn {
+ width: 150px;
+ height: 38px;
+ line-height: 38px;
+ border-radius: 8px;
+ background-color: rgba(4, 103, 224, 1);
+ margin-right: 13px;
+ font-size: 14px;
+ }
+ & .withdraw-cash-btn {
+ width: 100px;
+ height: 38px;
+ line-height: 38px;
+ border-radius: 8px;
+ background-color: rgba(138, 150, 160, 1);
+ color: #FFF;
+ font-size: 14px;
+ }
+ }
+}
+
+
diff --git a/src/models/Mine/account/withdrawCash/index.js b/src/models/Mine/account/withdrawCash/index.js
new file mode 100755
index 0000000..b92d0d1
--- /dev/null
+++ b/src/models/Mine/account/withdrawCash/index.js
@@ -0,0 +1,87 @@
+/**
+ * @Author: baosheng
+ * @Date: 2018-05-22 10:46:29
+ * @Title: 提现
+ */
+import React, { Component } from 'react'
+import { List, InputItem, Toast, Button } from 'antd-mobile'
+import * as urls from 'Contants/urls'
+import { Header, Content } from 'Components'
+import style from './style.css'
+
+const Item = List.Item
+const Brief = Item.Brief
+
+class WithdrawCash extends Component {
+ state = {
+ title: '招商银行',
+ img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1526905577349&di=a3da7639f5b20d172a5ceb18756d0ef5&imgtype=jpg&src=http%3A%2F%2Fimg3.imgtn.bdimg.com%2Fit%2Fu%3D2765035733%2C1282524408%26fm%3D214%26gp%3D0.jpg',
+ subtitle: '尾号8843',
+ maxMoney: 500000,
+ hasError: false,
+ value: '',
+ }
+ onErrorClick = () => {
+ if (this.state.hasError) {
+ Toast.info('超出最大金额')
+ }
+ }
+ onChange = (value) => {
+ if (value > this.state.maxMoney) {
+ this.setState({
+ hasError: true,
+ }, () => {
+ Toast.info('超出最大金额')
+ })
+ } else {
+ this.setState({
+ hasError: false,
+ })
+ }
+ this.setState({
+ value,
+ })
+ }
+ componentDidMount() {
+ }
+
+ render() {
+ const { title, img, subtitle, hasError, maxMoney, value } = this.state
+ return
+
{
+ this.props.match.history.push(urls.ACCOUNT)
+ }}
+ />
+
+
+
- {}}
+ >
+ {title}{subtitle}
+
+
提现金额
+
¥
+
- 全部提现 }>可用余额 {maxMoney}元
+
+
+ }
+}
+
+export default WithdrawCash
diff --git a/src/models/Mine/account/withdrawCash/style.css b/src/models/Mine/account/withdrawCash/style.css
new file mode 100755
index 0000000..94e8e98
--- /dev/null
+++ b/src/models/Mine/account/withdrawCash/style.css
@@ -0,0 +1,81 @@
+/**
+* @Author: baosheng
+* @Date: 2018-05-21 18:38:01
+* @Title: 提现
+*/
+
+.withdraw-cash {
+ background-color: #f6f7f8;
+ height: 100%;
+ & .title {
+ height: 22px;
+ line-height: 22px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 16px;
+ font-family: PingFangSC-Regular;
+ }
+ & .subtitle {
+ height: 21px;
+ line-height: 21px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 15px;
+ font-family: PingFangSC-Regular;
+ }
+ & :global(.am-list-thumb img) {
+ width: 35.74px;
+ height: 35.94px;
+ border-radius: 50%;
+ }
+ & .title2 {
+ height: 24px;
+ line-height: 24px;
+ padding: 15px;
+ color: rgba(49, 63, 72, 1);
+ margin-bottom: 0;
+ font-size: 17px;
+ font-family: PingFangSC-Regular;
+ background-color: #ffffff;
+ }
+ & .maxMoney {
+ height: 20px;
+ line-height: 20px;
+ color: rgba(138, 150, 160, 1);
+ font-size: 14px;
+ font-family: PingFangSC-Regular;
+ }
+ & .money {
+ width: 39px;
+ height: 90px;
+ line-height: 90px;
+ color: rgba(49, 63, 72, 1);
+ font-size: 64px;
+ font-family: PingFang-SC-Regular;
+ }
+ & .extra {
+ height: 21px;
+ line-height: 21px;
+ color: rgba(4, 103, 224, 1);
+ font-size: 15px;
+ font-family: PingFangSC-Regular;
+
+ }
+ & .disabled-btn {
+ height: 46.94px;
+ line-height: 46.94px;
+ margin: 15px;
+ border-radius: 4.99px;
+ background-color: rgba(138, 150, 160, 1);
+ &:before {
+ display: none;
+ }
+ }
+ & .primary-btn {
+ height: 46.94px;
+ line-height: 46.94px;
+ margin: 15px;
+ border-radius: 4.99px;
+ }
+ & :global(.am-list-line:after) {
+ display: none!important;
+ }
+}
diff --git a/src/models/Mine/index.js b/src/models/Mine/index.js
old mode 100644
new mode 100755
index be7029e..3065519
--- a/src/models/Mine/index.js
+++ b/src/models/Mine/index.js
@@ -1,30 +1,110 @@
/*
* @Author: chengbs
* @Date: 2018-04-08 16:19:55
-* @Last Modified by: chengbs
-* @Last Modified time: 2018-05-16 13:14:13
+* @Last Modified by: baosheng
+* @Last Modified time: 2018-07-01 14:31:03
*/
import React, { Component } from 'react'
-import { Grid } from 'antd-mobile'
-import Header from 'Components/Header'
+import { Button, Icon, List } from 'antd-mobile'
+import { Header, Content, NewIcon } from 'Components'
+import * as urls from 'Contants/urls'
+import api from 'Util/api'
+import style from './style.css'
-const data = Array.from(new Array(9)).map((_val, i) => ({
- icon: 'https://gw.alipayobjects.com/zos/rmsportal/nywPmnTAvTmLusPxHPSu.png',
- text: `name${i}`,
-}))
+const Item = List.Item
class Mine extends Component {
- test() {
- console.log('test')
+ constructor(props) {
+ super(props)
+ this.state = {
+ userData: {
+ },
+ income: {
+ dataA: 200,
+ dataB: 3000,
+ dataC: 100,
+ },
+ loading: true,
+ linkData: [
+ {
+ icon: 'icon-myJob',
+ title: '我的工单',
+ link: urls.MYWORKLIST
+ },
+ {
+ icon: 'icon-qualification',
+ title: '资质认证',
+ link: urls.AUTHENTICATE
+ },
+ {
+ icon: 'icon-myAccount',
+ title: '我的帐户',
+ link: urls.ACCOUNT
+ },
+ {
+ icon: 'icon-applicationForInvoi',
+ title: '申请发票',
+ link: urls.INVOICE
+ },
+ {
+ icon: 'icon-attendanceManagement',
+ title: '考勤管理',
+ link: urls.CHECK + '?url=MINE'
+ }
+ ]
+ }
}
- settings = () => {
- console.log('设置')
+
+ componentDidMount() {
+ (async () => {
+ const userData = await api.Mine.Personaldara.info({ hasInfo: 1, time: Date.now() }) || {}
+ this.setState({ loading: false, userData })
+ })()
}
+
render() {
+ const { userData, income, linkData, loading } = this.state
+ userData.info = userData.info || {}
return (
-
-
- Always square grid item
-
+
+
this.props.match.history.push(urls.SETUP)}/>
+
+
+
{userData['small_avatar'] ? 
: }
+
+
+ {userData.username}
+
+
+
+ {userData.info.address}
+
+
+
+
+
+
{income.dataA}
+
近30天工单数
+
+
+
{income.dataB}
+
近30天收入
+
+
+
{income.dataC}
+
我关注的
+
+
+ {linkData.map((item, index) => -
+ this.props.match.history.push(item.link)}>
+
+ {item.title}
+
+
)}
+
+
+
{
+ this.props.onClickBack()
+ }}
+ />
+
+
+
'项目名称'}>
+ {
+ proData.find((item) => {
+ return item.value === postData['proname'][0]
+ })['label']
+ }
+
+
'施工地址'}>
+ {postData['address']}
+
+
'施工时间'}>
+ {postData['workDate']}
+
+
'价格预算'}>
+ {postData['price']} 元
+
+
'工种需求'}>
+ {
+ worktypeData.find((item) => {
+ return item.value === postData['worktype'][0]
+ })['label']
+ }
+
+
'需求描述'}>
+ {postData['memo']}
+
+
'附件'}>
+
+ {
+ postData['files'].map((item, index, ary) => {
+ return (
+ - {item.name}
+ )
+ })
+ }
+
+
+
+
+
+
-
功能操作
-
(
-
-
-
- {dataItem.text}
-
-
任务日历切换列表
-
-
- - 北京好望山一期开工
- - 工期：3月20日-3月31日（共12 天）开工中
- - 计价模式：日结工资：300元/天
- - 联系人：李晓菲聊天电话
-
+
+
+
{
+ history.push(urls.HOME)
+ }}
+ leftTitle2='关闭'
+ leftClick2={() => {
+ history.push(urls.HOME)
+ }}
+ rightTitle='下一步'
+ rightClick={() => {
+ this.onHandleNext()
+ }}
+ />
+
+
+
+
+
+
+ {!isEdit && postData ? : null}
)
}
}
-export default Workplat
+const PushOrderWrapper = createForm()(PushOrder)
+export default PushOrderWrapper
diff --git a/src/models/PushOrder/style.css b/src/models/PushOrder/style.css
old mode 100644
new mode 100755
index 77dc09c..d3d3a7a
--- a/src/models/PushOrder/style.css
+++ b/src/models/PushOrder/style.css
@@ -1,76 +1,193 @@
/*
* @Author: chengbs
* @Date: 2018-04-10 15:19:22
-* @Last Modified by: chengbs
-* @Last Modified time: 2018-05-15 17:24:17
+* @Last Modified by: baosheng
+* @Last Modified time: 2018-07-07 20:46:01
*/
-.padd10 {
- /*padding: 10px;*/
- width: 375px;
-}
-.padd5 {
- padding: 5px;
-}
-.paddR10 {
- padding-right: 10px;
+.pro-radio :global(.am-radio) {
+ padding: 3px;
+ border: 1px solid #ccc;
+ border-radius: 50%;
+ margin-right: 5px;
}
-dl, dt, dd {
- padding: 0;
- margin: 0;
-}
-.subTitle {
- color: #666;
- font-size: 14px;
- padding: 15px 0 10px 10px;
-}
-.grid {
- height: 170px;
- background: #fff;
-}
-dl {
- width: 100%;
- background: #fff;
-}
-dl dd {
- overflow: hidden;
-}
-dl dt {
- height: 40px;
- line-height: 40px;
- text-indent: 1%;
-}
-dl dd {
- height: 30px;
- line-height: 30px;
- text-indent: 1%;
-}
-em {
- font-family: normal;
-}
-.prolist {
- float: left;
- width: 70%;
-}
-.auto {
- width: auto;
- margin-right: 10px;
- float: left;
-}
-.during {
- width: 30%;
- text-align: center;
- float: right;
+.pushOrderForm {
+ width: 328px;
+ margin: 0 auto;
+ & :global(.am-list) {
+
+ &.input-form-list {
+ height: 56px;
+ margin-top: 18px;
+ &.selected-form-list {
+ & :global(.am-list-body .am-list-item .am-list-line .am-list-extra) {
+ color: #000;
+ }
+ }
+ & :global(.am-list-header) {
+ padding: 0;
+ font-size: 14px;
+ color: rgba(49, 63, 72, 1);
+ }
+ & :global(.am-list-body) {
+ & :global(.am-list-body:after) {
+ height: 0;
+ }
+ & :global(.am-list-item) {
+ padding-left: 0;
+ & :global(.am-list-line) {
+ padding-right: 0;
+ & :global(.am-list-extra) {
+ flex-basis: 92%;
+ font-size: 14px;
+ text-align: left;
+ color: rgba(138, 150, 160, .7);
+ }
+ & :global(.am-input-control) {
+ & :global(input) {
+ font-size: 14px;
+ &:global(::-webkit-input-placeholder) {
+ color: rgba(138, 150, 160, .7);
+ font-size: 14px;
+ }
+ }
+ & :global(.fake-input-placeholder) {
+ text-align: left;
+ font-size: 14px;
+ color: rgba(138, 150, 160, .7);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ &.radio-form-list {
+ & :global(.am-list-body) {
+ height: 56px;
+ line-height: 56px;
+ & label {
+ font-size: 12px;
+ color: rgba(0, 0, 0, 0.65);
+ &:nth-child(1) {
+ margin-right: 70px;
+ }
+ & :global(.am-radio) {
+ width: 7px;
+ height: 7px;
+ margin-top: -2px;
+ & :global(.am-radio-inner:after) {
+ width: 5px;
+ height: 10px;
+ right: 3px;
+ top: -3px;
+ }
+ }
+ }
+ }
+ }
+
+ &.textarea-form-list {
+ margin-top: 18px;
+ & :global(.am-list-header) {
+ padding: 0;
+ font-size: 14px;
+ color: rgba(49, 63, 72, 1);
+ }
+ & :global(.am-list-body) {
+ margin-top: 10px;
+ & :global(.am-textarea-item) {
+ padding: 0;
+ & :global(.am-textarea-control) {
+ & :global(textarea) {
+ padding: 0 10px;
+ font-size: 14px;
+ &:global(::placeholder){
+ color: rgba(138, 150, 160, .7);
+ font-size: 14px;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ & :global(.rc-upload) {
+ display: block;
+ width: 60px;
+ height: 60px;
+ margin-top: 10px;
+ }
}
-dl dd a {
- margin-right: 10px;
+
+
+.push-upload-icon {
+ font-size: 60px;
}
-.dataItemImg {
- width: 30px;
- height: 30px;
+
+.file-list {
+ width: 320px;
+ margin-top: 10px;
+ -webkit-padding-start: 0;
+ & li {
+ height: 26px;
+ margin-bottom: 5px;
+ line-height: 26px;
+ overflow: hidden;
+ & .file-list-icon {
+ float: left;
+ width: 16px;
+ height: 16px;
+ margin-top: 5px;
+ }
+ & a {
+ float: left;
+ width: 280px;
+ line-height: 26px;
+ font-size: 14px;
+ margin-left: 5px;
+ color: #1890ff;
+ overflow:hidden;
+ white-space:nowrap;
+ -o-text-overflow:ellipsis;
+ text-overflow:ellipsis;
+ }
+ & i {
+ float: right;
+ width: 14px;
+ text-align: center;
+ font-style: normal;
+ color: #ccc;
+ }
+ }
}
-.dataItemText {
- color: #888;
- font-size: 12px;
- margin-top: 5px;
+
+
+.show-order-box {
+ width: 330px;
+ margin: 0 auto;
+ & :global(.am-list) {
+ height: 56px;
+ margin-top: 18px;
+ &.attch-list {
+ height: auto;
+ & :global(.am-list-body) {
+ height: auto;
+ line-height: auto;
+ }
+ }
+ & :global(.am-list-header) {
+ padding: 0;
+ height: 32px;
+ line-height: 32px;
+ color: rgba(138, 150, 160, .8);
+ font-size: 14px;
+ }
+ & :global(.am-list-body) {
+ color: #313F48;
+ height: 22px;
+ line-height: 22px;
+ }
+ }
}
diff --git a/src/models/PushOrder/taskList.js b/src/models/PushOrder/taskList.js
old mode 100644
new mode 100755
diff --git a/src/models/TobeDone/index.js b/src/models/TobeDone/index.js
old mode 100644
new mode 100755
index 751ee58..c095b71
--- a/src/models/TobeDone/index.js
+++ b/src/models/TobeDone/index.js
@@ -2,26 +2,220 @@
* @Author: chengbs
* @Date: 2018-04-08 16:19:20
* @Last Modified by: chengbs
-* @Last Modified time: 2018-05-16 15:23:48
+* @Last Modified time: 2018-06-02 13:54:36
*/
import React, { Component } from 'react'
-import Header from 'Components/Header'
+import ReactDOM from 'react-dom'
+import { Picker, List, PullToRefresh, ListView } from 'antd-mobile'
+import { Header, Content } from 'Components'
+import * as urls from 'Contants/urls'
+import style from './style.css'
+// import NewIcon from 'Components/NewIcon'
+const date = new Date()
+const data = [
+ {
+ title: '2018-04-08',
+ des: '不是所有的兼职汪都需要风吹日晒',
+ },
+ {
+ title: '2018-06-02',
+ des: '不是所有的兼职汪都需要风吹日晒',
+ },
+ {
+ title: '2018-06-02',
+ des: '不是所有的兼职汪都需要风吹日晒',
+ },
+]
+const NUM_ROWS = 20
+let pageIndex = 0
+
+function genData(pIndex = 0) {
+ const dataArr = []
+ for (let i = 0; i < NUM_ROWS; i++) {
+ dataArr.push(`row - ${(pIndex * NUM_ROWS) + i}`)
+ }
+ return dataArr
+}
class TobeDone extends Component {
constructor(props) {
super(props)
+ const dataSource = new ListView.DataSource({
+ rowHasChanged: (row1, row2) => row1 !== row2,
+ })
+
this.state = {
- date: '2018 5月'
+ sValue: [date.getFullYear() + '年', date.getMonth() + '月'],
+ dataSource,
+ refreshing: true,
+ isLoading: true,
+ height: document.documentElement.clientHeight
}
+ this.setDateAry = this.setDateAry.bind(this)
+ this.onRefresh = this.onRefresh.bind(this)
+ this.onEndReached = this.onEndReached.bind(this)
+ }
+
+ componentDidUpdate() {
+ document.body.style.overflow = 'hidden'
}
- detail = () => {
+
+ componentDidMount() {
+ const hei = this.state.height - ReactDOM.findDOMNode(this.lv).offsetTop
+
+ setTimeout(() => {
+ this.rData = genData()
+ this.setState({
+ dataSource: this.state.dataSource.cloneWithRows(genData()),
+ height: hei,
+ refreshing: false,
+ isLoading: false,
+ })
+ }, 1500)
+ }
+
+ onRefresh() {
+ this.setState({ refreshing: true, isLoading: true })
+ // simulate initial Ajax
+ setTimeout(() => {
+ this.rData = genData()
+ this.setState({
+ dataSource: this.state.dataSource.cloneWithRows(this.rData),
+ refreshing: false,
+ isLoading: false,
+ })
+ }, 600)
+ }
+
+ onEndReached(event) {
+ // load new data
+ // hasMore: from backend data, indicates whether it is the last page, here is false
+ if (this.state.isLoading && !this.state.hasMore) {
+ return
+ }
+ console.log('reach end', event)
+ this.setState({ isLoading: true })
+ setTimeout(() => {
+ this.rData = [...this.rData, ...genData(++pageIndex)]
+ this.setState({
+ dataSource: this.state.dataSource.cloneWithRows(this.rData),
+ isLoading: false,
+ })
+ }, 1000)
+ }
+
+ titleClick() {
console.log('详情')
}
+ setDateAry() {
+ let seasons = []
+ let year = date.getFullYear()
+ let yearAry = []
+ let mouthAry = []
+ for (let i = year - 10; i < year + 6; i++) {
+ yearAry.push({ label: i + '年', value: i + '年' })
+ }
+ for (let j = 1; j < 13; j++) {
+ mouthAry.push({ label: j + '月', value: j + '月' })
+ }
+ seasons = [yearAry, mouthAry]
+ return seasons
+ }
render() {
- const { date } = this.state
- return
-
+ const seasons = this.setDateAry()
+ const separator = (sectionID, rowID) => (
+
+ )
+ let index = data.length - 1
+ const row = (rowData, sectionID, rowID) => {
+ if (index < 0) {
+ index = data.length - 1
+ }
+ const obj = data[index--]
+ return (
+
+
+ {obj.title}
+
+
+
+ -
+
+
+ -
+
需求跟进
+ 浙江省西湖区莫干山路工程
+
+
+
+ -
+
+
+ -
+
需求跟进
+ 浙江省西湖区莫干山路工程
+
+
+
+ -
+
+
+ -
+
需求跟进
+ 浙江省西湖区莫干山路工程
+
+
+
+
+ )
+ }
+ return (
+
+
{
+ this.props.match.history.push(urls.CHECK + '?url=TOBEDONE')
+ }} title={
+
{ return labels.join('') }}
+ onChange={v => this.setState({ sValue: v })}
+ onOk={v => this.setState({ sValue: v })}
+ >
+
+
+
+ {this.state.isLoading ? '加载中...' : '加载完成'}
+
)}
+ renderRow={row}
+ renderSeparator={separator}
+ style={{
+ height: this.state.height - 50
+ }}
+ pullToRefresh={}
+ onEndReached={this.onEndReached}
+ pageSize={5}
+ />
+
+
+ )
}
}
diff --git a/src/models/TobeDone/style.css b/src/models/TobeDone/style.css
new file mode 100755
index 0000000..ca42f11
--- /dev/null
+++ b/src/models/TobeDone/style.css
@@ -0,0 +1,148 @@
+/*
+* @Author: chengbs
+* @Date: 2018-06-01 17:30:27
+* @Last Modified by: chengbs
+* @Last Modified time: 2018-06-02 13:31:22
+*/
+
+dl, dt, dd, h4, p {
+ margin: 0;
+ padding: 0;
+}
+
+.list-loading {
+ padding: 30px;
+ text-align: center;
+}
+
+.tobe-done {
+ & :global(.usr-hdleft-title-second) {
+ color: rgba(49, 63, 72, 1);
+ }
+ & :global(.am-navbar-title) {
+ flex: 1.1;
+ & :global(.title) {
+ width: 100%;
+ }
+ }
+ & .tobe-titile {
+ & :global(.am-list-item) {
+ padding: 0;
+ background: rgba(249, 249, 249, .87);
+ & :global(.am-list-line) {
+ padding: 0;
+ & :global(.am-list-extra) {
+ flex-basis:70%;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ }
+ }
+ }
+ }
+}
+
+.tobe-list {
+ padding: 0 15px;
+ background-color: #fff;
+ & .tobe-list-title {
+ height: 36px;
+ line-height: 36px;
+ color: #888;
+ font-size: 14px;
+ }
+ & .tobe-list-body {
+ padding: 0 0 5px 10px;
+ & dl {
+ height: 60px;
+ width: 100%;
+ overflow: hidden;
+ &.checked {
+ & .checkItem {
+ background: url(../../assets/checked.png) no-repeat center center;
+ }
+ & dd {
+ & h4 {
+ color: rgba(138, 150, 160, .7)
+ }
+ & p {
+ color: rgba(138, 150, 160, .7);
+ &:before {
+ background: rgba(138, 150, 160, .7);
+ }
+ }
+ }
+ }
+ & dt {
+ float: left;
+ width: 14px;
+ margin-top: 20px;
+ & .checkicon {
+ width: 14px;
+ height: 14px;
+ display: block;
+ font-size: 24px;
+ line-height: 14px;
+ text-align: center;
+ color: rgba(217, 217, 217, 1);
+ }
+ & .checkItem {
+ display: block;
+ width: 14px;
+ height: 14px;
+ &:global(.my-full-border) {
+ border-radius: 0;
+ }
+ }
+ }
+ & dd {
+ float: left;
+ margin-left: 12px;
+ & h4 {
+ height: 40px;
+ line-height: 40px;
+ font-weight: normal;
+ color: rgba(49, 63, 72, 1);
+ font-size: 14px;
+ }
+ & p {
+ font-size: 10px;
+ color: rgba(138, 150, 160, 1);
+ &:before {
+ display: inline-block;
+ content: '';
+ width: 6px;
+ height: 6px;
+ border-radius: 3px;
+ background: rgba(4, 103, 224, 1);
+ margin-right: 10px;
+ }
+ }
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/models/layout.js b/src/models/layout.js
old mode 100644
new mode 100755
index 2e09ab2..ebdbfda
--- a/src/models/layout.js
+++ b/src/models/layout.js
@@ -2,28 +2,32 @@
* @Author: baosheng
* @Date: 2018-04-02 22:24:57
* @Last Modified by: chengbs
-* @Last Modified time: 2018-05-16 16:52:33
+* @Last Modified time: 2018-05-24 21:19:08
*/
import React, { Component } from 'react'
import { Route } from 'react-router-dom'
import AppMenu from 'Components/Menus'
import history from 'Util/history'
+
class MainLayout extends Component {
constructor(props) {
super(props)
this.state = {
title: '',
path: '',
- isMenuPage: true
+ isMenuPage: true,
+ animated: false
}
this.goBack = this.goBack.bind(this)
this.showMenu = this.showMenu.bind(this)
}
componentWillReceiveProps(nextProps) {
+ console.log('layout:', nextProps.location.pathname)
const propObj = this.getRouteByPath(nextProps.location.pathname)
this.setState({
title: propObj['title'],
isMenuPage: propObj['showMenu'],
+ animated: propObj['animated'],
path: nextProps.location.pathname
})
}
@@ -31,12 +35,12 @@ class MainLayout extends Component {
const rtObj = this.getRouteByPath()
this.setState({
isMenuPage: rtObj['showMenu'],
+ animated: rtObj['animated'],
title: rtObj['title']
})
}
showMenu() {
const { routes } = this.props
- console.log(this.state.isMenuPage, routes)
if (this.state.isMenuPage) {
return (
@@ -45,6 +49,7 @@ class MainLayout extends Component {
return (
+
{
routes.map((route, index) => {
return (
{
- return (
-
-
-
- )
+ return
}}
/>
)
@@ -102,7 +104,7 @@ class MainLayout extends Component {
}
render() {
return (
-
+
{this.showMenu()}
)
diff --git a/src/models/style.css b/src/models/style.css
old mode 100644
new mode 100755
index e69de29..45baba0
--- a/src/models/style.css
+++ b/src/models/style.css
@@ -0,0 +1,7 @@
+/*
+* @Author: chengbs
+* @Date: 2018-05-16 18:38:22
+* @Last Modified by: chengbs
+* @Last Modified time: 2018-05-22 16:04:35
+*/
+
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
old mode 100644
new mode 100755
diff --git a/src/utils/H.js b/src/utils/H.js
old mode 100644
new mode 100755
diff --git a/src/utils/api.js b/src/utils/api.js
old mode 100644
new mode 100755
index 0a77852..b4ba28c
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -2,50 +2,73 @@
* @Author: baosheng
* @Date: 2018-04-02 22:27:03
* @Last Modified by: baosheng
-* @Last Modified time: 2018-04-02 22:27:06
+* @Last Modified time: 2018-07-01 20:13:26
*/
import fetch from 'Util/fetch'
-import { message } from 'antd'
-import { showSpin } from 'Models/layout'
+import { Toast } from 'antd-mobile'
// 获取数据类接口
-export const Fetch = (url, params) => {
- showSpin({ bool: true, content: '正在加载数据....' })
- return fetch(url, params).then((res) => {
+export const Fetch = (url, params, method = 'post', config) => {
+ if (method === 'get') {
+ params = { params, ...config }
+ config = {}
+ }
+ return fetch[method](url, params, config).then((res) => {
if (res.code === 0) {
- showSpin()
- return res.data
+ return res.data || true
} else {
- showSpin()
- message.error(res.message, 2)
+ Toast.fail(res.msg, 1)
}
}, (err) => {
- showSpin()
- message.error(err.message, 2)
+ Toast.fail(err.msg, 1)
})
}
// 保存类接口
-export const FetchSave = (url, params) => {
- showSpin({ bool: true, content: '正在加载数据....' })
- return fetch(url, params).then((res) => {
- console.log(res)
+export const FetchSave = (url, params, method = 'post', config) => {
+ if (method === 'get') {
+ params = { params, ...config }
+ config = {}
+ }
+ return fetch[method](url, params, config).then((res) => {
if (res.code === 0) {
- showSpin()
- message.success(res.message, 2)
- return res.data
+ Toast.success(res.msg, 1)
+ return res.data || true
} else {
- showSpin()
- message.error(res.message, 2)
+ Toast.fail(res.msg, 1)
}
}, (err) => {
- showSpin()
- message.error(err.message, 2)
+ Toast.fail(err.msg, 1)
})
}
export default {
- logout(params) { // 登出
- return FetchSave('/api/logout.json', params)
+ auth: {
+ login(params) { // 登录
+ return Fetch('/auth/login', params)
+ },
+ register(params) { // 注册
+ return Fetch('/auth/register', params)
+ },
+ loginout(params) { // 退出
+ return FetchSave('/auth/logout', params, 'get')
+ },
+ refresh(params) { // 刷新token
+ return Fetch('/auth/refresh', params)
+ }
+ },
+ Mine: { // 我的
+ Personaldara: { // 编辑个人资料
+ avatar(params) { // 上传用户头像
+ console.log(params)
+ return Fetch('/users/avatar', params, 'post', { 'Content-Type': 'multipart/form-data' })
+ },
+ edit(params) { // 修改用户资料
+ return Fetch('/users/edit', params)
+ },
+ info(params) { // 修改用户资料
+ return Fetch('/users', params, 'get')
+ },
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/utils/calendar.css b/src/utils/calendar.css
old mode 100644
new mode 100755
diff --git a/src/utils/calendar.js b/src/utils/calendar.js
old mode 100644
new mode 100755
diff --git a/src/utils/fetch.js b/src/utils/fetch.js
old mode 100644
new mode 100755
index 05446c5..9981a36
--- a/src/utils/fetch.js
+++ b/src/utils/fetch.js
@@ -1,22 +1,24 @@
/*
* @Author: baosheng
* @Date: 2018-04-02 22:28:51
+<<<<<<< HEAD
* @Last Modified by: baosheng
-* @Last Modified time: 2018-04-02 22:32:51
+* @Last Modified time: 2018-07-04 20:10:45
+=======
+* @Last Modified by: chengbs
+* @Last Modified time: 2018-06-19 22:49:33
+>>>>>>> origin/develop
*/
import storage from '../utils/storage'
import axios from 'axios'
import { baseUrl } from './index'
let fetcher = axios.create({
- method: 'post',
baseURL: baseUrl,
- withCredentials: true,
+ withCredentials: 'include',
transformRequest: [function (data) {
- const userInfo = storage.get('user')
- if (userInfo && data && !data.NOUSERINFO) {
- data.userName = userInfo.userName
- data.accessToken = userInfo.accessToken
+ if (data && data.constructor && data.constructor.name === 'FormData') {
+ return data
}
return JSON.stringify(data)
}],
@@ -27,18 +29,82 @@ let fetcher = axios.create({
})
fetcher.interceptors.request.use(function (config) {
+ const Authorization = storage.get('Authorization')
+ if (Authorization) {
+ config.headers.Authorization = Authorization
+ }
return config
}, function (error) {
return Promise.reject(error)
})
fetcher.interceptors.response.use(function (response) {
- if (response.data.code === 89001 || response.data.code === 81001) {
- location.href = '/login'
+ if (response.data.code === 10013) { // 未登录
+ window.location.href = '/Login/login'
+ } else if (response.data.code === 10011) { // token过期
+ let refreshToken = storage.get('refreshToken')
+ axios.post(baseUrl + '/auth/refresh', { refresh_token: refreshToken }).then(function(res) {
+ console.log(res.data.data.access_token)
+ storage.set('Authorization', 'Bearer ' + res.data.data.access_token)
+ storage.set('refreshToken', res.data.data.refresh_token)
+ window.location.reload()
+ }).catch(function(err) {
+ console.log(err)
+ })
}
return response.data
}, function (error) {
+ if (error && error.response) { // 这里是返回状态码不为200时候的错误处理
+ switch (error.response.status) {
+ case 400:
+ error.msg = '请求错误'
+ break
+
+ case 401:
+ error.msg = '未授权，请登录'
+ break
+
+ case 403:
+ error.msg = '拒绝访问'
+ break
+
+ case 404:
+ error.msg = `请求地址出错: ${error.response.config.url}`
+ break
+
+ case 408:
+ error.msg = '请求超时'
+ break
+
+ case 500:
+ error.msg = '服务器内部错误'
+ break
+
+ case 501:
+ error.msg = '服务未实现'
+ break
+
+ case 502:
+ error.msg = '网关错误'
+ break
+
+ case 503:
+ error.msg = '服务不可用'
+ break
+
+ case 504:
+ error.msg = '网关超时'
+ break
+
+ case 505:
+ error.msg = 'HTTP版本不受支持'
+ break
+
+ default:
+ error.msg = error.response.status + '错误'
+ }
+ }
return Promise.reject(error)
})
-export default fetcher.post
+export default fetcher
diff --git a/src/utils/history.js b/src/utils/history.js
old mode 100644
new mode 100755
diff --git a/src/utils/index.js b/src/utils/index.js
old mode 100644
new mode 100755
index 3c7e2f2..b0d5d60
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -2,26 +2,21 @@
* @Author: baosheng
* @Date: 2018-04-02 22:28:51
* @Last Modified by: baosheng
-* @Last Modified time: 2018-04-02 22:33:05
+* @Last Modified time: 2018-06-25 21:58:34
*/
-let baseUrl = '/'
-let imgPrefix = 'http://dx-image-test.itangchao.me/'
-let videoPrefix = 'http://dx-video-test.itangchao.me/'
+let baseUrl = '/api'
if (process.env.NODE_ENV === 'production') {
- baseUrl = 'http://dxapi.youxiangtv.com'
- imgPrefix = 'https://image.youxiangtv.com/'
- videoPrefix = 'https://video.youxiangtv.com/'
+ console.log('in PRO')
+ baseUrl = 'http://api-test.yaque365.com/'
if (TEST) {
console.log('in TEST')
- baseUrl = 'http://10.0.31.125:8081'
- imgPrefix = 'http://dx-image-test.itangchao.me/'
- videoPrefix = 'http://dx-video-test.itangchao.me/'
+ baseUrl = 'http://api-test.yaque365.com/'
}
if (PRE) {
console.log('in PRE')
- baseUrl = 'http://api-pre.youxiangtv.com'
+ baseUrl = 'http://api-test.yaque365.com/'
}
}
-export { baseUrl, imgPrefix, videoPrefix }
+export { baseUrl }
diff --git a/src/utils/storage.js b/src/utils/storage.js
old mode 100644
new mode 100755
diff --git a/src/utils/touchFeedback.js b/src/utils/touchFeedback.js
new file mode 100644
index 0000000..8a5ab35
--- /dev/null
+++ b/src/utils/touchFeedback.js
@@ -0,0 +1,100 @@
+/* eslint-disable */
+!(function () {
+ var eventBind = function (_this) {
+ var eventData = {}, container = _this._container, vague = 5,
+ bindProp = _this._bindProp, feedbackClass = _this._feedbackClass;
+
+ var classUtil = {
+ hasClass: function (elem, cls){
+ cls = cls || '';
+ if(cls.replace(/\s/g, '').length == 0) return false;
+ return new RegExp(' ' + cls + ' ').test(' ' + elem.className + ' ');
+ },
+ addClass: function (elem, cls){
+ if(!this.hasClass(elem, cls)){
+ elem.className += ' ' + cls;
+ }
+ },
+ removeClass: function (elem, cls){
+ if(this.hasClass(elem, cls)){
+ var newClass = ' ' + elem.className.replace(/[\t\r\n]/g, '') + ' ';
+ while(newClass.indexOf(' ' + cls + ' ') >= 0){
+ newClass = newClass.replace(' ' + cls + ' ', ' ');
+ }
+ elem.className = newClass.replace(/^\s+|\s+$/g, '');
+ }
+ },
+ closest: function (elem, attribute) {
+ var cur, match;
+ for (cur = elem; cur; cur = cur.parentNode) {
+ if (cur.nodeType < 11 && cur.nodeType === 1 && cur.getAttribute(attribute) === 'true') {
+ break;
+ }
+ }
+ return cur;
+ }
+ };
+
+ _this.startFunc = function (e) {
+ var event = e.changedTouches ? e.changedTouches[0] : e,
+ identifier = eventData[event.identifier] = {};
+ identifier.startY = event.pageY;
+ identifier.startX = event.pageX;
+ identifier.target = classUtil.closest(event.target, bindProp);
+ if (identifier.target) {
+ classUtil.addClass(identifier.target, feedbackClass);
+ }
+ };
+
+ container.addEventListener('touchstart', _this.startFunc);
+
+ _this.moveFunc = function (e) {
+ var event = e.changedTouches ? e.changedTouches[0] : e,
+ identifier = eventData[event.identifier];
+ if (event.target && Math.abs(identifier.startY - event.pageY) > vague) {
+ classUtil.removeClass(identifier.target, feedbackClass);
+ }
+ };
+
+ container.addEventListener('touchmove', _this.moveFunc);
+
+ _this.cancelFunc = function (e) {
+ var event = e.changedTouches ? e.changedTouches[0] : e,
+ identifier = eventData[event.identifier];
+ if (identifier.target) {
+ classUtil.removeClass(identifier.target, feedbackClass);
+ }
+ delete eventData[event.identifier];
+ };
+
+ container.addEventListener('touchcancel', _this.cancelFunc);
+
+ container.addEventListener('touchend', _this.cancelFunc);
+ };
+
+ var TouchFeedback = function (selector, option) {
+ this._container = document.querySelector(selector);
+ option = option || {};
+ this._bindProp = option.bindProp || 'data-touchFeedback';
+ this._feedbackClass = option.feedbackClass || 'feedback';
+ eventBind(this);
+ };
+
+ TouchFeedback.prototype.destory = function () {
+ var _this = this;
+ _this._container.removeEventListener('touchstart', _this.startFunc);
+ _this._container.removeEventListener('touchmove', _this.moveFunc);
+ _this._container.removeEventListener('touchcancel', _this.cancelFunc);
+ _this._container.removeEventListener('touchend', _this.cancelFunc);
+ };
+
+ if (typeof define === 'function') {
+ define(function() {
+ return TouchFeedback;
+ });
+ } else if (typeof exports !== 'undefined') {
+ module.exports = TouchFeedback;
+ } else {
+ this.TouchFeedback = TouchFeedback;
+ }
+}());
\ No newline at end of file
diff --git a/src/utils/ua.js b/src/utils/ua.js
old mode 100644
new mode 100755
diff --git a/yarn.lock b/yarn.lock
old mode 100644
new mode 100755
index f87e218..1c82046
--- a/yarn.lock
+++ b/yarn.lock
@@ -157,6 +157,10 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+antd-mobile-demo-data@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/antd-mobile-demo-data/-/antd-mobile-demo-data-0.2.0.tgz#049731dc3c48c42603185e4338724879224c8442"
+
antd-mobile@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/antd-mobile/-/antd-mobile-2.1.8.tgz#054efda2105d9bf603a0730b8602a8fb21c81c02"
@@ -291,7 +295,7 @@ array-tree-filter@1.0.x:
version "1.0.1"
resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-1.0.1.tgz#0a8ad1eefd38ce88858632f9cc0423d7634e4d5d"
-array-tree-filter@~2.1.0:
+array-tree-filter@^2.1.0, array-tree-filter@~2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
@@ -405,6 +409,17 @@ autoprefixer@^6.3.1:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
+autoprefixer@^7.1.1:
+ version "7.2.6"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+ dependencies:
+ browserslist "^2.11.3"
+ caniuse-lite "^1.0.30000805"
+ normalize-range "^0.1.2"
+ num2fraction "^1.2.2"
+ postcss "^6.0.17"
+ postcss-value-parser "^3.2.3"
+
aws-sign2@~0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -417,6 +432,13 @@ aws4@^1.2.1, aws4@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+axios@^0.18.0:
+ version "0.18.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+ dependencies:
+ follow-redirects "^1.3.0"
+ is-buffer "^1.1.5"
+
axobject-query@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
@@ -1064,6 +1086,10 @@ babylon@^6.17.0, babylon@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+balanced-match@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
+
balanced-match@^0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1296,7 +1322,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
-browserslist@^2.1.2, browserslist@^2.5.1:
+browserslist@^2.0.0, browserslist@^2.1.2, browserslist@^2.11.3, browserslist@^2.5.1:
version "2.11.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
dependencies:
@@ -1414,10 +1440,23 @@ caniuse-api@^1.5.2:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
+caniuse-api@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-2.0.0.tgz#b1ddb5a5966b16f48dc4998444d4bbc6c7d9d834"
+ dependencies:
+ browserslist "^2.0.0"
+ caniuse-lite "^1.0.0"
+ lodash.memoize "^4.1.2"
+ lodash.uniq "^4.5.0"
+
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000821"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000821.tgz#3fcdc67c446a94a9cdd848248a4e3e54b2da7419"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000805:
+ version "1.0.30000841"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000841.tgz#200079f853ca2839cb80852348d09a551f92f70a"
+
caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000792:
version "1.0.30000821"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93"
@@ -1463,10 +1502,22 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
+chalk@^2.4.1:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+ dependencies:
+ ansi-styles "^3.2.1"
+ escape-string-regexp "^1.0.5"
+ supports-color "^5.3.0"
+
chardet@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+china-division@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/china-division/-/china-division-2.0.0.tgz#4ca80236d34dbed6d96d92d185220ecca228ebe7"
+
chokidar@^1.6.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1575,8 +1626,8 @@ clone@^1.0.2:
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
clone@^2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
co@^4.6.0:
version "4.6.0"
@@ -1599,7 +1650,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"
-color-convert@^1.3.0, color-convert@^1.9.0:
+color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0, color-convert@^1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
dependencies:
@@ -1615,6 +1666,13 @@ color-string@^0.3.0:
dependencies:
color-name "^1.0.0"
+color-string@^1.4.0, color-string@^1.5.2:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
+ dependencies:
+ color-name "^1.0.0"
+ simple-swizzle "^0.2.2"
+
color@^0.11.0:
version "0.11.4"
resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
@@ -1623,6 +1681,20 @@ color@^0.11.0:
color-convert "^1.3.0"
color-string "^0.3.0"
+color@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
+ dependencies:
+ color-convert "^1.8.2"
+ color-string "^1.4.0"
+
+color@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
+ dependencies:
+ color-convert "^1.9.1"
+ color-string "^1.5.2"
+
colormin@^1.0.5:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -1871,6 +1943,15 @@ css-animation@1.x, css-animation@^1.3.2:
babel-runtime "6.x"
component-classes "^1.2.5"
+css-color-function@~1.3.3:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e"
+ dependencies:
+ balanced-match "0.1.0"
+ color "^0.11.0"
+ debug "^3.1.0"
+ rgb "~0.1.0"
+
css-color-names@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -1911,6 +1992,10 @@ css-selector-tokenizer@^0.7.0:
fastparse "^1.1.1"
regexpu-core "^1.0.0"
+css-unit-converter@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
+
css-what@2.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -1999,7 +2084,7 @@ date-now@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
@@ -2238,8 +2323,8 @@ domhandler@2.1:
domelementtype "1"
domhandler@^2.3.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
dependencies:
domelementtype "1"
@@ -2643,12 +2728,6 @@ events@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-eventsource@0.1.6:
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
- dependencies:
- original ">=0.0.5"
-
evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -2820,18 +2899,6 @@ fastparse@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-faye-websocket@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
- dependencies:
- websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.0:
- version "0.11.1"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
- dependencies:
- websocket-driver ">=0.5.1"
-
fb-watchman@^1.8.0:
version "1.9.2"
resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
@@ -2964,6 +3031,12 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+follow-redirects@^1.3.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.0.tgz#234f49cf770b7f35b40e790f636ceba0c3a0ab77"
+ dependencies:
+ debug "^3.1.0"
+
for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3494,10 +3567,13 @@ http-errors@~1.6.2:
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
+<<<<<<< HEAD
+=======
http-parser-js@>=0.4.0:
- version "0.4.11"
- resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529"
+ version "0.4.13"
+ resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+>>>>>>> origin/develop
http-proxy-middleware@~0.17.4:
version "0.17.4"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
@@ -3560,6 +3636,12 @@ image-size@^0.5.1:
version "0.5.5"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+img-loader@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/img-loader/-/img-loader-3.0.0.tgz#1543ced809b1ec9b4d5e77d2584159282f1c4dd6"
+ dependencies:
+ loader-utils "^1.1.0"
+
import-lazy@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -3675,6 +3757,10 @@ is-arrayish@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+is-arrayish@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd"
+
is-binary-path@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@@ -3938,6 +4024,10 @@ isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+isnumeric@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/isnumeric/-/isnumeric-0.2.0.tgz#a2347ba360de19e33d0ffd590fddf7755cbf2e64"
+
isobject@^2.0.0, isobject@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -4328,10 +4418,6 @@ json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-json3@^3.3.2:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -4522,7 +4608,7 @@ lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-lodash.template@^4.4.0:
+lodash.template@^4.2.4, lodash.template@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
dependencies:
@@ -5073,6 +5159,10 @@ once@^1.3.0, once@^1.3.3, once@^1.4.0:
dependencies:
wrappy "1"
+onecolor@^3.0.4:
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6"
+
onetime@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -5109,12 +5199,15 @@ optionator@^0.8.1, optionator@^0.8.2:
type-check "~0.3.2"
wordwrap "~1.0.0"
+<<<<<<< HEAD
+=======
original@>=0.0.5:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/original/-/original-1.0.1.tgz#b0a53ff42ba997a8c9cd1fb5daaeb42b9d693190"
dependencies:
- url-parse "1.0.x"
+ url-parse "~1.4.0"
+>>>>>>> origin/develop
os-browserify@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -5326,6 +5419,14 @@ pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+pixrem@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/pixrem/-/pixrem-4.0.1.tgz#2da4a1de6ec4423c5fc3794e930b81d4490ec686"
+ dependencies:
+ browserslist "^2.0.0"
+ postcss "^6.0.0"
+ reduce-css-calc "^1.2.7"
+
pkg-dir@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -5338,6 +5439,13 @@ pkg-dir@^2.0.0:
dependencies:
find-up "^2.1.0"
+pleeease-filters@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/pleeease-filters/-/pleeease-filters-4.0.0.tgz#6632b2fb05648d2758d865384fbced79e1ccaec7"
+ dependencies:
+ onecolor "^3.0.4"
+ postcss "^6.0.1"
+
pluralize@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -5354,6 +5462,21 @@ posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+postcss-apply@^0.8.0:
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/postcss-apply/-/postcss-apply-0.8.0.tgz#14e544bbb5cb6f1c1e048857965d79ae066b1343"
+ dependencies:
+ babel-runtime "^6.23.0"
+ balanced-match "^0.4.2"
+ postcss "^6.0.0"
+
+postcss-attribute-case-insensitive@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz#94dc422c8f90997f16bd33a3654bbbec084963b4"
+ dependencies:
+ postcss "^6.0.0"
+ postcss-selector-parser "^2.2.3"
+
postcss-calc@^5.2.0:
version "5.3.1"
resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -5362,6 +5485,80 @@ postcss-calc@^5.2.0:
postcss-message-helpers "^2.0.0"
reduce-css-calc "^1.2.6"
+postcss-calc@^6.0.0:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.1.tgz#3d24171bbf6e7629d422a436ebfe6dd9511f4330"
+ dependencies:
+ css-unit-converter "^1.1.1"
+ postcss "^6.0.0"
+ postcss-selector-parser "^2.2.2"
+ reduce-css-calc "^2.0.0"
+
+postcss-color-function@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.0.1.tgz#402b3f2cebc3f6947e618fb6be3654fbecef6444"
+ dependencies:
+ css-color-function "~1.3.3"
+ postcss "^6.0.1"
+ postcss-message-helpers "^2.0.0"
+ postcss-value-parser "^3.3.0"
+
+postcss-color-gray@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz#e5581ed57eaa826fb652ca11b1e2b7b136a9f9df"
+ dependencies:
+ color "^2.0.1"
+ postcss "^6.0.14"
+ postcss-message-helpers "^2.0.0"
+ reduce-function-call "^1.0.2"
+
+postcss-color-hex-alpha@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz#1e53e6c8acb237955e8fd08b7ecdb1b8b8309f95"
+ dependencies:
+ color "^1.0.3"
+ postcss "^6.0.1"
+ postcss-message-helpers "^2.0.0"
+
+postcss-color-hsl@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz#12703666fa310430e3f30a454dac1386317d5844"
+ dependencies:
+ postcss "^6.0.1"
+ postcss-value-parser "^3.3.0"
+ units-css "^0.4.0"
+
+postcss-color-hwb@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz#3402b19ef4d8497540c1fb5072be9863ca95571e"
+ dependencies:
+ color "^1.0.3"
+ postcss "^6.0.1"
+ postcss-message-helpers "^2.0.0"
+ reduce-function-call "^1.0.2"
+
+postcss-color-rebeccapurple@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz#ce1269ecc2d0d8bf92aab44bd884e633124c33ec"
+ dependencies:
+ postcss "^6.0.22"
+ postcss-values-parser "^1.5.0"
+
+postcss-color-rgb@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz#14539c8a7131494b482e0dd1cc265ff6514b5263"
+ dependencies:
+ postcss "^6.0.1"
+ postcss-value-parser "^3.3.0"
+
+postcss-color-rgba-fallback@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz#37d5c9353a07a09270912a82606bb42a0d702c04"
+ dependencies:
+ postcss "^6.0.6"
+ postcss-value-parser "^3.3.0"
+ rgb-hex "^2.1.0"
+
postcss-colormin@^2.1.8:
version "2.2.2"
resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
@@ -5377,6 +5574,62 @@ postcss-convert-values@^2.3.4:
postcss "^5.0.11"
postcss-value-parser "^3.1.2"
+postcss-cssnext@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-cssnext/-/postcss-cssnext-3.1.0.tgz#927dc29341a938254cde38ea60a923b9dfedead9"
+ dependencies:
+ autoprefixer "^7.1.1"
+ caniuse-api "^2.0.0"
+ chalk "^2.0.1"
+ pixrem "^4.0.0"
+ pleeease-filters "^4.0.0"
+ postcss "^6.0.5"
+ postcss-apply "^0.8.0"
+ postcss-attribute-case-insensitive "^2.0.0"
+ postcss-calc "^6.0.0"
+ postcss-color-function "^4.0.0"
+ postcss-color-gray "^4.0.0"
+ postcss-color-hex-alpha "^3.0.0"
+ postcss-color-hsl "^2.0.0"
+ postcss-color-hwb "^3.0.0"
+ postcss-color-rebeccapurple "^3.0.0"
+ postcss-color-rgb "^2.0.0"
+ postcss-color-rgba-fallback "^3.0.0"
+ postcss-custom-media "^6.0.0"
+ postcss-custom-properties "^6.1.0"
+ postcss-custom-selectors "^4.0.1"
+ postcss-font-family-system-ui "^3.0.0"
+ postcss-font-variant "^3.0.0"
+ postcss-image-set-polyfill "^0.3.5"
+ postcss-initial "^2.0.0"
+ postcss-media-minmax "^3.0.0"
+ postcss-nesting "^4.0.1"
+ postcss-pseudo-class-any-link "^4.0.0"
+ postcss-pseudoelements "^5.0.0"
+ postcss-replace-overflow-wrap "^2.0.0"
+ postcss-selector-matches "^3.0.1"
+ postcss-selector-not "^3.0.1"
+
+postcss-custom-media@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz#be532784110ecb295044fb5395a18006eb21a737"
+ dependencies:
+ postcss "^6.0.1"
+
+postcss-custom-properties@^6.1.0:
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz#5c52abde313d7ec9368c4abf67d27a656cba8b39"
+ dependencies:
+ balanced-match "^1.0.0"
+ postcss "^6.0.18"
+
+postcss-custom-selectors@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz#781382f94c52e727ef5ca4776ea2adf49a611382"
+ dependencies:
+ postcss "^6.0.1"
+ postcss-selector-matches "^3.0.0"
+
postcss-discard-comments@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
@@ -5421,6 +5674,32 @@ postcss-flexbugs-fixes@3.2.0:
dependencies:
postcss "^6.0.1"
+postcss-font-family-system-ui@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz#675fe7a9e029669f05f8dba2e44c2225ede80623"
+ dependencies:
+ postcss "^6.0"
+
+postcss-font-variant@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz#08ccc88f6050ba82ed8ef2cc76c0c6a6b41f183e"
+ dependencies:
+ postcss "^6.0.1"
+
+postcss-image-set-polyfill@^0.3.5:
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz#0f193413700cf1f82bd39066ef016d65a4a18181"
+ dependencies:
+ postcss "^6.0.1"
+ postcss-media-query-parser "^0.2.3"
+
+postcss-initial@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-2.0.0.tgz#72715f7336e0bb79351d99ee65c4a253a8441ba4"
+ dependencies:
+ lodash.template "^4.2.4"
+ postcss "^6.0.1"
+
postcss-load-config@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -5453,6 +5732,16 @@ postcss-loader@^2.0.8:
postcss-load-config "^1.2.0"
schema-utils "^0.4.0"
+postcss-media-minmax@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz#675256037a43ef40bc4f0760bfd06d4dc69d48d2"
+ dependencies:
+ postcss "^6.0.1"
+
+postcss-media-query-parser@^0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
postcss-merge-idents@^2.1.5:
version "2.1.7"
resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@@ -5541,6 +5830,12 @@ postcss-modules-values@^1.1.0:
icss-replace-symbols "^1.1.0"
postcss "^6.0.1"
+postcss-nesting@^4.0.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.2.1.tgz#0483bce338b3f0828ced90ff530b29b98b00300d"
+ dependencies:
+ postcss "^6.0.11"
+
postcss-normalize-charset@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
@@ -5569,6 +5864,19 @@ postcss-prefix-selector@^1.6.0:
dependencies:
postcss "^5.0.8"
+postcss-pseudo-class-any-link@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz#9152a0613d3450720513e8892854bae42d0ee68e"
+ dependencies:
+ postcss "^6.0.1"
+ postcss-selector-parser "^2.2.3"
+
+postcss-pseudoelements@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz#eef194e8d524645ca520a949e95e518e812402cb"
+ dependencies:
+ postcss "^6.0.0"
+
postcss-pxtorem@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/postcss-pxtorem/-/postcss-pxtorem-4.0.1.tgz#9c64d0efe4885473cc1cb0305c6ffc3ebb45b1cd"
@@ -5597,7 +5905,27 @@ postcss-reduce-transforms@^1.0.3:
postcss "^5.0.8"
postcss-value-parser "^3.0.1"
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+postcss-replace-overflow-wrap@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz#794db6faa54f8db100854392a93af45768b4e25b"
+ dependencies:
+ postcss "^6.0.1"
+
+postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz#e5634011e13950881861bbdd58c2d0111ffc96ab"
+ dependencies:
+ balanced-match "^0.4.2"
+ postcss "^6.0.1"
+
+postcss-selector-not@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz#2e4db2f0965336c01e7cec7db6c60dff767335d9"
+ dependencies:
+ balanced-match "^0.4.2"
+ postcss "^6.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector-parser@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
dependencies:
@@ -5626,6 +5954,14 @@ postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^
version "3.3.0"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+postcss-values-parser@^1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz#5d9fa63e2bcb0179ce48f3235303765eb89f3047"
+ dependencies:
+ flatten "^1.0.2"
+ indexes-of "^1.0.1"
+ uniq "^1.0.1"
+
postcss-zindex@^2.0.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
@@ -5643,6 +5979,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"
+postcss@^6.0, postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.17, postcss@^6.0.18, postcss@^6.0.22, postcss@^6.0.5, postcss@^6.0.6:
+ version "6.0.22"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
+ dependencies:
+ chalk "^2.4.1"
+ source-map "^0.6.1"
+ supports-color "^5.4.0"
+
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13:
version "6.0.21"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
@@ -5659,14 +6003,14 @@ posthtml-parser@^0.2.0, posthtml-parser@^0.2.1:
isobject "^2.1.0"
posthtml-rename-id@^1.0:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/posthtml-rename-id/-/posthtml-rename-id-1.0.5.tgz#09ede15775f0a9fa5dab13a6eee3eecbbe19aaa7"
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/posthtml-rename-id/-/posthtml-rename-id-1.0.7.tgz#190e9f341a8bbbda31e47e932f1d9b71b9f73593"
dependencies:
escape-string-regexp "1.0.5"
posthtml-render@^1.0.5, posthtml-render@^1.0.6:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.1.3.tgz#53e91c3debd0e7443704efa299329e1e10867f0e"
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.1.4.tgz#95dac09892f4f183fad5ac823f08f42c0256551e"
posthtml-svg-mode@^1.0:
version "1.0.2"
@@ -5746,7 +6090,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0:
+prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0:
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
@@ -5818,14 +6162,13 @@ querystring@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-querystringify@0.0.x:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
-
-querystringify@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
+<<<<<<< HEAD
+=======
+querystringify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+>>>>>>> origin/develop
raf@3.4.0, raf@^3.1.0, raf@^3.3.2:
version "3.4.0"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
@@ -5966,6 +6309,15 @@ rc-trigger@^2.2.2:
rc-animate "2.x"
rc-util "^4.4.0"
+rc-upload@^2.4.4:
+ version "2.4.4"
+ resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.4.4.tgz#28e1e6a3e44d1b1f92e57e21927cfa2763ac2a21"
+ dependencies:
+ babel-runtime "6.x"
+ classnames "^2.2.5"
+ prop-types "^15.5.7"
+ warning "2.x"
+
rc-util@4.x, rc-util@^4.0.4, rc-util@^4.4.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.5.0.tgz#3183e6ec806f382efb2d3e85770d95875fa6180f"
@@ -6198,7 +6550,7 @@ redent@^1.0.0:
indent-string "^2.1.0"
strip-indent "^1.0.1"
-reduce-css-calc@^1.2.6:
+reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7:
version "1.3.0"
resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
dependencies:
@@ -6206,7 +6558,14 @@ reduce-css-calc@^1.2.6:
math-expression-evaluator "^1.2.14"
reduce-function-call "^1.0.1"
-reduce-function-call@^1.0.1:
+reduce-css-calc@^2.0.0:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.4.tgz#c20e9cda8445ad73d4ff4bea960c6f8353791708"
+ dependencies:
+ css-unit-converter "^1.1.1"
+ postcss-value-parser "^3.3.0"
+
+reduce-function-call@^1.0.1, reduce-function-call@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
dependencies:
@@ -6389,7 +6748,11 @@ require-uncached@^1.0.3:
caller-path "^0.1.0"
resolve-from "^1.0.0"
-requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
+<<<<<<< HEAD
+requires-port@1.x.x:
+=======
+requires-port@1.x.x, requires-port@^1.0.0:
+>>>>>>> origin/develop
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -6443,6 +6806,14 @@ ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+rgb-hex@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/rgb-hex/-/rgb-hex-2.1.0.tgz#c773c5fe2268a25578d92539a82a7a5ce53beda6"
+
+rgb@~0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
+
right-align@^0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -6793,6 +7164,12 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+simple-swizzle@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+ dependencies:
+ is-arrayish "^0.3.1"
+
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -6842,24 +7219,6 @@ sntp@2.x.x:
dependencies:
hoek "4.x.x"
-sockjs-client@1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
- dependencies:
- debug "^2.6.6"
- eventsource "0.1.6"
- faye-websocket "~0.11.0"
- inherits "^2.0.1"
- json3 "^3.3.2"
- url-parse "^1.1.8"
-
-sockjs@0.3.18:
- version "0.3.18"
- resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
- dependencies:
- faye-websocket "^0.10.0"
- uuid "^2.0.2"
-
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -7115,6 +7474,12 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"
+supports-color@^5.4.0:
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+ dependencies:
+ has-flag "^3.0.0"
+
svg-baker-runtime@^1.3.3:
version "1.3.5"
resolved "https://registry.yarnpkg.com/svg-baker-runtime/-/svg-baker-runtime-1.3.5.tgz#f92d133d1fedfc8b8cfb9f9ab00c89253461dfb6"
@@ -7456,6 +7821,13 @@ unique-string@^1.0.0:
dependencies:
crypto-random-string "^1.0.0"
+units-css@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/units-css/-/units-css-0.4.0.tgz#d6228653a51983d7c16ff28f8b9dc3b1ffed3a07"
+ dependencies:
+ isnumeric "^0.2.0"
+ viewport-dimensions "^0.2.0"
+
universalify@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -7526,20 +7898,16 @@ url-parse-lax@^1.0.0:
dependencies:
prepend-http "^1.0.1"
-url-parse@1.0.x:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
- dependencies:
- querystringify "0.0.x"
- requires-port "1.0.x"
-
-url-parse@^1.1.8:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
+<<<<<<< HEAD
+=======
+url-parse@^1.1.8, url-parse@~1.4.0:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.1.tgz#4dec9dad3dc8585f862fed461d2e19bbf623df30"
dependencies:
- querystringify "~1.0.0"
- requires-port "~1.0.0"
+ querystringify "^2.0.0"
+ requires-port "^1.0.0"
+>>>>>>> origin/develop
url-slug@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/url-slug/-/url-slug-2.0.0.tgz#a789d5aed4995c0d95af33377ad1d5c68d4d7027"
@@ -7581,10 +7949,6 @@ utils-merge@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-uuid@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-
uuid@^3.0.0, uuid@^3.1.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
@@ -7616,6 +7980,10 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"
+viewport-dimensions@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz#de740747db5387fd1725f5175e91bac76afdf36c"
+
vm-browserify@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -7628,6 +7996,12 @@ walker@~1.0.5:
dependencies:
makeerror "1.0.x"
+warning@2.x:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/warning/-/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901"
+ dependencies:
+ loose-envify "^1.0.0"
+
warning@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -7749,17 +8123,6 @@ webpack@3.8.1:
webpack-sources "^1.0.1"
yargs "^8.0.2"
-websocket-driver@>=0.5.1:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
- dependencies:
- http-parser-js ">=0.4.0"
- websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-
whatwg-encoding@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"