diff --git a/form/src/app/form/form.component.ts b/form/src/app/form/form.component.ts index 38d74ae09227d5e8dd7f6fa64b1455f53ba05ffe..a5fc207d3482c80e96e50e5ebbc3e30da3b51809 100644 --- a/form/src/app/form/form.component.ts +++ b/form/src/app/form/form.component.ts @@ -45,12 +45,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ngOnInit() { this.item = {}; - this.item.contentObj = {}; - - if (!this.item.contentObj) { - this.item.contentObj = {}; - } - this.picArr = []; // 获å–å˜å‚¨çš„æ•°æ® (<any>window).courseware.getData((data) => { @@ -73,10 +67,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ngOnDestroy() {} init() { - if (this.item.contentObj.options) { + if (this.item.options) { console.log("picarr " + this.picArr); - this.picArr = this.item.contentObj.options; + this.picArr = this.item.options; // v1.0 } diff --git a/play/assets/tmpGame/script/Scene.js b/play/assets/tmpGame/script/Scene.js index d5fe4736588ea1cd54e310411f0fc677d4e44dca..e2cffbedb411084dc4a81061c8b4272ecc20d831 100644 --- a/play/assets/tmpGame/script/Scene.js +++ b/play/assets/tmpGame/script/Scene.js @@ -1,5 +1,5 @@ /** - * 主场景 v1.0 + * 主场景 v1.2 */ cc.Class({