郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c7a78cd814b90c3cf8196bd9e1c3722c834740d2 1 个父辈 940b714a
1 个管道 的构建 通过 耗费 5 秒

修改分享界面图片

内嵌 并排对比
正在显示 7 个修改的文件 包含 202 行增加 和 193 行删除
... ... @@ -6,18 +6,12 @@
<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/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Words.php" afterPath="$PROJECT_DIR$/application/admin/controller/Words.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/lang/zh-cn/words.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
<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$/application/admin/view/words/add.html" afterPath="$PROJECT_DIR$/application/admin/view/words/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/words/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/words/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/words.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/words.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -26,58 +20,49 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="3">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="add.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="25">
<caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
<state relative-caret-position="131">
<caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />
<folding>
<element signature="e#506#1244#0#PHP" expanded="false" />
<element signature="e#1249#2912#0#PHP" expanded="false" />
<element signature="e#2918#3280#0#PHP" expanded="false" />
<element signature="e#3285#3575#0#PHP" expanded="false" />
<element signature="e#3582#4016#0#PHP" expanded="false" />
<element signature="e#4021#4379#0#PHP" expanded="false" />
<element signature="e#4385#4792#0#PHP" expanded="false" />
<element signature="e#4797#5140#0#PHP" expanded="false" />
<element signature="e#5146#5559#0#PHP" expanded="false" />
<element signature="e#5564#5881#0#PHP" expanded="false" />
<element signature="e#5887#6724#0#PHP" expanded="false" />
<element signature="e#6729#8924#0#PHP" expanded="false" />
<element signature="e#8930#9610#0#PHP" expanded="false" />
<element signature="e#9615#10528#0#PHP" expanded="false" />
<element signature="e#10534#11323#0#PHP" expanded="false" />
<element signature="e#11328#12677#0#PHP" expanded="false" />
<element signature="e#12683#13385#0#PHP" expanded="false" />
<element signature="e#13390#14710#0#PHP" expanded="false" />
<element signature="e#14716#15292#0#PHP" expanded="false" />
<element signature="e#15297#15909#0#PHP" expanded="false" />
<element signature="e#19182#20084#0#PHP" expanded="false" />
<element signature="e#20089#22907#0#PHP" expanded="false" />
<element signature="e#22913#23290#0#PHP" expanded="false" />
<element signature="e#23295#23737#0#PHP" expanded="false" />
<element signature="e#514#1252#0#PHP" expanded="false" />
<element signature="e#1257#2920#0#PHP" expanded="false" />
<element signature="e#2926#3288#0#PHP" expanded="false" />
<element signature="e#3293#3583#0#PHP" expanded="false" />
<element signature="e#3589#3911#0#PHP" expanded="false" />
<element signature="e#3916#4203#0#PHP" expanded="false" />
<element signature="e#4210#4644#0#PHP" expanded="false" />
<element signature="e#4649#5007#0#PHP" expanded="false" />
<element signature="e#5013#5420#0#PHP" expanded="false" />
<element signature="e#5425#5768#0#PHP" expanded="false" />
<element signature="e#5774#6187#0#PHP" expanded="false" />
<element signature="e#6192#6509#0#PHP" expanded="false" />
<element signature="e#6515#7352#0#PHP" expanded="false" />
<element signature="e#7357#9552#0#PHP" expanded="false" />
<element signature="e#9558#10238#0#PHP" expanded="false" />
<element signature="e#10243#11156#0#PHP" expanded="false" />
<element signature="e#11162#11951#0#PHP" expanded="false" />
<element signature="e#11956#13305#0#PHP" expanded="false" />
<element signature="e#13311#14013#0#PHP" expanded="false" />
<element signature="e#14018#15338#0#PHP" expanded="false" />
<element signature="e#15344#15920#0#PHP" expanded="false" />
<element signature="e#15925#16537#0#PHP" expanded="false" />
<element signature="e#16543#17259#0#PHP" expanded="false" />
<element signature="e#17264#19804#0#PHP" expanded="false" />
<element signature="e#19810#20712#0#PHP" expanded="false" />
<element signature="e#20717#23535#0#PHP" expanded="false" />
<element signature="e#23541#23918#0#PHP" expanded="false" />
<element signature="e#23923#24365#0#PHP" expanded="false" />
<element signature="e#24368#24377#0#PHP" expanded="false" />
<element signature="e#25137#25642#0#PHP" expanded="false" />
<element signature="e#25647#25898#0#PHP" expanded="false" />
<element signature="e#25904#26383#0#PHP" expanded="false" />
<element signature="e#26388#27145#0#PHP" expanded="false" />
<element signature="e#27151#27632#0#PHP" expanded="false" />
<element signature="e#27637#28407#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -115,10 +100,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
<option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/shou.html" />
<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/view/pic/add.html" />
... ... @@ -159,12 +140,16 @@
<option value="$PROJECT_DIR$/application/admin/view/words/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Words.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.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$/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/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -184,10 +169,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="99" />
<option name="y" value="105" />
<option name="x" value="33" />
<option name="y" value="77" />
<option name="width" value="1940" />
<option name="height" value="883" />
<option name="height" value="941" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -366,7 +351,7 @@
<workItem from="1583368540533" duration="14325000" />
<workItem from="1583392420452" duration="12446000" />
<workItem from="1583454639047" duration="19611000" />
<workItem from="1583481861278" duration="221000" />
<workItem from="1583481861278" duration="4120000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -393,7 +378,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="506001000" />
<option name="totallyTimeSpent" value="509900000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -405,8 +390,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="99" y="105" width="1940" height="883" extended-state="1" />
<editor active="true" />
<frame x="33" y="77" width="1940" height="941" 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.1319149" 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" />
... ... @@ -415,7 +399,7 @@
<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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47184986" 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.47139305" 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" />
... ... @@ -463,34 +447,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="28" column="22" lean-forward="false" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Token.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1500">
<caret line="63" column="27" lean-forward="false" selection-start-line="63" selection-start-column="27" selection-end-line="63" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/fast/Random.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3494">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="877">
<caret line="322" column="70" lean-forward="false" selection-start-line="322" selection-start-column="70" selection-end-line="322" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -661,6 +617,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -668,6 +625,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -675,6 +633,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
... ... @@ -706,27 +665,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
</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="293">
<caret line="16" column="36" lean-forward="true" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
... ... @@ -748,17 +686,11 @@
</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="225">
<caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -785,58 +717,135 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<state relative-caret-position="200">
<caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
<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="275">
<caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="165" column="85" lean-forward="true" selection-start-line="165" selection-start-column="85" selection-end-line="165" selection-end-column="85" />
<state relative-caret-position="207">
<caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
<folding>
<element signature="e#506#1244#0#PHP" expanded="false" />
<element signature="e#1249#2912#0#PHP" expanded="false" />
<element signature="e#2918#3280#0#PHP" expanded="false" />
<element signature="e#3285#3575#0#PHP" expanded="false" />
<element signature="e#3582#4016#0#PHP" expanded="false" />
<element signature="e#4021#4379#0#PHP" expanded="false" />
<element signature="e#4385#4792#0#PHP" expanded="false" />
<element signature="e#4797#5140#0#PHP" expanded="false" />
<element signature="e#5146#5559#0#PHP" expanded="false" />
<element signature="e#5564#5881#0#PHP" expanded="false" />
<element signature="e#5887#6724#0#PHP" expanded="false" />
<element signature="e#6729#8924#0#PHP" expanded="false" />
<element signature="e#8930#9610#0#PHP" expanded="false" />
<element signature="e#9615#10528#0#PHP" expanded="false" />
<element signature="e#10534#11323#0#PHP" expanded="false" />
<element signature="e#11328#12677#0#PHP" expanded="false" />
<element signature="e#12683#13385#0#PHP" expanded="false" />
<element signature="e#13390#14710#0#PHP" expanded="false" />
<element signature="e#14716#15292#0#PHP" expanded="false" />
<element signature="e#15297#15909#0#PHP" expanded="false" />
<element signature="e#19182#20084#0#PHP" expanded="false" />
<element signature="e#20089#22907#0#PHP" expanded="false" />
<element signature="e#22913#23290#0#PHP" expanded="false" />
<element signature="e#23295#23737#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="325">
<caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
<state relative-caret-position="325">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</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="368">
<caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/share.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />
<folding>
<element signature="e#514#1252#0#PHP" expanded="false" />
<element signature="e#1257#2920#0#PHP" expanded="false" />
<element signature="e#2926#3288#0#PHP" expanded="false" />
<element signature="e#3293#3583#0#PHP" expanded="false" />
<element signature="e#3589#3911#0#PHP" expanded="false" />
<element signature="e#3916#4203#0#PHP" expanded="false" />
<element signature="e#4210#4644#0#PHP" expanded="false" />
<element signature="e#4649#5007#0#PHP" expanded="false" />
<element signature="e#5013#5420#0#PHP" expanded="false" />
<element signature="e#5425#5768#0#PHP" expanded="false" />
<element signature="e#5774#6187#0#PHP" expanded="false" />
<element signature="e#6192#6509#0#PHP" expanded="false" />
<element signature="e#6515#7352#0#PHP" expanded="false" />
<element signature="e#7357#9552#0#PHP" expanded="false" />
<element signature="e#9558#10238#0#PHP" expanded="false" />
<element signature="e#10243#11156#0#PHP" expanded="false" />
<element signature="e#11162#11951#0#PHP" expanded="false" />
<element signature="e#11956#13305#0#PHP" expanded="false" />
<element signature="e#13311#14013#0#PHP" expanded="false" />
<element signature="e#14018#15338#0#PHP" expanded="false" />
<element signature="e#15344#15920#0#PHP" expanded="false" />
<element signature="e#15925#16537#0#PHP" expanded="false" />
<element signature="e#16543#17259#0#PHP" expanded="false" />
<element signature="e#17264#19804#0#PHP" expanded="false" />
<element signature="e#19810#20712#0#PHP" expanded="false" />
<element signature="e#20717#23535#0#PHP" expanded="false" />
<element signature="e#23541#23918#0#PHP" expanded="false" />
<element signature="e#23923#24365#0#PHP" expanded="false" />
<element signature="e#24368#24377#0#PHP" expanded="false" />
<element signature="e#25137#25642#0#PHP" expanded="false" />
<element signature="e#25647#25898#0#PHP" expanded="false" />
<element signature="e#25904#26383#0#PHP" expanded="false" />
<element signature="e#26388#27145#0#PHP" expanded="false" />
<element signature="e#27151#27632#0#PHP" expanded="false" />
<element signature="e#27637#28407#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -11,8 +11,8 @@ return [
'Type_ids' => '地区标签',
'text_ids' =>'内容关键字标签',
'Address_ids' =>'地名关键字标签',
'Video' => '2K视频',
'Water_url' => '带水印云盘地址',
'Video' => '720水印预览',
'Water_url' => '720水印小样云盘地址',
'Two_url' => '2k视频地址',
'Two_code' => '2k提取码',
'Four_url' => '4k视频地址',
... ...
... ... @@ -50,27 +50,13 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" placeholder="请上传图片(400px*400px)">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-share"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">
</div>
</div>
<div class="form-group">
<label for="c-avatar" class="control-label col-xs-12 col-sm-2">2k视频上传</label>
<label for="c-avatar" class="control-label col-xs-12 col-sm-2">720水印预览上传</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-avatar" data-rule="required" class="form-control" size="50" name="row[video]" type="text" placeholder="请输入视频">
... ...
... ... @@ -50,27 +50,13 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" value="{$row.share}" placeholder="请上传图片(400px*400px)">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-share"></ul>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">
</div>
</div>
<div class="form-group">
<label for="c-avatar" class="control-label col-xs-12 col-sm-2">2k视频上传</label>
<label for="c-avatar" class="control-label col-xs-12 col-sm-2">720水印预览上传</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-avatar" data-rule="required" class="form-control" size="50" name="row[video]" type="text" value="{$row.video}" placeholder="请输入视频">
... ...
... ... @@ -15,7 +15,7 @@ use fast\Http;
*/
class User extends Api
{
protected $noNeedLogin = ['login','index','type','mine','car','cover','words'];
protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share'];
protected $noNeedRight = '*';
protected $uid = '';
... ... @@ -117,6 +117,34 @@ class User extends Api
$this->success('success',$data);
}
/**
* @ApiTitle (分享封面接口)
* @ApiSummary (分享封面接口)
* @ApiMethod (POST)
* @ApiRoute (/api/user/share)
* @ApiReturn ({
'code':'1',
'msg':'返回成功',
"time": "1571492001",
"data": {
"thumbnail": //分享图地址
"createtime": //创建时间
"updatetime": //修改时间
}
})
*/
public function share()
{
$rule = config('verify.path');
$data = Db::name('share')
->where('id',1)
->field('thumbnail')
->find();
$data['thumbnail'] = $rule.$data['thumbnail'];
$this->success('SUCCESS',$data);
}
/**
* @ApiTitle (首页视频、图片、精美大片入口)
... ...
此 diff 太大无法显示。
... ... @@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'address_ids', title: __('Address_ids'),searchList:$.getJSON('video/address')},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
// {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')},
{field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url},
{field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url},
... ...