Commit 846a7276 authored by wangqinghua's avatar wangqinghua

update

parent e98f3472
#Tue Aug 13 20:47:29 CST 2019 #Wed Aug 14 13:22:58 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
<ion-header> <ion-navbar> <ion-title>申领评价</ion-title> </ion-navbar> </ion-header> <ion-content> <div class="order"><!-- <div class="orderTips">--><!-- <p>--><!-- <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>--><!-- <p>--><!-- <span>申请人:{{item.applicantName}}</span>--><!-- <span float-right>申请部门:{{item.orgName}}</span>--><!-- </p>--><!-- </div>--> <div class="goodsList"> <ng-container *ngFor="let goods of goodsList;let gi = index;"> <div class="goodsItem"> <div class="goods-img"> <img [src]="picture + goods.url"> </div> <div class="goods-info"> <p class="model"> {{goods.brand}}&nbsp;&nbsp;&nbsp; <span>{{goods.model}}</span> </p> <p class="img-star"> <ng-container *ngFor="let star of goods.starList;let i = index;"> <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span> </ng-container><!-- <span class="score">{{goods.score}}分</span>--> </p> </div> </div> </ng-container> </div> </div> <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content> <ion-header> <ion-navbar> <ion-title>申领评价</ion-title> </ion-navbar> </ion-header> <ion-content> <div class="order"> <div class="goodsList"> <ng-container *ngFor="let goods of goodsList;let gi = index;"> <div class="goodsItem"> <div class="goods-img"> <img [src]="picture + goods.url"> </div> <div class="goods-info"> <p class="model"> {{goods.brand}}&nbsp;&nbsp;&nbsp; <span>{{goods.model}}</span> </p> <p class="img-star"> <ng-container *ngFor="let star of goods.starList;let i = index;"> <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span> </ng-container> </p> </div> </div> </ng-container> </div> </div> <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content>
\ No newline at end of file \ No newline at end of file
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
</div> </div>
<div class="type-div"> <div class="type-div">
<div class="type-list"> <div class="type-list">
<div class="scroll-tab"> <div class="scroll-tab">
<div class="news-content parent"> <div class="news-content parent">
<div class="tabs-parent parent"> <div class="tabs-parent parent">
<div *ngFor="let item of typeList;" (click)="filterType(item)" class="tabs-children"> <div *ngFor="let item of typeList;" (click)="filterType(item)" class="tabs-children">
<span #tabSpan [ngStyle]="{'color':obj.type == item.type?'#e42417':''}"> <span #tabSpan [ngStyle]="{'color':obj.type == item.type?'#e42417':''}">
{{item.name}} {{item.name}}
</span> </span>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<ng-container *ngFor="let item of goodsList"> <ng-container *ngFor="let item of goodsList">
<div class="goodsItem" (click)="choose(item)"> <div class="goodsItem" (click)="choose(item)">
<div class="item-img" > <div class="item-img" (click)="previewImg(item,$event)">
<img [src]="picture + item.url"> <img [src]="picture + item.url">
</div> </div>
<div class="item-info"> <div class="item-info">
...@@ -72,11 +72,10 @@ ...@@ -72,11 +72,10 @@
</div> </div>
<div class="item-icon"> <div class="item-icon">
<div class="img-star"> <div class="img-star">
<span class="icon iconfont icon-star-fill"></span> <ng-container *ngFor="let st of starList;let i = index">
<span class="icon iconfont icon-star-fill"></span> <span [ngClass]=" item.score > i?'icon-star-fill':'icon-star' "
<span class="icon iconfont icon-star-fill"></span> class="icon iconfont "></span>
<span class="icon iconfont icon-star"></span> </ng-container>
<span class="icon iconfont icon-star"></span>
</div> </div>
<div class="img-cart"> <div class="img-cart">
<span style="font-size: 2rem" class="icon iconfont icon-cart"></span> <span style="font-size: 2rem" class="icon iconfont icon-cart"></span>
...@@ -93,9 +92,9 @@ ...@@ -93,9 +92,9 @@
</ion-content> </ion-content>
<div *ngIf="preview.showPreView" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;"> <div *ngIf="preview.showPreView" class="imgPreview">
<img style="position: absolute; <img src="{{preview.preImgSrc}}" alt="">
top: 50%; <span (click)="closePreview()" class="icon-close">
left: 50%; <ion-icon name="close"></ion-icon>
transform: translate(-50%, -50%);" src="{{preview.preImgSrc}}" alt=""> </span>
</div> </div>
...@@ -102,7 +102,8 @@ page-goods-collect { ...@@ -102,7 +102,8 @@ page-goods-collect {
flex-direction: column; flex-direction: column;
flex-flow: column; flex-flow: column;
color: #facd70; color: #facd70;
span{
span {
font-size: 2rem; font-size: 2rem;
} }
} }
...@@ -132,4 +133,38 @@ page-goods-collect { ...@@ -132,4 +133,38 @@ page-goods-collect {
position: relative; position: relative;
background-color: #ffffff; background-color: #ffffff;
} }
.imgPreview {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, .3);
img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 70%;
}
.icon-close {
position: absolute;
top: 80%;
left: 50%;
-webkit-transform: translate(-50%, -60%);
transform: translate(-50%, -80%);
color: #fff;
font-size: 5rem;
background-color: rgba(0,0,0,.5);
display: inline-block;
height: 5rem;
width: 5rem;
text-align: center;
border-radius: 100%;
line-height: 8px;
}
}
} }
...@@ -42,8 +42,9 @@ export class GoodsCollectPage { ...@@ -42,8 +42,9 @@ export class GoodsCollectPage {
preview = { preview = {
showPreView: false, showPreView: false,
preImgSrc:'' preImgSrc: ''
} };
starList = new Array(5);
picture = AppGlobal.picture; picture = AppGlobal.picture;
...@@ -62,6 +63,11 @@ export class GoodsCollectPage { ...@@ -62,6 +63,11 @@ export class GoodsCollectPage {
); );
} }
ionViewDidLeave() {
this.preview.showPreView = false;
this.preview.preImgSrc = null;
}
search() { search() {
this.pageNumber = 1; this.pageNumber = 1;
this.getList(); this.getList();
...@@ -182,6 +188,11 @@ export class GoodsCollectPage { ...@@ -182,6 +188,11 @@ export class GoodsCollectPage {
console.log(this.preview.preImgSrc); console.log(this.preview.preImgSrc);
} }
closePreview() {
this.preview.showPreView = false;
this.preview.preImgSrc = null;
}
//选择规格 数量 //选择规格 数量
choose(item) { choose(item) {
let modal = this.modalCtrl.create(SpcesComponent, {goodsId: item.id}); let modal = this.modalCtrl.create(SpcesComponent, {goodsId: item.id});
......
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