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

config/index.js

@@ -17,10 +17,9 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'jk.kuyicloud.com',
-
-
+    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,

package-lock.json

@@ -1876,6 +1876,14 @@
         }
       }
     },
+    "can-promise": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/can-promise/-/can-promise-0.0.1.tgz",
+      "integrity": "sha512-gzVrHyyrvgt0YpDm7pn04MQt8gjh0ZAhN4ZDyCRtGl6YnuuK6b4aiUTD7G52r9l4YNmxfTtEscb92vxtAlL6XQ==",
+      "requires": {
+        "window-or-global": "^1.0.1"
+      }
+    },
     "caniuse-api": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
@@ -3326,6 +3334,11 @@
         "randombytes": "^2.0.0"
       }
     },
+    "dijkstrajs": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
+      "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
+    },
     "dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -3537,7 +3550,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -7163,6 +7175,14 @@
         "pify": "^3.0.0"
       }
     },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -7536,6 +7556,11 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -8003,7 +8028,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -8166,11 +8190,21 @@
         "os-tmpdir": "^1.0.0"
       }
     },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+    },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -8444,6 +8478,11 @@
       "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
+    "pngjs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
+    },
     "portfinder": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
@@ -11226,6 +11265,182 @@
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
+    "qrcode": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.3.3.tgz",
+      "integrity": "sha512-SH7V13AcJusH3GT8bMNOGz4w0L+LjcpNOU/NiOgtBhT/5DoWeZE6D5ntMJnJ84AMkoaM4kjJJoHoh9g++8lWFg==",
+      "requires": {
+        "can-promise": "0.0.1",
+        "dijkstrajs": "^1.0.1",
+        "isarray": "^2.0.1",
+        "pngjs": "^3.3.0",
+        "yargs": "^12.0.5"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+        },
+        "isarray": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
+          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+          "requires": {
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "qrcodejs2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
@@ -14823,6 +15038,11 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+    "window-or-global": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
+      "integrity": "sha1-2+RboqKRqrxW1iz2bEW3+jIpRt4="
+    },
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -14889,8 +15109,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "0.2.1",

package.json

@@ -54,6 +54,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
+    "qrcode": "^1.3.3",
     "qrcodejs2": "0.0.2",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",

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

@@ -11,4 +11,77 @@ 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,
+  })
+}
+
+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,
+    }
+  })
+}
+
+export function deleteActivity(activity_id) {
+  return request({
+    url: "/api/activity/delete",
+    method: "post",
+    params: {
+      id: activity_id,
+    }
+  })
+}
+
+export function publishActivity(activity_id) {
+  return request({
+    url: "/api/activity/publish",
+    method: "post",
+    params: {
+      id: activity_id,
+    }
+  })
+}
+
+export function getActivityShareInfo(activity_id) {
+  return request({
+    url: "/api/activity/shareinfo",
+    method: "get",
+    params: {
+      id: activity_id,
+    }
+  })
 }

src/api/member/member.js

@@ -118,3 +118,12 @@ export function DeleteMemberShipCard(data) {
     data: data
   })
 }
+
+
+export function EditRight(data) {
+  return request({
+    url: '/api/membercard/right/edit',
+    method: 'put',
+    data: data
+  })
+}

src/api/mpwechat/mpmenus.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function GetMenus() {
+  return request({
+    url: '/api/mpwechat/menus',
+    method: 'get',
+  })
+}
+
+export function SaveMenus(data) {
+  return request({
+    url: '/api/mpwechat/savemenus',
+    method: 'put',
+    data:data,
+  })
+}
+
+export function DeleteMenu(data) {
+  return request({
+    url: '/api/mpwechat/deletemenus',
+    method: 'post',
+    data:data,
+  })
+}

src/api/mpwechat/mpreply.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+export function GetSubscribeRplay() {
+    return request({
+        url: '/api/mpwechat/reply/subscribe',
+        method: 'get',
+    })
+}
+
+export function SaveSubscribeRplay(data) {
+    return request({
+        url: '/api/mpwechat/reply/subscribe',
+        method: 'put',
+        data:data,
+    })
+}
+    
+export function GetKeyWordReplys(params) {
+    return request({
+        url: '/api/mpwechat/reply/kewords',
+        method: 'get',
+        params:params,
+    })
+}
+
+export function CreateKeyWordReply(data) {
+    return request({
+        url: '/api/mpwechat/reply/keword',
+        method: 'post',
+        data:data,
+    })
+}
+export function EditKeyWordReply(id,data) {
+    return request({
+        url: '/api/mpwechat/reply/keword?id='+id,
+        method: 'put',
+        data:data,
+    })
+}
+
+export function DeleteReplys(data) {
+    return request({
+        url: '/api/mpwechat/replys',
+        method: 'delete',
+        data:data,
+    })
+}

src/api/mpwechat/mpwechat.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+export function GetAuthorizationInfo() {
+  return request({
+    url: '/api/mpwechat/authorization',
+    method: 'get',
+  })
+}
+
+export function GetAuthUrl() {
+  return request({
+    url: '/api/mpwechat/authurl',
+    method: 'get',
+  })
+}

src/lang/en.js

@@ -114,7 +114,12 @@ export default {
     marketingTool: "marketing tools",
     activityList: "activity list",
     activityPublish: "publish activity",
-    systemsetting:'Systemsetting'
+    activityModify: "edit activity",
+    systemsetting:'Systemsetting',
+    activityDetail: "activity detail",
+    activityShare: "activity share",
+    activityPreview: "activity preview",
+    activitySignupList: "activity sign up list",
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -162,8 +162,13 @@ export default {
     marketingTool: "营销工具",
     activityList: "活动列表",
     activityPublish: "发布活动",
+    activityModify: "编辑活动",
     systemsetting:'系统设置',
-    staffmanagement:'员工管理'
+    staffmanagement:'员工管理',
+    activityDetail: "活动详情",
+    activityShare: "活动分享",
+    activityPreview: "活动预览",
+    activitySignupList: "报名列表",
   },
   navbar: {
     logOut: '退出登录',

src/router/index.js

@@ -68,6 +68,11 @@ var _constant_router_map = [{
       noCache: true
     }
   }]
+},
+{
+  path: '/activity/preview',
+  component: () => import('@/scrm_pages/marketing_tool/activity_preview'),
+  hidden: true
 }
   // service
 ]

src/router/modules/marketing_tool.js

@@ -28,5 +28,60 @@ 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
+      }
+    },
+    {
+      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,
+    //   }
+    // },
+    {
+      path: "/activity/signupusers",
+      hidden: true,
+      is_menu: false,
+      component: () => import("@/scrm_pages/marketing_tool/activity_signup_users"),
+      name: "activitySignupList",
+      meta: {
+        title: "activitySignupList",
+        noCache: true,
+      }
+    },
   ]
 }

src/router/modules/member.js

@@ -15,7 +15,7 @@ export default {
     {
       path: '/member/members',
       component: () => import('@/scrm_pages/members/members'),
-      name: 'memberslist',
+      name: 'memberslists',
       meta: { title: '会员管理', noCache: true }
     },
     {

src/router/modules/system.js

@@ -17,6 +17,25 @@ export default {
       name: 'weixinMpAuth',
       meta: { title: '公众号授权', noCache: true }
     },
+    {
+      path: '/weixinmp/menus',
+      component: () => import('@/scrm_pages/weixinmp/menus'),
+      name: 'weixinMpMenus',
+      meta: { title: '公众号菜单', noCache: true }
+    },
+    {
+      path: '/weixinmp/reply/subscribe',
+      component: () => import('@/scrm_pages/weixinmp/subscribereply'),
+      name: 'weixinAutoReply',
+      meta: { title: '自动回复', noCache: true }
+    },
+    {
+      path: '/weixinmp/reply/keyword',
+      component: () => import('@/scrm_pages/weixinmp/keywordreply'),
+      name: 'weixinKeywordReply',
+      hidden: true,
+      meta: { title: '关键词回复', noCache: true }
+    },
     {
       path: '/Systemsetting/staffmanagement',
       component: () => import('@/scrm_pages/Systemsetting/staffmanagement'),

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,265 @@
+<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 v-if="activity != null && activity.status == 4" :to="activity_url" target="_blank">{{ title }}</router-link>
+                        <router-link v-else :to="activity_url">{{ title }}</router-link> -->
+                        <router-link :to="activity_url" target="_blank">{{ 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" @click="publishActivity" :loading="publishing">发布</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">
+                    <el-button type="primary" @click="$router.push({ path: '/activity/signupusers', query: { id: activity_id } })">查看全部</el-button>
+                </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, publishActivity } 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,
+            publishing: 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)
+            })
+        },
+        publishActivity: function() {
+            this.publishing = true
+            publishActivity(this.activity_id).then(rs => {
+                this.publishing = false
+                var resp = rs.data
+                if (resp.state == 1) {
+                    this.activity.status = 1
+                } else {
+                    this.$message.error(resp.msg)
+                } 
+
+            }).catch(rs => {
+                this.publishing = 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

@@ -34,8 +34,10 @@
       <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>
+
+          <unapproved-cell v-else-if="activity.status == 3" :key="index" :activity="activity" @delete="deleteActivity(activity.id, index)"></unapproved-cell>
+
+          <drafts-cell v-else-if="activity.status == 2" :key="index" :activity="activity" @delete="deleteActivity(activity.id, index)"></drafts-cell>
         </template>
       </div>
       <div class="cell clearfix" style="padding-top: 15px;">
@@ -46,11 +48,11 @@
 </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"
-import { fetchActivities } from "@/api/activity/activity"
+import { fetchActivities, deleteActivity } from "@/api/activity/activity"
 
 export default {
   name: "ActivityList",
@@ -102,6 +104,23 @@ export default {
         this.$message.error(err)
       })
     },
+
+    deleteActivity(id, index) {
+      this.loading_activities = true
+      deleteActivity(id).then(rs => {
+        this.loading_activities = false
+        var resp = rs.data
+        if (resp.state == 1) {
+          this.activities.splice(index, 1)
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(err => {
+        this.loading_activities = false
+        this.$message.error(err)
+        return err
+      })
+    }
   },
 };
 </script>

src/scrm_pages/marketing_tool/activity_preview.vue

@@ -0,0 +1,325 @@
+<template>
+<div style="background-color: #f6f8f9;">
+    <div class="main">
+        <div class="border title-panel">
+            <img :src="activity.poster_photo"/>
+            <div class="text">
+                <p class="title">{{ activity.title }}</p>
+                <p class="subtitle">{{ activity.subtitle }}</p>
+            </div>
+        </div>
+        <div class="org-info border">
+            <div class="logo">
+                <img :src="org.logo" />
+            </div>
+            <div class="info">
+                <p class="name">{{ org.name }}</p>
+                <p class="address">{{ activity.address }}</p>
+            </div>
+            <div class="arrow">
+                <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>{{ parseTime(activity.start_time, "{y}-{m}-{d} {h}:{i}") }}</p>
+            </div>
+            <div class="arrow-panel">
+                <img src="@/assets/img/sa_52.png" />
+            </div>
+        </div>
+        <div class="simple-cell border" v-if="activity.phone_number.length > 0">
+            <div class="icon">
+                <img src="@/assets/img/sa_24.png" />
+            </div>
+            <div class="text">
+                <p>{{ activity.phone_number }}</p>
+            </div>
+            <div class="arrow-panel">
+                <img src="@/assets/img/sa_52.png" />
+            </div>
+        </div>
+        <div class="simple-cell border" v-if="activity.limit_num > 0">
+            <div class="title">
+                <p>活动名额</p>
+            </div>
+            <div class="detail">
+                <p>{{ activity.limit_num + "人" }}</p>
+            </div>
+        </div>
+
+        <div class="large-text-cell border" v-if="sign_up_notice.length > 0">
+            <div class="title">
+                <img src="@/assets/img/sa_25.png" />
+                <span>报名须知</span>
+            </div>
+            <p class="content" v-html="sign_up_notice">
+            </p>
+        </div>
+
+        <div class="large-text-cell border" v-if="activity_paragraph.title.length > 0">
+            <div class="title">
+                <img src="@/assets/img/sa_26.png" />
+                <span>{{ activity_paragraph.title }}</span>
+            </div>
+            <p class="content" v-html="activity_paragraph.content">
+            </p>
+        </div>
+
+        <div class="signup-fake-btn">
+            立即报名
+        </div>
+    </div>
+</div> 
+</template>
+
+<script>
+import { fetchActivity } from "@/api/activity/activity"
+import { parseTime } from "@/utils"
+
+export default {
+    name: "ActivityPreview",
+    data() {
+        return {
+            activity_id: 0,
+
+            activity: {
+                id: 0,
+                poster_photo: "",
+                title: "",
+                subtitle: "",
+                address: "",
+                limit_num: 0,
+                sign_up_deadline: 0,
+                start_time: 0,
+                phone_number: "",
+                sign_up_notice: "",
+            },
+            activity_paragraph: {
+                title: "",
+                content: "",
+            },
+            org: {
+                name: "",
+                logo: "",
+            }
+        }
+    },
+    computed: {
+        sign_up_notice: function() {
+            return this.activity.sign_up_notice.replace(/\n/g, "<br/>")
+        }
+    },
+    mounted() {
+        this.activity_id = this.$route.query.id
+
+        fetchActivity(this.activity_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.org.name = resp.data.org.name
+                this.org.logo = resp.data.org.logo
+
+            } else {
+                this.$message.error(resp.msg)
+            }
+
+        }).catch(err => {
+            this.$message.error(err)
+        })
+    },
+    methods: {
+        parseTime,
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.main {
+    width: 750px;
+    margin: 0 auto;
+    padding: 14px 30px 0 30px;
+
+    .title-panel {
+        background-color: white;
+
+        img {
+            width: 100%;
+            height: auto;
+        }
+        .text {
+            padding: 12px 15px 16px 20px;
+
+            .title {
+                font-size: 18px;
+                color: #485b6d;
+                font-weight: bold;
+                line-height: 32px;
+            }
+            .subtitle {
+                margin-top: 4px;
+                color: #a6a6a6;
+                font-size: 14px;
+            }
+        }
+    }
+
+    .org-info {
+        padding: 26px 20px;
+        position: relative;
+        display: flex;
+        -webkit-box-align: center;
+        align-items: center;
+        margin-top: 15px;
+        background-color: white;
+
+        .logo {
+            img {
+                width: 40px;
+                height: 40px;
+                border-radius: 20px;
+                object-fit: cover;
+                object-position: center;
+            }
+        }
+
+        .info {
+            flex: 1;
+            padding-left: 23px;
+            color: #485b6d;
+
+            .name {
+                font-size: 16px;
+                line-height: 22px;
+            }
+            .address {
+                font-size: 14px;
+                line-height: 20px;
+            }
+        }
+        
+        .arrow {
+            width: 20px;
+            position: relative;
+            img {
+                width: 8px;
+                float: right;
+            }
+        }
+    }
+
+    .simple-cell {
+        background-color: white;
+        padding: 20px 20px;
+        margin-top: 15px;
+        position: relative;
+        display: flex;
+        -webkit-box-align: center;
+        align-items: center;
+
+        .icon {
+            img {
+                width: 20px;
+                height: auto;//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;
+            }
+        }
+
+        .title {
+            p {
+                color: #485b6d;
+            }
+        }
+        .detail {
+            flex: 1;
+            padding-left: 23px;
+            color: #485b6d;
+
+            p {
+                color: #485b6d;
+                float: right;
+                text-align: right;
+            }
+        }
+    }
+
+    .large-text-cell {
+        background-color: white;
+        padding: 20px 20px;
+        position: relative;
+        -webkit-box-align: center;
+        align-items: center;
+        margin-top: 15px;
+
+        .title {
+            color: #485b6d;
+            line-height: 18px;
+            height: 18px;
+
+            img {
+                margin-right: 11px;
+                float: left;
+            }
+        }
+        .content {
+            color: #a8b3ba;
+            margin: 10px 0 0 0;
+            font-size: 14px;
+            line-height: 20px;
+        }
+    }
+
+    .signup-fake-btn {
+        background: #58a1ed;
+        color: #fff;
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+        width: 100%;
+        margin-top: 100px;
+        font-size: 16px;
+    }
+}
+</style>
+
+<style scoped>
+.border {
+    border: solid 1px #dee2e5;
+    border-radius: 4px;
+}
+</style>

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/activity_share.vue

@@ -0,0 +1,227 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+        <div class="app-container" style="padding: 0 6px 20px; background-color: #f6f8f9;">
+            <div class="wx-share-panel">
+                <div class="text-panel">
+                    <p class="title">微信分享</p>
+                    <p class="desc">以微信方式推送给客户，该方式可以监测活动的展现及参与次数</p>
+                </div>
+                <div class="qrcode-panel">
+                    <div class="qrcode">
+                        <img :src="qr_img" :style="{ opacity: qr_img.length > 0 ? 1 : 0 }" />
+                    </div>
+                    <div class="btn">
+                        <el-button type="primary" @click="previewAction">新窗口预览</el-button>
+                    </div>
+                </div>
+            </div>
+            <div class="sms-share-panel">
+                <div class="text-panel">
+                    <p class="title">短信分享</p>
+                    <p class="desc">以短信方式推送给客户</p>
+                </div>
+                <div class="btn-panel">
+                    <el-button type="primary">短信推送</el-button>
+                </div>
+            </div>
+            <div class="link-share-panel">
+                <div>
+                    <p class="title">网页链接</p>
+                    <p class="desc">可以直接分享以下链接到相应媒体（邮件、QQ、微博等），或者嵌入到微信公众号菜单</p>
+                </div>
+                <div class="input-line">
+                    <div class="input">
+                        <el-input readonly v-model="short_url"></el-input>
+                    </div>
+                    <el-button type="primary" @click="copyAction">复制链接</el-button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from "@/scrm_pages/components/bread-crumb"
+import QRCode from "qrcode"
+import { getActivityShareInfo } from "@/api/activity/activity"
+
+export default {
+    name: "ActivityShare",
+    components: {
+        BreadCrumb,
+    },
+    data() {
+        return {
+            crumbs: [
+                { path: false, name: "活动详情" },
+                { path: false, name: "活动分享" },
+            ],
+
+            activity_id: 0,
+            short_url: "",
+            qr_img: "",
+        }
+    },
+    mounted() {
+        this.activity_id = this.$route.query.id
+
+        getActivityShareInfo(this.activity_id).then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+                this.short_url = resp.data.url
+
+                var opts = {
+                    errorCorrectionLevel: "H",
+                    type: "image/png"
+                };
+                var that = this;
+                QRCode.toDataURL(this.short_url, opts, function(err, qr_url) {
+                    if (err) {
+                        console.log(err);
+                    } else {
+                        that.qr_img = qr_url;
+                    }
+                });
+
+            } else {
+                this.$message.error(resp.msg)
+            }
+        }).catch(err => {
+            this.$message.error(err)
+        })
+
+    },
+    methods: {
+        previewAction: function () {
+            // var new_page = this.$router.resolve({ 
+            //     path: '/activity/preview',
+            //     query: {
+            //         id: this.activity_id,
+            //     }   
+            // })
+            // window.open(new_page.href, '_blank');
+            window.open(this.short_url, "_blank")
+        },
+        copyAction: function() {
+            var input = document.createElement("input");
+            input.value = this.short_url;
+            document.body.appendChild(input);
+            input.select();
+            document.execCommand("Copy");
+            document.body.removeChild(input);
+
+            this.$message.success("已复制链接")
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.wx-share-panel {
+    box-shadow: 0 0 1px #dee2e5;
+    padding: 25px 35px;
+    display: flex;
+    background-color: white;
+
+    .text-panel {
+        flex: 1;
+
+        .title {
+            font-size: 16px;
+            color: #485b6d;
+            font-weight: bold;
+            height: 40px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+        }
+        .desc {
+            color: #7b8a97;
+            font-size: 14px;
+        }
+    }
+    .qrcode-panel {
+        text-align: right;
+
+        .qrcode {
+            text-align: center;
+
+            img {
+                width: 120px;
+                height: 120px;
+            }
+        }
+
+        .btn {
+            text-align: center;
+        }
+    }
+}
+
+.sms-share-panel {
+    box-shadow: 0 0 1px #dee2e5;
+    padding: 25px 35px;
+    display: flex;
+    margin-top: 20px;
+    background-color: white;
+
+    .text-panel {
+        flex: 1;
+
+        .title {
+            font-size: 16px;
+            color: #485b6d;
+            font-weight: bold;
+            height: 40px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+        }
+        .desc {
+            color: #7b8a97;
+            font-size: 14px;
+        }
+    }
+    .btn-panel {
+        text-align: right;
+        padding-right: 4px;
+    }
+}
+
+.link-share-panel {
+    box-shadow: 0 0 1px #dee2e5;
+    padding: 25px 35px;
+    // display: flex;
+    margin-top: 20px;
+    background-color: white;
+
+    .title {
+        font-size: 16px;
+        color: #485b6d;
+        font-weight: bold;
+        height: 40px;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+    }
+    .desc {
+        color: #7b8a97;
+        font-size: 14px;
+    }
+    .input-line {
+        margin-top: 20px;
+
+        .input {
+            display: inline-block;
+            width: 400px;
+        }
+    }
+}
+</style>
+

src/scrm_pages/marketing_tool/activity_signup_users.vue

@@ -0,0 +1,107 @@
+<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 style="display: flex;">
+                <div style="flex: 1;">
+                    <router-link to="/activity/list">
+                        <el-button type="primary">返回列表</el-button>
+                    </router-link>
+                </div>
+                <el-button type="primary" @click="printAction">导出</el-button>
+            </div>
+            <div style="margin-top: 10px;" id="table-panel">
+                <el-table id="table" border :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 style="margin-top: 10px;">
+                <el-pagination :total="total" :current-page.sync="current_page" :page-size="10" layout="total, prev, pager, next" @current-change="getActivities()"></el-pagination>
+            </div>
+            <div id="print-table" style="width:960px; display: none;">
+                <el-table border :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 { fetchActivitySignupUsers } from "@/api/activity/activity"
+import { parseTime } from "@/utils"
+import printJS from "print-js"
+
+export default {
+    name: "ActivitySignupUsers",
+    components: {
+        BreadCrumb,
+    },
+    data() {
+        return {
+            crumbs: [
+                { path: false, name: "活动详情" },
+                { path: false, name: "报名列表" },
+            ],
+
+            activity_id: 0,
+
+            signup_users: [],
+            loading_search: false,
+            total: 0,
+            current_page: 1,
+        }
+    },
+    mounted() {
+        this.activity_id = this.$route.query.id
+
+        this.fetchSignupUsers()
+    },
+    methods: {
+        parseTime,
+        fetchSignupUsers: function() {
+            this.loading_search = true
+            fetchActivitySignupUsers(this.activity_id, "", this.current_page).then(rs => {
+                this.loading_search = false
+                var resp = rs.data
+                if (resp.state == 1) {
+                    this.signup_users = resp.data.users
+                    this.total = resp.data.total
+                } else {
+                    this.$message.error(resp.msg)
+                }
+            }).catch(err => {
+                this.loading_search = false
+                this.$message.error(err)
+            })
+        },
+        printAction: function() {
+            printJS({
+                printable: 'table',
+                type: "html",
+                scanStyles: false,
+                css: ['https://unpkg.com/element-ui/lib/theme-chalk/index.css'],
+                // maxWidth: 960,
+            })
+        },
+    },
+}
+</script>
+

src/scrm_pages/marketing_tool/components/drafts_cell.vue

@@ -7,11 +7,13 @@
         </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">编辑</el-button>
-                <el-button type="danger" size="small" icon="el-icon-delete">删除</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" @click="deleteActivity">删除</el-button>
             </div>
         </div>
     </div>
@@ -32,6 +34,16 @@ export default {
             
         }
     },
+    computed: {
+        activityUrl: function() {
+            return "/activity?id=" + this.activity.id
+        }
+    },
+    methods: {
+        deleteActivity() {
+            this.$emit("delete")
+        }
+    }
 }
 </script>
 

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;" @click="previewAction" :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,114 @@ export default {
                 })
             })
         },
