From 32925d0d66cb7511eac8d6a9ef0a28e14b2d91e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 25 Nov 2019 22:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          | 2 +-
 erp_web/js/modules/sys/sysIndex.js | 2 +-
 erp_web/pages/manage/user.html     | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 64f847e8a..15c891e6f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 * 很多人说华夏ERP（英文名：jshERP）是目前唯一完整开源的进销存系统
 * 虽然目前只有进销存+财务的功能，但后面将会推出ERP的全部功能，大家一起努力吧
 * 官网地址：[https://www.huaxiaerp.com](https://www.huaxiaerp.com)，演示账号：jsh，密码：123456
-* **商家入驻通道：[https://www.huaxiaerp.com/register.html](https://www.huaxiaerp.com/register.html) 欢迎注册，免费试用** 
+* **商家入驻通道：[https://www.huaxiaerp.com/register.html](https://www.huaxiaerp.com/register.html) 欢迎注册使用** 
 * 商务合作-请联系QQ：514869858，技术交流-请联系QQ：752718920
 * 欢迎加入华夏ERP交流QQ群，群1：120725710(满)、群2：732152262
 * 系统默认租户账号：jsh，默认超管账户：admin，默认密码均为：123456
diff --git a/erp_web/js/modules/sys/sysIndex.js b/erp_web/js/modules/sys/sysIndex.js
index 7e2b562d6..14028a141 100644
--- a/erp_web/js/modules/sys/sysIndex.js
+++ b/erp_web/js/modules/sys/sysIndex.js
@@ -436,7 +436,7 @@ $(function () {
     //消息弹窗
     var loginName = sessionStorage.getItem("loginName");
     if(loginName == "jsh") {
-        toastr.info('您当前正在使用测试账号，<br/>如需正式使用请注册 <a href="/register.html"><b>点击注册</b></a>');
+        toastr.info('您当前正在使用演示账号，<br/>如需正式使用请注册 <a href="/register.html"><b>点击注册</b></a>');
     }
 
     //广告循环
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 593fdeb43..73d1baa61 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -179,7 +179,9 @@
                 {
                     title: '操作', field: 'isystem', align: "center", width: 80, formatter: function (value, rec, index) {
                         var str = '';
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        if(rec.loginame != "jsh") {
+                            str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+                        }
                         if (rec.id != rec.tenantId) {
                             str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>';
                         }
@@ -317,7 +319,7 @@
                         ids += row[i].id + ",";
                     }
                     if(row[i].loginame == "jsh"){
-                        $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
+                        $.messager.alert('提示', '租户jsh不能删除！', 'warning');
                         return;
                     } else if(row[i].id == row[i].tenantId) {
                         $.messager.alert('提示', '不能删除自己！', 'warning');