Merge remote-tracking branch 'origin/master'

src/app/app.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
 import {IndexComponent} from "./pages/body/index/index.component";
 import {InitGuardService} from "./utils/initGuard.service";
+import {TRADE_ROUTES} from "./pages/trade/trade.routes";
 export const routes: Routes = [
   {path: '', pathMatch: 'full', redirectTo: 'admin/index'},
   {
@@ -29,6 +30,11 @@ export const routes: Routes = [
         loadChildren: () => import('./pages/merchant/merchant.routes').then(m => m.MERCHANT_ROUTES),
         canActivate: [InitGuardService]
       },
+      {
+        path: 'trade',
+        loadChildren: () => import('./pages/trade/trade.routes').then(m => m.TRADE_ROUTES),
+        canActivate: [InitGuardService]
+      },
       {
         path: 'goods',
         loadChildren: () => import('./pages/goods/goods.routes').then(m => m.GOODS_ROUTES),

src/app/pages/trade/comp-order/comp-order.component.html

@@ -0,0 +1 @@
+<p>comp-order works!</p>

src/app/pages/trade/comp-order/comp-order.component.ts

@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-comp-order',
+  standalone: true,
+  imports: [],
+  templateUrl: './comp-order.component.html',
+  styleUrl: './comp-order.component.less'
+})
+export class CompOrderComponent {
+
+}

src/app/pages/trade/trade.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule
+  ]
+})
+export class TradeModule { }

src/app/pages/trade/trade.routes.ts

@@ -0,0 +1,6 @@
+import { Routes } from '@angular/router';
+import {CompOrderComponent} from "./comp-order/comp-order.component";
+
+export const TRADE_ROUTES: Routes = [
+  { path: 'comp-order', component: CompOrderComponent },
+];

src/environments/environment.ts

@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:9502/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'http://localhost:9504/user/', // 测试环境服务器地址(请求数据地址)
+  userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  imageUrl: 'https://phgcs.dctpay.com/filesystem/',
 
 };