Skip to content

W
wisdom-ces
Commit 8139634a authored by wangqinghua's avatar wangqinghua
Browse files
Options

页面路由返回

parent 2bc44936
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 37 deletions
config.xml
View file @ 8139634a
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter.test" version="4.1.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.smart19.starter.test" version="4.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>党建云平台(测试)</name> <name>党建云平台(测试)</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova 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>
......
src/pages/home/learning/learning-do/learning-do.ts
View file @ 8139634a
...@@ -202,6 +202,7 @@ export class LearningDoPage { ...@@ -202,6 +202,7 @@ export class LearningDoPage {
this.commonSer.toast("提交成功"); this.commonSer.toast("提交成功");
if (this.type == 'reset') { if (this.type == 'reset') {
this.navCtrl.push("ReviewResultPage", { this.navCtrl.push("ReviewResultPage", {
testId:this.testId,
result: res.data, result: res.data,
title: this.title title: this.title
}) })
......
src/pages/home/learning/learning-list/learning-list.html
View file @ 8139634a
...@@ -44,17 +44,17 @@ ...@@ -44,17 +44,17 @@
<span *ngIf="item.testResult != 0" (click)="goToResult(item)" float-right class="look">查看结果</span> <span *ngIf="item.testResult != 0" (click)="goToResult(item)" float-right class="look">查看结果</span>
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right class="join">开始测试</span> <span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right class="join">开始测试</span>
</div> </div>
<div class="content-button padding-15-0 fontSize-15"> <!--<div class="content-button padding-15-0 fontSize-15">-->
<span class="margin-right-10">最高分:<span <!--<span class="margin-right-10">最高分:<span-->
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span> <!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<span class="color-red">{{item.maxNum}}</span> <!--<span class="color-red">{{item.maxNum}}</span>-->
</span> <!--</span>-->
<span>排名:</span> <!--<span>排名:</span>-->
<span *ngIf="!item?.ranking">无</span> <!--<span *ngIf="!item?.ranking">无</span>-->
<span class="color-red">{{item.ranking}}</span> <!--<span class="color-red">{{item.ranking}}</span>-->
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span> <!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
</div> <!--</div>-->
</div> </div>
</ion-item> </ion-item>
</ng-container> </ng-container>
...@@ -97,16 +97,16 @@ ...@@ -97,16 +97,16 @@
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right <span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right
class="join">开始测试</span> class="join">开始测试</span>
</div> </div>
<div class="content-button padding-15-0 fontSize-15"> <!--<div class="content-button padding-15-0 fontSize-15">-->
<span class="margin-right-10">最高分:<span <!--<span class="margin-right-10">最高分:<span-->
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span> <!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<span class="color-red">{{item.maxNum}}</span> <!--<span class="color-red">{{item.maxNum}}</span>-->
</span> <!--</span>-->
<span>排名:</span> <!--<span>排名:</span>-->
<span *ngIf="!item?.ranking">无</span> <!--<span *ngIf="!item?.ranking">无</span>-->
<span class="color-red">{{item.ranking}}</span> <!--<span class="color-red">{{item.ranking}}</span>-->
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span> <!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
</div> <!--</div>-->
</div> </div>
</ion-item> </ion-item>
</ng-container> </ng-container>
...@@ -150,16 +150,16 @@ ...@@ -150,16 +150,16 @@
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right <span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right
class="join">开始测试</span> class="join">开始测试</span>
</div> </div>
<div class="content-button padding-15-0 fontSize-15"> <!--<div class="content-button padding-15-0 fontSize-15">-->
<span class="margin-right-10">最高分:<span <!--<span class="margin-right-10">最高分:<span-->
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span> <!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<span class="color-red">{{item.maxNum}}</span> <!--<span class="color-red">{{item.maxNum}}</span>-->
</span> <!--</span>-->
<span>排名:</span> <!--<span>排名:</span>-->
<span *ngIf="!item?.ranking">无</span> <!--<span *ngIf="!item?.ranking">无</span>-->
<span class="color-red">{{item.ranking}}</span> <!--<span class="color-red">{{item.ranking}}</span>-->
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span> <!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
</div> <!--</div>-->
</div> </div>
</ion-item> </ion-item>
</ng-container> </ng-container>
......
src/pages/home/learning/review-result/review-result.ts
View file @ 8139634a
...@@ -29,6 +29,7 @@ export class ReviewResultPage { ...@@ -29,6 +29,7 @@ export class ReviewResultPage {
} }
ionViewDidLoad() { ionViewDidLoad() {
this.testId = this.navParams.get('testId');
this.result = this.navParams.get('result'); this.result = this.navParams.get('result');
this.title = this.navParams.get('title'); this.title = this.navParams.get('title');
let c = this.result.score / this.result.fullmarks; let c = this.result.score / this.result.fullmarks;
......
src/service/appHttpService.ts
View file @ 8139634a
...@@ -13,18 +13,18 @@ export class AppGlobal { ...@@ -13,18 +13,18 @@ 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 = "http://180.168.156.212:2931"; //测试环境
// static domain = ""; //本地环境 // static domain = ""; //本地环境
//图片地址 //图片地址
// static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/"; //正式地址 static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/"; //正式地址
static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/"; //测试 // static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/"; //测试
//通知公告图片参数 //通知公告图片参数
// static pictureNotice = "http://101.89.112.92:80"; //正式地址 static pictureNotice = "http://101.89.112.92:80"; //正式地址
static pictureNotice = "http://180.168.156.212:2931"; //测试 // static pictureNotice = "http://180.168.156.212:2931"; //测试
//接口地址 //接口地址
static API: any = { static API: any = {
......
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