Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue

config/index.js

@@ -19,7 +19,7 @@ module.exports = {
 
     host: 'test1.sgjyun.com',
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    host: 'test1.sgjyun.com',
+    // host: 'test1.sgjyun.com',
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/api/act/submitinfo.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
-export function submitForm (params){
-    //console.log("文章列表",params)
+export function submitForm (data){
+    console.log("文章列表",data)
     return request({
         url: '/api/acticle/createacticle',
-        method: 'Get',
-        params: params
+        method: 'Post',
+        data: data
     })
 }
 
@@ -43,10 +43,36 @@ export function GetCategorys(params){
      })
 }
 
-export function EditArticleCategory(MenuId,data){
+export function EditArticleCategory(id,data){
+    console.log("abc",data)
     return request({
-        url:'/api/acticle/edit?MenuId='+MenuId,
-        method:'put',
-        data,data
+        url:'/api/acticle/edit?id='+id,
+        method:'Post',
+        data:data
+    })
+}
+
+export function DeleteCategorys(data){
+     return request({
+         url:'/api/acticle/delete',
+         method:'delete',
+         data:data
+     })
+}
+
+export function addVido(data){
+    console.log("发布视频",data)
+    return request({
+        url:"/api/acticle/addvido",
+        method:"post",
+        data:data,
+    })
+}
+
+export function Savedraft(data){
+    return request({
+        url:"/api/acticle/savedraft",
+        method:"post",
+        data:data,
     })
 }

src/api/activity/activity.js

@@ -32,4 +32,26 @@ export function submitActivity(publish, activity) {
     },
     data: activity,
   })
+}
+
+export function fetchActivityDetailViewData(id) {
+  return request({
+    url: "/api/activity/detailview",
+    method: "get",
+    params: {
+      id: id,
+    }
+  })
+}
+
+export function fetchActivitySignupUsers(activity_id, keyword, page) {
+  return request({
+    url: "/api/activity/signups",
+    method: "get",
+    params: {
+      id: activity_id,
+      keyword: keyword,
+      page: page,
+    }
+  })
 }

src/lang/en.js

@@ -116,6 +116,9 @@ export default {
     activityPublish: "publish activity",
     activityModify: "edit activity",
     systemsetting:'Systemsetting',
+    activityDetail: "activity detail",
+    activityShare: "activity share",
+    activityPreview: "activity preview",
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -165,6 +165,9 @@ export default {
     activityModify: "编辑活动",
     systemsetting:'系统设置',
     staffmanagement:'员工管理',
+    activityDetail: "活动详情",
+    activityShare: "活动分享",
+    activityPreview: "活动预览",
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/marketing_tool.js

@@ -39,5 +39,38 @@ export default {
         noCache: true
       }
     },
+    {
+      path: "/activity",
+      hidden: true,
+      is_menu: false,
+      component: () => import("@/scrm_pages/marketing_tool/activity_detail"),
+      name: "activityDetail",
+      meta: {
+        title: "activityDetail",
+        noCache: true,
+      }
+    },
+    {
+      path: "/activity/share",
+      hidden: true,
+      is_menu: false,
+      component: () => import("@/scrm_pages/marketing_tool/activity_share"),
+      name: "activityShare",
+      meta: {
+        title: "activityShare",
+        noCache: true,
+      }
+    },
+    {
+      path: "/activity/preview",
+      hidden: true,
+      is_menu: false,
+      component: () => import("@/scrm_pages/marketing_tool/activity_preview"),
+      name: "activityPreview",
+      meta: {
+        title: "activityPreview",
+        noCache: true,
+      }
+    },
   ]
 }

src/scrm_pages/article/acticleCategory.vue

@@ -6,8 +6,8 @@
       </div>
       <div class="app-container">
         <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
-          <el-checkbox style="width: 30px">全选</el-checkbox>
-          <el-button size="small" icon="el-icon-delete">批量删除</el-button>
+          <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
+          <el-button size="small" icon="el-icon-delete" @click="openDeleteCategorys">批量删除</el-button>
 
         </div>
 
@@ -18,6 +18,7 @@
             ref="multipleTable"
             :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
             :data="articsData"
+            @selection-change="handleSelectionChange"
           >
             <el-table-column
               type="selection"
@@ -26,7 +27,7 @@
 
             <el-table-column label="分类名称" align="center">
               <template slot-scope="scope">
-                {{scope.row.Name}}
+                {{scope.row.name}}
               </template>
             </el-table-column>
 
@@ -38,7 +39,7 @@
 
             <el-table-column label="分类排序" align="center">
               <template slot-scope="scope">
-                {{scope.row.Order}}
+                {{scope.row.order}}
               </template>
             </el-table-column>
 
@@ -58,7 +59,7 @@
                     size="mini"
                     type="danger"
                     icon="el-icon-delete"
-                    @click="handleDelete(scope.$index, scope.row)">
+                    @click="openDelete(scope.row,scope.$index)">
                   </el-button>
                 </el-tooltip>
 
@@ -92,7 +93,7 @@
   import BreadCrumb from '../components/bread-crumb'
   import CreateArticleForm from "./components/CreateArticleForm";
   import EditArticleForm from "./components/EditArticleForm";
-  import { GetCategorys } from '@/api/act/submitinfo'
+  import { GetCategorys,DeleteCategorys } from '@/api/act/submitinfo';
   export default {
     name: 'acticleCategory',
     components:{
@@ -108,20 +109,21 @@
         ],
         articsData:[],
         articData:{
-          Name:'',
-          Summary:'',
-          Order:'',
-          MenuId:0,
+          name:'',
+          summary:'',
+          order:'',
+          id:0,
         },
         total:0,
         listQuery:{
           page:1,
           limit:10,
           name:'',
-          content:'',
-          sort:'',
+          summary:'',
+          order:'',
         },
-         artilceIndex:-1,
+         artilceIndex:0,
+         checkAllStatus:false,
       }
     },
 
@@ -157,7 +159,74 @@
             console.log("heh",this.articsData)  
              this.artilceIndex = index 
              this.$refs.editArticleForm.open();        
