From d5b352dc1381f21f91c4c4ce8b48269abc0327f6 Mon Sep 17 00:00:00 2001 From: whistlemm <276158636@qq.com> Date: Tue, 12 Dec 2017 01:43:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[feature]=20=E5=8F=91=E8=AF=B4=E8=AF=B4?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/global/tabbar.js | 4 ++-- src/app/layout.js | 2 ++ src/app/life/things/create.js | 30 ++++++++++++++++++++++++++++++ src/app/life/things/create.less | 0 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/app/life/things/create.js create mode 100644 src/app/life/things/create.less diff --git a/src/app/global/tabbar.js b/src/app/global/tabbar.js index 97f8154..10197eb 100644 --- a/src/app/global/tabbar.js +++ b/src/app/global/tabbar.js @@ -32,10 +32,10 @@ class CreateBtn extends React.Component { ), ( } > - 发朋友圈 + 发朋友圈 )]} placement="top" diff --git a/src/app/layout.js b/src/app/layout.js index 5868ab3..b873f9c 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -9,6 +9,7 @@ import Chat from './chat/list' import Life from './life' import ArticleDetail from './article/detail' import ArticleCreate from './article/create' +import ThingsCreate from './life/things/create' const Layout = props => { return ( @@ -17,6 +18,7 @@ const Layout = props => { + diff --git a/src/app/life/things/create.js b/src/app/life/things/create.js new file mode 100644 index 0000000..4dcd310 --- /dev/null +++ b/src/app/life/things/create.js @@ -0,0 +1,30 @@ +import React from 'react' +import { ImagePicker, TextareaItem } from 'antd-mobile' +import Style from './create.less' +import { createForm } from 'rc-form'; + +class createComponent extends React.Component { + render () { + const { getFieldProps } = this.props.form + + return ( +
+ + {/* img upload */} + +
+ ) + } +} + +export default createForm()(createComponent) diff --git a/src/app/life/things/create.less b/src/app/life/things/create.less new file mode 100644 index 0000000..e69de29 From 31ee867c37fcfc271eef7720ba948a4bd3cadf7b Mon Sep 17 00:00:00 2001 From: whistlemm <276158636@qq.com> Date: Wed, 13 Dec 2017 00:09:35 +0800 Subject: [PATCH 2/2] [feature] add font --- .roadhogrc | 3 ++ public/icon/iconfont.css | 25 ++++++++++++++ public/icon/iconfont.eot | Bin 0 -> 3252 bytes public/icon/iconfont.js | 1 + public/icon/iconfont.svg | 45 ++++++++++++++++++++++++++ public/icon/iconfont.ttf | Bin 0 -> 3084 bytes public/icon/iconfont.woff | Bin 0 -> 2212 bytes src/app/global/navBar.less | 6 +++- src/app/global/tabbar.js | 26 +++++++++------ src/app/global/tabbar.less | 7 ++++ src/app/home/tools.js | 3 +- src/app/home/tools.less | 5 +-- src/app/layout.js | 2 ++ src/app/life/index.js | 16 +++++++-- src/app/life/things/thingsHeader.less | 2 +- src/assets/icon/iconfont.css | 24 ++++++++++++++ src/assets/icon/iconfont.eot | Bin 0 -> 3252 bytes src/assets/icon/iconfont.js | 1 + src/assets/icon/iconfont.svg | 45 ++++++++++++++++++++++++++ src/assets/icon/iconfont.ttf | Bin 0 -> 3084 bytes src/assets/icon/iconfont.woff | Bin 0 -> 2212 bytes src/components/iconFont.js | 5 +++ src/index.js | 2 +- 23 files changed, 201 insertions(+), 17 deletions(-) create mode 100644 public/icon/iconfont.css create mode 100644 public/icon/iconfont.eot create mode 100644 public/icon/iconfont.js create mode 100644 public/icon/iconfont.svg create mode 100644 public/icon/iconfont.ttf create mode 100644 public/icon/iconfont.woff create mode 100644 src/assets/icon/iconfont.css create mode 100644 src/assets/icon/iconfont.eot create mode 100644 src/assets/icon/iconfont.js create mode 100644 src/assets/icon/iconfont.svg create mode 100644 src/assets/icon/iconfont.ttf create mode 100644 src/assets/icon/iconfont.woff create mode 100644 src/components/iconFont.js diff --git a/.roadhogrc b/.roadhogrc index c10f1fc..bfbf694 100644 --- a/.roadhogrc +++ b/.roadhogrc @@ -27,5 +27,8 @@ ] } }, + "cssModulesExclude": [ + "./src/assets/icon/iconfont.css" + ], "theme": "./src/common/theme.js" } diff --git a/public/icon/iconfont.css b/public/icon/iconfont.css new file mode 100644 index 0000000..0862e04 --- /dev/null +++ b/public/icon/iconfont.css @@ -0,0 +1,25 @@ + +@font-face {font-family: "iconfont"; + src: url('iconfont.eot?t=1513049300335'); /* IE9*/ + src: url('iconfont.eot?t=1513049300335#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'), + url('iconfont.ttf?t=1513049300335') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('iconfont.svg?t=1513049300335#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family:"iconfont" !important; + font-size:16px; + font-style:normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-liaotian:before { content: "\e641"; } + +.icon-life:before { content: "\e6c5"; } + +.icon-homer-copy:before { content: "\e621"; } + +.icon-wode:before { content: "\e60d"; } + diff --git a/public/icon/iconfont.eot b/public/icon/iconfont.eot new file mode 100644 index 0000000000000000000000000000000000000000..052cb6891a408b6b98ae2d0dfbf08f73666959b1 GIT binary patch literal 3252 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 literal 0 HcmV?d00001 diff --git a/public/icon/iconfont.js b/public/icon/iconfont.js new file mode 100644 index 0000000..a3fccf8 --- /dev/null +++ b/public/icon/iconfont.js @@ -0,0 +1 @@ +(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file diff --git a/public/icon/iconfont.svg b/public/icon/iconfont.svg new file mode 100644 index 0000000..0063b7d --- /dev/null +++ b/public/icon/iconfont.svg @@ -0,0 +1,45 @@ + + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/icon/iconfont.ttf b/public/icon/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2693343734beb45770787c0cc4178846c6e55d07 GIT binary patch literal 3084 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 D&z;10 literal 0 HcmV?d00001 diff --git a/src/app/global/navBar.less b/src/app/global/navBar.less index f6e1538..a4bfda7 100644 --- a/src/app/global/navBar.less +++ b/src/app/global/navBar.less @@ -10,7 +10,11 @@ height: 1.2rem; background-color: #fff; color: #000; - position: relative; + position: fixed; + z-index: 10000; + left: 0; + right: 0; + top: 0; .left, .right { -webkit-box-flex: 1; -ms-flex: 1; diff --git a/src/app/global/tabbar.js b/src/app/global/tabbar.js index 10197eb..a5f8c98 100644 --- a/src/app/global/tabbar.js +++ b/src/app/global/tabbar.js @@ -2,6 +2,8 @@ import React from 'react' import { connect } from 'dva' import { TabBar, Icon, Popover } from 'antd-mobile' import { routerRedux, Link } from 'dva/router' +import IconFont from 'components/iconFont' +import Style from './tabbar.less' class CreateBtn extends React.Component { state = { @@ -46,6 +48,12 @@ class CreateBtn extends React.Component { } } +const TabIcon = (props) => { + return ( + + ) +} + const tabbarConf = { tabbar: { barTintColor: 'white', @@ -54,16 +62,16 @@ const tabbarConf = { items: [{ title: '首页', key: 'home', - icon: , + icon: , onPress: ({ dispatch }) => { dispatch(routerRedux.replace('/home')) }, - selectedIcon: + selectedIcon: }, { title: '江湖', key: 'life', - icon: , + icon: , onPress: ({ dispatch }) => { dispatch(routerRedux.replace('/life')) }, - selectedIcon: + selectedIcon: }, { key: 'article/create', @@ -73,16 +81,16 @@ const tabbarConf = { { title: '聊天', key: 'chat', - icon: , + icon: , onPress: ({ dispatch }) => { dispatch(routerRedux.replace('/chat')) }, - selectedIcon: + selectedIcon: }, { title: '我的', key: 'user', - icon: , + icon: , onPress: ({ dispatch }) => { dispatch(routerRedux.replace('/user')) }, - selectedIcon: + selectedIcon: }] } @@ -124,7 +132,7 @@ class TabbarComponent extends React.Component { const { dispatch } = this.props return (
  • - + {/* */} +
    {item}
    • diff --git a/src/app/home/tools.less b/src/app/home/tools.less index 923d35f..2ff86da 100644 --- a/src/app/home/tools.less +++ b/src/app/home/tools.less @@ -2,7 +2,6 @@ height: 4.32rem; margin: .08rem; padding: .13rem .13rem; - font-size: 0.346667rem; text-align: center; clear: both; // display: block; @@ -17,8 +16,10 @@ .icons { width: 1.33rem; height: 1.33rem; - text-align: center; margin-left: .16rem; + text-align: center; + font-size: 0.64rem; + line-height: 1.33rem; } .iconItem { diff --git a/src/app/layout.js b/src/app/layout.js index b873f9c..ed65108 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -6,6 +6,7 @@ import Home from './home' import UserInfo from './user/UserInfo' import EditUser from './user/EditUser' import Chat from './chat/list' +import ChatingBox from './chat/box.js' import Life from './life' import ArticleDetail from './article/detail' import ArticleCreate from './article/create' @@ -20,6 +21,7 @@ const Layout = props => { + diff --git a/src/app/life/index.js b/src/app/life/index.js index c3fe079..655e6f1 100644 --- a/src/app/life/index.js +++ b/src/app/life/index.js @@ -1,10 +1,22 @@ import React from 'react' import { connect } from 'dva' -import Things from './things/index.js' +import { Icon } from 'antd-mobile' +import Things from './things/index' +import Navbar from '../global/navBar' const LifeComponent = () => { + const navBarProps = { + value1: '朋友圈', + value2: '校友圈', + value1Func: () => {}, + value2Func: () => {}, + leftContent: , + rightContent: + } + return ( -
    +
    +
    ) diff --git a/src/app/life/things/thingsHeader.less b/src/app/life/things/thingsHeader.less index de2c4ce..215d931 100644 --- a/src/app/life/things/thingsHeader.less +++ b/src/app/life/things/thingsHeader.less @@ -5,7 +5,7 @@ font-size: 0.346667rem; } .imgBg { - height: 6.8rem; + height: 5.333333rem; background-repeat: no-repeat; background-position: center center; background-size: cover; diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css new file mode 100644 index 0000000..0a0d0ce --- /dev/null +++ b/src/assets/icon/iconfont.css @@ -0,0 +1,24 @@ + +@font-face {font-family: "iconfont"; + src: url('./iconfont.eot?t=1513049300335'); /* IE9*/ + src: url('./iconfont.eot?t=1513049300335#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'), + url('./iconfont.ttf?t=1513049300335') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('./iconfont.svg?t=1513049300335#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family:"iconfont" !important; + font-style:normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-liaotian:before { content: "\e641"; } + +.icon-life:before { content: "\e6c5"; } + +.icon-homer-copy:before { content: "\e621"; } + +.icon-wode:before { content: "\e60d"; } + diff --git a/src/assets/icon/iconfont.eot b/src/assets/icon/iconfont.eot new file mode 100644 index 0000000000000000000000000000000000000000..052cb6891a408b6b98ae2d0dfbf08f73666959b1 GIT binary patch literal 3252 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 literal 0 HcmV?d00001 diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js new file mode 100644 index 0000000..a3fccf8 --- /dev/null +++ b/src/assets/icon/iconfont.js @@ -0,0 +1 @@ +(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file diff --git a/src/assets/icon/iconfont.svg b/src/assets/icon/iconfont.svg new file mode 100644 index 0000000..0063b7d --- /dev/null +++ b/src/assets/icon/iconfont.svg @@ -0,0 +1,45 @@ + + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2693343734beb45770787c0cc4178846c6e55d07 GIT binary patch literal 3084 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 D&z;10 literal 0 HcmV?d00001 diff --git a/src/components/iconFont.js b/src/components/iconFont.js new file mode 100644 index 0000000..fcb950c --- /dev/null +++ b/src/components/iconFont.js @@ -0,0 +1,5 @@ +export default function ({ type, className }) { + return ( + + ) +} diff --git a/src/index.js b/src/index.js index 3833d21..01e5c47 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import dva from 'dva' import './index.css' - +import './assets/icon/iconfont.css' import './common/JMessage' // 1. Initialize