From 33b1b351c798fe1bf708f89cbad9ce0c5cfd5c00 Mon Sep 17 00:00:00 2001
From: 199901012 <hurui@shinwoten.com>
Date: Wed, 10 Mar 2021 23:10: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

---
 .gitignore                                    | 48 +++++++++++++++++++
 .../system-role/system-role.component.html    |  5 +-
 src/environments/environment.ts               |  9 ++--
 3 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7c44974
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+/src/assets/node_modules/
+
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/src/app/admin/system/system-role/system-role.component.html b/src/app/admin/system/system-role/system-role.component.html
index f3f6251..84e9482 100644
--- a/src/app/admin/system/system-role/system-role.component.html
+++ b/src/app/admin/system/system-role/system-role.component.html
@@ -46,8 +46,9 @@
       <td>{{data.roleName}}</td>
       <td>
         <span *ngIf="data.roleType == 0">超级管理员</span>
-        <span *ngIf="data.roleType == 1">就业局</span>
-        <span *ngIf="data.roleType == 2">培训机构</span>
+        <span *ngIf="data.roleType == 1">运营中心</span>
+        <span *ngIf="data.roleType == 2">商户角色</span>
+        <span *ngIf="data.roleType == 3">门店角色</span>
       </td>
       <td>{{data.roleDesc}}</td>
       <td>
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 9f5fb23..45beb4f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -9,11 +9,10 @@ export const environment = {
   // imageUrl: 'http://manager.shinwoten.cn/filesystem/',
   // baseUrl: 'http://localhost:8301/crest/', // 测试环境服务器地址(请求数据地址)
   // baseUrl: 'https://newtalent.shinwoten.cn/crest/',
-
-  // baseUrl: 'https://192.168.3.5:8301/crest/',
-  // baseUrl: 'http://localhost:8301/crest/', // 测试环境服务器地址(请求数据地址)
-  baseUrl: 'https://newtalent.shinwoten.cn/crest/',
-  imageUrl: 'https://newtalent.shinwoten.cn/filesystem/',
+  // baseUrl: 'http://localhost:9302/brest/',
+  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+   baseUrl: 'http://localhost:9302/brest/',
+   imageUrl: 'http://localhost:9302/filesystem/',
 
 
 };