ytj

src/components/material.vue

@@ -38,7 +38,7 @@
         name='media'
         class="upload-btn">
         <div>
-          <Icon type="ios-camera" size="50"></Icon>
+          <Icon type="md-images" size="50"/>
         </div>
       </Upload>
       <Modal title="查看大图" v-model="visible">

src/pages/main/main.vue

@@ -66,13 +66,14 @@ export default {
   },
   created () {
     this.getMainMenu()
-    this.getUserInfo()
-    this.checkBind().then(() => {
-      if (this.isBind) {
-        this.showPage = true
-      } else {
-        this.$Message.warning('请先通知管理员绑定项目，再进行微信配置')
-      }
+    this.getUserInfo().then(() => {
+      this.checkBind().then(() => {
+        if (this.isBind || this.userInfo.UserType === 'admin') {
+          this.showPage = true
+        } else {
+          this.$Message.warning('请先通知管理员绑定项目，再进行微信配置')
+        }
+      })
     })
   },
   components: {

src/pages/main/reply/editReply.vue

@@ -106,6 +106,7 @@ export default {
     checkForm (data) {
       let formData = {}
       formData.RuleName = this.name
+      formData.IsUse = this.$route.query.state ? 'on' : 'off'
       formData.PairType = this.type === '模糊' ? 'blur' : 'acu'
       formData.Keywords = this.tagList.join()
       formData.AutoType = 'keyword'

src/pages/main/reply/reply.vue

@@ -71,7 +71,7 @@ export default {
                   'margin-right': '20px'
                 },
                 on: {
-                  click: () => { this.$router.push({ name: 'editReply', query: { id: params.row.AutoReplyId } }) }
+                  click: () => { this.$router.push({ name: 'editReply', query: { id: params.row.AutoReplyId,state: this.keywordSwitch } }) }
                 },
               }, '编辑'),
               h('Button', {
@@ -140,6 +140,7 @@ export default {
     checkForm (data) {
       let formData = {}
       formData.AutoType = 'subscribe'
+      formData.IsUse = this.attentionSwitch ? 'on' : 'off'
       if (data.type === 'text') {
         formData.MessageType = 'paragraph'
         formData.MessageParagraph = data.value
@@ -185,7 +186,7 @@ export default {
       })
     },
     edit () {
-      this.$router.push({ name: 'editReply' })
+      this.$router.push({ name: 'editReply', query: { state: this.keywordSwitch } })
     }
   }
 }

src/pages/main/user/editUser.vue

@@ -28,7 +28,7 @@
         :action="api.common.image.url"
         style="display: inline-block;width:58px;">
         <div style="width: 58px;height:58px;line-height: 58px;">
-          <Icon type="ios-camera" size="20"></Icon>
+          <Icon type="md-images" />
         </div>
       </Upload>
       <Modal title="查看大图" v-model="visible">

src/store/menuConfig.js

@@ -122,12 +122,16 @@ export default {
               if (current.type === 'click') {
                 current.type = 'text'
                 current.value = res.keyList.filter(item => item.KeyId === current.key)[0].Value
+              } else if (current.type === 'media_id') {
+                current.url = res.imgList.filter(item => item.MediaId === current.media_id)[0].Url
               }
               if (current.sub_button) {
                 current.sub_button.forEach((curr) => {
                   if (curr.type === 'click') {
                     curr.type = 'text'
                     curr.value = res.keyList.filter(item => item.KeyId === curr.key)[0].Value
+                  } else if (curr.type === 'media_id') {
+                    curr.url = res.imgList.filter(item => item.MediaId === curr.media_id)[0].Url
                   }
                 })
               }