张恒

添加一个富文本编辑器,以及mock地址

1 module.exports = { 1 module.exports = {
2 NODE_ENV: '"development"', 2 NODE_ENV: '"development"',
3 - BASE_API: '""' 3 + BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"'
4 } 4 }
......
1 module.exports = { 1 module.exports = {
2 NODE_ENV: '"production"', 2 NODE_ENV: '"production"',
3 - BASE_API: '""' 3 + BASE_API: '"https://easy-mock.com/mock/5950a2419adc231f356a6636/vue-admin"'
4 } 4 }
......
1 'use strict' 1 'use strict'
2 2
3 import { app } from 'electron' 3 import { app } from 'electron'
4 -import '../renderer/store'
5 import initWindow from './services/windowManager' 4 import initWindow from './services/windowManager'
6 import path from 'path' 5 import path from 'path'
7 6
......
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
31 </template> 31 </template>
32 32
33 <script> 33 <script>
34 -// import { getToken } from 'api/qiniu' 34 +
35 -import { checkPic } from "@util/picUtil.js";
36 35
37 export default { 36 export default {
38 name: "EditorSlideUpload", 37 name: "EditorSlideUpload",
...@@ -94,41 +93,41 @@ export default { ...@@ -94,41 +93,41 @@ export default {
94 } 93 }
95 }, 94 },
96 beforeUpload(file) { 95 beforeUpload(file) {
97 - const _self = this; 96 + // const _self = this;
98 - const _URL = window.URL || window.webkitURL; 97 + // const _URL = window.URL || window.webkitURL;
99 - const fileName = file.uid; 98 + // const fileName = file.uid;
100 - this.listObj[fileName] = {}; 99 + // this.listObj[fileName] = {};
101 - return new Promise((resolve, reject) => { 100 + // return new Promise((resolve, reject) => {
102 - let Sync = async () => { 101 + // let Sync = async () => {
103 - try { 102 + // try {
104 - let picKey = await checkPic(file, this.fileList.length, 1); 103 + // let picKey = await checkPic(file, this.fileList.length, 1);
105 - if (picKey) { 104 + // if (picKey) {
106 - let token = await this.getRequest( 105 + // let token = await this.getRequest(
107 - "/qiniu/serveGetQiniuUpToken?key=" + picKey 106 + // "/qiniu/serveGetQiniuUpToken?key=" + picKey
108 - ); 107 + // );
109 - console.log("picKey---", picKey, token); 108 + // console.log("picKey---", picKey, token);
110 - this.picPostData = token; 109 + // this.picPostData = token;
111 - const img = new Image(); 110 + // const img = new Image();
112 - img.src = _URL.createObjectURL(file); 111 + // img.src = _URL.createObjectURL(file);
113 - img.onload = function() { 112 + // img.onload = function() {
114 - _self.listObj[fileName] = { 113 + // _self.listObj[fileName] = {
115 - hasSuccess: false, 114 + // hasSuccess: false,
116 - uid: file.uid, 115 + // uid: file.uid,
117 - width: this.width, 116 + // width: this.width,
118 - height: this.height 117 + // height: this.height
119 - }; 118 + // };
120 - }; 119 + // };
121 - resolve(true); 120 + // resolve(true);
122 - } else { 121 + // } else {
123 - reject(false); 122 + // reject(false);
124 - this.listObj = {}; 123 + // this.listObj = {};
125 - } 124 + // }
126 - } catch (error) { 125 + // } catch (error) {
127 - reject(false); 126 + // reject(false);
128 - } 127 + // }
129 - }; 128 + // };
130 - Sync(); 129 + // Sync();
131 - }); 130 + // });
132 } 131 }
133 } 132 }
134 }; 133 };
......
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 <el-form ref="form" :model="form" label-width="120px"> 3 <el-form ref="form" :model="form" label-width="120px">
4 - <el-form-item label="Activity name"> 4 + <el-form-item label="活动名称">
5 <el-input v-model="form.name"></el-input> 5 <el-input v-model="form.name"></el-input>
6 </el-form-item> 6 </el-form-item>
7 - <el-form-item label="Activity zone"> 7 + <el-form-item label="活动地点">
8 - <el-select v-model="form.region" placeholder="please select your zone"> 8 + <el-select v-model="form.region" placeholder="请选择活动地点">
9 - <el-option label="Zone one" value="shanghai"></el-option> 9 + <el-option label="上海" value="上海"></el-option>
10 - <el-option label="Zone two" value="beijing"></el-option> 10 + <el-option label="北京" value="北京"></el-option>
11 </el-select> 11 </el-select>
12 </el-form-item> 12 </el-form-item>
13 - <el-form-item label="Activity time"> 13 + <el-form-item label="活动时间">
14 <el-col :span="11"> 14 <el-col :span="11">
15 - <el-date-picker type="date" placeholder="Pick a date" v-model="form.date1" style="width: 100%;"></el-date-picker> 15 + <el-date-picker type="date" placeholder="选择时间" v-model="form.date1" style="width: 100%;"></el-date-picker>
16 </el-col> 16 </el-col>
17 <el-col class="line" :span="2">-</el-col> 17 <el-col class="line" :span="2">-</el-col>
18 <el-col :span="11"> 18 <el-col :span="11">
19 - <el-time-picker type="fixed-time" placeholder="Pick a time" v-model="form.date2" style="width: 100%;"></el-time-picker> 19 + <el-time-picker
20 + type="fixed-time"
21 + placeholder="选择时间"
22 + v-model="form.date2"
23 + style="width: 100%;"
24 + ></el-time-picker>
20 </el-col> 25 </el-col>
21 </el-form-item> 26 </el-form-item>
22 - <el-form-item label="Instant delivery"> 27 + <el-form-item label="即时交付">
23 <el-switch v-model="form.delivery"></el-switch> 28 <el-switch v-model="form.delivery"></el-switch>
24 </el-form-item> 29 </el-form-item>
25 - <el-form-item label="Activity type"> 30 + <el-form-item label="额外选项">
26 <el-checkbox-group v-model="form.type"> 31 <el-checkbox-group v-model="form.type">
27 - <el-checkbox label="Online activities" name="type"></el-checkbox> 32 + <el-checkbox label="在线活动" name="type"></el-checkbox>
28 - <el-checkbox label="Promotion activities" name="type"></el-checkbox> 33 + <el-checkbox label="促销活动" name="type"></el-checkbox>
29 - <el-checkbox label="Offline activities" name="type"></el-checkbox> 34 + <el-checkbox label="线下活动" name="type"></el-checkbox>
30 - <el-checkbox label="Simple brand exposure" name="type"></el-checkbox> 35 + <el-checkbox label="发布会活动" name="type"></el-checkbox>
31 </el-checkbox-group> 36 </el-checkbox-group>
32 </el-form-item> 37 </el-form-item>
33 - <el-form-item label="Resources"> 38 + <el-form-item label="资源选项">
34 <el-radio-group v-model="form.resource"> 39 <el-radio-group v-model="form.resource">
35 - <el-radio label="Sponsor"></el-radio> 40 + <el-radio label="需要赞助商"></el-radio>
36 - <el-radio label="Venue"></el-radio> 41 + <el-radio label="不需要赞助商"></el-radio>
37 </el-radio-group> 42 </el-radio-group>
38 </el-form-item> 43 </el-form-item>
39 - <el-form-item label="Activity form"> 44 + <el-form-item label="活动详情">
40 - <el-input type="textarea" v-model="form.desc"></el-input> 45 + <tinymce v-model="form.desc" :height="300" />
41 </el-form-item> 46 </el-form-item>
42 <el-form-item> 47 <el-form-item>
43 <el-button type="primary" @click="onSubmit">Create</el-button> 48 <el-button type="primary" @click="onSubmit">Create</el-button>
...@@ -48,37 +53,39 @@ ...@@ -48,37 +53,39 @@
48 </template> 53 </template>
49 54
50 <script> 55 <script>
56 +import Tinymce from "@/components/Tinymce";
51 export default { 57 export default {
58 + components: { Tinymce },
52 data() { 59 data() {
53 return { 60 return {
54 form: { 61 form: {
55 - name: '', 62 + name: "",
56 - region: '', 63 + region: "",
57 - date1: '', 64 + date1: "",
58 - date2: '', 65 + date2: "",
59 delivery: false, 66 delivery: false,
60 type: [], 67 type: [],
61 - resource: '', 68 + resource: "",
62 - desc: '' 69 + desc: ""
63 - }
64 } 70 }
71 + };
65 }, 72 },
66 methods: { 73 methods: {
67 onSubmit() { 74 onSubmit() {
68 - this.$message('submit!') 75 + this.$message("submit!");
69 }, 76 },
70 onCancel() { 77 onCancel() {
71 this.$message({ 78 this.$message({
72 - message: 'cancel!', 79 + message: "cancel!",
73 - type: 'warning' 80 + type: "warning"
74 - }) 81 + });
75 } 82 }
76 } 83 }
77 -} 84 +};
78 </script> 85 </script>
79 86
80 <style scoped> 87 <style scoped>
81 -.line{ 88 +.line {
82 text-align: center; 89 text-align: center;
83 } 90 }
84 </style> 91 </style>
......