Skip to content

P
party-build-cloud
Commit 427dce27 authored by wangqinghua's avatar wangqinghua
Browse files
Options

style

parent 6d42af8f
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 67 deletions
README.md
View file @ 427dce27
...@@ -64,4 +64,4 @@ pages/ app的页面 ...@@ -64,4 +64,4 @@ pages/ app的页面
io.ionic.partyCloud.starter.test 部机关党建云(测试) io.ionic.partyCloud.starter.test 部机关党建云(测试)
io.ionic.partyCloud.starter.test 部机关党建云 io.ionic.partyCloud.starter.test 部机关党建云
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore release-key.keystore app-release-unsigned.apk 部机关党建云 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore release-key.keystore app-release-unsigned.apk 部机关党建云
\ No newline at end of file \ No newline at end of file
src/app/app.scss
View file @ 427dce27
...@@ -278,13 +278,13 @@ p { ...@@ -278,13 +278,13 @@ p {
border-radius: 5px; border-radius: 5px;
background: url(../assets/imgs/home/signBgc.png) repeat; background: url(../assets/imgs/home/signBgc.png) repeat;
background-size: cover; background-size: cover;
padding: 1rem;
.record-conten{ .record-conten{
margin-left: 25%; margin-left: 25%;
margin-top: 30%; margin-top: 30%;
color: #333333; color: #333333;
font-size: 1.4rem; font-size: 1.4rem;
line-height: 1.8rem; line-height: 1.8rem;
padding-right: 1rem;
height: 50%; height: 50%;
overflow: scroll; overflow: scroll;
} }
......
src/pages/home-pages/search-new/search-new.scss
View file @ 427dce27
...@@ -5,7 +5,7 @@ page-search-new { ...@@ -5,7 +5,7 @@ page-search-new {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-sizing: border-box; box-sizing: border-box;
width: 90%; width: 95%;
margin-left: 5px; margin-left: 5px;
ion-input { ion-input {
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
......
src/pages/home-pages/stuff-detail/stuff-detail.html
View file @ 427dce27
...@@ -6,32 +6,35 @@ ...@@ -6,32 +6,35 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="stuff"> <div class="stuff">
<div class="stuff-title"> <div class="stuff-container">
{{stuffObj?.title}} <div class="stuff-title">
</div> {{stuffObj?.title}}
<div class="stuff-info"> </div>
<span class="info-publisher">{{stuffObj?.source}}</span> <div class="stuff-info">
<span class="info-time">{{stuffObj?.publishTime | date:'yyyy-MM-dd'}}</span> <span class="info-publisher">{{stuffObj?.source}}</span>
</div> <span class="info-time">{{stuffObj?.publishTime | date:'yyyy-MM-dd'}}</span>
<div class="stuff-content"> </div>
<p [innerHTML]="stuffObj?.content"></p> <div class="stuff-content">
<p [innerHTML]="stuffObj?.content"></p>
</div>
</div> </div>
<div class="stuff-comment"> <div class="stuff-comment">
<p class="comment-title">评论</p> <p class="comment-title">评论</p>
<div *ngFor="let comment of stuffObj?.commentInfos" class="comment-item"> <div *ngFor="let comment of stuffObj?.commentInfos" class="comment-item">
<ion-row> <ion-row>
<ion-col col-2>头像</ion-col> <ion-col col-2>
<img src="./assets/imgs/man.png" class="contact-img">
</ion-col>
<ion-col col-10> <ion-col col-10>
<div class="comment-info"> <p class="comment-info">
发布 发布
</div> </p>
<div class="commnet-content"> <p class="commnet-content">
{{comment.content}} {{comment.content}}
</div> </p>
<div class="comment-time"> <p class="comment-time">
{{comment.createTime | date:'yyyy-MM-dd'}} {{comment.createTime | date:'yyyy-MM-dd'}}
</div> </p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
......
src/pages/home-pages/stuff-detail/stuff-detail.scss
View file @ 427dce27
page-stuff-detail { page-stuff-detail {
.stuff { .stuff {
padding: 1.5rem;
font-size: 1.8rem; font-size: 1.8rem;
line-height: 2.4rem; line-height: 2.4rem;
height: calc(100% - 4rem); height: calc(100% - 4rem);
overflow-y: scroll; overflow-y: scroll;
background-color: #f8f8f8; background-color: #f3f3f3;
.stuff-title { .stuff-container {
font-weight: 600; padding: 1.5rem;
font-size: 2.5rem; background-color: #fff;
margin-bottom: .5rem; .stuff-title {
line-height: 3rem; font-weight: 600;
} font-size: 2.5rem;
margin-bottom: .5rem;
line-height: 3rem;
}
.stuff-info { .stuff-info {
font-size: 1.5rem; font-size: 1.5rem;
margin-bottom: 1rem; margin-bottom: 1rem;
.info-publisher { .info-publisher {
color: #5c5c5c; color: #5c5c5c;
margin-right: 1rem; margin-right: 1rem;
} }
.info-time { .info-time {
color: #888888; color: #888888;
}
} }
} }
} }
...@@ -37,7 +40,8 @@ page-stuff-detail { ...@@ -37,7 +40,8 @@ page-stuff-detail {
text-align: center; text-align: center;
line-height: 3rem; line-height: 3rem;
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
z-index: 99999; z-index: 9;
[col-2] { [col-2] {
line-height: 4rem; line-height: 4rem;
} }
...@@ -81,7 +85,7 @@ page-stuff-detail { ...@@ -81,7 +85,7 @@ page-stuff-detail {
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: rgba(0, 0, 0, .2); background-color: rgba(0, 0, 0, .2);
z-index: 9; z-index: 99;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -98,6 +102,7 @@ page-stuff-detail { ...@@ -98,6 +102,7 @@ page-stuff-detail {
} }
.content-textarea { .content-textarea {
margin-top: 1rem;
padding: 10px; padding: 10px;
min-height: 100px; min-height: 100px;
width: 100%; width: 100%;
...@@ -112,8 +117,8 @@ page-stuff-detail { ...@@ -112,8 +117,8 @@ page-stuff-detail {
background-color: #fd5151; background-color: #fd5151;
width: 50%; width: 50%;
margin-right: 10px; margin-right: 10px;
height: 3rem; height: 2.5rem;
line-height: 3rem; line-height: 2.5rem;
border-radius: 5px; border-radius: 5px;
} }
} }
...@@ -121,24 +126,53 @@ page-stuff-detail { ...@@ -121,24 +126,53 @@ page-stuff-detail {
} }
.stuff-comment { .stuff-comment {
margin-top: 2rem; margin-top: 1rem;
padding: 0 1.5rem;
background-color: #fff;
.comment-title { .comment-title {
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
font-weight: 500; font-weight: 500;
padding-bottom: .8rem; padding-bottom: .8rem;
margin-bottom: .8rem; margin-bottom: .8rem;
position: relative;
}
.comment-title::after{
content: '';
position: absolute;
top: 7px;
left: -8px;
width: 3px;
height: 15px;
background-color: #e12724;
}
[col-10],[col-2]{
padding: 0;
} }
.comment-item { .comment-item {
.contact-img{
border-radius: 100px;
width: 75%;
text-align: center;
margin-top: 8px;
}
.comment-info { .comment-info {
color: #d88f27; color: #d88f27;
font-size: 1.6rem;
}
.commnet-content {
padding: .1rem 0;
font-size: 1.5rem;
color: #333333;
} }
.commnet-content{ .comment-time{
padding: .5rem 0; font-size: 1.4rem;
color: #666666;
} }
} }
.comment-item + .comment-item{ .comment-item + .comment-item {
border-top: 1px solid #eee; border-top: 1px solid #eee;
margin-top: .5rem; margin-top: .5rem;
} }
......
src/pages/home-pages/stuff-detail/stuff-detail.ts
View file @ 427dce27
...@@ -25,7 +25,6 @@ export class StuffDetailPage { ...@@ -25,7 +25,6 @@ export class StuffDetailPage {
} }
ionViewDidLoad() { ionViewDidLoad() {
this.footerView = true;
this.storage.get('userLoginInfo').then((value) => { this.storage.get('userLoginInfo').then((value) => {
console.log(value); console.log(value);
this.userId = value.userid; this.userId = value.userid;
...@@ -33,6 +32,9 @@ export class StuffDetailPage { ...@@ -33,6 +32,9 @@ export class StuffDetailPage {
}) })
this.stuffId = this.navParams.get('id'); this.stuffId = this.navParams.get('id');
this.getStuff(); this.getStuff();
setTimeout(()=>{
this.footerView = true;
},300)
//增加浏览量 //增加浏览量
} }
......
src/pages/tabs/home/home.html
View file @ 427dce27
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
<img class="toolbar-img" src="./assets/imgs/logo.png"> <img class="toolbar-img" src="./assets/imgs/logo.png">
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons center (click)="goToSearch()"> <ion-buttons center class="search-button" (click)="goToSearch()">
<ion-searchbar class="toolbar-search" placeholder="搜索"></ion-searchbar> <ion-searchbar class="toolbar-search" placeholder="搜索"></ion-searchbar>
<ion-icon class="search-icon" name="search"></ion-icon>
</ion-buttons> </ion-buttons>
<ion-buttons end> <ion-buttons end>
<button ion-button icon-only (click)="isSign = true" class="toolbar-signUp"> <button ion-button icon-only (click)="isSign = true" class="toolbar-signUp">
......
src/pages/tabs/home/home.scss
View file @ 427dce27
...@@ -3,12 +3,30 @@ page-home { ...@@ -3,12 +3,30 @@ page-home {
width: 100%; width: 100%;
height: 160px; height: 160px;
} }
.toolbar .searchbar-ios .searchbar-input{
.toolbar .searchbar-ios .searchbar-input {
background-color: #e12724; background-color: #e12724;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
border-radius: 0px; border-radius: 0px;
} }
.searchbar-ios .searchbar-input::-webkit-input-placeholder{
.search-button {
position: relative;
.search-icon {
position: absolute;
top: 1rem;
left: 1.1rem;
color: #ffffff;
font-size: 2rem;
}
}
.searchbar-ios .searchbar-search-icon {
background-image: none;
}
.searchbar-ios .searchbar-input::-webkit-input-placeholder {
color: #ffffff; color: #ffffff;
} }
...@@ -56,25 +74,27 @@ page-home { ...@@ -56,25 +74,27 @@ page-home {
} }
} }
.toolbar-search{ .toolbar-search {
color: #ffffff; color: #ffffff;
} }
//中间 //中间
.home-middle-tips{ .home-middle-tips {
padding: 1rem; padding: 1rem;
font-size: 1.5rem; font-size: 1.5rem;
line-height: 1.6rem; line-height: 1.6rem;
font-weight: 400; font-weight: 400;
ion-row{
ion-row {
padding: .5rem 0; padding: .5rem 0;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
box-shadow: -5px 0px 5px 1px #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2; box-shadow: -5px 0px 5px 1px #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2;
background-color: #fff; background-color: #fff;
.middle-left{
display: flex; .middle-left {
display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
...@@ -82,36 +102,53 @@ page-home { ...@@ -82,36 +102,53 @@ page-home {
} }
//新闻区 //新闻区
.main-news{ .main-news {
padding: 0 1rem; padding: 0 1rem;
.news-item{
.news-item {
padding: .8rem 0; padding: .8rem 0;
.news-left{
.news-left {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
min-height: 100%; min-height: 100%;
.news-title{
.news-title {
align-self: flex-start; align-self: flex-start;
font-weight: bold; font-weight: bold;
width: 100%; width: 100%;
} }
.news-end{
.news-end {
align-self: flex-end; align-self: flex-end;
color: #999999; color: #999999;
span{
span {
margin-right: 1rem; margin-right: 1rem;
} }
} }
} }
.news-right{
img{ .news-right {
img {
border-radius: .5rem; border-radius: .5rem;
} }
} }
} }
.news-item + .news-item{
.news-item + .news-item {
border-top: 1px solid #eeeeee; border-top: 1px solid #eeeeee;
} }
} }
.mask-button {
border-top: 1px solid #eeeeee;
text-align: center;
.submit-btn {
margin-top: 10px;
width: 60%;
}
}
} }
src/service/http.service.ts
View file @ 427dce27
...@@ -15,8 +15,8 @@ export class AppGlobal { ...@@ -15,8 +15,8 @@ export class AppGlobal {
//接口基地址 //接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境 // static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://180.168.156.212:2931"; //测试环境 // static domain = "http://180.168.156.212:2931"; //测试环境
static domain = "http://47.103.35.216:8080"; //阿里云地址 // static domain = "http://47.103.35.216:8080"; //阿里云地址
// static domain = ""; //本地环境 static domain = ""; //本地环境
//图片地址 //图片地址
......
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