ytj

src/components/material.vue

@@ -167,6 +167,8 @@ export default {
             })
           }
         })
+      }).catch(() => {
+        this.isLoading = false
       })
     }
   }

src/pages/main/menuConfig/menuConfig.vue

@@ -92,7 +92,7 @@ export default {
           console.log('检查修改')
           this.$Modal.confirm({
             title: '警告',
-            content: `<p style='font-size:18px;'>您已编辑过此菜单，确认放弃编辑？<p>`,
+            content: `<p style='font-size:16px;'>您已编辑过此菜单，确认放弃编辑？<p>`,
             onOk: () => {
               this.formActive = false
               this.hasContent = hasContent
@@ -115,16 +115,19 @@ export default {
     checkForm (data) {
       if (this.chooseTag.type === 0) {
         this.addMainMenu(data)
+        this.clear({ type: 0 })
       } else if (this.chooseTag.type === 1) {
         this.setMainMenu(data, this.chooseTag.index)
+        this.clear({ type: 1, index: this.chooseTag.index })
       } else if (this.chooseTag.type === 2) {
         this.addSubMenu(data, this.chooseTag.parentIndex)
+        this.clear({ type: 2, parentIndex: this.chooseTag.parentIndex })
       } else if (this.chooseTag.type === 3) {
         this.setSubMenu(data, this.chooseTag.index, this.chooseTag.parentIndex)
+        this.clear({ type: 3, index: this.chooseTag.index, parentIndex: this.chooseTag.parentIndex })
       }
       this.Changed(false)
       this.$Message.success('设置成功')
-      this.clear()
       // this.formActive = false
     },
     addMainMenuClick () {
@@ -222,7 +225,7 @@ export default {
       if (this.changed) {
         this.$Modal.confirm({
           title: '警告',
-          content: `<p style='font-size:18px;'>当前编辑的菜单未保存，若确认发布，当前未保存菜单不会生效，是否确认发布？<p>`,
+          content: `<p style='font-size:16px;'>当前编辑的菜单未保存，若确认发布，当前未保存菜单不会生效，是否确认发布？<p>`,
           onOk: () => {
             this.setWechatMenu().then(() => {
               this.$Message.success('发布成功')

src/pages/main/reply/editReply.vue

@@ -54,12 +54,12 @@ export default {
           this.menuData.value = this.MessageParagraph
         } else if (this.MessageType === 'img') {
           this.menuData.type = 'media_id'
-          this.menuData.media_id = ''
-          this.menuData.url = this.MessageImg
+          this.menuData.media_id = this.MessageImg
+          this.menuData.url = this.Url
         } else if (this.MessageType === 'content') {
           this.menuData.type = 'view'
-          this.menuData.media_id = ''
-          this.menuData.url = this.MessageContent
+          this.menuData.media_id = this.MessageContent
+          this.menuData.url = this.Url
         }
         this.showMenu = true
       })

src/pages/main/reply/reply.vue

@@ -47,7 +47,9 @@ export default {
         {
           title: '回复内容',
           align: 'center',
-          key: 'MessageParagraph'
+          render: (h, params) => {
+            return params.row.MessageType === 'paragraph' ? h('span', {}, params.row.MessageParagraph) : h('img', { attrs: { src: params.row.Url }, style: { 'width': '60px', 'padding': '5px' } }, '')
+          }
         },
         {
           title: '匹配',
@@ -104,12 +106,12 @@ export default {
         this.menuData.value = this.Subscribe.MessageParagraph
       } else if (this.Subscribe.MessageType === 'img') {
         this.menuData.type = 'media_id'
-        this.menuData.media_id = ''
-        this.menuData.url = this.Subscribe.MessageImg
+        this.menuData.media_id = this.Subscribe.MessageImg
+        this.menuData.url = this.Subscribe.Url
       } else if (this.Subscribe.MessageType === 'content') {
         this.menuData.type = 'view'
-        this.menuData.media_id = ''
-        this.menuData.url = this.Subscribe.MessageContent
+        this.menuData.media_id = this.Subscribe.MessageContent
+        this.menuData.url = this.Subscribe.MessageImg
       }
       this.showMenu = true
     })

src/store/menuConfig.js

@@ -158,8 +158,18 @@ export default {
         }).catch(reject)
       })
     },
-    clear (context) {
-      context.commit('clearMenu')
+    clear (context, data) {
+      if (data.type === 0) {
+        data.index = context.state.menuJson.button.length - 1
+        context.commit('updateMainActive', data)
+      } else if (data.type === 1) {
+        context.commit('updateMainActive', data)
+      } else if (data.type === 2) {
+        data.index = context.state.menuJson.button[data.parentIndex].sub_button.length - 1
+        context.commit('updateSubActive', data)
+      } else if (data.type === 3) {
+        context.commit('updateSubActive', data)
+      }
     },
     AddMainMenu (context, data) {
       context.commit('updateAddMain', data)

src/store/reply.js

@@ -60,7 +60,7 @@ export default {
           }
         }).then((res) => {
           context.commit('updateSubscribe', res)
-          resolve()
+          resolve() 
         }).catch(reject)
       })
     },

vue.config.js

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