修改冲突

2024-10-21 16:55:58 +08:00
parent c6b4e503dc ae11d40951
commit 390f286140
35 changed files with 681 additions and 343 deletions
--- a/commons/style/reset-uni-form.scss
+++ b/commons/style/reset-uni-form.scss
@@ -0,0 +1,6 @@
+::v-deep .uni-easyinput__content-input{
+height: initial;	
+}
+::v-deep .uni-forms-item{
+	min-height: initial;
+}
--- a/commons/utils/hasPermission.js
+++ b/commons/utils/hasPermission.js
@@ -55,12 +55,12 @@ const $PermissionObj = {
 	],
 	vip:[
 		{
-			key: '允许管理会员信息',
-			text: 'yun_xu_guan_li_hui_yuan_xin_xi'
+			text: '允许管理会员信息',
+			key: 'yun_xu_guan_li_hui_yuan_xin_xi'
 		},
 		{
-			key: 'yun_xu_xiu_gai_hui_yuan_yu_e',
-			text: '允许修改会员余额'
+			text: 'yun_xu_xiu_gai_hui_yuan_yu_e',
+			key: '允许修改会员余额'
 		}
 	],
 	stock:[