diff --git a/.env.development b/.env.development index fdd086a..0293dd2 100644 --- a/.env.development +++ b/.env.development @@ -8,6 +8,6 @@ VUE_APP_BASE_API = '/api' # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" -VUE_APP_URL = "http://5sbheh.natappfree.cc" +VUE_APP_URL = "http://192.168.2.106:7201" VUE_APP_REPORT_URL = "http://192.168.2.106:7202" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 873224d..d478e77 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -97,17 +97,16 @@ this.$router.push({ path: '/index' }) - this.loading = false + this.loading = true // this.getUserInfo(response.data.loginId) window.sessionStorage.setItem('tokenName', response.data.tokenName) window.sessionStorage.setItem('tokenValue', response.data.tokenValue) } }).catch(() => { - this.loading = false + this.loading = true }) - this.loading = true }, getUserInfo(id) { getUserById(id).then((response) => { diff --git a/src/views/marketingCard/indexAdd.vue b/src/views/marketingCard/indexAdd.vue index 8288881..641eced 100644 --- a/src/views/marketingCard/indexAdd.vue +++ b/src/views/marketingCard/indexAdd.vue @@ -245,8 +245,8 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - const index = this.formobj.goods.filter((item) => item.sid === sid) - + const index = this.formobj.goods.findIndex((item) => item.goodsSid === sid) + console.log("index》》》》", index) this.formobj.goods.splice(index, 1) }) }, @@ -335,9 +335,11 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) + this.submitdisabled = true req.saveGiftBag(this.formobj) .then(resp => { if (resp.success) { + this.submitdisabled = false this.$message({ showClose: true, type: 'success', @@ -345,10 +347,13 @@ }) this.handleReturn('true') } else { + this.submitdisabled = false // 根据resp.code进行异常情况处理 } }) - .catch(() => {}) + .catch(() => { + this.submitdisabled = false + }) }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue index e5f3dbe..a3635a9 100644 --- a/src/views/marketingCard/pickupCardSet.vue +++ b/src/views/marketingCard/pickupCardSet.vue @@ -155,9 +155,11 @@