郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4513e2b20dacd1cee6eec1b33dcc9e3266120031 1 个父辈 0786452b
1 个管道 的构建 通过 耗费 1 秒

修改后台小样上传

内嵌 并排对比
正在显示 7 个修改的文件 包含 135 行增加 和 81 行删除
@@ -2,9 +2,12 @@ @@ -2,9 +2,12 @@
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/common/library/Auth.php" afterPath="$PROJECT_DIR$/application/common/library/Auth.php" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
8 </list> 11 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -18,14 +21,17 @@ @@ -18,14 +21,17 @@
18 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 21 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
19 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 22 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
20 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
21 - <state relative-caret-position="219">  
22 - <caret line="306" column="30" lean-forward="true" selection-start-line="306" selection-start-column="30" selection-end-line="306" selection-end-column="30" /> 24 + <state relative-caret-position="600">
  25 + <caret line="331" column="58" lean-forward="false" selection-start-line="331" selection-start-column="58" selection-end-line="331" selection-end-column="58" />
23 <folding> 26 <folding>
24 <element signature="e#38#68#0#PHP" expanded="true" /> 27 <element signature="e#38#68#0#PHP" expanded="true" />
25 <element signature="e#462#1200#0#PHP" expanded="false" /> 28 <element signature="e#462#1200#0#PHP" expanded="false" />
  29 + <element signature="e#1205#2868#0#PHP" expanded="false" />
26 <element signature="e#2874#3402#0#PHP" expanded="false" /> 30 <element signature="e#2874#3402#0#PHP" expanded="false" />
27 <element signature="e#3407#4178#0#PHP" expanded="false" /> 31 <element signature="e#3407#4178#0#PHP" expanded="false" />
28 <element signature="e#4184#4591#0#PHP" expanded="false" /> 32 <element signature="e#4184#4591#0#PHP" expanded="false" />
  33 + <element signature="e#4945#5597#0#PHP" expanded="false" />
  34 + <element signature="e#5602#7338#0#PHP" expanded="false" />
29 <element signature="e#7344#7793#0#PHP" expanded="false" /> 35 <element signature="e#7344#7793#0#PHP" expanded="false" />
30 <element signature="e#7798#8681#0#PHP" expanded="false" /> 36 <element signature="e#7798#8681#0#PHP" expanded="false" />
31 </folding> 37 </folding>
@@ -33,26 +39,6 @@ @@ -33,26 +39,6 @@
33 </provider> 39 </provider>
34 </entry> 40 </entry>
35 </file> 41 </file>
36 - <file leaf-file-name="Auth.php" pinned="false" current-in-tab="false">  
37 - <entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">  
38 - <provider selected="true" editor-type-id="text-editor">  
39 - <state relative-caret-position="585">  
40 - <caret line="105" column="38" lean-forward="true" selection-start-line="105" selection-start-column="38" selection-end-line="105" selection-end-column="38" />  
41 - <folding />  
42 - </state>  
43 - </provider>  
44 - </entry>  
45 - </file>  
46 - <file leaf-file-name="verify.php" pinned="false" current-in-tab="false">  
47 - <entry file="file://$PROJECT_DIR$/application/extra/verify.php">  
48 - <provider selected="true" editor-type-id="text-editor">  
49 - <state relative-caret-position="450">  
50 - <caret line="18" column="40" lean-forward="true" selection-start-line="18" selection-start-column="40" selection-end-line="18" selection-end-column="40" />  
51 - <folding />  
52 - </state>  
53 - </provider>  
54 - </entry>  
55 - </file>  
56 </leaf> 42 </leaf>
57 </component> 43 </component>
58 <component name="FindInProjectRecents"> 44 <component name="FindInProjectRecents">
@@ -85,10 +71,6 @@ @@ -85,10 +71,6 @@
85 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" /> 71 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
86 <option value="$PROJECT_DIR$/application/admin/model/Type.php" /> 72 <option value="$PROJECT_DIR$/application/admin/model/Type.php" />
87 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" /> 73 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
88 - <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />  
89 - <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />  
90 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />  
91 - <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />  
92 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 74 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
93 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" /> 75 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
94 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" /> 76 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
@@ -103,6 +85,10 @@ @@ -103,6 +85,10 @@
103 <option value="$PROJECT_DIR$/public/.gitignore" /> 85 <option value="$PROJECT_DIR$/public/.gitignore" />
104 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 86 <option value="$PROJECT_DIR$/application/extra/verify.php" />
105 <option value="$PROJECT_DIR$/application/common/library/Auth.php" /> 87 <option value="$PROJECT_DIR$/application/common/library/Auth.php" />
  88 + <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
  89 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
  90 + <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
  91 + <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
