mirror of
				https://github.com/YunaiV/ruoyi-vue-pro.git
				synced 2025-10-31 10:37:41 +08:00 
			
		
		
		
	mp:移除 less 使用 scss 适配
This commit is contained in:
		| @ -90,8 +90,6 @@ | |||||||
|     "eslint-plugin-prettier": "^3.1.0", |     "eslint-plugin-prettier": "^3.1.0", | ||||||
|     "eslint-plugin-vue": "9.0.0", |     "eslint-plugin-vue": "9.0.0", | ||||||
|     "fs-extra": "^8.1.0", |     "fs-extra": "^8.1.0", | ||||||
|     "less": "^4.1.3", |  | ||||||
|     "less-loader": "^7.3.0", |  | ||||||
|     "lint-staged": "12.5.0", |     "lint-staged": "12.5.0", | ||||||
|     "runjs": "4.4.2", |     "runjs": "4.4.2", | ||||||
|     "sass": "1.32.13", |     "sass": "1.32.13", | ||||||
|  | |||||||
| @ -40,7 +40,7 @@ SOFTWARE. | |||||||
|       <!--左边配置菜单--> |       <!--左边配置菜单--> | ||||||
|       <div class="left"> |       <div class="left"> | ||||||
|         <div class="weixin-hd"> |         <div class="weixin-hd"> | ||||||
|             <div class="weixin-title">{{menuName}}</div> |             <div class="weixin-title">{{ name }}</div> | ||||||
|         </div> |         </div> | ||||||
|         <div class="weixin-menu menu_main clearfix"> |         <div class="weixin-menu menu_main clearfix"> | ||||||
|           <div class="menu_bottom" v-for="(item, i) of menuList" :key="i" > |           <div class="menu_bottom" v-for="(item, i) of menuList" :key="i" > | ||||||
| @ -75,18 +75,19 @@ SOFTWARE. | |||||||
|               </div> |               </div> | ||||||
|               <div> |               <div> | ||||||
|                   <span>菜单名称:</span> |                   <span>菜单名称:</span> | ||||||
|                   <el-input class="input_width" v-model="tempObj.name" placeholder="请输入菜单名称" :maxlength=nameMaxLength clearable></el-input> |                   <el-input class="input_width" v-model="tempObj.name" placeholder="请输入菜单名称" :maxlength="nameMaxLength" | ||||||
|  |                             clearable /> | ||||||
|               </div> |               </div> | ||||||
|               <div v-if="showConfigureContent"> |               <div v-if="showConfigureContent"> | ||||||
|                   <div class="menu_content"> |                   <div class="menu_content"> | ||||||
|                       <span>菜单内容:</span> |                       <span>菜单内容:</span> | ||||||
|                       <el-select v-model="tempObj.type" clearable placeholder="请选择" class="menu_option"> |                       <el-select v-model="tempObj.type" clearable placeholder="请选择" class="menu_option"> | ||||||
|                           <el-option v-for="item in menuOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> |                           <el-option v-for="item in menuOptions" :label="item.label" :value="item.value" :key="item.value" /> | ||||||
|                       </el-select> |                       </el-select> | ||||||
|                   </div> |                   </div> | ||||||
|                   <div class="configur_content" v-if="tempObj.type === 'view'"> |                   <div class="configur_content" v-if="tempObj.type === 'view'"> | ||||||
|                       <span>跳转链接:</span> |                       <span>跳转链接:</span> | ||||||
|                       <el-input class="input_width"  v-model="tempObj.url" placeholder="请输入链接" clearable></el-input> |                       <el-input class="input_width" v-model="tempObj.url" placeholder="请输入链接" clearable /> | ||||||
|                   </div> |                   </div> | ||||||
|                   <div class="configur_content" v-if="tempObj.type === 'miniprogram'"> |                   <div class="configur_content" v-if="tempObj.type === 'miniprogram'"> | ||||||
|                       <div class="applet"> |                       <div class="applet"> | ||||||
| @ -103,7 +104,7 @@ SOFTWARE. | |||||||
|                       </div> |                       </div> | ||||||
|                       <p class="blue">tips:需要和公众号进行关联才可以把小程序绑定带微信菜单上哟!</p> |                       <p class="blue">tips:需要和公众号进行关联才可以把小程序绑定带微信菜单上哟!</p> | ||||||
|                   </div> |                   </div> | ||||||
|                   <div class="configur_content" v-if="tempObj.type == 'article_view_limited'"> |                   <div class="configur_content" v-if="tempObj.type === 'article_view_limited'"> | ||||||
|                       <el-row> |                       <el-row> | ||||||
|                           <div class="select-item" v-if="tempObj && tempObj.content && tempObj.content.articles"> |                           <div class="select-item" v-if="tempObj && tempObj.content && tempObj.content.articles"> | ||||||
|                               <WxNews :objData="tempObj.content.articles"></WxNews> |                               <WxNews :objData="tempObj.content.articles"></WxNews> | ||||||
| @ -123,7 +124,7 @@ SOFTWARE. | |||||||
|                           </el-dialog> |                           </el-dialog> | ||||||
|                       </el-row> |                       </el-row> | ||||||
|                   </div> |                   </div> | ||||||
|                   <div class="configur_content" v-if="tempObj.type == 'click' || tempObj.type == 'scancode_waitmsg'"> |                   <div class="configur_content" v-if="tempObj.type === 'click' || tempObj.type === 'scancode_waitmsg'"> | ||||||
|                       <WxReplySelect :objData="tempObj" v-if="hackResetWxReplySelect"></WxReplySelect> |                       <WxReplySelect :objData="tempObj" v-if="hackResetWxReplySelect"></WxReplySelect> | ||||||
|                   </div> |                   </div> | ||||||
|               </div> |               </div> | ||||||
| @ -160,6 +161,7 @@ export default { | |||||||
|       showSearch: true, |       showSearch: true, | ||||||
|       // 查询参数 |       // 查询参数 | ||||||
|       accountId: undefined, |       accountId: undefined, | ||||||
|  |       name:'', // 公众号名 | ||||||
|       menuList: { |       menuList: { | ||||||
|         children: [], |         children: [], | ||||||
|       }, |       }, | ||||||
| @ -180,7 +182,6 @@ export default { | |||||||
|       }, |       }, | ||||||
|       visible2: false, //素材内容  "选择素材"按钮弹框显示隐藏 |       visible2: false, //素材内容  "选择素材"按钮弹框显示隐藏 | ||||||
|       tableData:[], //素材内容弹框数据, |       tableData:[], //素材内容弹框数据, | ||||||
|       menuName:'', |  | ||||||
|       menuOptions: [{ |       menuOptions: [{ | ||||||
|         value: 'view', |         value: 'view', | ||||||
|         label: '跳转网页' |         label: '跳转网页' | ||||||
| @ -234,7 +235,7 @@ export default { | |||||||
|     /** 设置账号编号 */ |     /** 设置账号编号 */ | ||||||
|     setAccountId(accountId) { |     setAccountId(accountId) { | ||||||
|       this.accountId = accountId; |       this.accountId = accountId; | ||||||
|       // this.uploadData.accountId = accountId; |       this.name = this.accounts.find(item => item.id === accountId)?.name; | ||||||
|     }, |     }, | ||||||
|     getList() { |     getList() { | ||||||
|       this.loading = false; |       this.loading = false; | ||||||
| @ -296,7 +297,7 @@ export default { | |||||||
|       this.isSubMenuActive = index + "" + k; // 二级菜单选中样式 |       this.isSubMenuActive = index + "" + k; // 二级菜单选中样式 | ||||||
|     }, |     }, | ||||||
|     // 添加横向一级菜单 |     // 添加横向一级菜单 | ||||||
|     addMenu(){ |     addMenu() { | ||||||
|       const menuKeyLength = this.menuList.length; |       const menuKeyLength = this.menuList.length; | ||||||
|       const addButton = { |       const addButton = { | ||||||
|         name: "菜单名称", |         name: "菜单名称", | ||||||
| @ -345,6 +346,7 @@ export default { | |||||||
|         this.isSubMenuActive = -1; |         this.isSubMenuActive = -1; | ||||||
|       }).catch(() => {}); |       }).catch(() => {}); | ||||||
|     }, |     }, | ||||||
|  |     // TODO 切换公众号时,清空;或者清空菜单时,也要清空表单; | ||||||
|  |  | ||||||
|     // ======================== 菜单编辑 ======================== |     // ======================== 菜单编辑 ======================== | ||||||
|     handleSave() { |     handleSave() { | ||||||
| @ -405,7 +407,7 @@ export default { | |||||||
| } | } | ||||||
| </script> | </script> | ||||||
| <!--本组件样式--> | <!--本组件样式--> | ||||||
| <style lang="less" scoped="scoped"> | <style lang="scss" scoped="scoped"> | ||||||
| /* 公共颜色变量 */ | /* 公共颜色变量 */ | ||||||
| .clearfix{*zoom:1;} | .clearfix{*zoom:1;} | ||||||
| .clearfix::after{content: "";display: table; clear: both;} | .clearfix::after{content: "";display: table; clear: both;} | ||||||
| @ -515,7 +517,7 @@ div{ | |||||||
|       } |       } | ||||||
|   } |   } | ||||||
|   /*右边菜单内容*/ |   /*右边菜单内容*/ | ||||||
|   .right{ |   .right { | ||||||
|       float: left; |       float: left; | ||||||
|       width: 63%; |       width: 63%; | ||||||
|       background-color: #e8e7e7; |       background-color: #e8e7e7; | ||||||
| @ -523,21 +525,21 @@ div{ | |||||||
|       margin-left: 20px; |       margin-left: 20px; | ||||||
|       -webkit-box-sizing: border-box; |       -webkit-box-sizing: border-box; | ||||||
|       box-sizing: border-box; |       box-sizing: border-box; | ||||||
|       .configure_page{ |       .configure_page { | ||||||
|           .delete_btn{ |           .delete_btn { | ||||||
|               text-align: right; |               text-align: right; | ||||||
|               margin-bottom: 15px; |               margin-bottom: 15px; | ||||||
|           } |           } | ||||||
|           .menu_content{ |           .menu_content { | ||||||
|               margin-top: 20px; |               margin-top: 20px; | ||||||
|           } |           } | ||||||
|           .configur_content{ |           .configur_content { | ||||||
|               margin-top: 20px; |               margin-top: 20px; | ||||||
|               background-color: #fff; |               background-color: #fff; | ||||||
|               padding: 20px 10px; |               padding: 20px 10px; | ||||||
|               border-radius: 5px |               border-radius: 5px | ||||||
|           } |           } | ||||||
|           .blue{ |           .blue { | ||||||
|               color:#29b6f6; |               color:#29b6f6; | ||||||
|               margin-top: 10px; |               margin-top: 10px; | ||||||
|           } |           } | ||||||
| @ -547,6 +549,9 @@ div{ | |||||||
|                   width: 20%; |                   width: 20%; | ||||||
|               } |               } | ||||||
|           } |           } | ||||||
|  |           .input_width { | ||||||
|  |             width: 40%; | ||||||
|  |           } | ||||||
|           .material{ |           .material{ | ||||||
|               .input_width{ |               .input_width{ | ||||||
|                   width: 30%; |                   width: 30%; | ||||||
| @ -557,17 +562,12 @@ div{ | |||||||
|           } |           } | ||||||
|       } |       } | ||||||
|   } |   } | ||||||
|  |   .el-input { | ||||||
|  |     width: 70%; | ||||||
|  |     margin-right: 2%; | ||||||
|  |   } | ||||||
| } | } | ||||||
| </style> | </style> | ||||||
| <!--修改UI框架样式--> |  | ||||||
| <!--<style lang="less" scoped>--> |  | ||||||
| <!--    .public-account-management{--> |  | ||||||
| <!--        .el-input{--> |  | ||||||
| <!--            width: 70%;--> |  | ||||||
| <!--            margin-right: 2%;--> |  | ||||||
| <!--        }--> |  | ||||||
| <!--    }--> |  | ||||||
| <!--</style>--> |  | ||||||
| <!--素材样式--> | <!--素材样式--> | ||||||
| <style lang="scss" scoped> | <style lang="scss" scoped> | ||||||
| .pagination { | .pagination { | ||||||
|  | |||||||
							
								
								
									
										16992
									
								
								yudao-ui-admin/yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										16992
									
								
								yudao-ui-admin/yarn.lock
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV