郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 bdb71ab20960ae222704af2ca5c6565c9c247d6e 1 个父辈 4f806886
1 个管道 的构建 通过 耗费 1 秒

修改视频总金额

内嵌 并排对比
正在显示 5 个修改的文件 包含 160 行增加 和 83 行删除
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
6 </list> 8 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -16,8 +18,8 @@ @@ -16,8 +18,8 @@
16 <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> 18 <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
17 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 19 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
18 <provider selected="true" editor-type-id="text-editor"> 20 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="196">  
20 - <caret line="588" column="8" lean-forward="true" selection-start-line="588" selection-start-column="8" selection-end-line="591" selection-end-column="21" /> 21 + <state relative-caret-position="96">
  22 + <caret line="584" column="33" lean-forward="false" selection-start-line="584" selection-start-column="33" selection-end-line="584" selection-end-column="33" />
21 <folding> 23 <folding>
22 <element signature="e#1233#2896#0#PHP" expanded="false" /> 24 <element signature="e#1233#2896#0#PHP" expanded="false" />
23 <element signature="e#2902#3430#0#PHP" expanded="false" /> 25 <element signature="e#2902#3430#0#PHP" expanded="false" />
@@ -39,6 +41,7 @@ @@ -39,6 +41,7 @@
39 <element signature="e#15906#16590#0#PHP" expanded="false" /> 41 <element signature="e#15906#16590#0#PHP" expanded="false" />
40 <element signature="e#16595#18691#0#PHP" expanded="false" /> 42 <element signature="e#16595#18691#0#PHP" expanded="false" />
41 <element signature="e#18697#19567#0#PHP" expanded="false" /> 43 <element signature="e#18697#19567#0#PHP" expanded="false" />
  44 + <element signature="e#19572#22068#0#PHP" expanded="false" />
42 <element signature="e#22074#22451#0#PHP" expanded="false" /> 45 <element signature="e#22074#22451#0#PHP" expanded="false" />
43 <element signature="e#22456#22777#0#PHP" expanded="false" /> 46 <element signature="e#22456#22777#0#PHP" expanded="false" />
44 <element signature="e#22783#23288#0#PHP" expanded="false" /> 47 <element signature="e#22783#23288#0#PHP" expanded="false" />
@@ -88,8 +91,8 @@ @@ -88,8 +91,8 @@
88 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> 91 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
89 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 92 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
90 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="288">  
92 - <caret line="202" column="62" lean-forward="true" selection-start-line="202" selection-start-column="62" selection-end-line="202" selection-end-column="62" /> 94 + <state relative-caret-position="44">
  95 + <caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" />
