ytj

public/index.html

@@ -5,7 +5,6 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <meta name="referrer" content="never">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <link rel="stylesheet" href="//at.alicdn.com/t/font_681879_u55mh75ray8.css">
   <title>千锦荟第三方平台</title>

src/components/material.vue

@@ -64,10 +64,16 @@ export default {
       defaultList: [],
       imgName: '',
       visible: false,
-      uploadList: []
+      uploadList: [],
+      meta: null
     }
   },
   created () {
+    // let meta = document.createElement('meta')
+    // meta.name = 'referrer'
+    // meta.content = 'never'
+    // this.meta = meta
+    // document.getElementsByTagName('head')[0].appendChild(meta)
     if (this.type === 'img') {
       this.getImg({ type: 'image' }).then(() => {
         if (this.model === 'set') {
@@ -171,7 +177,12 @@ export default {
         this.isLoading = false
       })
     }
-  }
+  },
+  // beforeDestroy () {
+  //   if (this.meta) {
+  //     document.getElementsByTagName('head')[0].removeChild(this.meta)
+  //   }
+  // }
 }
 </script>
 

src/components/menuForm.vue

@@ -94,7 +94,7 @@
       <div class="form-item">
         <label for="name">链接&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
         <Input placeholder="链接" v-validate="'url:require_protocol'" size="large" v-model="linkHref" clearable name="link" style="width: 300px"/>
-        <span class="error" v-show="errors.first('link')">请输入正确的url</span>
+        <span class="error" v-show="errors.first('link')">请输入正确的链接</span>
       </div>
     </div>
     <div class="btn-group">
