Merge branch 'devHuizhi' into dev_product

This commit is contained in:
皮伟
2019-11-21 17:19:12 +08:00
15 changed files with 624 additions and 235 deletions

View File

@@ -596,7 +596,7 @@ export default {
this.chooseProducts.forEach(item => {
let trialInfo = {}
item.calFactorLst.forEach(factor => {
//type 类型 0为picker 1计步器 2
//type 类型 0为picker 1计步器 2职业等级
if (factor.type == 0) {
if (factor.hasFlag == '1') {
trialInfo[factor.code] = factor[factor.code]