hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并自建站代码到话费修改

Browse Source
pull/1/head
袁野 2 years ago
parent 206ed23c38
commit f2b4af9894
6 changed files with 160 additions and 132 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/admin/order/oil-station-order/oil-station-order.component.ts
  2. 4
      src/app/app-common.module.ts
  3. 270
      src/app/app-routing.module.ts
  4. 1
      src/app/pipes/index.ts
  5. 14
      src/app/services/commons.service.ts
  6. 1
      src/app/services/order.service.ts

2
src/app/admin/order/oil-station-order/oil-station-order.component.ts
Unescape View File

@ -11,7 +11,7 @@ import {LocalStorageService} from '../../../services/local-storage.service';
import {CommonsService} from '../../../services/commons.service'; import {CommonsService} from '../../../services/commons.service';
import {WebsocketService} from '../../../services/websocket.service'; import {WebsocketService} from '../../../services/websocket.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {MerchantStoreService} from "../../../services/merchant-store.service"; import {MerchantStoreService} from '../../../services/merchant-store.service';
@Component({ @Component({
selector: 'app-oil-station-order', selector: 'app-oil-station-order',

4
src/app/app-common.module.ts
Unescape View File

@ -47,7 +47,8 @@ import {
PriceStatusPipe, PriceStatusPipe,
GasStaffStatusPipe, GasStaffStatusPipe,
PayStatusPipe, PayStatusPipe,
ChlidRechargeStatusPipe ChlidRechargeStatusPipe,
SourceTypePipe
} from './pipes'; } from './pipes';
import {OilCardStatusPipe} from './pipes'; import {OilCardStatusPipe} from './pipes';
import {OilTypePipe} from './pipes/store/oil-type.pipe'; import {OilTypePipe} from './pipes/store/oil-type.pipe';
@ -100,6 +101,7 @@ const PIPES = [
OilPriceTaskPriceTypePipe, OilPriceTaskPriceTypePipe,
PayStatusPipe, PayStatusPipe,
ChlidRechargeStatusPipe, ChlidRechargeStatusPipe,
SourceTypePipe,
]; ];

270
src/app/app-routing.module.ts
Unescape View File

@ -4,139 +4,149 @@ import {NavigationComponent} from './admin/navigation/navigation.component';
import {InitGuardService} from './services/init-guard.service'; import {InitGuardService} from './services/init-guard.service';
const routes: Routes = [ const routes: Routes = [
{path: '', pathMatch: 'full', redirectTo: 'adminLogin'}, {path: '', pathMatch: 'full', redirectTo: 'adminLogin'},
{ {
path: 'adminLogin', path: 'adminLogin',
loadChildren: () => import('./admin/login/login.module').then(m => m.LoginModule) loadChildren: () => import('./admin/login/login.module').then(m => m.LoginModule)
}, },
{ {
path: 'admin', component: NavigationComponent, path: 'admin', component: NavigationComponent,
children: [ children: [
{ {
path: 'index', path: 'index',
loadChildren: () => import('./admin/index/index.module').then(m => m.IndexModule), loadChildren: () => import('./admin/index/index.module').then(m => m.IndexModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'user', path: 'user',
loadChildren: () => import('./admin/user/user.module').then(m => m.UserModule), loadChildren: () => import('./admin/user/user.module').then(m => m.UserModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'merchant', path: 'merchant',
loadChildren: () => import('./admin/merchant/merchant.module').then(m => m.MerchantModule), loadChildren: () => import('./admin/merchant/merchant.module').then(m => m.MerchantModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'merchantStore', path: 'merchantStore',
loadChildren: () => import('./admin/merchant-store/merchant-store.module').then(m => m.MerchantStoreModule), loadChildren: () => import('./admin/merchant-store/merchant-store.module').then(m => m.MerchantStoreModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'coupon', path: 'coupon',
loadChildren: () => import('./admin/coupon/coupon.module').then(m => m.CouponModule), loadChildren: () => import('./admin/coupon/coupon.module').then(m => m.CouponModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'company', path: 'company',
loadChildren: () => import('./admin/company/company.module').then(m => m.CompanyModule), loadChildren: () => import('./admin/company/company.module').then(m => m.CompanyModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'price', path: 'price',
loadChildren: () => import('./admin/price/price.module').then(m => m.PriceModule), loadChildren: () => import('./admin/price/price.module').then(m => m.PriceModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'audit', path: 'audit',
loadChildren: () => import('./admin/audit/audit.module').then(m => m.AuditModule), loadChildren: () => import('./admin/audit/audit.module').then(m => m.AuditModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'order', path: 'order',
loadChildren: () => import('./admin/order/order.module').then(m => m.OrderModule), loadChildren: () => import('./admin/order/order.module').then(m => m.OrderModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'discount', path: 'discount',
loadChildren: () => import('./admin/discount/discount.module').then(m => m.DiscountModule), loadChildren: () => import('./admin/discount/discount.module').then(m => m.DiscountModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'system', path: 'system',
loadChildren: () => import('./admin/system/system.module').then(m => m.SystemModule), loadChildren: () => import('./admin/system/system.module').then(m => m.SystemModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'agent', path: 'agent',
loadChildren: () => import('./admin/agent/agent.module').then(m => m.AgentModule), loadChildren: () => import('./admin/agent/agent.module').then(m => m.AgentModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'rechargeOrder', path: 'rechargeOrder',
loadChildren: () => import('./admin/recharge-order/recharge-order.module').then(m => m.RechargeOrderModule), loadChildren: () => import('./admin/recharge-order/recharge-order.module').then(m => m.RechargeOrderModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'cms', path: 'cms',
loadChildren: () => import('./admin/cms/cms.module').then(m => m.CmsModule), loadChildren: () => import('./admin/cms/cms.module').then(m => m.CmsModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'activate', path: 'activate',
loadChildren: () => import('./admin/activate/activate.module').then(m => m.ActivateModule), loadChildren: () => import('./admin/activate/activate.module').then(m => m.ActivateModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'config-manage', path: 'config-manage',
loadChildren: () => import('./admin/config-manage/config-manage.module').then(m => m.ConfigManageModule), loadChildren: () => import('./admin/config-manage/config-manage.module').then(m => m.ConfigManageModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'discount-package', path: 'discount-package',
loadChildren: () => import('./admin/discount-package/discount-package.module').then(m => m.DiscountPackageModule), loadChildren: () => import('./admin/discount-package/discount-package.module').then(m => m.DiscountPackageModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'tuanyou-agent', path: 'tuanyou-agent',
loadChildren: () => import('./admin/tuanyou-agent/tuanyou-agent.module').then(m => m.TuanyouAgentModule), loadChildren: () => import('./admin/tuanyou-agent/tuanyou-agent.module').then(m => m.TuanyouAgentModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'company-amount', path: 'company-amount',
loadChildren: () => import('./admin/company-amount/company-amount.module').then(m => m.CompanyAmountModule), loadChildren: () => import('./admin/company-amount/company-amount.module').then(m => m.CompanyAmountModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'oil-card', path: 'oil-card',
loadChildren: () => import('./admin/oil-card/oil-card.module').then(m => m.OilCardModule), loadChildren: () => import('./admin/oil-card/oil-card.module').then(m => m.OilCardModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'gz-sinopec', path: 'gz-sinopec',
loadChildren: () => import('./admin/gz-sinopec/gz-sinopec.module').then(m => m.GzSinopecModule), loadChildren: () => import('./admin/gz-sinopec/gz-sinopec.module').then(m => m.GzSinopecModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'gas-staff', path: 'gas-staff',
loadChildren: () => import('./admin/gas-staff/gas-staff.module').then(m => m.GasStaffModule), loadChildren: () => import('./admin/gas-staff/gas-staff.module').then(m => m.GasStaffModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{ {
path: 'gas-oil-price', path: 'gas-oil-price',
loadChildren: () => import('./admin/gas-oil-price/gas-oil-price.module').then(m => m.GasOilPriceModule), loadChildren: () => import('./admin/gas-oil-price/gas-oil-price.module').then(m => m.GasOilPriceModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
], {
}, path: 'api-product',
loadChildren: () => import('./admin/api-product/api-product.module').then(m => m.ApiProductModule),
canActivate: [InitGuardService]
},
{
path: 'api-merchants',
loadChildren: () => import('./admin/api-merchants/api-merchants.module').then(m => m.ApiMerchantsModule),
canActivate: [InitGuardService]
},
],
},
]; ];
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes)],
exports: [RouterModule], exports: [RouterModule],
providers: [ providers: [
// { provide: RouteReuseStrategy, useClass: RouteStrategyService } // { provide: RouteReuseStrategy, useClass: RouteStrategyService }
], ],
}) })
export class AppRoutingModule { export class AppRoutingModule {
} }

1
src/app/pipes/index.ts
Unescape View File

@ -37,3 +37,4 @@ export * from './recharge-price/recharge-platform.pipe';
export * from './recharge-price/price-status.pipe'; export * from './recharge-price/price-status.pipe';
export * from './pay-status.pipe'; export * from './pay-status.pipe';
export * from './chlid-recharge-status.pipe'; export * from './chlid-recharge-status.pipe';
export * from './apiMerchant/source-type.pipe';

14
src/app/services/commons.service.ts
Unescape View File

@ -388,4 +388,18 @@ export class CommonsService {
}); });
} }
/**
* 发送充值短信验证码
*
* @param phone 手机号
* @param merchantId 手机号
* @param price 手机号
* @param callBack 回调
*/
public sendRechargeSmsCode(phone: string, merchantId: number, price: string, callBack) {
this.http.get(environment.baseUrl + 'sendSms/sendRechargeSmsCodeByMchId?phone=' + phone + '&merchantId=' + merchantId + '&price=' + price).subscribe(data => {
callBack(data);
});
}
} }

1
src/app/services/order.service.ts
Unescape View File

@ -8,6 +8,7 @@ import {CommonsService} from './commons.service';
}) })
export class OrderService { export class OrderService {
constructor( constructor(
private http: HttpClient, private http: HttpClient,
private common: CommonsService private common: CommonsService

Write Preview
Loading…
Cancel
Save