93 <folding> 96 <folding>
94 <element signature="e#574#693#0#PHP" expanded="false" /> 97 <element signature="e#574#693#0#PHP" expanded="false" />
95 <element signature="e#699#1012#0#PHP" expanded="false" /> 98 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -99,22 +102,25 @@ @@ -99,22 +102,25 @@
99 <element signature="e#5512#5930#0#PHP" expanded="false" /> 102 <element signature="e#5512#5930#0#PHP" expanded="false" />
100 <element signature="e#6179#6269#0#PHP" expanded="false" /> 103 <element signature="e#6179#6269#0#PHP" expanded="false" />
101 <element signature="e#6347#6443#0#PHP" expanded="false" /> 104 <element signature="e#6347#6443#0#PHP" expanded="false" />
102 - <element signature="e#9210#11294#0#PHP" expanded="false" />  
103 - <element signature="e#11358#11476#0#PHP" expanded="false" />  
104 - <element signature="e#12333#14108#0#PHP" expanded="false" />  
105 - <element signature="e#14181#14601#0#PHP" expanded="false" />  
106 - <element signature="e#14606#22776#0#PHP" expanded="false" />  
107 - <element signature="e#22793#23090#0#PHP" expanded="false" />  
108 - <element signature="e#23095#23488#0#PHP" expanded="false" />  
109 - <element signature="e#23515#26993#0#PHP" expanded="false" />  
110 - <element signature="e#27022#29927#0#PHP" expanded="false" />  
111 - <element signature="e#29956#34019#0#PHP" expanded="false" />  
112 - <element signature="e#31779#32028#0#PHP" expanded="false" />  
113 - <element signature="e#32071#33508#0#PHP" expanded="false" />  
114 - <element signature="e#32530#33486#0#PHP" expanded="false" />  
115 - <element signature="e#34048#38511#0#PHP" expanded="false" />  
116 - <element signature="e#36278#38026#0#PHP" expanded="false" />  
117 - <element signature="e#38534#38751#0#PHP" expanded="false" /> 105 + <element signature="e#7772#9181#0#PHP" expanded="false" />
  106 + <element signature="e#11546#11997#0#PHP" expanded="false" />
  107 + <element signature="e#13212#13330#0#PHP" expanded="false" />
  108 + <element signature="e#14187#15962#0#PHP" expanded="false" />
  109 + <element signature="e#16035#16455#0#PHP" expanded="false" />
  110 + <element signature="e#18227#19634#0#PHP" expanded="false" />
  111 + <element signature="e#23664#23782#0#PHP" expanded="false" />
  112 + <element signature="e#24230#24461#0#PHP" expanded="false" />
  113 + <element signature="e#24639#26416#0#PHP" expanded="false" />
  114 + <element signature="e#26501#26798#0#PHP" expanded="false" />
  115 + <element signature="e#26803#27196#0#PHP" expanded="false" />
  116 + <element signature="e#27223#30701#0#PHP" expanded="false" />
  117 + <element signature="e#30730#33635#0#PHP" expanded="false" />
  118 + <element signature="e#33664#37727#0#PHP" expanded="false" />
  119 + <element signature="e#35779#37216#0#PHP" expanded="false" />
  120 + <element signature="e#37264#37366#0#PHP" expanded="false" />
  121 + <element signature="e#37756#42219#0#PHP" expanded="false" />
  122 + <element signature="e#39986#41734#0#PHP" expanded="false" />
  123 + <element signature="e#42242#42459#0#PHP" expanded="false" />
118 </folding> 124 </folding>
119 </state> 125 </state>
120 </provider> 126 </provider>
@@ -168,8 +174,6 @@ @@ -168,8 +174,6 @@
168 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 174 <option value="$PROJECT_DIR$/application/extra/verify.php" />
169 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" /> 175 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
170 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 176 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
171 - <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
172 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
173 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> 177 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
174 <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" /> 178 <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
175 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" /> 179 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
@@ -188,6 +192,8 @@ @@ -188,6 +192,8 @@
188 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 192 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
189 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" /> 193 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
190 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> 194 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
  195 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
  196 + <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
191 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 197 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
192 </list> 198 </list>
193 </option> 199 </option>
@@ -206,11 +212,11 @@ @@ -206,11 +212,11 @@
206 <sorting>DEFINITION_ORDER</sorting> 212 <sorting>DEFINITION_ORDER</sorting>
207 </component> 213 </component>
208 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 214 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
209 - <component name="ProjectFrameBounds" extendedState="1">  
210 - <option name="x" value="40" />  
211 - <option name="y" value="43" /> 215 + <component name="ProjectFrameBounds" extendedState="7">
  216 + <option name="x" value="221" />
  217 + <option name="y" value="64" />
212 <option name="width" value="1700" /> 218 <option name="width" value="1700" />
213 - <option name="height" value="1000" /> 219 + <option name="height" value="1100" />
214 </component> 220 </component>
215 <component name="ProjectView"> 221 <component name="ProjectView">
216 <navigator currentView="ProjectPane" proportions="" version="1"> 222 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -243,6 +249,12 @@ @@ -243,6 +249,12 @@
243 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 249 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
244 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 250 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
245 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 251 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  252 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  253 + </path>
  254 + <path>
  255 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  256 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  257 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
246 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 258 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
247 </path> 259 </path>
248 <path> 260 <path>
@@ -252,6 +264,13 @@ @@ -252,6 +264,13 @@
252 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 264 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
253 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 265 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
254 </path> 266 </path>
  267 + <path>
  268 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  269 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  271 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  272 + <item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
  273 + </path>
255 </expand> 274 </expand>
256 <select /> 275 <select />
257 </subPane> 276 </subPane>
@@ -338,7 +357,7 @@ @@ -338,7 +357,7 @@
338 <workItem from="1575541798312" duration="2359000" /> 357 <workItem from="1575541798312" duration="2359000" />
339 <workItem from="1575592025964" duration="640000" /> 358 <workItem from="1575592025964" duration="640000" />
340 <workItem from="1575599624364" duration="95000" /> 359 <workItem from="1575599624364" duration="95000" />
341 - <workItem from="1575680867057" duration="13217000" /> 360 + <workItem from="1575680867057" duration="15315000" />
342 </task> 361 </task>
343 <task id="LOCAL-00001" summary="调试"> 362 <task id="LOCAL-00001" summary="调试">
344 <created>1574145133364</created> 363 <created>1574145133364</created>
@@ -351,7 +370,7 @@ @@ -351,7 +370,7 @@
351 <servers /> 370 <servers />
352 </component> 371 </component>
353 <component name="TimeTrackingManager"> 372 <component name="TimeTrackingManager">
354 - <option name="totallyTimeSpent" value="323116000" /> 373 + <option name="totallyTimeSpent" value="325214000" />
355 </component> 374 </component>
356 <component name="TodoView"> 375 <component name="TodoView">
357 <todo-panel id="selected-file"> 376 <todo-panel id="selected-file">
@@ -363,17 +382,16 @@ @@ -363,17 +382,16 @@
363 </todo-panel> 382 </todo-panel>
364 </component> 383 </component>
365 <component name="ToolWindowManager"> 384 <component name="ToolWindowManager">
366 - <frame x="40" y="43" width="1700" height="1000" extended-state="1" />  
367 - <editor active="true" /> 385 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
368 <layout> 386 <layout>
369 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19512194" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 387 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1705757" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
370 <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" /> 388 <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" />
371 <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" /> 389 <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" />
372 <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" /> 390 <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" />
373 <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" /> 391 <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" />
374 <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" /> 392 <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" />
375 <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" /> 393 <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" />
376 - <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" /> 394 + <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" />
377 <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" /> 395 <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" />
378 <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" /> 396 <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" />
379 <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" /> 397 <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 @@ @@ -548,13 +566,6 @@
548 </state> 566 </state>
549 </provider> 567 </provider>
550 </entry> 568 </entry>
551 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">  
552 - <provider selected="true" editor-type-id="text-editor">  
553 - <state relative-caret-position="125">  
554 - <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />  
555 - </state>  
556 - </provider>  
557 - </entry>  
558 <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> 569 <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
559 <provider selected="true" editor-type-id="text-editor"> 570 <provider selected="true" editor-type-id="text-editor">
560 <state relative-caret-position="475"> 571 <state relative-caret-position="475">
@@ -604,13 +615,6 @@ @@ -604,13 +615,6 @@
604 </state> 615 </state>
605 </provider> 616 </provider>
606 </entry> 617 </entry>
607 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">  
608 - <provider selected="true" editor-type-id="text-editor">  
609 - <state relative-caret-position="325">  
610 - <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />  
611 - </state>  
612 - </provider>  
613 - </entry>  
614 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js"> 618 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
615 <provider selected="true" editor-type-id="text-editor"> 619 <provider selected="true" editor-type-id="text-editor">
616 <state relative-caret-position="400"> 620 <state relative-caret-position="400">
@@ -762,14 +766,6 @@ @@ -762,14 +766,6 @@
762 </state> 766 </state>
763 </provider> 767 </provider>
764 </entry> 768 </entry>
765 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
766 - <provider selected="true" editor-type-id="text-editor">  
767 - <state relative-caret-position="799">  
768 - <caret line="40" column="73" lean-forward="false" selection-start-line="40" selection-start-column="73" selection-end-line="40" selection-end-column="73" />  
769 - <folding />  
770 - </state>  
771 - </provider>  
772 - </entry>  
773 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php"> 769 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
774 <provider selected="true" editor-type-id="text-editor"> 770 <provider selected="true" editor-type-id="text-editor">
775 <state relative-caret-position="338"> 771 <state relative-caret-position="338">
@@ -788,10 +784,34 @@ @@ -788,10 +784,34 @@
788 </state> 784 </state>
789 </provider> 785 </provider>
790 </entry> 786 </entry>
  787 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  788 + <provider selected="true" editor-type-id="text-editor">
  789 + <state relative-caret-position="349">
  790 + <caret line="40" column="75" lean-forward="true" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="75" />
  791 + <folding />
  792 + </state>
  793 + </provider>
  794 + </entry>
  795 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  796 + <provider selected="true" editor-type-id="text-editor">
  797 + <state relative-caret-position="475">
  798 + <caret line="43" column="82" lean-forward="true" selection-start-line="43" selection-start-column="82" selection-end-line="43" selection-end-column="82" />
  799 + <folding />
  800 + </state>
  801 + </provider>
  802 + </entry>
  803 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
  804 + <provider selected="true" editor-type-id="text-editor">
  805 + <state relative-caret-position="600">
  806 + <caret line="24" column="27" lean-forward="false" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
  807 + <folding />
  808 + </state>
  809 + </provider>
  810 + </entry>
