Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/components/uploadone.vue

@@ -4,7 +4,7 @@
       v-if="url"
       ref="upload"
       :action="url"
-      list-type="picture-card"
+      :list-type="listType"
       :file-list="fileList"
       :limit="limit"
       :on-exceed="outLimit"
@@ -30,7 +30,8 @@ export default {
     url: { type: null },
     limit: { type: Number },
     data: { type: null },
-    type: { type: String },
+    // type: { type: String },
+    listType: { type: String, default: 'picture-card' },
   },
   components: {},
   data: () => ({

src/views/pcenter/parts/infoAdmin.vue

@@ -64,8 +64,19 @@
               <el-form-item label="图片" prop="img_url" v-if="form.type == '0'">
                 <upload :limit="1" :data="form.img_url" type="img_url" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
               </el-form-item>
+              <el-form-item label="视频" prop="file_url" v-if="form.type == '0' && form.col_name == '科技培训'">
+                <upload
+                  :limit="1"
+                  :data="form.file_url"
+                  type="file_url"
+                  accept=".mp4"
+                  listType=""
+                  :url="'/files/imgpath/upload'"
+                  @upload="uploadSuccess"
+                ></upload>
+              </el-form-item>
               <el-form-item label="内容" prop="content" v-if="form.type == '0'">
-                <el-input v-model="form.content" type="textarea" placeholder="请输入信息内容"></el-input>
+                <wang-editor v-model="form.content" ref="editor"></wang-editor>
               </el-form-item>
               <el-form-item label="是否推荐" prop="is_top">
                 <el-radio-group v-model="form.is_top">
@@ -73,7 +84,7 @@
                   <el-radio label="1">推荐</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="状态" prop="status">
+              <el-form-item label="状态" prop="status" v-if="user.type == '0' || user.type == '1'">
                 <el-radio-group v-model="form.status">
                   <el-radio label="0">草稿</el-radio>
                   <el-radio label="1">审核中</el-radio>
@@ -81,6 +92,8 @@
                 </el-radio-group>
               </el-form-item>
               <el-col :span="24" style="text-align:center;">
+                <el-button type="success" v-if="user.type == '0' || user.type == '1'" @click="examineIn()">审核通过</el-button>
+                <el-button type="danger" v-if="user.type == '0' || user.type == '1'" @click="examineOut()">审核拒绝</el-button>
                 <el-button type="primary" @click="submitDraft('form')">保存草稿</el-button>
                 <el-button type="success" @click="submitForm('form')">发布信息</el-button>
                 <el-button type="danger" @click="resetForm('form')">取消</el-button>
@@ -94,13 +107,15 @@
 </template>
 
 <script>
-import upload from '@/components/uploadone.vue';
+import upload from '@/components/upload.vue';
+import wangEditor from '@/components/wang-editor.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'infoAdmin',
   props: {},
   components: {
     upload,
+    wangEditor,
   },
   data: function() {
     return {
@@ -162,6 +177,7 @@ export default {
     submitDraft(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.form.uid = this.user.uid;
           console.log(this.form);
         } else {
           console.log('error submit!!');
@@ -184,6 +200,14 @@ export default {
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
+    // 审核通过
+    examineIn() {
+      console.log('审核通过');
+    },
+    // 审核拒绝
+    examineOut() {
+      console.log('审核拒绝');
+    },
     // 图片
     uploadSuccess({ type, data }) {
       this.$set(this.form, `${type}`, data.uri);