106 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 92 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
107 </list> 93 </list>
108 </option> 94 </option>
@@ -122,8 +108,8 @@ @@ -122,8 +108,8 @@
122 </component> 108 </component>
123 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 109 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
124 <component name="ProjectFrameBounds"> 110 <component name="ProjectFrameBounds">
125 - <option name="x" value="529" />  
126 - <option name="y" value="29" /> 111 + <option name="x" value="253" />
  112 + <option name="y" value="32" />
127 <option name="width" value="1589" /> 113 <option name="width" value="1589" />
128 <option name="height" value="939" /> 114 <option name="height" value="939" />
129 </component> 115 </component>
@@ -158,20 +144,55 @@ @@ -158,20 +144,55 @@
158 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 144 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
159 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 145 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
160 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 146 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
161 - <item name="common" type="2a2b976b:PhpTreeStructureProvider$1" /> 147 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  148 + </path>
  149 + <path>
  150 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  151 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  152 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  153 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  154 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
162 </path> 155 </path>
163 <path> 156 <path>
164 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 157 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
165 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 158 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
166 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 159 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
167 - <item name="common" type="2a2b976b:PhpTreeStructureProvider$1" />  
168 - <item name="library" type="2a2b976b:PhpTreeStructureProvider$1" /> 160 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  161 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
169 </path> 162 </path>
170 <path> 163 <path>
171 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 164 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
172 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 165 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
173 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 166 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
174 - <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" /> 167 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  168 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  169 + <item name="pic" type="2a2b976b:PhpTreeStructureProvider$1" />
  170 + </path>
  171 + <path>
  172 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  173 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  174 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  175 + </path>
  176 + <path>
  177 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  178 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  179 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  180 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  181 + </path>
  182 + <path>
  183 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  184 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  185 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  186 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  187 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  188 + </path>
  189 + <path>
  190 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  191 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  192 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  193 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  194 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  195 + <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
175 </path> 196 </path>
176 </expand> 197 </expand>
177 <select /> 198 <select />
@@ -219,7 +240,7 @@ @@ -219,7 +240,7 @@
219 <workItem from="1574122453532" duration="15780000" /> 240 <workItem from="1574122453532" duration="15780000" />
220 <workItem from="1574141466352" duration="745000" /> 241 <workItem from="1574141466352" duration="745000" />
221 <workItem from="1574143209694" duration="3660000" /> 242 <workItem from="1574143209694" duration="3660000" />
222 - <workItem from="1574146994475" duration="7109000" /> 243 + <workItem from="1574146994475" duration="8359000" />
223 </task> 244 </task>
224 <task id="LOCAL-00001" summary="调试"> 245 <task id="LOCAL-00001" summary="调试">
225 <created>1574145133364</created> 246 <created>1574145133364</created>
@@ -232,7 +253,7 @@ @@ -232,7 +253,7 @@
232 <servers /> 253 <servers />
233 </component> 254 </component>
234 <component name="TimeTrackingManager"> 255 <component name="TimeTrackingManager">
235 - <option name="totallyTimeSpent" value="55462000" /> 256 + <option name="totallyTimeSpent" value="56712000" />
236 </component> 257 </component>
237 <component name="TodoView"> 258 <component name="TodoView">
238 <todo-panel id="selected-file"> 259 <todo-panel id="selected-file">
@@ -244,7 +265,7 @@ @@ -244,7 +265,7 @@
244 </todo-panel> 265 </todo-panel>
245 </component> 266 </component>
246 <component name="ToolWindowManager"> 267 <component name="ToolWindowManager">
247 - <frame x="529" y="29" width="1589" height="939" extended-state="0" /> 268 + <frame x="253" y="32" width="1589" height="939" extended-state="0" />
248 <layout> 269 <layout>
249 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18574232" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 270 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18574232" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
250 <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" /> 271 <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" />
@@ -427,20 +448,6 @@ @@ -427,20 +448,6 @@
427 </state> 448 </state>
428 </provider> 449 </provider>
429 </entry> 450 </entry>
430 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">  
431 - <provider selected="true" editor-type-id="text-editor">  
432 - <state relative-caret-position="361">  
433 - <caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="57" selection-end-column="10" />  
434 - </state>  
435 - </provider>  
436 - </entry>  
437 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">  
438 - <provider selected="true" editor-type-id="text-editor">  
439 - <state relative-caret-position="161">  
440 - <caret line="46" column="4" lean-forward="true" selection-start-line="46" selection-start-column="4" selection-end-line="57" selection-end-column="10" />  
441 - </state>  
442 - </provider>  
443 - </entry>  
444 <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> 451 <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
445 <provider selected="true" editor-type-id="text-editor"> 452 <provider selected="true" editor-type-id="text-editor">
446 <state relative-caret-position="675"> 453 <state relative-caret-position="675">
@@ -455,13 +462,6 @@ @@ -455,13 +462,6 @@
455 </state> 462 </state>
456 </provider> 463 </provider>
457 </entry> 464 </entry>
458 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">  
459 - <provider selected="true" editor-type-id="text-editor">  
460 - <state relative-caret-position="275">  
461 - <caret line="11" column="4" lean-forward="false" selection-start-line="11" selection-start-column="4" selection-end-line="12" selection-end-column="28" />  
462 - </state>  
463 - </provider>  
464 - </entry>  
465 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"> 465 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
466 <provider selected="true" editor-type-id="text-editor"> 466 <provider selected="true" editor-type-id="text-editor">
467 <state relative-caret-position="325"> 467 <state relative-caret-position="325">
@@ -476,13 +476,6 @@ @@ -476,13 +476,6 @@
476 </state> 476 </state>
477 </provider> 477 </provider>
478 </entry> 478 </entry>
479 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">  
480 - <provider selected="true" editor-type-id="text-editor">  
481 - <state relative-caret-position="564">  
482 - <caret line="178" column="4" lean-forward="true" selection-start-line="178" selection-start-column="4" selection-end-line="321" selection-end-column="5" />  
483 - </state>  
484 - </provider>  
485 - </entry>  
486 <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php"> 479 <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
487 <provider selected="true" editor-type-id="text-editor"> 480 <provider selected="true" editor-type-id="text-editor">
488 <state relative-caret-position="3867"> 481 <state relative-caret-position="3867">
@@ -497,13 +490,6 @@ @@ -497,13 +490,6 @@
497 </state> 490 </state>
498 </provider> 491 </provider>
499 </entry> 492 </entry>
500 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
501 - <provider selected="true" editor-type-id="text-editor">  
502 - <state relative-caret-position="525">  
503 - <caret line="27" column="61" lean-forward="true" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />  
504 - </state>  
505 - </provider>  
506 - </entry>  
507 <entry file="file://$PROJECT_DIR$/application/api/library/ExceptionHandle.php"> 493 <entry file="file://$PROJECT_DIR$/application/api/library/ExceptionHandle.php">
508 <provider selected="true" editor-type-id="text-editor"> 494 <provider selected="true" editor-type-id="text-editor">
509 <state relative-caret-position="-61"> 495 <state relative-caret-position="-61">
@@ -647,16 +633,66 @@ @@ -647,16 +633,66 @@
647 </state> 633 </state>
648 </provider> 634 </provider>
649 </entry> 635 </entry>
  636 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
  637 + <provider selected="true" editor-type-id="text-editor">
  638 + <state relative-caret-position="175">
  639 + <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
  640 + <folding />
  641 + </state>
  642 + </provider>
  643 + </entry>
  644 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
  645 + <provider selected="true" editor-type-id="text-editor">
  646 + <state relative-caret-position="511">
  647 + <caret line="34" column="28" lean-forward="true" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
  648 + <folding />
  649 + </state>
  650 + </provider>
  651 + </entry>
  652 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
  653 + <provider selected="true" editor-type-id="text-editor">
  654 + <state relative-caret-position="205">
  655 + <caret line="33" column="10" lean-forward="true" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" />
  656 + <folding />
  657 + </state>
  658 + </provider>
  659 + </entry>
  660 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  661 + <provider selected="true" editor-type-id="text-editor">
  662 + <state relative-caret-position="200">
  663 + <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
  664 + <folding />
  665 + </state>
  666 + </provider>
  667 + </entry>
  668 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
  669 + <provider selected="true" editor-type-id="text-editor">
  670 + <state relative-caret-position="1200">
  671 + <caret line="169" column="27" lean-forward="false" selection-start-line="169" selection-start-column="27" selection-end-line="169" selection-end-column="27" />
  672 + <folding>
  673 + <element signature="e#693#1831#0#PHP" expanded="false" />
  674 + <element signature="e#1863#3665#0#PHP" expanded="false" />
  675 + <element signature="e#3697#5737#0#PHP" expanded="false" />
  676 + <element signature="e#5743#5987#0#PHP" expanded="false" />
  677 + <element signature="e#5993#6139#0#PHP" expanded="false" />
  678 + <element signature="e#6144#11945#0#PHP" expanded="false" />
  679 + </folding>
  680 + </state>
  681 + </provider>
  682 + </entry>
