ytj

src/components/menuForm.vue

@@ -16,7 +16,7 @@
       <RadioGroup v-model="active" type="button" size="large" style="padding-bottom:20px">
         <Radio label="文字" style="line-height:32px;"></Radio>
         <Radio label="图片" style="line-height:32px;"></Radio>
-        <Radio label="图文" style="line-height:32px;"></Radio>
+        <!-- <Radio label="图文" style="line-height:32px;"></Radio> -->
       </RadioGroup>
       <div v-show="active === '文字'">
         <Input type="textarea" v-model="text" :rows="4" placeholder="输入消息文字" />
@@ -74,6 +74,7 @@
       </div>
       <div v-show="active === '图文'">
         <div>
+          <Button type="info" @click="chooseView">从素材库中选取</Button>
           <Button type="info" @click="chooseView">从素材库中选取</Button>
           <Modal width='800' v-model="showMaterialView" @on-ok="checkView" @on-cancel="closeView">
             <material v-if="showMaterialView" :type='materialType' :model='model' @emit='setView'></material>
@@ -95,6 +96,7 @@
     <div class="btn-group">
       <Button type="primary" @click="emit">确认</Button>
       <Button v-if="hasDelete" @click="delMenu">删除当前菜单</Button>
+      <Button v-if="hasCancel" type="warning" @click="cancel">取消</Button>
     </div>
   </div>
 </template>
@@ -106,7 +108,7 @@ import material from '@/components/material'
 import { createNamespacedHelpers } from 'vuex'
 const { mapActions: mapMaterialActions } = createNamespacedHelpers('material')
 export default {
-  props: ['data', 'menuConfig', 'hasContent', 'hasDelete', 'noRadio'],
+  props: ['data', 'menuConfig', 'hasContent', 'hasDelete', 'noRadio', 'hasCancel'],
   data () {
     return {
       active: '文字',
@@ -302,6 +304,9 @@ export default {
     delMenu () {
       this.$emit('delMenu')
     },
+    cancel () {
+      this.$emit('cancel')
+    }
   },
   components: {
     Emotion,

src/pages/login/login.vue

@@ -24,6 +24,7 @@
 import bg from '@/assets/login.jpg'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapLoginState, mapActions: mapLoginActions } = createNamespacedHelpers('login')
+const { mapActions: mapMainActions } = createNamespacedHelpers('main')
 export default {
   data () {
     return {
@@ -32,6 +33,9 @@ export default {
   },
   created () {
     // this.$Message.info('This is a info tip')
+    this.getUserInfo().then(() => {
+      this.$router.push({ name: 'menuConfig' })
+    })
     this.Remember = localStorage.getItem('remember')
     if (!this.Remember) {
       this.UserName = ''
@@ -74,6 +78,7 @@ export default {
   },
   methods: {
     ...mapLoginActions(['setRemember', 'setUserName', 'setPassWord', 'login']),
+    ...mapMainActions(['getUserInfo']),
     submit () {
       this.login({ UserName: this.UserName, UserPass: this.PassWord }).then(() => {
         if (!this.Remember) {

src/pages/main/main.vue

@@ -1,8 +1,31 @@
 <template>
   <div class="layout">
     <Layout>
-      <Header style="background:#2d8cf0">
-        
+      <Header class="header">
+        <div class="left"></div>
+        <div class="right">
+          <img :src="userInfo.Headimgurl" alt="">
+          <Dropdown @on-click="putPassWord">
+            <a href="javascript:void(0)" style="color:#fff;">{{userInfo.UserName}}<Icon type="ios-arrow-down"></Icon></a>
+            <DropdownMenu slot="list">
+              <DropdownItem>退出</DropdownItem>
+              <DropdownItem name='修改密码'>修改密码</DropdownItem>
+            </DropdownMenu>
+          </Dropdown>
+          <Modal v-model="showPass" title="修改密码">
+            <div style="padding-bottom:15px;">
+              <label for="passWordOld" style="padding-right:20px;">旧密码</label>
+              <Input placeholder="请输入项目名称" size="large" v-model="passWordOld" clearable name="passWordOld" type='password' style="width: 300px"/>
+            </div>
+            <div>
+              <label for="passWord" style="padding-right:20px;">新密码</label>
+              <Input placeholder="请输入项目名称" size="large" v-model="passWord" clearable name="passWord" type='password' style="width: 300px"/>
+            </div>
+            <div slot="footer">
+              <Button type="primary" @click="submit">确认</Button>
+            </div>
+          </Modal>
+        </div>
       </Header>
       <Layout>
         <Sider hide-trigger :style="{background: '#fff',borderRight:'1px solid #dcdee2'}">
@@ -25,17 +48,53 @@ import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapMainState, mapActions: mapMainActions } = createNamespacedHelpers('main')
 import menuLeft from '@/components/menu.vue' // 左侧导航
 export default {
-  created () { this.getMainMenu() },
+  data () {
+    return {
+      passWord: '',
+      passWordOld: '',
+      showPass: false
+    }
+  },
+  created () {
+    this.getMainMenu()
+    this.getUserInfo()
+  },
   components: {
     menuLeft
   },
   computed: {
     ...mapMainState({
-      menuData: item => item.menuData
+      menuData: item => item.menuData,
+      userInfo: item => item.userInfo
     })
   },
   methods: {
-    ...mapMainActions(['getMainMenu'])
+    ...mapMainActions(['getMainMenu', 'getUserInfo', 'changePassWord', 'logOut']),
+    putPassWord (name) {
+      console.log(this.showPass)
+      if (name === '修改密码') {
+        this.showPass = true
+      } else {
+        this.logOut().then(() => {
+          this.$Message.success('退出成功')
+          this.$router.push({ name: 'login' })
+        })
+      }
+    },
+    submit () {
+      if (!this.passWordOld) {
+        this.$Message.warning('请输入旧密码')
+        return
+      } else if (!this.passWord) {
+        this.$Message.warning('请输入新密码')
+        return
+      }
+      this.changePassWord({ oriPasswd: this.passWordOld, newPasswd: this.passWord }).then(() => {
+        this.showPass = false
+        this.$Message.success('修改成功')
+        console.log(this.userInfo)
+      })
+    }
   }
 }
 </script>
@@ -78,4 +137,20 @@ export default {
 .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
   opacity: 0;
 }
+.header {
+  background: #2d8cf0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .right {
+    display: flex;
+    align-items: center;
+    img {
+      width: 50px;
+      height: 50px;
+      border-radius: 50%;
+      margin-right: 10px;
+    }
+  }
+}
 </style>

src/pages/main/management/management.vue

@@ -3,17 +3,28 @@
     <Button type="success" style="margin-bottom:20px;" @click="showAdd = true">新增</Button>
     <Table border :columns="managementColumns" :data="managementList"></Table>
     <div class="page">
-      <Page :total="total" :pageSize='pageSize' :current='current' show-elevator />
+      <Page :total="total" :pageSize='pageSize' :current='current' @on-change='changePage' show-elevator />
     </div>
-    <Modal v-model="showAdd" title="新增" @on-ok="submit" @on-cancel="close">
+    <Modal v-model="showAdd" title="新增">
       <label for="name" style="padding-right:20px;">项目名称</label>
       <Input placeholder="请输入项目名称" size="large" v-model="name" clearable name="name" style="width: 300px"/>
+      <div slot="footer">
+        <Button type="primary" @click="submit">确认</Button>
+      </div>
     </Modal>
-    <div class="pop-up" v-show="pop.show">
-      <div>
-        弹窗
+    <Modal title="公众平台账号授权" v-model="pop.show" :mask-closable="false">
+      <div class="qrcode">
+        <Button type="success" class="reflsh">刷新</Button>
+        <img src="" alt="">
+        <span>使用公众平台绑定的管理员个人微信号扫描</span>
       </div>
-    </div>
+      <div class="select">
+        <div>扫码后点击刷新按钮，选择您想要绑定的公众号进行绑定</div>
+        <!-- <Select v-model="model1" style="width:300px">
+          <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+        </Select> -->
+      </div>
+    </Modal>
   </div>
 </template>
 
@@ -24,41 +35,47 @@ export default {
   data () {
     return {
       pageSize: 10,
-      total: 100,
-      current: 2,
       showAdd: false,
       name: '',
       pop: {
-        show: false
+        show: false,
       },
       managementColumns: [
         {
           title: '项目名称',
-          key: 'name'
+          align: 'center',
+          key: 'OrgName'
         },
         {
           title: '公众号名称',
-          key: 'age'
+          align: 'center',
+          key: 'WechatName'
         },
         {
           title: '微信ID',
-          key: 'province'
+          align: 'center',
+          key: 'WechatId'
         },
         {
           title: '状态',
-          key: 'city'
+          align: 'center',
+          render: (h, params) => {
+            return h('div', {}, params.row.AuthStatus === 'no' ? '未授权' : '已授权')
+          }
         },
         {
           title: '创建时间',
-          key: 'address'
+          align: 'center',
+          render: (h, params) => {
+            return h('div', {}, this.toolClass.dateFormat(params.row.CreateDate))
+          }
         },
         {
           title: '操作',
-          key: 'action',
           align: 'center',
           render: (h, params) => {
             return h('div', [
-              params.row.age === 18 ? h('Button', {
+              params.row.AuthStatus === 'no' ? h('Button', {
                 props: {
                   type: 'primary',
                   size: 'default'
@@ -67,7 +84,7 @@ export default {
                   'margin-right': '20px'
                 },
                 on: {
-                  click: () => { console.log(params) }
+                  click: () => { this.auth(params) }
                 },
               }, '授权') : '',
               h('Button', {
@@ -76,7 +93,7 @@ export default {
                   size: 'default'
                 },
                 on: {
-                  click: () => { console.log(params) }
+                  click: () => { this.delete(params) }
                 }
               }, '删除')
             ])
@@ -86,36 +103,95 @@ export default {
     }
   },
   created () {
+    this.getManagementList({ page: this.current, pagesize: this.pageSize })
   },
   computed: {
     ...mapManagementState({
-      managementList: item => item.managementList
+      managementList: item => item.managementList,
+      current: item => item.current,
+      total: item => item.total,
+      authData: item => item.authData
     })
   },
   methods: {
-    ...mapManagementActions(['getManagementList']),
+    ...mapManagementActions(['getManagementList', 'addManagement', 'deleteManagement', 'changeCurrent', 'authcode']),
     submit () {
-      this.close()
+      if (!this.name) {
+        this.$Message.warning('请输入项目名称')
+        this.showAdd = true
+        return
+      }
+      this.addManagement({ OrgName: this.name }).then(() => {
+        this.$Message.success('新增成功')
+        this.close()
+        this.changePage(1)
+        this.getManagementList({ page: this.current, pagesize: this.pageSize })
+      })
     },
     close () {
       this.name = ''
       this.showAdd = false
+    },
+    delete (info) {
+      this.$Modal.confirm({
+        title: '警告',
+        content: `<p style='font-size:18px;'>确认删除此项目？<p>`,
+        onOk: () => {
+          this.deleteManagement({ OrgId: info.row.OrgId }).then(() => {
+            this.$Message.success('删除成功')
+            this.changePage(1)
+            this.getManagementList({ page: this.current, pagesize: this.pageSize })
+          })
+        },
+        onCancel: () => {
+          this.$Message.info('操作取消')
+        }
+      })
+    },
+    changePage (page) {
+      this.changeCurrent(page)
+      this.getManagementList({ page: this.current, pagesize: this.pageSize })
+    },
+    auth (params) {
+      // this.pop.show = true
+      this.authcode().then(() => {
+        let url = encodeURIComponent(`${window.location.href}?id=${params.row.OrgId}`)
+        window.location.href = `https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=${this.authData.appid}&pre_auth_code=${this.authData.code}&redirect_uri=${url}&auth_type=1`
+
+      })
     }
   }
 }
 </script>
 
 <style lang='scss' scoped>
-.container {
-  position: relative;
-  .pop-up {
-    width: 100%;
-    height: 100%;
+.qrcode {
+  width: 300px;
+  height: 300px;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #ddd;
+  margin: 0 auto;
+  img {
+    width: 150px;
+    height: 150px;
+    margin: 10px;
+  }
+  p {
+    text-align: center;
+  }
+  .reflsh {
     position: absolute;
-    top: 0;
-    left: 0;
-    background: #fff;
-    border-radius: 8px;
+    top: 60px;
+    left: 10px;
+  }
+}
+.select {
+  text-align: center;
+  div {
+    margin-top: 10px;
   }
 }
 </style>

src/pages/main/reply/editReply.vue

@@ -14,15 +14,15 @@
     <div class="form-item">
       <label for="name">关键词</label>
       <div class="tag">
-        <Tag type="dot" style="margin-bottom: 10px;" v-for="(item, index) in tagList" :key="index" :name="index" closable @on-close="handleClose">{{ item.name }}</Tag>
+        <Tag type="dot" style="margin-bottom: 10px;" v-for="item in tagList" :key="item" :name="item" closable @on-close="handleClose">{{ item }}</Tag>
         <div>
           <Input v-model="value" @click.stop="1" placeholder="输入关键词" search enter-button="添加" style="width: 200px;" @on-search='handleAdd'/>
         </div>
       </div>
     </div>
-    <div >
+    <div>
       <label for="name">回复</label>
-      <menuForm :menuConfig='false' :data='{}' :hasContent='true' :hasDelete='false' @emit='checkForm' :noRadio='true'></menuForm>      
+      <menuForm v-if="showMenu" :menuConfig='false' :data='menuData' :hasContent='true' :hasDelete='false' @emit='checkForm' :noRadio='true' @cancel='cancel' :hasCancel='true'></menuForm>      
     </div>
   </div>
 </template>
@@ -36,25 +36,59 @@ export default {
     return {
       name: '',
       type: '完全',
-      value: ''
+      value: '',
+      showMenu: false,
+      menuData: {}
     }
   },
   components: {
     menuForm
   },
-  mounted () {
+  created () {
+    if (this.$route.query.id) {
+      this.getReplyDetail({ autoreplyId: this.$route.query.id }).then(() => {
+        this.name = this.RuleName
+        this.type = this.PairType === 'blur' ? '模糊' : '完全'
+        if (this.MessageType === 'paragraph') {
+          this.menuData.type = 'text'
+          this.menuData.value = this.MessageParagraph
+        } else if (this.MessageType === 'img') {
+          this.menuData.type = 'media_id'
+          this.img.media_id = ''
+          this.img.url = this.MessageImg
+        } else if (this.MessageType === 'content') {
+          this.menuData.type = 'view'
+          this.menuData.media_id = ''
+          this.menuData.url = this.MessageContent
+        }
+        this.showMenu = true
+      })
+    } else {
+      this.showMenu = true
+    }
   },
   computed: {
     ...mapReplyState({
-      tagList: item => item.tagList
+      tagList: item => item.tagList,
+      RuleName: item => item.RuleName,
+      AutoType: item => item.AutoType,
+      MessageContent: item => item.MessageContent,
+      MessageImg: item => item.MessageImg,
+      MessageParagraph: item => item.MessageParagraph,
+      MessageType: item => item.MessageType,
+      PairType: item => item.PairType,
     })
   },
   methods: {
-    ...mapReplyActions(['changeTag']),
+    ...mapReplyActions(['changeTag', 'getReplyDetail', 'setReply', 'addReply']),
     handleAdd () {
+      if (!this.value) {
+        this.$Message.warning('请填写关键字')
+        return
+      }
       let data = {
         type: 'add',
-        data: { name: this.value }
+        data: this.value
       }
       this.changeTag(data)
       this.value = ''
@@ -62,22 +96,52 @@ export default {
     handleClose (event, name) {
       let data = {
         type: 'delete',
-        index: name
+        item: name
       }
       this.changeTag(data)
     },
-    submit () {
-      this.addUser().then((res) => {
-        this.$Message.info(res)
-        this.cancel()
-      })
-    },
     cancel () {
-      this.$router.push({ name: 'user' })
+      this.$router.push({ name: 'reply' })
     },
     checkForm (data) {
-      console.log(data)
+      let formData = {}
+      formData.RuleName = this.name
+      formData.PairType = this.type === '模糊' ? 'blur' : 'acu'
+      formData.Keywords = this.tagList.join()
+      formData.AutoType = 'keyword'
+      if (data.type === 'text') {
+        formData.MessageType = 'paragraph'
+        formData.MessageParagraph = data.value
+        formData.MessageImg = ''
+        formData.MessageContent = ''
+      } else if (data.type === 'media_id') {
+        formData.MessageType = 'img'
+        formData.MessageImg = ''
+        formData.MessageParagraph = ''
+        formData.MessageContent = ''
+      } else if (data.type === 'view') {
+        formData.MessageType = 'content'
+        formData.MessageImg = ''
+        formData.MessageParagraph = ''
+        formData.MessageContent = ''
+      }
+      if (this.$route.query.id) {
+        formData.AutoReplyId = this.$route.query.id
+        this.setReply(formData).then(() => {
+          this.$Message.success('编辑成功')
+          this.$router.push({ name: 'reply' })
+        })
+      } else {
+        this.addReply(formData).then(() => {
+          this.$Message.success('新增成功')
+          this.$router.push({ name: 'reply' })
+        })
+      }
     }
+  },
+  beforeRouteLeave (to, from, next) {
+    this.changeTag({})
+    next()
   }
 }
 </script>

src/pages/main/reply/reply.vue

@@ -4,7 +4,7 @@
       <TabPane label="关键词回复" name="keyword">
         <div class="keyword">
           <label>用户通过发送关键词来触发回复</label>
-          <i-switch v-model="keywordSwitch" @on-change="change"/>
+          <i-switch v-model="keywordSwitch" @on-change="changeKey"/>
           <div class="add">
             <Button type="primary" @click="edit">新增</Button>
           </div>
@@ -13,9 +13,9 @@
       </TabPane>
       <TabPane label="关注回复" name="attention">
         <div class="attention">
-          <label>用户通过发送关键词来触发回复</label>
-          <i-switch v-model="attentionSwitch" @on-change="change"/>
-          <menuForm :menuConfig='false' :data='{}' :hasContent='true' :hasDelete='false' @emit='checkForm' :noRadio='true'></menuForm>
+          <label>用户通过关注触发回复</label>
+          <i-switch v-model="attentionSwitch" @on-change="changeSub"/>
+          <menuForm v-if="showMenu" :menuConfig='false' :data='menuData' :hasContent='true' :hasDelete='false' @emit='checkForm' :noRadio='true'></menuForm>
         </div>
       </TabPane>
     </Tabs>
@@ -29,24 +29,32 @@ const { mapState: mapReplyState, mapActions: mapReplyActions } = createNamespace
 export default {
   data () {
     return {
-      keywordSwitch: true,
-      attentionSwitch: true,
+      keywordSwitch: false,
+      attentionSwitch: false,
+      menuData: {},
+      showMenu: false,
       keywordColumns: [
         {
           title: '规则名',
-          key: 'name'
+          align: 'center',
+          key: 'RuleName'
         },
         {
           title: '关键词',
-          key: 'age'
+          align: 'center',
+          key: 'Keywords'
         },
         {
           title: '回复内容',
-          key: 'province'
+          align: 'center',
+          key: 'MessageParagraph'
         },
         {
           title: '匹配',
-          key: 'city'
+          align: 'center',
+          render: (h, params) => {
+            return h('div', {}, params.row.PairType === 'blur' ? '模糊' : '精确')
+          }
         },
         {
           title: '操作',
@@ -63,7 +71,7 @@ export default {
                   'margin-right': '20px'
                 },
                 on: {
-                  click: () => { console.log(params) }
+                  click: () => { this.$router.push({ name: 'editReply', query: { id: params.row.AutoReplyId } }) }
                 },
               }, '编辑'),
               h('Button', {
@@ -72,7 +80,7 @@ export default {
                   size: 'default'
                 },
                 on: {
-                  click: () => { console.log(params) }
+                  click: () => { this.delete(params) }
                 }
               }, '删除')
             ])
@@ -81,21 +89,100 @@ export default {
       ]
     }
   },
+  created () {
+    this.getKeywordList({ page: 1, pagesize: 10000, autoType: 'keyword' }).then(() => {
+      if (this.keywordList.length > 0) {
+        this.keywordSwitch = this.keywordList[0].IsUse === 'on' ? true : false
+      }
+    })
+    this.getSubscribe({ page: 1, pagesize: 10000, autoType: 'subscribe' }).then(() => {
+      if (this.Subscribe.IsUse) {
+        this.attentionSwitch = this.Subscribe.IsUse === 'on' ? true : false
+      }
+      if (this.Subscribe.MessageType === 'paragraph') {
+        this.menuData.type = 'text'
+        this.menuData.value = this.Subscribe.MessageParagraph
+      } else if (this.Subscribe.MessageType === 'img') {
+        this.menuData.type = 'media_id'
+        this.img.media_id = ''
+        this.img.url = this.Subscribe.MessageImg
+      } else if (this.Subscribe.MessageType === 'content') {
+        this.menuData.type = 'view'
+        this.menuData.media_id = ''
+        this.menuData.url = this.Subscribe.MessageContent
+      }
+      this.showMenu = true
+    })
+  },
   components: {
     menuForm
   },
   computed: {
     ...mapReplyState({
-      keywordList: item => item.keywordList
+      keywordList: item => item.keywordList,
+      Subscribe: item => item.Subscribe
     })
   },
   methods: {
-    ...mapReplyActions([]),
-    change (status) {
-      this.$Message.info('开关状态：' + status);
+    ...mapReplyActions(['getKeywordList', 'deleteReply', 'getSubscribe', 'setReply', 'addReply', 'changeIsUse']),
+    changeKey (status) {
+      let isUse = status ? 'on' : 'off'
+      this.changeIsUse({ autoType: 'keyword', isUse: isUse }).then(() => {
+        this.$Message.success('修改成功')
+      })
+    },
+    changeSub (status) {
+      let isUse = status ? 'on' : 'off'
+      this.changeIsUse({ autoType: 'subscribe', isUse: isUse }).then(() => {
+        this.$Message.success('修改成功')
+      })
     },
     checkForm (data) {
-      console.log(data)
+      let formData = {}
+      formData.AutoType = 'subscribe'
+      if (data.type === 'text') {
+        formData.MessageType = 'paragraph'
+        formData.MessageParagraph = data.value
+        formData.MessageImg = ''
+        formData.MessageContent = ''
+      } else if (data.type === 'media_id') {
+        formData.MessageType = 'img'
+        formData.MessageImg = ''
+        formData.MessageParagraph = ''
+        formData.MessageContent = ''
+      } else if (data.type === 'view') {
+        formData.MessageType = 'content'
+        formData.MessageImg = ''
+        formData.MessageParagraph = ''
+        formData.MessageContent = ''
+      }
+      if (this.Subscribe.AutoReplyId) {
+        formData.AutoReplyId = this.Subscribe.AutoReplyId
+        this.setReply(formData).then(() => {
+          this.$Message.success('编辑成功')
+          this.$router.push({ name: 'reply' })
+        })
+      } else {
+        this.addReply(formData).then(() => {
+          this.$Message.success('新增成功')
+          this.$router.push({ name: 'reply' })
+        })
+      }
+    },
+    delete (params) {
+      this.$Modal.confirm({
+        title: '警告',
+        content: `<p style='font-size:18px;'>确认删除此项目？<p>`,
+        onOk: () => {
+          this.deleteReply({ autoreplyId: params.row.AutoReplyId }).then(() => {
+            this.$Message.success('删除成功')
+            this.getKeywordList({ page: 1, pagesize: 10000, autoType: 'keyword' })
+          })
+        },
+        onCancel: () => {
+          this.$Message.info('操作取消')
+        }
+      })
     },
     edit () {
       this.$router.push({ name: 'editReply' })

src/pages/main/user/addUser.vue → src/pages/main/user/editUser.vue

@@ -211,7 +211,7 @@ export default {
           UserType: 'operator'
         }
         this.editUser(data).then(() => {
-          this.$Message.info('编辑成功')
+          this.$Message.success('编辑成功')
           this.cancel()
         })
       } else {
@@ -225,7 +225,7 @@ export default {
           UserType: 'operator'
         }
         this.addUser(data).then(() => {
-          this.$Message.info('新增成功')
+          this.$Message.success('新增成功')
           this.cancel()
         })
       }

src/pages/main/user/user.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Button type="success" style="margin-bottom:20px;" @click="addUser">新增</Button>
+    <Button type="success" style="margin-bottom:20px;" @click="editUser">新增</Button>
     <Table border :columns="userColumns" :data="userList"></Table>
     <div class="page">
       <Page :total="total" :pageSize='pageSize' :current='current' @on-change='changePage' show-elevator />
@@ -100,7 +100,7 @@ export default {
                   size: 'default'
                 },
                 on: {
-                  click: () => { this.$router.push({ name: 'addUser', query: { id: params.row.UserId } }) }
+                  click: () => { this.$router.push({ name: 'editUser', query: { id: params.row.UserId } }) }
                 }
               }, '编辑')
             ])
@@ -122,24 +122,48 @@ export default {
     })
   },
   methods: {
-    ...mapUserActions(['getUserList', 'changeCurrent', 'getProjectList', 'BindProject']),
+    ...mapUserActions(['getUserList', 'changeCurrent', 'getProjectList', 'BindProject', 'UnBindProject']),
     changePage (page) {
       this.changeCurrent(page)
     },
     bindProject (params) {
-      this.showAdd = true
       this.chooseUser = params.row.UserId
+      if (!params.row.OrgId) {
+        this.showAdd = true
+      } else {
+        this.unBindProject()
+      }
+    },
+    unBindProject () {
+      this.$Modal.confirm({
+        title: '警告',
+        content: `<p style='font-size:18px;'>确认取消绑定此项目？<p>`,
+        onOk: () => {
+          this.UnBindProject({ userId: this.chooseUser }).then(() => {
+            this.$Message.success('取消绑定成功')
+            this.getUserList({ page: this.current, pagesize: this.pageSize })
+            this.getProjectList()
+          })
+        },
+        onCancel: () => {
+          this.$Message.info('操作取消')
+        }
+      })
     },
     submit () {
-      this.BindProject({ userId: this.chooseUser, orgId: this.name })
+      this.BindProject({ userId: this.chooseUser, orgId: this.name }).then(() => {
+        this.$Message.success('绑定成功')
+        this.getUserList({ page: this.current, pagesize: this.pageSize })
+        this.getProjectList()
+      })
       this.close()
     },
     close () {
       this.name = ''
       this.showAdd = false
     },
-    addUser () {
-      this.$router.push({ name: 'addUser' })
+    editUser () {
+      this.$router.push({ name: 'editUser' })
     }
   },
   watch: {

src/pages/staticRouter.js

@@ -2,7 +2,7 @@ import main from '@/pages/main/main.vue' // 主体框架
 import menuConfig from '@/pages/main/menuConfig/menuConfig.vue' // 自定义菜单
 import management from '@/pages/main/management/management.vue' // 项目管理
 import user from '@/pages/main/user/user.vue' // 用户管理
-import addUser from '@/pages/main/user/addUser.vue' // 新增用户
+import editUser from '@/pages/main/user/editUser.vue' // 编辑用户
 import material from '@/pages/main/material/material.vue' // 素材库
 import reply from '@/pages/main/reply/reply.vue' // 自动回复
 import editReply from '@/pages/main/reply/editReply.vue' // 修改自动回复
@@ -30,9 +30,9 @@ export default {
           component: user,
           children: [
             {
-              path: '/addUser',
-              name: 'addUser',
-              component: addUser,
+              path: '/editUser',
+              name: 'editUser',
+              component: editUser,
             }
           ]
         },

src/store/main.js

@@ -5,10 +5,14 @@ export default {
   namespaced: true,
   state: {
     menuData: [],
+    userInfo: {}
   },
   mutations: {
     updateMenu (state, data) {
       state.menuData = data || []
+    },
+    updateUserInfo (state, data) {
+      state.userInfo = data || {}
     }
   },
   actions: {
@@ -20,8 +24,18 @@ export default {
           data: {
             ...data,
           }
-        }).then(res => {
-          resolve(res)
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    logOut (context) {
+      context
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.common.logOut
+        }).then(() => {
+          resolve()
         }).catch(reject)
       })
     },
@@ -32,11 +46,34 @@ export default {
           data: {
             ...data,
           }
-        }).then(res => {
+        }).then((res) => {
           context.commit('updateMenu', res)
-          resolve(res)
+          resolve()
         }).catch(reject)
       })
-    }
+    },
+    getUserInfo (context) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.user.getUserInfo
+        }).then((res) => {
+          context.commit('updateUserInfo', res)
+          resolve()
+        }).catch(reject)
+      })
+    },
+    changePassWord (context, data) {
+      context
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.user.changePassWord,
+          data: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
   }
 }

src/store/management.js

@@ -4,54 +4,76 @@ import api from '../util/api'
 export default {
   namespaced: true,
   state: {
-    managementList: [
-      {
-        name: 'John Brown',
-        age: 18,
-        address: 'New York No. 1 Lake Park',
-        province: 'America',
-        city: 'New York'
-      },
-      {
-        name: 'Jim Green',
-        age: 24,
-        address: 'Washington, D.C. No. 1 Lake Park',
-        province: 'America',
-        city: 'Washington, D.C.'
-      },
-      {
-        name: 'Joe Black',
-        age: 30,
-        address: 'Sydney No. 1 Lake Park',
-        province: 'Australian',
-        city: 'Sydney'
-      },
-      {
-        name: 'Jon Snow',
-        age: 26,
-        address: 'Ottawa No. 2 Lake Park',
-        province: 'Canada',
-        city: 'Ottawa',
-        zip: 100000
-      }
-    ]
+    managementList: [],
+    current: 1,
+    total: 0,
+    authData: {}
   },
   mutations: {
     updateManagementList (state, data) {
-      state.img = data || []
-    }
+      state.managementList = data.list || []
+      state.total = data.pagenum
+    },
+    updateCurrent (state, data) {
+      state.current = data
+    },
+    updateAuthData (state, data) {
+      state.authData = data || {}
+    },
   },
   actions: {
     getManagementList (context, data) {
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.common.managementList,
-          data: data
+          ...api.management.getManagementList,
+          queryData: {
+            ...data
+          }
         }).then((res) => {
           context.commit('updateManagementList', res)
           resolve()
         }).catch(reject)
       })
+    },
+    addManagement (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.management.addManagement,
+          data: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    deleteManagement (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.management.deleteManagement,
+          urlData: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    changeCurrent (context, data) {
+      context.commit('updateCurrent', data)
+    },
+    authcode (context) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.management.authcode
+        }).then((res) => {
+          context.commit('updateAuthData', res)
+          resolve()
+        }).catch(reject)
+      })
     }
   }
 }

src/store/reply.js

@@ -4,70 +4,46 @@ import api from '../util/api'
 export default {
   namespaced: true,
   state: {
-    keywordList: [
-      {
-        name: 'John Brown',
-        age: 18,
-        address: 'New York No. 1 Lake Park',
-        province: 'America',
-        city: 'New York'
-      },
-      {
-        name: 'Jim Green',
-        age: 24,
-        address: 'Washington, D.C. No. 1 Lake Park',
-        province: 'America',
-        city: 'Washington, D.C.'
-      },
-      {
-        name: 'Joe Black',
-        age: 30,
-        address: 'Sydney No. 1 Lake Park',
-        province: 'Australian',
-        city: 'Sydney'
-      },
-      {
-        name: 'Jon Snow',
-        age: 26,
-        address: 'Ottawa No. 2 Lake Park',
-        province: 'Canada',
-        city: 'Ottawa',
-        zip: 100000
-      }
-    ],
-    tagList: [
-      {
-        name: '关键词1'
-      },
-      {
-        name: '关键词2'
-      },
-      {
-        name: '关键词3'
-      },
-      {
-        name: '关键词4'
-      },
-      {
-        name: '关键词5'
-      }
-    ]
+    keywordList: [],
+    tagList: [],
+    RuleName: '',
+    AutoType: '',
+    MessageContent: '',
+    MessageImg: '',
+    MessageParagraph: '',
+    MessageType: '',
+    PairType: '',
+    Subscribe: {}
   },
   mutations: {
     updateKeywordList (state, data) {
-      state.keywordList = data || []
+      state.keywordList = data.list || []
+    },
+    updateSubscribe (state, data) {
+      state.Subscribe = data.list ? data.list[0] : {}
     },
     updateTagList (state, data) {
       state.tagList = data || []
+    },
+    updateDetail (state, data) {
+      state.RuleName = data.RuleName
+      state.AutoType = data.AutoType
+      state.MessageContent = data.MessageContent
+      state.MessageImg = data.MessageImg
+      state.MessageParagraph = data.MessageParagraph
+      state.MessageType = data.MessageType
+      state.PairType = data.PairType
+      let arr = data.Keywords ? data.Keywords.split(',') : []
+      state.tagList = arr
     }
   },
   actions: {
     getKeywordList (context, data) {
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.common.login,
-          data: {
-            ...data,
+          ...api.reply.getKeywordList,
+          queryData: {
+            ...data
           }
         }).then((res) => {
           context.commit('updateKeywordList', res)
@@ -75,15 +51,95 @@ export default {
         }).catch(reject)
       })
     },