-        }
+        },
+          changeCheck(){
+          this.$refs.multipleTable.clearSelection();
+          if (this.checkAllStatus) {
+            this.$refs.multipleTable.toggleAllSelection();
+            }
+           },
+        openDelete(row,index){
+          this.$confirm('确认要删除该分类名称吗？<br>删除后，该分类名称信息将无法恢复',{
+             dangerouslyUseHTMLString:true,
+             confirmButtonText: '确定',
+             cancelButtonText: '取消',
+             type: 'warning'   
+          }).then(()=>{
+            var ids = [];
+            ids.push(row.id);
+            DeleteCategorys({ids:ids}).then(response=>{
+                var res = response.data;
+                if(res.state === 1){
+                    this.articsData.splice(index,1);
+                    this.$message.success("删除会员成功");
+                }else{
+                   this.$message.error(res.msg);
+                }
+            }).catch(e=>{});
+          }).catch(() => {
+            return false        
+          });
+        },
+          handleSelectionChange(val){
+          this.selectedMembers = val;
+        },
+        openDeleteCategorys(){
+            if (this.selectedMembers.length==0) {
+            this.$message.error("请选择要删除的会员");
+            return false;
+          }   
+
+          this.$confirm('确认要删除所选的分类名称吗？<br>删除后，分类名称信息将无法恢复', '删除提示',{
+             dangerouslyUseHTMLString:true,
+             confirmButtonText: '确定',
+             cancelButtonText: '取消',
+             type: 'warning'
+          }).then(()=>{
+              var ids = [];
+              var idMap = {};
+              for (const index in this.selectedMembers) {
+                ids.push(this.selectedMembers[index].id);
+                idMap[this.selectedMembers[index].id] = this.selectedMembers[index].id;
+            }
+            DeleteCategorys({ids:ids}).then(response=>{
+               var res = response.data;
+               if(res.state ===1){
+                 var articsDatalength = this.articsData.length;
+                  for (let index = articsDatalength-1; index >= 0; index--) {
+                  if(this.articsData[index].id in idMap) {
+                    this.articsData.splice(index, 1);
+                  }                  
+                }
+                 this.$message.success("删除会员成功");
+               }else{
+                 this.$message.error(res.msg);
+              }
+            }).catch(e=>{});
+          }).catch(() => {
+            return false        
+          });
+        },
     },
      created(){
          this.GetCategorys()

src/scrm_pages/article/commentList.vue

@@ -4,7 +4,23 @@
           <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
         <div class="app-container">
-         评论列表
+           评论列表
+           <el-form-item ref="videocontentvideo" style="display:none;">
+              <img :src="imgurl">
+              <video width="320" height="240" controls id="upvideo">
+              </video>
+              <img :src="modlevidel" />
+            </el-form-item>
+
+            <el-form-item class="upload-demo-content" v-show="formLabelAlign.type==2">
+            <el-upload class="upload-demo" :limit="1" :on-exceed="exceedhandle" drag :file-list="filsListArray" :action="configuploadurl" :on-success="successuploadhandle" accept="video" name="fileList" :before-upload="beforeUploadVideo">
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">将视频文件拖到此处，或
+                <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip"></div>
+            </el-upload>
+          </el-form-item>
         </div>
     </div>
 </template>
@@ -22,7 +38,82 @@
           { path: false, name: '文章管理' },
           { path: '/articles/commentList', name: '评论列表' }
         ],
+        imgurl:'',
+        modlevidel:'',
+        formLabelAlign:'',
+        modlevidel:'',
+        filsListArray:[],
+        elForm:'',
+        configuploadurl:'',
+      }
+    },
+    methods:{
+      successuploadhandle(response, file, fileList) {
+      this.formLabelAlign.video = this.modlevidel =
+        response.data.fileList[0].url;
+        this.filsListArray = [];
+        this.filsListArray.push({
+        name: this.formLabelAlign.video,
+        url: this.formLabelAlign.video
+       });
+        this.findvideocover();
+    },
+      exceedhandle(files, fileList) {
+      this.$message.error("只能上传一个视频额");
+      },
+      beforeUploadVideo(file) {
+      if (
+        [
+          "video/mp4",
+          "video/ogg",
+          "video/flv",
+          "video/avi",
+          "video/wmv",
+          "video/rmvb"
+        ].indexOf(file.type) == -1
+      ) {
+        this.$message.error("请上传正确的视频格式");
+        return false;
       }
+     },
+
+     findvideocover() {
+      let _this = this;
+      this.$nextTick(() => {
+        let video = document.getElementById("upvideo");
+        let source = document.createElement("source");
+        // source.src = require("../../assets/5b086751dbb7af1ea8fa8d05e66fe5c3.mp4");this.formLabelAlign.video
+        source.src = this.formLabelAlign.video;
+        source.type = "video/mp4";
+        video.appendChild(source);
+        video.addEventListener("loadeddata", function() {
+          var canvas = document.createElement("canvas");
+          canvas.width = "320";
+          canvas.height = "320";
+          canvas
+            .getContext("2d")
+            .drawImage(video, 0, 0, canvas.width, canvas.width);
+          var img = document.createElement("img");
+          let imgsrc = canvas.toDataURL("image/png");
+          _this.Videoframehandle(imgsrc.split(",")[1]);
+        });
+      });
+      },
+
+      showvideohandle() {
+       this.$alert(
+        `<video width="320" height="240" controls>
+                      <source src="${
+                        this.filsListArray[0].url
+                      }"  type="video/mp4">
+                      您的浏览器不支持 HTML5 video 标签。
+                    </video>`,
+        "视频预览",
+        {
+          dangerouslyUseHTMLString: true
+        }
+      );
+    },
     }
   }
 </script>

src/scrm_pages/article/components/CreateArticleForm.vue

@@ -1,5 +1,4 @@
 <template>
-
     <div id="create-article-form-box">
       <el-dialog
         title="添加分类"
@@ -15,18 +14,18 @@
             </el-form-item>
           </el-row>
           <el-row :span=20>
