diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index aa4b74034..f2f828693 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -752,13 +752,6 @@ class NavigationService 'is_show' => 1, 'icon' => 'am-icon-bell-o', ], - [ - 'name' => '我的积分', - 'url' => MyUrl('index/userintegral/index'), - 'contains' => ['userintegralindex'], - 'is_show' => 1, - 'icon' => 'am-icon-fire', - ], [ 'name' => '我的足迹', 'url' => MyUrl('index/usergoodsbrowse/index'), @@ -775,6 +768,20 @@ class NavigationService ], ] ], + [ + 'name' => '财产中心', + 'is_show' => 1, + 'icon' => 'am-icon-trophy', + 'item' => [ + [ + 'name' => '我的积分', + 'url' => MyUrl('index/userintegral/index'), + 'contains' => ['userintegralindex'], + 'is_show' => 1, + 'icon' => 'am-icon-fire', + ], + ] + ], [ 'name' => '安全退出', 'url' => MyUrl('index/user/logout'), diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 7c3047362..15136c58d 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -77,9 +77,6 @@ iframe { width: 100%; height: 100%; border: 0; } */ @media only screen and (min-width: 641px) { /* 表单 */ - form.am-form { - overflow: hidden; - } form.am-form .am-form-group:hover, .plug-file-upload-view:hover { background: #f6f9fc; } diff --git a/public/static/common/lib/ueditor/dialogs/anchor/anchor.html b/public/static/common/lib/ueditor/dialogs/anchor/anchor.html index f277847a4..92a8cc654 100755 --- a/public/static/common/lib/ueditor/dialogs/anchor/anchor.html +++ b/public/static/common/lib/ueditor/dialogs/anchor/anchor.html @@ -7,8 +7,18 @@ diff --git a/public/static/common/lib/ueditor/dialogs/attachment/attachment.css b/public/static/common/lib/ueditor/dialogs/attachment/attachment.css index 9ba6b93a8..9be1454d7 100755 --- a/public/static/common/lib/ueditor/dialogs/attachment/attachment.css +++ b/public/static/common/lib/ueditor/dialogs/attachment/attachment.css @@ -697,4 +697,20 @@ i.file-preview.file-type-psd{ #online li .delbtn:hover { color: #fff; background-color: #ef1313; +} + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .wrapper { + width: 100%; + box-sizing:border-box; + } + #upload .filelist { + height: 290px; + } + #online { + height: 330px; + } } \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/background/background.css b/public/static/common/lib/ueditor/dialogs/background/background.css index 5c41fe9a4..0817b88ee 100755 --- a/public/static/common/lib/ueditor/dialogs/background/background.css +++ b/public/static/common/lib/ueditor/dialogs/background/background.css @@ -91,4 +91,26 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;} height: 107px; border: 3px solid #1094fa; background-position: 72px 72px; +} + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .wrapper { + width: calc(100% - 20px); + } + #imageList { + height: 205px; + } + #imgManager li { + width: 110px; + height: 110px; + margin: 10px 0 0 10px; + border: 1px solid #eee; + } + #normal input.txt { + width: calc(100% - 70px); + border: 1px solid #ccc; + } } \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/help/help.css b/public/static/common/lib/ueditor/dialogs/help/help.css index 4478475fd..40c0cc444 100755 --- a/public/static/common/lib/ueditor/dialogs/help/help.css +++ b/public/static/common/lib/ueditor/dialogs/help/help.css @@ -4,4 +4,13 @@ .tabbody .panel h1{font-size:26px;margin: 5px 0 0 5px;} .tabbody .panel p{font-size:12px;margin: 5px 0 0 5px;} .tabbody table{width:90%;line-height: 20px;margin: 5px 0 0 5px;;} -.tabbody table thead{font-weight: bold;line-height: 25px;} \ No newline at end of file +.tabbody table thead{font-weight: bold;line-height: 25px;} + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .wrapper { + width: calc(100% - 20px); + } +} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/image/image.css b/public/static/common/lib/ueditor/dialogs/image/image.css index 703a72cca..696a878f1 100755 --- a/public/static/common/lib/ueditor/dialogs/image/image.css +++ b/public/static/common/lib/ueditor/dialogs/image/image.css @@ -910,4 +910,48 @@ #online li .delbtn:hover { color: #fff; background-color: #ef1313; +} + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .wrapper, #remote .top, #remote .left { + width: 100%; + box-sizing:border-box; + } + #remote .right { + width: 80px; + position: absolute; + bottom: 10px; + right: 10px; + height: 80px; + } + #remote #preview { + width: 80px; + height: 80px; + margin-top: 0; + } + #remote #url, #remote #border, #remote #vhSpace { + width: auto; + } + #remote .row { + margin-left: 0; + } + .tabbody { + height: 315px; + overflow: hidden; + } + #upload .placeholder { + height: 140px; + } + #online { + height: 305px; + } + #upload .filelist { + height: 260px; + } + .tabbody .panel.focus { + height: 315px; + } } \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/map/map.html b/public/static/common/lib/ueditor/dialogs/map/map.html index e763b8eb0..049b3a496 100755 --- a/public/static/common/lib/ueditor/dialogs/map/map.html +++ b/public/static/common/lib/ueditor/dialogs/map/map.html @@ -14,6 +14,40 @@ #address{width:130px} #is_dynamic_label span{vertical-align:middle;margin: 3px 0px 3px 3px;} #is_dynamic_label input{vertical-align:middle;margin: 3px 3px 3px 50px;} + + /** + * 手机端自适应 + */ + @media only screen and (max-width: 641px) { + .content { + width: 100%; + box-sizing:border-box; + } + .content table { + position: relative; + } + .content table td { + display: block; + padding: 0 10px; + } + .content table td input { + width: 100% !important; + margin-bottom: 5px; + } + #is_dynamic_label { + bottom: 5px; + right: 10px; + position: absolute; + } + #is_dynamic_label input { + width: 15px !important; + margin: 0; + } + .content #container { + height: 250px !important; + border: 0 !important; + } + } diff --git a/public/static/common/lib/ueditor/dialogs/preview/preview.html b/public/static/common/lib/ueditor/dialogs/preview/preview.html index f6b433bcf..5281c8aae 100755 --- a/public/static/common/lib/ueditor/dialogs/preview/preview.html +++ b/public/static/common/lib/ueditor/dialogs/preview/preview.html @@ -17,6 +17,19 @@ margin:0; } #preview *{font-family:sans-serif;font-size:16px;} + /** + * 手机端自适应 + */ + @media only screen and (max-width: 641px) { + #preview { + margin: 0 !important; + padding: 10px; + box-sizing:border-box; + } + #preview img { + max-width: 100%; + } + } diff --git a/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css b/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css index b18430dc5..5afa0be8d 100755 --- a/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css +++ b/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css @@ -70,3 +70,37 @@ em{font-style: normal;} .eraserIcon{display: inline-block;width:16px;height:16px;background-image: url('images/eraser.png')} +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .main { + width: calc(100% - 16px); + } + .hot { + margin-bottom: 10px; + } + .hot, .picBoard { + width: 100%; + height: 150px; + } + .picBoard { + width: 100%; + } + .drawBoard { + height: 100%; + } + .brushBorad { + width: 100%; + height: 100% + } + .operateBar { + width: 50%; + } + .drawToolbar { + height: 185px; + } + .sectionBar { + margin-top: 6px; + } +} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html b/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html index 9371abd7b..200ecf6b5 100755 --- a/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html +++ b/public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html @@ -11,7 +11,7 @@
- +
diff --git a/public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html b/public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html index b91f19014..4dff3ae1e 100755 --- a/public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html +++ b/public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html @@ -12,6 +12,19 @@ .tabbody .panel{width:373px;height:100%;padding-left: 5px;position: absolute;background-color: #fff;} .tabbody input.int{ width:190px;height:21px;border:1px solid #d7d7d7;line-height:21px;} .tabbody input.btn{padding: 0 5px; text-align:center;line-height:24px; text-decoration: none;height:24px;background:url("../../themes/default/images/dialog-title-bg.png") repeat-x;border:1px solid #ccc; } + + /** + * 手机端自适应 + */ + @media only screen and (max-width: 641px) { + .warpper { + width: calc(100% - 20px); + } + .tabbody .panel { + width: 100%; + box-sizing:border-box; + } + } diff --git a/public/static/common/lib/ueditor/dialogs/spechars/spechars.html b/public/static/common/lib/ueditor/dialogs/spechars/spechars.html index 0b5c416f8..4c8e68268 100755 --- a/public/static/common/lib/ueditor/dialogs/spechars/spechars.html +++ b/public/static/common/lib/ueditor/dialogs/spechars/spechars.html @@ -10,6 +10,15 @@ #specharsTab{width: 97%;margin: 10px auto; zoom:1;position: relative} .tabbody {height:447px;} .tabbody span{ margin: 5px 3px;text-align: center;display:inline-block;width: 40px;height:16px;line-height: 16px;cursor: pointer; } + + /** + * 手机端自适应 + */ + @media only screen and (max-width: 641px) { + .tabbody { + height: 390px; + } + } diff --git a/public/static/common/lib/ueditor/dialogs/template/template.css b/public/static/common/lib/ueditor/dialogs/template/template.css index 6c1608dfc..15dbdf095 100755 --- a/public/static/common/lib/ueditor/dialogs/template/template.css +++ b/public/static/common/lib/ueditor/dialogs/template/template.css @@ -15,4 +15,16 @@ p{margin: 5px 0} table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;} li{clear:both} -ol{padding-left:40px; } \ No newline at end of file +ol{padding-left:40px; } + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .left { + width: 50%; + } + .right { + width: calc(50% - 30px); + } +} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/dialogs/video/video.css b/public/static/common/lib/ueditor/dialogs/video/video.css index da9294686..bdef2e0b6 100755 --- a/public/static/common/lib/ueditor/dialogs/video/video.css +++ b/public/static/common/lib/ueditor/dialogs/video/video.css @@ -747,4 +747,32 @@ i.file-preview.file-type-psd{ #online li .delbtn:hover { color: #fff; background-color: #ef1313; +} + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .wrapper { + width: calc(100% - 20px); + box-sizing:border-box; + } + #upload_left { + width: 100%; + } + #upload .placeholder { + width: calc(100% - 20px); + } + #online { + height: 315px; + } + #videoUrl { + width: auto; + } + #preview { + width: calc(100% - 150px); + } + .tabbody .panel.focus { + height: 300px; + } } \ No newline at end of file diff --git a/public/static/common/lib/ueditor/themes/default/css/ueditor.css b/public/static/common/lib/ueditor/themes/default/css/ueditor.css index 10958f602..f997d0f31 100755 --- a/public/static/common/lib/ueditor/themes/default/css/ueditor.css +++ b/public/static/common/lib/ueditor/themes/default/css/ueditor.css @@ -1908,4 +1908,32 @@ div.edui-box { } .edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-plaintxticon{ background-position: -72px -34px; +} + + +/** + * 手机端自适应 + */ +@media only screen and (max-width: 641px) { + .edui-default .edui-dialog { + left: 10px !important; + width: calc(100% - 20px) !important; + } + .edui-default .edui-for-emotion { + left: 10px !important; + width: calc(100% - 20px) !important; + } + + #edui_fixedlayer, + .edui-default .edui-for-insertimage .edui-dialog-content, + .edui-default .edui-for-insertvideo .edui-dialog-content, + .edui-default .edui-for-attachment .edui-dialog-content, + .edui-default .edui-for-map .edui-dialog-content, + .edui-default .edui-for-spechars .edui-dialog-content, + .edui-default .edui-for-anchor .edui-dialog-content, + .edui-default .edui-for-searchreplace .edui-dialog-content, + .edui-default .edui-dialog-content, + .edui-default .edui-for-emotion .edui-popup-content iframe { + width: 100% !important; + } } \ No newline at end of file diff --git a/public/static/common/lib/ueditor/themes/iframe.css b/public/static/common/lib/ueditor/themes/iframe.css index 774013afd..143c9a5f6 100755 --- a/public/static/common/lib/ueditor/themes/iframe.css +++ b/public/static/common/lib/ueditor/themes/iframe.css @@ -1 +1,4 @@ /*可以在这里添加你自己的css*/ +.edui-default, .edui-default .edui-dialog-body, .edui-default .edui-for-insertimage .edui-dialog-content, .edui-dialog div { + width: 200px !important; +} \ No newline at end of file diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js index c1066594f..699c651a3 100755 --- a/public/static/common/lib/ueditor/ueditor.all.js +++ b/public/static/common/lib/ueditor/ueditor.all.js @@ -6895,6 +6895,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g'); container = document.getElementById(container); } if (container) { + options.initialFrameWidth = 100 if(options.initialFrameWidth){ options.minFrameWidth = options.initialFrameWidth }else{ @@ -6906,7 +6907,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g'); options.initialFrameHeight = options.minFrameHeight = container.offsetHeight; } - container.style.width = /%$/.test(options.initialFrameWidth) ? '100%' : options.initialFrameWidth- + container.style.width = /%$/.test(options.initialFrameWidth) ? '60%' : options.initialFrameWidth- getStyleValue("padding-left")- getStyleValue("padding-right") +'px'; container.style.height = /%$/.test(options.initialFrameHeight) ? '100%' : options.initialFrameHeight - getStyleValue("padding-top")- getStyleValue("padding-bottom") +'px'; diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 6d1e02e34..dc323e818 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -723,6 +723,11 @@ ul.am-dropdown-content > .am-active > a:focus, } +/** + * 用户中心 + */ +.user-content-body {-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto; overflow: hidden; } + /** * 用户中心左侧菜单 */ @@ -737,7 +742,7 @@ ul.am-dropdown-content > .am-active > a:focus, .user-sidebar-sub li { border-left: 0!important; border-right: 0!important; } .user-sidebar-sub li a { padding-left:35px; } .user-content {display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;background:#fff;} -.user-content-body {-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto; } + .user-offcanvas-bar { z-index: 900; } @media only screen and (min-width:640px) { .user-sidebar {display:block;position:relative;background:none; border-top: 5px solid #ED5564;z-index: 0;}