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

src/api/act/submitinfo.js

@@ -16,4 +16,13 @@ export function getArticleType(params){
          method: 'Get',
          params: params
      })
+}
+
+export function GetAllArticles(params){
+     console.log("文章列表")
+     return request({
+         url:'/api/acticle/getAllArticles',
+         method:'Get',
+         params:params
+     })
 }

src/api/activity/activity.js

@@ -0,0 +1,14 @@
+import request from "@/utils/request"
+
+export function fetchActivities(page, keyword, status) {
+  const params = {
+    page: page,
+    keyword: keyword,
+    status: status,
+  }
+  return request({
+    url: '/api/activities',
+    method: 'get',
+    params: params,
+  })
+}

src/lang/en.js

@@ -110,6 +110,10 @@ export default {
     special_permission_manage: 'Special Permission Manage',
     schedule_print: 'Print Schudule',
     dialysis_batch_print: 'Batch Print Order',
+    
+    marketingTool: "marketing tools",
+    activityList: "activity list",
+    activityPublish: "publish activity",
     systemsetting:'Systemsetting'
   },
   navbar: {

src/lang/zh.js

@@ -158,6 +158,10 @@ export default {
     stockOutDetail: '出库单详情',
     cancelStockDetail: '退库单详情',
     stockDetail: '出入库明细查询',
+
+    marketingTool: "营销工具",
+    activityList: "活动列表",
+    activityPublish: "发布活动",
     systemsetting:'系统设置',
     staffmanagement:'员工管理'
   },

src/router/index.js

@@ -10,7 +10,8 @@ import role from './modules/role'
 import article from './modules/article'
 import member from './modules/member'
 import org from './modules/org'
-import system from './modules/system';
+import marketing_tool from './modules/marketing_tool'
+import system from './modules/system'
 
 /** note: submenu only apppear when children.length>=1
  *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -73,6 +74,7 @@ var _constant_router_map = [{
 var _asy_router_map = [
   member,
   article,
+  marketing_tool,
   org,
   role,
   system

src/router/modules/marketing_tool.js

@@ -0,0 +1,32 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  alwaysShow: true,
+  path: '/activity',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'marketingTool',
+  meta: {
+    title: 'marketingTool',
+    icon: 'component'
+  },
+  children: [{
+      path: '/activity/publish',
+      component: () => import('@/scrm_pages/marketing_tool/activity_publish'),
+      name: 'activityPublish',
+      meta: {
+        title: 'activityPublish',
+        noCache: true
+      }
+    },
+    {
+      path: '/activity/list',
+      component: () => import('@/scrm_pages/marketing_tool/activity_list'),
+      name: 'activityList',
+      meta: {
+        title: 'activityList',
+        noCache: true
+      }
+    },
+  ]
+}

src/scrm_pages/article/articleList.vue

@@ -8,7 +8,7 @@
           <div style="margin-bottom: 10px">
             <el-row :gutter="24">
               <el-col :span="8">
-                  <el-input style="width: 300px"  placeholder="请输入您需要搜索的内容"></el-input>
+                  <el-input style="width: 300px" v-model="listQuery.search"  placeholder="请输入您需要搜索的内容"></el-input>
                   <el-button type="primary"  icon="el-icon-search">搜索</el-button>
               </el-col>
             </el-row>
@@ -17,7 +17,8 @@
             <label class="title"><span class="name">标签</span>:</label>
              <div class="time">
                 <ul class="">
-                  <li :class="item.value==schedulType?'active':''"  v-for="item in schedulArr" :key="item.value">{{item.label}}</li>
+                  <li :class="0==schedulType?'active':''" @click="selectsign(0)">全部</li>
+                  <li :class="item.MenuId==schedulType?'active':''"  v-for="item in schedulArr" :key="item.MenuId">{{item.Name}}</li>
                 </ul>
              </div>
           </div>
@@ -25,15 +26,16 @@
             <label class="title"><span class="name">状态:</span></label>
             <div class="time">
               <ul class="">
+                <!-- <li :class="0==systemType?'active':''" @click="selectStatus(0)">全部</li> -->
                 <li :class="item.value==systemType?'active':''" v-for="item in systemArr" :key="item.value">{{item.label}}</li>
               </ul>
             </div>
           </div>
           <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
-            <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
-            <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+            <el-checkbox style="width: 30px">全选</el-checkbox>
+            <el-button size="small" icon="el-icon-delete">删除</el-button>
           </div>
-          <el-table ref="multipleTable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="tableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;">
+          <el-table ref="multipleTable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="ArticleData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;">
               <el-table-column
                 type="selection"
                 width="55">
@@ -92,6 +94,7 @@
 
 <script>
   import BreadCrumb from '../components/bread-crumb'
+  import { GetAllArticles } from '@/api/act/submitinfo'
   export default {
     name: 'commentList',
     components:{
@@ -106,34 +109,59 @@
         time: '',
         active: true,
         schedulType: 0,
-        schedulArr:[
-          {value: 0, label: '全部'},
-          {value: 1, label: '食物库'},
-          {value: 2, label: '肾病常识'},
-          {value: 3, label: '科普教育'},
-        ],
+        schedulArr:0,
         systemType: 0,
         systemArr: [
-          { value: 0, label: '全部' },
-          { value: 1, label: '已发布'},
-          { value: 2, label: '草稿箱'},
-          { value: 3, label: '未通过'},
+          { value: 0, label: "全部" },
+          { value: 1, label: "已发布" },
+          { value: 2, label: "草稿箱" },
+          { value: 2, label: "未通过" }
         ],
+        listQuery:{
+            page:1,
+            limit:10,
+            search:'',
+            classid:'',
+        },
+        ArticleData:[],
+        total:0,
       }
+    },
+    methods:{
+         GetAllArticles(){
+              GetAllArticles(this.listQuery).then(response =>{
+                     if(response.data.status === 1){
+                       this.ArticleData = response.data.data.articles
+                        console.log("文章列表",this.ArticleData)
+                        this.total = response.data.data.total
+                     }
+              })
+         },
+         selectsign(id){
+            this.listQuery.classid = id;
+            this.schedulArr = id;
+            this.GetAllArticles();
+         },
+         selectStatus(id){
+            this.listQuery.status = id;
+            this.systemType = id;
+            this.GetAllArticles();
+         },
+          handleSizeChange(limit) {
+            this.listQuery.limit = limit;
+            this.GetAllAritcles();
+        },
+         handleCurrentChange(page) {
+            this.listQuery.page = page;
+            this.GetAllAritcles();
+        }
+    },
+    created(){
+      this.GetAllArticles()
     }
   }
 </script>
 
 <style scoped>
-  /*.app-container .cell.clearfix .time ul li {*/
-    /*float: left;*/
-    /*list-style: none;*/
-    /*cursor: pointer;*/
-    /*padding: 6px 20px;*/
-    /*color: #606266;*/
-    /*border-radius: 4px;*/
-    /*margin: 0 8px 0 0;*/
-    /*font-size: 14px;*/
-    /*text-align: center;*/
-  /*}*/
+     
 </style>

src/scrm_pages/article/createArticle.vue

@@ -79,12 +79,12 @@
                 </el-col>
               </el-form-item>
                <el-form-item label="所属分类:">
-                 <el-select v-model="value" placeholder="请先选择文章所属分类" prop="act_type">
+                 <el-select v-model="form.act_type" placeholder="请先选择文章所属分类"  @change="changeActtype()">
                    <el-option
                      v-for="item in options"
-                     :key="item.id"
+                     :key="item.MenuId"
                      :label="item.Name"
-                     :value="item.id">
+                     :value="item.MenuId">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -94,7 +94,7 @@
           <el-row :span="24">
             <el-col :span="24">
                 <el-form-item>
-                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm" :disabled="formsubmit">发布</el-button>
+                      <el-button size="small" type="primary" style="width: 100px"  @click="submitForm;centerDialogVisible = true" :disabled="formsubmit">发布</el-button>
                       <el-button size="small" style="width: 100px">预览</el-button>
                       <el-button size="small" style="width: 100px">保存草稿</el-button>
                   <el-button size="small" style="width: 100px">取消</el-button>
@@ -170,6 +170,17 @@
     </el-tabs>
      </div>
     </div>
+      <el-dialog
+        title="发布成功"
+        :visible.sync="centerDialogVisible"
+         width="30%"
+         center>
+         <!-- <span>需要注意的是内容是默认不居中的</span> -->
+         <span slot="footer" class="dialog-footer">
+        <el-button @click="gotolink;centerDialogVisible = false">再发一条</el-button>
+        <el-button type="primary" @click="gobacklist">返回文章列表</el-button>
+       </span>
+      </el-dialog>
   </div>
 </template>
 
@@ -239,6 +250,7 @@
                 // 关闭自动保存
                 enableAutoSave: false
             },
+         centerDialogVisible: false,
       }
     },
     created(){
@@ -417,24 +429,24 @@
       beforeRemove(file, fileList) {
         return this.$confirm(`确定移除 ${ file.name }？`);
       },
+      changeActtype(){
+         console.log("所属分类",this.form.act_type)
+      },
       submitForm(){
         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.org_logo)  
+        console.log("所属分类",params.act_type)    
         submitForm(params).then(response => {
-           if(response.data.state === 1){
-             this.$message({
-               type: 'success',
-               message: '成功!'
-             })
-           }
+         
         })
       },
       getArticleType(){
@@ -447,6 +459,12 @@
              console.log("文章",this.options)
             }
         })
+      },
+      gotolink(){
+        this.$router.push({path:"/articles/createArticle"})
+      },
+      gobacklist(){
+        this.$router.push({path:'/articles/articleList'})
       }
     },
   }

src/scrm_pages/marketing_tool/activity_list.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="main-contain" v-loading="loading_activities">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
+        @click="$router.push({path:'/activity/publish'})"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        size="small"
+      >创建活动</el-button>
+    </div>
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input v-model="keyword" placeholder="请输入您要搜索的活动" class="keyword_input"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="getActivities()">搜索</el-button>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">状态</span> :
+        </label>
+        <div class="time">
+          <ul>
+            <li :class="{ active: selecting_status == 0 }" @click="changeSelectingStatus(0)">全部</li>
+            <li :class="{ active: selecting_status == 1 }" @click="changeSelectingStatus(1)">已发布</li>
+            <li :class="{ active: selecting_status == 2 }" @click="changeSelectingStatus(2)">待发布</li>
+            <li :class="{ active: selecting_status == 3 }" @click="changeSelectingStatus(3)">未通过</li>
+            <li :class="{ active: selecting_status == 4 }" @click="changeSelectingStatus(4)">已结束</li>
+          </ul>
+        </div>
+      </div>
+      <div>
+        <template v-for="(activity, index) in activities">
+          <published-cell v-if="activity.status == 1 || activity.status == 4" :key="index" :activity="activity"></published-cell>
+          <unapproved-cell v-else-if="activity.status == 3" :key="index" :activity="activity"></unapproved-cell>
+          <drafts-cell v-else-if="activity.status == 2" :key="index" :activity="activity"></drafts-cell>
+        </template>
+      </div>
+      <div class="cell clearfix" style="padding-top: 15px;">
+          <el-pagination :total="activity_total" :current-page.sync="current_page" :page-size="10" layout="total, prev, pager, next" @current-change="getActivities()"></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+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"
+import { fetchActivities } from "@/api/activity/activity"
+
+export default {
+  name: "ActivityList",
+  components: {
+    BreadCrumb,
+    PublishedCell,
+    UnapprovedCell,
+    DraftsCell,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "营销工具" },
+        { path: false, name: "活动列表" }
+      ],
+      keyword: "",
+      selecting_status: 0,
+      activity_total: 0,
+      current_page: 1,
+
+      loading_activities: false,
+      activities: [],
+    };
+  },
+  mounted() {
+      this.getActivities()
+  },
+  methods: {
+    changeSelectingStatus(status) {
+      this.selecting_status = status
+      this.getActivities()
+    },
+
+    getActivities() {
+      this.loading_activities = true
+      fetchActivities(this.current_page, this.keyword, this.selecting_status).then(rs => {
+        this.loading_activities = false
+        var resp = rs.data
+        if (resp.state == 1) {
+          this.activities = resp.data.activities
+          this.activity_total = resp.data.total
+          console.log(this.activities)
+
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(err => {
+        this.loading_activities = false
+        this.$message.error(err)
+      })
+    },
+  },
+};
+</script>
+
+<style scoped>
+.keyword_input {
+  width: 330px;
+}
+</style>
+
+

src/scrm_pages/marketing_tool/activity_publish.vue

@@ -0,0 +1,61 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+        <div class="app-container" style="padding: 0 20px; background-color: #f6f8f9;">
+            <div class="edit-main">
+                <div class="preview-panel">
+                    <preview-form></preview-form>
+                </div>
+                <div class="edit-panel">
+                    <edit-form></edit-form>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from "@/scrm_pages/components/bread-crumb";
+import PreviewForm from "@/scrm_pages/marketing_tool/components/edit_activity_preview_form"
+import EditForm from "@/scrm_pages/marketing_tool/components/edit_activity_edit_form"
+
+export default {
+    name: "ActivityPublish",
+    components: {
+        BreadCrumb,
+        PreviewForm,
+        EditForm,
+    },
+    data() {
+        return {
+            crumbs: [
+                { path: false, name: "营销工具" },
+                { path: false, name: "发布活动" }
+            ],
+        }
+    },
+}
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+.edit-main {
+    width: 100%;
+    display: flex;
+    min-height: 600px;
+    height: auto;
+    box-sizing: border-box;
+
+    .preview-panel {
+        flex: 3;
+        margin-right: 1rem;
+        background-color: #fff;
+    }
+    .edit-panel {
+        flex: 4;
+        padding-bottom: 80px;
+        background-color: #fff;
+    }
+}
+</style>

src/scrm_pages/marketing_tool/components/drafts_cell.vue

@@ -0,0 +1,123 @@
+<template>
+<div class="clearfix">
+    <div class="drafts-cell">
+        <div class="activity-image-panel">
+            <span class="status-text">待发布</span>
+            <img :src="activity.poster_photo" />
+        </div>
+        <div class="activity-info-panel">
+            <h3 class="title">
+                <a href="/">{{ activity.title }}</a>
+            </h3>
+            <div class="operation">
+                <el-button type="primary" size="small" icon="el-icon-edit-outline">编辑</el-button>
+                <el-button type="danger" size="small" icon="el-icon-delete">删除</el-button>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+export default {
+    name: "DraftsActivityCell",
+    props: {
+        activity: {
+            type: Object,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            
+        }
+    },
+}
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+.drafts-cell {
+    padding: 20px 15px;
+    border: none;
+    border-bottom: 1px solid #e5e8ea;
+    float: left;
+    margin: 0;
+    width: 100%;
+    border-radius: 0;
+    position: relative;
+
+    .activity-image-panel {
+        width: 155px;
+        height: 122px;
+        border: 1px #dee2e5 solid;
+        display: flex;
+        justify-content: center;
+        position: relative;
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        border-radius: 4px;
+        overflow: hidden;
+        float: left;
+
+        .status-text {
+            position: absolute;
+            font-size: 12px;
+            color: #fff;
+            top: 14px;
+            left: 3px;
+            -webkit-transform: rotate(316deg);
+            transform: rotate(316deg);
+        }
+
+        img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            object-position: center;
+        }
+    }
+    .activity-image-panel::before {
+        border-top: 28px solid #65d3e3;
+        border-right: 28px solid transparent;
+        border-bottom: 28px solid transparent;
+        border-left: 28px solid #65d3e3;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        display: block;
+        content: "";
+    }
+
+    .activity-info-panel {
+        padding: 7px 20px;
+        width: 60%;
+        float: left;
+
+        .title {
+            padding-bottom: 5px;
+
+            a {
+                color: #495060;
+                font-size: 20px;
+                max-width: 100%;
+                font-weight: 500;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                display: inline-block;
+            }
+        }
+
+        .operation {
+            padding: 10px 0 0;
+        }
+    }
+}
+</style>
+
+
+
+
+

src/scrm_pages/marketing_tool/components/edit_activity_edit_form.vue

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

src/scrm_pages/marketing_tool/components/edit_activity_preview_form.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="preview-main">
+        <div class="form-title">
+            <img class="icon" src="@/assets/img/sa_06.png" />
+            <span>预览</span>
+        </div>
+        <div class="form-content">
+            <div class="preview-cell-poster-photo border">
+                <img class="poster-photo" :src="poster_photo" />
+                <div class="title-panel">
+                    <p class="title">{{ title }}</p>
+                    <p class="subtitle">{{ subtitle }}</p>
+                </div>
+            </div>
+            <div class="org-info-cell border">
+                <div class="logo">
+                    <img :src="poster_photo" />
+                </div>
+                <div class="text-info">
+                    <p class="name">测试机构</p>
+                    <p class="address">地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址</p>
+                </div>
+                <div class="arrow-panel">
+                    <img src="@/assets/img/sa_52.png" />
+                </div>
+            </div>
+            <div class="simple-cell border">
+                <div class="icon">
+                    <img src="@/assets/img/sa_21.png" />
+                </div>
+                <div class="text">
+                    <p>2019-01-01</p>
+                </div>
+                <div class="arrow-panel">
+                    <img src="@/assets/img/sa_52.png" />
+                </div>
+            </div>
+            <div class="simple-cell border">
+                <div class="icon">
+                    <img src="@/assets/img/sa_24.png" />
+                </div>
+                <div class="text">
+                    <p>0755-86879866</p>
+                </div>
+                <div class="arrow-panel">
+                    <img src="@/assets/img/sa_52.png" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "EditActivityPreviewForm",
+    data() {
+        return {
+            
+        }
+    },
+    computed: {
+        poster_photo: function() {
+            return require("@/assets/img/activity_poster_photo_default.png")
+        },
+        title: function() {
+            return "与孩子一起挑选采摘新鲜有机马陆葡萄，体验采摘乐趣"
+        },
+        subtitle: function() {
+            return "亲子采摘活动"
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.preview-main {
+    .form-title {
+        width: 100%;
+        padding: 20px 0 20px 30px;
+        border-bottom: 1px #dee2e5 solid;
+
+        .icon {
+            margin-top: -4px;
+            vertical-align: middle;
+        }
+
+        span {
+            font-size: 18px;
+            font-weight: 500;
+            color: #485b6d;
+            margin-left: 10px;
+        }
+    }
+
+    .form-content {
+        width: 100%;
+        padding: 14px 30px 0 30px;
+
+        .preview-cell-poster-photo {
+            .poster-photo {
+                width: 100%;
+            }
+
+            .title-panel {
+                padding: 15px 15px 16px 20px;
+
+                .title {
+                    font-size: 18px;
+                    color: #485b6d;
+                    font-weight: bold;
+                    line-height: 28px;
+                }
+
+                .subtitle {
+                    margin-top: 6px;
+                    color: #a6a6a6;
+                    font-size: 14px;
+                }
+            }
+        }
+
+        .org-info-cell {
+            padding: 20px 20px;
+            margin-top: 15px;
+            position: relative;
+            display: flex;
+            -webkit-box-align: center;
+            align-items: center;
+
+            .logo {
+                img {
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 20px;
+                }
+            }
+            .text-info {
+                flex: 1;
+                padding-left: 17px;
+                color: #485b6d;
+
+                .name {
+                    font-size: 16px;
+                    line-height: 22px;
+                    font-weight: 500;
+                }
+                .address {
+                    font-size: 14px;
+                    line-height: 20px;
+                    margin-top: 5px;
+                }
+            }
+            .arrow-panel {
+                width: 20px;
+                position: relative;
+
+                img {
+                    width: 8px;
+                    float: right;
+                    vertical-align: middle;
+                }
+            }
+        }
+
+        .simple-cell {
+            padding: 20px 20px;
+            margin-top: 15px;
+            position: relative;
+            display: flex;
+            -webkit-box-align: center;
+            align-items: center;
+
+            .icon {
+                img {
+                    width: 20px;
+                    height: 20px;
+                    vertical-align: middle;
+                }
+            }
+            .text {
+                flex: 1;
+                padding-left: 17px;
+                color: #485b6d;
+                line-height: 20px;
+            }
+            .arrow-panel {
+                width: 20px;
+                position: relative;
+
+                img {
+                    width: 8px;
+                    float: right;
+                    vertical-align: middle;
+                }
+            }
+        }
+    }
+}
+</style>
+
+<style scoped>
+.border {
+    border: solid 1px #dee2e5;
+    border-radius: 4px;
+}
+</style>

src/scrm_pages/marketing_tool/components/published_cell.vue

@@ -0,0 +1,188 @@
+<template>
+<div class="clearfix">
+    <div class="published-cell">
+        <div class="activity-image-panel">
+            <span class="status-text">{{ status_text }}</span>
+            <img :src="activity.poster_photo" />
+        </div>
+        <div class="activity-info-panel">
+            <h3 class="title">
+                <a href="">{{ activity.title }}</a>
+            </h3>
+            <div class="statistics">
+                阅读：{{ activity.read_num }} 丨 评论：{{ activity.comment_num }} 丨 点赞：{{ activity.star_num }}
+            </div>
+            <div class="progress">
+                <div class="progress-bar">
+                    <el-progress :percentage="progress_percent" :stroke-width="5" color="#409eff" :show-text="false" ></el-progress>
+                </div>
+                <span class="progress-text">{{ progress_text }}</span>
+            </div>
+        </div>
+        <div class="activity-time-panel">
+            <span class="time">{{ start_time }}</span>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import { parseTime } from "@/utils"
+
+export default {
+    name: "PublishedActivityCell",
+    props: {
+        activity: {
+            type: Object,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            
+        }
+    },
+    computed: {
+        status_text: function() {
+            if (this.activity.status == 4) {
+                return "已结束"
+            } else if (this.activity.is_recommend == true) {
+                return "已推荐"
+            } else {
+                return "已发布"
+            }
+        },
+        progress_percent: function() {
+            if (this.activity.limit_num > 0) {
+                return (this.activity.join_num / this.activity.limit_num) * 100
+            } else {
+                return 100
+            }
+        },
+        progress_text: function() {
+            if (this.activity.limit_num > 0) {
+                if (this.activity.join_num >= this.activity.limit_num) {
+                    return "已报满"
+                } else {
+                    return this.activity.join_num + " / " + this.activity.limit_num
+                }
+            } else {
+                return "无限制"
+            }
+        },
+        start_time: function() {
+            return parseTime(this.activity.start_time, "{y}-{m}-{d}")
+        },
+    },
+}
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+.published-cell {
+    padding: 20px 15px;
+    border: none;
+    border-bottom: 1px solid #e5e8ea;
+    float: left;
+    margin: 0;
+    width: 100%;
+    border-radius: 0;
+    position: relative;
+
+    .activity-image-panel {
+        width: 155px;
+        height: 122px;
+        border: 1px #dee2e5 solid;
+        display: flex;
+        justify-content: center;
+        position: relative;
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        border-radius: 4px;
+        overflow: hidden;
+        float: left;
+
+        .status-text {
+            position: absolute;
+            font-size: 12px;
+            color: #fff;
+            top: 14px;
+            left: 3px;
+            -webkit-transform: rotate(316deg);
+            transform: rotate(316deg);
+        }
+
+        img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            object-position: center;
+        }
+    }
+    .activity-image-panel::before {
+        border-top: 28px solid #5bd18b;
+        border-right: 28px solid transparent;
+        border-bottom: 28px solid transparent;
+        border-left: 28px solid #5bd18b;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        display: block;
+        content: "";
+    }
+
+    .activity-info-panel {
+        padding: 7px 20px;
+        width: 60%;
+        float: left;
+
+        .title {
+            padding-bottom: 5px;
+
+            a {
+                color: #495060;
+                font-size: 20px;
+                max-width: 100%;
+                font-weight: 500;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                display: inline-block;
+            }
+        }
+
+        .statistics {
+            color: #a8b3ba;
+            font-size: 15px;
+            justify-content: space-between;
+            line-height: 30px;
+        }
+
+        .progress {
+            padding: 5px 0;
+
+            .progress-bar {
+                width: 60%;
+                display: inline-block;
+            }
+            .progress-text {
+                margin-left: 10px;
+                font-size: 15px;
+                color: #409eff;
+            }
+        }
+    }
+
+    .activity-time-panel {
+        float: right;
+        padding: 7px 0;
+
+        .time {
+            font-size: 15px;
+            color: #a8b3ba;
+        }
+    }
+}
+</style>
+

src/scrm_pages/marketing_tool/components/unapproved_cell.vue

@@ -0,0 +1,151 @@
+<template>
+<div class="clearfix">
+    <div class="unapproved-cell">
+        <div class="activity-image-panel">
+            <span class="status-text">未通过</span>
+            <img :src="activity.poster_photo" />
+        </div>
+        <div class="activity-info-panel">
+            <h3 class="title">
+                <a href="/">{{ activity.title }}</a>
+            </h3>
+            <div class="reason">
+                审核未通过：{{ activity.reason }}
+            </div>
+            <div class="operation">
+                <el-button type="primary" size="small" icon="el-icon-edit-outline">编辑</el-button>
+                <el-button type="danger" size="small" icon="el-icon-delete">删除</el-button>
+            </div>
+        </div>
+        <div class="activity-time-panel">
+            <span class="time">{{ start_time }}</span>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import { parseTime } from "@/utils"
+
+export default {
+    name: "UnapprovedActivityCell",
+    props: {
+        activity: {
+            type: Object,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            
+        }
+    },
+    computed: {
+        start_time: function() {
+            return parseTime(this.activity.start_time, "{y}-{m}-{d}")
+        },
+    },
+}
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+.unapproved-cell {
+    padding: 20px 15px;
+    border: none;
+    border-bottom: 1px solid #e5e8ea;
+    float: left;
+    margin: 0;
+    width: 100%;
+    border-radius: 0;
+    position: relative;
+
+    .activity-image-panel {
+        width: 155px;
+        height: 122px;
+        border: 1px #dee2e5 solid;
+        display: flex;
+        justify-content: center;
+        position: relative;
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        border-radius: 4px;
+        overflow: hidden;
+        float: left;
+
+        .status-text {
+            position: absolute;
+            font-size: 12px;
+            color: #fff;
+            top: 14px;
+            left: 3px;
+            -webkit-transform: rotate(316deg);
+            transform: rotate(316deg);
+        }
+
+        img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            object-position: center;
+        }
+    }
+    .activity-image-panel::before {
+        border-top: 28px solid #ff7979;
+        border-right: 28px solid transparent;
+        border-bottom: 28px solid transparent;
+        border-left: 28px solid #ff7979;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        display: block;
+        content: "";
+    }
+
+    .activity-info-panel {
+        padding: 7px 20px;
+        width: 60%;
+        float: left;
+
+        .title {
+            padding-bottom: 5px;
+
+            a {
+                color: #495060;
+                font-size: 20px;
+                max-width: 100%;
+                font-weight: 500;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                display: inline-block;
+            }
+        }
+
+        .reason {
+            color: #ff7979;
+            font-size: 14px;
+            justify-content: space-between;
+            line-height: 30px;
+        }
+
+        .operation {
+            padding: 10px 0 0;
+        }
+    }
+
+    .activity-time-panel {
+        float: right;
+        padding: 7px 0;
+
+        .time {
+            font-size: 15px;
+            color: #a8b3ba;
+        }
+    }
+}
+</style>
+
+
+

src/scrm_pages/members/members.vue

@@ -215,6 +215,7 @@
         GetMembers(){
             GetMembers(this.listQuery).then(response=>{
                 var res = response.data;
+                console.log("res是谁？",res)
                 if(res.state == 1) {
                     this.membersData = res.data.members;
                     this.total = res.data.total;