Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development

config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env');
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   API_URL: '"/"',
-  MAX_FILESIZE:'1024*1024*5',
+  MAX_FILESIZE:'1024*1024*10',
   IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
   INVITE_URL:'"http://wechat.test.singsingenglish.com"',
 });

config/prod.env.js

@@ -3,5 +3,5 @@ module.exports = {
   NODE_ENV: '"production"',
   IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
   API_URL: '"/"',
-  MAX_FILESIZE:'1024*1024*5',
+  MAX_FILESIZE:'1024*1024*10',
 }

config/test.env.js

@@ -6,5 +6,5 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"production"',
   IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
   API_URL: '"/"',
-  MAX_FILESIZE:'1024*1024*5',
+  MAX_FILESIZE:'1024*1024*10',
 })

src/components/resources/editor.vue

@@ -3,9 +3,6 @@
     <el-container>
       <el-header height="80px">
         <div class="head-top">
-          <el-button size="mini">
-            课程基本信息编辑
-          </el-button>
           缩放：<el-input-number v-model="bigNum"  size="mini" :min="30" :max="150" :step="10"></el-input-number>
           <el-button size="mini" type="success" style="float: right" @click="setOpen()">
             编辑当前页参数
@@ -31,6 +28,7 @@
           </div>
         </el-aside>
         <el-main>
+          <!--爸妈看一看1-->
           <div v-if="selectedMould[nowIndex] && selectedMould[nowIndex].key === 'look1'">
             <div class="look1" :style="{backgroundImage:`url(${mouldImg.look1.bg}`,transform:`scale(${bigNum/100},${bigNum/100})`}">
               <div class="bg-block">
@@ -70,6 +68,7 @@
               </div>
             </div>
           </div>
+          <!--音频1-->
           <div v-if="selectedMould[nowIndex] && selectedMould[nowIndex].key === 'radio1'">
             <div class="look1 radio1" :style="{backgroundImage:`url(${selectedMould[nowIndex].content.titleType === 0 ? mouldImg.radio1.bg:mouldImg.radio1.moerduoBg}`,transform:`scale(${bigNum/100},${bigNum/100})`}">
               <div class="bg-block" :style="{backgroundImage:`url(${mouldImg.radio1.contentBg}`}">
@@ -117,11 +116,15 @@
               </div>
             </div>
           </div>
+          <!--视频玩一玩1-->
           <div v-if="selectedMould[nowIndex] && selectedMould[nowIndex].key === 'play1'">
             <div class="look1 play1" :style="{backgroundImage:`url(${mouldImg.play1.bg}`,transform:`scale(${bigNum/100},${bigNum/100})`}">
               <div class="bg-block">
                 <div class="video-block">
-                  <img :src="mouldImg.play1.play"/>
+                  <div class="icon-class">
+                    <img :src="mouldImg.play1.play"/>
+                  </div>
+                  <video v-if="selectedMould[nowIndex].content.videoUrl.length > 0" :poster="selectedMould[nowIndex].content.banner[0].url" :src="selectedMould[nowIndex].content.videoUrl[0].url"></video>
                 </div>
                 <img :src="mouldImg.play1.radio" class="radio-img"/>
                 <img :src="mouldImg.play1.backBtn" class="btn back"/>
@@ -129,6 +132,7 @@
               </div>
             </div>
           </div>
+          <!--爸妈秀宝贝1-->
           <div v-if="selectedMould[nowIndex] && selectedMould[nowIndex].key === 'show1'">
             <div class="look1 show1" :style="{backgroundImage:`url(${mouldImg.show1.bg}`,transform:`scale(${bigNum/100},${bigNum/100})`}">
               <img :src="mouldImg.show1.haiou" class="haiou"/>
@@ -149,7 +153,7 @@
                 </div>
                 <div class="text-block">
                   解释说明：
-                  <div class="text-content">1231231231</div>
+                  <div class="text-content" v-html="selectedMould[nowIndex].content.text"></div>
                 </div>
                 <div class="sub-block">
                   <img :src="mouldImg.show1.subBtn">
@@ -161,169 +165,305 @@
               </div>
             </div>
           </div>
+          <!--唱学加油包1-->
           <div v-if="selectedMould[nowIndex] && selectedMould[nowIndex].key === 'refueling1'">
             <div class="look1 refueling1" :style="{backgroundImage:`url(${mouldImg.refueling1.bg}`,transform:`scale(${bigNum/100},${bigNum/100})`}">
               <div class="bg-block">
                 <img :src="mouldImg.refueling1.title">