-            <el-form-item label="分类描述:" required prop="content">
-              <keep-alive>
-                <neditor ref="neditor"
-                         id="editor"
-                         v-bind:r_content="form.content">
-                </neditor>
-              </keep-alive>
+            <el-form-item label="分类描述:" required prop="summary">      
+                <div style="margin: 10px 0;"></div>
+                <el-input
+                 type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4}"
+                 v-model="form.summary">
+                </el-input>
             </el-form-item>
           </el-row>
           <el-row :span=20>
-            <el-form-item label="排序" required prop="sort">
-              <el-input v-model="form.sort">
+            <el-form-item label="排序:" required prop="order">
+              <el-input v-model="form.order">
 
               </el-input>
             </el-form-item>
@@ -42,27 +41,31 @@
 </template>
 
 <script>
-    import Neditor from '@/components/Neditor'
     import { addCategory } from '@/api/act/submitinfo'
     export default {
-        name: "CreateArticleForm",
-         components:{
-           Neditor,
-        },
+        name: "CreateArticleForm",       
+           props:{
+             articsData:{
+             type: Array,
+             default: function () {
+             return [];
+        }
+      }
+           },
             data(){
                 return {
                     centerDialogVisible:false,
                     rules: {
                     name: [{required: true, message: "请填写分类名称",},],
-                    content: [{required: true,message:"请填写分类描述"}],
-                    sort: [{required: true,message:"请填写排序"}]
-                },
-                 form:{
-                   name:"",
-                   content:"",
-                   sort:"",
-                },
+                    summary: [{required: true,message:"请填写分类描述"}],
+                    order: [{required: true,message:"请填写排序"}]
+                 },
                 acticleform:[],
+                 form:{
+                    name:"",
+                    summary:"",
+                    order:"",
+                   },
              }
           },   
            methods:{
@@ -74,18 +77,18 @@
                      this.$refs[formName].resetFields();
                    }
                   },