+    getSubscribe (context, data) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.getKeywordList,
+          queryData: {
+            ...data
+          }
+        }).then((res) => {
+          context.commit('updateSubscribe', res)
+          resolve()
+        }).catch(reject)
+      })
+    },
+    getReplyDetail (context, data) {
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.getReplyDetail,
+          urlData: {
+            ...data
+          }
+        }).then((res) => {
+          context.commit('updateDetail', res)
+          resolve()
+        }).catch(reject)
+      })
+    },
+    setReply (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.setReply,
+          data: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    addReply (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.addReply,
+          data: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    deleteReply (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.deleteReply,
+          urlData: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    changeIsUse (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.reply.changeIsUse,
+          urlData: {
+            ...data
+          }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
     changeTag (context, data) {
       let res
       if (data.type === 'add') {
         context.state.tagList.push(data.data)
         res = context.state.tagList
       } else if (data.type === 'delete') {
-        context.state.tagList.splice(data.index, 1)
+        let index = context.state.tagList.indexOf(data.item);
+        context.state.tagList.splice(index, 1)
         res = context.state.tagList
-        console.log(res)
+      } else {
+        res = []
       }
       context.commit('updateTagList', res)
     }

src/store/user.js

@@ -96,9 +96,21 @@ export default {
       })
     },
     BindProject (context, data) {
+      console.log(context)
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.user.bindProject,
+          ...api.user.BindProject,
+          urlData: { ...data }
+        }).then(() => {
+          resolve()
+        }).catch(reject)
+      })
+    },
+    UnBindProject (context, data) {
+      console.log(context)
+      return new Promise((resolve, reject) => {
+        ajax({
+          ...api.user.UnBindProject,
           urlData: { ...data }
         }).then(() => {
           resolve()

src/util/api.js

@@ -7,6 +7,10 @@ const $api = {
       url: `${baseUrl}/user/login`,
       method: 'post'
     },
+    logOut: { // 登出
+      url: `${baseUrl}${admin}/user/sign`,
+      method: 'post'
+    },
     image: { // 图片上传
       method: 'post',
       url: `${baseUrl}${admin}/file`
@@ -15,37 +19,87 @@ const $api = {
       url: `${baseUrl}${admin}/menu`,
       method: 'get'
     },
-    getProjectList:{ // 获取项目列表
+    getProjectList: { // 获取项目列表
       url: `${baseUrl}${admin}/sysorg`,
       method: 'get'
     }
   },
-  index: {
-    getWechatMenu: {
-      url: `${baseUrl}${admin}/menu`,
-      method: 'post'
-    }
-  },
   user: {
+    getUserInfo: { // 获取用户信息
+      url: `${baseUrl}${admin}/sysuser/current`,
+      method: 'get'
+    },
     getUserList: { // 获取用户列表
       url: `${baseUrl}${admin}/sysuser`,
       method: 'get'
     },
+    changePassWord: { // 修改密码
+      url: `${baseUrl}${admin}/user/pwd`,
+      method: 'put'
+    },
     getSysuserInfo: { // 获取用户详情
       url: `${baseUrl}${admin}/sysuser/:userId`,
       method: 'get'
     },
-    addUser:{ // 新增用户
+    addUser: { // 新增用户
       url: `${baseUrl}${admin}/sysuser`,
       method: 'post'
     },
-    editUser:{ // 编辑用户
+    editUser: { // 编辑用户
       url: `${baseUrl}${admin}/sysuser`,
       method: 'put'
     },
-    bindProject:{ // 绑定项目
+    BindProject: { // 绑定项目
       url: `${baseUrl}${admin}/sysuser/bind/:userId/:orgId`,
       method: 'put'
+    },
+    UnBindProject: { // 解绑项目
+      url: `${baseUrl}${admin}/sysuser/unbind/:userId`,
+      method: 'put'
+    }
+  },
+  management: {
+    getManagementList: { // 获取项目列表
+      url: `${baseUrl}${admin}/sysorg`,
+      method: 'get'
+    },
+    addManagement: { // 新增项目
+      url: `${baseUrl}${admin}/sysorg`,
+      method: 'post'
+    },
+    deleteManagement: { // 删除项目
+      url: `${baseUrl}${admin}/sysorg/:orgId`,
+      method: 'delete'
+    },
+    authcode: { // 项目授权
+      url: `${baseUrl}${admin}/authcode`,
+      method: 'post'
+    }
+  },
+  reply: {
+    getKeywordList: { // 获取关键词列表
+      url: `${baseUrl}${admin}/autoreply`,
+      method: 'get'
+    },
+    getReplyDetail: { // 获取关键词详情
+      url: `${baseUrl}${admin}/autoreply/:autoreplyId`,
+      method: 'get'
+    },
+    setReply: { // 编辑关键词自动回复
+      url: `${baseUrl}${admin}/autoreply`,
+      method: 'put'
+    },
+    addReply: { // 新增关键词自动回复
+      url: `${baseUrl}${admin}/autoreply`,
+      method: 'post'
+    },
+    deleteReply: { // 删除关键词自动回复
+      url: `${baseUrl}${admin}/autoreply/:autoreplyId`,
+      method: 'delete'
+    },
+    changeIsUse: { // 编辑是否启用
+      url: `${baseUrl}${admin}/autoreply/isUse/:autoType/:isUse`,
+      method: 'put'
     }
   }
 }