Commit ad449b74 authored by 李维's avatar 李维

dev commit

parent c863b38e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="card-item-content border" style=" width: 500px;"> <div class="card-item-content border" style=" width: 500px;">
<div class="card-item-content"> <div class="card-item-content">
<div class="title" > <div class="title" >
糖果 -<strong>{{ i + 1 }}</strong>- 卡片 -<strong>{{ i + 1 }}</strong>-
</div> </div>
<div class="section" > <div class="section" >
<div class="section-content"> <div class="section-content">
......
import {Component, EventEmitter, Input, OnDestroy, OnChanges, OnInit, Output, ApplicationRef} from '@angular/core'; import {Component, EventEmitter, Input, OnDestroy, OnChanges, OnInit, Output, ApplicationRef} from '@angular/core';
const defaultData = { const defaultData = {
version: "1.0", version: "1.1",
bgMusic: "", bgMusic: "",
dataArray:[ dataArray:[]
{type:"Text", image_url:"", text:"", audio_url:""},
{type:"Text", image_url:"", text:"", audio_url:""},
{type:"Text", image_url:"", text:"", audio_url:""},
{type:"Text", image_url:"", text:"", audio_url:""},
{type:"Text", image_url:"", text:"", audio_url:""}
]
} }
@Component({ @Component({
......
...@@ -41,12 +41,14 @@ import { callbackify } from 'util'; ...@@ -41,12 +41,14 @@ import { callbackify } from 'util';
const defauleFormData = { const defauleFormData = {
version: "1.0", version: "1.1",
bgmusic: "", bgmusic: "",
dataArray:[ dataArray:[
{type:"Image", image_url:"bee-demo", audio_url:"bee-demo"}, {type:"Image", image_url:"default_image", text:"", audio_url:""},
{type:"Text", text:"Apple", audio_url:"apple-demo"}, {type:"Image", image_url:"default_image", text:"", audio_url:""},
{type:"Image", image_url:"bee-demo", audio_url:"bee-demo"} {type:"Image", image_url:"default_image", text:"", audio_url:""},
{type:"Image", image_url:"default_image", text:"", audio_url:""},
{type:"Image", image_url:"default_image", text:"", audio_url:""}
] ]
} }
......
...@@ -21,7 +21,7 @@ const localImages = { ...@@ -21,7 +21,7 @@ const localImages = {
'light-off': 'assets/play/light-off.png', 'light-off': 'assets/play/light-off.png',
'light-on': 'assets/play/light-on.png', 'light-on': 'assets/play/light-on.png',
'main-bg': 'assets/play/main-bg.png', 'main-bg': 'assets/play/main-bg.png',
'default_image': 'assets/play/default_image.png'
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment