diff --git a/fir_client/src/assets/bg.jpeg b/fir_client/src/assets/bg.jpeg new file mode 100644 index 0000000..3440f9e Binary files /dev/null and b/fir_client/src/assets/bg.jpeg differ diff --git a/fir_client/src/assets/logo.png b/fir_client/src/assets/logo.png new file mode 100644 index 0000000..eef0a70 Binary files /dev/null and b/fir_client/src/assets/logo.png differ diff --git a/fir_client/src/components/FirFooter.vue b/fir_client/src/components/FirFooter.vue index 8bc700c..a2a5626 100644 --- a/fir_client/src/components/FirFooter.vue +++ b/fir_client/src/components/FirFooter.vue @@ -3,12 +3,12 @@ -
+
{{ footer.copyright }}
-
+
@@ -22,7 +22,7 @@
-
+
{{ footer.ipcBeiAn.text }} diff --git a/fir_client/src/components/FirIndex.vue b/fir_client/src/components/FirIndex.vue index 5687a65..58191d0 100644 --- a/fir_client/src/components/FirIndex.vue +++ b/fir_client/src/components/FirIndex.vue @@ -1,39 +1,145 @@ + \ No newline at end of file diff --git a/fir_client/src/components/FirSuperSignBase.vue b/fir_client/src/components/FirSuperSignBase.vue index e045a54..6363699 100644 --- a/fir_client/src/components/FirSuperSignBase.vue +++ b/fir_client/src/components/FirSuperSignBase.vue @@ -77,7 +77,6 @@ - @@ -298,6 +298,7 @@ @@ -355,6 +356,7 @@ @@ -429,9 +431,6 @@
- - - @@ -464,7 +463,9 @@ authcode: "", authemail: "", apple_auth_list: [], - apple_auth_type: 0 + apple_auth_type: 0, + loadingfun: {}, + loading: false } }, methods: { @@ -492,7 +493,7 @@ this.pagination.pagesize = val; this.get_data_from_tabname(this.activeName, { "size": this.pagination.pagesize, - "page": this.pagination.currentPage + "page": 1 }) }, handleCurrentChange(val) { @@ -641,28 +642,33 @@ return ''; }, iosdevicesFun(methods, data) { + this.loading = true; iosdevices(data => { if (data.code === 1000) { this.app_devices_lists = data.data; this.pagination.total = data.count; } + this.loading = false; }, { "methods": methods, "data": data }) }, iosdeveloperFun(params) { - const loading = this.$loading({ - lock: true, - text: '执行中,请耐心等待...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + if (params.methods !== 'GET') { + this.loadingfun = this.$loading({ + lock: true, + text: '执行中,请耐心等待...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + } else { + this.loading = true + } iosdeveloper(data => { if (data.code === 1000) { this.app_developer_lists = data.data; this.pagination.total = data.count; this.apple_auth_list = data.apple_auth_list; - loading.close(); if (data.use_num) { this.developer_used_info = data.use_num; if (this.developer_used_info.all_usable_number !== 0) { @@ -689,16 +695,24 @@ if (this.codeactiveVisible) { this.codeactiveVisible = false; } - loading.close(); + if (params.methods !== 'GET') { + this.loadingfun.close(); + } else { + this.loading = false + } }, params) }, iosdevicesudidFun(action, data) { - const loading = this.$loading({ - lock: true, - text: '执行中,请耐心等待...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + if (action !== 'GET') { + this.loadingfun = this.$loading({ + lock: true, + text: '执行中,请耐心等待...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + } else { + this.loading = true + } iosdevicesudid(data => { if (data.code === 1000) { if (action !== "DELETE") { @@ -706,7 +720,11 @@ this.pagination.total = data.count; } } - loading.close() + if (action !== 'GET') { + this.loadingfun.close() + } else { + this.loading = false + } }, { "methods": action, "data": data }) diff --git a/fir_client/src/components/FirUserStorage.vue b/fir_client/src/components/FirUserStorage.vue index e8aded5..49d6008 100644 --- a/fir_client/src/components/FirUserStorage.vue +++ b/fir_client/src/components/FirUserStorage.vue @@ -173,6 +173,7 @@ @@ -330,6 +331,7 @@ id: 2, name: 'CDN模式: 请先配置好阿里云CDN,开启阿里云OSS私有Bucket回源,将使用鉴权A方式' },], + loading: false, } }, methods: { getUserInfoFun() { @@ -486,6 +488,7 @@ }, getstorageinfoFun() { + this.loading = true; getStorageinfo(data => { if (data.code === 1000) { this.org_storage_id = this.use_storage_id = data.storage; @@ -498,6 +501,7 @@ } else { this.$message.error('存储获取失败,' + data); } + this.loading = false; }, {"methods": 'GET'}); }, // eslint-disable-next-line no-unused-vars