650 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 683 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
651 <provider selected="true" editor-type-id="text-editor"> 684 <provider selected="true" editor-type-id="text-editor">
652 - <state relative-caret-position="219">  
653 - <caret line="306" column="30" lean-forward="true" selection-start-line="306" selection-start-column="30" selection-end-line="306" selection-end-column="30" /> 685 + <state relative-caret-position="600">
  686 + <caret line="331" column="58" lean-forward="false" selection-start-line="331" selection-start-column="58" selection-end-line="331" selection-end-column="58" />
654 <folding> 687 <folding>
655 <element signature="e#38#68#0#PHP" expanded="true" /> 688 <element signature="e#38#68#0#PHP" expanded="true" />
656 <element signature="e#462#1200#0#PHP" expanded="false" /> 689 <element signature="e#462#1200#0#PHP" expanded="false" />
  690 + <element signature="e#1205#2868#0#PHP" expanded="false" />
657 <element signature="e#2874#3402#0#PHP" expanded="false" /> 691 <element signature="e#2874#3402#0#PHP" expanded="false" />
658 <element signature="e#3407#4178#0#PHP" expanded="false" /> 692 <element signature="e#3407#4178#0#PHP" expanded="false" />
659 <element signature="e#4184#4591#0#PHP" expanded="false" /> 693 <element signature="e#4184#4591#0#PHP" expanded="false" />
  694 + <element signature="e#4945#5597#0#PHP" expanded="false" />
  695 + <element signature="e#5602#7338#0#PHP" expanded="false" />
660 <element signature="e#7344#7793#0#PHP" expanded="false" /> 696 <element signature="e#7344#7793#0#PHP" expanded="false" />
661 <element signature="e#7798#8681#0#PHP" expanded="false" /> 697 <element signature="e#7798#8681#0#PHP" expanded="false" />
662 </folding> 698 </folding>
@@ -5,7 +5,7 @@ return [ @@ -5,7 +5,7 @@ return [
5 'Keyword' => '关键词（多个关键词中间用逗号隔开）', 5 'Keyword' => '关键词（多个关键词中间用逗号隔开）',
6 'Thumbnail' => '缩略图', 6 'Thumbnail' => '缩略图',
7 'Type_ids' => '地区标签', 7 'Type_ids' => '地区标签',
8 - 'Water_url' => '带水印的百度云盘地址', 8 + 'Water_url' => '带水印的小样图片',
9 'Url' => '高清百度云盘地址', 9 'Url' => '高清百度云盘地址',
10 'Is_recommend' => '是否精选', 10 'Is_recommend' => '是否精选',
11 'Content' => '图片介绍', 11 'Content' => '图片介绍',
@@ -35,7 +35,15 @@ @@ -35,7 +35,15 @@
35 <div class="form-group"> 35 <div class="form-group">
36 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label> 36 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
37 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
38 - <input id="c-water_url" data-rule="required" class="form-control" name="row[water_url]" type="text" placeholder="请输入带水印网址"> 38 + <div class="input-group">
  39 + <input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" type="text" placeholder="请上传小样图片">
  40 + <div class="input-group-addon no-border no-padding">
  41 + <span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  42 + <span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  43 + </div>
  44 + <span class="msg-box n-right"></span>
  45 + </div>
  46 + <ul class="row list-inline plupload-preview" id="p-water_url"></ul>
39 </div> 47 </div>
40 </div> 48 </div>
41 <div class="form-group"> 49 <div class="form-group">
@@ -35,7 +35,15 @@ @@ -35,7 +35,15 @@
35 <div class="form-group"> 35 <div class="form-group">
36 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label> 36 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
37 <div class="col-xs-12 col-sm-8"> 37 <div class="col-xs-12 col-sm-8">
38 - <input id="c-water_url" data-rule="required" class="form-control" name="row[water_url]" type="text" value="{$row.water_url|htmlentities}"> 38 + <div class="input-group">
  39 + <input id="c-water_url" data-rule="required" class="form-control" size="35" name="row[water_url]" value="{$row.water_url}" type="text" placeholder="请上传小样图片">
  40 + <div class="input-group-addon no-border no-padding">
  41 + <span><button type="button" id="plupload-water_url" class="btn btn-danger plupload" data-input-id="c-water_url" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-water_url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  42 + <span><button type="button" id="fachoose-water_url" class="btn btn-primary fachoose" data-input-id="c-water_url" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  43 + </div>
  44 + <span class="msg-box n-right"></span>
  45 + </div>
  46 + <ul class="row list-inline plupload-preview" id="p-water_url"></ul>
39 </div> 47 </div>
40 </div> 48 </div>
41 <div class="form-group"> 49 <div class="form-group">
@@ -289,7 +289,7 @@ class User extends Api @@ -289,7 +289,7 @@ class User extends Api
289 "data": { 289 "data": {
290 "id": 4,//图片id, 290 "id": 4,//图片id,
291 "thumbnail": //缩略图, 291 "thumbnail": //缩略图,
292 - "water_url": //带水印的地址, 292 + "water_url": //小样带水印的图片地址,
293 "url": //高清地址, 293 "url": //高清地址,
294 "price"://正常价格, 294 "price"://正常价格,
295 "vip_price"://vip价格, 295 "vip_price"://vip价格,
@@ -316,6 +316,7 @@ class User extends Api @@ -316,6 +316,7 @@ class User extends Api
316 ->where('id',$pic_id) 316 ->where('id',$pic_id)
317 ->find(); 317 ->find();
318 $data['thumbnail'] = $rule.$data['thumbnail']; 318 $data['thumbnail'] = $rule.$data['thumbnail'];
  319 + $data['water_url'] = $rule.$data['water_url'];
319 $data['is_vip'] = 0; 320 $data['is_vip'] = 0;
320 $this->success('SUCCESS',$data); 321 $this->success('SUCCESS',$data);
321 }elseif($res['is_vip'] == 1){ 322 }elseif($res['is_vip'] == 1){
@@ -328,6 +329,7 @@ class User extends Api @@ -328,6 +329,7 @@ class User extends Api
328 ->find(); 329 ->find();
329 $data['is_vip'] = 1; 330 $data['is_vip'] = 1;
330 $data['thumbnail'] = $rule.$data['thumbnail']; 331 $data['thumbnail'] = $rule.$data['thumbnail'];
  332 + $data['water_url'] = $rule.$data['water_url'];
331 $this->success('SUCCESS',$data); 333 $this->success('SUCCESS',$data);
332 } 334 }
333 } 335 }
@@ -1976,7 +1976,7 @@ @@ -1976,7 +1976,7 @@
1976 "data": { 1976 "data": {
1977 "id": 4,//图片id, 1977 "id": 4,//图片id,
1978 "thumbnail": //缩略图, 1978 "thumbnail": //缩略图,
1979 - "water_url": //带水印的地址, 1979 + "water_url": //小样带水印的图片地址,
1980 "url": //高清地址, 1980 "url": //高清地址,
1981 "price"://正常价格, 1981 "price"://正常价格,
1982 "vip_price"://vip价格, 1982 "vip_price"://vip价格,
@@ -1999,7 +1999,7 @@ @@ -1999,7 +1999,7 @@
1999 1999
2000 <div class="row mt0 footer"> 2000 <div class="row mt0 footer">
2001 <div class="col-md-6" align="left"> 2001 <div class="col-md-6" align="left">
2002 - Generated on 2019-11-19 17:01:47 </div> 2002 + Generated on 2019-11-19 17:22:43 </div>
2003 <div class="col-md-6" align="right"> 2003 <div class="col-md-6" align="right">
2004 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 2004 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
2005 </div> 2005 </div>
@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
29 {field: 'keyword', title: __('Keyword')}, 29 {field: 'keyword', title: __('Keyword')},
30 {field: 'thumbnail', title: __('Thumbnail'), events: Table.api.events.image,formatter: Table.api.formatter.image}, 30 {field: 'thumbnail', title: __('Thumbnail'), events: Table.api.events.image,formatter: Table.api.formatter.image},
31 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')}, 31 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
32 - {field: 'water_url', title: __('Water_url'), formatter: Table.api.formatter.url}, 32 + {field: 'water_url', title: __('Water_url'), events: Table.api.events.image,formatter: Table.api.formatter.image},
33 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url}, 33 {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
34 {field: 'is_recommend', title: __('Is_recommend'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}, 34 {field: 'is_recommend', title: __('Is_recommend'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
35 {field: 'price', title: __('Price')}, 35 {field: 'price', title: __('Price')},