diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index 60a45ad..f3d534e 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -353,7 +353,7 @@ import QRCode from 'qrcodejs2' import {appReport, geetest, getAuthTokenFun, getdownloadurl, getShortAppinfo, gettask} from '@/restful/download' -import {checkEmail, checkphone, getRandomStr} from "@/utils/base/utils"; +import {checkEmail, checkphone, format_time, getRandomStr} from "@/utils/base/utils"; export default { name: "FirDownload", @@ -923,10 +923,7 @@ export default { return ftype }, formatTime: function (stime) { - if (stime) { - stime = stime.split(".")[0].split("T"); - return stime[0] + " " + stime[1] - } + return format_time(stime) } } }; diff --git a/fir_client/src/components/ShortDownload.vue b/fir_client/src/components/ShortDownload.vue index a69f17e..c3fb3f8 100644 --- a/fir_client/src/components/ShortDownload.vue +++ b/fir_client/src/components/ShortDownload.vue @@ -340,7 +340,7 @@ import QRCode from 'qrcodejs2' import {appReport, geetest, getAuthTokenFun, getdownloadurl, getShortAppinfo, gettask} from '@/restful/download' -import {checkEmail, checkphone, getRandomStr} from "@/utils/base/utils"; +import {checkEmail, checkphone, format_time, getRandomStr} from "@/utils/base/utils"; export default { name: "ShortDownload", @@ -881,10 +881,7 @@ export default { return ftype }, formatTime: function (stime) { - if (stime) { - stime = stime.split(".")[0].split("T"); - return stime[0] + " " + stime[1] - } + return format_time(stime) } } }; diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue index 33ab6fb..b90f253 100644 --- a/fir_client/src/components/user/FirSuperSignBase.vue +++ b/fir_client/src/components/user/FirSuperSignBase.vue @@ -778,6 +778,10 @@ clearable placeholder="输入开发者用户ID" style="width: 30%;margin-right: 30px;margin-bottom: 10px"/> + + + 搜索 @@ -837,16 +841,19 @@ label="设备状态" width="110"> + + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + + + +
0) { + let html_msg = '' + for (let e_msg of data.data) { + html_msg += `${e_msg.msg}
` + } + this.$message({ + dangerouslyUseHTMLString: true, + message: html_msg, + duration: 60000, + type: 'warning', + showClose: true + }); + } else { + this.$message.success("操作成功"); + } } if (params.data.act === 'setstatus') { this.setdeveloperstatusVisible = false @@ -2196,6 +2308,17 @@ export default { "methods": action, "data": data }) }, + operateMessageFun(params) { + signoperatemessage(data => { + if (data.code === 1000) { + this.operate_message_lists = data.data; + this.pagination.total = data.count; + this.operate_status_choices = data.status_choices + } else { + this.$message.error("操作失败了 " + data.msg) + } + }, params) + }, iosudevicesFun(action, data) { if (action !== 'GET') { this.loadingfun = this.$loading({ @@ -2212,6 +2335,7 @@ export default { if (action !== "PUT") { this.developer_udevices_lists = data.data; this.pagination.total = data.count; + this.device_status_choices = data.status_choices; } else { this.refreshactiveFun() } @@ -2231,7 +2355,7 @@ export default { getUserInfoFun(this); if (this.$route.params.act) { let activeName = this.$route.params.act; - let activeName_list = ["iosdeveloper", "adddeveloper", "iosudevices", "useddevices", "devicesudid", "devicesbill", "transferbill", "devicesrank"]; + let activeName_list = ["iosdeveloper", "adddeveloper", "iosudevices", "useddevices", "devicesudid", "devicesbill", "transferbill", "devicesrank", "operatemsg"]; for (let index in activeName_list) { if (activeName_list[index] === activeName) { this.activeName = activeName; diff --git a/fir_client/src/components/user/FirUserAdvert.vue b/fir_client/src/components/user/FirUserAdvert.vue index 873a412..ea25d41 100644 --- a/fir_client/src/components/user/FirUserAdvert.vue +++ b/fir_client/src/components/user/FirUserAdvert.vue @@ -204,6 +204,7 @@ import {advertinfo} from "@/restful"; import {VueCropper} from 'vue-cropper' import {AvatarUploadUtils, dataURLtoFile, getUserInfoFun} from '@/utils' +import {format_time} from "@/utils/base/utils"; export default { name: "FirUserAdvert", @@ -389,11 +390,7 @@ export default { }, format_time(stime) { - if (stime) { - stime = stime.split(".")[0].split("T"); - return stime[0] + " " + stime[1] - } else - return ''; + return format_time(stime) }, }, mounted() { getUserInfoFun(this); diff --git a/fir_client/src/components/user/FirUserDomain.vue b/fir_client/src/components/user/FirUserDomain.vue index 97295bd..a3f56c3 100644 --- a/fir_client/src/components/user/FirUserDomain.vue +++ b/fir_client/src/components/user/FirUserDomain.vue @@ -248,13 +248,7 @@ export default { return this.format_time(row.created_time) }, - format_time(stime) { - if (stime) { - stime = stime.split(".")[0].split("T"); - return stime[0] + " " + stime[1] - } else - return ''; - }, + }, mounted() { getUserInfoFun(this); this.get_data_from_tabname(); diff --git a/fir_client/src/components/user/FirUserNotify.vue b/fir_client/src/components/user/FirUserNotify.vue index cb5f2cd..b61eeee 100644 --- a/fir_client/src/components/user/FirUserNotify.vue +++ b/fir_client/src/components/user/FirUserNotify.vue @@ -343,7 +343,7 @@