Skip to content

M
max_android_panel
Commit a1871ca0 by Zhang Xin
Options

修改头部UI & 修改回收弹窗

parent 3b14be54
Showing with 127 additions and 69 deletions
client/actions/common.js
......@@ -42,11 +42,11 @@ const getStoreInfo = (storeId)=>{
body: JSON.stringify(bodyData)
}).then((response)=>response.json())
.then(json=>{
// let storeInfo = Object.assign({},{id:storeId});
// if(json.meta.success && json.data.warehouse){
// storeInfo = Object.assign({},storeInfo,json.data.warehouse)
// }
// dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
let storeInfo = Object.assign({},{id:storeId});
if(json.meta.success && json.data.warehouse){
storeInfo = Object.assign({},storeInfo,json.data.warehouse)
}
dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
}).catch(e=>{console.error(e)})
......
client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
......@@ -42,12 +42,30 @@ export default class HeaderComponent extends React.Component{
getHomeHeader(){
let headerInfo = this.props.headerInfo;
let {storeInfo,userInfo,taskInfo} = headerInfo;
storeInfo = {
id : 1,
name : '华茂商业街'
};
userInfo = {
employeeName : '李大仁',
id : '00001',
headImageUrl : ""
};
taskInfo = {
currentTaskNum : 2,
totalTaskNum : 6
}
let style = {}
if(taskInfo && taskInfo.currentTaskNum && taskInfo.totalTaskNum){
let style = {
style = {
'width' : (parseInt(taskInfo.currentTaskNum) / parseInt(taskInfo.totalTaskNum) * 100) + '%'
}
}
return (
<div className={"homeHeader clearfix"}>
{
......@@ -56,17 +74,6 @@ export default class HeaderComponent extends React.Component{
<img className={"logoImg"} src={UTILPATH.localImg.headlogo} alt=""/>
</div>
{
storeInfo && storeInfo.id ? <div className={"locationInfo"}>
{/*<img className={"addIcon"} src={UTILPATH.localImg.addIcon} alt=""/>*/}
<i className={"iconfont icon-address colfff font50"}></i>
<div className={"local colfff"}>
<p className={"font30"}>{storeInfo.name}</p>
<p className={"font24"}>ID : {storeInfo.id}</p>
</div>
</div> :null
}
{
taskInfo && taskInfo.currentTaskNum && taskInfo.totalTaskNum ?
<div className={"taskProgress"}>
<div className={"currentTask"} style={style}></div>
......@@ -78,6 +85,15 @@ export default class HeaderComponent extends React.Component{
}
<div className={"headerContent rightContent fr "}>
{
storeInfo && storeInfo.id ? <div className={"locationInfo"}>
<i className={"iconfont icon-address colfff font50"}></i>
<div className={"local colfff"}>
<p className={"font30"}>{storeInfo.name}</p>
<p className={"font24"}>ID : {storeInfo.id}</p>
</div>
</div> :null
}
{
userInfo && userInfo.id ? <div className={"userinfos"}>
<img className={"userheadImg"} src={ userInfo.headImageUrl || UTILPATH.localImg.defaultImg} alt=""/>
......@@ -88,7 +104,7 @@ export default class HeaderComponent extends React.Component{
</div> : null
}
<div className={"line"} />
<div className={"classify"} onClick={()=>this.handleShowClassify()}/>
<div className={"classify icon iconfont icon-menu colfff font70"} onClick={()=>this.handleShowClassify()}/>
</div>
<AllClassify showClassify={this.state.showClassify}/>
</div>
......@@ -131,13 +147,7 @@ export default class HeaderComponent extends React.Component{
render(){
let props = this.props;
let pages = null;
console.log("props ",props);
console.log("props ",props.headerInfo);
if(props && props.headerInfo && props.headerInfo.storeInfo){
pages = this.getHeader.bind(this)();
}
let pages = this.getHeader.bind(this)();
return <div className={"headerComponent"}>
{pages}
</div>
......
client/components/CommonComponent/HeaderComponent/index.css
......@@ -17,13 +17,12 @@
display: flex;
}
.headerComponent .homeHeader .headerlogo{
width: 440px;
width: 398px;
height: 100%;
background-color: #ff7860;
position: relative;
}
.headerComponent .homeHeader .headerlogo:after{
content : '';
position: absolute;
width: 0;
height: 0;
......@@ -46,6 +45,7 @@
position: relative;
/*padding-top: 16px;*/
line-height: 98px;
margin-right: 30px;
}
.headerComponent .homeHeader .locationInfo .addIcon{
display:inline-block;
......@@ -117,14 +117,15 @@
top: 50%;
transform: translateY(-50%);
position: relative;
border-radius: 22px;
overflow: hidden;
/*border-radius: 22px;*/
}
.headerComponent .taskProgress .currentTask{
position: absolute;
left: 0;
top: 0;
height: 100%;
border-radius: 22px;
/*border-radius: 22px;*/
background: #27ce61;
}
.headerComponent .taskProgress .progressText{
......@@ -145,9 +146,10 @@
width: 50px;
height: 50px;
position: relative;
background: #fff;
top: 50%;
transform: translateY(-50%);
/* background: #fff; */
/*top: 50%;*/
/*transform: translateY(-50%);*/
line-height: 98px;
}
......
client/components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage.jsx
......@@ -14,9 +14,9 @@ export default class RecoveryFirstPage extends React.Component{
}
return(
<div className={"recoveryFirstPage"}>
<div className={"text font40 col333"}>请将A区回收箱进行整体更换</div>
<Button key={"RecoveryFirstPageBtn"} classInfo={classInfo} style={style} text={'我已替换完成，下一步'} option={this.hideError}/>
<div className={"tips font24"}>点击查看回收箱位置照片</div>
<div className={"text font40 col333"}>任务目标：请将A区回收箱进行整体更换</div>
<Button key={"RecoveryFirstPageBtn"} classInfo={classInfo} style={style} text={'已替换完成'} option={this.hideError}/>
<div className={"tips font24"}>查看回收箱位置</div>
</div>
)
}
......
client/containers/LeftContainer/LeftContainer.jsx
......@@ -6,17 +6,16 @@ export default class LeftContainer extends React.Component{
}
render(){
let {leftInfo={}} = this.props;
let {taskInfo={}} = leftInfo;
return(
<div className={"leftContainer"}>
<div className={"circle font40 colfff"}>
<div className={"circle1"}/>
<div className={"circle2"}>
任务1
</div>
</div>
<div className={"leftText font40 col333"}>
核对数量
</div>
<ul>
<li className={"icon iconfont icon-task font90"} />
<li className={"taskNumber font40 col333"}>任务{taskInfo.currentTaskNum || ''}</li>
<li className={"leftText font30"}>{taskInfo.currentTaskType || ''}</li>
</ul>
</div>
)
}
......
client/containers/LeftContainer/index.css
.leftContainer{
height: 100%;
/*height: 100%;*/
background: #e4e4e4;
width: 398px;
display: inline-block;
......@@ -12,8 +12,8 @@
/* display: inline-block; */
/*position: absolute;*/
/*text-align: center;*/
/*top: 98px;*/
/*bottom: 0;*/
top: 98px;
bottom: 0;
}
.leftContainer .circle{
position: relative;
......@@ -50,6 +50,17 @@
text-align: center;
line-height: 156px;
}
.leftContainer ul{
position: relative;
top: 50%;
transform: translateY(-50%);
}
.leftContainer ul>li{
margin-bottom: 30px;
}
.leftContainer ul>li:last-child{
margin-bottom: 0;
}
.leftContainer .leftText{
margin-top: 10%;
color: #34343D;
}
\ No newline at end of file
client/containers/PageContainer/PageContainer.jsx
......@@ -59,7 +59,7 @@ class PageContainer extends React.Component {
constructor(props) {
super(props);
this.state = {
showPage : showPage[13],
showPage : showPage[10],
lastPage : '',
page : null,
popupInfo : defaultPopupInfo,
......@@ -544,15 +544,16 @@ class PageContainer extends React.Component {
pages = <HomePage startTask={()=>{dispatch(getTaskInfo(state.commonInfo))}} />;
break;
case showPage[6]:
pages = <TakeStokeContainer />;
pages = <TakeStokeContainer headerInfo = {state.commonInfo}/>;
break;
case showPage[5]:
pages = <BreakageContainer />;
break;
case showPage[10]:
let info = {name:1};
pages = <RecoveryPage
headerInfo = {state.commonInfo}
showPopup={(info)=>this.showPopup(info)}
showPopup={()=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()}
/>;
break;
......
client/containers/RecoveryContainer/RecoveryContainer.jsx
......@@ -16,7 +16,6 @@ export default class RecoveryContainer extends React.Component{
}
componentWillMount(){
this.correctQrcode()
}
getPopInfo(){
......@@ -24,7 +23,7 @@ export default class RecoveryContainer extends React.Component{
let btnDom = <Button key={"recoveryContainerCorrectQrcode"} style={{'width':btnWidth,'display':'inline-block'}} text={"我已放入回收箱"} option={this.putSkuToBox}/>
return (
<div className={"recoveryPopInfo"}>
<div className={"icon iconfont icon-tick font90"} />
<div className={"icon iconfont icon-correct font90"} />
<div className={"text font30 col000"}>
<p>货品信息匹配正确！</p>
<p>请将货品放入回收箱</p>
......@@ -37,11 +36,18 @@ export default class RecoveryContainer extends React.Component{
wrongQrcode(){
//拿错货品
let {showPopup,hidePopup} = this.props;
let btnWidth = "260px";
let btnDom = <Button key={"recoveryContainerWrongQrcode"} style={{'width':btnWidth}} text={"关闭"} option={hidePopup}/>
let btnWidth = "410px";
let btnDom = <Button key={"recoveryContainerCorrectQrcode"} style={{'width':btnWidth,'display':'inline-block'}} text={"关闭"} option={hidePopup}/>
let popDom =
<div className={"recoveryPopInfo"}>
<div className={"icon iconfont icon-wrong font90"} />
<div className={"text font30 col000"}>
<p>您拿错货品了，请放回货架！</p>
</div>
{btnDom}
</div>
showPopup({
popupText : '您拿错货品，请放回货架',
popupButtons:[btnDom]
popupChild:popDom
});
}
......
client/containers/RecoveryContainer/index.css
......@@ -13,6 +13,9 @@
margin: 80px 0 ;
color: #27ce61;
}
.recoveryPopInfo .icon.icon-wrong{
color: #ff0000;
}
.recoveryPopInfo .text{
line-height: 40px;
margin-bottom: 80px;
......
client/containers/TakeStokeContainer/TakeStokeContainer.jsx
......@@ -15,9 +15,10 @@ class TakeStokeContaniner extends React.Component {
render(){
let {initNum}=this.state;
let props = this.props;
return (
<div className={'TokeStokeContainer'}>
<HeaderComponent headerStatus={headerStatus[1]} />
<HeaderComponent headerStatus={headerStatus[1]} headerInfo={props.headerInfo}/>
<LeftContainer />
<RightContainer>
<div className={"TokeStokeContent"}>
......
client/containers/TakeStokeContainer/index.css
.rightContainer{
width:100%;
height:100%;
}
.TokeStokeContainer{
width:100%;
height:100%;
......
client/css/font.css
......@@ -25,6 +25,7 @@ body{
@value font50: 50px;
@value font58: 58px;
@value font60: 60px;
@value font70: 70px;
@value font90: 90px;
.font10 {
......@@ -195,6 +196,17 @@ body{
[data-dpr="3"] .font60 {
font-size: calc(var(--font3) * font60 * var(--base)) !important;
}
.font70 {
font-size: calc(font70 * var(--base)) !important;
}
[data-dpr="2"] .font70 {
font-size: calc(var(--font2) * font70 * var(--base)) !important;
}
[data-dpr="3"] .font70 {
font-size: calc(var(--font3) * font70 * var(--base)) !important;
}
.font90 {
font-size: calc(font90 * var(--base)) !important;
}
......
client/css/iconfont.css
@font-face {font-family: "font_family";
src: url('../font/iconfont.eot?t=1536740100033'); /* IE9*/
src: url('../font/iconfont.eot?t=1536740100033#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
url('../font/iconfont.ttf?t=1536740100033') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('../font/iconfont.svg?t=1536740100033#font_family') format('svg'); /* iOS 4.1- */
src: url('../font/iconfont.eot?t=1536818672732'); /* IE9*/
src: url('../font/iconfont.eot?t=1536818672732#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
url('../font/iconfont.ttf?t=1536818672732') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('../font/iconfont.svg?t=1536818672732#font_family') format('svg'); /* iOS 4.1- */
}
.iconfont {
......@@ -19,7 +19,7 @@
.icon-circle-left:before { content: "\e613"; }
.icon-tick:before { content: "\e8bd"; }
.icon-task:before { content: "\e653"; }
.icon-arrow-o-l:before { content: "\e789"; }
......@@ -34,3 +34,10 @@
.icon-arrow:before { content: "\e61b"; }
.icon-refresh:before { content: "\e61c"; }
.icon-correct:before { content: "\e61e"; }
.icon-menu:before { content: "\e61f"; }
.icon-wrong:before { content: "\e620"; }
client/font/iconfont.eot
No preview for this file type
client/font/iconfont.svg
......@@ -26,7 +26,7 @@ Created by iconfont
<glyph glyph-name="circle-left" unicode="&#58899;" d="M19.407 391.476c0-268.009 217.268-485.268 485.276-485.268 268.001 0 485.26 217.258 485.26 485.268 0 268.008-217.258 485.265-485.26 485.268-268.009 0.001-485.276-217.259-485.276-485.266zM929.291 391.476c0-234.511-190.111-424.607-424.607-424.607-234.501 0-424.608 190.098-424.608 424.607 0 234.501 190.109 424.606 424.608 424.606 234.498 0.001 424.607-190.106 424.608-424.606zM367.124 418.118c-7.281-7.264-13.253-17.223-11.601-26.641-1.653-9.419 4.32-19.38 11.601-26.658l232.226-232.226c11.847-11.83 31.045-11.828 42.892 0 11.847 11.847 11.848 31.054 0 42.902l-215.981 215.982 215.981 215.974c11.847 11.845 11.847 31.052 0 42.9-11.845 11.839-31.043 11.839-42.892 0l-232.226-232.23z" horiz-adv-x="1024" />
<glyph glyph-name="tick" unicode="&#59581;" d="M512-128C229.248-128 0 101.24800000000005 0 384S229.248 896 512 896s512-229.248 512-512-229.248-512-512-512z m-114.176 310.954667a53.333333 53.333333 0 0 1 75.434667 0l323.328 323.328a53.333333 53.333333 0 1 1-75.434667 75.434666l-287.914667-283.306666-128.853333 128.853333a53.333333 53.333333 0 1 1-75.434667-75.434667l168.874667-168.874666z" horiz-adv-x="1024" />
<glyph glyph-name="task" unicode="&#58963;" d="M840.454 833.558h-638.605c-76.445 0-139.409-63.68-139.409-141.007v-614.048c0-77.326 62.963-141.007 139.408-141.007h638.605c76.454 0 139.408 63.68 139.408 141.007v614.048c0 77.326-58.454 141.007-139.408 141.007zM912.409 73.95000000000005c0-40.931-31.473-72.772-71.954-72.772h-638.605c-40.473 0-71.954 31.84-71.954 72.772v618.603c0 40.931 31.481 72.772 71.954 72.772h638.605c40.481 0 71.954-31.84 71.954-72.772v-618.603zM399.73 610.6800000000001l-98.936-100.065-44.973 45.477c-13.5 13.647-35.981 13.647-44.973 0-13.5-13.638-13.5-36.386 0-45.477l71.954-72.781c4.5-4.546 13.492-9.092 26.981-9.092 13.5 0 13.5 4.546 26.981 9.092l121.426 122.813c13.5 13.647 13.5 36.386 0 45.487-26.981 13.638-44.973 13.638-58.463 4.546zM813.473 556.092h-310.308c-22.481 0-31.481-13.638-31.481-31.84 0-22.739 13.5-31.84 31.481-31.84h310.316c22.481 0 31.473 13.647 31.473 31.84 0 18.202-13.5 31.84-31.481 31.84zM318.775 351.41600000000005c-58.463 0-103.436-45.487-103.436-104.62 0-59.125 44.973-104.611 103.436-104.611 58.473 0 103.436 45.487 103.436 104.611 0 63.68-49.463 104.62-103.436 104.62zM318.775 214.957c-22.481 0-35.973 13.647-35.973 36.386 0 22.747 13.492 36.395 35.973 36.395 22.492 0 35.981-13.647 35.981-36.395 0-22.739-17.992-36.386-35.981-36.386zM813.473 283.192h-310.308c-22.481 0-31.481-13.647-31.481-31.849 0-18.184 13.5-31.84 31.481-31.84h310.316c22.481 0 31.473 13.647 31.473 31.84 0 18.202-13.5 31.84-31.481 31.84z" horiz-adv-x="1044" />
<glyph glyph-name="arrow-o-l" unicode="&#59273;" d="M983.7 583.3C957.9 644.3 921 699 874 746S772.3 829.9 711.3 855.7C648.1 882.5 581.1 896 512 896S375.9 882.5 312.7 855.7C251.7 829.9 197 793 150 746S66.1 644.3 40.3 583.3C13.5 520.1 0 453.1 0 384s13.5-136.1 40.3-199.3C66.1 123.70000000000005 103 69 150 22s101.7-83.9 162.7-109.7c63.2-26.7 130.2-40.3 199.3-40.3s136.1 13.5 199.3 40.3C772.3-61.89999999999998 827-25 874 22s83.9 101.7 109.7 162.7c26.7 63.2 40.3 130.2 40.3 199.3s-13.5 136.1-40.3 199.3z m-66.3-370.6c-22.2-52.4-53.9-99.5-94.3-139.9-40.4-40.4-87.5-72.1-139.9-94.3C629-44.39999999999998 571.4-56 512-56s-117 11.6-171.3 34.6c-52.4 22.2-99.5 53.9-139.9 94.3-40.4 40.4-72.1 87.5-94.3 139.9C83.6 267 72 324.6 72 384s11.6 117 34.6 171.3c22.2 52.4 53.9 99.5 94.3 139.9s87.5 72.1 139.9 94.3C395 812.4 452.6 824 512 824s117-11.6 171.3-34.6c52.4-22.2 99.5-53.9 139.9-94.3 40.4-40.4 72.1-87.5 94.3-139.9C940.4 501 952 443.4 952 384s-11.6-117-34.6-171.3zM623.5 641.5c-14.1 14.1-36.9 14.1-50.9 0l-232-232c-14.1-14.1-14.1-36.9 0-50.9l232-232c7-7 16.2-10.5 25.5-10.5s18.4 3.5 25.5 10.5c14.1 14.1 14.1 36.9 0 50.9L416.9 384l206.5 206.5c14.1 14.1 14.1 36.9 0.1 51z" horiz-adv-x="1024" />
......@@ -50,6 +50,15 @@ Created by iconfont
<glyph glyph-name="refresh" unicode="&#58908;" d="M539.350244 66.89198699999997c-178.034604 0-322.698471 144.835881-322.698472 322.698472 0 177.86259 145.351923 323.0425 323.214514 322.698471 67.085503-0.172014 131.41878-20.641693 185.947253-59.344868L690.894675 603.748026c-45.239711 31.994625-98.736099 48.679993-154.468671 48.163951-140.535528-1.548127-255.612968-114.905426-259.225265-255.440954-3.78431-147.760121 115.249454-269.202083 262.321519-269.202083 135.547119 0 247.528305 103.38048 260.945405 235.487317 1.548127 15.309256 14.621199 26.834201 30.10247 26.834202 18.061482 0 31.82261-15.653284 30.102469-33.542752-17.201411-162.209306-154.640685-289.15572-321.322358-289.15572zM539.350244 62.591634c-180.270788 0-326.998824 146.728036-326.998825 326.998825 0 87.03914 34.058794 169.089871 95.983874 231.01495 61.92508 61.92508 143.975811 95.983874 231.014951 95.983874h0.516042c67.945574-0.172014 133.138922-20.813707 188.527465-60.032925l3.440282-2.408197-39.907273-56.248615-3.440283 2.408198c-43.691584 30.96254-95.295817 47.30388-148.964219 47.30388h-2.92424c-66.741475-0.688056-130.042668-27.178229-178.034605-74.482109-47.991937-47.30388-75.34218-110.089031-77.062321-176.830506-1.892155-70.181757 24.25399-136.40719 73.278011-186.807324 49.024022-50.400134 114.733412-78.094406 184.743155-78.094406 64.161263 0 125.742315 23.909961 173.390223 67.085503 47.30388 43.003528 76.890307 101.316311 83.25483 164.445489 1.720141 17.545439 16.513355 30.790526 34.230808 30.790526 9.804804 0 19.093566-4.128339 25.630102-11.352931 6.536536-7.224593 9.804804-17.201411 8.77272-27.006215-8.256677-79.986561-45.927768-153.780615-105.788678-208.137074-60.376953-54.528473-138.299345-84.630942-219.662019-84.630943z m0 645.568957c-84.802956 0-164.617504-33.198723-224.994457-93.575676-60.376953-60.376953-93.575676-140.1915-93.575676-224.994456 0-175.626407 142.943726-318.398119 318.398118-318.398119 79.126491 0 155.156728 29.414413 213.81354 82.566773 58.312783 52.980346 94.951789 124.882244 103.036452 202.632622 0.688056 7.396607-1.548127 14.793214-6.536536 20.297665-4.988409 5.504452-11.69696 8.600706-19.093566 8.600706-13.417101 0-24.426004-9.804804-25.802117-23.049891-6.70855-65.193348-37.155048-125.570301-86.007055-169.949941-49.196036-44.723669-112.841257-69.321687-179.238703-69.321687-72.417941 0-140.1915 28.726356-190.935663 80.674618-50.572148 51.948261-77.578364 120.581891-75.686209 192.999832 1.720141 68.977658 30.102469 133.998992 79.642533 182.678986 49.540064 48.852007 114.905426 76.030237 183.883085 76.890307 55.216529 0.516042 108.36889-15.48127 153.6086-46.44381l29.930456 42.315471c-53.15236 36.639006-115.249454 55.904586-179.92676 56.0766h-0.516042zM749.379473 689.411053l-90.479423-121.78599c-4.644381-6.192508-0.516042-14.965228 7.224593-15.48127l144.491853-10.148832c7.224593-0.516042 12.385016 6.70855 9.63279 13.4171l-54.012431 131.934823c-2.92424 7.052579-12.385016 8.256677-16.857382 2.064169z" horiz-adv-x="1024" />
<glyph glyph-name="correct" unicode="&#58910;" d="M510.567 832.147c-246.304 0-446.663-200.359-446.663-446.663 0-246.305 200.359-446.664 446.663-446.664 246.305 0 446.766 200.36 446.766 446.664-0.102 246.304-200.461 446.663-446.766 446.663zM787.98 509.915L454.594 176.42700000000002c-7.982-7.982-20.978-7.982-28.96 0l-43.693 43.694-144.795 144.795c-7.982 7.981-7.982 20.977 0 28.959l43.694 43.694c7.982 7.982 20.978 7.982 28.96 0l130.263-130.162 275.263 275.264c7.982 7.981 20.978 7.981 29.062 0l43.592-43.797c8.084-7.982 8.084-20.977 0-28.959z" horiz-adv-x="1024" />
<glyph glyph-name="menu" unicode="&#58911;" d="M844.8 12.8h-256c-19.2 0-38.4 19.2-38.4 38.4v256c0 19.2 19.2 38.4 38.4 38.4h256c19.2 0 38.4-19.2 38.4-38.4v-256c0-19.2-19.2-38.4-38.4-38.4z m0 403.2h-256c-19.2 0-38.4 19.2-38.4 38.4v256c0 19.2 19.2 38.4 38.4 38.4h256c19.2 0 38.4-19.2 38.4-38.4v-256c0-19.2-19.2-38.4-38.4-38.4zM435.2 12.8h-256c-19.2 0-38.4 19.2-38.4 38.4v256c0 19.2 19.2 38.4 38.4 38.4h256c19.2 0 38.4-19.2 38.4-38.4v-256c6.4-19.2-12.8-38.4-38.4-38.4z m0 403.2h-256c-19.2 0-38.4 19.2-38.4 38.4v256c0 19.2 19.2 38.4 38.4 38.4h256c19.2 0 38.4-19.2 38.4-38.4v-256c6.4-19.2-12.8-38.4-38.4-38.4z" horiz-adv-x="1024" />
<glyph glyph-name="wrong" unicode="&#58912;" d="M512 896C229.23 896 0 666.77 0 384s229.23-512 512-512c282.768 0 512 229.23 512 512S794.77 896 512 896z m234.76-656.252c7.808-7.808 7.806-20.472 0.002-28.284l-62.228-62.224c-7.808-7.808-20.47-7.814-28.286-0.002L512 293.49 367.75 149.24c-7.81-7.812-20.474-7.808-28.284 0l-62.226 62.224c-7.81 7.808-7.812 20.472 0 28.284L421.492 384l-144.25 144.25c-7.81 7.808-7.81 20.474 0 28.284l62.226 62.224c7.81 7.812 20.474 7.81 28.284 0L512 474.51l144.252 144.25c7.806 7.812 20.47 7.81 28.282 0l62.226-62.224c7.806-7.812 7.808-20.474 0-28.284L602.51 384l144.25-144.252z" horiz-adv-x="1024" />
</font>
......
client/font/iconfont.ttf
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment