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

config/index.js

@@ -19,6 +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',
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/api/activity/activity.js

@@ -11,4 +11,25 @@ export function fetchActivities(page, keyword, status) {
     method: 'get',
     params: params,
   })
+}
+
+export function fetchActivity(id) {
+  return request({
+    url: "/api/activity",
+    method: "get",
+    params: {
+      id: id,
+    }
+  })
+}
+
+export function submitActivity(publish, activity) {
+  return request({
+    url: "/api/activity/submit",
+    method: "post",
+    params: {
+      publish: publish,
+    },
+    data: activity,
+  })
 }

src/lang/en.js

@@ -114,7 +114,8 @@ export default {
     marketingTool: "marketing tools",
     activityList: "activity list",
     activityPublish: "publish activity",
-    systemsetting:'Systemsetting'
+    activityModify: "edit activity",
+    systemsetting:'Systemsetting',
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -162,8 +162,9 @@ export default {
     marketingTool: "营销工具",
     activityList: "活动列表",
     activityPublish: "发布活动",
+    activityModify: "编辑活动",
     systemsetting:'系统设置',
-    staffmanagement:'员工管理'
+    staffmanagement:'员工管理',
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/marketing_tool.js

@@ -28,5 +28,16 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/activity/modify',
+      hidden: true,
+      is_menu: false,
+      component: () => import('@/scrm_pages/marketing_tool/activity_publish'),
+      name: 'activityModify',
+      meta: {
+        title: 'activityModify',
+        noCache: true
+      }
+    },
   ]
 }

src/scrm_pages/marketing_tool/activity_publish.vue

@@ -9,7 +9,7 @@
                     <preview-form :activity="activity" :paragraph="activity_paragraph"></preview-form>
                 </div>
                 <div class="edit-panel">
-                    <edit-form :activity="activity" :paragraph="activity_paragraph"></edit-form>
+                    <edit-form ref="edit_form" :activity="activity" :paragraph="activity_paragraph"></edit-form>
                 </div>
             </div>
         </div>
@@ -20,6 +20,7 @@
 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"
+import { fetchActivity } from "@/api/activity/activity"
 
 export default {
     name: "ActivityPublish",
@@ -53,6 +54,40 @@ export default {
             }
         }
     },
+    created() {
+        var id = this.$route.query.id
+        if (id != undefined) {
+            fetchActivity(id).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                    // console.log(resp.data)
+                    var activity = resp.data.activity
+                    this.activity.id = activity.id
+                    this.activity.poster_photo = activity.poster_photo
+                    this.activity.title = activity.title
+                    this.activity.subtitle = activity.subtitle
+                    this.activity.address = activity.address
+                    this.activity.limit_num = activity.limit_num
+                    this.activity.sign_up_deadline = activity.sign_up_deadline * 1000
+                    this.activity.start_time = activity.start_time * 1000
+                    this.activity.phone_number = activity.phone_number
+                    this.activity.sign_up_notice = activity.sign_up_notice
+
+                    var paragraph = resp.data.paragraph
+                    this.activity_paragraph.title = paragraph.title
+                    this.activity_paragraph.content = paragraph.content
+
+                    this.$refs.edit_form.initForms()
+
+                } else {
+                    this.$message.error(resp.msg)
+                }
+
+            }).catch(err => {
+                this.$message.error(err)
+            })
+        }
+    },
 }
 </script>
 

src/scrm_pages/marketing_tool/components/drafts_cell.vue

@@ -10,7 +10,7 @@
                 <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="primary" size="small" icon="el-icon-edit-outline" @click="$router.push({ path: '/activity/modify', query: {id: activity.id} })">编辑</el-button>
                 <el-button type="danger" size="small" icon="el-icon-delete">删除</el-button>
             </div>
         </div>

src/scrm_pages/marketing_tool/components/edit_activity_edit_form.vue

@@ -11,7 +11,7 @@
                     基本信息
                 </p>
                 <div class="module-item">
-                    <label class="item-title">主图</label>
+                    <label class="item-title">海报</label>
                     <div class="poster-photo-panel">
                         <el-input v-model="poster_photo_file_name" :readonly="true" class="input"></el-input>
                         <el-upload 
@@ -22,7 +22,7 @@
                         :on-success="posterPhotoUploadSuccess"
                         :before-upload="beforePosterPhotoUpload"
                         >
-                            <el-button type="primary" style="margin-left: 10px;" v-loading="uploading_poster_photo">上传图片</el-button>
+                            <el-button type="primary" style="margin-left: 10px;" :loading="uploading_poster_photo">上传图片</el-button>
                         </el-upload>
                     </div>
                 </div>
@@ -93,9 +93,9 @@
             </div>
 
             <div class="submit-button-panel">
-                <el-button style="padding: 10px 30px;" type="primary">发 布</el-button>
-                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;">保存草稿</el-button>
-                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;">预 览</el-button>
+                <el-button style="padding: 10px 30px;" type="primary" @click="publishAction" :loading="publishing_activity" :disabled="saving_activity || saving_before_preview_activity">发 布</el-button>
+                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;" @click="saveAction" :loading="saving_activity" :disabled="publishing_activity || saving_before_preview_activity">保存草稿</el-button>
+                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;" :loading="saving_before_preview_activity" :disabled="publishing_activity || saving_activity">预 览</el-button>
             </div>
         </div>
     </div>
@@ -105,6 +105,8 @@
 import Neditor from '@/components/Neditor'
 import { getToken } from "@/api/qiniu"
 import { getFileExtension } from "@/utils/tools"
+import { parseTime } from "@/utils"
+import { submitActivity } from "@/api/activity/activity"
 
 export default {
     name: "EditActivityEditForm",
@@ -123,6 +125,10 @@ export default {
     },
     data() {
         return {
+            saving_activity: false,
+            publishing_activity: false,
+            saving_before_preview_activity: false,
+
             uploading_poster_photo: false,
             qntoken: "",
             poster_photo_file_key: "",
@@ -153,14 +159,19 @@ export default {
             }
         },
         activity_time: function(new_val) {
-            this.activity.start_time = new_val
+            this.activity.start_time = parseInt(new_val / 1000)
         },
         sign_up_deadline: function(new_val) {
-            this.activity.sign_up_deadline = new_val  
+            this.activity.sign_up_deadline = parseInt(new_val / 1000)
         },
     },
     methods: {
-        initParagraphContent: function(content) {
+        initForms: function() {
+            this.poster_photo_file_name = this.activity.poster_photo
+            this.limit_num = this.activity.limit_num > 0 ? this.activity.limit_num : ""
+            this.activity_time = this.activity.start_time
+            this.sign_up_deadline = this.activity.sign_up_deadline
+
             this.paragraph_init_content = this.paragraph.content
         },
         paragraphContentChanged: function(content) {
@@ -172,14 +183,11 @@ export default {
             this.$message.error(err)
         },
         posterPhotoUploadSuccess: function(res, file) {
-            console.log(res)
-            console.log(file)
             this.poster_photo_file_name = file.name
             this.uploading_poster_photo = false
             this.activity.poster_photo = "https://images.shengws.com/" + res.url
         },
         beforePosterPhotoUpload: function(file) {
-            console.log(file)
             var is_image = file.type.indexOf("image") > -1
             var mb = file.size / 1024 / 1024
 
@@ -211,6 +219,98 @@ export default {
                 })
             })
         },
+
+        saveAction: function() {
+            this.saving_activity = true
+            this.submitActivity(false)
+        },
+        publishAction: function() {
+            this.publishing_activity = true
+            this.submitActivity(true, function() {
+                // 前往活动详情页
+            })
+        },
+        previewAction: function() {
+            this.saving_before_preview_activity = true
+            this.submitActivity(false, function() {
+                // 前往活动预览页
+            })
+        },
+        submitActivity: function(is_publish, successCallBack) {
+            this.validActivityInfo().then(() => {
+                var activity = {
+                    id: this.activity.id,
+                    poster_photo: this.activity.poster_photo,
+                    title: this.activity.title,
+                    subtitle: this.activity.subtitle,
+                    address: this.activity.address,
+                    limit_num: this.activity.limit_num,
+                    sign_up_deadline: parseTime(this.activity.sign_up_deadline, "{y}-{m}-{d} {h}:{i}"),
+                    start_time: parseTime(this.activity.start_time, "{y}-{m}-{d} {h}:{i}"),
+                    phone_number: this.activity.phone_number,
+                    sign_up_notice: this.activity.sign_up_notice,
+
+                    paragraph: {
+                        title: this.paragraph.title,
+                        content: this.paragraph.content,
+                    }
+                }
+                submitActivity(is_publish, activity).then(rs => {
+                    var resp = rs.data
+                    if (resp.state == 1) {
+                        this.activity.id = resp.data.activity_id
+                    } else {
+                        this.$message.error(resp.msg)
+                    }
+
+                    if (successCallBack != null || successCallBack != undefined) {
+                        successCallBack()
+                    }
+
+                    this.saving_activity = false
+                    this.publishing_activity = false
+                    this.saving_before_preview_activity = false
+
+                }).catch(err => {
+                    this.$message.error(err)
+                    this.saving_activity = false
+                    this.publishing_activity = false
+                    this.saving_before_preview_activity = false
+                })
+
+            }).catch(err => {
+                this.$message.error(err)
+                this.saving_activity = false
+                this.publishing_activity = false
+                this.saving_before_preview_activity = false
+            })
+            
+        },
+        validActivityInfo: function() {
+            return new Promise((resolve, reject) => {
+                if (this.activity.poster_photo.length == 0) {
+                    reject("海报不能为空")
+                } else if (this.activity.title.length == 0) {
+                    reject("标题不能为空")
+                } else if (this.activity.subtitle.length == 0) {
+                    reject("副标题不能为空")
+                } else if (this.activity.address.length == 0) {
+                    reject("活动地址不能为空")
+                } else if (this.activity.sign_up_deadline == 0) {
+                    reject("活动报名时间不能为空")
+                } else if (this.activity.start == 0) {
+                    reject("活动时间不能为空")
+                } 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) {
+                            reject("联系方式格式错误")
+                            return
+                        }
+                    }
+                }
+                resolve()
+            })
+        },
     },
 }
 </script>

src/scrm_pages/marketing_tool/components/edit_activity_preview_form.vue

@@ -197,6 +197,8 @@ export default {
                     width: 40px;
                     height: 40px;
                     border-radius: 20px;
+                    object-fit: cover;
+                    object-position: center;
                 }
             }
             .text-info {

src/scrm_pages/marketing_tool/components/unapproved_cell.vue

@@ -13,7 +13,7 @@
                 审核未通过：{{ activity.reason }}
             </div>
             <div class="operation">
-                <el-button type="primary" size="small" icon="el-icon-edit-outline">编辑</el-button>
+                <el-button type="primary" size="small" icon="el-icon-edit-outline" @click="$router.push({ path: '/activity/modify', query: {id: activity.id} })">编辑</el-button>
                 <el-button type="danger" size="small" icon="el-icon-delete">删除</el-button>
             </div>
         </div>