Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_app

shuishen

2021-08-18 1b1d3e2b3c9e767932bddf2671172235b8fbd16a

 store/actions.111.js

@@ -17,7 +17,6 @@
            },
         ],
         pasw = md5(data.pass),
         // url = 'http://223.82.109.183:2080/api/blade-auth/oauth/token?tenantId=000000&username=' + data.name +
         url = store.state.piAPI + '/blade-auth/oauth/token?tenantId=000000&username=' + data.name +
         ' &password=' + pasw + '&grant_type=password&scope=all&type=account';
      // url ='http://192.168.0.109:82/blade-auth/oauth/token';
@@ -133,7 +132,7 @@
                  30000);

               uni.request({
                  url: "http://223.82.109.183:2080/api/blade-system/dept/detail?id=" + res
                  url: this.$store.state.piAPI + "/blade-system/dept/detail?id=" + res
                     .data.dept_id,
                  method: "get",
                  data: {