Merge branch 'layui:main' into main

src/modules/layer.js

@@ -1202,7 +1202,7 @@ var cache = layer.cache||{}, skin = function(type){
  
 //仿系统prompt
 layer.prompt = function(options, yes){
-  var style = '';
+  var style = '', placeholder = '';
   options = options || {};
   
   if(typeof options === 'function') yes = options;
@@ -1212,8 +1212,11 @@ layer.prompt = function(options, yes){
     style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"';
     delete options.area;
   }
-  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style +'></textarea>' : function(){
+  if (options.placeholder) {
-    return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input">';
+    placeholder = ' placeholder="' + options.placeholder + '"';
+  }
+  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style + placeholder + '></textarea>' : function () {
+    return '<input type="' + (options.formType == 1 ? 'password' : 'text') + '" class="layui-layer-input"' + placeholder + '>';
   }();
   
   var success = options.success;