Skip to content

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

update

parent 02052279
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 33 deletions
config.xml
View file @ 4166457a
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.3.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.3.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>
......
ionic.config.json
View file @ 4166457a
......@@ -7,7 +7,7 @@
"proxies": [
{
"path": "/wisdomgroup",
"proxyUrl": "http://47.103.35.216:8080/wisdomgroup"
"proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
}
]
}
platforms/android/android.json
View file @ 4166457a
This diff is collapsed.
platforms/android/app/build/outputs/apk/debug/output.json
View file @ 4166457a
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40302},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 4166457a
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40301},"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":40302},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/logs/manifest-merger-debug-report.txt
View file @ 4166457a
......@@ -42,17 +42,17 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:103-137
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:versionName
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-101
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-102
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:hardwareAccelerated
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45
xmlns:android
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:137-195
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:138-196
android:versionCode
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:46-73
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
......
platforms/android/app/build/outputs/logs/manifest-merger-release-report.txt
View file @ 4166457a
......@@ -42,17 +42,17 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:103-137
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:versionName
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-101
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-102
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:hardwareAccelerated
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45
xmlns:android
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:137-195
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:138-196
android:versionCode
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:46-73
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
......
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 4166457a
......@@ -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 Thu Jun 20 14:23:36 CST 2019 </nav>
Check performed at Tue Jun 25 10:46:44 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
src/pages/home-pages/search-new/search-new.html
View file @ 4166457a
......@@ -3,7 +3,7 @@
<ion-navbar>
<div class="search-header">
<ion-input type="text" placeholder="按姓名搜索" [(ngModel)]="searchObj.title"></ion-input>
<span class="clear" (click)="searchValue()">搜索</span>
<span class="clear" (click)="search()">搜索</span>
</div>
</ion-navbar>
</ion-navbar>
......@@ -18,10 +18,8 @@
<div class="filter-new">
<ion-row>
<ion-col col-7></ion-col>
<ion-col col-2 (click)="changeOrder()">
时间
<ion-icon class="main-color" *ngIf="searchObj.order == 'desc'" name="arrow-round-down"></ion-icon>
<ion-icon class="main-color" *ngIf="searchObj.order == 'asc'" name="arrow-round-up"></ion-icon>
<ion-col col-2>
</ion-col>
<ion-col col-3>
<ion-segment [(ngModel)]="searchObj.stuffType" (ionChange)="search()">
......@@ -81,7 +79,7 @@
(play)="clickVideo($event)"
preload = "metadata"
controls="controls" muted="muted">
<source [src]="picture +item.path+ '#t=2' ">
<source [src]="picture +item.path+ '#t=1' ">
您的浏览器不支持 html5。
</video>
</div>
......
src/pages/home-pages/search-new/search-new.ts
View file @ 4166457a
......@@ -45,15 +45,10 @@ export class SearchNewPage {
}
}
searchValue(){
this.pageNum = 1;
this.search();
}
//查询列表
search() {
const data = {
pageNum: this.pageNum,
pageNum: 1,
pageCount: 10,
isRecent: 0,
obj: this.searchObj,
......@@ -75,7 +70,6 @@ export class SearchNewPage {
//下拉刷新
doRefresh(e) {
this.infiniteScrollContent.inf.enable(true);
this.pageNum = 1;
this.search();
setTimeout(() => {
e.complete();
......@@ -84,8 +78,6 @@ export class SearchNewPage {
//上拉加载
doInfinite(e) {
console.log(this.totalNum)
console.log(this.newList.length)
if(this.totalNum == this.newList.length ){
console.log('done')
e.enable(false);
......
src/pages/tabs/discover/discover.html
View file @ 4166457a
......@@ -196,7 +196,7 @@
<div class="publishMisk" *ngIf="isPublish" (click)="close()">
<div class="content" (click)="stop($event)">
<div class="image" (click)="goToPublish('image')">
<ion-icon class="icon iconfont icon-shipin-tianchong"></ion-icon>
<ion-icon class="icon-tupian iconfont"></ion-icon>
<span>发文章</span></div>
<!-- <div class="video" (click)="goToPublish('video')">-->
<!-- <ion-icon class="icon-tupian iconfont"></ion-icon>-->
......
src/service/appUpdate.service.ts
View file @ 4166457a
......@@ -98,4 +98,4 @@ export class AppUpdateService {
});
xhr.send();
}
}
\ No newline at end of file
}
src/service/http.service.ts
View file @ 4166457a
......@@ -15,8 +15,8 @@ export class AppGlobal {
//接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://192.168.2.235:8080"; //测试环境
// static domain = "http://47.103.33.196:8080"; //阿里云测试地址
static domain = "http://47.103.35.216:8080"; //阿里云正式地址
static domain = "http://47.103.33.196:8080"; //阿里云测试地址
// static domain = "http://47.103.35.216:8080"; //阿里云正式地址
// 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