Commit 7ac8bea9 authored by Damon's avatar Damon

Merge branch 'dev-1.5.0' into test

parents e999f39c 87e76966
......@@ -192,16 +192,20 @@
this.$emit('action', this.info)
},
handleOperate() {
uni.showModal({
if (this.willStatus === '-1') {
uni.showModal({
title: '提示',
content: '确定' + this.buttonText + '?',
success: function (res) {
success: (res) => {
if (res.confirm) {
this.$emit('operate', this.info.id, this.buttonOperateType, this.willStatus)
this.$emit('operate', this.info.id, this.buttonOperateType, this.willStatus)
} else if (res.cancel) {
}
}
})
})
} else {
this.$emit('operate', this.info.id, this.buttonOperateType, this.willStatus)
}
},
handleClickExpress() {
this.$emit('express', this.info)
......
......@@ -208,16 +208,20 @@
},
methods: {
handleClick() {
uni.showModal({
title: '提示',
content: '确定' + this.buttonText + '?',
success: function (res) {
if (res.confirm) {
this.handleClickSure()
} else if (res.cancel) {
}
}
})
if (this.buttonText === '取消申请') {
uni.showModal({
title: '提示',
content: '确定' + this.buttonText + '?',
success: (res) => {
if (res.confirm) {
this.handleClickSure()
} else if (res.cancel) {
}
}
})
} else {
this.handleClickSure()
}
},
handleClickSure() {
this.$u.api[this.buttonOperateType](this.info.id).then(res => {
......
......@@ -325,15 +325,15 @@ export default {
categoryId: this.categoryId || '',
keyword: this.keyword,
classifyId: this.classifyId,
brandId: this.modelId,
brandId: this.modelId || '',
speciesId: '',
partnerCompanyId: '',
}
if (this.classifyId === 1) {
params.partnerCompanyId = this.brandId
params.partnerCompanyId = this.brandId || ''
} else {
params.speciesId = this.brandId
params.speciesId = this.brandId || ''
}
this.$u.api.getPartsList(params).then((res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment