ytj

src/components/material.vue

@@ -6,12 +6,12 @@
     <Button type="error" @click="reflsh">同步素材库</Button>
     <div class="box" v-if="model === 'get'">
       <div v-if="type === 'img'">
-        <div  v-for="(item,index) in img" :key="index" @click="emit(item,index)" :class="{checked:item.checked}">
+        <div  v-for="(item,index) in img" :key="index" @click="emit(item,index)" @dblclick="dbemit(item,index)" :class="{checked:item.checked}">
           <img :src="item.url" alt="">
         </div>
       </div>
       <div v-if="type === 'view'">
-        <div v-for="(item,index) in view" :key="index" @click="emit(item,index)" :class="{checked:item.checked}">
+        <div v-for="(item,index) in view" :key="index" @click="emit(item,index)" @dblclick="dbemit(item,index)" :class="{checked:item.checked}">
           <img :src="item.url" alt="">
           <p>{{item.text}}</p>
         </div>
@@ -69,11 +69,6 @@ export default {
     }
   },
   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') {
@@ -112,6 +107,24 @@ export default {
       }
       this.$emit('emit', item)
     },
+    dbemit (item, index) {
+      if (this.type === 'img') {
+        this.img.forEach((curr, ind) => {
+          curr.checked = false
+          if (index === ind) {
+            curr.checked = true
+          }
+        })
+      } else {
+        this.view.forEach((curr, ind) => {
+          curr.checked = false
+          if (index === ind) {
+            curr.checked = true
+          }
+        })
+      }
+      this.$emit('dbemit', item)
+    },
     handleView (url) {
       this.imgName = url
       this.visible = true
@@ -177,12 +190,7 @@ export default {
         this.isLoading = false
       })
     }
-  },
-  // beforeDestroy () {
-  //   if (this.meta) {
-  //     document.getElementsByTagName('head')[0].removeChild(this.meta)
-  //   }
-  // }
+  }
 }
 </script>
 

src/components/menuForm.vue

@@ -2,8 +2,10 @@
   <div class="box">
     <div class="form-item" v-if="menuConfig">
       <label for="name">菜单名称</label>
-      <Input placeholder="字数不超过4个汉字或8个字母" size="large" v-model="menuTitle" clearable @input="toolClass.CutStr(menuTitle, 8, '字数不超过4个汉字或8个字母')" name="name" style="width: 300px"/>
-      <span class="error">{{toolClass.CutStr(menuTitle, 8, '字数不超过4个汉字或8个字母')}}</span>
+      <Input v-if="!isSub" placeholder="字数不超过4个汉字或8个字母" size="large" v-model="menuTitle" clearable @input="toolClass.CutStr(menuTitle, 8, '字数不超过4个汉字或8个字母')" name="name" style="width: 300px"/>
+      <span v-if="!isSub" class="error">{{toolClass.CutStr(menuTitle, 8, '字数不超过4个汉字或8个字母')}}</span>
+      <Input v-if="isSub" placeholder="字数不超过8个汉字或16个字母" size="large" v-model="menuTitle" clearable @input="toolClass.CutStr(menuTitle, 8, '字数不超过8个汉字或16个字母')" name="name" style="width: 300px"/>
+      <span v-if="isSub" class="error">{{toolClass.CutStr(menuTitle, 16, '字数不超过8个汉字或16个字母')}}</span>
     </div>
     <div class="form-item" v-if="hasContent"  v-show="!noRadio">
       <label for="name">菜单内容</label>
@@ -69,7 +71,7 @@
             </Upload>
           </div>
           <Modal width='800' v-model="showMaterial" @on-ok="checkImg" @on-cancel="closeImg">
-            <material v-if="showMaterial" :type='materialType' :model='model' @emit='setImg'></material>
+            <material v-if="showMaterial" :type='materialType' :model='model' @emit='setImg' @dbemit='dbsetImg'></material>
           </Modal>
           <div class="img-view">
             <img v-if="img.url" :src="img.url">