-               addCategory(formName){
-                  this.form.content = this.$refs.neditor.content
+               addCategory(formName){                 
                    this.$refs[formName].validate((valid)=>{
-                       if(valid){
+                       if(valid){                         
                             addCategory(this.form).then(response =>{
-                                  console.log(response.data.state)
+                                  console.log("添加分类响应",response.data.state)
                                   if(response.data.state==1){
                                     var category = response.data.data.category
-                                    this.centerDialogVisible=false
+                                    console.log("category是什么",category)
+                                    this.centerDialogVisible=false;
+                                    this.articsData.unshift(category);
                                     this.resetForm("acticleform");
-                                    this.$message.success("添加分类成功");
-                                    console.log("coo",category)
+                                    this.$message.success("添加分类成功");                           
                                   }
                             });
                        }   

src/scrm_pages/article/components/EditArticleForm.vue

@@ -7,47 +7,46 @@
         center>
         <el-form label-width="90px" class="clearfix" :model="form" ref="acticleform" :rules="rules">
           <el-row :span=20>
-            <el-form-item label="分类名称:" required prop="Name">
-              <el-input v-model="form.Name"></el-input>
+            <el-form-item label="分类名称:" required prop="name">
+              <el-input v-model="form.name"></el-input>
             </el-form-item>
           </el-row>
           <el-row :span=20>
-            <el-form-item label="分类描述:" required prop="Summary">
-              <keep-alive>
-                <neditor ref="neditor"
-                         id="editor"
-                         v-bind:r_content="form.Summary">
-                </neditor>
-              </keep-alive>
+            <el-form-item label="分类描述:" required prop="summary">
+              <div style="margin: 10px 0;"></div>
+              <el-input
+                 type="textarea"
+                :autosize="{minRows: 2, maxRows: 4}"
+                 v-model="form.summary">
+                </el-input>
             </el-form-item>
           </el-row>
           <el-row :span=20>
-            <el-form-item label="排序" required prop="Order">
-              <el-input v-model="form.Order"></el-input>
+            <el-form-item label="排序" required prop="order">
+              <el-input v-model="form.order"></el-input>
             </el-form-item>
           </el-row>
         </el-form>
         <span slot="footer" class="dialog-footer">
-               <el-button type="primary" @click="submitForm('acticleform')">保存</el-button>
+               <el-button 
+               type="primary" 
+               @click="submitForm('acticleform')">保存
+               </el-button>
               <el-button  @click="centerDialogVisible = false">取消</el-button>
              </span>
       </el-dialog>   
     </div>
 </template>
 <script>
-import Neditor from '@/components/Neditor'
  import { EditArticleCategory } from '@/api/act/submitinfo'
 export default {
     name: "EditArticleForm",
-     components:{
-        Neditor,
-      },
       props:{
         form:{
-           Name:'',
-          Summary:'',
-          Order:'',
-          MenuId:0,
+           name:'',
+           summary:'',
+           order:'',
+           id:0,
         },
       artilceIndex:{
           type:Number,
@@ -64,9 +63,9 @@ export default {
           return {
           centerDialogVisible:false,
            rules: {
-             Name: [{required: true, message: "请填写分类名称",},],
-             Summary: [{required: true,message:"请填写分类描述"}],
-             Order: [{required: true,message:"请填写排序"}]
+             name: [{required: true, message: "请填写分类名称",},],
+             summary: [{required: true,message:"请填写分类描述"}],
+             order: [{required: true,message:"请填写排序"}]
               },
              }
           }, 
@@ -80,20 +79,22 @@ export default {
                    }
                 },  
               submitForm(forname){ 
-                alert("aaa")
                 this.$refs[forname].validate((valid)=>{
                    if(valid){
-                      EditArticleCategory(this.form.MenuId,this.form).then(response=>{
-                            console.log("id是谁",this.form.MenuId)
-                            console.log(this.form)
+                       var order = this.form.order
+                       var ord = parseInt(order)
+                       this.form.order = ord
+                      EditArticleCategory(this.form.id,this.form).then(response=>{                        
                            var res =  response.data;
-                           console.log(res.state)
+                           console.log("返回响应",res.state)
                            if(res.state ===1 ){
-                              var categorys = res.data.categorys; 
+                              var categorys = res.data.category; 
                               console.log("categorys是什么",categorys)
-                              this.articsData[this.artilceIndex].name = categorys.Name;
-                              this.articsData[this.artilceIndex].content = categorys.Summary;
-                              this.articsData[this.artilceIndex].sort = categorys.Order;
+                              this.articsData[this.artilceIndex].name = categorys.name;
+                              this.articsData[this.artilceIndex].summary = categorys.summary;
+                              this.articsData[this.artilceIndex].order = categorys.order;
+                              //this.articsData.unshift(categorys);
+                              // this.resetForm("acticleform");
                               this.centerDialogVisible = false;
                               this.$message.success("编辑文章分类成功");
                            }

src/scrm_pages/article/createArticle.vue

@@ -7,13 +7,13 @@
     <div class="app-container">
     <el-tabs type="border-card">
       <el-tab-pane label="文章">
-        <el-form label-width="80px" class="clearfix" :model="form" ref="form"  :element-loading-text="loadingText">
+        <el-form label-width="100px" class="clearfix" :model="form" ref="arctileform"  :element-loading-text="loadingText" :rules="artilcrules">
           <el-row>
             <el-col :span="23">
-                <el-form-item label="文章标题:">
-                    <el-input v-model="form.act_name"  placeholder="文章标题"></el-input>
+                <el-form-item label="文章标题:" required prop="act_name">
+                    <el-input v-model="form.act_name"></el-input>
                 </el-form-item>
-              <el-form-item label="文章内容:">
+              <el-form-item label="文章内容:" required prop="act_content">
                 <keep-alive>
                   <neditor ref="neditor"
                            id="editor"
@@ -25,7 +25,7 @@
                   <el-radio v-model="radio" label="1" @click.native.prevent="select()" >单图</el-radio>
                   <el-radio v-model="radio" label="2" @click.native.prevent="clickitem()" >三图</el-radio>
               </el-form-item>
-              <el-form-item prop="org_log">
+              <el-form-item>
                 <el-col :span="3">
                   <div>
                     <el-upload
@@ -38,7 +38,7 @@
                       :on-error="handleAvatarError"
                       :on-success="handleAvatarSuccess"
                       :before-upload="beforeAvatarUpload">
-                      <img v-if="imageUrl" :src="imageUrl" class="avatar">
+                      <img v-if="form.org_logo" :src="form.org_logo" class="avatar">
                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
                   </div>
@@ -46,7 +46,7 @@
                 <el-col :span="3">
                   <div v-if="show">
                     <el-upload
-                      v-loading="guploading"
+                      v-loading="uploading"
                       :element-loading-text="loadingText"
                       class="avatar-uploader"
                       :data="uploadData"
@@ -78,13 +78,13 @@
                   </div>
                 </el-col>
               </el-form-item>
-               <el-form-item label="所属分类:">
+               <el-form-item label="所属分类:" prop="act_type">
                  <el-select v-model="form.act_type" placeholder="请先选择文章所属分类"  @change="changeActtype()">
                    <el-option
                      v-for="item in options"
-                     :key="item.MenuId"
-                     :label="item.Name"
-                     :value="item.MenuId">
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -94,8 +94,8 @@
           <el-row :span="24">
             <el-col :span="24">
                 <el-form-item>
-                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm();centerDialogVisible = true">发布</el-button>
-                      <el-button size="small" style="width: 100px">预览</el-button>
+                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm('arctileform');centerDialogVisible=false">发布</el-button>
+                      <el-button size="small" style="width: 100px" @click="preview('arctileform')">预览</el-button>
                       <el-button size="small" style="width: 100px">保存草稿</el-button>
                   <el-button size="small" style="width: 100px">取消</el-button>
                 </el-form-item>
@@ -104,65 +104,71 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="视频">
-        <el-form label-width="80px" class="clearfix">
+        <el-form label-width="100px" class="clearfix"  :rules="rules" :model="form" ref="vidoform">
            <el-row>
              <el-col :span="24">
                  <div style="margin-bottom: 100px">
-                 <el-form-item>
-                 <div class="video-select">
-                   <el-upload
-                   class="upload-demo"
-                   action="https://upload.qiniup.com"
-                   :on-preview="handlePreview"
-                   :on-remove="handleRemove"
-                   :before-remove="beforeRemove"
-                   multiple
-                   :limit="3"
-                   :on-exceed="handleExceed"
-                   :file-list="fileList"
-                   :before-upload="beforeUpload">
-                   <el-button size="small" type="primary">点击上传</el-button>
-                   <div slot="tip" class="el-upload__tip">只能上传jpg/exe文件，且不超过2G</div>
-                   </el-upload>
-                   </div>
-                   <div class="progressbar probar" style="text-align: center">
-                   <span class="videotitle"></span>
-                   <input type="hidden" name="videoUrl" id="videopath">
-                   <div class="barpic"></div>
-                   <span class="chaimg"></span>
-                   <span class="videoupload"></span>
-                   </div>
-                 </el-form-item>
+                   <el-form-item  required prop="vio_upload">
+                       <div class="video-select" v-if="show">
+                        <el-upload
+                            class="upload-demo"
+                            :data="uploadFileData"
+                            action="https://upload.qiniup.com"
+                            :on-change="handleChange"
+                            :on-success="handleSuccess"
+                            :on-error="handleError"
+                            :before-upload="beforeUploadFile"
+                             accept="video/x-flv,video/mpeg,video/avi,video/x-ms-wmv,video/quicktime,.asf,.rm,.rmvb,video/x-matroska,video/x-m4v,video/mp4">                         
+                             <el-button size="small" type="primary" v-if="show">点击上传</el-button>
+                             <div slot="tip" class="el-upload__tip" v-if="show">支持大多视频文件格式,大小不超过2G</div>
+                        </el-upload>
+                       </div>
+                         <div class="video" v-if="shows">
+                         <img v-if="form.vio_upload" :src="form.vio_upload+'?vframe/jpg/offset/1/w/300/h/200'" class="avatar" id="upvideo">
+                       </div>
+                        <div id="upvideo"></div>                  
+                    </el-form-item>
                   </div>
-                 <el-form-item label="视频标题:">
-                   <el-input placeholder="视频标题"></el-input>
+
+                 <el-form-item label="视频标题:" required prop="vid_name">
+                   <el-input v-model="form.vid_name"></el-input>
                  </el-form-item>
-                 <el-form-item label="视频封面:"></el-form-item>
-                 <el-form-item>
-                   <el-upload  class="avatar-uploader" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
-                     <img v-if="imageUrl" :src="imageUrl" class="avatar">
+
+                 <el-form-item label="视频封面:">
+                   <el-upload  class="avatar-uploader" :show-file-list="false" 
+                   :on-success="handlevioSuccess" 
+                   :before-upload="beforevidoFile" 
+                   :on-change="handleChange"
+                   action="https://upload.qiniup.com"
+                   :data="uploadvidoData">
+                     <img v-if="form.vid_pic" :src="form.vid_pic" class="avatar">                  
+                     <img v-if="form.vio_upload" :src="form.vio_upload+'?vframe/jpg/offset/1/w/300/h/200'" class="avatar">
                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                    </el-upload>
                  </el-form-item>
-                  <el-form-item label="所属分类:">
-                    <el-select v-model="form.act_type" placeholder="请选择">
+                 <div class="eltip">
+                   视频封面若不上传，系统会根据视频内容进行自动截取<br>
+                   目前支持PNG和JPG格式，图片大小不能超过1MB
+                   </div>
+                  <el-form-item label="所属分类:" required prop="vid_type">
+                    <el-select v-model="form.vid_type">
                       <el-option
-                         v-for="item in options"
-                         :key="item.value"
-                        :label="item.label"
-                         :value="item.value">
+                          v-for="item in options"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id"> 
                       </el-option>
                       </el-select>
                   </el-form-item>
                    <el-row :span="24">
                      <el-col :span="24">
                        <el-form-item>
-                         <el-button size="small" type="primary" style="width: 100px">发布</el-button>
-                         <el-button size="small" style="width: 100px">保存草稿</el-button>
-                         <el-button size="small" style="width: 100px">取消</el-button>
+                         <el-button size="small" type="primary" style="width: 100px" @click="SumitVido('vidoform');centerDialogVisible = false">发布</el-button>
+                         <el-button size="small" style="width: 100px" @click="Savedraft('vidoform');centerdraftVisible = false">保存草稿</el-button>
+                         <el-button size="small" style="width: 100px" @click="centercancelVisible = true">取消</el-button>
                        </el-form-item>
                      </el-col>
-                   </el-row>
+                   </el-row>                   
              </el-col>
            </el-row>
         </el-form>
@@ -175,12 +181,33 @@
         :visible.sync="centerDialogVisible"
          width="30%"
          center>
-         <!-- <span>需要注意的是内容是默认不居中的</span> -->
          <span slot="footer" class="dialog-footer">
-        <el-button @click="gotolink;centerDialogVisible = false">再发一条</el-button>
+        <el-button @click="gotolink()">再发一条</el-button>
         <el-button type="primary" @click="gobacklist">返回文章列表</el-button>
        </span>
       </el-dialog>
+
+      <el-dialog
+       title="保存草稿成功"
+       :visible.sync = "centerdraftVisible"
+        width="30%"
+        center>
+        <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="gobacklist">返回文章列表</el-button>  
+         </span>
+      </el-dialog>
+
+      <el-dialog
+       title="提示"
+       :visible.sync = "centercancelVisible"
+       width="30%"
+       center>
+       <span style="center">是否确定取消编辑此文章/视频</span>
+       <span slot="footer" class="dialog-footer">
+       <el-button type="primary" @click="centercancelVisible = false" >确认</el-button>
+       <el-button @click="centercancelVisible = false">取消</el-button>   
+        </span>   
+      </el-dialog>
   </div>
 </template>
 
@@ -191,7 +218,7 @@
   import 'quill/dist/quill.snow.css'
   import 'quill/dist/quill.bubble.css'
   import Neditor from '@/components/Neditor'
-  import {submitForm,getArticleType} from '@/api/act/submitinfo'
+  import {submitForm,getArticleType,addVido,Savedraft} from '@/api/act/submitinfo'
   import { getToken } from '@/api/qiniu'
   import { getFileExtension} from '@/utils/tools'
   export default {
@@ -212,12 +239,8 @@
         show:false,
         content: '',
         editorOption: {},
-        uploadUrl:"",//你要上传视频到你后台的地址
-        videoFlag:false , //是否显示进度条
-        videoUploadPercent:"", //进度条的进度，
-        isShowUploadVideo:false, //显示上传按钮
         company:"",
-        fileList: [{name: '123', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}],
+        fileList: [],
         form:{
           act_name:'',
           act_content:'',
@@ -225,6 +248,11 @@
           act_category:'',
           org_logo:'',
           act_type:'',
+          file:'',
+          vid_pic:'',
+          vio_upload:'',
+          vid_name:'',
+          vid_type:'',
         },
          acttypes:[],
          imageUrl:'',
@@ -236,31 +264,37 @@
          uploading:false,
          loadingText:'',
          uploadData: { token: '', key: '' },
-         myConfig: {
-                // 如果需要上传功能,找后端小伙伴要服务器接口地址
-                serverUrl: '/api/web/upload/ueditor',
-                // 你的UEditor资源存放的路径,相对于打包后的index.html
-                UEDITOR_HOME_URL: '/NEditor/',
-                // 编辑器不自动被内容撑高
-                autoHeightEnabled: false,
-                // 初始容器高度
-                initialFrameHeight: 240,
-                // 初始容器宽度
-                initialFrameWidth: '100%',
-                // 关闭自动保存
-                enableAutoSave: false
-            },
+         uploadFileData:{token:'',key:''},
+         uploadvidoData:{token:'',key:''},
          centerDialogVisible: false,
+         centerdraftVisible:false,
+         centercancelVisible:false,
+         formLabelAlign:true,
+         modlevidel:'',
+         filsListArray:[],
+         show:true,
+         shows:false,
+         rules: {
+            vid_name: [{required: true, message: "视频标题不能为空"},],
+            vio_upload: [{required: true,message:"请上传视频"}],
+            vid_type: [{required: true,message:"所属分类不能为空"}]
+          },
+        artilcrules:{
+            act_name: [{required: true, message: "文章标题不能为空"},],
+            act_content: [{required: true,message:"文章内容不能为空"}],
+            act_type: [{required: true,message:"所属分类不能为空"}]
+        },
+        vidoform:[],
+        ue:'',
       }
     },
     created(){
-        this.getArticleType()
+        this.getArticleType();
     },
     methods: {
       //第一个图片
       handleAvatarSuccess(res, file) {
-        this.imageUrl = URL.createObjectURL(file.raw);
-        this.form.org_logo = this.qiniuDomain + res.url;
+       this.form.org_logo = this.qiniuDomain + res.url;
         this.uploading = false
       },
        handleAvatarError(err, file, fileList) {
@@ -298,8 +332,6 @@
                     this.uploading = false;
                 })
             })
-
-          //return isJPG && isLt2M;
       },
       //第二个图片
       handleAvatartwoSuccess(res, file) {
@@ -347,7 +379,6 @@
       },
 
       //第三张图片
-      //第二个图片
       handleAvatarlastSuccess(res, file) {
         this.imageUrlLast = URL.createObjectURL(file.raw);
         this.form.org_logo = this.qiniuDomain + res.url;
@@ -372,7 +403,6 @@
             var date = new Date()
             var ext = getFileExtension(file.name)
             var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
-            this.uploading = true;
             this.loadingText = '封面图片上传中'
 
             const _self = this
@@ -385,32 +415,76 @@
                     resolve(true)
                 }).catch(err => {
                     reject(false)
-                    this.uploading = false;
                 })
-            })
+            }) 
+        }, 
+        //视频上传
+        handleChange(file, fileList) {
+          this.form.file =  file.raw
+        }, 
+        handleSuccess(res,file,fileList){  
+            this.$message.success("视频上传成功")               
+             this.form.vio_upload = this.qiniuDomain + res.url;           
+             console.log("是什么",this.form.vio_upload)
 
-          //return isJPG && isLt2M;
+             this.show=false;
+             this.shows = true;
+        },
+        handlevioSuccess(res,file,fileList){
+           this.form.vid_pic = this.qiniuDomain + res.url;  
+        },
+        changeImg(url){
+          console.log("路径是多少?",url)
+        },
+         handleError(err, file, fileList) {
+             this.$message.error("视频上传失败")
+         },
+        beforeUploadFile(file) {
+        const isLt2M = file.size / 1024 / 1024 < 2048;
+        if (!isLt2M) {
+          this.$message.error('上传视频大小不能超过 2G!');
+        }
+            var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token = response.data.data.uptoken
+                    //console.log("token2是什么?",token)
+                    _self._data.uploadFileData.token = token
+                    _self._data.uploadFileData.key = key
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)                  
+                })
+            })
       },
