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

config/index.js

@@ -18,8 +18,8 @@ module.exports = {
     // if you want dev by ip, please set host: '0.0.0.0'
 
     host: 'test1.sgjyun.com',
-    // host: 'jk.kuyicloud.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

@@ -3495,9 +3495,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.7.2.tgz",
-      "integrity": "sha512-Exh9QTkm9gwMMPzg1TyaTlBKyr3k4K9XcC5vl0A/mneDvJX//RsURGuOWsCNDVQMdhh5h9e+W5icosh+pKfbCg==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.9.1.tgz",
+      "integrity": "sha512-w8vrCW5Q+2gfDzs19MUrFdnCy5IjF98rs7DBsKnJQKFfZJZiZ2O+YAsSp/EuPrCm3P/2o/N3MtvZ34VANel13g==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -4706,8 +4706,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4728,14 +4727,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4750,20 +4747,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4880,8 +4874,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4893,7 +4886,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4908,7 +4900,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4916,14 +4907,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4942,7 +4931,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5023,8 +5011,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5036,7 +5023,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5122,8 +5108,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5159,7 +5144,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5179,7 +5163,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5223,14 +5206,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

package.json

@@ -44,7 +44,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.7.2",
+    "element-ui": "^2.9.1",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/api/activity/activity.js

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

src/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/mpwechat.js

@@ -0,0 +1,30 @@
+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',
+  })
+}
+  
+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,
+  })
+}

src/components/Neditor/index.vue

@@ -39,6 +39,7 @@
       selectionchange() {
         this.ue.addListener('selectionchange', () => {
           this.content = this.ue.getContent()
+          this.$emit("content_changed", this.content)
         })
       },
 

src/icons/svg/dashboard.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559132638469" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1438" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M563.197497 0 460.802503 0 0.012259 486.388227c0 0 0.901006 102.396016 51.200051 102.396016s76.797012 0 76.797012 0 0 232.496449 0 332.816677c0 100.300818 102.397038 102.399081 102.397038 102.399081l204.79714 0c0 0 0-272.419617 0-358.416702 0-25.647017 25.600026-25.600026 25.600026-25.600026l102.394994 0c0 0 25.601047 0.851972 25.601047 25.600026 0 92.198911 0 358.416702 0 358.416702s99.647027 0 204.795097 0c105.147048 0 102.398059-102.399081 102.398059-102.399081L895.992721 563.185239c0 0 27.19875 0 76.799055 0 49.59724 0 51.195965-76.79599 51.195965-76.79599L563.197497 0z" p-id="1439" fill="#bfcbd9"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559805368038" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2337" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M405.923568 101.722776C279.295566 206.825532 205.614449 276.459472 95.310228 397.352867c-27.430746 35.963073-22.976294 102.870926 0 102.870926 71.362304 0 102.870926 0 102.870926 0s0 128.160915 0 257.177314c0 37.830607 5.390777 102.869902 45.196365 102.869902 65.173348 0 160.544463 0 160.544463 0L403.921981 603.088578l205.741851 0 0 257.18243c0 0 83.145675 0 148.308791 0 29.956266 0 57.43306-27.219945 57.43306-102.869902 0-132.344191 0-257.177314 0-257.177314s40.329521 0 102.869902 0c30.588669 0 35.552727-72.79084 0-102.870926C817.308009 294.65795 703.651436 195.340967 593.641927 105.117083 506.79393 37.305651 459.622584 46.296419 405.923568 101.722776z" p-id="2338"></path></svg>

src/lang/en.js

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

src/lang/zh.js

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

src/router/index.js

@@ -12,6 +12,7 @@ import member from './modules/member'
 import org from './modules/org'
 import marketing_tool from './modules/marketing_tool'
 import system from './modules/system'
+import site from './modules/site'
 
 /** note: submenu only apppear when children.length>=1
  *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -77,7 +78,8 @@ var _asy_router_map = [
   marketing_tool,
   org,
   role,
-  system
+  system,
+  site
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/marketing_tool.js

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

src/router/modules/site.js

@@ -0,0 +1,20 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '',
+  component: Layout,
+  redirect: '/site',
+  children: [{
+    path: '/site',
+    component: () => import('@/scrm_pages/site/index'),
+    name: 'site',
+    meta: {
+      title: '微网站',
+      icon: 'dashboard',
+      noCache: true
+    }
+  },
+  { path: '/site/preview', component: () => import('@/scrm_pages/site/preview'), name: '预览', meta: { title: 'preview' }, hidden: true, is_menu: false }
+
+  ]
+}

src/router/modules/system.js

@@ -17,6 +17,12 @@ export default {
       name: 'weixinMpAuth',
       meta: { title: '公众号授权', noCache: true }
     },
+    {
+      path: '/weixinmp/menus',
+      component: () => import('@/scrm_pages/weixinmp/menus'),
+      name: 'weixinMpMenus',
+      meta: { title: '公众号菜单', noCache: true }
+    },
     {
       path: '/Systemsetting/staffmanagement',
       component: () => import('@/scrm_pages/Systemsetting/staffmanagement'),

src/scrm_pages/marketing_tool/activity_publish.vue

@@ -6,10 +6,10 @@
         <div class="app-container" style="padding: 0 20px; background-color: #f6f8f9;">
             <div class="edit-main">
                 <div class="preview-panel">
-                    <preview-form></preview-form>
+                    <preview-form :activity="activity" :paragraph="activity_paragraph"></preview-form>
                 </div>
                 <div class="edit-panel">
-                    <edit-form></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",
@@ -34,6 +35,57 @@ export default {
                 { path: false, name: "营销工具" },
                 { path: false, name: "发布活动" }
             ],
+
+            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: "",
+            }
+        }
+    },
+    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)
+            })
         }
     },
 }

src/scrm_pages/marketing_tool/components/drafts_cell.vue

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

src/scrm_pages/marketing_tool/components/edit_activity_edit_form.vue

@@ -1,14 +1,416 @@
 <template>
-    <div></div>
+    <div class="edit-form-main">
+        <div class="form-title">
+            <img class="icon" src="@/assets/img/sa_7.png" />
+            <span>活动编辑</span>
+        </div>
+        <div class="form-content">
+            <div class="module-panel">
+                <p class="module-title">
+                    <img src="@/assets/img/sa_13.png" />
+                    基本信息
+                </p>
+                <div class="module-item">
+                    <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 
+                        action="https://upload.qiniup.com" 
+                        :data="{ token: qntoken, key: poster_photo_file_key }"
+                        :show-file-list="false"
+                        :on-error="posterPhotoUploadFail"
+                        :on-success="posterPhotoUploadSuccess"
+                        :before-upload="beforePosterPhotoUpload"
+                        >
+                            <el-button type="primary" style="margin-left: 10px;" :loading="uploading_poster_photo">上传图片</el-button>
+                        </el-upload>
+                    </div>
+                </div>
+                <div class="poster-photo-hint">图片建议尺寸828*430,大小不超过3M</div>
+                <div class="module-item">
+                    <label class="item-title">标题</label>
+                    <el-input v-model="activity.title" class="item-input"></el-input>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">名称</label>
+                    <el-input v-model="activity.subtitle" class="item-input"></el-input>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">商户简称</label>
+                    <el-input v-model="$store.getters.xt_user.org.org_name" class="item-input" readonly></el-input>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">报名时间</label>
+                    <el-date-picker v-model="sign_up_deadline" :picker-options="pickerOptions" value-format="timestamp" type="datetime" format="yyyy-MM-dd HH:mm" class="item-input"></el-date-picker>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">活动时间</label>
+                    <el-date-picker v-model="activity_time" :picker-options="pickerOptions" value-format="timestamp" type="datetime" format="yyyy-MM-dd HH:mm" class="item-input"></el-date-picker>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">活动地址</label>
+                    <el-input v-model="activity.address" class="item-input"></el-input>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">限定人数</label>
+                    <el-input v-model="limit_num" class="item-input" :maxlength="9" @keyup.native="limit_num=limit_num.replace(/\D/g,'')" @afterpaste.native="limit_num=limit_num.replace(/\D/g,'')"></el-input>
+                    <span class="limit-text">不填写默认为无限制</span>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">联系方式</label>
+                    <el-input v-model="activity.phone_number" class="item-input"></el-input>
+                </div>
+            </div>
+
+            <div class="module-panel" style="margin-top: 30px;">
+                <p class="module-title">
+                    <img src="@/assets/img/sa_13.png" />
+                    报名须知
+                </p>
+                <div class="module-item">
+                    <label class="item-title">报名须知</label>
+                    <el-input v-model="activity.sign_up_notice" class="item-input" type="textarea" :rows="4" resize="none"></el-input>
+                </div>
+            </div>
+
+            <div class="module-panel" style="margin-top: 30px;">
+                <p class="module-title">
+                    <img src="@/assets/img/sa_13.png" />
+                    详细说明
+                </p>
+                <div class="module-item">
+                    <label class="item-title">标题</label>
+                    <el-input v-model="paragraph.title" class="item-input"></el-input>
+                </div>
+                <div class="module-item">
+                    <label class="item-title">详情</label>
+                    <div class="item-input">
+                        <keep-alive>
+                            <neditor ref="neditor" id="editor" :r_content="paragraph_init_content" @content_changed="paragraphContentChanged"></neditor>
+                        </keep-alive>
+                    </div>
+                </div>
+            </div>
+
+            <div class="submit-button-panel">
+                <el-button style="padding: 10px 30px;" type="primary" @click="publishAction" :loading="publishing_activity" :disabled="saving_activity || saving_before_preview_activity">发 布</el-button>
+                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;" @click="saveAction" :loading="saving_activity" :disabled="publishing_activity || saving_before_preview_activity">保存草稿</el-button>
+                <el-button style="color: #409eff; border-color: #409eff; padding: 10px 30px;" :loading="saving_before_preview_activity" :disabled="publishing_activity || saving_activity">预 览</el-button>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script>
+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",
+    components: {
+        Neditor,
+    },
+    props: {
+        activity: {
+            type: Object,
+            required: true,
+        },
+        paragraph: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            saving_activity: false,
+            publishing_activity: false,
+            saving_before_preview_activity: false,
+
+            uploading_poster_photo: false,
+            qntoken: "",
+            poster_photo_file_key: "",
+            poster_photo_file_name: "",
+
+            limit_num: "",
+            activity_time: 0,
+            sign_up_deadline: 0,
+            paragraph_init_content: "",
+
+            pickerOptions: {
+                disabledDate: (time) => {
+                    return time.getTime() < Date.now() - 8.64e7
+                }
+            }
+        }
+    },
+    created() {
+        this.activity_time = (new Date()).getTime()
+        this.sign_up_deadline = (new Date()).getTime()
+    },
+    watch: {
+        limit_num: function(new_val) {
+            if (/^[1-9]+[0-9]*]*$/.test(new_val)) {
+                this.activity.limit_num = parseInt(new_val)
+            } else {
+                this.activity.limit_num = 0
+            }
+        },
+        activity_time: function(new_val) {
+            this.activity.start_time = parseInt(new_val / 1000)
+        },
+        sign_up_deadline: function(new_val) {
+            this.activity.sign_up_deadline = parseInt(new_val / 1000)
+        },
+    },
+    methods: {
+        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) {
+            this.paragraph.content = content
+        },
+
+        posterPhotoUploadFail: function(err, file, fileList) {
+            this.uploading_poster_photo = false
+            this.$message.error(err)
+        },
+        posterPhotoUploadSuccess: function(res, 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) {
+            var is_image = file.type.indexOf("image") > -1
+            var mb = file.size / 1024 / 1024
+
+            if (!is_image) {
+                this.$message.error("请上传图片")
+                return false
+            }
+            if (mb > 3) {
+                this.$message.error("上传主图大小不能超过3MB")
+                return false
+            }
+
+            var rand = Math.floor(Math.random() * 1000000000)
+            var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = "" + date.getFullYear() + (date.getMonth() + 1) + date.getDate() + "_activity_" + rand + "." + ext
+
+            this.uploading_poster_photo = true
+
+            return new Promise((resolve, reject) => {
+                getToken().then(rs => {
+                    var token = rs.data.data.uptoken
+                    this.qntoken = token
+                    this.poster_photo_file_key = key
+                    resolve(true)
+                }).catch(err => {
+                    this.uploading_poster_photo = false
+                    reject(false)
+                })
+            })
+        },
+
+        saveAction: function() {
+            this.saving_activity = true
+            this.submitActivity(false)
+        },
+        publishAction: function() {
+            this.publishing_activity = true
+            this.submitActivity(true, function() {
+                // 前往活动详情页
+            })
+        },
+        previewAction: function() {
+            this.saving_before_preview_activity = true
+            this.submitActivity(false, function() {
+                // 前往活动预览页
+            })
+        },
+        submitActivity: function(is_publish, successCallBack) {
+            this.validActivityInfo().then(() => {
+                var activity = {
+                    id: this.activity.id,
+                    poster_photo: this.activity.poster_photo,
+                    title: this.activity.title,
+                    subtitle: this.activity.subtitle,
+                    address: this.activity.address,
+                    limit_num: this.activity.limit_num,
+                    sign_up_deadline: parseTime(this.activity.sign_up_deadline, "{y}-{m}-{d} {h}:{i}"),
+                    start_time: parseTime(this.activity.start_time, "{y}-{m}-{d} {h}:{i}"),
+                    phone_number: this.activity.phone_number,
+                    sign_up_notice: this.activity.sign_up_notice,
+
+                    paragraph: {
+                        title: this.paragraph.title,
+                        content: this.paragraph.content,
+                    }
+                }
+                submitActivity(is_publish, activity).then(rs => {
+                    var resp = rs.data
+                    if (resp.state == 1) {
+                        this.activity.id = resp.data.activity_id
+                    } else {
+                        this.$message.error(resp.msg)
+                    }
+
+                    if (successCallBack != null || successCallBack != undefined) {
+                        successCallBack()
+                    }
+
+                    this.saving_activity = false
+                    this.publishing_activity = false
+                    this.saving_before_preview_activity = false
+
+                }).catch(err => {
+                    this.$message.error(err)
+                    this.saving_activity = false
+                    this.publishing_activity = false
+                    this.saving_before_preview_activity = false
+                })
+
+            }).catch(err => {
+                this.$message.error(err)
+                this.saving_activity = false
+                this.publishing_activity = false
+                this.saving_before_preview_activity = false
+            })
+            
+        },
+        validActivityInfo: function() {
+            return new Promise((resolve, reject) => {
+                if (this.activity.poster_photo.length == 0) {
+                    reject("海报不能为空")
+                } else if (this.activity.title.length == 0) {
+                    reject("标题不能为空")
+                } else if (this.activity.subtitle.length == 0) {
+                    reject("副标题不能为空")
+                } else if (this.activity.address.length == 0) {
+                    reject("活动地址不能为空")
+                } else if (this.activity.sign_up_deadline == 0) {
+                    reject("活动报名时间不能为空")
+                } else if (this.activity.start == 0) {
+                    reject("活动时间不能为空")
+                } else {
+                    if (this.activity.phone_number.length > 0) {
+                        if (/^1\d{10}$/.test(this.activity.phone_number) == false && /^(0\d{2,3}-?\d{7,8}$)/.test(this.activity.phone_number) == false) {
+                            reject("联系方式格式错误")
+                            return
+                        }
+                    }
+                }
+                resolve()
+            })
+        },
+    },
 }
 </script>
 
 <style lang="scss" scoped>
+.edit-form-main {
+    .form-title {
+        width: 100%;
+        height: 60px;
+        padding: 20px 0 20px 30px;
+        border-bottom: 1px #dee2e5 solid;
+
+        .icon {
+            margin-top: -4px;
+            vertical-align: middle;
+        }
+
+        span {
+            font-size: 18px;
+            font-weight: 500;
+            color: #485b6d;
+            margin-left: 10px;
+        }
+    }
+
+    .form-content {
+        width: 100%;
+        padding: 14px 30px 14px 30px;
+
+        .module-panel {
+            // padding: 0 30px;
+
+            .module-title {
+                font-size: 18px;
+                color: #a8b3ba;
+
+                img {
+                    float: left;
+                    display: block;
+                    padding: 2px 19px 0 0;
+                }
+            }
 
+            .module-item {
+                margin-top: 20px;
+                display: flex;
+                // padding: 0 30px;
+
+                .item-title {
+                    width: 115px;
+                    height: 40px;
+                    line-height: 40px;
+                    color: #485b6d;
+                    font-size: 13px;
+                    // font-weight: 100;
+                    text-align: right;
+                    padding-right: 22px;
+                    float: left;
+                }
+
+                .item-input {
+                    flex: 1;
+                    color: #485b6d;
+                }
+
+                .limit-text {
+                    line-height: 40px;
+                    color: #a8b3ba;
+                    font-size: 13px;
+                    // font-weight: 100;
+                    text-align: left;
+                    padding-left: 10px;
+                }
+
+                .poster-photo-panel {
+                    display: flex;
+                    flex: 1;
+                    align-items: center;
+
+                    .input {
+                        flex: 1;
+                        color: #485b6d;
+                        cursor: pointer;
+                    }
+                }
+            }
+
+            .poster-photo-hint {
+                font-size: 12px;
+                line-height: 16px;
+                color: #a8b3ba;
+                margin-left: 115px;
+            }
+        }
+
+        .submit-button-panel {
+            padding: 0 0 0 115px;
+            margin-top: 30px;
+        }
+    }
+}
 </style>
 

src/scrm_pages/marketing_tool/components/edit_activity_preview_form.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="preview-main">
+    <div class="preview-form-main">
         <div class="form-title">
             <img class="icon" src="@/assets/img/sa_06.png" />
             <span>预览</span>
@@ -14,11 +14,11 @@
             </div>
             <div class="org-info-cell border">
                 <div class="logo">
-                    <img :src="poster_photo" />
+                    <img :src="$store.getters.xt_user.org.org_logo" />
                 </div>
                 <div class="text-info">
-                    <p class="name">测试机构</p>
-                    <p class="address">地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址地址</p>
+                    <p class="name">{{ $store.getters.xt_user.org.org_name }}</p>
+                    <p class="address">{{ address }}</p>
                 </div>
                 <div class="arrow-panel">
                     <img src="@/assets/img/sa_52.png" />
@@ -29,7 +29,7 @@
                     <img src="@/assets/img/sa_21.png" />
                 </div>
                 <div class="text">
-                    <p>2019-01-01</p>
+                    <p>{{ activity_time }}</p>
                 </div>
                 <div class="arrow-panel">
                     <img src="@/assets/img/sa_52.png" />
@@ -40,19 +40,55 @@
                     <img src="@/assets/img/sa_24.png" />
                 </div>
                 <div class="text">
-                    <p>0755-86879866</p>
+                    <p>{{ phone_number }}</p>
                 </div>
                 <div class="arrow-panel">
                     <img src="@/assets/img/sa_52.png" />
                 </div>
             </div>
+            <div class="simple-cell border">
+                <div class="title">
+                    <p>活动名额</p>
+                </div>
+                <div class="detail">
+                    <p>{{ limit_num }}</p>
+                </div>
+            </div>
+            <div class="large-text-cell border">
+                <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">
+                <div class="title">
+                    <img src="@/assets/img/sa_26.png" />
+                    <span>{{ paragraph_title }}</span>
+                </div>
+                <p class="content" v-html="paragraph_content">
+                </p>
+            </div>
         </div>
     </div>
 </template>
 
 <script>
+import { parseTime } from "@/utils"
+
 export default {
     name: "EditActivityPreviewForm",
+    props: {
+        activity: {
+            type: Object,
+            required: true,
+        },
+        paragraph: {
+            type: Object,
+            required: true,
+        },
+    },
     data() {
         return {
             
@@ -60,22 +96,51 @@ export default {
     },
     computed: {
         poster_photo: function() {
-            return require("@/assets/img/activity_poster_photo_default.png")
+            return this.activity.poster_photo.length > 0 ? this.activity.poster_photo : require("@/assets/img/activity_poster_photo_default.png")
         },
         title: function() {
-            return "与孩子一起挑选采摘新鲜有机马陆葡萄，体验采摘乐趣"
+            return this.activity.title.length > 0 ? this.activity.title : "与孩子一起挑选采摘新鲜有机马陆葡萄，体验采摘乐趣"
         },
         subtitle: function() {
-            return "亲子采摘活动"
+            return this.activity.subtitle.length > 0 ? this.activity.subtitle : "亲子采摘活动"
+        },
+        address: function() {
+            return this.activity.address.length > 0 ? this.activity.address : "深圳市南山区高新园"
+        },
+        activity_time: function() {
+            if (this.activity.start_time > 0) {
+                return parseTime(this.activity.start_time, "{y}-{m}-{d} {h}:{i}")
+            } else {
+                return "2019-01-01 09:00:00"
+            }
+        },
+        phone_number: function() {
+            return this.activity.phone_number.length > 0 ? this.activity.phone_number : "0755-86879866"
+        },
+        limit_num: function() {
+            return this.activity.limit_num > 0 ? (this.activity.limit_num + "人") : "无限制"
+        },
+        sign_up_notice: function() {
+            var notice = this.activity.sign_up_notice.length > 0 ? this.activity.sign_up_notice : "1.活动费用88元（2斤葡萄 1只手绘风筝 车费 包含1个大人 1个小孩）。\n2.多加1个大人另收30元/人。\n3.葡萄采摘时在园内可以适当品尝。"
+            return notice.replace(/\n/g, "<br/>")
+        },
+
+        paragraph_title: function() {
+            return this.paragraph.title.length > 0 ? this.paragraph.title : "商家介绍"
+        },
+        paragraph_content: function() {
+            var content = this.paragraph.content.length > 0 ? this.paragraph.content : "1.活动费用88元（2斤葡萄 1只手绘风筝 车费 包含1个大人 1个小孩）。<br/>2.多加1个大人另收30元/人。<br/>3.葡萄采摘时在园内可以适当品尝。"
+            return content
         },
     },
 }
 </script>
 
 <style lang="scss" scoped>
-.preview-main {
+.preview-form-main {
     .form-title {
         width: 100%;
+        height: 60px;
         padding: 20px 0 20px 30px;
         border-bottom: 1px #dee2e5 solid;
 
@@ -94,7 +159,7 @@ export default {
 
     .form-content {
         width: 100%;
-        padding: 14px 30px 0 30px;
+        padding: 14px 30px 14px 30px;
 
         .preview-cell-poster-photo {
             .poster-photo {
@@ -132,6 +197,8 @@ export default {
                     width: 40px;
                     height: 40px;
                     border-radius: 20px;
+                    object-fit: cover;
+                    object-position: center;
                 }
             }
             .text-info {
@@ -173,7 +240,7 @@ export default {
             .icon {
                 img {
                     width: 20px;
-                    height: 20px;
+                    height: auto;//20px;
                     vertical-align: middle;
                 }
             }
@@ -193,6 +260,50 @@ export default {
                     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 {
+            padding: 20px 20px;
+            position: relative;
+            -webkit-box-align: center;
+            align-items: center;
+            margin-top: 15px;
+
+            .title {
+                color: #485b6d;
+                line-height: 18px;
+                height: 18px;
+
+                img {
+                    // width: 18px;
+                    // height: auto;
+                    margin-right: 11px;
+                    float: left;
+                }
+            }
+            .content {
+                color: #a8b3ba;
+                margin: 10px 0 0 0;
+                font-size: 14px;
+                line-height: 20px;
+            }
         }
     }
 }

src/scrm_pages/marketing_tool/components/unapproved_cell.vue

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

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/site/components/new-feature.vue

@@ -0,0 +1,107 @@
+<template>
+<div class="feature">
+    <ul >
+        <li>
+            <span>
+              <img :src="new1" alt="">
+              <p>轮播图</p>  
+            </span>
+        </li>
+         <li>
+           <span>
+              <img :src="new1" alt="">
+              <p>轮播图</p>  
+            </span>  
+        </li>
+         <li>
+           <span>
+              <img :src="new1" alt="">
+              <p>轮播图</p>  
+            </span>  
+        </li>
+         <li>
+           <span>
+              <img :src="new1" alt="">
+              <p>轮播图</p>  
+            </span>  
+        </li>
+         <li>
+           <span>
+              <img :src="new1" alt="">
+              <p class="title">轮播图</p>  
+            </span>  
+        </li>
+    </ul>
+    <!-- <el-row :gutter="21" type="flex"  justify="space-around">
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
+    </el-row>
+    <el-row :gutter="21" type="flex"  justify="space-around">
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
+    </el-row>
+    <el-row :gutter="21" type="flex"  justify="space-around">
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
+    </el-row> -->
+</div>    
+</template>
+
+
+<script>
+export default {
+  name: "newfeature",
+  data() {
+    return {
+      new1: require("../../../assets/preview/new-1.png")
+    };
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.feature {
+  ul {
+    border: 1px solid #eaeefb;
+    float: left;
+    width: 100%;
+    li {
+      width: 33.3%;
+      float: left;
+      text-align: center;
+      height: 120px;
+      color: #666;
+      font-size: 13px;
+      border-right: 1px solid #eee;
+      border-bottom: 1px solid #eee;
+      margin-right: -1px;
+      margin-bottom: -1px;
+      span {
+        vertical-align: middle;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 120px;
+        img {
+          display: inline-block;
+          font-size: 32px;
+          margin-bottom: 15px;
+          color: #606266;
+          transition: color 0.15s linear;
+          vertical-align: middle;
+        }
+        .title {
+          display: inline-block;
+          padding: 0 3px;
+          height: 30px;
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+}
+</style>

src/scrm_pages/site/index.vue

@@ -0,0 +1,67 @@
+<template>
+   <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
+      </div>
+      <div class="app-container">
+         <el-row :gutter="20">
+            <el-col :span="12">
+              <div class="success">
+                <h1 class="name">欢迎来到微官网主页</h1>
+                <div class="tips">您可以手机扫码访问或在右侧预览</div>
+                <div class="site-code"><img :src="codeImg" alt=""></div>
+                <router-link to="/site/preview">
+                  <el-button type="primary">进入微官网后台</el-button>
+                </router-link>
+              </div>
+            </el-col>
+            <el-col :span="12">
+
+            </el-col>
+          </el-row>
+      </div>
+   </div>
+</template>
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+export default {
+  name: "site",
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      crumbs: [{ path: false, name: "微网站" }],
+      codeImg: require("../../assets/home/wei.jpg")
+    };
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.success {
+  text-align: center;
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  .name {
+    font-size: 30px;
+    font-weight: bold;
+    color: #333;
+    margin: 0;
+    padding-bottom: 10px;
+  }
+  .tips{
+    line-height: 30px;
+    padding-bottom: 10px;
+  }
+  .site-code {
+    width: 200px;
+    padding-bottom: 10px;
+    img{
+      width: 100%;
+    }
+  }
+}
+</style>

src/scrm_pages/site/preview.vue

@@ -0,0 +1,57 @@
+<template>
+   <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
+      </div>
+      <div class="app-container">
+            <!-- 新增 -->
+                <el-tabs type="border-card" style="width:450px;">
+                    <el-tab-pane label="首页">
+                        <el-tabs v-model="activeName" @tab-click="handleClick"  >
+                            <el-tab-pane label="新增模块" name="first">
+                                 <new-feature> </new-feature>
+                            </el-tab-pane>
+                            <el-tab-pane label="已使用" name="second">
+
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-tab-pane>
+                    <el-tab-pane label="联系我们">
+                        <el-tabs v-model="activeName" @tab-click="handleClick">
+                            <el-tab-pane label="新增模块" name="three">
+
+                            </el-tab-pane>
+                            <el-tab-pane label="已使用" name="four">
+                                
+                            </el-tab-pane>
+                        </el-tabs>                        
+                    </el-tab-pane>
+                </el-tabs>
+            <!-- 已使用 -->
+           
+      </div>
+   </div>
+</template>
+
+<script> 
+import BreadCrumb from "../components/bread-crumb";
+import NewFeature from "./components/new-feature";
+export default {
+  name: "preview",
+  components: {
+    BreadCrumb,
+    NewFeature
+  },
+  data() {
+    return {
+      crumbs: [{ path: false, name: "预览" }],
+      activeName: 'first'
+    };
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
+
+

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;*/