+
+        saveAction: function() {
+            this.saving_activity = true
+            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
+            var t = this
+            this.submitActivity(false, function() {
+                var new_page = t.$router.resolve({ 
+                    path: '/activity/preview',
+                    query: {
+                        id: t.activity.id,
+                    }   
+                })
+                window.open(new_page.href, '_blank');
+            })
+        },
+        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 => {
+                    console.log('------  ' + err)
+                    this.$message.error(err)
+                    this.saving_activity = false
+                    this.publishing_activity = false
+                    this.saving_before_preview_activity = false
+                })
+
+            }).catch(err => {
+                console.log('asdada  ' + 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("海报不能为空")
+                    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) {
+                            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/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

@@ -13,8 +13,8 @@
                 审核未通过：{{ 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>
+                <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" @click="deleteActivity">删除</el-button>
             </div>
         </div>
         <div class="activity-time-panel">
@@ -42,9 +42,14 @@ 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}")
         },
     },
+    methods: {
+        deleteActivity() {
+            this.$emit("delete")
+        }
+    }
 }
 </script>
 

src/scrm_pages/members/cards.vue

@@ -2,7 +2,11 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加会员卡</el-button>
+      <el-col :span="5" style="text-align: right;">
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加会员卡</el-button>
+        <el-button  type="primary" size="small" icon="el-icon-setting" @click="openRight">会员权益配置</el-button>
+      </el-col>
+      
     </div>
     <div class="app-container">
         <div class="filter-container" style="margin-top: 10px;margin-left: 5px " id="member-cards-box">
@@ -29,6 +33,8 @@
         <create-card-form ref="createCardForm" :cardsData="cardsData" ></create-card-form>
         <!--create-card-form 编辑会员卡-->
         <edit-card-form ref="editCardForm" :cardsData="cardsData" :cardIndex="cardIndex" :form="editFormData"></edit-card-form>
+        <!--create-right-form 编辑权益-->
+        <edit-card-right-form ref="editCardRightForm"  :form="rightData" ></edit-card-right-form>
     </div>
   </div>
 </template>
@@ -38,6 +44,7 @@
   import BreadCrumb from '../components/bread-crumb';
   import CreateCardForm from "./components/CreateCardForm";
   import EditCardForm from "./components/EditCardForm";
+  import EditCardRightForm from "./components/EditCardRightForm";
 
   export default {
     name: 'memberCardList',
@@ -45,6 +52,7 @@
       BreadCrumb,
       CreateCardForm,
       EditCardForm,
+      EditCardRightForm
     },
     data(){
       return{
@@ -53,6 +61,9 @@
           { path: false, name: '会员卡管理' }
         ],
         cardsData:[],
+        rightData:{
+          rights: "",
+        },
         editFormData:{
             background_type:1,
             background:"#409EFF",
@@ -72,6 +83,12 @@
         openCreate:function(){
           this.$refs.createCardForm.open();
         },
+        // updateRightData(right){
+        //   this.rightData.rights = right;
+        // },
+        openRight(){
+          this.$refs.editCardRightForm.open();
+        },
         openEdit(row, index) {
           for (const key in this.editFormData) {
             this.editFormData[key] = row[key];
@@ -106,6 +123,9 @@
                 var res = response.data;
                 if(res.state===1) {
                     this.cardsData = res.data.cards;
+                    if (res.data.right) {
+                      this.rightData.rights = res.data.right.rights;
+                    }
                 }
             }).catch(e=>{})
         }

src/scrm_pages/members/components/EditCardRightForm.vue

@@ -0,0 +1,77 @@
+<template>
+    <div id="edit-card-form-box">
+        <el-dialog title="会员协议配置" :visible.sync="editRightFormVisible" width="900px" id="edit-member-right-show" v-loading="submitLoading" :element-loading-text="loadingText">
+            <el-form ref="rightForm" :model="form" label-width="100px" id="edit-member-right-form">
+                <el-form-item label="会员权益:"  prop="rights">
+                    <el-input v-model="form.rights" type="textarea" rows='6' placeholder="" ></el-input>
+                </el-form-item>
+            </el-form>
+            
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="editRightFormVisible = false">取消</el-button>
+                <el-button
+                type="primary"
+                @click="submitForm('rightForm')"
+                >保 存
+                </el-button>
+            </div>
+        </el-dialog>  
+    </div>
+</template>
+
+<script>
+import {EditRight} from "@/api/member/member";
+
+export default {
+    name:'EditCardRightForm',
+    props:{
+        form:{
+            rights:'',
+        },
+    },
+    data(){
+        return {
+            editRightFormVisible:false,
+            loadingText:'',
+            submitLoading:false,
+            
+        }
+    },
+    methods:{
+        open:function(){
+            this.editRightFormVisible = true;
+        },
+        resetForm:function(formName) {
+            if (typeof(this.$refs[formName]) !='undefined') {
+                this.$refs[formName].resetFields();
+            }
+        },
+        submitForm:function(formName){
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    this.loadingText = "正在保存...";
+                    this.submitLoading = true;
+                    EditRight(this.form).then(response=>{
+                        var res = response.data;
+                        if(res.state === 1) {
+                            // this.$emit('update-right', res.data.right.rights);
+                            this.editRightFormVisible = false;
+                            this.$message.success("编辑成功");
+                        }else {
+                            this.$message.error(res.msg);
+                        }
+                        this.submitLoading = false;
+                    }).catch(e=>{
+                        this.submitLoading = false;
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+    },
+    computed: {
+    
+    },
+}
+</script>

src/scrm_pages/weixinmp/authorization.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button  style="float:right;" type="primary" size="small" :disabled="resetSubmit" icon="el-icon-refresh" @click="resetPage">刷新</el-button>
     </div>
     <div class="app-container" id="winxin-auth-box">
       <div class="filter-container" style="margin-top: 10px;margin-left: 5px ">
@@ -9,10 +10,10 @@
           <div class="bind-title-box">
             <span class="bind-title">您已绑定公众号，如需更换绑定公众号，请点击下面按钮</span>
           </div>
-          <el-button type="warning">更换绑定公众号</el-button>
+          <el-button type="warning" @click="getAuthUrl" >更换绑定公众号</el-button>
           <div class="bind-massage-box">
             <span>
-              授权公众号：{{authData.authorizer_nick_name}}，类型：{{mpTypeName}}，
+              授权公众号：{{authData.authorizer_nick_name}}
               <!--授权方公众号类型，0代表订阅号，1代表由历史老帐号升级后的订阅号，2代表服务号-->
               <!-- authorizer_service_type_info -->
             </span>
@@ -22,7 +23,7 @@
           <div class="bind-title-box">
             <span class="bind-title">您尚未绑定公众号</span>
           </div>
-          <el-button type="warning">已有公众号，立刻绑定</el-button>
+          <el-button type="warning" @click="getAuthUrl" >已有公众号，立刻绑定</el-button>
           <div class="bind-massage-box">
             <span>
               如果还没有公众号，需要先在微信公众号平台进行申请。 去
@@ -54,19 +55,33 @@
       <div style="height:20px">&nbsp;</div>
       <div class="dataTitle title-12">如何取消给酷医云的授权？</div>
       <div class="dataBody">
-        <p>公众号取消授权，进入微信后台，点击“+添加功能插件”，进入“授权管理”，就可以看到酷医云的授权，并且解除授权了。</p>
+        <p>公众号取消授权，进入微信后台，点击“设置-公众号设置-授权管理”，就可以看到酷医云的授权，并且解除授权了。</p>
       </div>
     </div>
+    <el-dialog
+      title="授权二维码"
+      :visible.sync="centerDialogVisible"
+      width="30%"
+      center>
+      <div style="text-align:center;">
+        <div><span>请用微信扫描下方二维码</span></div>
+        <div id="mpwechat-auth-qrcode" ref="qrcode" ></div>
+        <div><span>在手机完成授权后，点击右上角的刷新按钮</span></div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-
+import QRCode from 'qrcodejs2'  // 引入qrcode
+import {GetAuthorizationInfo,GetAuthUrl} from "@/api/mpwechat/mpwechat";
 export default {
   name: "authorization",
   components: {
-    BreadCrumb
+    BreadCrumb,
+    QRCode,
   },
   data() {
     return {
@@ -74,7 +89,9 @@ export default {
         { path: false, name: "系统设置" },
         { path: false, name: "公众号授权" }
       ],
-
+      showAuthButton:true,
+      centerDialogVisible:false,
+      resetSubmit:false,
       authData: {
         id: 0,
         user_org_id: 0,
@@ -93,12 +110,58 @@ export default {
         authorizer_qrcode_url: "",
         created_time: "",
         updated_time: "",
-        authorizer_status: 1
+        authorizer_status: 0
       }
     };
   },
-  methods: {},
-  created() {},
+  methods: {
+    getAuthUrl:function(){
+      // this.showAuthButton = false;
+      GetAuthUrl().then(response=>{
+        var res =  response.data;
+        if (res.state===1) {
+          var url = res.data.url;
+          this.centerDialogVisible = true;
+          this.$nextTick (function () {
+            this.qrcode(url);
+          })
+        }else {
+          this.$message.error(res.msg);
+        }
+      }).catch(e=>{
+        
+        // this.showAuthButton = true;
+      });
+    },
+    qrcode(url) {
+      document.getElementById('mpwechat-auth-qrcode').innerHTML = ''
+      let qrcode = new QRCode('mpwechat-auth-qrcode', {
+        width: 150,  
+        height: 150,
+        text: url,
+        colorDark : "#000",
+        colorLight : "#fff",
+      })
+    },
+    resetPage(){
+      this.GetAuthorizationInfo();
+    },
+    GetAuthorizationInfo:function(){
+      GetAuthorizationInfo().then(response=>{
+        var res =  response.data;
+        if(res.state===1) {
+          if(res.data.authorization) {
+            this.authData = res.data.authorization;
+          }
+        }else {
+          this.$message.error(res.msg);
+        }
+      }).catch(e=>{});
+    },
+  },
+  created() {
+    this.GetAuthorizationInfo();
+  },
   computed:{
     mpTypeName:function(){
       return 'xx';
@@ -166,6 +229,10 @@ export default {
   font-size: 14px;
   line-height: 18px;
 }
+#mpwechat-auth-qrcode{
+  width: 150px;
+  margin: 5px auto;
+}
 /*.app-container .cell.clearfix .time ul li {*/
 /*float: left;*/
 /*list-style: none;*/

src/scrm_pages/weixinmp/components/CreateKWReplyForm.vue

@@ -0,0 +1,101 @@
+<template>
+    <div id="create-kw-reply-form-box">
+        <el-dialog title="添加关键词回复" :visible.sync="createKWReplyFormVisible" width="700px" >
+            <el-form ref="replyForm" :rules="replyRules" :model="form" label-width="90px">
+                <el-form-item label="规则名称:" required prop="message_regular_name">
+                    <el-input v-model="form.message_regular_name"></el-input>
+                </el-form-item>
+                <el-form-item label="模式:" required prop="message_key_type">
+                    <el-radio-group v-model="form.message_key_type">
+                        <el-radio :label="item.id" :value="item.id" v-for="(item, index) in keyTypeOptions" :key="index" >{{item.name}}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="关键字:" required prop="message_key_name">
+                    <el-input v-model="form.message_key_name"></el-input>
+                </el-form-item>
+                <el-form-item label="回复内容:" required prop="message_content">
+                    <el-input v-model="form.message_content" type="textarea" rows="4"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="createKWReplyFormVisible = false">取消</el-button>
+                <el-button
+                type="primary"
+                @click="submitForm('replyForm')"
+                >保 存
+                </el-button>
+            </div>
+        </el-dialog>  
+    </div>
+</template>
+
+<script>
+import {CreateKeyWordReply} from "@/api/mpwechat/mpreply";
+
+export default {
+    name:'CreateReplyForm',
+    props:{
+        replysData:{
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+    },
+    data(){
+        return {
+            createKWReplyFormVisible:false,
+            keyTypeOptions:[
+                {id:1, name:'半匹配'},
+                {id:2, name:'全匹配'},
+            ],
+            replyRules: {
+                message_regular_name: [{required: true, message: "请填写规则名称",},],
+                message_key_type: [{required: true, message: "请选择模式",},],
+                message_key_name: [{required: true, message: "请填写关键字",},],
+                message_content: [{required: true, message: "请填写回复内容",},],
+            },
+            form:{
+                message_regular_name:'',
+                message_key_type:1,
+                message_key_name:'',
+                message_content:'',
+            },
+            
+        }
+    },
+    methods:{
+        open:function(){
+            this.resetForm("replyForm");
+            this.createKWReplyFormVisible = true;
+        },
+        resetForm(formName) {
+            if (typeof(this.$refs[formName]) !='undefined') {
+                this.$refs[formName].resetFields();
+            }
+        },
+        submitForm(formName){
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    CreateKeyWordReply(this.form).then(response=>{
+                        var res = response.data;
+                        if(res.state === 1) {
+                            var message = res.data.message;
+                            this.replysData.unshift(message);
+                            this.resetForm("replyForm");
+                            this.createKWReplyFormVisible = false;
+                            this.$message.success("添加成功");
+                        }else {
+                            this.$message.error(res.msg);
+                        }
+                    }).catch(e=>{});
+
+                } else {
+                    return false;
+                }
+            });
+        },
+    }
+}
+</script>
+

src/scrm_pages/weixinmp/components/EditKWReplyForm.vue

@@ -0,0 +1,105 @@
+<template>
+    <div id="edit-kw-reply-form-box">
+        <el-dialog title="编辑关键词回复" :visible.sync="editKWReplyFormVisible" width="700px" >
+            <el-form ref="replyForm" :rules="replyRules" :model="form" label-width="90px">
+                <el-form-item label="规则名称:" required prop="message_regular_name">
+                    <el-input v-model="form.message_regular_name"></el-input>
+                </el-form-item>
+                <el-form-item label="模式:" required prop="message_key_type">
+                    <el-radio-group v-model="form.message_key_type">
+                        <el-radio :label="item.id" :value="item.id" v-for="(item, index) in keyTypeOptions" :key="index" >{{item.name}}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="关键字:" required prop="message_key_name">
+                    <el-input v-model="form.message_key_name"></el-input>
+                </el-form-item>
+                <el-form-item label="回复内容:" required prop="message_content">
+                    <el-input v-model="form.message_content" type="textarea" rows="4"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="editKWReplyFormVisible = false">取消</el-button>
+                <el-button
+                type="primary"
+                @click="submitForm('replyForm')"
+                >保 存
+                </el-button>
+            </div>
+        </el-dialog>  
+    </div>
+</template>
+
+<script>
+import {EditKeyWordReply} from "@/api/mpwechat/mpreply";
+
+export default {
+    name:'EditReplyForm',
+    props:{
+        replysData:{
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        replyIndex:{
+            type:Number,
+            default:-1,
+        },
+        form:{
+            id:0,
+            message_regular_name:'',
+            message_key_type:1,
+            message_key_name:'',
+            message_content:'',
+        },
+    },
+    data(){
+        return {
+            editKWReplyFormVisible:false,
+            keyTypeOptions:[
+                {id:1, name:'半匹配'},
+                {id:2, name:'全匹配'},
+            ],
+            replyRules: {
+                message_regular_name: [{required: true, message: "请填写规则名称",},],
+                message_key_type: [{required: true, message: "请选择模式",},],
+                message_key_name: [{required: true, message: "请填写关键字",},],
+                message_content: [{required: true, message: "请填写回复内容",},],
+            },
+            
+        }
+    },
+    methods:{
+        open:function(){
+            this.editKWReplyFormVisible = true;
+        },
+        resetForm(formName) {
+            if (typeof(this.$refs[formName]) !='undefined') {
+                this.$refs[formName].resetFields();
+            }
+        },
+        submitForm(formName){
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    EditKeyWordReply(this.form.id, this.form).then(response=>{
+                        var res = response.data;
+                        if(res.state === 1) {
+                            var message = res.data.message;
+                            this.replysData.splice(this.replyIndex, 1, message);
+                            this.resetForm("replyForm");
+                            this.editKWReplyFormVisible = false;
+                            this.$message.success("编辑成功");
+                        }else {
+                            this.$message.error(res.msg);
+                        }
+                    }).catch(e=>{});
+
+                } else {
+                    return false;
+                }
+            });
+        },
+    }
+}
+</script>
+

src/scrm_pages/weixinmp/components/replyNav.vue

@@ -0,0 +1,30 @@
+<template>
+    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
+        <el-tab-pane label="关键词回复" name="keyword"></el-tab-pane>
+        <el-tab-pane label="关注后回复" name="subscribe"></el-tab-pane>
+    </el-tabs>
+</template>
+<script>
+export default {
+    props:{
+        activeName:{
+            type:String,
+            default: 'subscribe'
+        }
+    },
+    data(){
+        return{
+            tabActiveName:'subscribe',
+        }
+    }, 
+    methods:{
+        handleTabClick(tab, event) {
+            this.$router.push({ path: "/weixinmp/reply/"+this.tabActiveName });
+        }
+    },
+    created(){
+        this.tabActiveName = this.activeName
+    },
+}
+</script>
+

src/scrm_pages/weixinmp/keywordreply.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button  style="float:right;" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="openCreate">添加回复</el-button>
+    </div>
+    <div class="app-container">
+        <reply-nav activeName="keyword"></reply-nav>
+        <div style="margin-bottom: 10px">
+            <el-row :gutter="24">
+                <el-col :span="8">
+                    <el-input style="width: 300px" v-model="listQuery.search" placeholder="请输入您需要搜索的内容"></el-input>
+                    <el-button type="primary"  icon="el-icon-search" @click="changeKey">搜索</el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <div class="filter-container" style="margin-top: 10px;margin-left: 5px">
+            <el-checkbox style="width: 30px" @change="changeCheck" v-model="checkAllStatus">全选</el-checkbox>
+            <el-button size="small" icon="el-icon-delete" @click="openDeleteReplys">批量删除</el-button>
+        </div>
+        <el-table ref="multipleTable"  @selection-change="handleSelectionChange"  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="messagesData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;">
+            <el-table-column
+                align="center"
+                type="selection"
+                width="55">
+             </el-table-column>
+            <el-table-column label="关键词" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.message_key_name}}
+                </template>
+            </el-table-column>
+            <el-table-column label="回复内容" align="center">
+                <template slot-scope="scope">
+                <span>{{scope.row.message_content}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="模式" align="center">
+                <template slot-scope="scope">
+                <span>{{keyTypeName(scope.row.message_key_type)}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                        <el-button size="mini" type="primary" icon="el-icon-edit-outline" @click="openEdit(scope.row, scope.$index)" ></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                        <el-button size="mini" type="danger" icon="el-icon-delete" @click="openDelete(scope.row, scope.$index)" ></el-button>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10,20,50,100]"
+            :page-size="10"
+            background
+            style="margin-top:20px;"
+            align="right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
+        <!--添加-->
+        <create-k-w-reply-form ref="createKWReplyForm" :replysData="messagesData" ></create-k-w-reply-form>
+        <!--编辑-->
+        <edit-k-w-reply-form ref="editKWReplyForm" :replysData="messagesData" :replyIndex="replyIndex" :form="editForm"></edit-k-w-reply-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {GetKeyWordReplys,DeleteReplys} from "@/api/mpwechat/mpreply";
+  import BreadCrumb from '../components/bread-crumb';
+  import CreateKWReplyForm from './components/CreateKWReplyForm';
+  import EditKWReplyForm from './components/EditKWReplyForm';
+import replyNav from "./components/replyNav";
+
+  export default {
+    name: 'keywordreply',
+    components:{
+      BreadCrumb,
+      replyNav,
+      CreateKWReplyForm,
+      EditKWReplyForm,
+    },
+    data(){
+      return{
+        crumbs: [
+        { path: false, name: "系统设置" },
+        { path: false, name: "关键词回复" }
+        ],
+        total:0,
+        listQuery:{
+            page:1,
+            limit:10,
+            search:'',
+        },
+        checkAllStatus:false,
+        selectedReplys:[],
+        messagesData:[],
+        replyIndex:-1,
+        editForm:{
+            id:0,
+            message_regular_name:'',
+            message_key_type:1,
+            message_key_name:'',
+            message_content:'',
+        },
+      }
+    },
+    methods:{
+        openCreate:function(){
+          this.$refs.createKWReplyForm.open();
+        },
+        openEdit:function(row,index){
+            this.replyIndex = index;
+            for (const key in this.editForm) {
+              this.editForm[key] = row[key];
+            }
+            this.$refs.editKWReplyForm.open();
+        },
+        openDeleteReplys:function(){
+          if (this.selectedReplys.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.selectedReplys) {
+              ids.push(this.selectedReplys[index].id);
+              idMap[this.selectedReplys[index].id] = this.selectedReplys[index].id;
+            }
+            DeleteReplys({ids:ids}).then(response=>{
+              var res = response.data;
+              if (res.state === 1) {
+                var dataLength = this.messagesData.length;
+                for (let index = dataLength-1; index >= 0; index--) {
+                  if(this.messagesData[index].id in idMap) {
+                    this.messagesData.splice(index, 1);
+                  }                  
+                }
+                this.$message.success("删除成功");
+              }else {
+                this.$message.error(res.msg);
+              }
+            }).catch(e=>{});
+          }).catch(() => {
+            return false        
+          });
+        },
+        openDelete:function(row,index){
+          this.$confirm('确认要删除该回复吗？<br>删除后，该回复将无法恢复', '删除提示', {
+            dangerouslyUseHTMLString:true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            var ids = [];
+            ids.push(row.id);
+            DeleteReplys({ids:ids}).then(response=>{
+              var res = response.data;
+              if (res.state === 1) {
+                this.messagesData.splice(index, 1);
+                this.$message.success("删除成功");
+              }else {
+                this.$message.error(res.msg);
+              }
+            }).catch(e=>{});
+          }).catch(() => {
+            return false        
+          });
+        },
+        changeCheck:function(){
+          this.$refs.multipleTable.clearSelection();
+          if (this.checkAllStatus) {
+            this.$refs.multipleTable.toggleAllSelection();
+          }
+        },
+        handleSelectionChange:function (val) {
+          this.selectedReplys = val;
+        },
+        handleSizeChange(limit) {
+            this.listQuery.limit = limit;
+            this.GetKeyWordReplys();
+        },
+        handleCurrentChange(page) {
+            this.listQuery.page = page;
+            this.GetKeyWordReplys();
+        },
+        changeKey(){
+            this.GetKeyWordReplys();
+        },
+        keyTypeName:function(type){
+          return type == 1?'半匹配':'全匹配';
+        },
+        GetKeyWordReplys(){
+            GetKeyWordReplys(this.listQuery).then(response=>{
+                var res = response.data;
+                if(res.state===1) {
+                    this.messagesData = res.data.messages;
+                    this.total = res.data.total;
+                }
+            }).catch(e=>{})
+        }
+    },
+    computed:{
+    },
+    created(){
+        this.GetKeyWordReplys();
+    }
+  }
+</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/weixinmp/subscribereply.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container" id="winxin-subscribe-replu-box">
+      <reply-nav activeName="subscribe"></reply-nav>
+      <el-form ref="form" :model="form" >
+        <el-form-item label="">
+          <el-input type="textarea" v-model="form.message_content" rows='5'></el-input>
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-col :span="24" style="text-align: right;"> -->
+            <el-button type="primary" align="right" @click="saveReply">保存</el-button>
+          <!-- </el-col> -->
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+import replyNav from "./components/replyNav";
+import {GetAuthorizationInfo} from "@/api/mpwechat/mpwechat";
+import {GetSubscribeRplay,SaveSubscribeRplay} from "@/api/mpwechat/mpreply";
+
+export default {
+  name: "subscribereply",
+  components: {
+    BreadCrumb,
+    replyNav,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "系统设置" },
+        { path: false, name: "关注后回复" }
+      ],
+      initReply:false,
+      form:{
+        'message_content':'',
+      },
+    };
+  },
+  methods: {
+    GetAuthorizationInfo:function(){
+      GetAuthorizationInfo().then(response=>{
+        var res =  response.data;
+        if(res.state===1) {
+          if(res.data.authorization) {
+            this.authData = res.data.authorization;
+            if (this.authData.authorizer_status != 1) {
+              this.$message.error("公众号未授权");
+              this.$router.push({path:"/weixinmp/authorization"})
+              return false;
+            }else if (this.authData.authorizer_verify_type_info>=0 || this.authData.authorizer_service_type_info==2) {
+              this.initReply = true;
+            }
+          }else {
+              this.$message.error("公众号未授权");
+              this.$router.push({path:"/weixinmp/authorization"})
+          }
+        }else {
+          this.$message.error(res.msg);
+        }
+      }).catch(e=>{});
+    },
+    GetSubscribeRplay:function(){
+      GetSubscribeRplay().then(response=>{
+        var res = response.data;
+        if (res.state==1) {
+          if (res.data.message) {
+            this.form.message_content = res.data.message.message_content;
+          }
+        }else {
+          this.$message.error(res.msg);
+        }
+      }).catch(e=>{});
+    },
+    saveReply:function(){
+      SaveSubscribeRplay(this.form).then(response=>{
+        var res = response.data;
+        if (res.state === 1) {
+          this.$message.success('保存成功');
+        }else {
+          this.$message.error(res.msg);
+        }
+      }).catch(e=>{});
+    }
+  },
+  created() {
+    this.GetAuthorizationInfo();
+  },
+  computed:{
+  },
+  watch:{
+    'initReply':function(){
+      this.GetSubscribeRplay();
+    }
+  },
+};
+</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/xt_permission.js

@@ -5,19 +5,19 @@ import 'nprogress/nprogress.css'// progress bar style
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
-const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
+const loginWhiteList = ['/token/verify', '/401', '/404', "/activity/preview"] // 登录验证白名单
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start()