郭盛 / areial · 提交

转到一个项目

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

修改提取码

内嵌 并排对比
正在显示 3 个修改的文件 包含 142 行增加 和 136 行删除
... ... @@ -2,14 +2,8 @@
<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/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<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/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/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -20,42 +14,64 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<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="280">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pic.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="33" column="55" lean-forward="false" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pic.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<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 relative-caret-position="-448">
<caret line="500" column="31" lean-forward="true" selection-start-line="500" selection-start-column="31" selection-end-line="500" selection-end-column="31" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<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#15290#0#PHP" expanded="false" />
<element signature="e#15296#16166#0#PHP" expanded="false" />
<element signature="e#18385#18762#0#PHP" expanded="false" />
<element signature="e#18767#19031#0#PHP" expanded="false" />
<element signature="e#19037#19542#0#PHP" expanded="false" />
<element signature="e#19547#19798#0#PHP" expanded="false" />
<element signature="e#19804#20283#0#PHP" expanded="false" />
<element signature="e#20288#21045#0#PHP" expanded="false" />
<element signature="e#21051#21532#0#PHP" expanded="false" />
<element signature="e#21537#22307#0#PHP" expanded="false" />
<element signature="e#22313#22676#0#PHP" expanded="false" />
<element signature="e#22681#22872#0#PHP" expanded="false" />
<element signature="e#22878#23236#0#PHP" expanded="false" />
<element signature="e#23241#23431#0#PHP" expanded="false" />
<element signature="e#23437#24580#0#PHP" expanded="false" />
<element signature="e#24585#27250#0#PHP" expanded="false" />
<element signature="e#27256#27754#0#PHP" expanded="false" />
<element signature="e#27759#29124#0#PHP" expanded="false" />
<element signature="e#29130#29543#0#PHP" expanded="false" />
<element signature="e#29548#30027#0#PHP" expanded="false" />
<element signature="e#30033#30567#0#PHP" expanded="false" />
<element signature="e#30572#31486#0#PHP" expanded="false" />
<element signature="e#31492#32146#0#PHP" expanded="false" />
<element signature="e#32151#33418#0#PHP" expanded="false" />
<element signature="e#33424#34184#0#PHP" expanded="false" />
<element signature="e#34189#35264#0#PHP" expanded="false" />
<element signature="e#35290#36121#0#PHP" expanded="false" />
<element signature="e#36127#36547#0#PHP" expanded="false" />
<element signature="e#36552#37035#0#PHP" expanded="false" />
<element signature="e#37041#37847#0#PHP" expanded="false" />
<element signature="e#37852#41006#0#PHP" expanded="false" />
<element signature="e#41021#42386#0#PHP" expanded="false" />
<element signature="e#42402#43466#0#PHP" expanded="false" />
<element signature="e#43473#44231#0#PHP" expanded="false" />
<element signature="e#44236#46500#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -107,7 +123,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<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/admin/view/video/add.html" />
... ... @@ -116,6 +131,7 @@
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<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/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -134,8 +150,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="190" />
<option name="y" value="100" />
<option name="x" value="218" />
<option name="y" value="34" />
<option name="width" value="1806" />
<option name="height" value="989" />
</component>
... ... @@ -170,22 +186,14 @@
<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="api" 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="lang" 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="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="zh-cn" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -241,7 +249,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="7006000" />
<workItem from="1574410294356" duration="7574000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -254,7 +262,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="168953000" />
<option name="totallyTimeSpent" value="169521000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -266,8 +274,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="190" y="100" width="1806" height="989" extended-state="0" />
<editor active="true" />
<frame x="218" y="34" width="1806" height="989" extended-state="0" />
<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" />
... ... @@ -276,7 +283,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14908257" 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.14906104" 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" />
... ... @@ -585,67 +592,6 @@
</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="147">
<caret line="1201" column="14" lean-forward="true" selection-start-line="1201" selection-start-column="14" selection-end-line="1201" selection-end-column="14" />
<folding>
<element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<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#15282#0#PHP" expanded="false" />
<element signature="e#15288#16158#0#PHP" expanded="false" />
<element signature="e#16163#18311#0#PHP" expanded="false" />
<element signature="e#18317#18694#0#PHP" expanded="false" />
<element signature="e#18699#18963#0#PHP" expanded="false" />
<element signature="e#18969#19474#0#PHP" expanded="false" />
<element signature="e#19479#19730#0#PHP" expanded="false" />
<element signature="e#19736#20215#0#PHP" expanded="false" />
<element signature="e#20220#20977#0#PHP" expanded="false" />
<element signature="e#20983#21464#0#PHP" expanded="false" />
<element signature="e#21469#22239#0#PHP" expanded="false" />
<element signature="e#22245#22608#0#PHP" expanded="false" />
<element signature="e#22613#22804#0#PHP" expanded="false" />
<element signature="e#22810#23168#0#PHP" expanded="false" />
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
<element signature="e#29965#30499#0#PHP" expanded="false" />
<element signature="e#30504#31418#0#PHP" expanded="false" />
<element signature="e#31424#32078#0#PHP" expanded="false" />
<element signature="e#32083#33350#0#PHP" expanded="false" />
<element signature="e#33356#34116#0#PHP" expanded="false" />
<element signature="e#34121#35196#0#PHP" expanded="false" />
<element signature="e#35222#36053#0#PHP" expanded="false" />
<element signature="e#36059#36479#0#PHP" expanded="false" />
<element signature="e#36484#36967#0#PHP" expanded="false" />
<element signature="e#36973#37779#0#PHP" expanded="false" />
<element signature="e#40953#42313#0#PHP" expanded="false" />
<element signature="e#42329#43388#0#PHP" expanded="false" />
<element signature="e#43395#44153#0#PHP" expanded="false" />
<element signature="e#44158#46422#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
... ... @@ -717,10 +663,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<state relative-caret-position="200">
<caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
<folding />
</state>
</provider>
... ... @@ -733,13 +679,73 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
<state relative-caret-position="280">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<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="-448">
<caret line="500" column="31" lean-forward="true" selection-start-line="500" selection-start-column="31" selection-end-line="500" selection-end-column="31" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<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#15290#0#PHP" expanded="false" />
<element signature="e#15296#16166#0#PHP" expanded="false" />
<element signature="e#18385#18762#0#PHP" expanded="false" />
<element signature="e#18767#19031#0#PHP" expanded="false" />
<element signature="e#19037#19542#0#PHP" expanded="false" />
<element signature="e#19547#19798#0#PHP" expanded="false" />
<element signature="e#19804#20283#0#PHP" expanded="false" />
<element signature="e#20288#21045#0#PHP" expanded="false" />
<element signature="e#21051#21532#0#PHP" expanded="false" />
<element signature="e#21537#22307#0#PHP" expanded="false" />
<element signature="e#22313#22676#0#PHP" expanded="false" />
<element signature="e#22681#22872#0#PHP" expanded="false" />
<element signature="e#22878#23236#0#PHP" expanded="false" />
<element signature="e#23241#23431#0#PHP" expanded="false" />
<element signature="e#23437#24580#0#PHP" expanded="false" />
<element signature="e#24585#27250#0#PHP" expanded="false" />
<element signature="e#27256#27754#0#PHP" expanded="false" />
<element signature="e#27759#29124#0#PHP" expanded="false" />
<element signature="e#29130#29543#0#PHP" expanded="false" />
<element signature="e#29548#30027#0#PHP" expanded="false" />
<element signature="e#30033#30567#0#PHP" expanded="false" />
<element signature="e#30572#31486#0#PHP" expanded="false" />
<element signature="e#31492#32146#0#PHP" expanded="false" />
<element signature="e#32151#33418#0#PHP" expanded="false" />
<element signature="e#33424#34184#0#PHP" expanded="false" />
<element signature="e#34189#35264#0#PHP" expanded="false" />
<element signature="e#35290#36121#0#PHP" expanded="false" />
<element signature="e#36127#36547#0#PHP" expanded="false" />
<element signature="e#36552#37035#0#PHP" expanded="false" />
<element signature="e#37041#37847#0#PHP" expanded="false" />
<element signature="e#37852#41006#0#PHP" expanded="false" />
<element signature="e#41021#42386#0#PHP" expanded="false" />
<element signature="e#42402#43466#0#PHP" expanded="false" />
<element signature="e#43473#44231#0#PHP" expanded="false" />
<element signature="e#44236#46500#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -426,7 +426,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,water_url,content')
->field('id,title,thumbnail,price,water_url,url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -444,7 +444,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,water_url,content')
->field('id,title,thumbnail,price,water_url,url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -502,7 +502,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,eight_url,content')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -522,7 +522,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,eight_url,content')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -1243,7 +1243,7 @@ class User extends Api
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
$v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
... ... @@ -1273,7 +1273,7 @@ class User extends Api
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
$v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
}
}
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 17:41:19 </div>
Generated on 2019-11-22 19:05:22 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...