791 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 811 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
792 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
793 - <state relative-caret-position="196">  
794 - <caret line="588" column="8" lean-forward="true" selection-start-line="588" selection-start-column="8" selection-end-line="591" selection-end-column="21" /> 813 + <state relative-caret-position="96">
  814 + <caret line="584" column="33" lean-forward="false" selection-start-line="584" selection-start-column="33" selection-end-line="584" selection-end-column="33" />
795 <folding> 815 <folding>
796 <element signature="e#1233#2896#0#PHP" expanded="false" /> 816 <element signature="e#1233#2896#0#PHP" expanded="false" />
797 <element signature="e#2902#3430#0#PHP" expanded="false" /> 817 <element signature="e#2902#3430#0#PHP" expanded="false" />
@@ -813,6 +833,7 @@ @@ -813,6 +833,7 @@
813 <element signature="e#15906#16590#0#PHP" expanded="false" /> 833 <element signature="e#15906#16590#0#PHP" expanded="false" />
814 <element signature="e#16595#18691#0#PHP" expanded="false" /> 834 <element signature="e#16595#18691#0#PHP" expanded="false" />
815 <element signature="e#18697#19567#0#PHP" expanded="false" /> 835 <element signature="e#18697#19567#0#PHP" expanded="false" />
  836 + <element signature="e#19572#22068#0#PHP" expanded="false" />
816 <element signature="e#22074#22451#0#PHP" expanded="false" /> 837 <element signature="e#22074#22451#0#PHP" expanded="false" />
817 <element signature="e#22456#22777#0#PHP" expanded="false" /> 838 <element signature="e#22456#22777#0#PHP" expanded="false" />
818 <element signature="e#22783#23288#0#PHP" expanded="false" /> 839 <element signature="e#22783#23288#0#PHP" expanded="false" />
@@ -860,8 +881,8 @@ @@ -860,8 +881,8 @@
860 </entry> 881 </entry>
861 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 882 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
862 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
863 - <state relative-caret-position="288">  
864 - <caret line="202" column="62" lean-forward="true" selection-start-line="202" selection-start-column="62" selection-end-line="202" selection-end-column="62" /> 884 + <state relative-caret-position="44">
  885 + <caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" />
