切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
889008b732a9d0d0719b7f5b9a5c874f90bd71da
1 个父辈
40037a76
1 个管道 的构建
通过
耗费 1 秒
订单
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
51 行增加
和
50 行删除
.idea/workspace.xml
application/api/controller/User.php
public/api.html
.idea/workspace.xml
查看文件 @
889008b
...
...
@@ -2,9 +2,7 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<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"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -18,8 +16,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=
"310"
>
<caret
line=
"446"
column=
"68"
lean-forward=
"false"
selection-start-line=
"446"
selection-start-column=
"68"
selection-end-line=
"446"
selection-end-column=
"68"
/>
<state
relative-caret-position=
"31"
>
<caret
line=
"1250"
column=
"13"
lean-forward=
"true"
selection-start-line=
"1250"
selection-start-column=
"13"
selection-end-line=
"1250"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -37,6 +35,7 @@
<element
signature=
"e#11669#12245#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12250#12797#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12803#13487#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13492#15300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15306#16176#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16181#18389#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18395#18772#0#PHP"
expanded=
"false"
/>
...
...
@@ -60,17 +59,17 @@
<element
signature=
"e#30043#30577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30582#31496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31502#32156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33426#34186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34191#35266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35292#36123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36129#36549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36554#37037#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37043#37849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42385#43449#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43456#44214#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44219#46483#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46490#46941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46946#48087#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33477#34237#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34242#35317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35343#36174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36180#36600#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36605#37088#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37094#37900#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42418#43482#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43489#44247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44252#46516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46523#46974#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46979#48120#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -174,11 +173,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"505"
/>
<option
name=
"y"
value=
"83"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"102"
/>
<option
name=
"y"
value=
"181"
/>
<option
name=
"width"
value=
"1806"
/>
<option
name=
"height"
value=
"9
77
"
/>
<option
name=
"height"
value=
"9
59
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -274,7 +273,7 @@
<workItem
from=
"1574295812843"
duration=
"20536000"
/>
<workItem
from=
"1574336957891"
duration=
"1350000"
/>
<workItem
from=
"1574382087071"
duration=
"22007000"
/>
<workItem
from=
"1574410294356"
duration=
"1
2452
000"
/>
<workItem
from=
"1574410294356"
duration=
"1
3756
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -287,7 +286,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"17
4399
000"
/>
<option
name=
"totallyTimeSpent"
value=
"17
5703
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -299,7 +298,7 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
505"
y=
"83"
width=
"1806"
height=
"977"
extended-state=
"0
"
/>
<frame
x=
"
102"
y=
"181"
width=
"1806"
height=
"959"
extended-state=
"1
"
/>
<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.14833906"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32912987"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -308,7 +307,7 @@
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.15
119047
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.15
450121
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -714,8 +713,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"310"
>
<caret
line=
"446"
column=
"68"
lean-forward=
"false"
selection-start-line=
"446"
selection-start-column=
"68"
selection-end-line=
"446"
selection-end-column=
"68"
/>
<state
relative-caret-position=
"31"
>
<caret
line=
"1250"
column=
"13"
lean-forward=
"true"
selection-start-line=
"1250"
selection-start-column=
"13"
selection-end-line=
"1250"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -733,6 +732,7 @@
<element
signature=
"e#11669#12245#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12250#12797#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12803#13487#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13492#15300#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15306#16176#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16181#18389#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18395#18772#0#PHP"
expanded=
"false"
/>
...
...
@@ -756,17 +756,17 @@
<element
signature=
"e#30043#30577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30582#31496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31502#32156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33426#34186#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34191#35266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35292#36123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36129#36549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36554#37037#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37043#37849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42385#43449#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43456#44214#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44219#46483#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46490#46941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46946#48087#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33477#34237#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34242#35317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35343#36174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36180#36600#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36605#37088#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37094#37900#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42418#43482#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43489#44247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44252#46516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46523#46974#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46979#48120#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/api/controller/User.php
查看文件 @
889008b
...
...
@@ -998,10 +998,11 @@ class User extends Api
}
elseif
(
$param
[
'total'
]
<=
0
){
$this
->
error
([
'code'
=>
3
,
'msg'
=>
'非法操作'
]);
}
else
{
$a
=
[];
$a
[
'id'
]
=
$video_id
;
$a
[
'attr'
]
=
$video_attr
;
$param
[
'video_id'
]
=
serialize
(
$a
);
$b
=
explode
(
','
,
$video_id
.
','
.
$video_attr
);
$c
[
'id'
]
=
$b
[
'0'
];
$c
[
'attr'
]
=
$b
[
'1'
];
$b
=
$c
;
$param
[
'video_id'
]
=
serialize
(
$b
);
$param
[
'createtime'
]
=
time
();
$param
[
'num'
]
=
date
(
'Ymd'
)
.
substr
(
implode
(
NULL
,
array_map
(
'ord'
,
str_split
(
substr
(
uniqid
(),
7
,
13
),
1
))),
0
,
8
);
$data
=
Db
::
name
(
'order'
)
...
...
@@ -1250,15 +1251,15 @@ class User extends Api
}
if
(
!
empty
(
$v
[
'video_id'
])){
$v
[
'video_id'
]
=
unserialize
(
$v
[
'video_id'
]);
// foreach ($v['video_id'] as &$v2){
// $v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
// $v2['info']['attr'] = $v2['attr'];
// unset($v2['attr']);
// $v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
// $v2['info']['vipprice'] = $v2['info']['price']*0.75;
// $v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
// $v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
// }
foreach
(
$v
[
'video_id'
]
as
&
$v2
){
$v2
[
'info'
]
=
Db
::
name
(
'video'
)
->
field
(
'keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime'
,
true
)
->
where
(
'id'
,
$v2
[
'id'
])
->
find
();
$v2
[
'info'
][
'attr'
]
=
$v2
[
'attr'
];
unset
(
$v2
[
'attr'
]);
$v2
[
'info'
][
'thumbnail'
]
=
$rule
.
$v2
[
'info'
][
'thumbnail'
];
$v2
[
'info'
][
'vipprice'
]
=
$v2
[
'info'
][
'price'
]
*
0.75
;
$v2
[
'info'
][
'four_vipprice'
]
=
$v2
[
'info'
][
'four_price'
]
*
0.75
;
$v2
[
'info'
][
'eight_vipprice'
]
=
$v2
[
'info'
][
'eight_price'
]
*
0.75
;
}
}
}
return
$res
;
...
...
public/api.html
查看文件 @
889008b
...
...
@@ -5675,7 +5675,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2019-11-22 2
0:43:20
</div>
Generated on 2019-11-22 2
1:05:06
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
请
注册
或
登录
后发表评论