Skip to content

Commit fa567b5

Browse files
he-shilianghe-shiliang
committed
修改缘分页面及添加空白提示组件
2 parents 1d0a1ad + d365187 commit fa567b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+945
-154
lines changed

‎config.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@
100100
<allow-navigation href="http://192.168.211.1:8102" />
101101
<allow-navigation href="http://192.168.0.103:8102" />
102102
<allow-navigation href="http://192.168.0.105:8101" />
103-
<allow-navigation href="http://192.168.0.105:8102" />
104-
<engine name="android" spec="^6.2.3" />
105-
<engine name="ios" spec="~4.4.0" />
106103
<plugin name="com.synconset.imagepicker" spec="^2.1.10">
107104
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="是否允许访问您的相册" />
108105
</plugin>
@@ -113,11 +110,16 @@
113110
<plugin name="cordova-plugin-camera" spec="^2.4.1" />
114111
<plugin name="cordova-plugin-console" spec="^1.1.0" />
115112
<plugin name="cordova-plugin-device" spec="^1.1.7" />
116-
<plugin name="cordova-plugin-file" spec="^4.3.3" />
117-
<plugin name="cordova-plugin-file-transfer" spec="^1.7.0" />
118113
<plugin name="cordova-plugin-splashscreen" spec="^4.1.0" />
119114
<plugin name="cordova-plugin-statusbar" spec="^2.3.0" />
120115
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
121116
<plugin name="cordova-sqlite-storage" spec="^2.1.4" />
122117
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
118+
<allow-navigation href="http://192.168.0.105:8102" />
119+
<plugin name="cordova-plugin-shake" spec="^0.6.0" />
120+
<plugin name="com.hutchind.cordova.plugins.streamingmedia" spec="~0.1.4" />
121+
<engine name="android" spec="^6.2.3" />
122+
<engine name="ios" spec="~4.4.0" />
123+
<plugin name="cordova-plugin-file" spec="^4.3.3" />
124+
<plugin name="cordova-plugin-file-transfer" spec="^1.7.0" />
123125
</widget>

‎package-lock.json

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@
2929
"@ionic-native/file-transfer": "^4.5.2",
3030
"@ionic-native/image-picker": "^4.5.2",
3131
"@ionic-native/network": "^4.5.0",
32+
"@ionic-native/shake": "^4.5.2",
3233
"@ionic-native/splash-screen": "4.3.2",
3334
"@ionic-native/status-bar": "4.3.2",
35+
"@ionic-native/streaming-media": "^4.5.2",
36+
"@ionic-native/video-player": "^4.5.2",
3437
"@ionic/storage": "^2.1.3",
3538
"com.synconset.imagepicker": "^2.1.10",
3639
"cordova-alipay-base": "file:node_modules/cordova-alipay-base",
@@ -43,10 +46,13 @@
4346
"cordova-plugin-compat": "^1.2.0",
4447
"cordova-plugin-console": "^1.1.0",
4548
"cordova-plugin-device": "^1.1.7",
49+
"cordova-plugin-device-motion": "^2.0.0",
4650
"cordova-plugin-file": "^4.3.3",
4751
"cordova-plugin-file-transfer": "^1.7.0",
52+
"cordova-plugin-shake": "^0.6.0",
4853
"cordova-plugin-splashscreen": "^4.1.0",
4954
"cordova-plugin-statusbar": "^2.3.0",
55+
"cordova-plugin-streaming-media": "^1.0.2",
5056
"cordova-plugin-telerik-imagepicker": "^2.1.8",
5157
"cordova-plugin-whitelist": "^1.3.3",
5258
"cordova-sqlite-storage": "^2.1.4",
@@ -87,7 +93,9 @@
8793
"cordova-plugin-alipay-v2": {
8894
"APP_ID": "2017113000260632"
8995
},
96+
"cordova-plugin-shake": {},
97+
"com.hutchind.cordova.plugins.streamingmedia": {},
9098
"cordova-plugin-file-transfer": {}
9199
}
92100
}
93-
}
101+
}