-                <div class="content-img">
+                <div class="content-img" :style="{backgroundImage:selectedMould[nowIndex].content.banner[0] ? `url(${selectedMould[nowIndex].content.banner[0].url}`:''}">
                   <img :src="mouldImg.refueling1.radio" class="radio-icon">
                 </div>
               </div>
               <div class="bottom-block">
                 <img :src="mouldImg.refueling1.backBtn"/>
-                <img :src="mouldImg.refueling1.next"/>
+                <img :src="mouldImg.refueling1.next" v-if="selectedMould[nowIndex].content.nextType"/>
               </div>
             </div>
           </div>
         </el-main>
-  </el-container>
-  </el-container>
-  <el-dialog
-    title="编辑"
-    :visible.sync="dialogVisible"
-    :modal="false"
-    width="30%">
-    <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'look1'">
-      <el-form-item label="音频">
-        <el-upload
-          class="upload-demo"
-          action="/api/public/upload"
-          multiple
-          :limit="1"
-          :on-exceed="handleExceed"
-          :on-success="uploadSuccess"
-          :file-list="selectedMould[nowIndex].content.radioUrl">
-          <el-button size="small" type="primary">点击上传</el-button>
-        </el-upload>
-      </el-form-item>
-      <el-form-item label="今日目标">
-        <el-input type="textarea" v-model="selectedMould[nowIndex].content.today" placeholder="今日目标换行输入<br>"></el-input>
-      </el-form-item>
-      <el-form-item label="陪玩指南">
-        <el-input type="textarea" v-model="selectedMould[nowIndex].content.directory" placeholder="陪玩指南换行输入<br>"></el-input>
-      </el-form-item>
-      <el-form-item label="下一页序号">
-        <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in selectedMould"
-            :key="index"
-            :label="index"
-            :value="index">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="停留时长">
-        <el-input-number v-model="selectedMould[nowIndex].content.timeLang"></el-input-number>
-      </el-form-item>
-    </el-form>
-    <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'radio1'">
-      <el-form-item label="音频">
-        <el-upload
-          class="upload-demo"
-          action="/api/public/upload"
-          multiple
-          :on-exceed="handleExceed"
-          :on-success="uploadSuccessRadio1"
-          :file-list="selectedMould[nowIndex].content.radio">
-          <el-button size="small" type="primary">点击上传</el-button>
-        </el-upload>
-      </el-form-item>
-      <div v-for="(data,index) in selectedMould[nowIndex].content.radio">
-        <el-form-item label="音频名字">
-          <el-input v-model="data.title" placeholder="请输入音频显示标题"></el-input>
+      </el-container>
+    </el-container>
+    <el-dialog
+      title="编辑"
+      :visible.sync="dialogVisible"
+      :modal="false"
+      width="30%">
+      <!--爸妈看一看1-->
+      <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'look1'">
+        <el-form-item label="音频">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            multiple
+            :limit="1"
+            :on-exceed="handleExceed"
+            :on-success="uploadSuccess"
+            :file-list="selectedMould[nowIndex].content.radioUrl">
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="今日目标">
+          <el-input type="textarea" v-model="selectedMould[nowIndex].content.today" placeholder="今日目标换行输入<br>"></el-input>
+        </el-form-item>
+        <el-form-item label="陪玩指南">
+          <el-input type="textarea" v-model="selectedMould[nowIndex].content.directory" placeholder="陪玩指南换行输入<br>"></el-input>
+        </el-form-item>
+        <el-form-item label="下一页序号">
+          <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="停留时长">
+          <el-input-number v-model="selectedMould[nowIndex].content.timeLang"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <!--音频1-->
+      <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'radio1'">
+        <el-form-item label="音频">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            multiple
+            :on-exceed="handleExceed"
+            :on-success="uploadSuccessRadio1"
+            :file-list="selectedMould[nowIndex].content.radio">
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <div v-for="(data,index) in selectedMould[nowIndex].content.radio">
+          <el-form-item label="音频名字">
+            <el-input v-model="data.title" placeholder="请输入音频显示标题"></el-input>
+          </el-form-item>
+          <el-form-item label="音频作者">
+            <el-input v-model="data.lable" placeholder="请输入音频来源作者"></el-input>
+          </el-form-item>
+        </div>
+        <el-form-item label="上一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.lastIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标题类型">
+          <el-select v-model="selectedMould[nowIndex].content.titleType" placeholder="请选择">
+            <el-option
+              :value="0"
+              label="宝贝玩一玩">
+            </el-option>
+            <el-option
+              :value="1"
+              label="磨耳朵">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="按钮组">
+          <el-select v-model="selectedMould[nowIndex].content.buttonType" placeholder="请选择">
+            <el-option
+              :value="0"
+              label="返回看一看 + 爸妈秀宝贝">
+            </el-option>
+            <el-option
+              :value="1"
+              label="返回玩一玩 + 完成今日学习">
+            </el-option>
+            <el-option
+              :value="2"
+              label="上一页 + 完成今日学习">
+            </el-option>
+            <el-option
+              :value="3"
+              label="返回玩一玩 + 下一页">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="视频切换">
+          <el-switch v-model="selectedMould[nowIndex].content.tabVideo.type">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="视频目标" v-if="selectedMould[nowIndex].content.tabVideo.type">
+          <el-select v-model="selectedMould[nowIndex].content.tabVideo.index" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="停留时长">
+          <el-input-number v-model="selectedMould[nowIndex].content.timeLang"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <!--视频玩一玩1-->
+      <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'play1'">
+        <el-form-item label="视频">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            :http-request="uploadFile"
+            multiple
+            :limit="1"
+            :disabled="(fileUid && progress < 99)"
+            :file-list="selectedMould[nowIndex].content.radio">
+            <el-button size="small" type="primary" :disabled="(fileUid && progress < 99)">点击上传</el-button>
+            <div style="width: 300px">
+              <el-progress v-if="fileUid" :percentage="progress"></el-progress>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="视频封面">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            :http-request="uploadFileVideo1Banner"
+            list-type="picture-card"
+            multiple
+            :limit="1"
+            :disabled="(fileUid && progress < 99)"
+            :file-list="selectedMould[nowIndex].content.radio">
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="是否切换">
+          <el-switch v-model="selectedMould[nowIndex].content.tabRadio.type">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="切换目标" v-if="selectedMould[nowIndex].content.tabRadio.type">
+          <el-select v-model="selectedMould[nowIndex].content.tabRadio.index" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.lastIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <!--爸妈秀宝贝1-->
+      <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'refueling1'">
+        <el-form-item label="音频">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            :http-request="uploadFileRadio"
+            multiple
+            :limit="1"
+            :disabled="(fileUid && progress < 99)"
+            :file-list="selectedMould[nowIndex].content.radio">
+            <el-button size="small" type="primary" :disabled="(fileUid && progress < 99)">点击上传</el-button>
+            <div style="width: 300px">
+              <el-progress v-if="fileUid" :percentage="progress"></el-progress>
+            </div>
+          </el-upload>
         </el-form-item>