865 <folding> 886 <folding>
866 <element signature="e#574#693#0#PHP" expanded="false" /> 887 <element signature="e#574#693#0#PHP" expanded="false" />
867 <element signature="e#699#1012#0#PHP" expanded="false" /> 888 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -871,22 +892,25 @@ @@ -871,22 +892,25 @@
871 <element signature="e#5512#5930#0#PHP" expanded="false" /> 892 <element signature="e#5512#5930#0#PHP" expanded="false" />
872 <element signature="e#6179#6269#0#PHP" expanded="false" /> 893 <element signature="e#6179#6269#0#PHP" expanded="false" />
873 <element signature="e#6347#6443#0#PHP" expanded="false" /> 894 <element signature="e#6347#6443#0#PHP" expanded="false" />
874 - <element signature="e#9210#11294#0#PHP" expanded="false" />  
875 - <element signature="e#11358#11476#0#PHP" expanded="false" />  
876 - <element signature="e#12333#14108#0#PHP" expanded="false" />  
877 - <element signature="e#14181#14601#0#PHP" expanded="false" />  
878 - <element signature="e#14606#22776#0#PHP" expanded="false" />  
879 - <element signature="e#22793#23090#0#PHP" expanded="false" />  
880 - <element signature="e#23095#23488#0#PHP" expanded="false" />  
881 - <element signature="e#23515#26993#0#PHP" expanded="false" />  
882 - <element signature="e#27022#29927#0#PHP" expanded="false" />  
883 - <element signature="e#29956#34019#0#PHP" expanded="false" />  
884 - <element signature="e#31779#32028#0#PHP" expanded="false" />  
885 - <element signature="e#32071#33508#0#PHP" expanded="false" />  
886 - <element signature="e#32530#33486#0#PHP" expanded="false" />  
887 - <element signature="e#34048#38511#0#PHP" expanded="false" />  
888 - <element signature="e#36278#38026#0#PHP" expanded="false" />  
889 - <element signature="e#38534#38751#0#PHP" expanded="false" /> 895 + <element signature="e#7772#9181#0#PHP" expanded="false" />
  896 + <element signature="e#11546#11997#0#PHP" expanded="false" />
  897 + <element signature="e#13212#13330#0#PHP" expanded="false" />
  898 + <element signature="e#14187#15962#0#PHP" expanded="false" />
  899 + <element signature="e#16035#16455#0#PHP" expanded="false" />
  900 + <element signature="e#18227#19634#0#PHP" expanded="false" />
  901 + <element signature="e#23664#23782#0#PHP" expanded="false" />
  902 + <element signature="e#24230#24461#0#PHP" expanded="false" />
  903 + <element signature="e#24639#26416#0#PHP" expanded="false" />
  904 + <element signature="e#26501#26798#0#PHP" expanded="false" />
  905 + <element signature="e#26803#27196#0#PHP" expanded="false" />
  906 + <element signature="e#27223#30701#0#PHP" expanded="false" />
  907 + <element signature="e#30730#33635#0#PHP" expanded="false" />
  908 + <element signature="e#33664#37727#0#PHP" expanded="false" />
  909 + <element signature="e#35779#37216#0#PHP" expanded="false" />
  910 + <element signature="e#37264#37366#0#PHP" expanded="false" />
  911 + <element signature="e#37756#42219#0#PHP" expanded="false" />
  912 + <element signature="e#39986#41734#0#PHP" expanded="false" />
  913 + <element signature="e#42242#42459#0#PHP" expanded="false" />
890 </folding> 914 </folding>
891 </state> 915 </state>
892 </provider> 916 </provider>
@@ -22,6 +22,7 @@ return [ @@ -22,6 +22,7 @@ return [
22 'Content' =>'视频介绍', 22 'Content' =>'视频介绍',
23 'Is_recommend' => '是否精选', 23 'Is_recommend' => '是否精选',
24 'Buy_num' =>'购买数量', 24 'Buy_num' =>'购买数量',
  25 + 'Money' =>'总金额',
25 'Click_num' =>'点击数量', 26 'Click_num' =>'点击数量',
26 'Createtime' => '创建时间', 27 'Createtime' => '创建时间',
27 'Updatetime' => '修改时间' 28 'Updatetime' => '修改时间'
@@ -217,11 +217,37 @@ class Pay extends Api @@ -217,11 +217,37 @@ class Pay extends Api
217 } 217 }
218 } 218 }
219 if(!empty($video_id)){ 219 if(!empty($video_id)){
220 - //将购买次数加1  
221 - foreach ($video_id as $key => $val){  
222 - $video = Db::name('video')->field('id,buy_num')->where('id',$val['id'])->find();  
223 - Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1]); 220 + //判断是否为会员
  221 + if($login['is_vip'] == 0){
  222 + //不是会员的情况
  223 + //将购买次数加1
  224 + foreach ($video_id as $key => $val){
  225 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  226 + if($val['attr'] == 1){
  227 + $video_money = $video['money'] + $video['price'];
  228 + }elseif ($val['attr'] == 2){
  229 + $video_money = $video['money'] + $video['four_price'];
  230 + }else{
  231 + $video_money = $video['money'] + $video['eight_price'];
  232 + }
  233 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  234 + }
  235 + }else{
  236 + //是会员的情况
  237 + //将购买次数加1
  238 + foreach ($video_id as $key => $val){
  239 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  240 + if($val['attr'] == 1){
  241 + $video_money = $video['money'] + ($video['price']*0.75);
  242 + }elseif ($val['attr'] == 2){
  243 + $video_money = $video['money'] + ($video['four_price']*0.75);
  244 + }else{
  245 + $video_money = $video['money'] + ($video['eight_price']*0.75);
  246 + }
  247 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  248 + }
224 } 249 }
  250 +
