切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
55acd3905f807282981df1d086243ecbf7a1d684
1 个父辈
b6406bfa
1 个管道 的构建
通过
耗费 6 秒
修改图片会员价格
变更
6
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
241 行增加
和
134 行删除
.idea/workspace.xml
application/admin/view/pic/add.html
application/admin/view/pic/edit.html
application/api/controller/User.php
public/api.html
public/assets/js/backend/pic.js
.idea/workspace.xml
查看文件 @
55acd39
...
...
@@ -2,7 +2,11 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/assets/js/backend/vip.js"
afterPath=
"$PROJECT_DIR$/public/assets/js/backend/vip.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
afterPath=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
afterPath=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/api.html"
afterPath=
"$PROJECT_DIR$/public/api.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
afterPath=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -16,8 +20,8 @@
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"234"
>
<caret
line=
"594"
column=
"16"
lean-forward=
"true"
selection-start-line=
"594"
selection-start-column=
"16"
selection-end-line=
"594"
selection-end-column=
"16"
/>
<state
relative-caret-position=
"261"
>
<caret
line=
"416"
column=
"0"
lean-forward=
"true"
selection-start-line=
"416"
selection-start-column=
"0"
selection-end-line=
"416"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#337#456#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,15 +38,19 @@
<element
signature=
"e#9728#10430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10435#11635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11641#12325#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12330#13826#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13832#14702#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14707#16520#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16526#16903#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16908#17172#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17178#17683#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17688#17939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17945#18424#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18429#19186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12330#13918#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13924#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14799#16612#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16618#16995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17000#17264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17270#17775#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17780#18031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18037#18516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18521#19278#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19284#19647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19652#19843#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19849#20207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20212#20402#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -89,10 +97,7 @@
<option
value=
"$PROJECT_DIR$/.gitignore"
/>
<option
value=
"$PROJECT_DIR$/public/.gitignore"
/>
<option
value=
"$PROJECT_DIR$/application/common/library/Auth.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<option
value=
"$PROJECT_DIR$/application/extra/verify.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
/>
...
...
@@ -101,9 +106,12 @@
<option
value=
"$PROJECT_DIR$/composer.json"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/user/user.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/vip/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/vip.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
</list>
</option>
</component>
...
...
@@ -121,9 +129,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"36"
/>
<option
name=
"y"
value=
"71"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"119"
/>
<option
name=
"y"
value=
"67"
/>
<option
name=
"width"
value=
"1883"
/>
<option
name=
"height"
value=
"946"
/>
</component>
...
...
@@ -159,27 +167,6 @@
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"vip"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
...
...
@@ -189,32 +176,6 @@
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"js"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"assets"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"js"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"backend"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -263,7 +224,7 @@
<workItem
from=
"1574141466352"
duration=
"745000"
/>
<workItem
from=
"1574143209694"
duration=
"3660000"
/>
<workItem
from=
"1574146994475"
duration=
"23222000"
/>
<workItem
from=
"1574209189943"
duration=
"1
1979
000"
/>
<workItem
from=
"1574209189943"
duration=
"1
5001
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -276,7 +237,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"8
3554
000"
/>
<option
name=
"totallyTimeSpent"
value=
"8
6576
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -288,7 +249,7 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
36"
y=
"71"
width=
"1883"
height=
"946"
extended-state=
"1
"
/>
<frame
x=
"
119"
y=
"67"
width=
"1883"
height=
"946"
extended-state=
"0
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.15743281"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -502,20 +463,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"511"
>
<caret
line=
"34"
column=
"28"
lean-forward=
"true"
selection-start-line=
"34"
selection-start-column=
"28"
selection-end-line=
"34"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"205"
>
<caret
line=
"33"
column=
"10"
lean-forward=
"true"
selection-start-line=
"33"
selection-start-column=
"10"
selection-end-line=
"33"
selection-end-column=
"10"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Pic.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1200"
>
...
...
@@ -639,14 +586,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/pic.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"84"
>
<caret
line=
"33"
column=
"144"
lean-forward=
"true"
selection-start-line=
"33"
selection-start-column=
"24"
selection-end-line=
"33"
selection-end-column=
"144"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/user/user.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"400"
>
...
...
@@ -716,10 +655,34 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/pic.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"459"
>
<caret
line=
"36"
column=
"65"
lean-forward=
"true"
selection-start-line=
"36"
selection-start-column=
"65"
selection-end-line=
"36"
selection-end-column=
"65"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"161"
>
<caret
line=
"59"
column=
"10"
lean-forward=
"false"
selection-start-line=
"59"
selection-start-column=
"10"
selection-end-line=
"59"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"330"
>
<caret
line=
"59"
column=
"10"
lean-forward=
"false"
selection-start-line=
"59"
selection-start-column=
"10"
selection-end-line=
"59"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"234"
>
<caret
line=
"594"
column=
"16"
lean-forward=
"true"
selection-start-line=
"594"
selection-start-column=
"16"
selection-end-line=
"594"
selection-end-column=
"16"
/>
<state
relative-caret-position=
"261"
>
<caret
line=
"416"
column=
"0"
lean-forward=
"true"
selection-start-line=
"416"
selection-start-column=
"0"
selection-end-line=
"416"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#38#68#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#337#456#0#PHP"
expanded=
"false"
/>
...
...
@@ -736,15 +699,19 @@
<element
signature=
"e#9728#10430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10435#11635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11641#12325#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12330#13826#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13832#14702#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14707#16520#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16526#16903#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16908#17172#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17178#17683#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17688#17939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17945#18424#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18429#19186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12330#13918#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13924#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14799#16612#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16618#16995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17000#17264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17270#17775#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17780#18031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18037#18516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18521#19278#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19284#19647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19652#19843#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19849#20207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20212#20402#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/admin/view/pic/add.html
查看文件 @
55acd39
...
...
@@ -59,12 +59,6 @@
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Vip_price')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-vip_price"
data-rule=
"required"
class=
"form-control"
name=
"row[vip_price]"
type=
"text"
placeholder=
"请输入会员价格"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Is_recommend')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
{:build_radios('row[is_recommend]', ['1'=>__('是'), '0 '=>__('否')])}
...
...
application/admin/view/pic/edit.html
查看文件 @
55acd39
...
...
@@ -59,12 +59,6 @@
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Vip_price')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-vip_price"
data-rule=
"required"
class=
"form-control"
name=
"row[vip_price]"
type=
"text"
value=
"{$row.vip_price}"
placeholder=
"请输入会员价格"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Content')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<textarea
id=
"c-content"
data-rule=
"required"
class=
"form-control editor"
name=
"row[content]"
placeholder=
"请输入图片介绍"
>
{$row.content}
</textarea>
...
...
application/api/controller/User.php
查看文件 @
55acd39
...
...
@@ -388,9 +388,10 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'pic'
)
->
field
(
'id,title,thumbnail,price,
vip_price,
water_url,content'
)
->
field
(
'id,title,thumbnail,price,water_url,content'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
$data
[
'thumbnail'
]
=
$rule
.
$data
[
'thumbnail'
];
$data
[
'water_url'
]
=
$rule
.
$data
[
'water_url'
];
$data
[
'content'
]
=
strip_tags
(
$data
[
'content'
]);
...
...
@@ -402,10 +403,11 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'pic'
)
->
field
(
'id,title,thumbnail,price,
vip_price,
water_url,content'
)
->
field
(
'id,title,thumbnail,price,water_url,content'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
$data
[
'is_vip'
]
=
1
;
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
$data
[
'thumbnail'
]
=
$rule
.
$data
[
'thumbnail'
];
$data
[
'water_url'
]
=
$rule
.
$data
[
'water_url'
];
$data
[
'content'
]
=
strip_tags
(
$data
[
'content'
]);
...
...
@@ -584,8 +586,8 @@ class User extends Api
}
/**
* @ApiTitle (我的)
* @ApiSummary (我的)
* @ApiTitle (会员介绍)
* @ApiSummary (会员介绍)
* @ApiMethod (POST)
* @ApiRoute (/api/user/vipdesc)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
...
...
@@ -595,17 +597,41 @@ class User extends Api
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"nickname": //昵称,
"avatar": //头像,
"money" : //余额
"is_vip": //是否为会员(0否 1是)
"content": //会员介绍内容
}
})
*/
public
function
vipdesc
()
{
$data
=
$data
=
Db
::
name
(
'vip'
)
->
field
(
'content'
)
->
where
(
'id'
,
2
)
->
find
();
$this
->
success
(
'SUCCESS'
,
$data
);
}
/**
* @ApiTitle (会员须知)
* @ApiSummary (会员须知)
* @ApiMethod (POST)
* @ApiRoute (/api/user/vipdetail)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"text": //会员须知内容
}
})
*/
public
function
vipdetail
()
{
$data
=
Db
::
name
(
'vip'
)
->
field
(
'text'
)
->
where
(
'id'
,
2
)
->
find
();
$this
->
success
(
'SUCCESS'
,
$data
);
}
...
...
public/api.html
查看文件 @
55acd39
...
...
@@ -168,7 +168,8 @@
<a
href=
"javascript:;"
data-id=
"15"
class=
"list-group-item"
>
历史记录
</a>
<a
href=
"javascript:;"
data-id=
"16"
class=
"list-group-item"
>
我的
</a>
<a
href=
"javascript:;"
data-id=
"17"
class=
"list-group-item"
>
创建充值订单
</a>
<a
href=
"javascript:;"
data-id=
"18"
class=
"list-group-item"
>
我的
</a>
<a
href=
"javascript:;"
data-id=
"18"
class=
"list-group-item"
>
会员介绍
</a>
<a
href=
"javascript:;"
data-id=
"19"
class=
"list-group-item"
>
会员须知
</a>
</div>
</div>
</div>
...
...
@@ -2552,7 +2553,7 @@
<div
class=
"panel-heading"
id=
"heading-18"
>
<h4
class=
"panel-title"
>
<span
class=
"label label-primary"
>
POST
</span>
<a
data-toggle=
"collapse"
data-parent=
"#accordion18"
href=
"#collapseOne18"
>
我的
<span
class=
"text-muted"
>
/api/user/vipdesc
</span></a>
<a
data-toggle=
"collapse"
data-parent=
"#accordion18"
href=
"#collapseOne18"
>
会员介绍
<span
class=
"text-muted"
>
/api/user/vipdesc
</span></a>
</h4>
</div>
<div
id=
"collapseOne18"
class=
"panel-collapse collapse"
>
...
...
@@ -2570,7 +2571,7 @@
<div
class=
"tab-pane active"
id=
"info18"
>
<div
class=
"well"
>
我的
</div>
会员介绍
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
...
...
@@ -2664,11 +2665,136 @@
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"nickname": //昵称,
"avatar": //头像,
"money" : //余额
"is_vip": //是否为会员(0否 1是
</pre>
"content": //会员介绍内容
}
}
</pre>
</div>
</div>
</div>
<!-- #sample -->
</div>
<!-- .tab-content -->
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
id=
"heading-19"
>
<h4
class=
"panel-title"
>
<span
class=
"label label-primary"
>
POST
</span>
<a
data-toggle=
"collapse"
data-parent=
"#accordion19"
href=
"#collapseOne19"
>
会员须知
<span
class=
"text-muted"
>
/api/user/vipdetail
</span></a>
</h4>
</div>
<div
id=
"collapseOne19"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
<!-- Nav tabs -->
<ul
class=
"nav nav-tabs"
id=
"doctab19"
>
<li
class=
"active"
><a
href=
"#info19"
data-toggle=
"tab"
>
基础信息
</a></li>
<li><a
href=
"#sandbox19"
data-toggle=
"tab"
>
在线测试
</a></li>
<li><a
href=
"#sample19"
data-toggle=
"tab"
>
返回示例
</a></li>
</ul>
<!-- Tab panes -->
<div
class=
"tab-content"
>
<div
class=
"tab-pane active"
id=
"info19"
>
<div
class=
"well"
>
会员须知
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
<table
class=
"table table-hover"
>
<thead>
<tr>
<th>
名称
</th>
<th>
类型
</th>
<th>
必选
</th>
<th>
描述
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
token
</td>
<td>
string
</td>
<td>
是
</td>
<td>
请求的Token
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
无
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
正文
</strong></div>
<div
class=
"panel-body"
>
无
</div>
</div>
</div>
<!-- #info -->
<div
class=
"tab-pane"
id=
"sandbox19"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
Headers
</strong></div>
<div
class=
"panel-body"
>
<div
class=
"headers"
>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"token"
>
token
</label>
<input
type=
"string"
class=
"form-control input-sm"
id=
"token"
required
placeholder=
"请求的Token - Ex: "
name=
"token"
>
</div>
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
参数
</strong></div>
<div
class=
"panel-body"
>
<form
enctype=
"application/x-www-form-urlencoded"
role=
"form"
action=
"/api/user/vipdetail"
method=
"POST"
name=
"form19"
id=
"form19"
>
<div
class=
"form-group"
>
无
</div>
<div
class=
"form-group"
>
<button
type=
"submit"
class=
"btn btn-success send"
rel=
"19"
>
提交
</button>
<button
type=
"reset"
class=
"btn btn-info"
rel=
"19"
>
重置
</button>
</div>
</form>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
响应输出
</strong></div>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
style=
"overflow-x:auto"
>
<pre
id=
"response_headers19"
></pre>
<pre
id=
"response19"
></pre>
</div>
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
><strong>
返回参数
</strong></div>
<div
class=
"panel-body"
>
无
</div>
</div>
</div>
</div>
</div>
<!-- #sandbox -->
<div
class=
"tab-pane"
id=
"sample19"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<pre
id=
"sample_response19"
>
{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"text": //会员须知内容
}
}
</pre>
</div>
</div>
</div>
<!-- #sample -->
...
...
@@ -2683,7 +2809,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2019-11-20 1
1:44:31
</div>
Generated on 2019-11-20 1
3:17:47
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
public/assets/js/backend/pic.js
查看文件 @
55acd39
...
...
@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'url'
,
title
:
__
(
'Url'
),
formatter
:
Table
.
api
.
formatter
.
url
},
{
field
:
'is_recommend'
,
title
:
__
(
'Is_recommend'
),
formatter
:
Table
.
api
.
formatter
.
label
,
searchList
:{
'0'
:
'否'
,
'1'
:
'是'
}},
{
field
:
'price'
,
title
:
__
(
'Price'
)},
{
field
:
'vip_price'
,
title
:
__
(
'Vip_price'
)},
//
{field: 'vip_price', title: __('Vip_price')},
{
field
:
'buy_num'
,
title
:
__
(
'Buy_num'
)},
{
field
:
'click_num'
,
title
:
__
(
'Click_num'
)},
{
field
:
'createtime'
,
title
:
__
(
'Createtime'
),
operate
:
'RANGE'
,
addclass
:
'datetimerange'
,
formatter
:
Table
.
api
.
formatter
.
datetime
},
...
...
请
注册
或
登录
后发表评论