Skip to content

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

update

parent c64e521b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 47 deletions
config.xml
View file @ aea5fd5e
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.2.6" 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>
......
platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java
View file @ aea5fd5e
......@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.ionic.smart19.starter";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 40205;
public static final String VERSION_NAME = "4.2.5";
public static final int VERSION_CODE = 40206;
public static final String VERSION_NAME = "4.2.6";
}
platforms/android/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
View file @ aea5fd5e
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ aea5fd5e
#Sun Jun 16 00:51:51 CST 2019
#Sun Jun 16 23:25:43 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/manifests/full/release/AndroidManifest.xml
View file @ aea5fd5e
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter"
android:hardwareAccelerated="true"
android:versionCode="40205"
android:versionName="4.2.5" >
android:versionCode="40206"
android:versionName="4.2.6" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ aea5fd5e
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
View file @ aea5fd5e
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/res/release/output.json
View file @ aea5fd5e
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
View file @ aea5fd5e
[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"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 @ aea5fd5e
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40206},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ aea5fd5e
......@@ -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 Jun 16 00:51:54 CST 2019 </nav>
Check performed at Sun Jun 16 23:27:59 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ aea5fd5e
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="40205" android:versionName="4.2.5" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="40206" android:versionName="4.2.6" package="io.ionic.smart19.starter" 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 @ aea5fd5e
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.2.6" 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>
......
platforms/browser/config.xml
View file @ aea5fd5e
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.2.6" 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>
......
src/pages/discover-pages/publish/publish.html
View file @ aea5fd5e
......@@ -20,7 +20,7 @@
</ion-item>
<ion-item>
<ion-label class="main-color">发布范围</ion-label>
<ion-select [(ngModel)]="obj.publishRange" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-select [(ngModel)]="obj.publishRangeFlag" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of group" [value]="item.id">{{item.groupName}}</ion-option>
</ion-select>
</ion-item>
......
src/pages/discover-pages/publish/publish.ts
View file @ aea5fd5e
......@@ -39,10 +39,13 @@ export class PublishPage {
type: '13',
title: '',
content: '',
publishRange: '',
publishRangeFlag: '1',
};
fileList = []; //文件数组
group = [{groupName: '全体人员', id: null}]; //用户组
group = [
{groupName: '全体人员', id: 1},
{groupName: '本处室', id: 2},
]; //用户组
userid; //当前登录人的id
file; // 文件
orgName; //登录人的部门
......@@ -235,9 +238,19 @@ export class PublishPage {
//发布
publish(status) {
let message;
if (status == 1) message = '确定当前内容保存为草稿?';
if (status == 2) message = '确定提交审核当前内容?';
if (status == 3) message = '确定直接发布当前内容?';
let toast;
if (status == 1) {
message = '确定当前内容保存为草稿?';
toast = "已保存为草稿";
}
if (status == 2) {
message = '确定提交审核当前内容?';
toast = "已提交审核";
}
if (status == 3) {
message = '确定直接发布当前内容?';
toast = "已发布";
}
if (!this.check()) {
return false;
}
......@@ -267,7 +280,7 @@ export class PublishPage {
source: this.orgName, //来源
publishStatus: status, //已提交 退回1 发布3
content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content, //内容
publishRange: this.obj.publishRange, //范围
publishRangeFlag: this.obj.publishRangeFlag, //范围
submitter: this.userid, //提交者
stuffType: this.type === 'image' ? 1 : 2, //图片 1 视频 2
attachments: attachmentsArr, //标题附件
......@@ -275,7 +288,8 @@ export class PublishPage {
this.commonSer.alert(message, () => {
this.tabSer.stuffSave(data).subscribe(
(res) => {
this.commonSer.toast('已提交');
this.commonSer.toast(toast);
setTimeout(() => {
this.navCtrl.pop()
}, 800)
......
src/pages/mine-pages/appraisals/appraisals.scss
View file @ aea5fd5e
......@@ -35,7 +35,7 @@ page-appraisals {
.top-col{
background-color: #fff;
margin: .5rem;
height: 3rem;
//height: 3rem;
line-height: 2rem;
font-size: 1.5rem;
border-radius: 4px;
......
src/pages/mine-pages/my-publish/my-publish.html
View file @ aea5fd5e
......@@ -54,7 +54,7 @@
</ion-row>
</ng-container>
</ng-container>
<ion-list text-center style="margin-top: 10rem" *ngIf=" !isLoad && publicList.length == 0">
<ion-list text-center style="margin-top: 10rem" *ngIf="publicList.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无发布
......
src/pages/mine-pages/my-publish/my-publish.ts
View file @ aea5fd5e
......@@ -68,6 +68,7 @@ export class MyPublishPage {
doRefresh(e) {
this.getDraftList();
this.getPublishList();
e.complete();
}
//查看文章详情
......
src/pages/mine-pages/share/share.scss
View file @ aea5fd5e
......@@ -6,7 +6,7 @@ page-share {
.share{
background-color: #f1f1f1;
height: 100%;
padding: 3rem 2rem;
padding: 4rem 2rem;
}
.code-title{
display: flex;
......
src/pages/mine-pages/verify-edit/verify-edit.html
View file @ aea5fd5e
......@@ -20,7 +20,7 @@
</ion-item>
<ion-item>
<ion-label class="main-color">发布范围</ion-label>
<ion-select [(ngModel)]="obj.publishRange" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-select [(ngModel)]="obj.publishRangeFlag" cancelText="取消" okText="确定" placeholder="全体人员">
<ion-option *ngFor="let item of group" [value]="item.id">{{item.groupName}}</ion-option>
</ion-select>
</ion-item>
......
src/pages/mine-pages/verify-edit/verify-edit.ts
View file @ aea5fd5e
......@@ -41,11 +41,14 @@ export class VerifyEditPage {
plateType: '13',
title: '',
content: null,
publishRange: '',
publishRangeFlag: '',
};
fileList = []; //文件数组
group = [{groupName: '全体人员', id: null}]; //用户组
group = [
{groupName: '全体人员', id: 1},
{groupName: '本处室', id: 2},
]; //用户组
userid; //当前登录人的id
file; // 文件
......@@ -250,9 +253,19 @@ export class VerifyEditPage {
//发布
publish(status) {
let message;
if (status == 1) message = '确定将当前内容保存为草稿?';
if (status == 2) message = '确定提交审核当前内容?';
if (status == 3) message = '确定直接发布当前内容?';
let toast;
if (status == 1) {
message = '确定当前内容保存为草稿?';
toast = "已保存为草稿";
}
if (status == 2) {
message = '确定提交审核当前内容?';
toast = "已提交审核";
}
if (status == 3) {
message = '确定直接发布当前内容?';
toast = "已发布";
}
if (!this.check()) {
return false;
}
......@@ -283,7 +296,7 @@ export class VerifyEditPage {
source: '上海市委组织部', //来源
publishStatus: status, //已提交 退回1 发布3
content: `&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;` + content, //内容
publishRange: this.obj.publishRange, //范围
publishRangeFlag: this.obj.publishRangeFlag, //范围
submitter: this.userid, //提交者
stuffType: this.type === 'image' ? 1 : 2, //图片 1 视频 2
attachments: attachmentsArr, //标题附件
......@@ -291,7 +304,7 @@ export class VerifyEditPage {
this.commonSer.alert(message, () => {
this.tabSer.stuffSave(data).subscribe(
(res) => {
this.commonSer.toast('已发布');
this.commonSer.toast(toast);
setTimeout(() => {
let index = this.navCtrl.length() - 2;
this.navCtrl.remove(2, index)
......
src/pages/mine/person/editPersonInfo/editPersonInfo.ts
View file @ aea5fd5e
......@@ -3,6 +3,8 @@ import { IonicPage, NavController, NavParams, ToastController } from 'ionic-angu
import { Storage } from '@ionic/storage';
import { AppService } from "../../../../service/http.service";
import {CommonService} from "../../../../provide/common.service";
import {TabsService} from "../../../tabs/tabs.service";
@IonicPage()
@Component({
......@@ -31,6 +33,7 @@ export class EditPersonInfoPage {
};
code:string ;
mineInfo;
//myregMobile = /^((\d)\s*,\s*)*(\d)/;
// /(\d*\s*,\s*)*(\d*)/
myregMobile = /^([0-9]|[-])+$/g;
......@@ -45,6 +48,8 @@ export class EditPersonInfoPage {
public storage: Storage,
public appService: AppService,
public toast: ToastController,
private commonSer:CommonService,
private tabSer:TabsService
) {
}
......@@ -54,19 +59,24 @@ export class EditPersonInfoPage {
this.user = value;
this.gender = this.user.userDetail.user.gender;
this.userinfo = this.user.userDetail.user;
if(!this.userinfo.job){
this.userinfo.job = null;
}
console.log(this.userinfo);
this.getUserInfo();
this.userinfo.userId = this.user.id;
this.getOrgName(this.user.id,result=>{
let data = result;
this.orgName = data["orgName"];
});
});
}
getUserInfo(){
this.tabSer.getUserIntegral().subscribe(
(res) => {
this.userinfo.job = res.data.job;
}
)
}
//保存
save(){
......@@ -103,8 +113,8 @@ export class EditPersonInfoPage {
.toPromise()
.then(res => {
let data = res.json();
this.commonSer.toast('已保存');
this.user.userDetail.user = data;
this.storage.remove("user");
this.storage.set("user",this.user);
this.navCtrl.pop();
......
src/pages/mine/person/personInfo/personInfo.html
View file @ aea5fd5e
......@@ -64,7 +64,7 @@
<div class="info-item">
<span class="info-span">职务</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.job}}</span>
<span class="info">{{mineInfo?.job}}</span>
</div>
</div>
</ion-item>
......
src/pages/mine/person/personInfo/personInfo.ts
View file @ aea5fd5e
......@@ -22,7 +22,6 @@ export class PersonInfoPage {
user: any;
gender: object;
userid: '';
myDate;
picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
mineInfo;
......
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