-
-      beforeUpload(file) {
-        var testmsg=file.name.substring(file.name.lastIndexOf('.')+1)
-        const extension = testmsg === 'mp4'
-        const extension2 = testmsg === 'exe'
-        const isLt2M = file.size / 1024 / 1024 < 2048     //这里做文件大小限制
-        if(!extension && !extension2) {
-          this.$message({
-            message: '上传文件只能是 mp4、exe格式!',
-            type: 'warning'
-          });
+      beforevidoFile(file){
+          const isJPG = file.type === 'png/jpg';
+          if (!isJPG) {
+          this.$message.error('上传头像图片只能是 png或者jpg格式!');
         }
-        if(!isLt2M) {
-          this.$message({
-            message: '上传文件大小不能超过 2G!',
-            type: 'warning'
-          });
+          const isLt2M = file.size / 1024 / 1024 < 1;
+        if (!isLt2M) {
+          this.$message.error('上传视频大小不能超过 1M!');
         }
-        return extension || extension2 && isLt2M
-      },
+            var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token = response.data.data.uptoken
+                    //console.log("token2是什么?",token)
+                    _self._data.uploadvidoData.token = token
+                    _self._data.uploadvidoData.key = key
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)                  
+                })
+            })
+       },
       select(){
         this.show = false
       },
