From f6962b09b78693feda5769be82e63809a1464bd9 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 23 Nov 2021 11:10:50 +0800
Subject: [PATCH] init

---
 src/views/admin/user/index.vue | 2 +-
 vue.config.js                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index b299757..8f6d757 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -319,7 +319,7 @@
         </el-table-column>
         <el-table-column prop="createTime" label="添加时间"> </el-table-column>
         <el-table-column prop="address" label="操作" fixed="right" width="150">
-          <template slot-scope="scope" v-if="scope.row.userRoleType!=11||scope.row.userRoleType!=12||scope.row.userRoleType!=13">
+          <template slot-scope="scope" v-if="scope.row.userRoleType!=11&&scope.row.userRoleType!=12&&scope.row.userRoleType!=13">
             <el-button
               @click="editTwo(scope.row)"
               v-if="sys_user_edit1"
diff --git a/vue.config.js b/vue.config.js
index f361a46..db6248b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
-const url = 'http://192.168.31.169:9999' //长龙
+const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://192.168.31.169:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