Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject

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"

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' //王笑