@@ -194,8 +194,8 @@ export default {
       this.closeLink()
     },
     closeLink () {
-      // this.linkText = ''
-      // this.linkHref = ''
+      this.linkText = ''
+      this.linkHref = ''
       this.showLink = false
     },
     handleEmotion (i) {
@@ -307,10 +307,10 @@ export default {
       } else if (this.type === '跳转网页') {
         console.log(111)
         if (this.errors.first('link')) {
-          this.$Message.warning('url格式不正确')
+          this.$Message.warning('链接格式不正确')
           return false
         } else if (!this.linkHref) {
-          this.$Message.warning('url必填')
+          this.$Message.warning('链接必填')
           return false
         } else if (this.linkHref.indexOf('http') <= -1) {
           this.$Message.warning('链接必须附带http协议头')

src/pages/main/menuConfig/menuConfig.vue

@@ -148,11 +148,6 @@ export default {
       }).catch((err) => {
         console.log(err)
       })
-      // this.chooseItem = item
-      // this.chooseTag.type = 1
-      // this.chooseTag.index = index
-      // this.chengeForm(item.sub_button.length > 0 ? false : true, true)
-      // this.mainActive({ index })
     },
     addSubMenuClick (index) {
       this.chengeForm(true, false).then(() => {
@@ -163,11 +158,6 @@ export default {
       }).catch((err) => {
         console.log(err)
       })
-      // this.chooseItem = {}
-      // this.chooseTag.type = 2
-      // this.chooseTag.parentIndex = index
-      // this.chengeForm(true, false)
-      // this.subPlusActive({ index })
     },
     setSubMenuClick (item, index, parentIndex) {
       this.chengeForm(true, true).then(() => {
@@ -179,12 +169,6 @@ export default {
       }).catch((err) => {
         console.log(err)
       })
-      // this.chooseItem = item
-      // this.chooseTag.type = 3
-      // this.chooseTag.index = index
-      // this.chooseTag.parentIndex = parentIndex
-      // this.chengeForm(true, true)
-      // this.subActive({ index, parentIndex })
     },
     delMenu () {
       if (this.chooseTag.type === 1) {
@@ -193,7 +177,7 @@ export default {
         this.setSubMenu(null, this.chooseTag.index, this.chooseTag.parentIndex)
       }
       this.$Message.success('删除成功')
-      this.clear()
+      this.clear({ type: 3 })
       this.formActive = false
     },
     addMainMenu (changeData) {
@@ -229,6 +213,7 @@ export default {
           onOk: () => {
             this.setWechatMenu().then(() => {
               this.$Message.success('发布成功')
+              this.formActive = false
               this.init()
             })
           },
@@ -239,10 +224,15 @@ export default {
       } else {
         this.setWechatMenu().then(() => {
           this.$Message.success('发布成功')
+          this.formActive = false
           this.init()
         })
       }
     }
+  },
+  beforeRouteLeave (to, from, next) {
+    this.Changed(false)
+    next()
   }
 }
 </script>

src/pages/main/reply/editReply.vue

@@ -7,7 +7,7 @@
     <div class="form-item">
       <label for="name">匹配</label>
       <RadioGroup  v-model="type">
-        <Radio label="完全"></Radio>
+        <Radio label="精确"></Radio>
         <Radio label="模糊"></Radio>
       </RadioGroup>
     </div>
@@ -35,7 +35,7 @@ export default {
   data () {
     return {
       name: '',
-      type: '完全',
+      type: '精确',
       value: '',
       showMenu: false,
       menuData: {}
@@ -48,7 +48,7 @@ export default {
     if (this.$route.query.id) {
       this.getReplyDetail({ autoreplyId: this.$route.query.id }).then(() => {
         this.name = this.RuleName
-        this.type = this.PairType === 'blur' ? '模糊' : '完全'
+        this.type = this.PairType === 'blur' ? '模糊' : '精确'
         if (this.MessageType === 'paragraph') {
           this.menuData.type = 'text'
           this.menuData.value = this.MessageParagraph
@@ -77,6 +77,7 @@ export default {
       MessageParagraph: item => item.MessageParagraph,
       MessageType: item => item.MessageType,
       PairType: item => item.PairType,
+      Url: item => item.Url
     })
   },
   methods: {

src/pages/main/user/user.vue

@@ -63,7 +63,9 @@ export default {
         {
           title: '用户类型',
           align: 'center',
-          key: 'UserType'
+          render: (h, params) => {
+            return h('div', {}, params.row.UserType === 'admin' ? '管理员' : '普通用户')
+          }
         },
         {
           title: '绑定项目',
@@ -73,7 +75,6 @@ export default {
         {
           title: '创建时间',
           align: 'center',
-          key: 'CreateDate',
           render: (h, params) => {
             return h('div', {}, this.toolClass.dateFormat(params.row.CreateDate))
           }

src/store/menuConfig.js

@@ -1,6 +1,8 @@
 import ajax from '../util/ajax'
 import api from '../util/api'
 import Vue from 'vue'
+import { Message } from 'iview'
+
 const loop = (data, setTrue) => {
   let returnData = {}
   data.mainPlusActive = false
@@ -64,7 +66,7 @@ export default {
     },
     updateAddMain (state, data) {
       state.menuJson.button.push(data)
-      Vue.set(state.menuJson.button, state.menuJson.button.lenght, data)
+      Vue.set(state.menuJson.button, state.menuJson.button.length - 1, data)
     },
     updateSetMain (state, data) {
       if (data.item) { // data有值时，为修改
@@ -81,6 +83,7 @@ export default {
           sub_button: []
         })
       }
+      console.log(state.menuJson.button)
       state.menuJson.button[data.index].sub_button.push(data.item)
       loop(state.menuJson)
     },
@@ -169,6 +172,8 @@ export default {
         context.commit('updateSubActive', data)
       } else if (data.type === 3) {
         context.commit('updateSubActive', data)
+      } else {
+        context.commit('clearMenu')
       }
     },
     AddMainMenu (context, data) {
@@ -196,65 +201,32 @@ export default {
       context.commit('updateSubPlusActive', data)
     },
     setWechatMenu (context) {
-      let submitData = {
-        menu: {}
-      }
-      submitData.menu = context.state.menuJson
-      delete submitData.menu['mainPlusActive']
-      submitData.menu.button.forEach((currentValue) => {
-        delete currentValue['active']
-        delete currentValue['subPlusActive']
-        if (currentValue.sub_button) {
-          currentValue.sub_button.forEach((curr) => {
-            delete curr['active']
-          })
-        }
-      })
-      let str = JSON.stringify(submitData)
-      // let str = JSON.stringify(
-      //   {
-      //     "menu": {
-      //       "button": [
-      //         {
-      //           "type": "view",
-      //           "name": "业主门禁",
-      //           "url": "https://www.haina.com/m/eed980b4a3b3f8213c21a29f9ca8f407/index",
-      //           "sub_button": []
-      //         },
-      //         {
-      //           "type": "view",
-      //           "name": "物业费",
-      //           "url": "https://www.haina.com/m/eed980b4a3b3f8213c21a29f9ca8f407/cp/agrOkGbiO7vMYOamjd",
-      //           "sub_button": []
-      //         },
-      //         {
-      //           "name": "城的空间",
-      //           "sub_button": [
-      //             {
-      //               "type": "view",
-      //               "name": "C端",
-      //               "url": "http://dev.ycjcjy.com/c/",
-      //               "sub_button": []
-      //             },
-      //             {
-      //               "type": "view",
-      //               "name": "邻里圈",
-      //               "url": "https://www.haina.com/m/eed980b4a3b3f8213c21a29f9ca8f407/cp/agVvBQGsWwDJ5nz3kb",
-      //               "sub_button": []
-      //             },
-      //             {
-      //               "type": "view",
-      //               "name": "另外一个缴费",
-      //               "url": "https://www.haina.com/m/eed980b4a3b3f8213c21a29f9ca8f407/cp/agvBQ95cWlrpa7mOBb",
-      //               "sub_button": []
-      //             }
-      //           ]
-      //         }
-      //       ]
-      //     }
-      //   }
-      // )
       return new Promise((resolve, reject) => {
+        if (context.state.menuJson.button.length <= 0) {
+          Message.warning('您未添加任何菜单,请先添加菜单后再进行发布')
+          reject()
+          return false
+        }
+        let submitData = {
+          menu: {}
+        }
+        submitData.menu = context.state.menuJson
+        delete submitData.menu['mainPlusActive']
+        submitData.menu.button.forEach((currentValue) => {
+          delete currentValue['active']
+          delete currentValue['subPlusActive']
+          if ((currentValue.sub_button || []).length > 0) {
+            delete currentValue['type']
+            delete currentValue['media_id']
+            delete currentValue['url']
+            delete currentValue['value']
+            currentValue.sub_button.forEach((curr) => {
+              delete curr['active']
+            })
+          }
+        })
+        console.log(submitData)
+        let str = JSON.stringify(submitData)
         ajax({
           ...api.wechatMenu.setWechatMenu,
           data: {

src/store/reply.js

@@ -13,6 +13,7 @@ export default {
     MessageParagraph: '',
     MessageType: '',
     PairType: '',
+    Url: '',
     Subscribe: {}
   },
   mutations: {
@@ -26,6 +27,7 @@ export default {
       state.tagList = data || []
     },
     updateDetail (state, data) {
+      console.log(data)
       state.RuleName = data.RuleName
       state.AutoType = data.AutoType
       state.MessageContent = data.MessageContent
@@ -33,6 +35,7 @@ export default {
       state.MessageParagraph = data.MessageParagraph
       state.MessageType = data.MessageType
       state.PairType = data.PairType
+      state.Url = data.Url
       let arr = data.Keywords ? data.Keywords.split(',') : []
       state.tagList = arr
     }
@@ -60,7 +63,7 @@ export default {
           }
         }).then((res) => {
           context.commit('updateSubscribe', res)
-          resolve() 
+          resolve()
         }).catch(reject)
       })
     },

vue.config.js

@@ -6,9 +6,9 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        // target: 'http:///wechatconfig-dev.ycjcjy.com',
+        target: 'http://wechatconfigdev.ycjcjy.com',
         // target: 'http://192.168.0.62:8080', // wf
-        target: 'http://192.168.0.102:8080', // hyq
+        // target: 'http://192.168.0.102:8080', // hyq
         // target: 'http://192.168.0.11', // zys
         // target: 'http://dev.ycjcjy.com', // frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置