Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MMloveyou1314
ShopXO
提交
072e160d
ShopXO
项目概览
MMloveyou1314
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
072e160d
编写于
4月 24, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
编辑器自适应
上级
4076e8ef
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
301 addition
and
16 deletion
+301
-16
application/service/NavigationService.php
application/service/NavigationService.php
+14
-7
public/static/common/css/common.css
public/static/common/css/common.css
+0
-3
public/static/common/lib/ueditor/dialogs/anchor/anchor.html
public/static/common/lib/ueditor/dialogs/anchor/anchor.html
+11
-1
public/static/common/lib/ueditor/dialogs/attachment/attachment.css
...atic/common/lib/ueditor/dialogs/attachment/attachment.css
+16
-0
public/static/common/lib/ueditor/dialogs/background/background.css
...atic/common/lib/ueditor/dialogs/background/background.css
+22
-0
public/static/common/lib/ueditor/dialogs/help/help.css
public/static/common/lib/ueditor/dialogs/help/help.css
+10
-1
public/static/common/lib/ueditor/dialogs/image/image.css
public/static/common/lib/ueditor/dialogs/image/image.css
+44
-0
public/static/common/lib/ueditor/dialogs/map/map.html
public/static/common/lib/ueditor/dialogs/map/map.html
+34
-0
public/static/common/lib/ueditor/dialogs/preview/preview.html
...ic/static/common/lib/ueditor/dialogs/preview/preview.html
+13
-0
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css
+34
-0
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html
+1
-1
public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html
...mmon/lib/ueditor/dialogs/searchreplace/searchreplace.html
+13
-0
public/static/common/lib/ueditor/dialogs/spechars/spechars.html
.../static/common/lib/ueditor/dialogs/spechars/spechars.html
+9
-0
public/static/common/lib/ueditor/dialogs/template/template.css
...c/static/common/lib/ueditor/dialogs/template/template.css
+13
-1
public/static/common/lib/ueditor/dialogs/video/video.css
public/static/common/lib/ueditor/dialogs/video/video.css
+28
-0
public/static/common/lib/ueditor/themes/default/css/ueditor.css
.../static/common/lib/ueditor/themes/default/css/ueditor.css
+28
-0
public/static/common/lib/ueditor/themes/iframe.css
public/static/common/lib/ueditor/themes/iframe.css
+3
-0
public/static/common/lib/ueditor/ueditor.all.js
public/static/common/lib/ueditor/ueditor.all.js
+2
-1
public/static/index/default/css/common.css
public/static/index/default/css/common.css
+6
-1
未找到文件。
application/service/NavigationService.php
浏览文件 @
072e160d
...
...
@@ -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'
),
...
...
public/static/common/css/common.css
浏览文件 @
072e160d
...
...
@@ -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
;
}
...
...
public/static/common/lib/ueditor/dialogs/anchor/anchor.html
浏览文件 @
072e160d
...
...
@@ -7,8 +7,18 @@
<style
type=
"text/css"
>
*
{
color
:
#838383
;
margin
:
0
;
padding
:
0
}
html
,
body
{
font-size
:
12px
;
overflow
:
hidden
;
}
.content
{
padding
:
5px
0
0
15px
;}
.content
{
padding
:
10px
0
0
15px
;}
.content
input
{
width
:
calc
(
100%
-
80px
);
border-radius
:
4px
;
-webkit-box-shadow
:
inset
0
1px
1px
rgba
(
0
,
0
,
0
,
.075
);
box-shadow
:
inset
0
1px
1px
rgba
(
0
,
0
,
0
,
.075
);
-webkit-transition
:
border-color
ease-in-out
.15s
,
box-shadow
ease-in-out
.15s
;
transition
:
border-color
ease-in-out
.15s
,
box-shadow
ease-in-out
.15s
;
}
input
{
width
:
210px
;
height
:
21px
;
line-height
:
21px
;
margin-left
:
4px
;}
/**
* 手机端自适应
*/
@media
only
screen
and
(
max-width
:
641px
)
{
.tabbody
{
height
:
390px
;
}
}
</style>
</head>
<body>
...
...
public/static/common/lib/ueditor/dialogs/attachment/attachment.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/background/background.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/help/help.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/image/image.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/map/map.html
浏览文件 @
072e160d
...
...
@@ -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
;
}
}
</style>
</head>
<body>
...
...
public/static/common/lib/ueditor/dialogs/preview/preview.html
浏览文件 @
072e160d
...
...
@@ -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%
;
}
}
</style>
<script
type=
"text/javascript"
src=
"../internal.js"
></script>
<script
src=
"../../ueditor.parse.js"
></script>
...
...
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/scrawl/scrawl.html
浏览文件 @
072e160d
...
...
@@ -11,7 +11,7 @@
<div
class=
"main"
id=
"J_wrap"
>
<div
class=
"hot"
>
<div
class=
"drawBoard border_style1"
>
<canvas
id=
"J_brushBoard"
class=
"brushBorad"
width=
"360"
height=
"300"
></canvas>
<canvas
id=
"J_brushBoard"
class=
"brushBorad"
></canvas>
<div
id=
"J_picBoard"
class=
"picBoard"
style=
"width: 360px;height: 300px"
></div>
</div>
<div
id=
"J_operateBar"
class=
"operateBar"
>
...
...
public/static/common/lib/ueditor/dialogs/searchreplace/searchreplace.html
浏览文件 @
072e160d
...
...
@@ -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
;
}
}
</style>
</head>
<body>
...
...
public/static/common/lib/ueditor/dialogs/spechars/spechars.html
浏览文件 @
072e160d
...
...
@@ -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
;
}
}
</style>
</head>
<body>
...
...
public/static/common/lib/ueditor/dialogs/template/template.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/dialogs/video/video.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/themes/default/css/ueditor.css
浏览文件 @
072e160d
...
...
@@ -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
public/static/common/lib/ueditor/themes/iframe.css
浏览文件 @
072e160d
/*可以在这里添加你自己的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
public/static/common/lib/ueditor/ueditor.all.js
浏览文件 @
072e160d
...
...
@@ -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) ? '
10
0%' : options.initialFrameWidth-
container.style.width = /%$/.test(options.initialFrameWidth) ? '
6
0%' : 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';
public/static/index/default/css/common.css
浏览文件 @
072e160d
...
...
@@ -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
;}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录