-        <el-form-item label="音频作者">
-          <el-input v-model="data.lable" placeholder="请输入音频来源作者"></el-input>
+        <el-form-item label="图片">
+          <el-upload
+            class="upload-demo"
+            action="/api/public/upload"
+            :http-request="uploadFileVideo1Banner"
+            list-type="picture-card"
+            multiple
+            :limit="1"
+            :disabled="(fileUid && progress < 99)"
+            :file-list="selectedMould[nowIndex].content.radio">
+          </el-upload>
         </el-form-item>
-      </div>
-      <el-form-item label="上一步序号">
-        <el-select v-model="selectedMould[nowIndex].content.lastIndex" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in selectedMould"
-            :key="index"
-            :label="index"
-            :value="index">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="下一步序号">
-        <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in selectedMould"
-            :key="index"
-            :label="index"
-            :value="index">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="标题类型">
-        <el-select v-model="selectedMould[nowIndex].content.titleType" placeholder="请选择">
-          <el-option
-            :value="0"
-            label="宝贝玩一玩">
-          </el-option>
-          <el-option
-            :value="1"
-            label="磨耳朵">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="按钮组">
-        <el-select v-model="selectedMould[nowIndex].content.buttonType" placeholder="请选择">
-          <el-option
-            :value="0"
-            label="返回看一看 + 爸妈秀宝贝">
-          </el-option>
-          <el-option
-            :value="1"
-            label="返回玩一玩 + 完成今日学习">
-          </el-option>
-          <el-option
-            :value="2"
-            label="上一页 + 完成今日学习">
-          </el-option>
-          <el-option
-            :value="3"
-            label="返回玩一玩 + 下一页">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="视频切换">
-        <el-switch v-model="selectedMould[nowIndex].content.tabVideo.type">
-        </el-switch>
-      </el-form-item>
-      <el-form-item label="视频目标" v-if="selectedMould[nowIndex].content.tabVideo.type">
-        <el-select v-model="selectedMould[nowIndex].content.tabVideo.index" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in selectedMould"
-            :key="index"
-            :label="index"
-            :value="index">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="停留时长">
-        <el-input-number v-model="selectedMould[nowIndex].content.timeLang"></el-input-number>
-      </el-form-item>
-    </el-form>
-    <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'play1'">
-      <el-form-item label="音频">
-        <el-upload
-          class="upload-demo"
-          action="/api/public/upload"
-          :http-request="uploadFile"
-          multiple
-          :on-exceed="handleExceed"
-          :on-success="uploadSuccessRadio1"
-          :file-list="selectedMould[nowIndex].content.radio">
-          <el-button size="small" type="primary">点击上传</el-button>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-  </el-dialog>
+        <el-form-item label="上一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.lastIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下一页">
+          <el-switch v-model="selectedMould[nowIndex].content.nextType">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="下一步序号" v-if="selectedMould[nowIndex].content.nextType">
+          <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <!--唱学加油包1-->
+      <el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'show1'">
+        <el-form-item label="说明文字">
+          <el-input type="textarea" :rows="3" v-model="selectedMould[nowIndex].content.text"></el-input>
+        </el-form-item>
+        <el-form-item label="解锁限制">
+          <el-switch v-model="selectedMould[nowIndex].content.check">
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="上一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.lastIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下一步序号">
+          <el-select v-model="selectedMould[nowIndex].content.nextIndex" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in selectedMould"
+              :key="index"
+              :label="index"
+              :value="index">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
-
 <script>
   import mouldImg from '../../util/mouldImgUrl'
   import {uploadFileApi} from "../../service/api";
