Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/hrs_app_h5/bill

.env.development

 VUE_APP_OIDC_CONFIG = '{ "authority": "http://106.120.107.150:5000", "client_id": "teamix-team-manager-web-pc", "client_secret": "123456", "redirect_uri": "http://localhost:8080/callback.html", "response_type": "id_token token", "scope": "workapps.client api.workapps.user api.workapps.org api.workapps.open openid","post_logout_redirect_uri":"http://localhost:8080", "silent_redirect_uri": "http://localhost:8080/silent-renew-oidc.html", "automaticSilentRenew": true,"accessTokenExpiringNotificationTime":60,"filterProtocolClaims":true,"loadUserInfo":true }'
 VUE_APP_OIDC_CONFIG = '{ "authority": "http://106.120.107.150:5000", "client_id": "teamix-team-manager-web-pc", "client_secret": "123456", "redirect_uri": "http://localhost:8080/callback.html", "response_type": "id_token token", "scope": "workapps.client api.workapps.user api.workapps.org api.workapps.open openid","post_logout_redirect_uri":"http://localhost:8080", "silent_redirect_uri": "http://localhost:8080/silent-renew-oidc.html", "automaticSilentRenew": true,"accessTokenExpiringNotificationTime":60,"filterProtocolClaims":true,"loadUserInfo":true }'
 
 
-VUE_APP_ORG_API_BASEURL = 'http://192.168.1.161:7771'
-#VUE_APP_ORG_API_BASEURL = 'http://10.10.11.31:63766'
-VUE_APP_UPLOADAPI_BASEURL = 'http://192.168.1.161:8080'
-VUE_APP_WORKSTATIONAPI_BASEURL = 'http://channel.jinsehuaqin.com:8090'
-VUE_APP_USERAPI_BASEURL = 'http://192.168.1.161:8090'
-
-
-VUE_APP_REDIRECT_HTTPS = false
-
-VUE_APP_PUBLIC_DIR='/'
+VUE_APP_API_BASEURL = 'http://10.10.10.44:8086/api/hrs/bill/account/206484/period'
\ No newline at end of file

src/views/Bill/index.vue

@@ -239,8 +239,8 @@ export default {
         console.log("+++++++");
         console.log("+++++++");
       }
       }
     },
     },
-    async getData() {
-      await api.getData(1, 1, "a").then(res => {
+     getperiod() {
+       api.getData(1, 1, "a").then(res => {
         console.log(res.data);
         console.log(res.data);
         this.data.balance=res.data.balance;
         this.data.balance=res.data.balance;
       });
       });