Skip to content

P
party-build-cloud
Commit 9113f2cf authored by wangqinghua's avatar wangqinghua
Browse files
Options

增加字体

修改登录页面的背景
parent 45b6956c
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 406 deletions
config.xml
View file @ 9113f2cf
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.partyCloud.starter.test" version="0.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.partyCloud.starter.test" version="0.2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云(测试)</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......@@ -18,7 +18,7 @@
<preference name="FadeSplashScreenDuration" value="300" />
<preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" />
<preference name="SplashScreenDelay" value="20000" />
<platform name="android">
<allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
......
src/app/app.scss
View file @ 9113f2cf
......@@ -2,22 +2,8 @@
@import "../theme/style";
@import "../assets/iconfont/iconfont";
html{
font-family: "Noto Sans CJK SC", "Source Han Sans CN";
font-size: 10px !important;
}
//html,ion-app.ios{
// font-family: "webfont",serif !important;
// font-style: normal;
// -webkit-font-smoothing: antialiased;
// -moz-osx-font-smoothing: grayscale;
//}
//.web-font {
// font-family: "webfont",serif !important;
// font-size: 16px;
// font-style: normal;
// -webkit-font-smoothing: antialiased;
// -moz-osx-font-smoothing: grayscale;
//}
p {
margin: 0;
}
......@@ -96,6 +82,9 @@ p {
border-radius: 4px;
height: 35px;
}
.tabs-ios .tab-button-text{
margin-top: -5px !important;
}
.no-info {
text-align: center;
......@@ -362,9 +351,9 @@ a[disabled], button[disabled], [ion-button][disabled],
}
.login-box {
padding-top: 4rem;
padding-top: 2.5rem;
height: 100%;
background-image: url('../assets/imgs/login-bg.png');
background-image: url('../assets/imgs/login_bg.png');
background-size: 100% 100%;
}
......
src/assets/font/demo.html deleted 100644 → 0
View file @ 45b6956c
<html>
<head>
<meta charset="utf-8"/>
<title>webfont</title>
<style type="text/css">
*{margin: 0;padding: 0;list-style: none;}
/*
KISSY CSS Reset
理念：1. reset 的目的不是清除浏览器的默认样式，这仅是部分工作。清除和重置是紧密不可分的。
2. reset 的目的不是让默认样式在所有浏览器下一致，而是减少默认样式有可能带来的问题。
3. reset 期望提供一套普适通用的基础样式。但没有银弹，推荐根据具体需求，裁剪和修改后再使用。
特色：1. 适应中文；2. 基于最新主流浏览器。
维护：玉伯<lifesinger@gmail.com>, 正淳<ragecarrier@gmail.com>
*/
/** 清除内外边距 **/
body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, /* structural elements 结构元素 */
dl, dt, dd, ul, ol, li, /* list elements 列表元素 */
pre, /* text formatting elements 文本格式元素 */
form, fieldset, legend, button, input, textarea, /* form elements 表单元素 */
th, td /* table elements 表格元素 */ {
margin: 0;
padding: 0;
}
/** 设置默认字体 **/
body,
button, input, select, textarea /* for ie */ {
font: 12px/1.5 tahoma, arial, \5b8b\4f53, sans-serif;
}
h1, h2, h3, h4, h5, h6 { font-size: 100%; }
address, cite, dfn, em, var { font-style: normal; } /* 将斜体扶正 */
code, kbd, pre, samp { font-family: courier new, courier, monospace; } /* 统一等宽字体 */
small { font-size: 12px; } /* 小于 12px 的中文很难阅读，让 small 正常化 */
/** 重置列表元素 **/
ul, ol { list-style: none; }
/** 重置文本格式元素 **/
a { text-decoration: none; }
a:hover { text-decoration: underline; }
/** 重置表单元素 **/
legend { color: #000; } /* for ie6 */
fieldset, img { border: 0; } /* img 搭车：让链接里的 img 无边框 */
button, input, select, textarea { font-size: 100%; } /* 使得表单元素在 ie 下能继承字体大小 */
/* 注：optgroup 无法扶正 */
/** 重置表格元素 **/
table { border-collapse: collapse; border-spacing: 0; }
/* 清除浮动 */
.ks-clear:after, .clear:after {
content: '\20';
display: block;
height: 0;
clear: both;
}
.ks-clear, .clear {
*zoom: 1;
}
.main {padding: 30px 100px;}
.main h1{font-size:36px; color:#333; text-align:left;margin-bottom:30px; border-bottom: 1px solid #eee;}
.helps{margin-top:40px;}
.helps pre{
padding:20px;
margin:10px 0;
border:solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists li{
float:left;
width: 100px;
height:150px;
text-align: center;
}
.icon_lists .icon{
font-size: 42px;
line-height: 100px;
margin: 10px 0;
color:#333;
-webkit-transition: font-size 0.25s ease-out 0s;
-moz-transition: font-size 0.25s ease-out 0s;
transition: font-size 0.25s ease-out 0s;
}
.icon_lists .icon:hover{
font-size: 100px;
}
@font-face {
font-family: "webfont";
src: url('webfont.eot'); /* IE9 */
src: url('webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('webfont.woff') format('woff'), /* chrome、firefox */
url('webfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url('webfont.svg#webfont') format('svg'); /* iOS 4.1- */
}
.web-font {
font-family: "webfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</style>
</head>
<body>
<div class="main">
<h1>webfont 字体预览</h1>
<p class="web-font">说金钱是罪恶，都在捞;说美女是祸水，都想要;说高处不胜寒，都在爬;说烟酒伤身体，都不戒;说天堂最美好，都不去!</p>
<div class="helps">
第一步：使用font-face声明字体
<pre>
@font-face {
font-family: 'webfont';
src: url('webfont.eot'); /* IE9 */
src: url('webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('webfont.woff') format('woff'), /* chrome、firefox */
url('webfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
url('webfont.svg#webfont') format('svg'); /* iOS 4.1- */
}
</pre>
第二步：定义使用webfont的样式
<pre>
.web-font {
font-family: "webfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</pre>
第三步：为文字加上对应的样式
<pre>
&lt;i class="web-font"&gt;说金钱是罪恶，都在捞;说美女是祸水，都想要;说高处不胜寒，都在爬;说烟酒伤身体，都不戒;说天堂最美好，都不去!&lt;/i&gt;
</pre>
</div>
</div>
</body>
</html>
src/assets/font/webfont.svg deleted 100644 → 0
View file @ 45b6956c
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg>
<metadata>
Created by webfont
</metadata>
<defs>
<font id="Noto Sans S Chinese Black" horiz-adv-x="1000" vert-adv-y="1000" >
<font-face
font-family="Noto Sans S Chinese Black"
font-weight="900"
font-stretch="normal"
units-per-em="1000"
panose-1="0 0 0 0 0 0 0 0 0 0"
ascent="880"
descent="-120"
x-height="569"
cap-height="744"
bbox="-1019 -1045 2925 1805"
underline-thickness="50"
underline-position="-100"
unicode-range="U+0001-2CE93"
/>
<missing-glyph />
<glyph glyph-name="cid2" unicode="&#x21;" d="M198 -14q-46 0 -75.5 32t-29.5 79q0 46 29.5 78t75.5 32q47 0 76.5 -32t29.5 -78q0 -47 -29.5 -79t-76.5 -32zM115 608l-6 158h179l-6 -158l-26 -338h-115z" horiz-adv-x="397" />
<glyph glyph-name="cid28" unicode="&#x3b;" d="M176 7q-21 0 -40 6.5t-33.5 19.5t-23.5 31.5t-9 42.5q0 45 32 72.5t79 27.5q59 0 90 -44t31 -122q0 -97 -54.5 -166.5t-158.5 -101.5l-36 95q65 23 98.5 60t33.5 79h-9zM176 352q-47 0 -76.5 31.5t-29.5 78.5t29.5 78.5t76.5 31.5q46 0 76 -31.5t30 -78.5t-30 -78.5
t-76 -31.5z" horiz-adv-x="351" />
<glyph glyph-name="cid9846" unicode="&#x4E0D;" d="M655 525q38 -30 84 -65.5t91 -72.5t85.5 -73t67.5 -66l-125 -112q-21 27 -53 59t-69 66.5t-77.5 69t-77.5 66.5v-490h-160v452q-64 -66 -137.5 -122.5t-156.5 -99.5q-9 15 -21 33t-26 36t-27.5 35t-25.5 29q66 30 125.5 71t112 89.5t96.5 102t78 108.5h-377v149h878v-149
h-308q-12 -21 -24.5 -42t-26.5 -41v-95z" />
<glyph glyph-name="cid10271" unicode="&#x4F24;" d="M937 719v-137h-446q-20 -34 -42 -64t-45 -54q-10 9 -25 21t-31.5 24.5t-33 23.5l-28.5 19q28 25 53.5 59t46.5 73t38 81.5t28 86.5l141 -31q-8 -26 -16.5 -51.5t-18.5 -50.5h379zM931 440q-1 -10 -1 -21q-1 -9 -1 -18.5v-15.5q-3 -102 -6 -175.5t-8 -123t-12 -79
t-18 -43.5q-20 -26 -41 -35.5t-49 -14.5q-25 -4 -61.5 -5t-77.5 0q-2 30 -14 67.5t-30 65.5q36 -3 66.5 -4t47.5 -1q13 0 21 3t16 11q12 13 17.5 72t8.5 184h-138q-10 -63 -28.5 -121.5t-50 -110t-77.5 -96.5t-111 -81q-7 13 -17.5 28t-22.5 30t-25.5 28.5t-25.5 23.5
q51 27 88 59.5t62 70.5t40 80t24 89h-161v133h176q2 29 3 59t2 62h145q-2 -63 -6 -121h265zM365 808q-20 -53 -44 -106.5t-53 -105.5v-690h-138v479q-11 -14 -21.5 -26.5t-21.5 -23.5q-5 13 -14 34t-20 42.5t-22 42t-20 34.5q32 33 63.5 74t59.5 88t52 98t42 103z" />
<glyph glyph-name="cid10340" unicode="&#x4F53;" d="M766 552q20 -55 45.5 -110t55 -106t62 -95.5t67.5 -79.5q-13 -9 -28 -22.5t-29.5 -29t-28 -31.5t-22.5 -30q-36 43 -69 99v-83h-119v-151h-142v151h-113v91q-19 -31 -39.5 -58.5t-42.5 -51.5q-8 12 -19.5 25.5t-24.5 27.5t-26.5 27t-25.5 23v-242h-138v488
q-12 -16 -24 -30.5t-24 -28.5q-5 13 -14 33.5t-20 42.5t-22.5 42.5t-20.5 34.5q30 33 59 74.5t55 88.5t48 98t39 102l137 -42q-32 -92 -75 -182v-464q35 34 68 78.5t62 94.5t54 105t45 111h-176v138h238v159h142v-159h264v-138h-198zM558 193v197q-20 -53 -42.5 -102.5
t-47.5 -94.5h90zM793 193q-26 48 -49.5 101t-43.5 110v-211h93z" />
<glyph glyph-name="cid12257" unicode="&#x53BB;" d="M489 319q-38 -59 -80.5 -114t-87.5 -104l354 19q-22 34 -45 66t-46 61l135 59q32 -38 64 -80.5t61 -86t53 -84.5t41 -76l-144 -73q-8 18 -17.5 38.5t-21.5 42.5q-121 -9 -210 -16t-152.5 -12t-106 -9t-71 -8t-46.5 -8t-33 -9q-3 11 -8.5 29t-12.5 38.5t-14.5 40.5
t-13.5 35q21 5 38 20t40 38q9 9 24.5 27.5t34 44t39.5 56.5t40 65h-263v147h382v116h-305v146h305v128h155v-128h315v-146h-315v-116h386v-147h-474z" />
<glyph glyph-name="cid13704" unicode="&#x5728;" d="M952 725v-139h-532q-24 -51 -52.5 -100t-62.5 -95v-485h-147v326q-35 -31 -74 -56q-6 15 -14 34t-17.5 38.5t-19.5 37.5t-18 32q75 48 134.5 117.5t104.5 150.5h-203v139h267q13 33 23 66t18 65l152 -36q-8 -24 -16 -47.5t-16 -47.5h473zM725 65h222v-134h-599v134h230
v198h-192v134h192v151h147v-151h184v-134h-184v-198z" />
<glyph glyph-name="cid14036" unicode="&#x5802;" d="M956 713v-251h-139v127h-637v-127h-132v251h137q-11 22 -25 45t-28 42l129 50q23 -27 44.5 -60.5t32.5 -59.5l-38 -17h124v143h147v-143h137l-50 16q19 27 38.5 61.5t31.5 63.5l157 -44q-22 -27 -42.5 -52t-38.5 -45h152zM570 55h380v-126h-896v126h370v54h-276v124h276
v45h-208v273h568v-273h-214v-45h299v-124h-299v-54zM351 387h289v55h-289v-55z" />
<glyph glyph-name="cid14469" unicode="&#x5904;" d="M541 677q-25 -304 -118 -489q37 -35 77.5 -57.5t84 -36t90.5 -18.5t96 -5h46h61t62.5 0.5t50.5 1.5q-9 -14 -17.5 -33.5t-16 -41t-13.5 -42.5t-9 -37h-172q-61 0 -118 6.5t-109.5 23t-100.5 43.5t-91 69q-85 -106 -206 -163q-9 13 -24 29t-32 32.5t-34.5 30.5t-30.5 22
q72 30 129 73t101 103q-17 30 -33.5 64.5t-30.5 74.5q-9 -16 -17.5 -30t-17.5 -27q-10 9 -24.5 20.5t-31 22.5t-33 21.5t-30.5 17.5q26 37 49.5 91.5t43.5 121t35 140.5t25 150l154 -31q-6 -32 -12 -63.5t-14 -63.5h106l26 4zM275 564q-5 -17 -10 -32.5t-10 -31.5
q14 -51 31 -94t36 -79q20 51 33.5 109.5t22.5 127.5h-103zM731 101h-156v756h156v-245l35 20q25 -32 53.5 -68t55.5 -72.5t51 -71.5t39 -64l-131 -80q-16 35 -43.5 79t-59.5 91v-345z" />
<glyph glyph-name="cid14548" unicode="&#x5929;" d="M602 346q53 -107 148 -183t237 -111q-13 -12 -27 -29t-27.5 -35.5t-25.5 -37.5t-20 -34q-137 43 -228.5 121t-154.5 191q-23 -47 -56 -92t-80 -85.5t-109 -76t-142 -62.5q-7 13 -18 30.5t-24.5 35t-27 33.5t-25.5 27q81 26 141.5 60.5t103 74.5t70 84t44.5 89h-319v150
h350q1 15 1.5 28.5t0.5 27.5v92h-313v150h797v-150h-330v-94v-26.5t-1 -27.5h369v-150h-334z" />
<glyph glyph-name="uni5973" unicode="&#x5973;" d="M844 -97q-56 34 -128 74.5t-157 84.5q-81 -62 -191.5 -97.5t-256.5 -58.5q-11 35 -32.5 76.5t-44.5 70.5q115 11 204 32t158 58q-64 31 -128.5 60t-129.5 55q27 48 55 106t54 121h-195v157h256q40 113 65 217l157 -22q-11 -48 -24.5 -97t-29.5 -98h477v-157h-159
q-21 -94 -50 -168t-68 -132q82 -39 154 -75.5t127 -65.5zM421 485q-16 -42 -32 -82t-31 -76q42 -17 84 -35.5t84 -37.5q66 85 102 231h-207z" />
<glyph glyph-name="cid14697" unicode="&#x597D;" d="M975 312h-189v-255q0 -54 -13 -83t-48 -46q-35 -16 -81 -20t-106 -4q-5 31 -19 70.5t-29 68.5q17 -1 36 -1.5t36 -0.5h30.5h19.5q13 0 18 4t5 15v252h-201v138h201v83q29 27 57.5 63t51.5 74h-273v131h366l34 7l97 -70q-36 -55 -82 -115t-100 -111v-62h189v-138zM457 644
q-11 -132 -33.5 -238.5t-60.5 -193.5q33 -30 60.5 -58.5t47.5 -54.5l-95 -125q-16 23 -38.5 49.5t-48.5 54.5q-76 -105 -190 -173q-8 13 -18 29t-22 32t-24.5 30t-23.5 24q53 26 96 66t78 92q-38 35 -77.5 69t-75.5 63q29 93 55 217h-58v133h83q8 49 14 97.5t10 94.5
l145 -10q-5 -45 -12.5 -90t-15.5 -92h91l24 4zM227 527q-9 -44 -18.5 -86t-20.5 -82q16 -12 31.5 -24.5t31.5 -25.5q20 49 33.5 103.5t22.5 114.5h-80z" />
<glyph glyph-name="cid16047" unicode="&#x5BD2;" d="M768 258q45 -33 99 -61t109 -47q-12 -10 -25.5 -24.5t-26.5 -30t-25 -31.5t-20 -29q-81 35 -156.5 94.5t-131.5 128.5h-179q-55 -74 -134 -134.5t-167 -96.5q-8 12 -19.5 27.5t-24.5 31t-26 30t-25 24.5q60 20 117.5 50.5t103.5 67.5h-178v112h234v28h-122v95h122v31
h-133v54h-97v215h358q-4 11 -8 20.5t-8 18.5l150 40q10 -18 19.5 -38.5t17.5 -40.5h345v-215h-92v-54h-132v-31h120v-95h-120v-28h233v-112h-178zM293 623v38h145v-38h127v38h148v-38h75v52h-583v-52h88zM438 493h127v31h-127v-31zM438 370h127v28h-127v-28zM422 243
q27 -4 59 -11t63 -15.5t59 -18t49 -18.5l-63 -97q-19 9 -46 19.5t-57.5 20t-62.5 18t-60 14.5zM302 103q57 -4 119 -12.5t122 -20t115 -25t100 -27.5l-62 -116q-42 15 -97 30t-116 27.5t-123.5 22t-120.5 15.5z" />
<glyph glyph-name="cid18188" unicode="&#x6076;" d="M840 -38q-7 29 -20 64.5t-30 74.5q-6 -54 -18 -89.5t-32.5 -56t-51.5 -28.5t-76 -8h-171q-57 0 -94.5 8t-59 27t-30 50.5t-8.5 77.5v158h144v-156q0 -12 2.5 -19.5t9 -11.5t19 -5t33.5 -1h144q18 0 28.5 4t17 16t9.5 35t6 61q10 -8 25.5 -15.5t32.5 -14.5t34 -12.5
t31 -8.5q-14 33 -30 65.5t-32 61.5l125 44q18 -32 37.5 -67.5t36.5 -71.5t31.5 -69.5t22.5 -61.5zM26 -4q30 51 54 119.5t37 139.5l130 -43q-8 -36 -17 -74t-20 -75t-24 -72t-28 -63zM678 493q9 18 17.5 40t17 45.5t15 46.5t11.5 43l153 -39q-26 -49 -51 -95t-45 -78z
M252 666q20 -38 36 -83t22 -80l-132 -45q-2 17 -7 38t-12 43.5t-15 44.5t-17 42zM442 308h-386v126h275v253h-240v124h824v-124h-251v-253h279v-126h-410q34 -38 66 -79t50 -75l-124 -71q-9 20 -24 44.5t-34 50.5t-39.5 52t-39.5 48zM468 434h58v253h-58v-253z" />
<glyph glyph-name="cid18397" unicode="&#x60F3;" d="M851 -23q-11 25 -30 58t-40 68q-7 -53 -18.5 -87.5t-32 -54.5t-51 -28t-74.5 -8h-166q-57 0 -94 8t-58 27t-29.5 49.5t-8.5 75.5v125h144v-123q0 -12 2 -18.5t9 -10t19 -4.5t32 -1h139q17 0 27.5 3.5t16.5 15.5t9 34.5t5 60.5q10 -8 24.5 -15t31 -13.5t33 -11.5t30.5 -9
l-41 68l127 60q15 -23 33.5 -49.5t36 -53t33.5 -51.5t27 -45zM21 27q26 42 48.5 97.5t35.5 110.5l130 -50q-14 -56 -34.5 -117t-45.5 -106zM199 399q-20 -32 -42.5 -60t-45.5 -50q-8 12 -19.5 26t-24 27.5t-25.5 26t-24 21.5q47 35 89 89.5t71 114.5h-134v122h155v138h138
v-138h131v-122h-131v-26q15 -9 37.5 -23.5t45.5 -30.5t43 -29.5t29 -20.5l-76 -116q-15 17 -35.5 38t-43.5 42v-186h-138v157zM500 292l5 -4v518h419v-551h-381q26 -23 51.5 -47t41.5 -43l-105 -90q-10 13 -25.5 30.5t-33.5 35.5l-36.5 36.5t-34.5 33.5zM637 655h148v38
h-148v-38zM637 511h148v39h-148v-39zM637 367h148v40h-148v-40z" />
<glyph glyph-name="cid18927" unicode="&#x6212;" d="M934 515q-29 -112 -71.5 -210t-98.5 -182q14 -37 29.5 -57.5t31.5 -20.5q14 0 22.5 41.5t12.5 134.5q23 -24 56.5 -46.5t61.5 -32.5q-8 -73 -20.5 -119.5t-32 -73t-47.5 -36.5t-65 -10q-45 0 -80.5 26t-64.5 73q-25 -26 -51 -49.5t-55 -43.5q-7 9 -17.5 21t-23 25
t-25.5 25.5t-24 23.5v-20h-136v262h-66q-3 -43 -10.5 -88t-22.5 -87.5t-38.5 -81.5t-57.5 -70q-8 9 -21 20.5t-27.5 23t-29 22t-26.5 17.5q25 24 42 53t28 61t17.5 65t9.5 65h-81v131h85v172h135v-172h63v170h136v-170h68v-131h-68v-221q75 50 136 123q-26 89 -40.5 199
t-22.5 231h-499v137h493q-1 35 -1.5 69t-0.5 68h146q-1 -35 -1 -69v-68h100q-18 17 -37.5 33t-38.5 30l97 79q17 -11 35.5 -24.5t36 -27.5t32.5 -28.5t25 -27.5l-41 -34h65v-137h-268q9 -143 29 -261q25 52 45 108.5t34 118.5z" />
<glyph glyph-name="cid19455" unicode="&#x635E;" d="M963 773v-129h-115v-59h-132v59h-117v-59h-131v59h-109v129h109v82h131v-82h117v82h132v-82h115zM361 565h587v-189h-132v74h-329v-74h-126v189zM923 323q0 -10 -1 -20q-1 -8 -1.5 -17t-1.5 -15q-6 -68 -12.5 -118.5t-14 -86.5t-17 -59t-20.5 -35q-18 -20 -36.5 -28.5
t-41.5 -12.5q-20 -3 -49 -4.5t-62 -0.5q-2 30 -12 67t-25 63q23 -3 43.5 -3.5t33.5 -0.5q10 0 17 2t15 10q10 10 18.5 42t16.5 98h-107q-13 -47 -34 -89t-53 -78.5t-77 -68.5t-106 -57q-6 13 -15 28t-20 29.5t-22.5 28t-22.5 23.5q89 33 136.5 79.5t69.5 104.5h-130v119h158
q2 20 3.5 41t3.5 43h139q-2 -22 -4 -43t-4 -41h235zM349 305q-22 -7 -44 -13t-45 -12v-209q0 -48 -8.5 -76t-34.5 -45t-61.5 -22.5t-84.5 -5.5q-1 13 -4.5 30.5t-8.5 35.5t-11 36t-12 32q24 -1 46 -1h31q16 0 16 17v172l-81 -22l-30 139q24 5 52 11t59 13v154h-94v133h94
v182h132v-182h81v-133h-81v-122l71 18z" />
<glyph glyph-name="cid20733" unicode="&#x662F;" d="M586 55q14 0 29 -0.5t31 -0.5h67.5h92t95 1t77.5 2q-8 -12 -15 -29t-13.5 -36t-11.5 -38t-8 -35h-293q-65 0 -120.5 5t-102.5 19.5t-86 39.5t-71 65q-55 -91 -133 -145q-8 10 -21.5 24t-29 28.5t-31 28t-27.5 21.5q75 45 119.5 119t61.5 170l145 -21q-5 -23 -10.5 -44.5
t-12.5 -42.5q20 -42 51 -67t70 -39v228h-381v127h887v-127h-359v-54h296v-125h-296v-74zM857 466h-713v359h713v-359zM709 599h-424v-33h424v33zM709 725h-424v-33h424v33z" />
<glyph glyph-name="cid21074" unicode="&#x6700;" d="M952 318q-20 -72 -50 -131.5t-70 -107.5q66 -36 149 -54q-11 -10 -23 -24.5t-23.5 -30t-21.5 -31t-17 -28.5q-91 26 -164 75q-65 -47 -144 -78q-9 20 -25 44.5t-33 44.5l-33 -3v-89h-139v75q-85 -8 -164 -16t-144 -14l-10 124q19 2 39.5 3t43.5 3v288h-83v114h919v-114
h-462v-258l41 4l1 -94q52 19 98 50q-29 32 -52 68t-43 78l65 18h-81v111h321l23 4zM255 221h103v25h-103v-25zM255 368v-24h103v24h-103zM358 98v25h-103v-33zM665 234q14 -23 30 -43.5t36 -39.5q32 37 57 83h-123zM836 507h-675v316h675v-316zM690 623h-390v-25h390v25z
M690 732h-390v-24h390v24z" />
<glyph glyph-name="uni6C34" unicode="&#x6C34;" d="M926 592q-57 -56 -120 -111t-117 -97q55 -84 129 -149t170 -107q-13 -12 -28.5 -28.5t-30.5 -35t-28 -37.5t-22 -35q-98 52 -170 128.5t-126 173.5v-208q0 -60 -12.5 -94.5t-46.5 -54.5q-35 -20 -83.5 -26.5t-111.5 -6.5q-2 17 -7.5 38.5t-13 43.5t-16 43t-17.5 38
q41 -2 77.5 -2.5t51.5 -0.5q24 0 24 23v768h155v-247q9 -28 19.5 -54.5t21.5 -52.5q46 43 90.5 92t76.5 94zM416 586q-16 -104 -43 -195.5t-63.5 -167.5t-82 -135.5t-97.5 -99.5q-9 12 -23.5 28t-31 32t-33.5 30t-30 22q82 57 140 151.5t89 217.5h-191v147h243l26 5z" />
<glyph glyph-name="cid25478" unicode="&#x70DF;" d="M939 810v-899h-135v48h-276v-56h-129v167l-79 -79q-12 29 -29 63.5t-35 69.5q-19 -60 -49 -116t-75 -105q-8 12 -20 27.5t-25.5 30.5t-27.5 28t-25 21q44 51 70 109.5t39.5 121.5t17.5 128t4 127v345h134v-263q7 30 12.5 59t9.5 55l78 -28v146h540zM528 681v-467
q35 49 51.5 102t23.5 106h-61v116h68v4v122h111v-125v-1h65v-116h-70q-1 -8 -1.5 -16t-2.5 -16q25 -38 49 -78.5t43 -78.5v448h-276zM299 468q-1 -42 -2.5 -84t-6.5 -84q10 -14 24 -34.5t29 -43.5t29.5 -46t26.5 -42v410q-11 -29 -21 -55t-20 -46zM804 88v68l-69 -44
q-9 27 -24.5 60.5t-34.5 70.5q-14 -38 -35 -73.5t-50 -67.5q-11 14 -28 31t-35 31v-76h276zM157 634q0 -33 -2 -70.5t-6.5 -75t-11.5 -72.5t-16 -64l-103 37q9 24 15.5 55.5t11.5 66t8 69.5t4 67z" />
<glyph glyph-name="cid26157" unicode="&#x722C;" d="M544 745q-11 -5 -23 -8.5t-24 -8.5q-6 -121 -6 -217.5t13 -171.5t43.5 -129.5t87 -90.5t142 -55.5t208.5 -24.5q-9 -11 -18 -27t-17.5 -34t-15.5 -35.5t-11 -31.5q-130 10 -222 35t-154 68t-98 105t-53 145.5t-20 190t2 237.5l-24 -6v-766h-126v735l-24 -5v-257
q0 -55 -3 -119.5t-12 -130t-25 -126.5t-43 -109q-8 9 -21 20.5t-28 22.5t-30 21t-25 15q22 42 34.5 93t18.5 104.5t7.5 107t1.5 101.5v346l-1 2h1v1h4q50 10 101 23t99 28t90.5 30.5t76.5 31.5l94 -84v2h392v-376h-268v-77q0 -16 1.5 -25t6 -14t12.5 -6.5t22 -1.5h98
q12 0 19 4t11.5 14.5t7 29.5t4.5 49q10 -8 24 -15t29.5 -14t31 -12t28.5 -8q-6 -48 -15.5 -80.5t-26 -52t-41.5 -28t-60 -8.5h-129q-42 0 -70.5 7.5t-45.5 26.5t-24 51t-7 82v426zM815 657h-27v-144h27v144zM668 657v-144h28v144h-28z" />
<glyph glyph-name="cid29321" unicode="&#x7978;" d="M956 46q0 -46 -11 -73t-42 -42q-30 -14 -71 -17.5t-95 -3.5q-3 28 -14.5 63t-23.5 61q29 -2 60.5 -2h42.5q11 1 15 4t4 13v58l-70 -63q-11 29 -31.5 65t-45.5 73q-18 -41 -44.5 -79t-62.5 -73q-10 12 -25.5 26t-32.5 28v-178h-137v346l-41 -55q-11 18 -25 39t-30 44v-374
h-135v332q-18 -17 -36 -32.5t-37 -29.5q-3 16 -9.5 38t-14 44t-16 41.5t-14.5 30.5q60 38 113 98.5t91 131.5h-181v130h129q-13 25 -30.5 52.5t-35.5 50.5l114 70q26 -29 50 -64t37 -63l-69 -46h58l25 5l76 -53q-17 -53 -40.5 -103t-51.5 -98q17 -15 36 -34t37 -38v86h230
q1 11 1 22v22v15h-196v299h505v-299h-183v-18v-20t-1 -21h228v-409zM542 624h226v79h-226v-79zM509 168q31 39 49 80t28 83h-77v-163zM714 312q30 -34 58.5 -72.5t48.5 -73.5v165h-104z" />
<glyph glyph-name="cid32289" unicode="&#x7F6A;" d="M961 14h-258v-111h-158v626h158v-48h239v-130h-239v-34h212v-124h-212v-39h258v-140zM332 528h152v-621h-152v105h-289v133h289v45h-232v120h232v42h-255v129h255v47zM921 542h-831v285h831v-285zM321 712h-92v-55h92v55zM547 712h-94v-55h94v55zM774 712h-95v-55h95v55z
" />
<glyph glyph-name="cid32352" unicode="&#x7F8E;" d="M656 133q53 -44 133.5 -66.5t197.5 -28.5q-12 -12 -24.5 -29t-24 -35.5t-21.5 -37t-17 -33.5q-76 9 -136 24.5t-108 40.5t-85.5 59.5t-67.5 79.5q-21 -36 -53.5 -66.5t-81 -55.5t-116 -44.5t-157.5 -34.5q-4 15 -12 32.5t-18 35.5t-21.5 34.5t-21.5 28.5q126 16 199 39
t112 57h-254v129h318q2 9 2.5 18t2.5 19h-356v126h377v35h-289v121h289v33h-333v127h164q-9 19 -20.5 38t-23.5 35l130 50q22 -25 41 -56t28 -56l-26 -11h195q18 28 35.5 61t28.5 62l158 -37q-15 -23 -30 -45t-29 -41h169v-127h-337v-33h300v-121h-300v-35h392v-126h-409
q-2 -10 -2.5 -19t-2.5 -18h388v-129h-283z" />
<glyph glyph-name="cid33023" unicode="&#x80DC;" d="M974 64v-137h-563v137h212v161h-171v134h171v149h-89q-13 -35 -26.5 -66.5t-28.5 -57.5q-14 11 -39 26.5t-48 29.5v-380q0 -45 -7.5 -75t-32.5 -47q-25 -18 -56 -23t-74 -5q-1 14 -4.5 32.5t-8 37.5t-10.5 37t-12 32q17 -1 34.5 -1h24.5q13 0 13 15v170h-72
q-6 -89 -19.5 -175t-38.5 -153q-9 7 -24 16.5t-31.5 18.5t-33 17t-28.5 12q18 51 28.5 112.5t16 126t6.5 128t1 118.5v367h328v-304q26 60 44.5 134.5t29.5 151.5l136 -24q-11 -69 -27 -134h48v195h142v-195h183v-137h-183v-149h169v-134h-169v-161h209zM193 690v-94h66v94
h-66zM259 367v98h-66v-10v-42.5t-1 -45.5h67z" />
<glyph glyph-name="cid37555" unicode="&#x8981;" d="M773 201q-32 -62 -73 -106q68 -20 128 -38t108 -34l-114 -114q-51 20 -115.5 42.5t-139.5 45.5q-84 -41 -196 -62t-257 -33q-8 32 -22.5 66.5t-31.5 57.5q88 3 162 9.5t136 20.5q-48 13 -96 24.5t-97 22.5q19 21 39 46t40 52h-205v124h286q5 10 10.5 19.5t10.5 19.5h-247
v295h214v40h-258v125h883v-125h-265v-40h239v-295h-461l56 -13q-3 -7 -6.5 -13t-7.5 -13h469v-124h-189zM536 476v70h-86v-70h86zM673 546v-70h94v70h-94zM450 659h86v40h-86v-40zM235 476h78v70h-78v-70zM416 201q-5 -8 -10 -14.5t-10 -13.5q38 -9 75.5 -18t75.5 -19
q35 26 63 65h-194z" />
<glyph glyph-name="cid38713" unicode="&#x8BF4;" d="M834 50q4 0 7 3.5t5 15.5t3 34.5t2 59.5q10 -9 25.5 -17.5t33 -16t35.5 -13.5t32 -9q-5 -56 -14.5 -93t-24.5 -58.5t-36.5 -30.5t-51.5 -9h-56q-39 0 -63.5 9t-38 28.5t-18.5 51.5t-5 79v216h-54q-5 -66 -16.5 -124t-38.5 -107.5t-72.5 -90.5t-117.5 -72
q-6 13 -15.5 28.5t-21 30.5t-23.5 29t-24 24q58 22 92.5 51.5t53.5 65t26.5 77t10.5 88.5h-99v357h104q-12 34 -32.5 72.5t-43.5 71.5l124 52q15 -19 29.5 -41t27 -44t22.5 -43.5t16 -39.5l-66 -28h112q21 42 41.5 95.5t32.5 99.5l156 -44q-19 -40 -38.5 -78.5t-37.5 -72.5
h90v-357h-95v-214q0 -25 1.5 -30.5t8.5 -5.5h12zM760 530h-250v-103h250v103zM378 279q4 -16 10 -35t13 -38t14 -35.5t13 -27.5q-81 -65 -131.5 -106t-80.5 -66.5t-44 -39.5t-22 -25q-5 14 -14.5 32.5t-20.5 37.5t-23 36.5t-22 29.5q11 7 24 18.5t24 26.5t18 32t7 35v254
h-110v142h258v-339zM228 580q-12 18 -31 40.5t-40.5 46t-44.5 47t-43 43.5l97 87q20 -18 43.5 -39.5t46.5 -43.5t43 -43t33 -39z" />
<glyph glyph-name="uni8EAB" unicode="&#x8EAB;" d="M965 500q-37 -60 -79.5 -114t-90.5 -103v-212q0 -56 -12.5 -87.5t-47.5 -48.5t-83.5 -21.5t-117.5 -4.5q-2 15 -6.5 33.5t-11 38t-14 37.5t-14.5 32q-83 -47 -172 -84.5t-184 -66.5q-7 12 -18 27.5t-23 32t-24.5 31.5t-22.5 26q113 29 215.5 70.5t194.5 95.5h-388v126
h125v454h210q8 25 14.5 49.5t11.5 46.5l171 -16q-10 -20 -21 -40l-22 -40h240v-273q12 17 22.5 34t21.5 35zM654 497h-319v-42h319v42zM335 638v-39h319v39h-319zM631 308q6 5 11.5 10.5t11.5 10.5v24h-319v-45h296zM654 159q-39 -29 -79.5 -56t-84.5 -51q20 -1 41.5 -1.5
t40.5 -1t34 -0.5h22q26 1 26 24v86z" />
<glyph glyph-name="cid40938" unicode="&#x90FD;" d="M983 740q-24 -73 -52.5 -152t-54.5 -144q27 -33 44 -64t26 -60t12 -55.5t3 -49.5q0 -62 -14 -100.5t-45 -60.5q-32 -22 -73 -28q-17 -2 -38.5 -3t-44.5 1q0 14 -2.5 31t-7 35t-11 35.5t-13.5 32.5v-252h-143v816q-17 -40 -35 -78t-39 -74h48v-125h-131q-12 -16 -24.5 -31
t-26.5 -30h154v-464h-137v34h-127v-48h-131v281q-8 -5 -16.5 -9.5t-16.5 -9.5q-6 12 -15.5 28t-21 33.5t-23.5 33.5t-21 27q64 29 120.5 68t106.5 87h-199v125h161v61h-119v124h119v92h134v-92h90v-46q11 23 20.5 47t17.5 49l112 -31v26h287l21 5zM378 69v49h-127v-49h127z
M378 270h-127v-44h127v44zM340 570q10 15 19.5 30t19.5 31h-50v-61h11zM712 164q15 -2 26.5 -2h22.5t20.5 1.5t17.5 6.5q23 13 23 62q0 38 -17.5 89t-68.5 105q9 25 18 54.5t18 61t17.5 62.5t16.5 60h-94v-500z" />
<glyph glyph-name="cid41098" unicode="&#x9152;" d="M774 670v-69h165v-695h-138v39h-358v-39h-131v695h158v69h-177v68l-78 -107q-14 10 -34 23t-43 26.5l-46 27t-42 24.5l83 107q17 -9 38.5 -19.5t43 -22t42 -22.5t36.5 -20v46h667v-131h-186zM743 286q-32 0 -52 6.5t-31.5 22t-16 40.5t-4.5 62v59h-37v-20q0 -27 -5 -54.5
t-17.5 -53.5t-35 -49.5t-58.5 -41.5q-7 8 -18.5 19.5t-24.5 23.5v-61h358v47h-58zM443 476v-120q33 24 42 50.5t9 52.5v17h-51zM801 69v49h-358v-49h358zM801 476h-54v-56q0 -16 2.5 -19t12.5 -3h25q8 0 14 2v76zM645 670h-49v-69h49v69zM184 370q-14 10 -34 22t-43 25
t-46 25.5t-42 23.5l81 109q18 -9 41.5 -19.5t46.5 -22t44.5 -22.5t36.5 -20zM34 1q16 29 34 66t37 79t38 86.5t36 89.5l117 -82q-29 -81 -62 -162.5t-68 -157.5z" />
<glyph glyph-name="uni91D1" unicode="&#x91D1;" d="M577 438v-86h304v-130h-122l79 -28q-24 -38 -48 -74t-45 -65h193v-132h-874v132h181q-13 32 -33 71t-42 71l60 25h-115v130h305v86h-196v46q-56 -25 -112 -44q-15 32 -42 69.5t-55 65.5q71 19 139 46t128.5 63t110.5 81.5t86 101.5l138 -61q-7 -11 -14 -21l-14 -20
q36 -30 82.5 -58.5t99 -53t108.5 -45t112 -34.5q-12 -12 -26.5 -28t-28 -33.5t-25.5 -34.5t-20 -31q-31 11 -61.5 23t-60.5 26v-58h-192zM304 222q23 -33 43.5 -69.5t30.5 -65.5l-73 -32h115v167h-116zM577 222v-167h95l-54 22q19 29 39 69t34 76h-114zM635 571
q-35 23 -68 47t-63 50q-28 -27 -58.5 -51t-62.5 -46h252z" />
<glyph glyph-name="cid42744" unicode="&#x94B1;" d="M970 301q-34 -59 -76 -109t-91 -93q12 -26 24 -41t24 -15q11 0 17.5 23t9.5 80q20 -25 47.5 -46t50.5 -32q-8 -48 -19.5 -79t-28 -49.5t-39.5 -25.5t-54 -7q-43 0 -78 29t-63 80q-92 -59 -196 -101q-14 27 -38.5 60t-50.5 57q63 20 122 48t113 63q-22 77 -39 173
l-160 -30l-23 128l165 30q-2 18 -4 37l-4 38l-111 -18l-24 129l126 20q-6 105 -6 210h140q-2 -47 -0.5 -94t3.5 -95l106 16q-20 20 -50.5 44.5t-54.5 44.5l85 75q13 -9 29.5 -20.5t32 -23.5t30 -23.5t24.5 -20.5l-76 -73l82 13l23 -126l-222 -36q2 -19 3.5 -37t3.5 -36
l218 39l22 -125l-222 -41q5 -28 10 -53.5t10 -48.5q51 51 87 114zM416 195q1 -15 4.5 -32.5t7.5 -34.5t8.5 -32.5t8.5 -26.5q-75 -44 -122 -71.5t-75 -45t-41.5 -28t-21.5 -18.5q-5 10 -13 23t-17.5 26.5t-19 25t-17.5 18.5q18 15 38 45t20 72v125h-122v129h122v77h-66v68
q-14 -15 -27 -27q-4 12 -11.5 31t-17 40t-19 40.5t-17.5 32.5q45 40 82 98t60 123l127 -39q-7 -20 -17 -43h152v-138h-223q-9 -15 -18.5 -29t-19.5 -28h247v-129h-103v-77h110v-129h-110v-106z" />
<glyph glyph-name="uni9AD8" unicode="&#x9AD8;" d="M944 768v-121h-892v121h372l-10 30t-10 29l152 37q9 -22 20 -47.5t20 -48.5h348zM838 395h-663v224h663v-224zM684 524h-364v-34h364v34zM927 32q0 -46 -13 -69t-46 -35q-32 -12 -76 -14t-100 -1q-4 17 -11.5 37t-16.5 39h-259v-36h-134v270h445v-209q15 0 26.5 0.5
t16.5 0.5q11 0 16 3.5t5 14.5v214h-564v-342h-141v459h852v-332zM589 125h-184v-38h184v38z" />
<glyph glyph-name="cid59003" unicode="&#xFF0C;" d="M301 46q-21 0 -40 7t-34 19.5t-24 31t-9 42.5q0 46 32.5 73t78.5 27q60 0 90.5 -40.5t30.5 -109.5q0 -88 -55 -155.5t-157 -95.5l-37 96q58 16 91.5 44.5t39.5 60.5h-7z" />
</font>
</defs></svg>
src/components/slide/slide.html
View file @ 9113f2cf
<div class="slides-content">
<ion-slides (ionSlideDidChange)="slideChange($event)" #slides *ngIf="slidersItems.length>0" pager
<ion-slides (ionSlideDidChange)="slideChange($event)" #slides *ngIf="slidersItems.length>0"
loop="true"
autoplay="2000" speed="1500">
<ion-slide *ngFor="let item of slidersItems;">
......@@ -8,5 +8,7 @@
</ion-slides>
</div>
<p class="slides-title">
{{slideTitle}} <span class="main-color" float-end>{{slideIndex}}<span
style="font-size: 1.5rem;font-weight: 400;">/{{slidersItems.length}}</span></span></p>
\ No newline at end of file
{{slideTitle}}<span class="slide-index" float-end>
<span>{{slideIndex}}</span><span>/{{slidersItems.length}}</span>
</span>
</p>
\ No newline at end of file
src/components/slide/slide.scss
View file @ 9113f2cf
......@@ -27,7 +27,7 @@ slide {
}
.slides-title {
color: #333;
color: #4c4c4c;
width: 100%;
text-align: left;
height: 2rem;
......@@ -35,6 +35,17 @@ slide {
padding: 0 1rem;
font-size: 1.5rem;
font-weight: 500;
font-family: 'SourceHanSans-Bold';
.slide-index{
color: #e42417;
font-weight: 400;
span:first-child{
font-size: 1.8rem;
}
span:last-child{
font-size: 1.5rem;
}
}
}
//新闻区
.main-news {
......
src/components/slide/slide.ts
View file @ 9113f2cf
......@@ -34,10 +34,11 @@ export class SlideComponent implements AfterViewInit{
resourceType: 2,
isRecommend: 1,
}
}
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.slidersItems = res.data;
this.slidersItems = res.data.list;
if(this.slidersItems.length > 0){
this.slidersItems.forEach(e => {
if (e.title.length > 16) {
e.title = e.title.substr(0, 14) + '...';
......@@ -47,6 +48,7 @@ export class SlideComponent implements AfterViewInit{
}
})
}
}
)
}
......
src/pages/home-pages/stuff-detail/stuff-detail.scss
View file @ 9113f2cf
......@@ -14,6 +14,8 @@ page-stuff-detail {
font-size: 2.5rem;
margin-bottom: .5rem;
line-height: 3rem;
color: #4c4c4c;
font-family: 'SourceHanSans-Bold';
}
.stuff-info {
......@@ -31,6 +33,8 @@ page-stuff-detail {
}
.stuff-content{
line-height: 2.8rem;
color: #444444;
font-family: 'SourceHanSans-Light';
}
}
}
......
src/pages/login/login.html
View file @ 9113f2cf
......@@ -28,12 +28,9 @@
<input [(ngModel)]="user.remember" name="checkbox" class="jizhu-password" value="1" type="checkbox"
checked="true" style="margin-left:10px;width:17px;height:17px;vertical-align:middle">
<label style="padding-left:5px;font-family:'微软雅黑';" class="jizhu-password-label">记住密码</label>
<label float-end style="padding-left:5px;font-family:'微软雅黑';font-weight: 500" (click)="forgetPassword()" class="main-color jizhu-password-label">忘记密码</label>
</div>
<button type="button" (click)="forgetPassword()" class="login-btn"
style="width: 48%;float: left; color:#e12724;background-color: #ffffff;border-color: #e12724;">
忘记密码
</button>
<button type="button" (click)="login()" class="login-btn" style="width: 48%;float: right;">登&nbsp;&nbsp;录</button>
<button type="button" (click)="login()" class="login-btn">登&nbsp;&nbsp;录</button>
</form>
<div class="introduce">
登陆手机号为组织部统一配发的手机号，初始密码为000000，使用过程中如有任何问题请联系人事处。
......
src/pages/login/login.scss
View file @ 9113f2cf
......@@ -45,7 +45,7 @@ page-login {
color: #333333;
}
input::-webkit-input-placeholder{
color: #e9acad;
color: #666666;
}
.login-input-img {
......
src/pages/tabs/discover/discover.ts
View file @ 9113f2cf
......@@ -189,7 +189,7 @@ export class DiscoverPage {
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.newList = res.data;
this.newList = res.data.list;
this.newList.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
......@@ -214,7 +214,7 @@ export class DiscoverPage {
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.newList = res.data;
this.newList = res.data.list;
this.newList.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
......@@ -258,15 +258,17 @@ export class DiscoverPage {
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.newList = res.data;
this.newList = res.data.list;
this.newList.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
}
})
this.slideList[this.toIndex] = this.newList;
setTimeout(()=>{
this.commonSer.toastTime('刷新成功!', 800)
e.complete();
},1000);
}
)
}
......
src/pages/tabs/home/home.html
View file @ 9113f2cf
......@@ -100,8 +100,10 @@
</div>
</ion-slide>
</ion-slides>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
<ion-infinite-scroll #infiniteScrollContent (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles" threshold="10%"
loadingText="加载更多..."></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>
<!--政治生日-->
......
src/pages/tabs/home/home.scss
View file @ 9113f2cf
......@@ -190,5 +190,10 @@ page-home {
.slide-zoom{
text-align: left;
}
//下拉刷新
ion-infinite-scroll{
overflow: hidden;
}
}
src/pages/tabs/home/home.ts
View file @ 9113f2cf
import {Component, ElementRef, ViewChild, NgZone, Renderer2} from '@angular/core';
import {NavController, IonicPage, Slides, Content} from 'ionic-angular';
import {NavController, IonicPage, Slides, Content, InfiniteScrollContent} from 'ionic-angular';
import {Http, Response} from '@angular/http';
import {AppService, AppGlobal} from '../../../service/http.service';
import {Storage} from '@ionic/storage';
......@@ -31,6 +31,7 @@ export class HomePage {
@ViewChild('topHeight') topHeight: ElementRef;
@ViewChild('headerTag') headerTag: ElementRef;
@ViewChild('homeMiddleTips') homeMiddleTips: ElementRef;
@ViewChild('infiniteScrollContent') infiniteScrollContent: ElementRef;
picture: string = AppGlobal.domain + '/wisdomgroup';
//所属板块类型:
......@@ -64,9 +65,18 @@ export class HomePage {
spanWidth; //文字宽度
//分页
total = { //总页数
one:Number,
two:Number,
three:Number,
four:Number,
};
constructor(public navCtrl: NavController, public tts: TextToSpeech, public datePipe: DatePipe,
public commonSer: CommonService, public emitSer: EmitService,
public zone: NgZone, public slideListCom: SlideListComponent,
public renderer:Renderer2,
public appService: AppService, public http: Http, public storage: Storage,
public badge: Badge, public tabsSer: TabsService) {
// 接收发射过来的数据
......@@ -91,7 +101,7 @@ export class HomePage {
this.spanWidth = this.tabSpan.nativeElement.offsetWidth; //文字宽度
this.tips.nativeElement.style.width = this.tabSpan.nativeElement.offsetWidth + 'px';
this.tips1.nativeElement.style.width = this.tabSpan.nativeElement.offsetWidth + 'px';
this.change(this.tabsList[1]);
this.change(this.tabsList[0]);
this.getInfo();
this.scrollHeight();
}
......@@ -127,7 +137,8 @@ export class HomePage {
}
this.tabsSer.stuffPage(data).subscribe(
(res) => {
let arr = res.data;
let arr = res.data.list;
if(arr.length > 0){
arr.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
......@@ -136,6 +147,7 @@ export class HomePage {
this.slideList[index] = arr;
this.slides1.slideTo(index, 500);
}
}
)
}
......@@ -238,11 +250,16 @@ export class HomePage {
this.navCtrl.push(NoticePage);
}
//上拉加载
doInfinite(e) {
console.log('infinite');
this.renderer.setStyle(this.infiniteScrollContent.nativeElement,'height','84px');
setTimeout(()=>{
e.complete();
this.renderer.setStyle(this.infiniteScrollContent.nativeElement,'height','0px');
},2000)
}
//下拉刷新
doRefresh(e) {
const data = {
pageSize: 1,
......@@ -254,15 +271,19 @@ export class HomePage {
}
this.tabsSer.stuffPage(data).subscribe(
(res) => {
let arr = res.data;
let arr = res.data.list;
if(arr.length > 0){
arr.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
}
});
this.commonSer.toastTime('刷新成功!', 800)
this.slideList[this.index] = arr;
}
setTimeout(()=>{
this.commonSer.toastTime('刷新成功!', 800)
e.complete();
},1000)
}
)
}
......
src/pages/tabs/serve/serve.html
View file @ 9113f2cf
......@@ -31,7 +31,7 @@
</ion-col>
<ion-col col-9 class="card3" id="party-bir" *ngIf="noticeList.length > 0" horizonta-lamp>
<div class="card3-item" *ngFor="let item of noticeList;">
<span *ngIf="noticeTips > 0" class="tips"></span>
<span *ngIf="noticeTips > 0" class="tip"></span>
<span class="color-996">{{item.title}}</span>
{{item.content}}
</div>
......
src/pages/tabs/serve/serve.scss
View file @ 9113f2cf
......@@ -161,7 +161,7 @@ page-serve {
color: #fb9662;
}
.tips {
.tip {
display: inline-block;
padding: 2px;
background-color: #fb9662;
......@@ -327,7 +327,7 @@ page-serve {
.calen-tab {
margin: 10px 10px 0px 10px;
font-size: 1.3rem;
border: 1px solid #ddd;
border: 1px solid #ebebeb;
line-height: 2rem;
border-radius: 5px;
padding: .5rem;
......
src/service/http.service.ts
View file @ 9113f2cf
......@@ -18,7 +18,6 @@ export class AppGlobal {
// static domain = "http://47.103.35.216:8080"; //阿里云地址
static domain = ""; //本地环境
//图片地址
// static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址
static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //测试
......
src/theme/variables.scss
View file @ 9113f2cf
......@@ -83,6 +83,18 @@ $main-color:#e42417;
// Fonts
// --------------------------------------------------
@font-face {
font-family: "SourceHanSans-Normal";
src: url("../assets/font/SourceHanSansCN-Normal.ttf");
}
@font-face {
font-family: "SourceHanSans-Bold";
src: url("../assets/font/SourceHanSerifCN-Bold.ttf");
}
@font-face {
font-family: "SourceHanSans-Light";
src: url("../assets/font/SourceHanSerifCN-Light.ttf");
}
......
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