| 
					
				 | 
			
			
				@@ -1,10 +1,12 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   <div class="app-container"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <el-tabs v-model="activeName" @tab-click="handleClick"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div class="main-search-box"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-tabs v-model="activeName" @tab-click="handleClick"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-tab-pane label="PC端" name="1"></el-tab-pane> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-tab-pane label="移动端" name="0"></el-tab-pane> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-tabs> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <el-form 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-form 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       :model="queryParams" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ref="queryForm" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       size="small" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -46,7 +48,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-form-item> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <el-row :gutter="10" class="mb8"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-col :span="1.5"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-button 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -80,7 +82,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-col :span="1.5"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-button 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           type="primary" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          plain 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+           
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           icon="el-icon-sort" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           size="mini" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           @click="toggleExpandAll" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -92,6 +94,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         @queryTable="getList" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ></right-toolbar> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <el-table 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       v-if="refreshTable" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -112,7 +117,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         prop="platformType" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         label="平台类型" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :show-overflow-tooltip="true" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        width="80" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        width="120" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot-scope="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <dict-tag 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -121,14 +126,31 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column prop="icon" v-if="activeName==1" label="图标" align="center" width="100"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        prop="icon" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        v-if="activeName == 1" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        label="图标" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        align="center" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        width="100" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot-scope="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <svg-icon v-if="scope.row.icon" :icon-class="scope.row.icon" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column prop="icon" v-if="activeName==0" label="图标" align="center" width="100"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        prop="icon" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        v-if="activeName == 0" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        label="图标" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        align="center" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        width="100" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot-scope="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <img v-if="scope.row.icon != '#'" style="width: 20px;height: 20px;" :src="scope.row.icon" alt=""> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <img 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            v-if="scope.row.icon != '#'" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            style="width: 20px; height: 20px" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            :src="scope.row.icon" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            alt="" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -161,7 +183,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         label="操作" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        align="center" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        align="left" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         class-name="small-padding fixed-width" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot-scope="scope"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -262,8 +284,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 </el-input> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </el-popover> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<!--                <imgUpload type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <base-image v-else v-model="form.icon" ></base-image> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <!--                <imgUpload type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <base-image v-else v-model="form.icon"></base-image> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-col :span="12"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -442,11 +464,11 @@ import Treeselect from "@riophae/vue-treeselect"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import "@riophae/vue-treeselect/dist/vue-treeselect.css"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import IconSelect from "@/components/IconSelect"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import imgUpload from "@/components/ImageUpload/index.vue"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import  BaseImage from "@/components/BaseImage" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import BaseImage from "@/components/BaseImage"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: "Menu", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   dicts: ["sys_show_hide", "sys_normal_disable", "sys_platform_type"], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { Treeselect, IconSelect, imgUpload,BaseImage }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { Treeselect, IconSelect, imgUpload, BaseImage }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // platformType 平台类型 0APP 1PC 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -497,8 +519,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   methods: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //上传成功回调 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    inputHandler(list){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.form.icon=list 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    inputHandler(list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.form.icon = list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //切换tab栏刷新数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleClick() { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -536,7 +558,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.menuOptions = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         const menu = { id: 0, menuName: "主类目", children: [] }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         menu.children = this.handleTree(response.data, "id"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        console.log(menu,'menu') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        console.log(menu, "menu"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.menuOptions.push(menu); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -640,8 +662,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <style lang="scss" scoped> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  .el-upload-dragger{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    width: 100%; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    height: 100%; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+.el-upload-dragger { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  width: 100%; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  height: 100%; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </style> 
			 |