diff --git a/locale/en.json b/locale/en.json index 4f3e4bc..85ca8b7 100644 --- a/locale/en.json +++ b/locale/en.json @@ -57,5 +57,7 @@ "regenerate": "Regenerate", "forced-completion": "Forced completion", "take-and-place": "Take and place", - "filter.point": "Point" + "filter.point": "Point", + "warning": "Warning", + "toast.command-reissue": "Do you need to issue it?" } \ No newline at end of file diff --git a/locale/ko.json b/locale/ko.json index 5084b5e..1ebb2c4 100644 --- a/locale/ko.json +++ b/locale/ko.json @@ -57,5 +57,7 @@ "regenerate": "재생성", "forced-completion": "강제 완료", "take-and-place": "픽업 허용", - "filter.point": "포인트" + "filter.point": "포인트", + "warning": "힌트", + "toast.command-reissue": "발송해야 하나요?" } \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 743ea10..baa4aa0 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -57,5 +57,7 @@ "regenerate": "重新生成", "forced-completion": "强制完成", "take-and-place": "允许取放", - "filter.point": "点位" + "filter.point": "点位", + "warning": "提示", + "toast.command-reissue": "是否需要下发?" } \ No newline at end of file diff --git a/manifest.json b/manifest.json index fe4ca56..040c8f9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "DOOSAN", "appid" : "__UNI__3898904", "description" : "韩国斗山acs手持系统", - "versionName" : "1.0.0", - "versionCode" : 100, + "versionName" : "1.0.1", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/login/login.vue b/pages/login/login.vue index e4dafeb..88a3f9e 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -71,19 +71,7 @@ // url: '/pages/home/home' // }) this.disabled = true - if (this.user === '') { - uni.showToast({ - title: '用户名不能为空', - icon: 'none' - }) - this.disabled = false - return - } - if (this.password === '') { - uni.showToast({ - title: '密码不能为空', - icon: 'none' - }) + if (this.user === '' || this.password === '') { this.disabled = false return } diff --git a/pages/manage/call-manage.vue b/pages/manage/call-manage.vue index b7b1f08..d3fd2e2 100644 --- a/pages/manage/call-manage.vue +++ b/pages/manage/call-manage.vue @@ -20,7 +20,7 @@ - + @@ -44,8 +44,23 @@ this.title = options.title }, methods: { - async _callTask (type) { + toSure (type) { this.disabled = true + uni.showModal({ + title: this.$t('warning'), + cancelText: this.$t('button.cancel'), + confirmText: this.$t('button.confirm'), + content: this.$t('toast.command-reissue'), + success: (res) => { + if (res.confirm) { + this._callTask(type) + } else if (res.cancel) { + this.disabled = false + } + } + }) + }, + async _callTask (type) { try { let res = await callTask(this.sCode, this.nCode, type) this.disabled = false