Merge branch 'develop'

Former-commit-id: 8c3ea4043ea8ebded161f91e9d489d518b4f7b7a [formerly 8c3ea4043ea8ebded161f91e9d489d518b4f7b7a [formerly 8c3ea4043ea8ebded161f91e9d489d518b4f7b7a [formerly 8c3ea4043ea8ebded161f91e9d489d518b4f7b7a [formerly 7b6a59159b88eb607bffe9b6ece8b45231d26582 [formerly 034b1ae71ec3b712645c972fe94a94d28add08ef]]]]]
Former-commit-id: d659e2caf38fd2d897fcdb78827693f80b7a5671
Former-commit-id: a5f506f727e7e31272f4942d793cef5d3f906084
Former-commit-id: 18fe58d2e6291da2bae7e247f528a67fdc364cdc [formerly 1836f7c555618e851cb35237eb82c0462a792baa]
Former-commit-id: ac451307f168642ef1cf2c78ad2d5bef62ba991c
Former-commit-id: bd9f55a28caef22d2cfd78ad07e715c9710a846c
Former-commit-id: eb0ee0f623b2b2a952c517cbd8ab3ef2c23052e1
Former-commit-id: 196a3683a3fb513b7d805f0a5d7972c413bea6d5
Former-commit-id: 3dc3523a0aa6e8f4f5fd1fb6cc32728884e039ba
This commit is contained in:
孙昊翔
2018-11-26 13:41:47 +08:00
2 changed files with 6 additions and 0 deletions

View File

@@ -23,6 +23,9 @@ export default {
return this.value ? 'success' : 'danger'
},
text () {
if (this.scope.$index === 1) {
return this.myProps
}
return this.value ? '是' : '否'
}
},

View File

@@ -27,6 +27,9 @@ export default {
return this.value ? 'success' : 'danger'
},
text () {
if (this.scope.$index === 1) {
return this.myProps
}
return this.value ? '是' : '否'
}
},