Merge branch 'dev'

.env.development

 VUE_APP_OIDC_CONFIG = '{ "authority": "http://106.120.107.150:5000", "client_id": "hrs-bill-web-mobile", "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": "hrs-bill-web-mobile", "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_API_BASEURL = 'http://organization.test.hrs100.cn:18080/api/user/bill/'
+VUE_APP_API_BASEURL = 'http://organization.test.hrs100.cn:18080/'
 
 
 VUE_APP_PUBLIC_DIR='/'
 VUE_APP_PUBLIC_DIR='/'

.env.staging

 VUE_APP_OIDC_CONFIG = '{ "authority": "http://106.120.107.150:5000", "client_id": "hrs-bill-web-mobile", "client_secret": "123456", "redirect_uri": "http://106.120.107.150:7773/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://106.120.107.150:7773", "silent_redirect_uri": "http://106.120.107.150:7773/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": "hrs-bill-web-mobile", "client_secret": "123456", "redirect_uri": "http://106.120.107.150:7773/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://106.120.107.150:7773", "silent_redirect_uri": "http://106.120.107.150:7773/silent-renew-oidc.html", "automaticSilentRenew": true,"accessTokenExpiringNotificationTime":60,"filterProtocolClaims":true,"loadUserInfo":true }'
 
 
-VUE_APP_API_BASEURL = 'http://organization.test.hrs100.cn:18080/api/user/bill/'
+VUE_APP_API_BASEURL = 'http://organization.test.hrs100.cn:18080/'
 
 
 VUE_APP_PUBLIC_DIR='/'
 VUE_APP_PUBLIC_DIR='/'

src/api/More/index.js

@@ -14,7 +14,7 @@ export default {
         return AjaxRequest.get(url);
         return AjaxRequest.get(url);
     },
     },
     async getPayUrl() {
     async getPayUrl() {
-        const url = urls=getPayUrlUrl();
+        const url = urls.getPayUrlUrl();
         return AjaxRequest.get(url);
         return AjaxRequest.get(url);
     }
     }
 };
 };

src/views/Bill/index.vue

@@ -516,7 +516,7 @@ export default {
     console.log('this.payUrl=',this.payUrl);
     console.log('this.payUrl=',this.payUrl);
     if (!this.payUrl) {
     if (!this.payUrl) {
       this.payUrl = await this.loadPayUrl();
       this.payUrl = await this.loadPayUrl();
-      localStorage.setItem("payUrl", payUrl);
+      localStorage.setItem("payUrl", this.payUrl);
     }
     }
   }
   }
 };
 };