Skip to content

W
wisdom-ces
Commit 6dc26750 authored by wangqinghua's avatar wangqinghua
Browse files
Options

底部按钮 样式调整

parent 0f1e6b82
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 40 deletions
src/pages/home/activity-track/replace-apply/replace-apply.ts
View file @ 6dc26750
......@@ -97,7 +97,7 @@ export class ReplaceApplyPage {
}
//报名
confirmOrder(orderId) {
confirmOrder() {
//验证信息：
/**0.对于暂未有批次的。
1.判断携带人数是否超过限额人数。
......
src/pages/home/activity/batch-detail/batch-detail.html
View file @ 6dc26750
......@@ -32,35 +32,39 @@
</p>
</div>
</div>
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span></div>
<div class="button-right" >
<!--是否报名了>时间是否截止->人数是否满了->-->
<ng-container *ngIf="batch.order">
<span *ngIf="batch.order.orderstate == 1" class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
<span *ngIf="batch.order.orderstate == 2" class="button-btn button-btn1" (click)="reelectBatch()">订单确认</span>
</ng-container>
<ng-container *ngIf="!batch.order">
<!--时间截止-->
<ng-container *ngIf="batch.signUp">
<!--人数满-->
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
<span class="button-btn button-btn3">立即报名</span>
</ng-container>
<!--人数未满-->
<ng-container *ngIf="batch.hasSignUpCount < batch.batchLimitNumber">
<span (click)="goApply()" class="button-btn button-btn1">立即报名</span>
</ng-container>
</ng-container>
<ng-container *ngIf="!batch.signUp">
<span class="button-btn button-btn3">报名截止</span>
</ng-container>
</ng-container>
</div>
</div>
</div>
</ion-content>
</ion-slide>
</ion-slides>
</ion-content>
<ion-footer>
<ion-toolbar style="padding:0px">
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch.hasSignUpCount}}/{{batch.batchLimitNumber}}</span></div>
<div class="button-right" >
<!--是否报名了>时间是否截止->人数是否满了->-->
<ng-container *ngIf="batch.order">
<span *ngIf="batch.order.orderstate == 1" class="button-btn button-btn2" (click)="sureCancelOrder()">取消报名</span>
<span *ngIf="batch.order.orderstate == 2" class="button-btn button-btn1" (click)="reelectBatch()">订单确认</span>
</ng-container>
<ng-container *ngIf="!batch.order">
<!--时间截止-->
<ng-container *ngIf="batch.signUp">
<!--人数满-->
<ng-container *ngIf="batch.hasSignUpCount == batch.batchLimitNumber">
<span class="button-btn button-btn3">立即报名</span>
</ng-container>
<!--人数未满-->
<ng-container *ngIf="batch.hasSignUpCount < batch.batchLimitNumber">
<span (click)="goApply()" class="button-btn button-btn1">立即报名</span>
</ng-container>
</ng-container>
<ng-container *ngIf="!batch.signUp">
<span class="button-btn button-btn3">报名截止</span>
</ng-container>
</ng-container>
</div>
</div>
</ion-toolbar>
</ion-footer>
src/pages/home/activity/batch-detail/batch-detail.scss
View file @ 6dc26750
......@@ -63,7 +63,7 @@ page-batch-detail {
}
.content-item{
font-size: 16px;
padding: 0 20px;
padding: 0 20px 20px 20px;
p{
padding: 10px 0;
span:first-child{
......@@ -79,9 +79,6 @@ page-batch-detail {
}
.content-button{
position: fixed;
bottom: 6px;
left: 0;
display: flex;
align-items: center;
width: 100%;
......
src/pages/home/activity/order-detail/order-detail.html
View file @ 6dc26750
......@@ -31,6 +31,10 @@
<span [innerHtml]='batch.batchNotice' ></span>
</div>
</div>
</div>
</ion-content>
<ion-footer>
<ion-toolbar style="padding:0px;height: 60px;">
<div class="content-button">
<div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span>
</div>
......@@ -45,5 +49,5 @@
</div>
</div>
</div>
</ion-content>
\ No newline at end of file
</ion-toolbar>
</ion-footer>
src/pages/home/activity/order-detail/order-detail.scss
View file @ 6dc26750
......@@ -63,7 +63,7 @@ page-order-detail {
}
.content-item{
font-size: 16px;
padding: 0 20px;
padding: 0 20px 20px 20px;
p{
padding: 10px 0;
span:first-child{
......@@ -79,9 +79,6 @@ page-order-detail {
}
.content-button{
position: fixed;
bottom: 0;
left: 0;
display: flex;
align-items: center;
width: 100%;
......
src/service/http.service.ts
View file @ 6dc26750
......@@ -13,9 +13,9 @@ export class AppGlobal {
};
//接口基地址
static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://180.168.156.212:2931"; //测试环境
// static domain = ""; //本地环境
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