From 2a0bfec1df0b3a00154641528c4dd8795731e336 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Thu, 9 May 2024 11:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/app.routes.ts                                |  6 ++++++
 .../pages/goods/goods-type/goods-type.component.ts   |  2 --
 .../pages/trade/comp-order/comp-order.component.html |  1 +
 .../pages/trade/comp-order/comp-order.component.less |  0
 .../pages/trade/comp-order/comp-order.component.ts   | 12 ++++++++++++
 src/app/pages/trade/trade.module.ts                  | 12 ++++++++++++
 src/app/pages/trade/trade.routes.ts                  |  6 ++++++
 src/environments/environment.ts                      |  8 ++++----
 8 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 src/app/pages/trade/comp-order/comp-order.component.html
 create mode 100644 src/app/pages/trade/comp-order/comp-order.component.less
 create mode 100644 src/app/pages/trade/comp-order/comp-order.component.ts
 create mode 100644 src/app/pages/trade/trade.module.ts
 create mode 100644 src/app/pages/trade/trade.routes.ts

diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index b08136e..54eb13b 100644
--- a/src/app/app.routes.ts
+++ b/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),
diff --git a/src/app/pages/goods/goods-type/goods-type.component.ts b/src/app/pages/goods/goods-type/goods-type.component.ts
index 64f3766..ec88c62 100644
--- a/src/app/pages/goods/goods-type/goods-type.component.ts
+++ b/src/app/pages/goods/goods-type/goods-type.component.ts
@@ -4,8 +4,6 @@ import {NzButtonComponent} from "ng-zorro-antd/button";
 import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
 import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
 import {NzInputDirective} from "ng-zorro-antd/input";
-import {NzMessageService} from "ng-zorro-antd/message";
-import {NzModalService} from "ng-zorro-antd/modal";
 import {NgForOf} from "@angular/common";
 import {goodsTypeSearch} from "../../../data/goods/goods.namespace";
 import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
diff --git a/src/app/pages/trade/comp-order/comp-order.component.html b/src/app/pages/trade/comp-order/comp-order.component.html
new file mode 100644
index 0000000..7b63dfe
--- /dev/null
+++ b/src/app/pages/trade/comp-order/comp-order.component.html
@@ -0,0 +1 @@
+<p>comp-order works!</p>
diff --git a/src/app/pages/trade/comp-order/comp-order.component.less b/src/app/pages/trade/comp-order/comp-order.component.less
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/trade/comp-order/comp-order.component.ts b/src/app/pages/trade/comp-order/comp-order.component.ts
new file mode 100644
index 0000000..77dbfe8
--- /dev/null
+++ b/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 {
+
+}
diff --git a/src/app/pages/trade/trade.module.ts b/src/app/pages/trade/trade.module.ts
new file mode 100644
index 0000000..c3b8ecf
--- /dev/null
+++ b/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 { }
diff --git a/src/app/pages/trade/trade.routes.ts b/src/app/pages/trade/trade.routes.ts
new file mode 100644
index 0000000..d4cee95
--- /dev/null
+++ b/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 },
+];
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 69c0948..de1db83 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:9502/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'http://localhost:9504/user/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://phgcs.dctpay.com/filesystem/',
 
 };