Skip to content

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

style update

parent 2c10d6d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 71 deletions
config.xml
View file @ 1e93548e
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter.test" version="4.5.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter.test" version="4.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云</name>
<description>组织部党建云平台App.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......@@ -16,6 +16,7 @@
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreenDelay" value="1000" />
<preference name="ShowSplashScreenSpinner" value="false" />
<preference name="Fullscreen" value="true" />
<platform name="android">
<allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
......
platforms/android/android.json
View file @ 1e93548e
This diff is collapsed.
platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/test/BuildConfig.java
View file @ 1e93548e
......@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.ionic.smart19.starter.test";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 40502;
public static final String VERSION_NAME = "4.5.2";
public static final int VERSION_CODE = 40503;
public static final String VERSION_NAME = "4.5.3";
}
platforms/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View file @ 1e93548e
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ 1e93548e
#Fri Aug 02 15:33:07 CST 2019
#Mon Aug 05 16:53:48 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ 1e93548e
#Mon Aug 05 16:09:11 CST 2019
#Mon Aug 05 17:54:00 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 @ 1e93548e
#Internal package file, do not edit.
#Mon Aug 05 16:09:11 CST 2019
#Mon Aug 05 17:54:00 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
......
platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
View file @ 1e93548e
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter.test"
android:hardwareAccelerated="true"
android:versionCode="40502"
android:versionName="4.5.2" >
android:versionCode="40503"
android:versionName="4.5.3" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ 1e93548e
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
View file @ 1e93548e
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/res/release/output.json
View file @ 1e93548e
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
View file @ 1e93548e
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["PROJECT","EXTERNAL_LIBRARIES","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 1e93548e
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40502},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40503},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 1e93548e
......@@ -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 Mon Aug 05 16:09:17 CST 2019 </nav>
Check performed at Mon Aug 05 17:54:03 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ 1e93548e
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="40502" android:versionName="4.5.2" package="io.ionic.smart19.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="40503" android:versionName="4.5.3" package="io.ionic.smart19.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
......
platforms/android/app/src/main/res/xml/config.xml
View file @ 1e93548e
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter.test" version="4.5.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter.test" version="4.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Keyboard">
<param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
</feature>
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.html
View file @ 1e93548e
......@@ -22,24 +22,25 @@
</div>
</div>
<ng-container *ngIf="changeType == 1">
<div class="order" *ngFor="let item of noList">
<p class="orderTips">
<ion-checkbox [(ngModel)]="item.checkbox" color="danger"
(ngModelChange)="changeCheck(item)"></ion-checkbox>
<span>申请人：{{item.applicantName}}</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<ng-container *ngFor="let goods of item.suppies">
<div class="goodsItem">
<div class="goods-img">
<img [src]="picture + goods.url">
</div>
<div class="goods-info">
<p class="model">
<span>{{goods.model}}</span>
</p>
<p>
<ng-container *ngFor="let item of noList">
<div class="order" *ngIf="mineInfo.orgName == item.orgName || role.includes(6)">
<p class="orderTips">
<ion-checkbox [(ngModel)]="item.checkbox" color="danger"
(ngModelChange)="changeCheck(item)"></ion-checkbox>
<span>申请人：{{item.applicantName}}</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<ng-container *ngFor="let goods of item.suppies">
<div class="goodsItem">
<div class="goods-img">
<img [src]="picture + goods.url">
</div>
<div class="goods-info">
<p class="model">
<span>{{goods.model}}</span>
</p>
<p>
<span class="specs">规格:
<span>{{goods.specs1}}</span>
<span>{{goods.specs2}}</span>
......@@ -47,34 +48,36 @@
<span>{{goods.specs4}}</span>
<span>{{goods.specs5}}</span>
</span>
<span class="amount">数量:{{goods.amount}}</span>
</p>
<span class="amount">数量:{{goods.amount}}</span>
</p>
</div>
</div>
</div>
</ng-container>
</div>
</ng-container>
</div>
</div>
</div>
</ng-container>
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="order" *ngFor="let item of doneList" (click)="goDetail(item)">
<p class="orderTips">
<span *ngIf="item.status == 2">已申请</span>
<span *ngIf="item.status == 3">已领取</span>
<span *ngIf="item.status == 4">已驳回</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<ng-container *ngFor="let goods of item.suppies">
<div class="goodsItem">
<div class="goods-img">
<img [src]="picture + goods.url">
</div>
<div class="goods-info">
<p class="model">
<span>{{goods.model}}</span>
</p>
<p>
<ng-container *ngFor="let item of doneList">
<div class="order" *ngIf="mineInfo.orgName == item.orgName || role.includes(6)" (click)="goDetail(item)">
<p class="orderTips">
<span *ngIf="item.status == 2">已申请</span>
<span *ngIf="item.status == 3">已领取</span>
<span *ngIf="item.status == 4">已驳回</span>
<span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<ng-container *ngFor="let goods of item.suppies">
<div class="goodsItem">
<div class="goods-img">
<img [src]="picture + goods.url">
</div>
<div class="goods-info">
<p class="model">
<span>{{goods.model}}</span>
</p>
<p>
<span class="specs">规格:
<span>{{goods.specs1}}</span>
<span>{{goods.specs2}}</span>
......@@ -82,13 +85,14 @@
<span>{{goods.specs4}}</span>
<span>{{goods.specs5}}</span>
</span>
<span class="amount">数量:{{goods.amount}}</span>
</p>
<span class="amount">数量:{{goods.amount}}</span>
</p>
</div>
</div>
</div>
</ng-container>
</ng-container>
</div>
</div>
</div>
</ng-container>
</ng-container>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
......
src/pages/serve-pages/goods-collect/goods-verify/goods-verify.ts
View file @ 1e93548e
......@@ -27,6 +27,7 @@ export class GoodsVerifyPage {
type;
picture = AppGlobal.picture;
mineInfo;
constructor(public navCtrl: NavController, public navParams: NavParams, private appMainSer: AppMainService,
private serveSer: ServeService, private commonSer: CommonService) {
......@@ -49,6 +50,11 @@ export class GoodsVerifyPage {
this.getUnsubmit();
}
);
//获取个人信息
this.appMainSer.mineInfo.subscribe(value => {
this.mineInfo = value;
})
}
ionViewWillLeave() {
......
src/pages/serve-pages/meet-room/meet-room.html
View file @ 1e93548e
......@@ -43,7 +43,9 @@
</div>
<div class="morning-room">
<span (click)="goApplyEdit(item1)" *ngFor="let item1 of room?.morningUse">
{{item1.name}}(已预定)
{{item1.name}}
<ng-container *ngIf="item1.applicantName != mineInfo.orgName">(已预定)</ng-container>
<ng-container *ngIf="item1.applicantName == mineInfo.orgName">(可编辑)</ng-container>
</span>
</div>
</div>
......@@ -53,7 +55,9 @@
</div>
<div class="morning-room">
<span (click)="goApplyEdit(item2)" *ngFor="let item2 of room?.afternoonUse">
{{item2.name}}(已预定)
{{item2.name}}
<ng-container *ngIf="item2.applicantName != mineInfo.orgName">(已预定)</ng-container>
<ng-container *ngIf="item2.applicantName == mineInfo.orgName">(可编辑)</ng-container>
</span>
</div>
</div>
......
src/pages/serve-pages/meet-room/room-deal/room-deal.ts
View file @ 1e93548e
......@@ -138,7 +138,7 @@ export class RoomDealPage {
ids: this.chooseObj.join(','),
status: status,
};
let msg = status == 1 ? '确定通过所选申请' : '确定退回所选申请';
let msg = status == 2 ? '确定通过所选申请' : '确定退回所选申请';
this.commonSer.alert(msg, () => {
this.serveSer.meetOperate(data).subscribe(
(res) => {
......
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