diff --git a/app/admin/view/default/lib/module/user.html b/app/admin/view/default/lib/module/user.html
index e30d5b936..85b80a765 100644
--- a/app/admin/view/default/lib/module/user.html
+++ b/app/admin/view/default/lib/module/user.html
@@ -4,19 +4,19 @@
{{$module_data.user.user_name_view}}
{{if !empty($module_data['user']['username'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['number_code'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['mobile'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['email'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['gender_text'])}}
-
+
{{/if}}
diff --git a/app/index/view/default/lib/module/user.html b/app/index/view/default/lib/module/user.html
index e30d5b936..85b80a765 100644
--- a/app/index/view/default/lib/module/user.html
+++ b/app/index/view/default/lib/module/user.html
@@ -4,19 +4,19 @@
{{$module_data.user.user_name_view}}
{{if !empty($module_data['user']['username'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['number_code'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['mobile'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['email'])}}
-
+
{{/if}}
{{if !empty($module_data['user']['gender_text'])}}
-
+
{{/if}}
diff --git a/app/lang/en.php b/app/lang/en.php
index 89dbc3835..3de5163a5 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -39,6 +39,8 @@ return [
'goods_id_empty_tips' => 'Item ID data',
'input_empty_tips' => 'Please enter data',
'store_enabled_tips' => 'Your browser does not support local storage. Please disable Private Mode or upgrade to a modern browser.',
+ 'copy_fail' => 'Copy Failed',
+ 'copy_success' => 'Copy Succeeded',
// 上传下载
'get_loading_tips' => 'Getting...',
'download_loading_tips' => 'Downloading...',
@@ -2312,7 +2314,8 @@ return [
// 分页
'page' => [
'each_page_name' => 'Each Page',
- 'page_unit' => 'Strip',
+ 'page_strip' => 'Strip',
+ 'page_unit' => 'Page',
'jump_to_text' => 'Jump to',
'data_total' => 'Total {:total} Data',
'page_total' => 'Total {:total} Page',
diff --git a/app/lang/zh.php b/app/lang/zh.php
index e02c26201..826efe2b0 100755
--- a/app/lang/zh.php
+++ b/app/lang/zh.php
@@ -39,6 +39,8 @@ return [
'goods_id_empty_tips' => '商品ID数据',
'input_empty_tips' => '请输入数据',
'store_enabled_tips' => '您的浏览器不支持本地存储。请禁用“专用模式”，或升级到现代浏览器。',
+ 'copy_fail' => '复制失败',
+ 'copy_success' => '复制成功',
// 上传下载
'get_loading_tips' => '正在获取中...',
'download_loading_tips' => '正在下载中...',
@@ -2319,7 +2321,8 @@ return [
// 分页
'page' => [
'each_page_name' => '每页',
- 'page_unit' => '条',
+ 'page_strip' => '条',
+ 'page_unit' => '页',
'jump_to_text' => '跳转到',
'data_total' => '共 {:total} 条数据',
'page_total' => '共 {:total} 页',
diff --git a/extend/base/Page.php b/extend/base/Page.php
index 91172c4bd..69e8c0c72 100755
--- a/extend/base/Page.php
+++ b/extend/base/Page.php
@@ -144,7 +144,7 @@ class Page
$this->html .= ''.MyLang('common_extend.base.page.each_page_name').'';
$this->html .= '';
- $this->html .= ''.MyLang('common_extend.base.page.page_unit').'';
+ $this->html .= ''.MyLang('common_extend.base.page.page_strip').'';
$this->html .= ''.MyLang('common_extend.base.page.jump_to_text').'';
$this->html .= '';
diff --git a/public/static/admin/default/css/index.index.css b/public/static/admin/default/css/index.index.css
index ebba64c56..34f6e39f0 100644
--- a/public/static/admin/default/css/index.index.css
+++ b/public/static/admin/default/css/index.index.css
@@ -153,6 +153,12 @@
background: transparent;
display: none;
}
+.window-layer-resize-bar {
+ display: none;
+}
+.window-layer-alone-layer .window-layer-resize-bar {
+ display: block;
+}
.window-layer-resize-bar>[class^=window-layer-resize-item-] {
position: absolute;
z-index: 3;
diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js
index 4f32f167d..580782ccc 100755
--- a/public/static/admin/default/js/index.js
+++ b/public/static/admin/default/js/index.js
@@ -409,7 +409,7 @@ $(function()
});
// 弹窗拖拽
- $(document).on('mousedown', '.window-layer-tab-bar', function(pe)
+ $(document).on('mousedown', '.window-layer-alone-layer .window-layer-tab-bar', function(pe)
{
var is_move = true;
var $content = $('#ifcontent');
@@ -481,7 +481,7 @@ $(function()
});
// 独立窗口拉动大小
- $(document).on('mousedown', '.window-layer-resize-bar div[class^="window-layer-resize-item-"]', function(pe)
+ $(document).on('mousedown', '.window-layer-alone-layer .window-layer-resize-bar div[class^="window-layer-resize-item-"]', function(pe)
{
var is_move = true;
var $content = $('#ifcontent');
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 6d71ce0e0..3d09f1498 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -20,7 +20,7 @@ html input[disabled] { cursor: default !important; color: #b1b1b1 !important; ba
/* 没数据 */
.table-no {
text-align: center;
- padding: 115px 0;
+ padding: 20px 0;
background: #FFF;
color: #b9b7b7;
}
@@ -1171,6 +1171,9 @@ button.colorpicker-submit img {
.am-table-scrollable-horizontal ul.user-base li:first-child {
margin-bottom: 7px;
}
+.am-table-scrollable-horizontal .table-no {
+ padding: 110px 0px;
+}
/**
* 表格-操作栏更多操作列表样式
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 9a4d9b650..c6466b351 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -4667,4 +4667,21 @@ $(function()
// 关闭弹窗
$(this).parents('.am-modal-dialog').find('.am-modal-hd .am-close').trigger('click');
});
+
+ // 文本信息复制
+ var text_copy_clipboard = new ClipboardJS('.text-copy-submit',
+ {
+ text: function(e)
+ {
+ return $(e).data('value');
+ }
+ });
+ text_copy_clipboard.on('success', function(e)
+ {
+ Prompt(window['lang_copy_success'] || '复制成功', 'success');
+ });
+ text_copy_clipboard.on('error', function(e)
+ {
+ Prompt(window['lang_copy_fail'] || '复制失败');
+ });
});
\ No newline at end of file