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

新增用户时，用户的扩展信息中，登录皮肤和首页布局更改为下拉选择框



See merge request !508

@@ -306,7 +306,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         '    <option value="" style="display:none;"></option>'+ selectOption +
                         '    <option value="" style="display:none;"></option>'+ selectOption +
                         '</select>';
                         '</select>';
                 }else{
                 }else{
-                    str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">'
+                    if(v.ddicCode=="loginSkin"){
+                        var selectOption='    <option value="default">默认布局</option>'+
+                            '   <option value="skin1">skin1</option>'+
+                            '   <option value="skin2">skin2</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 +
+                            '</select>';
+                    }else if(v.ddicCode=="userLayout"){
+                        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 +
+                            '</select>';
+                    }else{
+                        str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">'
+
+                    }
                 }
                 }
                 var property = '        <div class="layui-inline ">' +
                 var property = '        <div class="layui-inline ">' +
                     '            <label class="layui-form-label">' + v.ddicName + '</label>' +
                     '            <label class="layui-form-label">' + v.ddicName + '</label>' +