Commit 97c62bdc authored by liujiangnan's avatar liujiangnan

模板开发完成

parent ffcc9f93
This diff is collapsed.
...@@ -10,3 +10,69 @@ ...@@ -10,3 +10,69 @@
nz-select { nz-select {
width: 100%; width: 100%;
} }
@font-face
{
font-family: 'BRLNSDB';
src: url("../../assets/font/BRLNSDB.TTF") ;
}
@font-face
{
font-family: 'BRLNSB';
src: url("../../assets/font/BRLNSB.TTF") ;
}
@font-face
{
font-family: 'BRLNSR';
src: url("../../assets/font/BRLNSR.TTF") ;
}
@font-face
{
font-family: 'GOTHIC';
src: url("../../assets/font/GOTHIC.TTF") ;
}
@font-face
{
font-family: 'GOTHICB';
src: url("../../assets/font/GOTHICB.TTF") ;
}
@font-face
{
font-family: 'GOTHICBI';
src: url("../../assets/font/GOTHICBI.TTF") ;
}
@font-face
{
font-family: 'GOTHICI';
src: url("../../assets/font/GOTHICI.TTF") ;
}
@font-face
{
font-family: 'MMTextBook';
src: url("../../assets/font/MMTextBook.otf") ;
}
@font-face
{
font-family: 'MMTextBook-Bold';
src: url("../../assets/font/MMTextBook-Bold.otf") ;
}
@font-face
{
font-family: 'MMTextBook-BoldItalic';
src: url("../../assets/font/MMTextBook-BoldItalic.otf") ;
}
@font-face
{
font-family: 'MMTextBook-Italic';
src: url("../../assets/font/MMTextBook-Italic.otf") ;
}
\ No newline at end of file
...@@ -25,6 +25,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -25,6 +25,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.item = {}; this.item = {};
this.item.title = {
t_font_color:'#000000',
t_font:'BRLNSDB',
t_font_size:40
};
// 获取存储的数据 // 获取存储的数据
(<any> window).courseware.getData((data) => { (<any> window).courseware.getData((data) => {
...@@ -53,6 +59,16 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -53,6 +59,16 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
init() { init() {
//标题
if(!this.item.title){
this.item.title = {
t_font_color:'#000000',
t_font:'BRLNSDB',
t_font_size:40
};
}
if (this.item.wordArr) { if (this.item.wordArr) {
this.wordArr = this.item.wordArr; this.wordArr = this.item.wordArr;
} else { } else {
...@@ -76,14 +92,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -76,14 +92,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
* 储存音频数据 * 储存音频数据
* @param e * @param e
*/ */
onAudioUploadSuccess(e, key) { onAudioUploadSuccess(e, item, key) {
item[key] = e.url;
this.item[key] = e.url;
this.save(); this.save();
} }
onAudioUploadSuccessByItem(e, item, key) { onAudioUploadSuccessByItem(e, item, key) {
console.log(item);
item[key] = e.url; item[key] = e.url;
this.save(); this.save();
} }
...@@ -121,14 +135,14 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -121,14 +135,14 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.saveItem(); this.saveItem();
} }
addLetterItem(letters){ // addLetterItem(letters){
let letter = this.letterData(); // let letter = this.letterData();
letters.push(letter); // letters.push(letter);
this.save(); // this.save();
} // }
deleteLetterItem(letters, index){ deleteLetterItem(letters, index){
console.log(letters); console.log(letters);
...@@ -154,11 +168,25 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -154,11 +168,25 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}; };
} }
letterData() { // letterData() {
return { // return {
letter_val: '', // letter_val: '',
letter_color: 'C04' // letter_color: 'C04',
}; // is_: false
// };
// }
saveWordItem(index,type) {
let val = this.wordArr[index][type].word_val;
this.wordArr[index][type].letters = [];
for(let i=0;i<val.length;i++){
this.wordArr[index][type].letters.push({
letter_val: val[i],
letter_color: 'C04',
is_: '0'
});
}
this.save();
} }
saveItem() { saveItem() {
......
...@@ -864,7 +864,7 @@ export class ShapeRect extends MySprite { ...@@ -864,7 +864,7 @@ export class ShapeRect extends MySprite {
} }
} }
export class ShapeRectNew extends MySprite { export class ShapeRoundRect extends MySprite {
radius = 0; radius = 0;
......
...@@ -17,3 +17,62 @@ ...@@ -17,3 +17,62 @@
src: url("../../assets/font/BRLNSDB.TTF") ; src: url("../../assets/font/BRLNSDB.TTF") ;
} }
@font-face
{
font-family: 'BRLNSB';
src: url("../../assets/font/BRLNSB.TTF") ;
}
@font-face
{
font-family: 'BRLNSR';
src: url("../../assets/font/BRLNSR.TTF") ;
}
@font-face
{
font-family: 'GOTHIC';
src: url("../../assets/font/GOTHIC.TTF") ;
}
@font-face
{
font-family: 'GOTHICB';
src: url("../../assets/font/GOTHICB.TTF") ;
}
@font-face
{
font-family: 'GOTHICBI';
src: url("../../assets/font/GOTHICBI.TTF") ;
}
@font-face
{
font-family: 'GOTHICI';
src: url("../../assets/font/GOTHICI.TTF") ;
}
@font-face
{
font-family: 'MMTextBook';
src: url("../../assets/font/MMTextBook.otf") ;
}
@font-face
{
font-family: 'MMTextBook-Bold';
src: url("../../assets/font/MMTextBook-Bold.otf") ;
}
@font-face
{
font-family: 'MMTextBook-BoldItalic';
src: url("../../assets/font/MMTextBook-BoldItalic.otf") ;
}
@font-face
{
font-family: 'MMTextBook-Italic';
src: url("../../assets/font/MMTextBook-Italic.otf") ;
}
\ No newline at end of file
This diff is collapsed.
...@@ -3,7 +3,8 @@ const res = [ ...@@ -3,7 +3,8 @@ const res = [
// ['bg', "assets/play/bg.jpg"], // ['bg', "assets/play/bg.jpg"],
['btn_left', "assets/play/btn_left.png"], ['btn_left', "assets/play/btn_left.png"],
['btn_right', "assets/play/btn_right.png"], ['btn_right', "assets/play/btn_right.png"],
['pause', "assets/play/pause.png"] ['pause', "assets/play/pause.png"],
['play', "assets/play/play.png"]
// ['text_bg', "assets/play/text_bg.png"], // ['text_bg', "assets/play/text_bg.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