diff --git a/front/package.json b/front/package.json index ec947bc..112c789 100644 --- a/front/package.json +++ b/front/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "1.0.22", + "version": "1.0.23", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "lichong", diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue index c3ee7d4..188a925 100644 --- a/front/src/renderer/src/views/shujufenxi.vue +++ b/front/src/renderer/src/views/shujufenxi.vue @@ -1407,9 +1407,9 @@ export default { item["zhu"] = Number(element.jine) / 2 let zhonghaomaArr = `${zhonghaoma}`.split("") let xiangmuArr = `${element.value}`.split("") - zhonghaomaArr = _.uniq(zhonghaomaArr) - xiangmuArr = _.uniq(xiangmuArr) - if (_.difference(zhonghaomaArr, xiangmuArr).length === 0) { + xiangmuArr = xiangmuArr.sort() + zhonghaomaArr = zhonghaomaArr.sort() + if (xiangmuArr[0] === zhonghaomaArr[0] && xiangmuArr[1] === zhonghaomaArr[1] && xiangmuArr[2] === zhonghaomaArr[2]) { item["zhong"] = Number(element.jine) * Number(formData[element.type]) item["zhongzhu"] = 1 item["pei"] = Number(element.jine) * Number(formData[element.type])