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

src/components/upload.vue

@@ -96,8 +96,12 @@ export default {
       if (_.isArray(val)) {
         let newArr = val.map(item => {
           let object = {};
-          object.name = item.name;
-          object.url = item.url;
+          if (typeof item === 'string') {
+            object.url = item;
+          } else {
+            object.name = item.name;
+            object.url = item.url;
+          }
           return object;
         });
         this.$set(this, `fileList`, newArr);

src/views/pcenter/parts/infoAdmin.vue

@@ -54,7 +54,14 @@
                 <el-input :disabled="disabled" v-model="form.title" placeholder="请输入信息标题"></el-input>
               </el-form-item>
               <el-form-item label="简介" prop="introduction">
-                <el-input :disabled="disabled" v-model="form.introduction" type="textarea" placeholder="请输入信息简介"></el-input>
+                <el-input
+                  :disabled="disabled"
+                  v-model="form.introduction"
+                  type="textarea"
+                  placeholder="请输入信息简介"
+                  maxlength="300"
+                  show-word-limit
+                ></el-input>
               </el-form-item>
               <el-form-item label="发布时间" prop="publish_time">
                 <el-date-picker :disabled="disabled" v-model="form.publish_time" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
@@ -71,9 +78,9 @@
               <el-form-item label="发布单位" prop="publish_unit">
                 <el-input :disabled="disabled" v-model="form.publish_unit" placeholder="请输入发布单位"></el-input>
               </el-form-item>
-              <el-form-item label="图片" prop="img_url" v-if="form.type == '0'">
+              <el-form-item label="图片" prop="img_url" v-if="form.type == '0' && form.col_name == '图片新闻'">
                 <el-image v-if="disabled" :src="form.img_url"></el-image>
-                <upload v-else :limit="1" :data="form.img_url" type="img_url" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
+                <upload v-else :limit="9" :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 == '科技培训'">
                 <video v-if="disabled" :src="form.file_url" controls="controls" style="height: 395px; width: 100%;">
@@ -92,7 +99,15 @@
               </el-form-item>
               <el-form-item label="内容" prop="content" v-if="form.type == '0'">
                 <span v-if="disabled" v-html="form.content"></span>
-                <wang-editor v-else v-model="form.content" ref="editor"></wang-editor>
+                <el-input
+                  v-if="!disabled && form.col_name == '专题研讨'"
+                  v-model="form.content"
+                  type="textarea"
+                  placeholder="请输入内容"
+                  maxlength="300"
+                  show-word-limit
+                ></el-input>
+                <wang-editor v-if="!disabled && form.col_name != '专题研讨'" v-model="form.content" ref="editor"></wang-editor>
               </el-form-item>
               <el-form-item label="是否推荐" prop="is_top">
                 <el-radio-group :disabled="disabled" v-model="form.is_top">
@@ -100,11 +115,18 @@
                   <el-radio label="1">推荐</el-radio>
                 </el-radio-group>
               </el-form-item>
+              <el-form-item label="信息状态" prop="status">
+                <el-radio-group :disabled="disabled" v-model="form.status">
+                  <el-radio label="0">草稿</el-radio>
+                  <el-radio label="1">待审核</el-radio>
+                  <el-radio v-if="user.type == '0' || user.type == '1'" label="2">审核通过</el-radio>
+                  <el-radio v-if="user.type == '0' || user.type == '1'" label="3">审核拒绝</el-radio>
+                </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" v-if="form.status === undefined" @click="submitDraft('form')">保存草稿</el-button>
-                <el-button type="success" v-if="form.status === undefined || form.status === '0'" @click="submitForm('form')">发布信息</el-button>
+                <el-button type="primary" @click="submitDraft('form')">保存</el-button>
                 <el-button type="danger" @click="resetForm('form')">取消</el-button>
               </el-col>
             </el-form>
@@ -145,11 +167,11 @@ export default {
         { value: '平台建设', label: '平台建设' },
         { value: '项目成果', label: '项目成果' },
         { value: '知识产权', label: '知识产权' },
-        { value: '科技合作', label: '科技合作' },
+        { value: '科技支撑', label: '科技支撑' },
         { value: '超算联盟', label: '超算联盟' },
         { value: '国家网格', label: '国家网格' },
-        { value: '教学中心', label: '教学中心' },
-        { value: '创业基地', label: '创业基地' },
+        { value: '数学中心', label: '数学中心' },
+        { value: '创新基地', label: '创新基地' },
         { value: '软件中心', label: '软件中心' },
         { value: '专题研讨', label: '专题研讨' },
         { value: '技术问答', label: '技术问答' },
@@ -162,14 +184,16 @@ export default {
       ],
       // 发布
       form: {},
+      imgList: [],
       // 规则
       rules: {
         col_name: [{ required: true, message: '请选择栏目', trigger: 'blur' }],
         title: [{ required: true, message: '请输入信息标题', trigger: 'blur' }],
-        introduction: [{ required: true, message: '请输入简介', trigger: 'blur' }],
+        // introduction: [{ required: true, message: '请输入简介', trigger: 'blur' }],
         publish_time: [{ required: false, message: '请选择发布时间', trigger: 'blur' }],
         publish_unit: [{ required: false, message: '请输入发布单位', trigger: 'blur' }],
         type: [{ required: true, message: '请输入信息类型', trigger: 'blur' }],
+        status: [{ required: true, message: '请选择信息状态', trigger: 'blur' }],
         img_url: [{ required: false, message: '请上传图片', trigger: 'blur' }],
         is_top: [{ required: false, message: '请选择', trigger: 'blur' }],
       },
@@ -191,7 +215,7 @@ export default {
     add() {
       this.display = 'detail';
       this.disabled = false;
-      this.form = {};
+      this.form = { type: '0' };
     },
     // 返回
     back() {
@@ -261,7 +285,6 @@ export default {
             }
           } else {
             this.form.publisher = this.user.uid;
-            this.form.status = '0';
             let res = await this.newsCreate(this.form);
             if (this.$checkRes(res)) {
               this.$message({
@@ -279,40 +302,6 @@ export default {
         }
       });
     },
-    // 提交发布
-    submitForm(formName) {
-      this.$refs[formName].validate(async valid => {
-        if (valid) {
-          if (this.form.publisher) {
-            this.form.status = '1';
-            let res = await this.newsUpdate(this.form);
-            if (this.$checkRes(res)) {
-              this.$message({
-                message: '发布信息成功',
-                type: 'success',
-              });
-              this.display = 'list';
-              this.searchInfo();
-            }
-          } else {
-            this.form.publisher = this.user.uid;
-            this.form.status = '1';
-            let res = await this.newsCreate(this.form);
-            if (this.$checkRes(res)) {
-              this.$message({
-                message: '发布信息成功',
-                type: 'success',
-              });
-              this.display = 'list';
-              this.searchInfo();
-            }
-          }
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
     // 取消
     resetForm(formName) {
       this.$refs[formName].resetFields();
@@ -332,7 +321,10 @@ export default {
     },
     // 图片
     uploadSuccess({ type, data }) {
-      this.$set(this.form, `${type}`, data.uri);
+      if (!this.form[type]) {
+        this.form[type] = [];
+      }
+      this.form[type].push(data.uri);
     },
   },
   computed: {