切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
bdb71ab20960ae222704af2ca5c6565c9c247d6e
1 个父辈
4f806886
1 个管道 的构建
通过
耗费 1 秒
修改视频总金额
变更
5
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
160 行增加
和
83 行删除
.idea/workspace.xml
application/admin/lang/zh-cn/video.php
application/api/controller/Pay.php
public/api.html
public/assets/js/backend/video.js
.idea/workspace.xml
查看文件 @
bdb71ab
...
...
@@ -2,7 +2,9 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
afterPath=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
afterPath=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -16,8 +18,8 @@
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"196"
>
<caret
line=
"588"
column=
"8"
lean-forward=
"true"
selection-start-line=
"588"
selection-start-column=
"8"
selection-end-line=
"591"
selection-end-column=
"21"
/>
<state
relative-caret-position=
"96"
>
<caret
line=
"584"
column=
"33"
lean-forward=
"false"
selection-start-line=
"584"
selection-start-column=
"33"
selection-end-line=
"584"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#1233#2896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2902#3430#0#PHP"
expanded=
"false"
/>
...
...
@@ -39,6 +41,7 @@
<element
signature=
"e#15906#16590#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16595#18691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18697#19567#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19572#22068#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22074#22451#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22456#22777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22783#23288#0#PHP"
expanded=
"false"
/>
...
...
@@ -88,8 +91,8 @@
<file
leaf-file-name=
"Pay.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"288"
>
<caret
line=
"202"
column=
"62"
lean-forward=
"true"
selection-start-line=
"202"
selection-start-column=
"62"
selection-end-line=
"202"
selection-end-column=
"62"
/>
<state
relative-caret-position=
"44"
>
<caret
line=
"408"
column=
"58"
lean-forward=
"true"
selection-start-line=
"408"
selection-start-column=
"58"
selection-end-line=
"408"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
...
...
@@ -99,22 +102,25 @@
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9210#11294#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11358#11476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12333#14108#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14181#14601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14606#22776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22793#23090#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23095#23488#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23515#26993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27022#29927#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29956#34019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31779#32028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32071#33508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32530#33486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34048#38511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36278#38026#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38534#38751#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7772#9181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11546#11997#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13212#13330#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14187#15962#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16035#16455#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18227#19634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23664#23782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24230#24461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24639#26416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26501#26798#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26803#27196#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27223#30701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30730#33635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33664#37727#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35779#37216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37264#37366#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37756#42219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39986#41734#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42242#42459#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -168,8 +174,6 @@
<option
value=
"$PROJECT_DIR$/application/extra/verify.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/video/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/video/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Video.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Wonderful.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php"
/>
...
...
@@ -188,6 +192,8 @@
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
</list>
</option>
...
...
@@ -206,11 +212,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"40"
/>
<option
name=
"y"
value=
"43"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"7"
>
<option
name=
"x"
value=
"221"
/>
<option
name=
"y"
value=
"64"
/>
<option
name=
"width"
value=
"1700"
/>
<option
name=
"height"
value=
"1
0
00"
/>
<option
name=
"height"
value=
"1
1
00"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -243,6 +249,12 @@
<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=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
...
...
@@ -252,6 +264,13 @@
<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=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"lang"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -338,7 +357,7 @@
<workItem
from=
"1575541798312"
duration=
"2359000"
/>
<workItem
from=
"1575592025964"
duration=
"640000"
/>
<workItem
from=
"1575599624364"
duration=
"95000"
/>
<workItem
from=
"1575680867057"
duration=
"1
3217
000"
/>
<workItem
from=
"1575680867057"
duration=
"1
5315
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -351,7 +370,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"32
3116
000"
/>
<option
name=
"totallyTimeSpent"
value=
"32
5214
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -363,17 +382,16 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"40"
y=
"43"
width=
"1700"
height=
"1000"
extended-state=
"1"
/>
<editor
active=
"true"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"7"
/>
<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.1
9512194
"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1
705757
"
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"
/>
<window_info
id=
"Event Log"
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=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
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=
"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=
"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=
"
false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.16685979
"
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.16648531
"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
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=
"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=
"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"
/>
...
...
@@ -548,13 +566,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"5"
column=
"26"
lean-forward=
"false"
selection-start-line=
"5"
selection-start-column=
"26"
selection-end-line=
"5"
selection-end-column=
"26"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"475"
>
...
...
@@ -604,13 +615,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/video.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"28"
column=
"24"
lean-forward=
"true"
selection-start-line=
"28"
selection-start-column=
"24"
selection-end-line=
"28"
selection-end-column=
"63"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"400"
>
...
...
@@ -762,14 +766,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=
"799"
>
<caret
line=
"40"
column=
"73"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"73"
selection-end-line=
"40"
selection-end-column=
"73"
/>
<folding
/>
</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=
"338"
>
...
...
@@ -788,10 +784,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=
"349"
>
<caret
line=
"40"
column=
"75"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"24"
selection-end-line=
"40"
selection-end-column=
"75"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/video.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"475"
>
<caret
line=
"43"
column=
"82"
lean-forward=
"true"
selection-start-line=
"43"
selection-start-column=
"82"
selection-end-line=
"43"
selection-end-column=
"82"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"600"
>
<caret
line=
"24"
column=
"27"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"27"
selection-end-line=
"24"
selection-end-column=
"27"
/>
<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=
"196"
>
<caret
line=
"588"
column=
"8"
lean-forward=
"true"
selection-start-line=
"588"
selection-start-column=
"8"
selection-end-line=
"591"
selection-end-column=
"21"
/>
<state
relative-caret-position=
"96"
>
<caret
line=
"584"
column=
"33"
lean-forward=
"false"
selection-start-line=
"584"
selection-start-column=
"33"
selection-end-line=
"584"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#1233#2896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2902#3430#0#PHP"
expanded=
"false"
/>
...
...
@@ -813,6 +833,7 @@
<element
signature=
"e#15906#16590#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16595#18691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18697#19567#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19572#22068#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22074#22451#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22456#22777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22783#23288#0#PHP"
expanded=
"false"
/>
...
...
@@ -860,8 +881,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/Pay.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"288"
>
<caret
line=
"202"
column=
"62"
lean-forward=
"true"
selection-start-line=
"202"
selection-start-column=
"62"
selection-end-line=
"202"
selection-end-column=
"62"
/>
<state
relative-caret-position=
"44"
>
<caret
line=
"408"
column=
"58"
lean-forward=
"true"
selection-start-line=
"408"
selection-start-column=
"58"
selection-end-line=
"408"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#574#693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#699#1012#0#PHP"
expanded=
"false"
/>
...
...
@@ -871,22 +892,25 @@
<element
signature=
"e#5512#5930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6179#6269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6347#6443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9210#11294#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11358#11476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12333#14108#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14181#14601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14606#22776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22793#23090#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23095#23488#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23515#26993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27022#29927#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29956#34019#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31779#32028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32071#33508#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32530#33486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34048#38511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36278#38026#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38534#38751#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7772#9181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11546#11997#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13212#13330#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14187#15962#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16035#16455#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18227#19634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23664#23782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24230#24461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24639#26416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26501#26798#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26803#27196#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27223#30701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30730#33635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33664#37727#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35779#37216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37264#37366#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37756#42219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39986#41734#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42242#42459#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/admin/lang/zh-cn/video.php
查看文件 @
bdb71ab
...
...
@@ -22,6 +22,7 @@ return [
'Content'
=>
'视频介绍'
,
'Is_recommend'
=>
'是否精选'
,
'Buy_num'
=>
'购买数量'
,
'Money'
=>
'总金额'
,
'Click_num'
=>
'点击数量'
,
'Createtime'
=>
'创建时间'
,
'Updatetime'
=>
'修改时间'
...
...
application/api/controller/Pay.php
查看文件 @
bdb71ab
...
...
@@ -217,11 +217,37 @@ class Pay extends Api
}
}
if
(
!
empty
(
$video_id
)){
//将购买次数加1
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
]);
//判断是否为会员
if
(
$login
[
'is_vip'
]
==
0
){
//不是会员的情况
//将购买次数加1
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num,price,four_price,eight_price,money'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
if
(
$val
[
'attr'
]
==
1
){
$video_money
=
$video
[
'money'
]
+
$video
[
'price'
];
}
elseif
(
$val
[
'attr'
]
==
2
){
$video_money
=
$video
[
'money'
]
+
$video
[
'four_price'
];
}
else
{
$video_money
=
$video
[
'money'
]
+
$video
[
'eight_price'
];
}
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
,
'money'
=>
$video_money
]);
}
}
else
{
//是会员的情况
//将购买次数加1
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num,price,four_price,eight_price,money'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
if
(
$val
[
'attr'
]
==
1
){
$video_money
=
$video
[
'money'
]
+
(
$video
[
'price'
]
*
0.75
);
}
elseif
(
$val
[
'attr'
]
==
2
){
$video_money
=
$video
[
'money'
]
+
(
$video
[
'four_price'
]
*
0.75
);
}
else
{
$video_money
=
$video
[
'money'
]
+
(
$video
[
'eight_price'
]
*
0.75
);
}
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
,
'money'
=>
$video_money
]);
}
}
//判断视频的属性
foreach
(
$video_id
as
&
$val
){
if
(
$val
[
'attr'
]
==
1
){
...
...
@@ -379,10 +405,35 @@ class Pay extends Api
}
}
if
(
!
empty
(
$video_id
)){
//修改购买次数
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
]);
//判断是否为会员
if
(
$login
[
'is_vip'
]
==
0
){
//不是会员的情况
//将购买次数加1
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num,price,four_price,eight_price,money'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
if
(
$val
[
'attr'
]
==
1
){
$video_money
=
$video
[
'money'
]
+
$video
[
'price'
];
}
elseif
(
$val
[
'attr'
]
==
2
){
$video_money
=
$video
[
'money'
]
+
$video
[
'four_price'
];
}
else
{
$video_money
=
$video
[
'money'
]
+
$video
[
'eight_price'
];
}
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
,
'money'
=>
$video_money
]);
}
}
else
{
//是会员的情况
//将购买次数加1
foreach
(
$video_id
as
$key
=>
$val
){
$video
=
Db
::
name
(
'video'
)
->
field
(
'id,buy_num,price,four_price,eight_price,money'
)
->
where
(
'id'
,
$val
[
'id'
])
->
find
();
if
(
$val
[
'attr'
]
==
1
){
$video_money
=
$video
[
'money'
]
+
(
$video
[
'price'
]
*
0.75
);
}
elseif
(
$val
[
'attr'
]
==
2
){
$video_money
=
$video
[
'money'
]
+
(
$video
[
'four_price'
]
*
0.75
);
}
else
{
$video_money
=
$video
[
'money'
]
+
(
$video
[
'eight_price'
]
*
0.75
);
}
Db
::
name
(
'video'
)
->
where
(
'id'
,
$video
[
'id'
])
->
update
([
'buy_num'
=>
$video
[
'buy_num'
]
+
1
,
'money'
=>
$video_money
]);
}
}
//判断视频的属性
foreach
(
$video_id
as
&
$val
){
...
...
public/api.html
查看文件 @
bdb71ab
...
...
@@ -6612,7 +6612,7 @@
<div
class=
"row mt0 footer"
>
<div
class=
"col-md-6"
align=
"left"
>
Generated on 2019-12-07 1
3:36:02
</div>
Generated on 2019-12-07 1
4:25:24
</div>
<div
class=
"col-md-6"
align=
"right"
>
<a
href=
"https://www.fastadmin.net"
target=
"_blank"
>
FastAdmin
</a>
</div>
...
...
public/assets/js/backend/video.js
查看文件 @
bdb71ab
...
...
@@ -40,6 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'eight_url'
,
title
:
__
(
'Eight_url'
),
operate
:
false
,
formatter
:
Table
.
api
.
formatter
.
url
},
{
field
:
'eight_code'
,
title
:
__
(
'Eight_code'
),
operate
:
false
},
{
field
:
'buy_num'
,
title
:
__
(
'Buy_num'
),
operate
:
false
},
{
field
:
'money'
,
title
:
__
(
'Money'
),
operate
:
false
},
{
field
:
'click_num'
,
title
:
__
(
'Click_num'
),
operate
:
false
},
{
field
:
'price'
,
title
:
__
(
'Price'
),
operate
:
false
},
{
field
:
'four_price'
,
title
:
__
(
'Four_price'
),
operate
:
false
},
...
...
请
注册
或
登录
后发表评论