Skip to content

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

评论图片修正

parent 01c3435d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 67 deletions
config.xml
View file @ 5644f15f
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.3.7" 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.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云</name> <name>部机关党建云</name>
<description>组织部党建云平台App.</description> <description>组织部党建云平台App.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
platforms/android/android.json
View file @ 5644f15f
This diff is collapsed.
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ 5644f15f
#Fri Jul 12 18:47:03 CST 2019 #Fri Jul 12 20:41:36 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/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 @ 5644f15f
#Fri Jul 12 16:03:01 CST 2019 #Fri Jul 12 22:18:57 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/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 @ 5644f15f
#Internal package file, do not edit. #Internal package file, do not edit.
#Fri Jul 12 16:03:01 CST 2019 #Fri Jul 12 22:18:57 CST 2019
20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_ 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/assets/release 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/loading.gif 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/loading.gif
......
platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
View file @ 5644f15f
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter" package="io.ionic.smart19.starter"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:versionCode="40307" android:versionCode="40308"
android:versionName="4.3.7" > android:versionName="4.3.8" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ 5644f15f
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40307},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40308},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
View file @ 5644f15f
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40307},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40308},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/res/release/output.json
View file @ 5644f15f
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40307},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40308},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 5644f15f
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40307},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40308},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 5644f15f
...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none'; ...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 1 error</span> <span class="mdl-layout-title">Lint Report: 1 error</span>
<div class="mdl-layout-spacer"></div> <div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only"> <nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Fri Jul 12 16:03:16 CST 2019 </nav> Check performed at Fri Jul 12 22:19:00 CST 2019 </nav>
</div> </div>
</header> </header>
<div class="mdl-layout__drawer"> <div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ 5644f15f
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="40307" android:versionName="4.3.7" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android"> <manifest android:hardwareAccelerated="true" android:versionCode="40308" android:versionName="4.3.8" 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" /> <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"> <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"> <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 @ 5644f15f
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.3.7" 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.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Keyboard"> <feature name="Keyboard">
<param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" /> <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
</feature> </feature>
......
src/components/reply/reply.html
View file @ 5644f15f
<div class="main" > <div class="main">
<div class="content" (click)="close()" > <div class="content" (click)="close()">
<div class="comment" (click)="stop($event)"> <div class="comment" (click)="stop($event)">
<ion-row class="comment-item">
<ion-col col-2>
<img src="./assets/imgs/man.png" class="contact-img">
</ion-col>
<ion-col col-10 style="padding-bottom: 5px;border-bottom: 1px solid #eeeeee">
<p class="comment-info">
{{comment?.username}}
</p>
<p class="commnet-content">
{{comment?.content}}
</p>
<p class="comment-time">
{{comment?.createTime | date:'yyyy-MM-dd'}} <span>·</span>
</p>
</ion-col>
</ion-row>
<div class="reply-content">
<ion-row *ngFor="let reply of relpyList">
<ion-col offset-2 col-10>
<ion-row class="comment-item"> <ion-row class="comment-item">
<ion-col col-2> <ion-col col-2>
<img src="./assets/imgs/man.png" class="contact-img"> <ng-container *ngIf="comment?.picUrl && comment?.picUrl != ''">
</ion-col> <img src="{{picture+comment?.picUrl}}" class="contact-img">
<ion-col col-10> </ng-container>
<p class="comment-info"> <ng-container *ngIf="!comment?.picUrl || comment?.picUrl == ''">
{{reply?.username}} <img src="./assets/imgs/man.png" class="contact-img"
</p> *ngIf="comment?.userGender =='1'||comment?.userGender==null">
<p class="commnet-content"> <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="comment?.userGender =='0'">
{{reply?.content}} </ng-container>
</p> </ion-col>
<p class="comment-time"> <ion-col col-10 style="padding-bottom: 5px;border-bottom: 1px solid #eeeeee">
{{reply?.createTime | date:'yyyy-MM-dd'}} <span>·</span> <p class="comment-info">
</p> {{comment?.username}}
</ion-col> </p>
<p class="commnet-content">
{{comment?.content}}
</p>
<p class="comment-time">
{{comment?.createTime | date:'yyyy-MM-dd'}} <span>·</span>
</p>
</ion-col>
</ion-row> </ion-row>
</ion-col> <div class="reply-content">
</ion-row> <ion-row *ngFor="let reply of relpyList">
</div> <ion-col offset-2 col-10>
<ion-row class="comment-item">
<ion-col col-2>
<ng-container *ngIf="reply?.picUrl && reply?.picUrl != ''">
<img src="{{picture+reply?.picUrl}}" style="width: 36px;height: 36px;" class="contact-img">
</ng-container>
<ng-container *ngIf="!reply?.picUrl || reply?.picUrl == ''">
<img src="./assets/imgs/man.png" style="width: 36px;height: 36px;" class="contact-img"
*ngIf="reply?.userGender =='1'||reply?.userGender==null">
<img src="./assets/imgs/woman.png" style="width: 36px;height: 36px;" class="contact-img"
*ngIf="reply?.userGender =='0'">
</ng-container>
</ion-col>
<ion-col col-10>
<p class="comment-info">
{{reply?.username}}
</p>
<p class="commnet-content">
{{reply?.content}}
</p>
<p class="comment-time">
{{reply?.createTime | date:'yyyy-MM-dd'}} <span>·</span>
</p>
</ion-col>
</ion-row>
</ion-col>
</ion-row>
</div>
</div>
<div class="reply">
</div>
</div> </div>
<div class="reply">
</div>
</div>
</div> </div>
src/components/reply/reply.scss
View file @ 5644f15f
...@@ -20,8 +20,9 @@ reply { ...@@ -20,8 +20,9 @@ reply {
} }
.comment-item { .comment-item {
.contact-img{ .contact-img{
border-radius: 100px; border-radius: 50%;
width: 75%; width: 50px;
height: 50px;
text-align: center; text-align: center;
margin-top: 8px; margin-top: 8px;
} }
......
src/components/reply/reply.ts
View file @ 5644f15f
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {NavController, NavParams, ViewController} from "ionic-angular"; import {NavController, NavParams, ViewController} from "ionic-angular";
import {AppService} from "../../service/http.service"; import {AppGlobal, AppService} from "../../service/http.service";
import {TabsService} from "../../pages/tabs/tabs.service"; import {TabsService} from "../../pages/tabs/tabs.service";
@Component({ @Component({
...@@ -12,6 +12,7 @@ export class ReplyComponent { ...@@ -12,6 +12,7 @@ export class ReplyComponent {
comment; comment;
relpyList; relpyList;
replyContent; replyContent;
picture: string = AppGlobal.picture;
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
private tabSer: TabsService, private tabSer: TabsService,
......
src/pages/tabs/discover/discover.scss
View file @ 5644f15f
...@@ -138,6 +138,7 @@ page-discover { ...@@ -138,6 +138,7 @@ page-discover {
max-height: 60px; max-height: 60px;
img { img {
height: 100%;
border-radius: .5rem; border-radius: .5rem;
} }
} }
......
src/pages/tabs/discover/discover.ts
View file @ 5644f15f
...@@ -412,13 +412,18 @@ export class DiscoverPage { ...@@ -412,13 +412,18 @@ export class DiscoverPage {
this.newList = res.data.list; this.newList = res.data.list;
this.newList.forEach(e => { this.newList.forEach(e => {
if (e.attachments && e.attachments.length > 0) { if (e.attachments && e.attachments.length > 0) {
e.path = e.attachments[0].path; if(e.attachments[0].resourceType != 2){
e.resourceType = e.attachments[0].resourceType; e.path = e.attachments[0].path;
e.resourceType = e.attachments[0].resourceType;
}else if(e.attachments.length > 1){
e.path = e.attachments[1].path;
e.resourceType = e.attachments[1].resourceType;
}
} }
}); });
this.swiper.slideTo(this.indexParent, 500); this.swiper.slideTo(this.indexParent, 500);
this.slideList[this.indexParent] = this.newList; this.slideList[this.indexParent] = this.newList;
console.log(this.newList);
this.getMore(res); this.getMore(res);
} }
) )
......
src/service/http.service.ts
View file @ 5644f15f
...@@ -17,8 +17,8 @@ export class AppGlobal { ...@@ -17,8 +17,8 @@ export class AppGlobal {
// static domain = "http://192.168.2.235:8080"; //测试环境 // static domain = "http://192.168.2.235:8080"; //测试环境
// static domain = "http://47.103.33.196:8080"; //阿里云正式地址 // static domain = "http://47.103.33.196:8080"; //阿里云正式地址
// static domain = "http://47.103.35.216:8080"; //阿里云测试地址 // static domain = "http://47.103.35.216:8080"; //阿里云测试地址
static domain = "http://218.78.19.169:8081"; //天翼云测试地址 // static domain = "http://218.78.19.169:8081"; //天翼云测试地址
// static domain = ""; //本地环境 static domain = ""; //本地环境
//图片地址 //图片地址
// static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址 // static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址
......
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