@@ -432,40 +506,74 @@
       changeActtype(){
          console.log("所属分类",this.form.act_type)
       },
-      submitForm(){
-        console.log("提交文章")
-        var params  = new Object()
-        params.act_name = this.form.act_name
-        params.act_content = this.$refs.neditor.content
-        params.org_logo = this.form.org_logo
-        params.act_type = this.form.act_type
-        this.formloading=true
-        this.submitForm =true
-        console.log("文章标题",params.act_name)
-        console.log("文章内容",params.act_content)
-        console.log("富文本编辑器的内容",params.act_content)
-        console.log("图片",params.org_logo)  
-        console.log("所属分类",params.act_type)    
-        submitForm(params).then(response => {
-         
-        })
+      submitForm(formName){
+        this.form.act_content = this.$refs.neditor.content;
+        console.log("文章内容",this.$refs.neditor.content)
+        this.$refs[formName].validate((valid)=>{
+            if(valid){
+              submitForm(this.form).then(response => {
+                   if(response.data.state == 1){
+                     this.centerDialogVisible = true;
+                     var articles = response.data.data.articles;
+                     console.log("返回的数据是啥?",articles);
+                   }
+              })
+            }
+        });
       },
       getArticleType(){
         getArticleType().then(response =>{
-            //console.log("好嗨我")
+            console.log(response.data.state)
             if(response.data.state === 1){
             var category = response.data.data.category
             this.options = response.data.data.category
-            // console.log("文章内容:",category)
-            // console.log("文章",this.options)
+             //console.log("文章内容:",category)
+             //console.log("文章",this.options)
             }
         })
       },
       gotolink(){
-        this.$router.push({path:"/articles/createArticle"})
+         this.$router.go(0);
       },
       gobacklist(){
         this.$router.push({path:'/articles/articleList'})
+      },
+      SumitVido(formName){
+         this.$refs[formName].validate((valid)=>{
+           if(valid){
+               addVido(this.form).then(response=>{
+                   if(response.data.state == 1){
+                     this.centerDialogVisible = true;
+                     var vido = response.data.data.vido;
+                     console.log("返回数据",vido)
+                   }
+               });
+           }
+         });
+      },
+      Savedraft(formName){
+        this.$refs[formName].validate((valid)=>{
+           if(valid){
+               Savedraft(this.form).then(response=>{
+                   if(response.data.state==1){
+                     this.centerdraftVisible = true;
+                     var savedraft = response.data.data.savedraft;
+                     console.log("保存草稿数据",savedraft)
+                   }
+               });
+           }
+        });
+      },
+      preview(formName){
+         this.form.act_content = this.$refs.neditor.content;
+         console.log("文章内容",this.$refs.neditor.content)
+         this.$refs[formName].validate((valid)=>{
+            if(valid){
+               preview(this.form).then(response=>{
+                    this.$router.go(0);
+               });
+            }
+         });
       }
     },
   }
