diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index c1e6d0b12..2f721deaf 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -1180,7 +1180,7 @@ class UsersController extends AbstractController } $uid = intval(str_pad(Base::generatePassword(4,1), 9, 8, STR_PAD_LEFT)); if($user){ - $uid = intval(str_pad(Request::header('fd'), 5, 9, STR_PAD_LEFT).$user->userid); + $uid = intval(str_pad(Base::generatePassword(4,1), 5, 9, STR_PAD_LEFT).$user->userid); } try { $service = new AgoraTokenGenerator($meetingSetting['appid'], $meetingSetting['app_certificate'], $meeting->channel, $uid); diff --git a/docker-compose.yml b/docker-compose.yml index 1d381e263..4e2c03738 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -176,7 +176,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.5" + image: "kuaifan/doookr:0.0.6" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue index 5caf4c141..ae0fe6966 100644 --- a/resources/assets/js/components/MicroApps.vue +++ b/resources/assets/js/components/MicroApps.vue @@ -1,8 +1,8 @@ @@ -474,7 +474,7 @@ export default { // okr路由 okrUrl() { - let url = $A.apiUrl("/apps/okr") + let url = $A.apiUrl("../apps/okr") if (url.indexOf('http') == -1) { url = window.location.origin + url } diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index e2e68fafd..de1ffdfc5 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -20,7 +20,7 @@ :xs="{ span: 8 }" :sm="{ span: 8 }" :lg="{ span: 6 }" - :xl="{ span: 4 }" + :xl="{ span: 6 }" :xxl="{ span: 3 }" >
diff --git a/resources/assets/js/pages/manage/apps.vue b/resources/assets/js/pages/manage/apps.vue index f70b9fe15..ca9924980 100644 --- a/resources/assets/js/pages/manage/apps.vue +++ b/resources/assets/js/pages/manage/apps.vue @@ -22,11 +22,11 @@ export default { watch: { '$route': { handler(to) { + this.loading = true; if (to.name == 'manage-apps') { - this.loading = true; this.$nextTick(() => { this.loading = false; - let url = $A.apiUrl("/apps/okr") + let url = $A.apiUrl("../apps/okr") if (url.indexOf('http') == -1) { url = window.location.origin + url } diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index c57989b02..06f41a5a9 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -45,10 +45,10 @@ margin-bottom: 16px; >div { - font-size: 12px; - font-weight: bold; + font-size: 14px; + font-weight: normal; background: #ffffff; - color: #282828; + color: #333333; border-radius: 8px; padding: 14px; display: flex; @@ -351,6 +351,14 @@ body.window-portrait { } .apply-content{ padding: 16px 20px; + .apply-col { + margin-bottom: 16px; + + >div { + font-size: 12px; + font-weight: bold; + } + } } } } \ No newline at end of file