Merge branch 'master-prod-500-lushangqing' into 'master-500-prod'

【596】登录logo 支持配置-功能迁移



See merge request !677

@@ -29,7 +29,7 @@
     margin-left:6px;
     width:200px;
 }
-.upload-demo-logoConfig{
+.upload-demo{
     margin-left:20px;
     width:93px;
 }

@@ -143,12 +143,6 @@ const routes = [{
 		name: 'logoConfig',
 		component: () => myImport('views/logoConfig/index')
 	},
-	//忙时配置
-	{
-		path: '/vue3/busyConfig',
-		name: 'busyConfig',
-		component: () => myImport('views/busyConfig/index')
-	},
 ];
 
 // hash模式： createWebHashHistory

@@ -25,7 +25,7 @@
                                         </dev>
                                     </template>
                                     <el-upload
-                                            class="upload-demo-logoConfig"
+                                            class="upload-demo"
                                             :show-file-list="false"
                                             :before-upload="beforeAvatarUpload"
                                             :data="item.imageUrl"
@@ -57,7 +57,7 @@
                                         </dev>
                                     </template>
                                     <el-upload
-                                            class="upload-demo-logoConfig"
+                                            class="upload-demo"
                                             :show-file-list="false"
                                             :before-upload="beforeAvatarUpload"
                                             :data="item.imageUrlBg"
@@ -88,7 +88,7 @@
                                         </dev>
                                     </template>
                                     <el-upload
-                                            class="upload-demo-logoConfig"
+                                            class="upload-demo"
                                             :show-file-list="false"
                                             :before-upload="beforeAvatarUpload"
                                             :data="item.imageUrlSkin"
@@ -119,7 +119,7 @@
                                         </dev>
                                     </template>
                                     <el-upload
-                                            class="upload-demo-logoConfig"
+                                            class="upload-demo"
                                             :show-file-list="false"
                                             :before-upload="beforeAvatarUpload"
                                             :data="item.imageUrlIndex"

@@ -282,8 +282,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     rowTail = '</div>';
                 }
                if(v.ddicCode=="userLayout"){
-                    var selectOption='    <option value="layout">简约布局</option>'+
-                        '   <option value="layout-nx">经典布局</option>';
+                    var selectOption='    <option value="layout">默认布局</option>'+
+                        '   <option value="layout-nx">layout-nx</option>';
 
                     str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
                         '    <option value="" style="display:none;"></option>'+ selectOption +

@@ -238,12 +238,6 @@ const routes = [{
 		name: 'logoConfig',
 		component: () => myImport('views/logoConfig/index')
 	},
-	//忙时配置
-	{
-		path: '/vue3/busyConfig',
-		name: 'busyConfig',
-		component: () => myImport('views/busyConfig/index')
-	},
 ];
 
 // hash模式： createWebHashHistory