@@ -507,6 +615,24 @@
     height: 200px;
     position: relative;
     left: 500px;
+    margin-bottom: 1px;
+  }
+  .video{
+    padding: 150px 0 30px;
+    background-position: center 0;
+    background-size: 192px 132px;
+    text-align: center;
+    width: 200px;
+    height: 200px;
+    position: relative;
+    left: 500px;
+    margin-bottom: 60px;
+    margin-top: -140px;
+  }
+  .eltip{
+    font-size: 12px;
+    position: relative;
+    left: 80px;
+    margin-bottom: 20px;
   }
-
 </style>

src/scrm_pages/marketing_tool/activity_detail.vue

@@ -0,0 +1,248 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+        <div class="app-container" style="padding-top: 0; background-color: #f6f8f9;">
+            <div class="base-info">
+                <div class="poster-photo">
+                    <img :src="poster_photo" />
+                </div>
+                <div class="title-panel">
+                    <p class="title">
+                        <router-link :to="activity_url">{{ title }}</router-link>
+                    </p>
+                    <p class="date">活动日期：{{ activity_time }}</p>
+                </div>
+                <div class="action-panel">
+                    <el-button type="primary" v-if="show_share_btn" @click="$router.push({ path: '/activity/share', query: { id: activity_id } })">再次分享</el-button>
+                    <el-button type="primary" v-if="show_publish_btn">发布</el-button>
+                </div>
+            </div>
+            <div class="times-statistics">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <div class="item">
+                            <span class="count">{{ read_times }}</span>
+                            <p class="desc">展示次数</p>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div class="item">
+                            <span class="count">{{ join_count }}</span>
+                            <p class="desc">参与人数</p>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
+            <div class="signup-header">
+                <div class="input">
+                    <el-input v-model="signup_keyword" placeholder="搜索报名人" style="width: 330px;"></el-input>
+                    <el-button type="primary" icon="el-icon-search" :loading="loading_search" @click="fetchSignupUsers">搜索</el-button>
+                </div>
+                <div class="all-btn">
+                    <router-link to="/">
+                        <el-button type="primary">查看全部</el-button>
+                    </router-link>
+                </div>
+            </div>
+            <div class="signup-table-panel">
+                <el-table :data="signup_users" empty-text="暂无人报名">
+                    <el-table-column label="报名号" align="center" prop="id"></el-table-column>
+                    <el-table-column label="手机号" align="center" prop="mobile"></el-table-column>
+                    <el-table-column label="客户姓名" align="center" prop="real_name"></el-table-column>
+                    <el-table-column label="报名时间" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.ctime, "{y}-{m}-{d} {h}:{i}") }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from "@/scrm_pages/components/bread-crumb"
+import { fetchActivityDetailViewData, fetchActivitySignupUsers } from "@/api/activity/activity"
+import { parseTime } from "@/utils"
+
+export default {
+    name: "ActivityDetail",
+    components: {
+        BreadCrumb,
+    },
+    data() {
+        return {
+            crumbs: [
+                { path: false, name: "营销工具" },
+                { path: false, name: "活动详情" },
+            ],
+
+            activity_id: 0,
+            activity: null,
+
+            signup_keyword: "",
+            signup_users: [],
+
+            loading_search: false,
+        }
+    },
+    computed: {
+        title: function() {
+            return this.activity == null ? "" : this.activity.title
+        },
+        poster_photo: function() {
+            return this.activity == null ? "/" : this.activity.poster_photo
+        },
+        activity_url: function() {
+            if (this.activity != null) {
+                return "/activity/preview?id=" + this.activity_id
+            }
+            return ""
+        },
+        activity_time: function() {
+            return this.activity == null ? "" : parseTime(this.activity.start_time, "{y}-{m}-{d} {h}:{i}")
+        },
+        show_share_btn: function() {
+            return this.activity == null ? false : (this.activity.status == 1)
+        },
+        show_publish_btn: function() {
+            return this.activity == null ? false : (this.activity.status == 4)
+        },
+        read_times: function() {
+            return this.activity == null ? 0 : this.activity.read_num
+        },
+        join_count: function() {
+            return this.activity == null ? 0 : this.activity.join_num
+        }
+    },
+    mounted() {
+        this.activity_id = this.$route.query.id
+
+        fetchActivityDetailViewData(this.activity_id).then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+                this.activity = resp.data.activity
+                this.signup_users = resp.data.users
+            } else {
+                this.$message.error(resp.msg)
+            }
+
+        }).catch(err => {
+            this.$message.error(err)
+        })
+    },
+    methods: {
+        parseTime,
+        fetchSignupUsers: function() {
+            this.loading_search = true
+            fetchActivitySignupUsers(this.activity_id, this.signup_keyword, 1).then(rs => {
+                this.loading_search = false
+                var resp = rs.data
+                if (resp.state == 1) {
+                    this.signup_users = resp.data.users
+                } else {
+                    this.$message.error(resp.msg)
+                }
+            }).catch(err => {
+                this.loading_search = false
+                this.$message.error(err)
+            })
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.base-info {
+    padding: 20px 25px;
+    display: flex;
+    justify-content: flex-end;
+    flex-wrap: nowrap;
+    align-items: center;
+    background-color: white;
+    box-shadow: 0 0 1px #dee2e5;
+
+    .poster-photo {
+        width: 120px;
+        height: 96px;
+        display: flex;
+        justify-content: center;
+        margin-right: 22px;
+
+        img {
+            width: 100%;
+            height: auto;
+            border-radius: 4px;
+            object-fit: cover;
+            object-position: center;
+        }
+    }
+    .title-panel {
+        flex: 3;
+        padding-right: 20px;
+
+        .title {
+            font-size: 18px;
+            color: #485b6d;
+            font-weight: 700;
+            word-break: break-all;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            height: 70px;
+            line-height: 34px;
+        }
+        .date {
+            color: #7b8a97;
+            line-height: 20px;
+            font-size: 14px;
+        }
+    }
+    .action-panel {
+        flex: 1;
+        text-align: right;
+    }
+}
+.times-statistics {
+    margin-top: 20px;
+
+    .item {
+        padding: 40px 0 30px 0;
+        box-shadow: 0 0 1px #dee2e5;
+        background-color: white;
+        text-align: center;
+
+        .count {
+            font-size: 36px;
+            color: #58a2ec;
+        }
+        .desc {
+            margin-top: 5px;
+            font-size: 14px;
+            color: #485b6d;
+        }
+    }
+}
+.signup-header {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+
+    .input {
+        width: 500px;
+        display: block;
+    }
+    .all-btn {
+        display: block;
+    }
+}
+.signup-table-panel {
+    margin-top: 10px;
+}
+</style>
+
+

src/scrm_pages/marketing_tool/activity_list.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import BreadCrumb from "@/scrm_pages/components/bread-crumb";
+import BreadCrumb from "@/scrm_pages/components/bread-crumb"
 import PublishedCell from "@/scrm_pages/marketing_tool/components/published_cell"
 import UnapprovedCell from "@/scrm_pages/marketing_tool/components/unapproved_cell"
 import DraftsCell from "@/scrm_pages/marketing_tool/components/drafts_cell"

src/scrm_pages/marketing_tool/activity_preview.vue

@@ -0,0 +1,14 @@
+<template>
+    <div></div>
+</template>
+
+<script>
+export default {
+    name: "ActivityPreview",
+}
+</script>
+
+<style scoped>
+
+</style>
+

src/scrm_pages/marketing_tool/activity_share.vue

@@ -0,0 +1,14 @@
+<template>
+    <div></div>
+</template>
+
+<script>
+export default {
+    name: "ActivityShare",
+}
+</script>
+
+<style scoped>
+
+</style>
+

src/scrm_pages/marketing_tool/components/drafts_cell.vue

@@ -7,7 +7,9 @@
         </div>
         <div class="activity-info-panel">
             <h3 class="title">
-                <a href="/">{{ activity.title }}</a>
+                <router-link :to="activityUrl">
+                    <a>{{ activity.title }}</a>
+                </router-link>
             </h3>
             <div class="operation">
                 <el-button type="primary" size="small" icon="el-icon-edit-outline" @click="$router.push({ path: '/activity/modify', query: {id: activity.id} })">编辑</el-button>
@@ -32,6 +34,11 @@ export default {
             
         }
     },
+    computed: {
+        activityUrl: function() {
+            return "/activity?id=" + this.activity.id
+        }
+    },
 }
 </script>
 

