Commit e8b288d4eb538953017178968e326fe10537359c

Authored by 后端研发-苏明海
2 parents 1caefbbe 029937fd

Merge branch 'test' into 'qa'

Test

See merge request !378
pages/goods/goodsInfo/goodsInfo.js
@@ -3652,7 +3652,7 @@ Page({ @@ -3652,7 +3652,7 @@ Page({
3652 func(); return false; 3652 func(); return false;
3653 } 3653 }
3654 3654
3655 - if(this.data.sales_rules!=2 && this.data.is_newsales_rules!=1){ 3655 + if(this.data.sales_rules!=2){
3656 func(); 3656 func();
3657 }else{ 3657 }else{
3658 3658