Browse Source

2023-12-19

master
guoxing 1 year ago
parent
commit
9127353be4
  1. 2
      .env.development
  2. 5
      src/views/login/login.vue
  3. 11
      src/views/marketingCard/indexAdd.vue
  4. 14
      src/views/marketingCard/pickupCardSet.vue

2
.env.development

@ -8,6 +8,6 @@ VUE_APP_BASE_API = '/api'
# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" # 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_REPORT_URL = "http://192.168.2.106:7202"
##VUE_APP_URL = "http://8.130.39.13:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"

5
src/views/login/login.vue

@ -97,17 +97,16 @@
this.$router.push({ this.$router.push({
path: '/index' path: '/index'
}) })
this.loading = false this.loading = true
// this.getUserInfo(response.data.loginId) // this.getUserInfo(response.data.loginId)
window.sessionStorage.setItem('tokenName', response.data.tokenName) window.sessionStorage.setItem('tokenName', response.data.tokenName)
window.sessionStorage.setItem('tokenValue', response.data.tokenValue) window.sessionStorage.setItem('tokenValue', response.data.tokenValue)
} }
}).catch(() => { }).catch(() => {
this.loading = false this.loading = true
}) })
this.loading = true
}, },
getUserInfo(id) { getUserInfo(id) {
getUserById(id).then((response) => { getUserById(id).then((response) => {

11
src/views/marketingCard/indexAdd.vue

@ -245,8 +245,8 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).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) this.formobj.goods.splice(index, 1)
}) })
}, },
@ -335,9 +335,11 @@
saveOrUpdate() { saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj) console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.submitdisabled = true
req.saveGiftBag(this.formobj) req.saveGiftBag(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.submitdisabled = false
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'success', type: 'success',
@ -345,10 +347,13 @@
}) })
this.handleReturn('true') this.handleReturn('true')
} else { } else {
this.submitdisabled = false
// resp.code // resp.code
} }
}) })
.catch(() => {}) .catch(() => {
this.submitdisabled = false
})
}, },
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')

14
src/views/marketingCard/pickupCardSet.vue

@ -155,9 +155,11 @@
<div <div
style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;"> style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;">
<span <!-- <span
style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;" style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;"
@click="saveOrUpdate">发行</span> @click="saveOrUpdate">发行</span> -->
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">发行</el-button>
</div> </div>
@ -265,6 +267,7 @@
data() { data() {
return { return {
viewState: 1, viewState: 1,
submitdisabled:false,
page: { page: {
total: 0, // total: 0, //
current: 1, // current: 1, //
@ -497,9 +500,11 @@
}, },
saveOrUpdate() { saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj) console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.submitdisabled = true
req.generateCard(this.formobj) req.generateCard(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.submitdisabled = false
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'success', type: 'success',
@ -507,10 +512,13 @@
}) })
this.handleReturn('true') this.handleReturn('true')
} else { } else {
this.submitdisabled = false
// resp.code // resp.code
} }
}) })
.catch(() => {}) .catch(() => {
this.submitdisabled = false
})
}, },
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')

Loading…
Cancel
Save