@@ -625,12 +625,9 @@ var subComponent = {
},
setMoneyList: function () {
return this.moneyList.filter((item, i) => i !== 0)
-<<<<<<< HEAD
isWX: function () {
return location.href.indexOf('front') !== -1
-=======
->>>>>>> master
}
watch: {
