Skip to content

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

style update

parent 9b22a807
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 29 deletions
app-release-unsigned.apk
View file @ 97354983
No preview for this file type
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ 97354983
#Sun Aug 04 18:45:07 CST 2019
#Mon Aug 05 16:09:11 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt
View file @ 97354983
#Internal package file, do not edit.
#Sun Aug 04 18:45:07 CST 2019
#Mon Aug 05 16:09:11 CST 2019
20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/icon-gh.png
......@@ -411,7 +411,7 @@
227.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/94.js
75.set=ASSET
326.set=ASSET
150.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
150.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
249.set=ASSET
321.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/icon-password-new.png
34.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
......@@ -725,7 +725,7 @@
424.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/icon-password-confirm.png
37.set=ASSET
286.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png
149.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
149.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
150.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
321.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
183.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
......
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 97354983
......@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 1 error</span>
<div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Sun Aug 04 18:45:09 CST 2019 </nav>
Check performed at Mon Aug 05 16:09:17 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
src/app/app.scss
View file @ 97354983
......@@ -192,26 +192,10 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
position: relative;
}
.scroll-tab{
.icon-left{
position: absolute;
left: 1px;
top: 8px;
z-index: 999999;
color: #999;
font-size: 2.5rem;
}
.icon-right{
position: absolute;
right: 1px;
top: 8px;
z-index: 999999;
color: #999;
font-size: 2.5rem;
}
span.more{
position: absolute;
padding: 0 5px;
top: 2px;
top: 0;
right: 0;
font-size: 3.5rem;
color: #333;
......@@ -253,7 +237,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
cursor: pointer;
height: 3rem;
line-height: 3rem;
width: 7rem;
width: 8rem;
display: inline-block;
color: #747378;
}
......
src/pages/mine-pages/my-publish/my-publish.scss
View file @ 97354983
......@@ -60,6 +60,8 @@ page-my-publish {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title{
position: relative;
......
src/pages/mine-pages/verify/verify.scss
View file @ 97354983
......@@ -64,6 +64,8 @@ page-verify {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title{
position: relative;
......
src/pages/mine/my-duty/my-duty.scss
View file @ 97354983
......@@ -21,6 +21,8 @@ page-my-duty {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title{
position: relative;
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.html
View file @ 97354983
......@@ -26,9 +26,7 @@
<p class="orderTips">
<ion-checkbox [(ngModel)]="item.checkbox" color="danger"
(ngModelChange)="changeCheck(item)"></ion-checkbox>
<span *ngIf="item.status == 2">已申请</span>
<span *ngIf="item.status == 3">已领取</span>
<span *ngIf="item.status == 4">已驳回</span>
<span>申请人：{{item.applicantName}}</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.scss
View file @ 97354983
......@@ -135,6 +135,8 @@ page-goods-verify {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title{
position: relative;
......
src/pages/serve-pages/hair-cut/hair-cut.scss
View file @ 97354983
......@@ -24,6 +24,8 @@ page-hair-cut {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title {
......
src/pages/serve-pages/meet-room/meet-room.scss
View file @ 97354983
......@@ -24,6 +24,8 @@ page-meet-room {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title {
......
src/pages/serve-pages/meet-room/room-deal/room-deal.scss
View file @ 97354983
......@@ -20,6 +20,8 @@ page-room-deal {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title {
......
src/pages/serve-pages/use-car/car-deal/car-deal.scss
View file @ 97354983
......@@ -20,6 +20,8 @@ page-car-deal {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title {
......
src/pages/serve-pages/use-car/use-car.scss
View file @ 97354983
......@@ -24,6 +24,8 @@ page-use-car {
width: 50%;
text-align: center;
position: relative;
height: 36px;
line-height: 36px;
}
.duty-title {
......
src/pages/tabs/discover/discover.ts
View file @ 97354983
......@@ -251,7 +251,8 @@ export class DiscoverPage {
this.getBanner();
this.scrollHeight();
timer(20).subscribe(() => {
this.itemWidth = '84';
const htmlFontSize = getComputedStyle(window.document.documentElement)['font-size'];
this.itemWidth = htmlFontSize.split("px")[0] * 8;
this.spanWidth = this.tabSpan.nativeElement.offsetWidth; //文字宽度
this.changeParent(this.tabsList[0])
});
......
src/pages/tabs/home/home.ts
View file @ 97354983
......@@ -136,7 +136,8 @@ export class HomePage {
ionViewDidLoad() {
this.getBanner();
this.itemWidth = '84';
const htmlFontSize = getComputedStyle(window.document.documentElement)['font-size'];
this.itemWidth = htmlFontSize.split("px")[0] * 8;
this.spanWidth = this.tabsParent.nativeElement.children[0].children[0].offsetWidth; //文字宽度
this.tips.nativeElement.style.width = this.spanWidth + 'px';
this.tips1.nativeElement.style.width = this.spanWidth + 'px';
......@@ -441,7 +442,7 @@ export class HomePage {
//多模块
moreTab() {
let modal = this.modalCtrl.create(FilterComponent, {list: this.tabsList, choose: this.plateType}, {
let modal = this.modalCtrl.create(FilterComponent, {list: this.tabsList, type: this.plateType}, {
enterAnimation: 'modal-from-right-enter',
leaveAnimation: 'modal-from-right-leave'
});
......
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