ytj

src/components/material.vue

@@ -35,6 +35,7 @@
         :with-credentials='true'
         type="drag"
         :action="api.material.addImg.url"
+        name='media'
         class="upload-btn">
         <div>
           <Icon type="ios-camera" size="50"></Icon>
@@ -118,9 +119,14 @@ export default {
     handleSuccess (res, file) {
       console.log(res)
       console.log(file)
-      // this.addImg(file).then(() => {
-
-      // })
+      this.$Message.success('上传成功')
+      this.getImg({ type: 'image' }).then(() => {
+        if (this.model === 'set') {
+          this.$nextTick(() => {
+            this.uploadList = this.img
+          })
+        }
+      })
     },
     handleFormatError (file) {
       this.$Notice.warning({

src/components/menuForm.vue

@@ -170,6 +170,7 @@ export default {
   methods: {
     ...mapMaterialActions(['addImg']),
     checkLink () {
+      console.log(111)
       if (!this.linkText) {
         this.$Message.warning('链接名称必填')
         return false
@@ -181,6 +182,9 @@ export default {
       if (this.errors.first('linkT')) {
         this.$Message.warning('链接格式不正确')
         return false
+      } else if (this.linkHref.indexOf('http') <= -1) {
+        this.$Message.warning('链接必须附带http协议头')
+        return false
       }
       let text = `<a href='${this.linkHref}'>${this.linkText}</a>`
       this.text += text
@@ -292,10 +296,14 @@ export default {
           this.emitData.media_id = this.view.media_id
         }
       } else if (this.type === '跳转网页') {
+        console.log(111)
         if (this.errors.first('link')) {
           this.$Message.warning('url格式不正确')
         } else if (!this.linkHref) {
           this.$Message.warning('url必填')
+        } else if (this.linkHref.indexOf('http') <= -1) {
+          this.$Message.warning('链接必须附带http协议头')
+          return false
         }
         this.emitData.type = 'view'
         this.emitData.url = this.linkHref

src/pages/login/login.vue

@@ -15,7 +15,7 @@
         <span>记住用户名密码</span>
         <input type="checkbox" v-model="Remember">
       </div>
-      <div class="submit" @click="submit()">登陆</div>
+      <Button type="success" class="submit" @click="submit()">登陆</Button>
     </div>
   </div>
 </template>
@@ -80,6 +80,14 @@ export default {
     ...mapLoginActions(['setRemember', 'setUserName', 'setPassWord', 'login']),
     ...mapMainActions(['getUserInfo', 'clearMenu']),
     submit () {
+      if (!this.UserName) {
+        this.$Message.warning('请输入用户名')
+        return
+      }
+      if (!this.PassWord) {
+        this.$Message.warning('请输入密码')
+        return
+      }
       this.login({ UserName: this.UserName, UserPass: this.md5(this.PassWord) }).then(() => {
         if (!this.Remember) {
           this.UserName = ''
@@ -161,11 +169,6 @@ export default {
     .submit {
       width: 200px;
       height: 35px;
-      text-align: center;
-      line-height: 35px;
-      background-color: #00bbbd;
-      color: #fff;
-      border-radius: 12px;
     }
   }
 }

src/pages/main/management/management.vue

@@ -12,7 +12,7 @@
         <Button type="primary" @click="submit">确认</Button>
       </div>
     </Modal>
-    <Modal title="公众平台账号授权" v-model="pop.show" :mask-closable="false">
+    <Modal title="公众平台账号授权" v-model="pop.show">
       <div class="qrcode" v-if="wechatConfig.ConfId">
         <img v-if="wechatConfig.HeadImg" :src="wechatConfig.HeadImg" alt="">
         <img v-else :src="defultHead" alt="">

src/pages/main/menuConfig/menuConfig.vue

@@ -55,7 +55,7 @@ export default {
     }
   },
   created () {
-    this.getWechatMenu()
+    this.init()
   },
   computed: {
     ...mapMenuConfigState({
@@ -68,6 +68,9 @@ export default {
   },
   methods: {
     ...mapMenuConfigActions(['getWechatMenu', 'AddMainMenu', 'SetMainMenu', 'AddSubMenu', 'SetSubMenu', 'mainActive', 'subActive', 'mainPlusActive', 'subPlusActive', 'clear', 'setWechatMenu']),
+    init () {
+      this.getWechatMenu()
+    },
     chengeForm (hasContent, hasDelete) {
       this.formActive = false
       this.hasContent = hasContent
@@ -156,7 +159,10 @@ export default {
       this.SetSubMenu(data)
     },
     submit () {
-      this.setWechatMenu()
+      this.setWechatMenu().then(() => {
+        this.$Message.success('发布成功')
+        this.init()
+      })
     }
   }
 }

src/store/material.js

@@ -24,9 +24,9 @@ export default {
             ...data,
           }
         }).then(res => {
-          // data.forEach((curr) => {
-          //   curr.checked = false
-          // })
+          res.forEach((curr) => {
+            curr.checked = false
+          })
           context.commit('updateImg', res)
           resolve(res)
         }).catch(reject)

src/store/menuConfig.js

@@ -117,7 +117,21 @@ export default {
         }).then((res) => {
           let button = []
           if (res) {
-            button = res.menu.button
+            button = res.menu.menu.button
+            button.forEach((current) => {
+              if (current.type === 'click') {
+                current.type = 'text'
+                current.value = res.keyList.filter(item => item.KeyId === current.key)[0].Value
+              }
+              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
+                  }
+                })
+              }
+            })
           }
           context.commit('updateMenu', loop({ button }))
           resolve()