src/scrm_pages/marketing_tool/components/edit_activity_edit_form.vue

@@ -222,18 +222,20 @@ export default {
 
         saveAction: function() {
             this.saving_activity = true
-            this.submitActivity(false)
+            this.submitActivity(false, function() {
+                // 弹框 => 再发一条/前往列表
+            })
         },
         publishAction: function() {
             this.publishing_activity = true
             this.submitActivity(true, function() {
-                // 前往活动详情页
+                this.$router.push({ path: "/activity", query: { id: this.activity.id } })
             })
         },
         previewAction: function() {
             this.saving_before_preview_activity = true
             this.submitActivity(false, function() {
-                // 前往活动预览页
+                this.$router.push({ path: "/activity/preview", query: { id: this.activity.id } })
             })
         },
         submitActivity: function(is_publish, successCallBack) {
@@ -290,16 +292,22 @@ export default {
             return new Promise((resolve, reject) => {
                 if (this.activity.poster_photo.length == 0) {
                     reject("海报不能为空")
+                    return
                 } else if (this.activity.title.length == 0) {
                     reject("标题不能为空")
+                    return
                 } else if (this.activity.subtitle.length == 0) {
                     reject("副标题不能为空")
+                    return
                 } else if (this.activity.address.length == 0) {
                     reject("活动地址不能为空")
+                    return
                 } else if (this.activity.sign_up_deadline == 0) {
                     reject("活动报名时间不能为空")
+                    return
                 } else if (this.activity.start == 0) {
                     reject("活动时间不能为空")
+                    return
                 } else {
                     if (this.activity.phone_number.length > 0) {
                         if (/^1\d{10}$/.test(this.activity.phone_number) == false && /^(0\d{2,3}-?\d{7,8}$)/.test(this.activity.phone_number) == false) {

src/scrm_pages/marketing_tool/components/published_cell.vue

@@ -7,7 +7,9 @@
         </div>
         <div class="activity-info-panel">
             <h3 class="title">
-                <a href="">{{ activity.title }}</a>
+                <router-link :to="activityUrl">
+                    <a>{{ activity.title }}</a>
+                </router-link>
             </h3>
             <div class="statistics">
                 阅读：{{ activity.read_num }} 丨 评论：{{ activity.comment_num }} 丨 点赞：{{ activity.star_num }}
@@ -52,6 +54,9 @@ export default {
                 return "已发布"
             }
         },
+        activityUrl: function() {
+            return "/activity?id=" + this.activity.id
+        },
         progress_percent: function() {
             if (this.activity.limit_num > 0) {
                 return (this.activity.join_num / this.activity.limit_num) * 100
@@ -71,7 +76,7 @@ export default {
             }
         },
         start_time: function() {
-            return parseTime(this.activity.start_time, "{y}-{m}-{d}")
+            return parseTime(this.activity.start_time, "{y}-{m}-{d} {h}-{i}")
         },
     },
 }

src/scrm_pages/marketing_tool/components/unapproved_cell.vue

@@ -42,7 +42,7 @@ export default {
     },
     computed: {
         start_time: function() {
-            return parseTime(this.activity.start_time, "{y}-{m}-{d}")
+            return parseTime(this.activity.start_time, "{y}-{m}-{d} {h}:{i}")
         },
     },
 }