@@ -332,32 +472,77 @@
     name: "editor",
     props:[
       'selectedMould',
+      'editorObj'
     ],
     data(){
       return {
+        // 放大缩小参数
         bigNum:100,
+        // 弹窗参数
         dialogVisible:false,
+        // 当前对象下标
         nowIndex:0,
+        // 模板图片集
         mouldImg:mouldImg,
+        // 文件上传Uid
+        fileUid:null
+      }
+    },
+    mounted(){
+      console.log(this.editorObj)
+    },
+    computed:{
+      progress(){
+        return this.$store.state.progressList.find(i=>{return i.id === this.fileUid}).num <100 ? this.$store.state.progressList.find(i=>{return i.id === this.fileUid}).num : 100
       }
     },
     methods:{
+      initPage(){
+        switch (this.editorObj.type) {
+          case 0:
+            this.selectedMould=[]
+        }
+      },
+      // 打开设置弹窗
       setOpen(){
         this.dialogVisible = true;
       },
+      // 上传Banner
+      uploadFileVideo1Banner(a){
+        this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
+        uploadFileApi({file:a.file,type:'local'}).then(res=>{
+          this.selectedMould[this.nowIndex].content.banner[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
+        })
+      },
+      // 上传音频
+      uploadFileRadio(a){
+        this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
+        this.fileUid = a.file.uid;
+        uploadFileApi({file:a.file,type:'local'}).then(res=>{
+          this.selectedMould[this.nowIndex].content.radio[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
+        })
+      },
+      // 上传视频
       uploadFile(a){
-        uploadFileApi(a.file).then(res=>{
+        this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
+        this.fileUid = a.file.uid;
+        uploadFileApi({file:a.file,type:'local'}).then(res=>{
+          this.selectedMould[this.nowIndex].content.videoUrl[0]={name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
         })
       },
+      // 列表选择
       chooseThat(data){
         this.nowIndex = data;
       },
+      // 超出个数显示
       handleExceed(){
         this.$message.error('超出文件限制个数');
       },
+      // 源生上传成功回调
       uploadSuccess(a){
         this.selectedMould[this.nowIndex].content.radioUrl.push({name:a.data.url,url:process.env.IMAGE_URL_HEAD + a.data.url})
       },
+      // 源生上传成功音频回调
       uploadSuccessRadio1(a){
         this.selectedMould[this.nowIndex].content.radio.push({name:a.data.url,url:process.env.IMAGE_URL_HEAD + a.data.url,title:'',lable:''})
       }
@@ -459,6 +644,14 @@
           height: 100%;
           width: 1000px;
           position: relative;
+          .icon-class{
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background: rgba(0,0,0,0.3);
+          }
           img{
             position: absolute;
             top: 50%;
@@ -466,6 +659,9 @@
             margin-top: -50px;
             margin-left: -50px;
           }
+          video{
+            width: 1000px;
+          }
         }
       }
     }
@@ -601,6 +797,8 @@
         position: relative;
         height: 832px;
         background: #333;
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
         margin: 20px;
         border-radius: 8px;
         .radio-icon{

src/components/resources/editorDialog.vue

@@ -23,14 +23,27 @@
             </el-card>
           </div>
         </div>
-
       </el-aside>
       <el-main>
-        <editor :selectedMould="selectedMould"/>
+        <el-button size="mini" @click="showDialog = true">
+          课程基本信息编辑
+        </el-button>
+        <el-button size="mini">
+          保存
+        </el-button>
+        <editor :selectedMould="selectedMould" :editorObj="editorObj"/>
       </el-main>
     </el-container>
-    <el-dialog>
+    <el-dialog
+      title="信息编辑"
+      :modal="false"
+      :visible.sync="showDialog"
+      width="30%">
+      <el-form>
+        <el-form-item>
 
+        </el-form-item>
+      </el-form>
     </el-dialog>
   </el-dialog>
 </template>
@@ -39,6 +52,8 @@
   import addUrl from '../../assets/editor/Group 7.png'
   import {MOULDLIST} from "../../util/resourceMould";
   import editor from './editor'
+  import {addCategoryApi} from "../../service/api";
+
   export default {
     props:[
       'editorObj'
@@ -50,6 +65,7 @@
       return{
         selectedMould:[],
         addUrl:addUrl,
+        showDialog:false,
         mouldList:MOULDLIST,
         age:[0,0],
         level:[0,0],

src/service/api.js

@@ -143,12 +143,12 @@ const getCategoryUrl = `${_baseUrl}api/admin/category/list/0`;
 export const getCategoryApi = function (pid) {
   return Vue.prototype.$fetch(getCategoryUrl,{'pid':pid})
 };
-//删除元素分类
+//删除分类
 const delCategoryUrl = `${_baseUrl}api/admin/category`;
 export const delCategoryApi = function (id) {
   return Vue.prototype.$del(`${delCategoryUrl}/${id}`)
 };
-//元素排序修改
+//分类排序修改
 const sortCategoryUrl = `${_baseUrl}api/admin/category/sort`;
 export const sortCategoryApi = function (json) {
   return Vue.prototype.$patch(sortCategoryUrl,json)
@@ -158,6 +158,21 @@ const getCateDetailListUrl = `${_baseUrl}api/admin/element/list/0`;
 export const getCateListApi = function (id) {
   return Vue.prototype.$fetch(getCateDetailListUrl,id)
 };
+// 添加元素
+const addElementUrl = `${_baseUrl}api/admin/element/add/`;
+export const addElementApi = function (json, id) {
+  return Vue.prototype.$post(`${addElementUrl}${id}`,json)
+};
+// 查询元素详情
+const getElemenetDetailUrl = `${_baseUrl}api/admin/element/`;
+export const getElemenetDetailApi = function (id) {
+  return Vue.prototype.$fetch(`${getElemenetDetailUrl}${id}`)
+};
+// 编辑元素
+const editElementUrl = `${_baseUrl}api/admin/element/`;
+export const editElementApi = function (id, json) {
+  return Vue.prototype.$put(`${editElementUrl}${id}`, json)
+};
 // 获取单品列表
 const getSingleListUrl = `${_baseUrl}api/admin/item/stock/list`;
 export const getSingleListApi = function (name) {
@@ -256,8 +271,8 @@ export const getMediaListApi = function (json) {
 // const getGoodsListUrl = `${_baseUrl}api/admin/goods/list`;
 // 文件上传
 const uploadFileUrl = `${_baseUrl}api/public/upload/zone`;
-export const uploadFileApi = function (data) {
-  return Vue.prototype.$upload(uploadFileUrl,data)
+export const uploadFileApi = function (json) {
+  return Vue.prototype.$upload(uploadFileUrl,json)
 };
 // 获取菜单列表
 const getMenuListUrl = `${_baseUrl}api/admin/category/list/2`;

src/service/index.js

 import axios from 'axios';
 import md5 from 'js-md5';
+import store from "@/store"
 import { MessageBox ,Message  } from 'element-ui';
 import router from '../router'
 import Cookie from '../util/cookie'
@@ -65,29 +66,35 @@ axios.interceptors.response.use(
  * @param params
  * @returns {Promise}
  */
-export function upload(url,data) {
+export function upload(url,json) {
   return new Promise((resolve,reject) => {
-
     //开启分片
-      let size = parseInt(Number(data.size)/Number(process.env.MAX_FILESIZE) +1);
+      let size = parseInt(Number(json.file.size)/Number(process.env.MAX_FILESIZE) +1);
       let y = 0;
       let fun = function(){
         let formData = new FormData();
-        let file = data.slice(y*process.env.MAX_FILESIZE,(y+1)*process.env.MAX_FILESIZE)
-        console.log(data)
+        let file = json.file.slice(y*process.env.MAX_FILESIZE,(y+1)*process.env.MAX_FILESIZE);
+        console.log(json.file);
         formData.append('chunk', y);
-        formData.append('file_name', data.name);
+        formData.append('file_name', json.file.name);
         formData.append('count', size);
         formData.append('file', file);
         axios.post(url,formData,{ headers: {
             'Content-Type': 'multipart/form-data'
-          },timeout:60000})
+          },timeout:60000,
+          onUploadProgress: progressEvent => {
+            if(store.state.progressList.find(i=>{return i.id === json.file.uid})){
+              let progress =  ((Number(progressEvent.loaded) + Number(y*process.env.MAX_FILESIZE)) / Number(json.file.size) * 100| 0);
+              store.dispatch('setProgress',{type: 'change',id: json.file.uid ,num: progress});
+            }
+          },})
           .then(response => {
             if(response.data.code === 200){
-              y++;
-              if(y<size){
+              if(y+1<size){
+                y++;
                 fun()
               }else{
+                y=0;
                 resolve(response.data.data);
               }
             }else{

src/store/actions.js

@@ -7,4 +7,7 @@ export default{
   setUserName({commit},name){
     commit('setUserName',name);
   },
+  setProgress({commit},data){
+    commit('progress',data);
+  },
 }

src/store/index.js

@@ -14,6 +14,7 @@ export default new vuex.Store({
     menuList:menu,
     menuType:false,
     nowTab:'first',
+    progressList:[],
     openedTab:[
       {
         value:'首页',

src/store/mutations.js

@@ -19,6 +19,19 @@ const mutations={
   },
   changeParentRouter(state,data){
     state.menuList.find((a)=>{return a.name === data.name}).routerName = data.to.name
+  },
+  progress(state,data){
+    switch (data.type) {
+      case 'new':
+        state.progressList.push({num:0,id:data.id});
+        break;
+      case 'change':
+        state.progressList.find((x)=>{return x.id === data.id}).num = data.num;
+        break;
+      case 'delete':
+        delete state.progressList.find((x)=>{return x.id === data.id});
+        break
+    }
   }
 };
 export default mutations;

src/util/resourceMould.js

@@ -41,8 +41,8 @@ export const MOULDLIST = [
     name:'玩-video-1',
     key:'play1',
     content:{
-      videoUrl:'',
-      banner:"",
+      videoUrl:[],
+      banner:[],
       nextIndex:'',
       lastIndex:'',
       tabRadio:{
@@ -54,11 +54,24 @@ export const MOULDLIST = [
     title:'唱学加油包',
     imgUrl:RefuelingUrl,
     name:'加油包-1',
-    key:'refueling1'
+    key:'refueling1',
+    content:{
+      radio:[],
+      banner:[],
+      nextIndex:'',
+      nextType:true,
+      lastIndex:'',
+    }
   },{
     title:'爸妈秀宝贝',
     imgUrl:showBabyUrl,
     name:'秀宝贝-1',
-    key:'show1'
+    key:'show1',
+    content:{
+      text:'',
+      check:true,
+      nextIndex:'',
+      lastIndex:'',
+    }
   },
 ];