225 //判断视频的属性 251 //判断视频的属性
226 foreach ($video_id as &$val){ 252 foreach ($video_id as &$val){
227 if($val['attr'] == 1){ 253 if($val['attr'] == 1){
@@ -379,10 +405,35 @@ class Pay extends Api @@ -379,10 +405,35 @@ class Pay extends Api
379 } 405 }
380 } 406 }
381 if(!empty($video_id)){ 407 if(!empty($video_id)){
382 - //修改购买次数  
383 - foreach ($video_id as $key => $val){  
384 - $video = Db::name('video')->field('id,buy_num')->where('id',$val['id'])->find();  
385 - Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1]); 408 + //判断是否为会员
  409 + if($login['is_vip'] == 0){
  410 + //不是会员的情况
  411 + //将购买次数加1
  412 + foreach ($video_id as $key => $val){
  413 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  414 + if($val['attr'] == 1){
  415 + $video_money = $video['money'] + $video['price'];
  416 + }elseif ($val['attr'] == 2){
  417 + $video_money = $video['money'] + $video['four_price'];
  418 + }else{
  419 + $video_money = $video['money'] + $video['eight_price'];
  420 + }
  421 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  422 + }
  423 + }else{
  424 + //是会员的情况
  425 + //将购买次数加1
  426 + foreach ($video_id as $key => $val){
  427 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  428 + if($val['attr'] == 1){
  429 + $video_money = $video['money'] + ($video['price']*0.75);
  430 + }elseif ($val['attr'] == 2){
  431 + $video_money = $video['money'] + ($video['four_price']*0.75);
  432 + }else{
  433 + $video_money = $video['money'] + ($video['eight_price']*0.75);
  434 + }
  435 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  436 + }
386 } 437 }
387 //判断视频的属性 438 //判断视频的属性
388 foreach ($video_id as &$val){ 439 foreach ($video_id as &$val){
@@ -6612,7 +6612,7 @@ @@ -6612,7 +6612,7 @@
6612 6612
6613 <div class="row mt0 footer"> 6613 <div class="row mt0 footer">
6614 <div class="col-md-6" align="left"> 6614 <div class="col-md-6" align="left">
6615 - Generated on 2019-12-07 13:36:02 </div> 6615 + Generated on 2019-12-07 14:25:24 </div>
6616 <div class="col-md-6" align="right"> 6616 <div class="col-md-6" align="right">
6617 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 6617 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
6618 </div> 6618 </div>
@@ -40,6 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -40,6 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
40 {field: 'eight_url', title: __('Eight_url'),operate:false, formatter: Table.api.formatter.url}, 40 {field: 'eight_url', title: __('Eight_url'),operate:false, formatter: Table.api.formatter.url},
41 {field: 'eight_code', title: __('Eight_code'),operate:false}, 41 {field: 'eight_code', title: __('Eight_code'),operate:false},
42 {field: 'buy_num', title: __('Buy_num'),operate:false}, 42 {field: 'buy_num', title: __('Buy_num'),operate:false},
  43 + {field: 'money', title: __('Money'),operate:false},
43 {field: 'click_num', title: __('Click_num'),operate:false}, 44 {field: 'click_num', title: __('Click_num'),operate:false},
44 {field: 'price', title: __('Price'),operate:false}, 45 {field: 'price', title: __('Price'),operate:false},
45 {field: 'four_price', title: __('Four_price'),operate:false}, 46 {field: 'four_price', title: __('Four_price'),operate:false},