@@ -113,7 +115,7 @@ import { createNamespacedHelpers } from 'vuex'
 const { mapActions: mapMaterialActions } = createNamespacedHelpers('material')
 const { mapActions: mapMenuConfigActions } = createNamespacedHelpers('menuConfig')
 export default {
-  props: ['data', 'menuConfig', 'hasContent', 'hasDelete', 'noRadio', 'hasCancel', 'needCheckDestroy'],
+  props: ['data', 'menuConfig', 'hasContent', 'hasDelete', 'noRadio', 'hasCancel', 'needCheckDestroy', 'isSub'],
   data () {
     return {
       active: '文字',
@@ -173,7 +175,6 @@ export default {
     ...mapMaterialActions(['addImg']),
     ...mapMenuConfigActions(['Changed']),
     checkLink () {
-      console.log(111)
       if (!this.linkText) {
         this.$Message.warning('链接名称必填')
         return false
@@ -214,6 +215,11 @@ export default {
       this.imghc = img
       this.imghc.url = this.imghc.Url
     },
+    dbsetImg (img) {
+      this.imghc = img
+      this.imghc.url = this.imghc.Url
+      this.checkImg()
+    },
     checkImg () {
       this.img = this.imghc
       this.closeImg()
@@ -255,6 +261,10 @@ export default {
     setView (view) {
       this.viewhc = view
     },
+    dbsetView (view) {
+      this.viewhc = view
+      this.checkView()
+    },
     checkView () {
       this.view = this.viewhc
       this.closeView()
@@ -274,9 +284,16 @@ export default {
         if (!this.menuTitle) {
           this.$Message.warning('菜单名称必填')
           return false
-        } else if (this.toolClass.CutStr(this.menuTitle, 8, '字数不超过4个汉字或8个字母')) {
-          this.$Message.warning('菜单名称超过4个汉字或8个字母')
-          return false
+        } else if (!this.isSub) {
+          if (this.toolClass.CutStr(this.menuTitle, 8, '字数不超过4个汉字或8个字母')) {
+            this.$Message.warning('一级菜单名称超过4个汉字或8个字母')
+            return false
+          }
+        } else if (this.isSub) {
+          if (this.toolClass.CutStr(this.menuTitle, 16, '字数不超过8个汉字或16个字母')) {
+            this.$Message.warning('二级菜单名称超过8个汉字或16个字母')
+            return false
+          }
         }
         this.emitData.name = this.menuTitle
       }
@@ -289,7 +306,6 @@ export default {
           this.emitData.type = 'text'
           this.emitData.value = this.text
         } else if (this.active === '图片') {
-          console.log(this.img)
           if (!this.img.media_id) {
             this.$Message.warning('请选择素材')
             return false
@@ -305,7 +321,6 @@ 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('链接格式不正确')
           return false
@@ -336,7 +351,6 @@ export default {
   },
   beforeUpdate () {
     if (this.needCheckDestroy) {
-      console.log('check')
       if (this.data) {
         if (this.menuConfig) {
           if (this.menuTitle !== this.data.name) {

src/components/subMenu.vue

@@ -24,13 +24,14 @@ export default {
 
 <style lang="scss" scoped>
 .menu-item {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 8px 0;
+  padding: 8px 2px;
   border-top: 1px solid #ccc;
   border-left: 1px solid #ccc;
   border-right: 1px solid #ccc;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   &:hover {
     cursor: pointer;
   }

src/pages/main/menuConfig/menuConfig.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div class="loading" v-if="isLoading">
+      <img width='80px' :src="loading" alt="">
+    </div>
     <div class="content">
       <div class='phone'>
         <div class='phone-head'>
@@ -25,7 +28,7 @@
       <div class="content-item">
         <transition name="fade">
           <div v-if="formActive" class="boxshadow">
-            <menuForm :data='chooseItem' :menuConfig='true' :hasContent='hasContent' :hasDelete='hasDelete' :needCheckDestroy='true' @emit='checkForm' @delMenu='delMenu'></menuForm>
+            <menuForm :data='chooseItem' :menuConfig='true' :hasContent='hasContent' :hasDelete='hasDelete' :needCheckDestroy='true' :isSub='(chooseTag.type === 2 || chooseTag.type === 3) ? true : false' @emit='checkForm' @delMenu='delMenu'></menuForm>
           </div>
         </transition>
       </div>
@@ -37,6 +40,7 @@
 </template>
 
 <script>
+import loading from '@/assets/loading.gif'
 import defultImg from '@/assets/bottomMsg.png'
 import bottomMenu from '@/components/bottomMenu.vue'
 import menuForm from '@/components/menuForm.vue'
@@ -45,6 +49,8 @@ const { mapState: mapMenuConfigState, mapActions: mapMenuConfigActions } = creat
 export default {
   data () {
     return {
+      loading,
+      isLoading: false,
       defultImg,
       chooseItem: {},
       chooseTag: {
@@ -211,10 +217,15 @@ export default {
           title: '警告',
           content: `<p style='font-size:16px;'>当前编辑的菜单未保存，若确认发布，当前未保存菜单不会生效，是否确认发布？<p>`,
           onOk: () => {
+            this.isLoading = true
             this.setWechatMenu().then(() => {
               this.$Message.success('发布成功')
               this.formActive = false
               this.init()
+              this.Changed(false)
+              this.isLoading = false
+            }).catch(() => {
+              this.isLoading = false
             })
           },
           onCancel: () => {
@@ -222,10 +233,15 @@ export default {
           }
         })
       } else {
+        this.isLoading = true
         this.setWechatMenu().then(() => {
           this.$Message.success('发布成功')
           this.formActive = false
           this.init()
+          this.Changed(false)
+          this.isLoading = false
+        }).catch(() => {
+          this.isLoading = false
         })
       }
     }
@@ -238,6 +254,18 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.loading {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 2;
+  background: rgba(0, 0, 0, 0.2);
+}
 .content {
   display: flex;
   .content-item {

src/router/index.js

@@ -42,6 +42,33 @@ router.beforeEach((to, from, next) => {
   if (to.name !== 'login' && !store.state.main.isBind) {
     // Message.warning('请先通知管理员绑定项目，再进行微信配置')
   }
+  if (to.name === 'management') {
+    if (store.state.main.meta) {
+      document.getElementsByTagName('head')[0].children.referrer.content = 'default'
+      store.state.main.meta.content = 'default'
+    } else {
+      let meta = document.createElement('meta')
+      meta.name = 'referrer'
+      meta.content = 'default'
+      document.getElementsByTagName('head')[0].appendChild(meta)
+      store.state.main.meta = meta
+    }
+  } else {
+    if (store.state.main.meta) {
+      document.getElementsByTagName('head')[0].children.referrer.content = 'never'
+    } else {
+      let meta = document.createElement('meta')
+      meta.name = 'referrer'
+      meta.content = 'never'
+      document.getElementsByTagName('head')[0].appendChild(meta)
+      store.state.main.meta = meta
+    }
+
+    // let meta = document.createElement('meta')
+    // meta.name = 'referrer'
+    // meta.content = 'never'
+    // store.state.main.meta = meta
+  }
   next()
 })
 

src/store/main.js

@@ -6,7 +6,8 @@ export default {
   state: {
     menuData: [],
     userInfo: {},
-    isBind: false
+    isBind: false,
+    meta: null
   },
   mutations: {
     updateMenu (state, data) {
@@ -18,6 +19,9 @@ export default {
     updateIsBind (state, data) {
       state.isBind = data
     },
+    updateMeta (state, data) {
+      state.meta = data
+    }
   },
   actions: {
     login (context, data) {
@@ -92,5 +96,9 @@ export default {
         }).catch(reject)
       })
     },
+    setMeta (context, data) {
+      context.commit('updateMeta', data)
+
+    }
   }
 }

src/store/material.js

@@ -104,11 +104,14 @@ export default {
         }).catch(reject)
       })
     },
-    reflshImg (context) {
+    reflshImg (context, data) {
       console.log(context)
       return new Promise((resolve, reject) => {
         ajax({
-          ...api.material.reflshImg
+          ...api.material.reflshImg,
+          urlData: {
+            ...data
+          }
         }).then(() => {
           resolve()
         }).catch(reject)

src/store/menuConfig.js

@@ -1,7 +1,7 @@
 import ajax from '../util/ajax'
 import api from '../util/api'
 import Vue from 'vue'
-import { Message } from 'iview'
+// import { Message } from 'iview'
 
 const loop = (data, setTrue) => {
   let returnData = {}
@@ -202,11 +202,11 @@ export default {
     },
     setWechatMenu (context) {
       return new Promise((resolve, reject) => {
-        if (context.state.menuJson.button.length <= 0) {
-          Message.warning('您未添加任何菜单,请先添加菜单后再进行发布')
-          reject()
-          return false
-        }
+        // if (context.state.menuJson.button.length <= 0) {
+        //   Message.warning('您未添加任何菜单,请先添加菜单后再进行发布')
+        //   reject()
+        //   return false
+        // }
         let submitData = {
           menu: {}
         }