|
|
@@ -74,16 +74,18 @@ export default {
|
|
|
b && this.data.result.slice(0, 4).forEach((item, index) => {
|
|
|
let eItem = topicObj.result[index]
|
|
|
if (item.title === eItem.title) {
|
|
|
- if (item.type === 'area') {
|
|
|
- let arr = eItem.val.split('<#>')
|
|
|
+ let sp = '<#>'
|
|
|
+ let regSp = new RegExp(sp)
|
|
|
+ if (item.type === 'area' && regSp.test(item.val)) {
|
|
|
+ let arr = eItem.val.split(sp)
|
|
|
let area = arr[0].split(',')
|
|
|
item.area = area.join()
|
|
|
item.val1 = arr[1]
|
|
|
item.val2 = arr[2]
|
|
|
item.val = arr[3]
|
|
|
}
|
|
|
- else if (item.type === 'certificate') {
|
|
|
- let arr = eItem.val.split('<#>')
|
|
|
+ else if (item.type === 'certificate' && regSp.test(item.val)) {
|
|
|
+ let arr = eItem.val.split(sp)
|
|
|
item.certificate = arr[0]
|
|
|
item.val = arr[1]
|
|
|
} else {
|