‎src/app/app.component.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { Component, Input,ViewChild } from '@angular/core';
2-
import { Platform, Nav ,IonicApp, Keyboard} from 'ionic-angular';
2+
import { Platform, Nav ,IonicApp, Keyboard, Events} from 'ionic-angular';
33
import { StatusBar } from '@ionic-native/status-bar';
44
import { SplashScreen } from '@ionic-native/splash-screen';
55
import {PopProvider} from "../providers/pop";
66
import {TabsPage} from "../pages/tabs/tabs";
77
import { AppConfig } from "./app.config";
8+
import {Shake} from "@ionic-native/shake";
89

910

1011
@Component({
@@ -23,6 +24,7 @@ export class MyApp {
2324
public statusBar: StatusBar,
2425
public splashScreen: SplashScreen,
2526
public pop:PopProvider,
27+
public events:Events,
2628
public keyboard:Keyboard
2729
) {
2830

@@ -31,14 +33,19 @@ export class MyApp {
3133
// Here you can do any higher level native things you might need.
3234
statusBar.styleDefault();
3335
splashScreen.hide();
36+
this.events.subscribe("loginStatus",(status) => {
37+
this.loginStatus = status;
38+
});
3439
this.registerBackButtonAction();
3540
});
36-
console.log(AppConfig.getLoginStatus())
37-
38-
this.loginStatus = AppConfig.loginStatus;
39-
console.log(this.loginStatus)
4041
}
41-
registerBackButtonAction() {
42+
43+
44+
45+
46+
47+
48+
registerBackButtonAction() {
4249
this.platform.registerBackButtonAction(() => {
4350
if(this.keyboard.isOpen()){
4451
this.keyboard.close();

‎src/app/app.module.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ import { GoodsProvider } from '../providers/goods';
3737
import { UtilsProvider } from '../providers/utils/utils';
3838
import { OrderProvider } from '../providers/order';
3939
import { PincodeInputModule } from 'ionic2-pincode-input';
40+
import {Shake} from "@ionic-native/shake";
41+
import {VideoPlayer} from "@ionic-native/video-player";
42+
import {StreamingMedia} from "@ionic-native/streaming-media";
43+
import { ChatProvider } from '../providers/chat/chat';
4044
@NgModule({
4145
declarations: [
4246
MyApp
@@ -89,7 +93,11 @@ import { PincodeInputModule } from 'ionic2-pincode-input';
8993
FindProvider,
9094
GoodsProvider,
9195
UtilsProvider,
92-
OrderProvider
96+
OrderProvider,
97+
Shake,
98+
VideoPlayer,
99+
StreamingMedia,
100+
ChatProvider
93101
]
94102
})
95103
export class AppModule {

‎src/assets/data.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -879,30 +879,30 @@
879879
},
880880
"luckPerson":[
881881
{
882-
"avatar":"./assets/images/company/mingpian.jpg",
882+
"avatar":"./assets/images/avatar/1.png",
883883
"status":1,
884-
"out":"11000",
884+
"in":"11000",
885885
"send":"12121",
886-
"name":"廖丹霞",
887-
"company":"Gworld科技有限公司",
886+
"name":"徐克",
887+
"company":"著名导演、制片人",
888888
"job":"总裁助理"
889889
},
890890
{
891-
"avatar":"./assets/images/company/jieshao.jpg",
891+
"avatar":"./assets/images/avatar/2.png",
892892
"status":0,
893-
"out":"5656",
893+
"in":"5656",
894894
"send":"232",
895895
"name":"廖丹霞",
896896
"company":"Gworld科技有限公司",
897897
"job":"总裁助理"
898898
},
899899
{
900-
"avatar":"./assets/images/company/fuwu.jpg",
900+
"avatar":"./assets/images/avatar/3.png",
901901
"status":1,
902-
"out":"54545",
902+
"in":"54545",
903903
"send":"6644",
904-
"name":"廖丹霞",
905-
"company":"Gworld科技有限公司",
904+
"name":"成龙",
905+
"company":"功夫巨星",
906906
"job":"总裁助理"
907907
}
908908
],

‎src/assets/images/face.png

8.64 KB
Loading

‎src/assets/images/live.png

58 KB
Loading

‎src/components/blank/blank.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!-- Generated template for the BlankComponent component -->
2+
<section class="blank-box">
3+
<div class="blank-icon">
4+
<ion-icon class="iconfont icon-meiyouneirong" *ngIf="type == ''"></ion-icon>
5+
<ion-icon class="iconfont icon-konggouwuche" *ngIf="type == 'cart'"></ion-icon>
6+
</div>
7+
<p class="tip" *ngIf="type == ''">{{tip}}<span *ngIf="btnText != ''" (tap)="toShop()">，<b>{{btnText}}</b></span></p>
8+
<p class="tip" *ngIf="type == 'cart'">{{tip}}<span *ngIf="btnText != ''" (tap)="toShop()">，<b>{{btnText}}</b></span></p>
9+
</section>

‎src/components/blank/blank.module.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { NgModule } from "@angular/core";
2+
import { IonicPageModule } from "ionic-angular";
3+
import { BlankComponent} from "./blank";
4+
5+
@NgModule ({
6+
declarations: [
7+
BlankComponent
8+
],
9+
imports: [
10+
IonicPageModule.forChild(BlankComponent),
11+
],
12+
exports: [
13+
BlankComponent
14+
]
15+
})
16+
export class BlankModule {
17+
18+
}

‎src/components/blank/blank.scss

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
blank {
2+
.blank-box{
3+
@include position(absolute,0,0,0,0);
4+
width:80%;
5+
height: 150px;
6+
margin: auto;
7+
.blank-icon{
8+
ion-icon{
9+
font-size: 100px;
10+
display: block;
11+
text-align: center;
12+
color: #ccc;
13+
}
14+
}
15+
p{
16+
text-align: center;
17+
color: #333;
18+
span{
19+
b{
20+
color:#FA6B5B;
21+
border: 1px solid #FA6B5B;
22+
@include radius(4px);
23+
font-size: 12px;
24+
padding: 4px;
25+
}
26+
}
27+
}
28+
}
29+
}

‎src/components/blank/blank.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { Component , Input} from '@angular/core';
2+
import {NavController} from "ionic-angular";
3+
4+
/**
5+
* Generated class for the BlankComponent component.
6+
*
7+
* See https://angular.io/api/core/Component for more info on Angular
8+
* Components.
9+
*/
10+
@Component({
11+
selector: 'blank',
12+
templateUrl: 'blank.html'
13+
})
14+
export class BlankComponent {
15+
16+
text: string;
17+
@Input() type:string = "";
18+
@Input() tip:string = "";
19+
@Input() btnText:string = "";
20+
constructor(
21+
public navCtrl:NavController
22+
) {
23+
console.log('Hello BlankComponent Component');
24+
this.text = 'Hello World';
25+
}
26+
// 跳转至商城
27+
public toShop(){
28+
this.navCtrl.push("ShopPage");
29+
}
30+
}

‎src/components/components.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import {PublishModule} from "./publish/publish.module";
2424
import { ChatSendModule } from './chat-send/chat-send.module';
2525
import {ReviewModule} from "./review/review.module";
2626
import { TouCommentModule } from './tou-comment/tou-comment.module';
27+
import { LuckListModule } from './luck-list/luck-list.module';
28+
import { BlankModule } from './blank/blank.module';
2729

2830
@NgModule({
2931
declarations: [],
@@ -54,6 +56,8 @@ import { TouCommentModule } from './tou-comment/tou-comment.module';
5456
ChatSendModule,
5557
ReviewModule,
5658
TouCommentModule,
59+
LuckListModule,
60+
BlankModule,
5761
]
5862
})
5963
export class ComponentsModule {

0 commit comments

Comments
 (0)